From da62f2ba42d1bd572d99cb419fc556628eb0cc07 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 19 Aug 2023 11:02:30 +0200
Subject: [PATCH 001/430] Get output_requirements struct its own include file

---
 src/middle-ram.cpp          |  1 +
 src/options.hpp             | 25 ------------------------
 src/output-requirements.hpp | 38 +++++++++++++++++++++++++++++++++++++
 src/output.cpp              |  4 +++-
 src/output.hpp              |  3 ++-
 tests/test-middle.cpp       |  1 +
 6 files changed, 45 insertions(+), 27 deletions(-)
 create mode 100644 src/output-requirements.hpp

diff --git a/src/middle-ram.cpp b/src/middle-ram.cpp
index f34161101..a00339970 100644
--- a/src/middle-ram.cpp
+++ b/src/middle-ram.cpp
@@ -10,6 +10,7 @@
 #include "logging.hpp"
 #include "middle-ram.hpp"
 #include "options.hpp"
+#include "output-requirements.hpp"
 
 #include <osmium/builder/osm_object_builder.hpp>
 #include <osmium/util/delta.hpp>
diff --git a/src/options.hpp b/src/options.hpp
index 1e18c31c3..dea7367a0 100644
--- a/src/options.hpp
+++ b/src/options.hpp
@@ -49,31 +49,6 @@ struct database_options_t
 
 std::string build_conninfo(database_options_t const &opt);
 
-/**
- * Outputs can signal their requirements to the middle by setting these fields.
- */
-struct output_requirements
-{
-    /**
-     * Need full node objects with tags, attributes (only if --extra-attributes
-     * is set) and locations. If false, only node locations are needed.
-     */
-    bool full_nodes = false;
-
-    /**
-     * Need full way objects with tags, attributes (only if --extra-attributes
-     * is set) and way nodes. If false, only way nodes are needed.
-     */
-    bool full_ways = false;
-
-    /**
-     * Need full relation objects with tags, attributes (only if
-     * --extra-attributes is set) and members. If false, no data from relations
-     * is needed.
-     */
-    bool full_relations = false;
-};
-
 /**
  * Structure for storing command-line and other options
  */
diff --git a/src/output-requirements.hpp b/src/output-requirements.hpp
new file mode 100644
index 000000000..9deb1a099
--- /dev/null
+++ b/src/output-requirements.hpp
@@ -0,0 +1,38 @@
+#ifndef OSM2PGSQL_OUTPUT_REQUIREMENTS_HPP
+#define OSM2PGSQL_OUTPUT_REQUIREMENTS_HPP
+
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+/**
+ * Outputs can signal their requirements to the middle by setting these fields.
+ */
+struct output_requirements
+{
+    /**
+     * Need full node objects with tags, attributes (only if --extra-attributes
+     * is set) and locations. If false, only node locations are needed.
+     */
+    bool full_nodes = false;
+
+    /**
+     * Need full way objects with tags, attributes (only if --extra-attributes
+     * is set) and way nodes. If false, only way nodes are needed.
+     */
+    bool full_ways = false;
+
+    /**
+     * Need full relation objects with tags, attributes (only if
+     * --extra-attributes is set) and members. If false, no data from relations
+     * is needed.
+     */
+    bool full_relations = false;
+};
+
+#endif // OSM2PGSQL_OUTPUT_REQUIREMENTS_HPP
diff --git a/src/output.cpp b/src/output.cpp
index 4c1d5787c..a26206f7d 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -7,12 +7,14 @@
  * For a full list of authors see the git log.
  */
 
+#include "output.hpp"
+
 #include "db-copy.hpp"
 #include "format.hpp"
+#include "options.hpp"
 #include "output-gazetteer.hpp"
 #include "output-null.hpp"
 #include "output-pgsql.hpp"
-#include "output.hpp"
 
 #ifdef HAVE_LUA
 # include "output-flex.hpp"
diff --git a/src/output.hpp b/src/output.hpp
index 35a787f61..c82a62d36 100644
--- a/src/output.hpp
+++ b/src/output.hpp
@@ -18,13 +18,14 @@
 
 #include <osmium/index/id_set.hpp>
 
-#include "options.hpp"
 #include "osmtypes.hpp"
+#include "output-requirements.hpp"
 
 class db_copy_thread_t;
 class thread_pool_t;
 
 struct middle_query_t;
+struct options_t;
 
 class output_t
 {
diff --git a/tests/test-middle.cpp b/tests/test-middle.cpp
index 75c5dff84..f6ef975eb 100644
--- a/tests/test-middle.cpp
+++ b/tests/test-middle.cpp
@@ -18,6 +18,7 @@
 #include "dependency-manager.hpp"
 #include "middle-pgsql.hpp"
 #include "middle-ram.hpp"
+#include "output-requirements.hpp"
 
 #include "common-buffer.hpp"
 #include "common-cleanup.hpp"

From fbc3ff9063177622af09ce126b508cc6e6c2cc6b Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 17 Aug 2023 09:13:37 +0200
Subject: [PATCH 002/430] Suppress clang-tidy error on main functions

The main functions now catch all exceptions, but there is still the
possibility that the logging of the error message throws again. Not much
we can do about this.
---
 src/gen/osm2pgsql-gen.cpp | 1 +
 src/osm2pgsql.cpp         | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index 75f886b74..64369585c 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -595,6 +595,7 @@ void genproc_t::run()
     }
 }
 
+// NOLINTNEXTLINE(bugprone-exception-escape)
 int main(int argc, char *argv[])
 {
     try {
diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
index 59333dfb8..656954454 100644
--- a/src/osm2pgsql.cpp
+++ b/src/osm2pgsql.cpp
@@ -348,6 +348,7 @@ static void check_and_set_style(options_t *options)
     }
 }
 
+// NOLINTNEXTLINE(bugprone-exception-escape)
 int main(int argc, char *argv[])
 {
     try {
@@ -404,6 +405,9 @@ int main(int argc, char *argv[])
     } catch (std::exception const &e) {
         log_error("{}", e.what());
         return 1;
+    } catch (...) {
+        log_error("Unknown exception.");
+        return 1;
     }
 
     return 0;

From 1f04c537f919a972e94c89c3004faefb723d613a Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 17 Aug 2023 09:26:41 +0200
Subject: [PATCH 003/430] Avoid narrowing conversion

---
 src/tagtransform-lua.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tagtransform-lua.cpp b/src/tagtransform-lua.cpp
index fd2d035e4..3389dc165 100644
--- a/src/tagtransform-lua.cpp
+++ b/src/tagtransform-lua.cpp
@@ -110,8 +110,8 @@ bool lua_tagtransform_t::filter_tags(osmium::OSMObject const &o, bool *polygon,
             lua_pushstring(lua_state(), t.key.c_str());
             lua_pushstring(lua_state(), t.value.c_str());
             lua_rawset(lua_state(), -3);
+            ++sz;
         }
-        sz += tags.size();
     }
 
     lua_pushinteger(lua_state(), sz);

From 1c2a4251bceefecfc025a229757a0e76ac5571ec Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 17 Aug 2023 09:23:20 +0200
Subject: [PATCH 004/430] Refactor tests triggering a moved-from-warning

Clang-tidy doesn't understand that only one SECTION is run per test so
it thinks data is used after move.

This removes some of the SECTIONs which don't really do things relevant
to the tests here. And one test is split into two so we don't need the
SECTION any more.
---
 tests/test-expire-from-geometry.cpp | 41 +++++++++++------------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/tests/test-expire-from-geometry.cpp b/tests/test-expire-from-geometry.cpp
index fdd5a9fb0..87fa917b4 100644
--- a/tests/test-expire-from-geometry.cpp
+++ b/tests/test-expire-from-geometry.cpp
@@ -390,13 +390,6 @@ TEST_CASE("expire multilinestring geometry", "[NoDB]")
         et.from_geometry(geom, expire_config);
     }
 
-    SECTION("geom with check")
-    {
-        geom::geometry_t geom{std::move(ml)};
-        geom.set_srid(3857);
-        et.from_geometry_if_3857(geom, expire_config);
-    }
-
     auto const tiles = et.get_tiles();
     REQUIRE(tiles.size() == 3);
     CHECK(tile_t::from_quadkey(tiles[0], zoom) == tile_t{zoom, 2049, 2046});
@@ -440,13 +433,6 @@ TEST_CASE("expire multipolygon geometry", "[NoDB]")
         et.from_geometry(geom, expire_config);
     }
 
-    SECTION("geom with check")
-    {
-        geom::geometry_t geom{std::move(mp)};
-        geom.set_srid(3857);
-        et.from_geometry_if_3857(geom, expire_config);
-    }
-
     auto const tiles = et.get_tiles();
     REQUIRE(tiles.size() == 17);
 
@@ -476,18 +462,8 @@ TEST_CASE("expire geometry collection", "[NoDB]")
     collection.add_geometry(geom::geometry_t{
         geom::linestring_t{{15000.0, 15000.0}, {25000.0, 15000.0}}});
 
-    SECTION("geom")
-    {
-        geom::geometry_t const geom{std::move(collection)};
-        et.from_geometry(geom, expire_config);
-    }
-
-    SECTION("geom with check")
-    {
-        geom::geometry_t geom{std::move(collection)};
-        geom.set_srid(3857);
-        et.from_geometry_if_3857(geom, expire_config);
-    }
+    geom::geometry_t const geom{std::move(collection)};
+    et.from_geometry(geom, expire_config);
 
     auto const tiles = et.get_tiles();
     REQUIRE(tiles.size() == 6);
@@ -499,6 +475,19 @@ TEST_CASE("expire geometry collection", "[NoDB]")
     CHECK(tile_t::from_quadkey(tiles[5], zoom) == tile_t{zoom, 2048, 2048});
 }
 
+TEST_CASE("expire works if in 3857", "[NoDB]")
+{
+    expire_config_t const expire_config;
+    expire_tiles et{zoom, defproj};
+
+    geom::geometry_t geom{geom::point_t{0.0, 0.0}};
+    geom.set_srid(3857);
+    et.from_geometry_if_3857(geom, expire_config);
+
+    auto const tiles = et.get_tiles();
+    REQUIRE(tiles.size() == 4);
+}
+
 TEST_CASE("expire doesn't do anything if not in 3857", "[NoDB]")
 {
     expire_config_t const expire_config;

From 22e3f9c9f583da5f1c6f2e9d717059d922445c74 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 22 Aug 2023 21:47:53 +0200
Subject: [PATCH 005/430] Github action: Test with PostgreSQL 15 instead of 14

---
 .github/workflows/ci.yml | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 83e6f0581..d5ba9ee83 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -196,7 +196,7 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  ubuntu20-pg13-clang10-cpp17:
+  ubuntu20-pg15-clang10:
     runs-on: ubuntu-20.04
 
     env:
@@ -204,7 +204,7 @@ jobs:
       CXX: clang++-10
       LUA_VERSION: 5.3
       LUAJIT_OPTION: OFF
-      POSTGRESQL_VERSION: 14
+      POSTGRESQL_VERSION: 15
       POSTGIS_VERSION: 3
       USE_PROJ_LIB: 6
       BUILD_TYPE: Debug
@@ -249,7 +249,7 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  ubuntu22-pg14-clang14-jit:
+  ubuntu22-pg15-clang14-jit:
     runs-on: ubuntu-22.04
 
     env:
@@ -257,7 +257,7 @@ jobs:
       CXX: clang++-14
       LUA_VERSION: 5.4
       LUAJIT_OPTION: ON
-      POSTGRESQL_VERSION: 14
+      POSTGRESQL_VERSION: 15
       POSTGIS_VERSION: 3
       BUILD_TYPE: Debug
       PSYCOPG: 2
@@ -267,7 +267,7 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  ubuntu22-pg14-clang14-proj6:
+  ubuntu22-pg15-clang14-proj6:
     runs-on: ubuntu-22.04
 
     env:
@@ -275,7 +275,7 @@ jobs:
       CXX: clang++-14
       LUA_VERSION: 5.4
       LUAJIT_OPTION: OFF
-      POSTGRESQL_VERSION: 14
+      POSTGRESQL_VERSION: 15
       POSTGIS_VERSION: 3
       USE_PROJ_LIB: 6
       BUILD_TYPE: Debug
@@ -286,7 +286,7 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  ubuntu22-pg14-clang14-noproj:
+  ubuntu22-pg15-clang14-noproj:
     runs-on: ubuntu-22.04
 
     env:
@@ -294,7 +294,7 @@ jobs:
       CXX: clang++-14
       LUA_VERSION: 5.3
       LUAJIT_OPTION: OFF
-      POSTGRESQL_VERSION: 14
+      POSTGRESQL_VERSION: 15
       POSTGIS_VERSION: 3
       USE_PROJ_LIB: off
       BUILD_TYPE: Debug
@@ -305,7 +305,7 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  ubuntu22-pg14-clang14-cpp17:
+  ubuntu22-pg15-clang14:
     runs-on: ubuntu-22.04
 
     env:
@@ -313,7 +313,7 @@ jobs:
       CXX: clang++-14
       LUA_VERSION: 5.4
       LUAJIT_OPTION: OFF
-      POSTGRESQL_VERSION: 14
+      POSTGRESQL_VERSION: 15
       POSTGIS_VERSION: 3
       USE_PROJ_LIB: 6
       BUILD_TYPE: Debug
@@ -324,7 +324,7 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  ubuntu22-pg14-gcc12-release:
+  ubuntu22-pg15-gcc12-release:
     runs-on: ubuntu-22.04
 
     env:
@@ -333,7 +333,7 @@ jobs:
       EXTRA_FLAGS: -Wno-stringop-overread
       LUA_VERSION: 5.4
       LUAJIT_OPTION: ON
-      POSTGRESQL_VERSION: 14
+      POSTGRESQL_VERSION: 15
       POSTGIS_VERSION: 3
       BUILD_TYPE: Release
       PSYCOPG: 2
@@ -343,14 +343,14 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  ubuntu22-pg14-gcc12-release-nolua:
+  ubuntu22-pg15-gcc12-release-nolua:
     runs-on: ubuntu-22.04
 
     env:
       CC: gcc-12
       CXX: g++-12
       EXTRA_FLAGS: -Wno-stringop-overread
-      POSTGRESQL_VERSION: 14
+      POSTGRESQL_VERSION: 15
       POSTGIS_VERSION: 3
       BUILD_TYPE: Release
       PSYCOPG: 2
@@ -360,7 +360,7 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  ubuntu22-pg14-clang14-cpp20:
+  ubuntu22-pg15-clang14-cpp20:
     runs-on: ubuntu-22.04
 
     env:
@@ -368,7 +368,7 @@ jobs:
       CXX: clang++-14
       LUA_VERSION: 5.3
       LUAJIT_OPTION: OFF
-      POSTGRESQL_VERSION: 14
+      POSTGRESQL_VERSION: 15
       POSTGIS_VERSION: 3
       CPP_VERSION: 20
       BUILD_TYPE: Debug
@@ -379,7 +379,7 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  ubuntu22-pg14-gcc12-cpp20:
+  ubuntu22-pg15-gcc12-cpp20:
     runs-on: ubuntu-22.04
 
     env:
@@ -387,7 +387,7 @@ jobs:
       CXX: g++-12
       LUA_VERSION: 5.3
       LUAJIT_OPTION: OFF
-      POSTGRESQL_VERSION: 14
+      POSTGRESQL_VERSION: 15
       POSTGIS_VERSION: 3
       CPP_VERSION: 20
       BUILD_TYPE: Debug

From b3109d9c77f7d3d7f83dcf2ca397397654157ae4 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 24 Aug 2023 15:11:47 +0200
Subject: [PATCH 006/430] Use colon syntax consistently when calling Lua
 functions on objects

---
 flex-config/bbox.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flex-config/bbox.lua b/flex-config/bbox.lua
index 02b974c7b..920772859 100644
--- a/flex-config/bbox.lua
+++ b/flex-config/bbox.lua
@@ -82,7 +82,7 @@ end
 -- Format the bounding box we get from calling get_bbox() on the parameter
 -- in the way needed for the PostgreSQL/PostGIS box2d type.
 local function format_bbox(object)
-    local xmin, ymin, xmax, ymax = object.get_bbox()
+    local xmin, ymin, xmax, ymax = object:get_bbox()
     if xmin == nil then
         return nil
     end

From 58dca4f253cad822a67abe3d5ed7967e40ff6b08 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 27 Aug 2023 16:50:29 +0200
Subject: [PATCH 007/430] Revert "Refactor code that gets a mutex and calls
 into Lua code"

This reverts commit 4dca25541a585e61d58e7682dadf0269603f5573.

The select_relation_members() reads data from the Lua stack after
calling call_lua_function(). It is important that this is still
protected by the mutex.
---
 src/output-flex.cpp | 29 +++++++++++++++++++----------
 src/output-flex.hpp |  7 +++++--
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 561b47a9a..bfbc73b6a 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -48,6 +48,9 @@
 #include <stdexcept>
 #include <string>
 
+// Mutex used to coordinate access to Lua code
+static std::mutex lua_mutex;
+
 // Lua can't call functions on C++ objects directly. This macro defines simple
 // C "trampoline" functions which are called from Lua which get the current
 // context (the output_flex_t object) and call the respective function on the
@@ -895,9 +898,6 @@ int output_flex_t::expire_output_table()
 void output_flex_t::call_lua_function(prepared_lua_function_t func,
                                       osmium::OSMObject const &object)
 {
-    static std::mutex lua_mutex;
-    std::lock_guard<std::mutex> const guard{lua_mutex};
-
     m_calling_context = func.context();
 
     lua_pushvalue(lua_state(), func.index()); // the function to call
@@ -914,6 +914,13 @@ void output_flex_t::call_lua_function(prepared_lua_function_t func,
     m_calling_context = calling_context::main;
 }
 
+void output_flex_t::get_mutex_and_call_lua_function(
+    prepared_lua_function_t func, osmium::OSMObject const &object)
+{
+    std::lock_guard<std::mutex> const guard{lua_mutex};
+    call_lua_function(func, object);
+}
+
 void output_flex_t::pending_way(osmid_t id)
 {
     if (!m_process_way) {
@@ -926,7 +933,7 @@ void output_flex_t::pending_way(osmid_t id)
 
     way_delete(id);
 
-    call_lua_function(m_process_way, m_way_cache.get());
+    get_mutex_and_call_lua_function(m_process_way, m_way_cache.get());
 }
 
 void output_flex_t::select_relation_members()
@@ -935,6 +942,7 @@ void output_flex_t::select_relation_members()
         return;
     }
 
+    std::lock_guard<std::mutex> const guard{lua_mutex};
     call_lua_function(m_select_relation_members, m_relation_cache.get());
 
     // If the function returned nil there is nothing to be marked.
@@ -1014,7 +1022,8 @@ void output_flex_t::pending_relation(osmid_t id)
     delete_from_tables(osmium::item_type::relation, id);
 
     if (m_process_relation) {
-        call_lua_function(m_process_relation, m_relation_cache.get());
+        get_mutex_and_call_lua_function(m_process_relation,
+                                        m_relation_cache.get());
     }
 }
 
@@ -1029,7 +1038,7 @@ void output_flex_t::pending_relation_stage1c(osmid_t id)
     }
 
     m_disable_add_row = true;
-    call_lua_function(m_process_relation, m_relation_cache.get());
+    get_mutex_and_call_lua_function(m_process_relation, m_relation_cache.get());
     m_disable_add_row = false;
 }
 
@@ -1104,7 +1113,7 @@ void output_flex_t::node_add(osmium::Node const &node)
     }
 
     m_context_node = &node;
-    call_lua_function(m_process_node, node);
+    get_mutex_and_call_lua_function(m_process_node, node);
     m_context_node = nullptr;
 }
 
@@ -1117,7 +1126,7 @@ void output_flex_t::way_add(osmium::Way *way)
     }
 
     m_way_cache.init(way);
-    call_lua_function(m_process_way, m_way_cache.get());
+    get_mutex_and_call_lua_function(m_process_way, m_way_cache.get());
 }
 
 void output_flex_t::relation_add(osmium::Relation const &relation)
@@ -1128,7 +1137,7 @@ void output_flex_t::relation_add(osmium::Relation const &relation)
 
     m_relation_cache.init(relation);
     select_relation_members();
-    call_lua_function(m_process_relation, relation);
+    get_mutex_and_call_lua_function(m_process_relation, relation);
 }
 
 void output_flex_t::delete_from_table(table_connection_t *table_connection,
@@ -1518,7 +1527,7 @@ void output_flex_t::reprocess_marked()
         }
         way_delete(id);
         if (m_process_way) {
-            call_lua_function(m_process_way, m_way_cache.get());
+            get_mutex_and_call_lua_function(m_process_way, m_way_cache.get());
         }
     }
 
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index ed457f9d5..436237b32 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -185,12 +185,15 @@ class output_flex_t : public output_t
 
     /**
      * Call a Lua function that was "prepared" earlier with the OSMObject
-     * as its only parameter. Uses a mutex internally to make access to the
-     * Lua environment thread safe.
+     * as its only parameter.
      */
     void call_lua_function(prepared_lua_function_t func,
                            osmium::OSMObject const &object);
 
+    /// Aquire the lua_mutex and the call `call_lua_function()`.
+    void get_mutex_and_call_lua_function(prepared_lua_function_t func,
+                                         osmium::OSMObject const &object);
+
     void init_lua(std::string const &filename);
 
     // Get the flex table that is as first parameter on the Lua stack.

From f3e7d6972b21b055af38dbb80e28f4cff8a55cf6 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 27 Aug 2023 16:58:00 +0200
Subject: [PATCH 008/430] Add comment in the hope that we don't make this error
 again

---
 src/output-flex.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index bfbc73b6a..24443e65e 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -942,6 +942,8 @@ void output_flex_t::select_relation_members()
         return;
     }
 
+    // We can not use get_mutex_and_call_lua_function() here, because we need
+    // the mutex to stick around as long as we are looking at the Lua stack.
     std::lock_guard<std::mutex> const guard{lua_mutex};
     call_lua_function(m_select_relation_members, m_relation_cache.get());
 

From 8bb8fca981daa4fed1c4e579b635a79f7998ebf9 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 28 Aug 2023 09:50:57 +0200
Subject: [PATCH 009/430] Disable the warning that cache is disabled in append
 mode

In append mode we don't necessarily have the flat node setting from the
command line, because it is read from the properties file. So this would
give us an unnecessary and wrong warning.

This is just a band aid though, a better fix would be to check after we
have read the properties file. But that needs some larger changes I'll
leave for when we refactor the command line parsing code.
---
 src/command-line-parser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index f303da0d7..79c1749f1 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -486,7 +486,7 @@ static void check_options(options_t *options)
             throw std::runtime_error{
                 "RAM node cache can only be disabled in slim mode."};
         }
-        if (options->flat_node_file.empty()) {
+        if (options->flat_node_file.empty() && !options->append) {
             log_warn("RAM cache is disabled. This will likely slow down "
                      "processing a lot.");
         }

From 71a1df7858f3d2d198f9b5d94815159f9f8b1ae2 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 29 Aug 2023 10:52:25 +0200
Subject: [PATCH 010/430] Generalization: Allow list of SQL commands in
 run_sql() command

The run_sql() command now can have either a single SQL statement in the
`sql` field or a list of SQL commands.

The new `transaction` field can be set to `true` to wrap the SQL
commands in BEGIN/COMMIT.
---
 src/gen/osm2pgsql-gen.cpp | 44 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 5 deletions(-)

diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index 64369585c..638b26109 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -368,15 +368,49 @@ class genproc_t
 
         std::string const description =
             luaX_get_table_string(lua_state(), "description", 1, "Argument #1");
-        std::string const sql =
-            luaX_get_table_string(lua_state(), "sql", 1, "Argument #1");
 
-        log_debug("Running SQL command: {}.", description);
+        bool const transaction = luaX_get_table_bool(lua_state(), "transaction",
+                                                     1, "Argument #1", false);
+
+        std::vector<std::string> queries;
+        if (transaction) {
+            queries.emplace_back("BEGIN");
+        }
+
+        lua_getfield(lua_state(), 1, "sql");
+        int const ltype = lua_type(lua_state(), -1);
+        if (ltype == LUA_TSTRING) {
+            queries.emplace_back(lua_tostring(lua_state(), -1));
+        } else if (ltype == LUA_TTABLE) {
+            if (!luaX_is_array(lua_state())) {
+                throw std::runtime_error{
+                    "Table in 'sql' field must be an array."};
+            }
+            luaX_for_each(lua_state(), [&]() {
+                if (lua_type(lua_state(), -1) != LUA_TSTRING) {
+                    throw std::runtime_error{
+                        "Table in 'sql' field must only contain strings."};
+                }
+                queries.emplace_back(lua_tostring(lua_state(), -1));
+            });
+        } else {
+            throw std::runtime_error{
+                "Argument #1 must contain a 'sql' string or table field."};
+        }
+
+        if (transaction) {
+            queries.emplace_back("COMMIT");
+        }
+
+        log_debug("Running SQL commands: {}.", description);
 
         util::timer_t timer_sql;
         pg_conn_t const db_connection{m_conninfo};
-        db_connection.exec(sql);
-        log_debug("SQL command took {}.",
+        for (auto const &query : queries) {
+            log_debug("Running sql: {}", query);
+            db_connection.exec(query);
+        }
+        log_debug("SQL commands took {}.",
                   util::human_readable_duration(timer_sql.stop()));
 
         return 0;

From bdd64445d6c20c9f6f0557a6d64da0db1a3aaff2 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 28 Aug 2023 10:03:01 +0200
Subject: [PATCH 011/430] Refactor: Build a list of (templated) queries, then
 run them

---
 src/middle-pgsql.cpp | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index a66c17acf..0c8d6fc0f 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -822,13 +822,15 @@ void middle_pgsql_t::get_node_parents(
 
     send_id_list(m_db_connection, "osm2pgsql_changed_nodes", changed_nodes);
 
-    m_db_connection.exec("ANALYZE osm2pgsql_changed_nodes");
+    std::vector<std::string> queries;
+
+    queries.emplace_back("ANALYZE osm2pgsql_changed_nodes");
 
     bool const has_bucket_index =
         check_bucket_index(&m_db_connection, m_options->prefix);
 
     if (has_bucket_index) {
-        m_db_connection.exec(build_sql(*m_options, R"(
+        queries.emplace_back(R"(
 WITH changed_buckets AS (
   SELECT array_agg(id) AS node_ids, id >> {way_node_index_id_shift} AS bucket
     FROM osm2pgsql_changed_nodes GROUP BY id >> {way_node_index_id_shift}
@@ -839,31 +841,35 @@ INSERT INTO osm2pgsql_changed_ways
     WHERE w.nodes && b.node_ids
       AND {schema}"{prefix}_index_bucket"(w.nodes)
        && ARRAY[b.bucket];
-        )"));
+        )");
     } else {
-        m_db_connection.exec(build_sql(*m_options, R"(
+        queries.emplace_back(R"(
 INSERT INTO osm2pgsql_changed_ways
   SELECT DISTINCT w.id
     FROM {schema}"{prefix}_ways" w, osm2pgsql_changed_nodes n
     WHERE w.nodes && ARRAY[n.id]
-        )"));
+        )");
     }
 
     if (m_options->middle_database_format == 1) {
-        m_db_connection.exec(build_sql(*m_options, R"(
+        queries.emplace_back(R"(
 INSERT INTO osm2pgsql_changed_relations
   SELECT DISTINCT r.id
     FROM {schema}"{prefix}_rels" r, osm2pgsql_changed_nodes n
     WHERE r.parts && ARRAY[n.id]
       AND r.parts[1:way_off] && ARRAY[n.id]
-        )"));
+        )");
     } else {
-        m_db_connection.exec(build_sql(*m_options, R"(
+        queries.emplace_back(R"(
 INSERT INTO osm2pgsql_changed_relations
   SELECT DISTINCT r.id
     FROM {schema}"{prefix}_rels" r, osm2pgsql_changed_nodes c
     WHERE {schema}"{prefix}_member_ids"(r.members, 'N'::char) && ARRAY[c.id];
-        )"));
+        )");
+    }
+
+    for (auto const &query : queries) {
+        m_db_connection.exec(build_sql(*m_options, query));
     }
 
     load_id_list(m_db_connection, "osm2pgsql_changed_ways", parent_ways);

From 29ff7eeb2d7f9901b2ffec955ac8cd4cb0cf2c2b Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 28 Aug 2023 10:05:01 +0200
Subject: [PATCH 012/430] Move DISTINCT from queries generating list to when we
 read the data

We had some problems with the query planner getting confused with those
queries. Lets make them as simple as possible to not confuse it
unnecessarily. This might be vodoo, but it doesn't cost much, just a
little bit of temporary space in the database, because when reading we
do the ORDER BY anyway, so the extra DISTINCT isn't more cost.
---
 src/middle-pgsql.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index 0c8d6fc0f..7ca140b6c 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -73,8 +73,8 @@ static void load_id_list(pg_conn_t const &db_connection,
                          std::string const &table,
                          osmium::index::IdSetSmall<osmid_t> *ids)
 {
-    auto const res =
-        db_connection.exec(fmt::format("SELECT id FROM {} ORDER BY id", table));
+    auto const res = db_connection.exec(
+        fmt::format("SELECT DISTINCT id FROM {} ORDER BY id", table));
     for (int n = 0; n < res.num_tuples(); ++n) {
         ids->set(osmium::string_to_object_id(res.get_value(n, 0)));
     }
@@ -836,7 +836,7 @@ WITH changed_buckets AS (
     FROM osm2pgsql_changed_nodes GROUP BY id >> {way_node_index_id_shift}
 )
 INSERT INTO osm2pgsql_changed_ways
-  SELECT DISTINCT w.id
+  SELECT w.id
     FROM {schema}"{prefix}_ways" w, changed_buckets b
     WHERE w.nodes && b.node_ids
       AND {schema}"{prefix}_index_bucket"(w.nodes)
@@ -845,7 +845,7 @@ INSERT INTO osm2pgsql_changed_ways
     } else {
         queries.emplace_back(R"(
 INSERT INTO osm2pgsql_changed_ways
-  SELECT DISTINCT w.id
+  SELECT w.id
     FROM {schema}"{prefix}_ways" w, osm2pgsql_changed_nodes n
     WHERE w.nodes && ARRAY[n.id]
         )");
@@ -854,7 +854,7 @@ INSERT INTO osm2pgsql_changed_ways
     if (m_options->middle_database_format == 1) {
         queries.emplace_back(R"(
 INSERT INTO osm2pgsql_changed_relations
-  SELECT DISTINCT r.id
+  SELECT r.id
     FROM {schema}"{prefix}_rels" r, osm2pgsql_changed_nodes n
     WHERE r.parts && ARRAY[n.id]
       AND r.parts[1:way_off] && ARRAY[n.id]
@@ -862,7 +862,7 @@ INSERT INTO osm2pgsql_changed_relations
     } else {
         queries.emplace_back(R"(
 INSERT INTO osm2pgsql_changed_relations
-  SELECT DISTINCT r.id
+  SELECT r.id
     FROM {schema}"{prefix}_rels" r, osm2pgsql_changed_nodes c
     WHERE {schema}"{prefix}_member_ids"(r.members, 'N'::char) && ARRAY[c.id];
         )");

From 556c8e8772fe53655c663db1d31f8780d6473cb4 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 28 Aug 2023 11:54:21 +0200
Subject: [PATCH 013/430] Put query for finding parent ways from nodes inside a
 PL/pgSQL function

The query we had before would sometimes result in really bad performance
when the query planner in PostgreQL decides that it needs to use
sequential scans on the ways table. This is due to the statistics being
way off. By running the query for each node ids on its own we hopefully
trick the query planner into always using an index lookup.

See #2056
---
 src/middle-pgsql.cpp | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index 7ca140b6c..45ef7fdf8 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -830,18 +830,33 @@ void middle_pgsql_t::get_node_parents(
         check_bucket_index(&m_db_connection, m_options->prefix);
 
     if (has_bucket_index) {
+        // The query to get the parent ways of changed nodes is "hidden"
+        // inside a PL/pgSQL function so that the query planner only sees
+        // a single node id that is being queried for. If we ask for all
+        // nodes at the same time the query planner sometimes thinks it is
+        // better to do a full table scan which totally destroys performance.
+        // This is due to the PostgreSQL statistics on ARRAYs being way off.
         queries.emplace_back(R"(
-WITH changed_buckets AS (
-  SELECT array_agg(id) AS node_ids, id >> {way_node_index_id_shift} AS bucket
-    FROM osm2pgsql_changed_nodes GROUP BY id >> {way_node_index_id_shift}
-)
-INSERT INTO osm2pgsql_changed_ways
-  SELECT w.id
-    FROM {schema}"{prefix}_ways" w, changed_buckets b
-    WHERE w.nodes && b.node_ids
-      AND {schema}"{prefix}_index_bucket"(w.nodes)
-       && ARRAY[b.bucket];
-        )");
+CREATE OR REPLACE FUNCTION osm2pgsql_find_changed_ways() RETURNS void AS $$
+DECLARE
+  changed_buckets RECORD;
+BEGIN
+  FOR changed_buckets IN
+    SELECT array_agg(id) AS node_ids, id >> {way_node_index_id_shift} AS bucket
+      FROM osm2pgsql_changed_nodes GROUP BY id >> {way_node_index_id_shift}
+  LOOP
+    INSERT INTO osm2pgsql_changed_ways
+    SELECT DISTINCT w.id
+      FROM {schema}"{prefix}_ways" w
+      WHERE w.nodes && changed_buckets.node_ids
+        AND {schema}"{prefix}_index_bucket"(w.nodes)
+         && ARRAY[changed_buckets.bucket];
+  END LOOP;
+END;
+$$ LANGUAGE plpgsql
+)");
+        queries.emplace_back("SELECT osm2pgsql_find_changed_ways()");
+        queries.emplace_back("DROP FUNCTION osm2pgsql_find_changed_ways()");
     } else {
         queries.emplace_back(R"(
 INSERT INTO osm2pgsql_changed_ways

From fdddd610ba758bef6d9b73d734cb3104f4a8b6bc Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 29 Aug 2023 11:51:51 +0200
Subject: [PATCH 014/430] Generalizer: Show some more information in log level
 info

Now we can see SQL queries and generalizers run with some timing info
already in log level info.
---
 src/gen/osm2pgsql-gen.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index 638b26109..b350c5df1 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -296,7 +296,7 @@ class genproc_t
 
     int app_run_gen()
     {
-        log_debug("Running configured generalizer (run {})...", ++m_gen_run);
+        log_debug("Configuring generalizer...");
 
         if (lua_type(lua_state(), 1) != LUA_TSTRING) {
             throw std::runtime_error{"Argument #1 to 'run_gen' must be a "
@@ -326,8 +326,8 @@ class genproc_t
         auto generalizer =
             create_generalizer(strategy, &db_connection, &params);
 
-        log_debug("Generalizer '{}' ({}) initialized.", generalizer->name(),
-                  generalizer->strategy());
+        log_info("Running generalizer '{}' ({})...", generalizer->name(),
+                 generalizer->strategy());
 
         if (m_append) {
             params.set("delete_existing", true);
@@ -335,6 +335,7 @@ class genproc_t
 
         write_to_debug_log(params, "Params (after initialization):");
 
+        util::timer_t timer_gen;
         if (generalizer->on_tiles()) {
             process_tiles(db_connection, params, generalizer.get());
         } else {
@@ -353,8 +354,8 @@ class genproc_t
                 std::chrono::duration_cast<std::chrono::milliseconds>(
                     timer.elapsed())));
         }
-        log_debug("Finished generalizer '{}' (run {}).", generalizer->name(),
-                  m_gen_run);
+        log_info("Finished generalizer '{}' in {}.", generalizer->name(),
+                 util::human_readable_duration(timer_gen.stop()));
 
         return 0;
     }
@@ -402,7 +403,7 @@ class genproc_t
             queries.emplace_back("COMMIT");
         }
 
-        log_debug("Running SQL commands: {}.", description);
+        log_info("Running SQL commands: {}.", description);
 
         util::timer_t timer_sql;
         pg_conn_t const db_connection{m_conninfo};
@@ -410,8 +411,8 @@ class genproc_t
             log_debug("Running sql: {}", query);
             db_connection.exec(query);
         }
-        log_debug("SQL commands took {}.",
-                  util::human_readable_duration(timer_sql.stop()));
+        log_info("Finished SQL commands in {}.",
+                 util::human_readable_duration(timer_sql.stop()));
 
         return 0;
     }
@@ -538,7 +539,6 @@ class genproc_t
 
     std::string m_conninfo;
     std::string m_dbschema;
-    std::size_t m_gen_run = 0;
     uint32_t m_jobs;
     bool m_append;
     bool m_updatable;

From 0798a51949452c353119bb430274ff608e4bb8ac Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 2 Sep 2023 11:07:28 +0200
Subject: [PATCH 015/430] Clean tests: Remove 'name' field from expire which is
 never used

This is a left-over from earlier use of the 'name' field.
---
 tests/bdd/flex/lua-expire-output-definitions.feature | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/tests/bdd/flex/lua-expire-output-definitions.feature b/tests/bdd/flex/lua-expire-output-definitions.feature
index fbebf9fa0..bb1c74c6b 100644
--- a/tests/bdd/flex/lua-expire-output-definitions.feature
+++ b/tests/bdd/flex/lua-expire-output-definitions.feature
@@ -17,7 +17,6 @@ Feature: Expire output definitions in Lua file
         And the lua style
             """
             osm2pgsql.define_expire_output({
-                name = 'foo',
                 filename = false
             })
             """
@@ -32,7 +31,6 @@ Feature: Expire output definitions in Lua file
         And the lua style
             """
             osm2pgsql.define_expire_output({
-                name = 'foo',
                 table = 'bar',
                 schema = false
             })
@@ -48,7 +46,6 @@ Feature: Expire output definitions in Lua file
         And the lua style
             """
             osm2pgsql.define_expire_output({
-                name = 'foo',
                 table = false
             })
             """
@@ -63,7 +60,6 @@ Feature: Expire output definitions in Lua file
         And the lua style
             """
             osm2pgsql.define_expire_output({
-                name = 'foo',
                 maxzoom = 'bar',
                 filename = 'somewhere'
             })
@@ -79,7 +75,6 @@ Feature: Expire output definitions in Lua file
         And the lua style
             """
             osm2pgsql.define_expire_output({
-                name = 'foo',
                 maxzoom = 12,
                 minzoom = 'bar',
                 filename = 'somewhere'
@@ -96,7 +91,6 @@ Feature: Expire output definitions in Lua file
         And the lua style
             """
             osm2pgsql.define_expire_output({
-                name = 'foo',
                 maxzoom = 123,
                 filename = 'somewhere'
             })
@@ -112,7 +106,6 @@ Feature: Expire output definitions in Lua file
         And the lua style
             """
             osm2pgsql.define_expire_output({
-                name = 'foo',
                 maxzoom = 12,
                 minzoom = -3,
                 filename = 'somewhere'
@@ -129,7 +122,6 @@ Feature: Expire output definitions in Lua file
         And the lua style
             """
             osm2pgsql.define_expire_output({
-                name = 'foo',
                 maxzoom = 12,
                 minzoom = 14,
                 filename = 'somewhere'

From 4f6f2af39fdd8e6458c9a1ea9d20f3cff72310c9 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 2 Sep 2023 21:59:18 +0200
Subject: [PATCH 016/430] Actually add geometries in the test

Instead of just NULL geometries to make them a bit more realistic.
---
 tests/bdd/flex/lua-expire.feature | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/bdd/flex/lua-expire.feature b/tests/bdd/flex/lua-expire.feature
index 186d4095b..6998c8684 100644
--- a/tests/bdd/flex/lua-expire.feature
+++ b/tests/bdd/flex/lua-expire.feature
@@ -72,7 +72,7 @@ Feature: Expire configuration in Lua file
             })
 
             function osm2pgsql.process_node(object)
-                t:insert({})
+                t:insert({ some = object:as_point() })
             end
             """
         When running osm2pgsql flex
@@ -93,7 +93,7 @@ Feature: Expire configuration in Lua file
             })
 
             function osm2pgsql.process_node(object)
-                t:insert({})
+                t:insert({ some = object:as_point() })
             end
             """
         When running osm2pgsql flex
@@ -136,7 +136,7 @@ Feature: Expire configuration in Lua file
             })
 
             function osm2pgsql.process_node(object)
-                t:insert({})
+                t:insert({ some = object:as_point() })
             end
             """
         Then running osm2pgsql flex fails
@@ -184,7 +184,7 @@ Feature: Expire configuration in Lua file
             })
 
             function osm2pgsql.process_node(object)
-                t:insert({})
+                t:insert({ some = object:as_point() })
             end
             """
         When running osm2pgsql flex
@@ -208,7 +208,7 @@ Feature: Expire configuration in Lua file
             })
 
             function osm2pgsql.process_node(object)
-                t:insert({})
+                t:insert({ some = object:as_point() })
             end
             """
         When running osm2pgsql flex
@@ -231,7 +231,7 @@ Feature: Expire configuration in Lua file
             })
 
             function osm2pgsql.process_node(object)
-                t:insert({})
+                t:insert({ geom = object:as_point() })
             end
             """
         When running osm2pgsql flex

From b45e2c418528b8589487c765ffc365eb73c2e07e Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 1 Sep 2023 09:59:50 +0200
Subject: [PATCH 017/430] Faster hex decoder

---
 src/gen/gen-rivers.cpp       |  2 +-
 src/gen/gen-tile-builtup.cpp |  2 +-
 src/gen/gen-tile-raster.cpp  |  2 +-
 src/wkb.cpp                  | 41 +++++++++++++++++++-----------------
 src/wkb.hpp                  |  8 +++----
 tests/test-wkb.cpp           | 13 ++++++------
 6 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/src/gen/gen-rivers.cpp b/src/gen/gen-rivers.cpp
index eeb59c177..096661d18 100644
--- a/src/gen/gen-rivers.cpp
+++ b/src/gen/gen-rivers.cpp
@@ -258,7 +258,7 @@ SELECT "{id_column}", "{width_column}", "{name_column}", "{geom_column}"
             if (!name.empty()) {
                 names.emplace(id, name);
             }
-            auto const geom = ewkb_to_geom(decode_hex(result.get_value(i, 3)));
+            auto const geom = ewkb_to_geom(decode_hex(result.get(i, 3)));
 
             if (geom.is_linestring()) {
                 auto const &ls = geom.get<geom::linestring_t>();
diff --git a/src/gen/gen-tile-builtup.cpp b/src/gen/gen-tile-builtup.cpp
index a1190b1c8..6992b030c 100644
--- a/src/gen/gen-tile-builtup.cpp
+++ b/src/gen/gen-tile-builtup.cpp
@@ -173,7 +173,7 @@ static void draw_from_db(double margin, canvas_list_t *canvas_list,
                                 box.max_x(), box.max_y());
 
         for (int n = 0; n < result.num_tuples(); ++n) {
-            auto const geom = ewkb_to_geom(decode_hex(result.get_value(n, 0)));
+            auto const geom = ewkb_to_geom(decode_hex(result.get(n, 0)));
             cc.canvas.draw(geom, tile);
         }
     }
diff --git a/src/gen/gen-tile-raster.cpp b/src/gen/gen-tile-raster.cpp
index 3c9019cd8..6ac7ba0db 100644
--- a/src/gen/gen-tile-raster.cpp
+++ b/src/gen/gen-tile-raster.cpp
@@ -163,7 +163,7 @@ static void draw_from_db(double margin, unsigned int image_extent,
 
     for (int n = 0; n < result.num_tuples(); ++n) {
         std::string param = result.get_value(n, 1);
-        auto const geom = ewkb_to_geom(decode_hex(result.get_value(n, 0)));
+        auto const geom = ewkb_to_geom(decode_hex(result.get(n, 0)));
 
         auto const [it, success] = canvas_list->try_emplace(
             std::move(param), image_extent, image_buffer);
diff --git a/src/wkb.cpp b/src/wkb.cpp
index a55d5493b..cf888d500 100644
--- a/src/wkb.cpp
+++ b/src/wkb.cpp
@@ -576,32 +576,35 @@ geom::geometry_t ewkb_to_geom(std::string_view wkb)
     return geom;
 }
 
-unsigned char decode_hex_char(char c)
-{
-    if (c >= '0' && c <= '9') {
-        return c - '0';
-    }
-    if (c >= 'A' && c <= 'F') {
-        return c - 'A' + 10;
-    }
-    if (c >= 'a' && c <= 'f') {
-        return c - 'a' + 10;
-    }
+static constexpr std::array<char, 256> const hex_table = {
+    0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
+    0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
+    0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
+    0, 1, 2, 3,   4, 5, 6, 7,   8, 9, 0, 0,   0, 0, 0, 0,
+
+    0, 10, 11, 12,   13, 14, 15, 0,   0, 0, 0, 0,   0, 0, 0, 0,
+    0,  0,  0,  0,    0,  0,  0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
+    0, 10, 11, 12,   13, 14, 15, 0,   0, 0, 0, 0,   0, 0, 0, 0,
+};
 
-    throw std::runtime_error{"Invalid wkb: Not a hex character"};
+unsigned char decode_hex_char(char c) noexcept
+{
+    // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-constant-array-index)
+    return hex_table[static_cast<std::size_t>(static_cast<unsigned char>(c))];
 }
 
-std::string decode_hex(char const *hex)
+std::string decode_hex(std::string_view hex_string)
 {
+    if (hex_string.size() % 2 != 0) {
+        throw std::runtime_error{"Invalid wkb: Not a valid hex string"};
+    }
+
     std::string wkb;
+    wkb.reserve(hex_string.size() / 2);
 
-    while (*hex != '\0') {
+    // NOLINTNEXTLINE(llvm-qualified-auto, readability-qualified-auto)
+    for (auto hex = hex_string.begin(); hex != hex_string.end();) {
         unsigned int const c = decode_hex_char(*hex++);
-
-        if (*hex == '\0') {
-            throw std::runtime_error{"Invalid wkb: Not a valid hex string"};
-        }
-
         wkb += static_cast<char>((c << 4U) | decode_hex_char(*hex++));
     }
 
diff --git a/src/wkb.hpp b/src/wkb.hpp
index 24a46098a..c76acd6a5 100644
--- a/src/wkb.hpp
+++ b/src/wkb.hpp
@@ -41,15 +41,15 @@
 [[nodiscard]] geom::geometry_t ewkb_to_geom(std::string_view wkb);
 
 /**
- * Decode one hex character (0-9A-F or 0-9a-f) and return its value. Throw
- * an exception if not a valid hex character.
+ * Decode one hex character (0-9A-F or 0-9a-f) and return its value.
+ * Returns 0 for characters that are not hex characters.
  */
-[[nodiscard]] unsigned char decode_hex_char(char c);
+[[nodiscard]] unsigned char decode_hex_char(char c) noexcept;
 
 /**
  * Decode a string of hex characters. Throws an exception if the input is not
  * a valid hex encoding.
  */
-[[nodiscard]] std::string decode_hex(char const *hex);
+[[nodiscard]] std::string decode_hex(std::string_view hex);
 
 #endif // OSM2PGSQL_WKB_HPP
diff --git a/tests/test-wkb.cpp b/tests/test-wkb.cpp
index 538081153..816ad9cf5 100644
--- a/tests/test-wkb.cpp
+++ b/tests/test-wkb.cpp
@@ -189,7 +189,7 @@ TEST_CASE("wkb: geometrycollection", "[NoDB]")
 
 TEST_CASE("wkb: invalid", "[NoDB]") { REQUIRE_THROWS(ewkb_to_geom("INVALID")); }
 
-TEST_CASE("wkb hex decode of valid hex characters")
+TEST_CASE("wkb hex decode of valid and invalid hex characters")
 {
     REQUIRE(decode_hex_char('0') == 0);
     REQUIRE(decode_hex_char('9') == 9);
@@ -197,7 +197,11 @@ TEST_CASE("wkb hex decode of valid hex characters")
     REQUIRE(decode_hex_char('f') == 0x0f);
     REQUIRE(decode_hex_char('A') == 0x0a);
     REQUIRE(decode_hex_char('F') == 0x0f);
-    REQUIRE_THROWS(decode_hex_char('x'));
+    REQUIRE(decode_hex_char('#') == 0);
+    REQUIRE(decode_hex_char('@') == 0);
+    REQUIRE(decode_hex_char('g') == 0);
+    REQUIRE(decode_hex_char('G') == 0);
+    REQUIRE(decode_hex_char(0x7f) == 0);
 }
 
 TEST_CASE("wkb hex decode of valid hex string")
@@ -216,11 +220,6 @@ TEST_CASE("wkb hex decode of valid hex string")
     REQUIRE(result == data);
 }
 
-TEST_CASE("wkb hex decode of invalid hex string")
-{
-    REQUIRE_THROWS(decode_hex("no"));
-}
-
 TEST_CASE("wkb hex decode of empty string is okay")
 {
     std::string const hex{};

From 422ba14490b33deba5d0ddf1aae02ebe9aa72676 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 1 Sep 2023 11:47:16 +0200
Subject: [PATCH 018/430] Better implementation for low-level bit-fiddling in
 tracer code

---
 src/gen/tracer.cpp | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/gen/tracer.cpp b/src/gen/tracer.cpp
index 5321c3eae..62cd37905 100644
--- a/src/gen/tracer.cpp
+++ b/src/gen/tracer.cpp
@@ -41,6 +41,15 @@ void tracer_t::reset()
     m_num_points = 0;
 }
 
+static potrace_word bit_squeeze(potrace_word w, unsigned char const *d) noexcept
+{
+    return (0x80U & d[0]) | (0x40U & d[1]) | (0x20U & d[2]) | (0x10U & d[3]) |
+           (0x08U & d[4]) | (0x04U & d[5]) | (0x02U & d[6]) | (0x01U & d[7]) |
+           w;
+}
+
+static_assert(sizeof(potrace_word) == 8);
+
 void tracer_t::prepare(canvas_t const &canvas) noexcept
 {
     std::size_t const size = canvas.size();
@@ -48,14 +57,17 @@ void tracer_t::prepare(canvas_t const &canvas) noexcept
 
     m_bits.reserve((size * size) / bits_per_word);
 
-    unsigned char const *d = canvas.begin();
-    while (d != canvas.end()) {
-        potrace_word w = 0x1U & *d++;
-        for (std::size_t n = 1; n < bits_per_word; ++n) {
-            w <<= 1U;
-            assert(d != canvas.end());
-            w |= 0x1U & *d++;
-        }
+    for (unsigned char const *d = canvas.begin(); d != canvas.end(); d += 8) {
+        auto w = bit_squeeze(0, d);
+
+        w = bit_squeeze(w << 8U, d += 8);
+        w = bit_squeeze(w << 8U, d += 8);
+        w = bit_squeeze(w << 8U, d += 8);
+        w = bit_squeeze(w << 8U, d += 8);
+        w = bit_squeeze(w << 8U, d += 8);
+        w = bit_squeeze(w << 8U, d += 8);
+        w = bit_squeeze(w << 8U, d += 8);
+
         m_bits.push_back(w);
     }
 

From 30af427c6a50e9bb0ca0d9f55d498a6ea563f418 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 3 Sep 2023 11:01:31 +0200
Subject: [PATCH 019/430] Generalization: Allow setting condition for running
 SQL commands

If a condition is set with "if_has_rows", the SQL command in
"if_has_rows" will be run and only if that returns any rows, the main
sql command is run. This check happens only in "append" mode, in
"create" mode the command is always run.

To be used with something like "SELECT 1 FROM some_table LIMIT 1" to
check whether the table has any rows (for instance an expire table).
---
 src/gen/osm2pgsql-gen.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index b350c5df1..e892dd16c 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -373,6 +373,9 @@ class genproc_t
         bool const transaction = luaX_get_table_bool(lua_state(), "transaction",
                                                      1, "Argument #1", false);
 
+        std::string const if_has_rows = luaX_get_table_string(
+            lua_state(), "if_has_rows", 1, "Argument #1", "");
+
         std::vector<std::string> queries;
         if (transaction) {
             queries.emplace_back("BEGIN");
@@ -403,10 +406,21 @@ class genproc_t
             queries.emplace_back("COMMIT");
         }
 
+        pg_conn_t const db_connection{m_conninfo};
+
+        if (m_append && !if_has_rows.empty()) {
+            auto const result = db_connection.exec(if_has_rows);
+            if (result.num_tuples() == 0) {
+                log_info("Not running SQL command: {} (no rows in "
+                         "condition result).",
+                         description);
+                return 0;
+            }
+        }
+
         log_info("Running SQL commands: {}.", description);
 
         util::timer_t timer_sql;
-        pg_conn_t const db_connection{m_conninfo};
         for (auto const &query : queries) {
             log_debug("Running sql: {}", query);
             db_connection.exec(query);

From 415de9abdf2d003a5c0a0abe8e8fc139acacc2b5 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 4 Sep 2023 10:57:53 +0200
Subject: [PATCH 020/430] prepare release 1.9.2

---
 CMakeLists.txt               | 2 +-
 docs/osm2pgsql-replication.1 | 2 +-
 docs/osm2pgsql.1             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f6b51798..f5195612d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 cmake_minimum_required(VERSION 3.8.0)
 
-project(osm2pgsql VERSION 1.9.1 LANGUAGES CXX C)
+project(osm2pgsql VERSION 1.9.2 LANGUAGES CXX C)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
diff --git a/docs/osm2pgsql-replication.1 b/docs/osm2pgsql-replication.1
index 5d39bdad9..3d1109b03 100644
--- a/docs/osm2pgsql-replication.1
+++ b/docs/osm2pgsql-replication.1
@@ -1,4 +1,4 @@
-.TH "OSM2PGSQL-REPLICATION" "1" "1.9.1" "" ""
+.TH "OSM2PGSQL-REPLICATION" "1" "1.9.2" "" ""
 .SH NAME
 osm2pgsql-replication \- osm2pgsql database updater
 .SH SYNOPSIS
diff --git a/docs/osm2pgsql.1 b/docs/osm2pgsql.1
index 9bf66a6fe..dd69f9556 100644
--- a/docs/osm2pgsql.1
+++ b/docs/osm2pgsql.1
@@ -1,4 +1,4 @@
-.TH "OSM2PGSQL" "1" "1.9.1" "" ""
+.TH "OSM2PGSQL" "1" "1.9.2" "" ""
 .SH NAME
 .PP
 osm2pgsql - OpenStreetMap data to PostgreSQL converter

From 389904269a1b1f246641d203abadfcd5cebb97cc Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 4 Sep 2023 17:26:11 +0200
Subject: [PATCH 021/430] Check in CMake config that we are building for 64bit
 architecture

For a long time we haven't officially supported 32bit architectures but
not really disabled them. But this is giving us more problems lately and
we can't test on 32 bit systems anyway, so this now gives us an up front
check.
---
 CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5195612d..34d2e7c77 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,10 @@ else()
     set(ENABLE_INSTALL OFF)
 endif()
 
+if (NOT ${CMAKE_SIZEOF_VOID_P} EQUAL 8)
+    message(FATAL_ERROR "osm2pgsql needs a 64 bit architecture")
+endif()
+
 if (WIN32)
     set(DEFAULT_STYLE "default.style" CACHE STRING "Default style used unless one is given on the command line")
 else()

From 32389c1fe3cf3a8dafb0118058905361839d6577 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 22 Aug 2023 12:02:05 +0200
Subject: [PATCH 022/430] Add runtime warnings that area type and add_row() are
 deprecated

Only one message about add_row() is shown.
---
 src/flex-table-column.cpp | 6 ++++++
 src/output-flex.cpp       | 7 +++++++
 src/output-flex.hpp       | 2 ++
 3 files changed, 15 insertions(+)

diff --git a/src/flex-table-column.cpp b/src/flex-table-column.cpp
index 91824e268..c0c4b9aa5 100644
--- a/src/flex-table-column.cpp
+++ b/src/flex-table-column.cpp
@@ -62,6 +62,12 @@ static table_column_type get_column_type_from_string(std::string const &type)
         throw fmt_error("Unknown column type '{}'.", type);
     }
 
+    if (column_type->type == table_column_type::area) {
+        log_warn("The 'area' column type is deprecated. Please read");
+        log_warn("https://osm2pgsql.org/doc/tutorials/"
+                 "switching-from-add-row-to-insert/");
+    }
+
     return column_type->type;
 }
 
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 24443e65e..735bbe81a 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -587,6 +587,13 @@ int output_flex_t::table_add_row()
     }
     lua_remove(lua_state(), 1);
 
+    if (m_add_row_has_never_been_called) {
+        m_add_row_has_never_been_called = false;
+        log_warn("The add_row() function is deprecated. Please read");
+        log_warn("https://osm2pgsql.org/doc/tutorials/"
+                 "switching-from-add-row-to-insert/");
+    }
+
     if (m_calling_context == calling_context::process_node) {
         if (!table.matches_type(osmium::item_type::node)) {
             throw fmt_error("Trying to add node to table '{}'.", table.name());
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index 436237b32..89cced9b2 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -316,6 +316,8 @@ class output_flex_t : public output_t
      * add_row() command.
      */
     bool m_disable_add_row = false;
+
+    bool m_add_row_has_never_been_called = true;
 };
 
 #endif // OSM2PGSQL_OUTPUT_FLEX_HPP

From a29a086291a718a9c13940a246d30e9bbd298e98 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 25 Aug 2023 08:59:28 +0200
Subject: [PATCH 023/430] Rename "docs" directory to "man"

And updates various docs accordingly.

For a while we haven't kept any docs in there other than the man pages.
The new name better reflects what this directory is all about.
---
 CMakeLists.txt                        |  2 +-
 CONTRIBUTING.md                       | 12 ++++++------
 docs/README.md                        | 11 -----------
 {docs => man}/CMakeLists.txt          |  0
 {docs => man}/manpage.template        |  0
 {docs => man}/manpage_from_python.py  |  0
 {docs => man}/osm2pgsql-gen.1         |  0
 {docs => man}/osm2pgsql-gen.md        |  0
 {docs => man}/osm2pgsql-replication.1 |  0
 {docs => man}/osm2pgsql.1             |  0
 {docs => man}/osm2pgsql.md            |  0
 style.lua                             |  3 ++-
 12 files changed, 9 insertions(+), 19 deletions(-)
 delete mode 100644 docs/README.md
 rename {docs => man}/CMakeLists.txt (100%)
 rename {docs => man}/manpage.template (100%)
 rename {docs => man}/manpage_from_python.py (100%)
 rename {docs => man}/osm2pgsql-gen.1 (100%)
 rename {docs => man}/osm2pgsql-gen.md (100%)
 rename {docs => man}/osm2pgsql-replication.1 (100%)
 rename {docs => man}/osm2pgsql.1 (100%)
 rename {docs => man}/osm2pgsql.md (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34d2e7c77..1c1f38de3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -356,7 +356,7 @@ endif()
 # Man page
 #############################################################
 
-add_subdirectory(docs)
+add_subdirectory(man)
 
 #############################################################
 # Install
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 496591089..921faf2c8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -55,12 +55,12 @@ convention](https://www.doxygen.nl/manual/docblocks.html) using backslashes
 
 ## Documentation
 
-User documentation is available on [the website](https://osm2pgsql.org/), some
-is stored in `docs/`. Pages on the OpenStreetMap wiki are known to be
-unreliable and outdated.
+User documentation is available on [the website](https://osm2pgsql.org/). The
+source of the web page is in its own repository
+(https://github.com/openstreetmap/osm2pgsql-website).
 
-The man pages for [osm2pgsql](docs/osm2pgsql.1) and
-[osm2pgsql-replication](docs/osm2pgsql-replication.1) can be built from source
+The man pages for [osm2pgsql](man/osm2pgsql.1) and
+[osm2pgsql-replication](man/osm2pgsql-replication.1) can be built from source
 with `make man`.
 
 They need pandoc and argparse-manpage for the conversion. These tools can be
@@ -207,7 +207,7 @@ the report.
 
 * Decide on a new version. (See [semantic versioning](https://semver.org/).)
 * Update version in [CMakeLists.txt](CMakeLists.txt), look for `project` function.
-* Build man page (`make man`) and copy it to `docs/osm2pgsql.1`.
+* Build man page (`make man`) and copy it to `man/osm2pgsql.1`.
 * Tag release with release notes in commit message and upload the tag to Github.
 * Fill out release notes on Github.
 * Copy Windows binaries and source tarball to osm2pgsql.org.
diff --git a/docs/README.md b/docs/README.md
deleted file mode 100644
index 7a0049d12..000000000
--- a/docs/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-# osm2pgsql Documentation
-
-This directory contains the [source code for the man page](osm2pgsql.md) and
-the [compiled version](osm2pgsql.1) and the files necessary to create it.
-Call `make man` to re-build the man page.
-
-The documentation that used to be in this directory has been moved to
-the [osm2pgsql manual](https://osm2pgsql.org/doc/manual.html) or to the
-[examples](https://osm2pgsql.org/examples) on the website.
-
diff --git a/docs/CMakeLists.txt b/man/CMakeLists.txt
similarity index 100%
rename from docs/CMakeLists.txt
rename to man/CMakeLists.txt
diff --git a/docs/manpage.template b/man/manpage.template
similarity index 100%
rename from docs/manpage.template
rename to man/manpage.template
diff --git a/docs/manpage_from_python.py b/man/manpage_from_python.py
similarity index 100%
rename from docs/manpage_from_python.py
rename to man/manpage_from_python.py
diff --git a/docs/osm2pgsql-gen.1 b/man/osm2pgsql-gen.1
similarity index 100%
rename from docs/osm2pgsql-gen.1
rename to man/osm2pgsql-gen.1
diff --git a/docs/osm2pgsql-gen.md b/man/osm2pgsql-gen.md
similarity index 100%
rename from docs/osm2pgsql-gen.md
rename to man/osm2pgsql-gen.md
diff --git a/docs/osm2pgsql-replication.1 b/man/osm2pgsql-replication.1
similarity index 100%
rename from docs/osm2pgsql-replication.1
rename to man/osm2pgsql-replication.1
diff --git a/docs/osm2pgsql.1 b/man/osm2pgsql.1
similarity index 100%
rename from docs/osm2pgsql.1
rename to man/osm2pgsql.1
diff --git a/docs/osm2pgsql.md b/man/osm2pgsql.md
similarity index 100%
rename from docs/osm2pgsql.md
rename to man/osm2pgsql.md
diff --git a/style.lua b/style.lua
index 8b0b88d66..792c92bba 100644
--- a/style.lua
+++ b/style.lua
@@ -1,4 +1,5 @@
--- For documentation of Lua tag transformations, see docs/lua.md.
+-- For documentation of Lua tag transformations see
+-- https://osm2pgsql.org/doc/manual.html#the-pgsql-output
 
 -- Objects with any of the following keys will be treated as polygon
 polygon_keys = {

From 2d17341d0fbff12082b671bd75ee54741a0edf0a Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 5 Sep 2023 10:55:51 +0200
Subject: [PATCH 024/430] Github actions: Update checkout to v4 in workflow
 files

---
 .github/workflows/ci.yml           | 44 +++++++++++++++---------------
 .github/workflows/luacheck.yml     |  2 +-
 .github/workflows/test-install.yml |  2 +-
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d5ba9ee83..d0adf68fe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
       LUA_VERSION: 5.4
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install prerequisites
         run: |
@@ -61,7 +61,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
@@ -79,7 +79,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
@@ -98,7 +98,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
@@ -117,7 +117,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
@@ -135,7 +135,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
@@ -154,7 +154,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
@@ -173,7 +173,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
@@ -192,7 +192,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
@@ -211,7 +211,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
@@ -229,7 +229,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
@@ -245,7 +245,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
@@ -263,7 +263,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
@@ -282,7 +282,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
@@ -301,7 +301,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
@@ -320,7 +320,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
@@ -339,7 +339,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
@@ -356,7 +356,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
@@ -375,7 +375,7 @@ jobs:
       PSYCOPG: 3
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
@@ -394,7 +394,7 @@ jobs:
       PSYCOPG: 3
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
@@ -411,7 +411,7 @@ jobs:
       VCPKG_DEFAULT_BINARY_CACHE: C:/vcpkg_binary_cache
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/cache@v3
         with:
           path: |
@@ -456,7 +456,7 @@ jobs:
       OSMURL: https://download.geofabrik.de/europe/monaco-latest.osm.bz2
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/cache@v3
         with:
           path: |
diff --git a/.github/workflows/luacheck.yml b/.github/workflows/luacheck.yml
index 3162c9ae9..785b2b89a 100644
--- a/.github/workflows/luacheck.yml
+++ b/.github/workflows/luacheck.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install prerequisites
         run: |
diff --git a/.github/workflows/test-install.yml b/.github/workflows/test-install.yml
index 9c91f8ce2..afec50300 100644
--- a/.github/workflows/test-install.yml
+++ b/.github/workflows/test-install.yml
@@ -28,7 +28,7 @@ jobs:
       OSMFILE: monaco-latest.osm.pbf
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Show installed PostgreSQL packages
         run: apt-cache search postgresql | sort

From 616d0159a60cb28d5839d3085d781e71b57a44df Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 2 Sep 2023 22:00:53 +0200
Subject: [PATCH 025/430] Make sure we are always testing with an empty grid in
 --append tests

---
 tests/bdd/flex/relation-changes.feature | 27 ++++++++++++++--------
 tests/bdd/flex/way-add.feature          | 18 ++++++++++-----
 tests/bdd/flex/way-change.feature       | 15 ++++++++-----
 tests/bdd/flex/way-del.feature          | 24 +++++++++++++-------
 tests/bdd/flex/way-relation-add.feature | 30 ++++++++++++++++---------
 tests/bdd/flex/way-relation-del.feature | 15 ++++++++-----
 tests/bdd/steps/geometry_factory.py     |  4 ++++
 tests/bdd/steps/steps_osm_data.py       |  5 +++++
 8 files changed, 95 insertions(+), 43 deletions(-)

diff --git a/tests/bdd/flex/relation-changes.feature b/tests/bdd/flex/relation-changes.feature
index 90e887a28..3ab06983d 100644
--- a/tests/bdd/flex/relation-changes.feature
+++ b/tests/bdd/flex/relation-changes.feature
@@ -32,7 +32,8 @@ Feature: Handling changes to relations
             | --slim |
         Then table osm2pgsql_test_relations has 0 rows
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             r30 v2 dV Ttype=multipolygon Mw20@,w21@
             """
@@ -55,7 +56,8 @@ Feature: Handling changes to relations
             | --slim |
         Then table osm2pgsql_test_relations has 0 rows
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             w21 v2 dV Nn12,n13,n10
             """
@@ -77,7 +79,8 @@ Feature: Handling changes to relations
             | --slim |
         Then table osm2pgsql_test_relations has 0 rows
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             n12 v2 dV x10.1 y10.1
             """
@@ -100,7 +103,8 @@ Feature: Handling changes to relations
             | --slim |
         Then table osm2pgsql_test_relations has 0 rows
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             r30 v2 dV Ttype=multipolygon Mw20@,w21@
             """
@@ -123,7 +127,8 @@ Feature: Handling changes to relations
             | --slim |
         Then table osm2pgsql_test_relations has 1 row
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             r30 v2 dV Mw20@,w21@
             """
@@ -146,7 +151,8 @@ Feature: Handling changes to relations
             | --slim |
         Then table osm2pgsql_test_relations has 1 row
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             w21 v2 dV <new nodelist>
             """
@@ -174,7 +180,8 @@ Feature: Handling changes to relations
             | --slim |
         Then table osm2pgsql_test_relations has 1 row
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             n12 v2 dV <new coordinates>
             """
@@ -202,7 +209,8 @@ Feature: Handling changes to relations
             | --slim |
         Then table osm2pgsql_test_relations has 1 row
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             r30 v2 dV Ttype=multipolygon <new memberlist>
             """
@@ -232,7 +240,8 @@ Feature: Handling changes to relations
             | area_id | tags->'natural' | tags->'landuse' |
             | -30     | wood            | NULL            |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             r30 v2 dV Ttype=multipolygon,landuse=forest Mw20@,w21@
             """
diff --git a/tests/bdd/flex/way-add.feature b/tests/bdd/flex/way-add.feature
index 4b7ca86a1..bad8041ef 100644
--- a/tests/bdd/flex/way-add.feature
+++ b/tests/bdd/flex/way-add.feature
@@ -31,7 +31,8 @@ Feature: Adding ways to a flex database
 
 
     Scenario: way is not relevant
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             w10 v1 dV Tt=ag Nn10,n11
             r30 v2 dV Tt=ag Mw10@,w11@,w12@mark,w13@,w14@mark
@@ -52,7 +53,8 @@ Feature: Adding ways to a flex database
 
 
     Scenario: add to t1
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             w10 v1 dV Tt1=yes Nn10,n11
             r30 v2 dV Tt=ag Mw10@,w11@,w12@mark,w13@,w14@mark
@@ -74,7 +76,8 @@ Feature: Adding ways to a flex database
 
 
     Scenario: add to t2
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             w10 v1 dV Tt2=yes Nn10,n11
             r30 v2 dV Tt=ag Mw10@mark,w11@,w12@mark,w13@,w14@mark
@@ -96,7 +99,8 @@ Feature: Adding ways to a flex database
 
 
     Scenario: add to t1 and t2
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             w10 v1 dV Tt1=yes,t2=yes Nn10,n11
             r30 v2 dV Tt=ag Mw10@mark,w11@,w12@mark,w13@,w14@mark
@@ -119,7 +123,8 @@ Feature: Adding ways to a flex database
 
 
     Scenario: add to tboth (only stage1)
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             w10 v1 dV Ttboth=yes Nn10,n11
             r30 v2 dV Tt=ag Mw10@,w11@,w12@mark,w13@,w14@mark
@@ -141,7 +146,8 @@ Feature: Adding ways to a flex database
 
 
     Scenario: add to tboth (stage1 and stage2)
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             w10 v1 dV Ttboth=yes Nn10,n11
             r30 v2 dV Tt=ag Mw10@mark,w11@,w12@mark,w13@,w14@mark
diff --git a/tests/bdd/flex/way-change.feature b/tests/bdd/flex/way-change.feature
index 8c9855d3c..00499b268 100644
--- a/tests/bdd/flex/way-change.feature
+++ b/tests/bdd/flex/way-change.feature
@@ -31,7 +31,8 @@ Feature: Changing ways in a flex database
             | 13     |
             | 14     |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             <input>
             """
@@ -83,7 +84,8 @@ Feature: Changing ways in a flex database
             | 13     |
             | 14     |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             <input>
             """
@@ -136,7 +138,8 @@ Feature: Changing ways in a flex database
             | 13     |
             | 14     |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             <input>
             """
@@ -193,7 +196,8 @@ Feature: Changing ways in a flex database
             | 13     | NULL    |
             | 14     | {30}    |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             <input>
             """
@@ -239,7 +243,8 @@ Feature: Changing ways in a flex database
             | 13     | NULL    |
             | 14     | {30}    |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             w10 v2 dV Tt1=yes,t2=yes,tboth=yes Nn10,n11
             """
diff --git a/tests/bdd/flex/way-del.feature b/tests/bdd/flex/way-del.feature
index bc0d25d17..0e650e885 100644
--- a/tests/bdd/flex/way-del.feature
+++ b/tests/bdd/flex/way-del.feature
@@ -31,7 +31,8 @@ Feature: Deleting ways in a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             w10 v2 dD
             """
@@ -73,7 +74,8 @@ Feature: Deleting ways in a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             w10 v2 dD
             """
@@ -115,7 +117,8 @@ Feature: Deleting ways in a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             w10 v2 dD
             """
@@ -156,7 +159,8 @@ Feature: Deleting ways in a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             w10 v2 dD
             """
@@ -198,7 +202,8 @@ Feature: Deleting ways in a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             w10 v2 dD
             """
@@ -240,7 +245,8 @@ Feature: Deleting ways in a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             w10 v2 dD
             """
@@ -283,7 +289,8 @@ Feature: Deleting ways in a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             w10 v2 dD
             """
@@ -325,7 +332,8 @@ Feature: Deleting ways in a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             w10 v2 dD
             """
diff --git a/tests/bdd/flex/way-relation-add.feature b/tests/bdd/flex/way-relation-add.feature
index 3ec232b37..984f7862b 100644
--- a/tests/bdd/flex/way-relation-add.feature
+++ b/tests/bdd/flex/way-relation-add.feature
@@ -34,7 +34,8 @@ Feature: Adding relations to a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             r32 v2 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@,w15@
             """
@@ -85,7 +86,8 @@ Feature: Adding relations to a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             r32 v2 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@,w15@
             """
@@ -131,7 +133,8 @@ Feature: Adding relations to a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             r32 v2 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@,w15@
             """
@@ -177,7 +180,8 @@ Feature: Adding relations to a 2-stage flex database
             | 13     | NULL    |
             | 14     | {30}    |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             r32 v2 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@,w15@
             """
@@ -227,7 +231,8 @@ Feature: Adding relations to a 2-stage flex database
             | 13     | NULL    |
             | 14     | {30}    |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             r32 v2 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@,w15@
             """
@@ -272,7 +277,8 @@ Feature: Adding relations to a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             r32 v2 dV Tt=ag Mw10@,w11@,w12@,w13@,w14@,w15@
             """
@@ -322,7 +328,8 @@ Feature: Adding relations to a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             r32 v2 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@,w15@
             """
@@ -368,7 +375,8 @@ Feature: Adding relations to a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             r32 v2 dV Tt=ag Mw10@,w11@,w12@,w13@,w14@,w15@
             """
@@ -414,7 +422,8 @@ Feature: Adding relations to a 2-stage flex database
             | 13     | NULL    |
             | 14     | {30}    |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             r32 v2 dV Tt=ag Mw10@,w11@,w12@,w13@,w14@,w15@
             """
@@ -459,7 +468,8 @@ Feature: Adding relations to a 2-stage flex database
             | 13     | NULL    |
             | 14     | {30}    |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             r32 v2 dV Tt=ag Mw10@,w11@,w12@,w13@,w14@,w15@
             """
diff --git a/tests/bdd/flex/way-relation-del.feature b/tests/bdd/flex/way-relation-del.feature
index eb15b807d..1efc34ef0 100644
--- a/tests/bdd/flex/way-relation-del.feature
+++ b/tests/bdd/flex/way-relation-del.feature
@@ -33,7 +33,8 @@ Feature: Deleting relations in a stage-2 flex database
             | 13     |
             | 14     |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             r32 v2 dD
             """
@@ -77,7 +78,8 @@ Feature: Deleting relations in a stage-2 flex database
             | 13     |
             | 14     |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             r32 v2 dD
             """
@@ -123,7 +125,8 @@ Feature: Deleting relations in a stage-2 flex database
             | 13     |
             | 14     |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             <input>
             """
@@ -173,7 +176,8 @@ Feature: Deleting relations in a stage-2 flex database
             | 13     |
             | 14     |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             <input>
             """
@@ -224,7 +228,8 @@ Feature: Deleting relations in a stage-2 flex database
             | 13     |
             | 14     |
 
-        Given the OSM data
+        Given an empty grid
+        And the OSM data
             """
             <input>
             """
diff --git a/tests/bdd/steps/geometry_factory.py b/tests/bdd/steps/geometry_factory.py
index 54d24ac3c..be1c82bfa 100644
--- a/tests/bdd/steps/geometry_factory.py
+++ b/tests/bdd/steps/geometry_factory.py
@@ -64,6 +64,10 @@ def mk_wkt_points(self, geom):
         return ','.join([self.mk_wkt_point(x) for x in geom.split(',')])
 
 
+    def remove_grid(self):
+        self.grid = {}
+
+
     def set_grid(self, lines, grid_step, origin_x, origin_y):
         """ Replace the grid with one from the given lines.
         """
diff --git a/tests/bdd/steps/steps_osm_data.py b/tests/bdd/steps/steps_osm_data.py
index 26eff1a27..38f1fefb6 100644
--- a/tests/bdd/steps/steps_osm_data.py
+++ b/tests/bdd/steps/steps_osm_data.py
@@ -16,6 +16,11 @@ def osm_set_import_file(context, osm_file):
     context.import_file = context.test_data_dir / osm_file
 
 
+@given("an empty grid")
+def osm_define_node_grid(context):
+    context.geometry_factory.remove_grid()
+
+
 @given("the (?P<step>[0-9.]+ )?grid(?: with origin (?P<origin_x>[0-9.-]+) (?P<origin_y>[0-9.-]+))?")
 def osm_define_node_grid(context, step, origin_x, origin_y):
     step = float(step.strip()) if step else 0.1

From 1199f90a0454eb4775f2eb51616c24135e136fea Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 2 Sep 2023 22:01:22 +0200
Subject: [PATCH 026/430] Test that no maxzoom setting works on you'll get
 expire on zoom 0

---
 tests/bdd/flex/expire.feature     | 108 ++++++++++++++++++++++++++++++
 tests/bdd/flex/lua-expire.feature |  23 +++++++
 tests/data/test_expire.lua        |  20 ++++++
 3 files changed, 151 insertions(+)
 create mode 100644 tests/bdd/flex/expire.feature
 create mode 100644 tests/data/test_expire.lua

diff --git a/tests/bdd/flex/expire.feature b/tests/bdd/flex/expire.feature
new file mode 100644
index 000000000..2230cf7a4
--- /dev/null
+++ b/tests/bdd/flex/expire.feature
@@ -0,0 +1,108 @@
+Feature: Changes on way with expire on zoom 0
+
+    Background:
+        Given the style file 'test_expire.lua'
+
+        And the 0.1 grid
+            | 11 | 13 |
+            | 10 | 12 |
+
+        And the OSM data
+            """
+            w11 v1 dV Tt1=yes Nn12,n13
+            """
+        When running osm2pgsql flex with parameters
+            | --slim |
+
+        Then table osm2pgsql_test_t1 contains exactly
+            | way_id |
+            | 11     |
+        Then table osm2pgsql_test_expire contains exactly
+            | zoom | x | y |
+
+
+    Scenario: way is not relevant
+        Given the OSM data
+            """
+            w10 v1 dV Ta=b Nn10,n11
+            """
+        And an empty grid
+
+        When running osm2pgsql flex with parameters
+            | --slim | -a |
+
+        Then table osm2pgsql_test_t1 contains exactly
+            | way_id |
+            | 11     |
+        Then table osm2pgsql_test_expire contains exactly
+            | zoom | x | y |
+
+
+    Scenario: node is not relevant
+        Given the OSM data
+            """
+            n1 v2 dV x1 y2
+            """
+        And an empty grid
+
+        When running osm2pgsql flex with parameters
+            | --slim | -a |
+
+        Then table osm2pgsql_test_t1 contains exactly
+            | way_id |
+            | 11     |
+        Then table osm2pgsql_test_expire contains exactly
+            | zoom | x | y |
+
+
+    Scenario: add to t1
+        Given the OSM data
+            """
+            w10 v1 dV Tt1=yes Nn10,n11
+            """
+        And an empty grid
+
+        When running osm2pgsql flex with parameters
+            | --slim | -a |
+
+        Then table osm2pgsql_test_t1 contains exactly
+            | way_id |
+            | 10     |
+            | 11     |
+        Then table osm2pgsql_test_expire contains exactly
+            | zoom | x | y |
+            | 0    | 0 | 0 |
+
+
+    Scenario: change in t1
+        Given the OSM data
+            """
+            w11 v2 dV Ta=b Nn10,n11
+            """
+        And an empty grid
+
+        When running osm2pgsql flex with parameters
+            | --slim | -a |
+
+        Then table osm2pgsql_test_t1 contains exactly
+            | way_id |
+        Then table osm2pgsql_test_expire contains exactly
+            | zoom | x | y |
+            | 0    | 0 | 0 |
+
+
+    Scenario: remove from t1
+        Given the OSM data
+            """
+            w11 v2 dD
+            """
+        And an empty grid
+
+        When running osm2pgsql flex with parameters
+            | --slim | -a |
+
+        Then table osm2pgsql_test_t1 contains exactly
+            | way_id |
+        Then table osm2pgsql_test_expire contains exactly
+            | zoom | x | y |
+            | 0    | 0 | 0 |
diff --git a/tests/bdd/flex/lua-expire.feature b/tests/bdd/flex/lua-expire.feature
index 6998c8684..d24fc0bfd 100644
--- a/tests/bdd/flex/lua-expire.feature
+++ b/tests/bdd/flex/lua-expire.feature
@@ -238,3 +238,26 @@ Feature: Expire configuration in Lua file
         Then table nodes has 1562 rows
         And table tiles has 0 rows
 
+    Scenario: Expire into table without maxzoom means maxzoom 0
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            local eo = osm2pgsql.define_expire_output({
+                table = 'tiles',
+            })
+            local t = osm2pgsql.define_node_table('nodes', {
+                { column = 'geom',
+                  type = 'point',
+                  expire = {
+                    { output = eo }
+                }}
+            })
+
+            function osm2pgsql.process_node(object)
+                t:insert({ geom = object:as_point() })
+            end
+            """
+        When running osm2pgsql flex
+        Then table nodes has 1562 rows
+        And table tiles has 0 rows
+
diff --git a/tests/data/test_expire.lua b/tests/data/test_expire.lua
new file mode 100644
index 000000000..bd949e743
--- /dev/null
+++ b/tests/data/test_expire.lua
@@ -0,0 +1,20 @@
+
+-- No maxzoom sets it to 0
+local eo = osm2pgsql.define_expire_output({
+    table = 'osm2pgsql_test_expire',
+})
+
+local the_table = osm2pgsql.define_way_table('osm2pgsql_test_t1', {
+    { column = 'tags', type = 'hstore' },
+    { column = 'geom', type = 'linestring', expire = {{ output = eo }} },
+})
+
+function osm2pgsql.process_way(object)
+    if object.tags.t1 then
+        the_table:insert{
+            tags = object.tags,
+            geom = object:as_linestring()
+        }
+    end
+end
+

From 92625b5c0007c6f3e40d60c7e4a193d1f8487c33 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 6 Sep 2023 11:47:09 +0200
Subject: [PATCH 027/430] Generalization: Wrap upload of data in transaction

So we don't use so many transaction ids.
---
 src/gen/gen-tile-builtup.cpp | 2 ++
 src/gen/gen-tile-raster.cpp  | 2 ++
 src/gen/gen-tile-vector.cpp  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/src/gen/gen-tile-builtup.cpp b/src/gen/gen-tile-builtup.cpp
index 6992b030c..6cae4f2b4 100644
--- a/src/gen/gen-tile-builtup.cpp
+++ b/src/gen/gen-tile-builtup.cpp
@@ -181,6 +181,7 @@ static void draw_from_db(double margin, canvas_list_t *canvas_list,
 
 void gen_tile_builtup_t::process(tile_t const &tile)
 {
+    connection().exec("BEGIN");
     delete_existing(tile);
 
     canvas_list_t canvas_list;
@@ -262,6 +263,7 @@ void gen_tile_builtup_t::process(tile_t const &tile)
             connection().exec_prepared("insert_geoms", wkb, tile.x(), tile.y());
         }
     }
+    connection().exec("COMMIT");
     timer(m_timer_write).stop();
     log_gen("Inserted {} generalized polygons", geometries.size());
 }
diff --git a/src/gen/gen-tile-raster.cpp b/src/gen/gen-tile-raster.cpp
index 6ac7ba0db..9ac0873ab 100644
--- a/src/gen/gen-tile-raster.cpp
+++ b/src/gen/gen-tile-raster.cpp
@@ -174,6 +174,7 @@ static void draw_from_db(double margin, unsigned int image_extent,
 
 void gen_tile_raster_union_t::process(tile_t const &tile)
 {
+    connection().exec("BEGIN");
     delete_existing(tile);
 
     canvas_list_t canvas_list;
@@ -244,6 +245,7 @@ void gen_tile_raster_union_t::process(tile_t const &tile)
         timer(m_timer_write).stop();
         log_gen("Inserted {} generalized polygons", geometries.size());
     }
+    connection().exec("COMMIT");
 }
 
 void gen_tile_raster_union_t::post()
diff --git a/src/gen/gen-tile-vector.cpp b/src/gen/gen-tile-vector.cpp
index 89cefccff..cdc270a6b 100644
--- a/src/gen/gen-tile-vector.cpp
+++ b/src/gen/gen-tile-vector.cpp
@@ -83,12 +83,14 @@ PREPARE gen_geoms (int, int, int) AS
 
 void gen_tile_vector_union_t::process(tile_t const &tile)
 {
+    connection().exec("BEGIN");
     delete_existing(tile);
 
     log_gen("Generalize...");
     timer(m_timer_simplify).start();
     auto const result = connection().exec_prepared("gen_geoms", tile.zoom(),
                                                    tile.x(), tile.y());
+    connection().exec("COMMIT");
     timer(m_timer_simplify).stop();
     log_gen("Inserted {} generalized polygons", result.affected_rows());
 }

From ff6d92efb13c2ce7b6ae655017206313ab0fad61 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 9 Sep 2023 15:33:23 +0200
Subject: [PATCH 028/430] Generalizer: Log tile being processed also in
 multithreaded mode

Not only in singlethreaded more.
---
 src/gen/osm2pgsql-gen.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index e892dd16c..eb60a4c06 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -262,7 +262,10 @@ void run_tile_gen(std::string const &conninfo, gen_base_t *master_generalizer,
             queue->pop_back();
         }
 
-        generalizer->process({zoom, p.first, p.second});
+        tile_t tile{zoom, p.first, p.second};
+        log_debug("Processing tile {}/{}/{}...", tile.zoom(), tile.x(),
+                  tile.y());
+        generalizer->process(tile);
     }
     log_debug("Shutting down generalizer thread.");
 }

From 723b64d4257d9a8463d4b59bee5b5e7edc2e1492 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 9 Sep 2023 15:46:45 +0200
Subject: [PATCH 029/430] Generalizer: Simplify tracer code, use local instead
 of member vars

---
 src/gen/tracer.cpp | 14 ++++++++------
 src/gen/tracer.hpp |  2 --
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gen/tracer.cpp b/src/gen/tracer.cpp
index 62cd37905..e0bcddcad 100644
--- a/src/gen/tracer.cpp
+++ b/src/gen/tracer.cpp
@@ -26,18 +26,22 @@ tracer_t::trace(canvas_t const &canvas, tile_t const &tile, double min_area)
 {
     prepare(canvas);
 
-    m_state.reset(potrace_trace(m_param.get(), &m_bitmap));
-    if (!m_state || m_state->status != POTRACE_STATUS_OK) {
+    potrace_bitmap_t bitmap{int(canvas.size()), int(canvas.size()),
+                            int(canvas.size() / bits_per_word), m_bits.data()};
+
+    std::unique_ptr<potrace_state_t, potrace_state_deleter> state{
+        potrace_trace(m_param.get(), &bitmap)};
+
+    if (!state || state->status != POTRACE_STATUS_OK) {
         throw std::runtime_error{"potrace failed"};
     }
 
-    return build_geometries(tile, m_state->plist, min_area);
+    return build_geometries(tile, state->plist, min_area);
 }
 
 void tracer_t::reset()
 {
     m_bits.clear();
-    m_state.reset();
     m_num_points = 0;
 }
 
@@ -70,8 +74,6 @@ void tracer_t::prepare(canvas_t const &canvas) noexcept
 
         m_bits.push_back(w);
     }
-
-    m_bitmap = {int(size), int(size), int(size / bits_per_word), m_bits.data()};
 }
 
 std::vector<geom::geometry_t>
diff --git a/src/gen/tracer.hpp b/src/gen/tracer.hpp
index 6026070e6..47fc587f6 100644
--- a/src/gen/tracer.hpp
+++ b/src/gen/tracer.hpp
@@ -64,9 +64,7 @@ class tracer_t
                                                    double min_area) noexcept;
 
     std::vector<potrace_word> m_bits;
-    potrace_bitmap_t m_bitmap{};
     std::unique_ptr<potrace_param_t, potrace_param_deleter> m_param;
-    std::unique_ptr<potrace_state_t, potrace_state_deleter> m_state;
     std::size_t m_extent;
     std::size_t m_buffer;
     std::size_t m_num_points = 0;

From b15de24fe32b6944a300579cfe63d2be4e368a27 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 10 Sep 2023 09:32:18 +0200
Subject: [PATCH 030/430] Generalizer bugfix: Set delete_existing earlier

In append mode we need to delete existing tiles. We need to set this
parameter earlier, so the generalizer is initialized correctly.
---
 src/gen/osm2pgsql-gen.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index e892dd16c..817564afd 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -317,6 +317,10 @@ class genproc_t
             params.set("schema", m_dbschema);
         }
 
+        if (m_append) {
+            params.set("delete_existing", true);
+        }
+
         write_to_debug_log(params, "Params (config):");
 
         log_debug("Connecting to database...");
@@ -329,10 +333,6 @@ class genproc_t
         log_info("Running generalizer '{}' ({})...", generalizer->name(),
                  generalizer->strategy());
 
-        if (m_append) {
-            params.set("delete_existing", true);
-        }
-
         write_to_debug_log(params, "Params (after initialization):");
 
         util::timer_t timer_gen;

From b5fedee6cae4612697b54ca914021d72c3d07e81 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 8 Sep 2023 20:35:53 +0200
Subject: [PATCH 031/430] Check values found in expire tables (must be number
 in valid range)

---
 src/gen/osm2pgsql-gen.cpp | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index a751fd126..6a3db8867 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -201,16 +201,28 @@ static tile_extent get_extent_from_db(pg_conn_t const &db_connection,
 }
 
 static std::vector<std::pair<uint32_t, uint32_t>>
-get_tiles_from_table(pg_conn_t const &connection, std::string const &table)
+get_tiles_from_table(pg_conn_t const &connection, std::string const &table,
+                     uint32_t zoom)
 {
-    std::vector<std::pair<uint32_t, uint32_t>> tiles;
+    auto const result = connection.exec(
+        R"(SELECT x, y FROM "{}" WHERE zoom = {})", table, zoom);
 
-    auto const result = connection.exec(R"(SELECT x, y FROM "{}")", table);
+    std::vector<std::pair<uint32_t, uint32_t>> tiles;
+    tiles.reserve(result.num_tuples());
 
+    uint32_t const max = 1UL << zoom;
     for (int n = 0; n < result.num_tuples(); ++n) {
         char *end = nullptr;
         auto const x = std::strtoul(result.get_value(n, 0), &end, 10);
+        if (*end != '\0' || x >= max) {
+            log_error("Ignoring invalid x value in expire table '{}'", table);
+            continue;
+        }
         auto const y = std::strtoul(result.get_value(n, 1), &end, 10);
+        if (*end != '\0' || y >= max) {
+            log_error("Ignoring invalid y value in expire table '{}'", table);
+            continue;
+        }
         tiles.emplace_back(x, y);
     }
 
@@ -497,7 +509,7 @@ class genproc_t
             auto const table = params.get_string("expire_list");
             log_debug("Running generalizer for expire list from table '{}'...",
                       table);
-            tile_list = get_tiles_from_table(db_connection, table);
+            tile_list = get_tiles_from_table(db_connection, table, zoom);
             log_debug("Truncating table '{}'...", table);
             db_connection.exec("TRUNCATE {}", table);
         } else {

From fb0d5d57858b4560ee8fb53a9216a867de5107de Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 18 Sep 2023 10:56:16 +0200
Subject: [PATCH 032/430] Add first/last timestamps to expire tables

This adds two timestamp (with timezone) columns to all expire tables
called "first" and "last". When an entry is added, both are set to the
current (transaction) timestamp. When an entry already exists a new
insert will result in the "last" timestamp being updated.

Having these two timestamps allows various expire/updating strategies,
for instance:
* update oldest entry
* update entry that didn't change for the longest time
* update older entries but only if there are no recent changes, which
  indicates that there might be more changes coming

For backwards compatibility the code detects which table format is used
and falls back to the old behaviour if the timestamp columns aren't
there.
---
 src/expire-output.cpp | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/expire-output.cpp b/src/expire-output.cpp
index ef26f5135..6a03aac87 100644
--- a/src/expire-output.cpp
+++ b/src/expire-output.cpp
@@ -59,10 +59,22 @@ expire_output_t::output_tiles_to_table(quadkey_list_t const &tiles_at_maxzoom,
 
     pg_conn_t connection{conninfo};
 
-    connection.exec("PREPARE insert_tiles(int4, int4, int4) AS"
-                    " INSERT INTO {} (zoom, x, y) VALUES ($1, $2, $3)"
-                    " ON CONFLICT DO NOTHING",
-                    qn);
+    auto const result = connection.exec("SELECT * FROM {} LIMIT 1", qn);
+
+    if (result.num_fields() == 3) {
+        // old format with fields: zoom, x, y
+        connection.exec("PREPARE insert_tiles(int4, int4, int4) AS"
+                        " INSERT INTO {} (zoom, x, y) VALUES ($1, $2, $3)"
+                        " ON CONFLICT DO NOTHING",
+                        qn);
+    } else {
+        // new format with fields: zoom, x, y, first, last
+        connection.exec("PREPARE insert_tiles(int4, int4, int4) AS"
+                        " INSERT INTO {} (zoom, x, y) VALUES ($1, $2, $3)"
+                        " ON CONFLICT (zoom, x, y)"
+                        " DO UPDATE SET last = CURRENT_TIMESTAMP(0)",
+                        qn);
+    }
 
     auto const count = for_each_tile(
         tiles_at_maxzoom, m_minzoom, m_maxzoom, [&](tile_t const &tile) {
@@ -76,10 +88,13 @@ expire_output_t::output_tiles_to_table(quadkey_list_t const &tiles_at_maxzoom,
 void expire_output_t::create_output_table(pg_conn_t const &connection) const
 {
     auto const qn = qualified_name(m_schema, m_table);
-    connection.exec("CREATE TABLE IF NOT EXISTS {} ("
-                    " zoom int4 NOT NULL,"
-                    " x int4 NOT NULL,"
-                    " y int4 NOT NULL,"
-                    " PRIMARY KEY (zoom, x, y))",
-                    qn);
+    connection.exec(
+        "CREATE TABLE IF NOT EXISTS {} ("
+        " zoom int4 NOT NULL,"
+        " x int4 NOT NULL,"
+        " y int4 NOT NULL,"
+        " first timestamp with time zone DEFAULT CURRENT_TIMESTAMP(0),"
+        " last timestamp with time zone DEFAULT CURRENT_TIMESTAMP(0),"
+        " PRIMARY KEY (zoom, x, y))",
+        qn);
 }

From 33bd0a464bd830bc429baf1e72fce6665dffd07d Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 19 Sep 2023 10:24:34 +0200
Subject: [PATCH 033/430] Github actions: Test with newer PostgreSQL versions
 (up to 16)

---
 .github/workflows/ci.yml | 48 ++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d0adf68fe..6a3a51426 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -121,7 +121,7 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  ubuntu20-pg12-gcc10-jit:
+  ubuntu20-pg13-gcc10-jit:
     runs-on: ubuntu-20.04
 
     env:
@@ -129,7 +129,7 @@ jobs:
       CXX: g++-10
       LUA_VERSION: 5.3
       LUAJIT_OPTION: ON
-      POSTGRESQL_VERSION: 12
+      POSTGRESQL_VERSION: 13
       POSTGIS_VERSION: 2.5
       BUILD_TYPE: Debug
       PSYCOPG: 2
@@ -140,7 +140,7 @@ jobs:
       - uses: ./.github/actions/build-and-test
 
 
-  ubuntu20-pg13-clang10-jit:
+  ubuntu20-pg15-clang10-jit:
     runs-on: ubuntu-20.04
 
     env:
@@ -148,7 +148,7 @@ jobs:
       CXX: clang++-10
       LUA_VERSION: 5.3
       LUAJIT_OPTION: ON
-      POSTGRESQL_VERSION: 13
+      POSTGRESQL_VERSION: 15
       POSTGIS_VERSION: 3
       BUILD_TYPE: Debug
       PSYCOPG: 2
@@ -158,7 +158,7 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  ubuntu20-pg13-clang10-proj6:
+  ubuntu20-pg15-clang10-proj6:
     runs-on: ubuntu-20.04
 
     env:
@@ -166,7 +166,7 @@ jobs:
       CXX: clang++-10
       LUA_VERSION: 5.3
       LUAJIT_OPTION: OFF
-      POSTGRESQL_VERSION: 13
+      POSTGRESQL_VERSION: 15
       POSTGIS_VERSION: 3
       USE_PROJ_LIB: 6
       BUILD_TYPE: Debug
@@ -177,7 +177,7 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  ubuntu20-pg13-clang10-noproj:
+  ubuntu20-pg15-clang10-noproj:
     runs-on: ubuntu-20.04
 
     env:
@@ -185,7 +185,7 @@ jobs:
       CXX: clang++-10
       LUA_VERSION: 5.3
       LUAJIT_OPTION: OFF
-      POSTGRESQL_VERSION: 13
+      POSTGRESQL_VERSION: 15
       POSTGIS_VERSION: 3
       USE_PROJ_LIB: off
       BUILD_TYPE: Debug
@@ -196,7 +196,7 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  ubuntu20-pg15-clang10:
+  ubuntu20-pg16-clang10:
     runs-on: ubuntu-20.04
 
     env:
@@ -204,7 +204,7 @@ jobs:
       CXX: clang++-10
       LUA_VERSION: 5.3
       LUAJIT_OPTION: OFF
-      POSTGRESQL_VERSION: 15
+      POSTGRESQL_VERSION: 16
       POSTGIS_VERSION: 3
       USE_PROJ_LIB: 6
       BUILD_TYPE: Debug
@@ -249,7 +249,7 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  ubuntu22-pg15-clang14-jit:
+  ubuntu22-pg16-clang14-jit:
     runs-on: ubuntu-22.04
 
     env:
@@ -257,7 +257,7 @@ jobs:
       CXX: clang++-14
       LUA_VERSION: 5.4
       LUAJIT_OPTION: ON
-      POSTGRESQL_VERSION: 15
+      POSTGRESQL_VERSION: 16
       POSTGIS_VERSION: 3
       BUILD_TYPE: Debug
       PSYCOPG: 2
@@ -267,7 +267,7 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  ubuntu22-pg15-clang14-proj6:
+  ubuntu22-pg16-clang14-proj6:
     runs-on: ubuntu-22.04
 
     env:
@@ -275,7 +275,7 @@ jobs:
       CXX: clang++-14
       LUA_VERSION: 5.4
       LUAJIT_OPTION: OFF
-      POSTGRESQL_VERSION: 15
+      POSTGRESQL_VERSION: 16
       POSTGIS_VERSION: 3
       USE_PROJ_LIB: 6
       BUILD_TYPE: Debug
@@ -286,7 +286,7 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  ubuntu22-pg15-clang14-noproj:
+  ubuntu22-pg16-clang14-noproj:
     runs-on: ubuntu-22.04
 
     env:
@@ -294,7 +294,7 @@ jobs:
       CXX: clang++-14
       LUA_VERSION: 5.3
       LUAJIT_OPTION: OFF
-      POSTGRESQL_VERSION: 15
+      POSTGRESQL_VERSION: 16
       POSTGIS_VERSION: 3
       USE_PROJ_LIB: off
       BUILD_TYPE: Debug
@@ -324,7 +324,7 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  ubuntu22-pg15-gcc12-release:
+  ubuntu22-pg16-gcc12-release:
     runs-on: ubuntu-22.04
 
     env:
@@ -333,7 +333,7 @@ jobs:
       EXTRA_FLAGS: -Wno-stringop-overread
       LUA_VERSION: 5.4
       LUAJIT_OPTION: ON
-      POSTGRESQL_VERSION: 15
+      POSTGRESQL_VERSION: 16
       POSTGIS_VERSION: 3
       BUILD_TYPE: Release
       PSYCOPG: 2
@@ -343,14 +343,14 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  ubuntu22-pg15-gcc12-release-nolua:
+  ubuntu22-pg16-gcc12-release-nolua:
     runs-on: ubuntu-22.04
 
     env:
       CC: gcc-12
       CXX: g++-12
       EXTRA_FLAGS: -Wno-stringop-overread
-      POSTGRESQL_VERSION: 15
+      POSTGRESQL_VERSION: 16
       POSTGIS_VERSION: 3
       BUILD_TYPE: Release
       PSYCOPG: 2
@@ -360,7 +360,7 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  ubuntu22-pg15-clang14-cpp20:
+  ubuntu22-pg16-clang14-cpp20:
     runs-on: ubuntu-22.04
 
     env:
@@ -368,7 +368,7 @@ jobs:
       CXX: clang++-14
       LUA_VERSION: 5.3
       LUAJIT_OPTION: OFF
-      POSTGRESQL_VERSION: 15
+      POSTGRESQL_VERSION: 16
       POSTGIS_VERSION: 3
       CPP_VERSION: 20
       BUILD_TYPE: Debug
@@ -379,7 +379,7 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  ubuntu22-pg15-gcc12-cpp20:
+  ubuntu22-pg16-gcc12-cpp20:
     runs-on: ubuntu-22.04
 
     env:
@@ -387,7 +387,7 @@ jobs:
       CXX: g++-12
       LUA_VERSION: 5.3
       LUAJIT_OPTION: OFF
-      POSTGRESQL_VERSION: 15
+      POSTGRESQL_VERSION: 16
       POSTGIS_VERSION: 3
       CPP_VERSION: 20
       BUILD_TYPE: Debug

From 203889c31c44400aabe5abf7b735e7dc273b51ba Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 22 Sep 2023 09:43:24 +0200
Subject: [PATCH 034/430] Avoid copy of vector in get_tiles_from_table()
 function

Use out parameter with ptr instead.
---
 src/gen/osm2pgsql-gen.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index 6a3db8867..e8351c5af 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -200,15 +200,15 @@ static tile_extent get_extent_from_db(pg_conn_t const &db_connection,
     return get_extent_from_db(db_connection, schema, table, geom_column, zoom);
 }
 
-static std::vector<std::pair<uint32_t, uint32_t>>
+static void
 get_tiles_from_table(pg_conn_t const &connection, std::string const &table,
-                     uint32_t zoom)
+                     uint32_t zoom,
+                     std::vector<std::pair<uint32_t, uint32_t>> *tiles)
 {
     auto const result = connection.exec(
         R"(SELECT x, y FROM "{}" WHERE zoom = {})", table, zoom);
 
-    std::vector<std::pair<uint32_t, uint32_t>> tiles;
-    tiles.reserve(result.num_tuples());
+    tiles->reserve(result.num_tuples());
 
     uint32_t const max = 1UL << zoom;
     for (int n = 0; n < result.num_tuples(); ++n) {
@@ -223,10 +223,8 @@ get_tiles_from_table(pg_conn_t const &connection, std::string const &table,
             log_error("Ignoring invalid y value in expire table '{}'", table);
             continue;
         }
-        tiles.emplace_back(x, y);
+        tiles->emplace_back(x, y);
     }
-
-    return tiles;
 }
 
 class tile_processor_t
@@ -509,7 +507,7 @@ class genproc_t
             auto const table = params.get_string("expire_list");
             log_debug("Running generalizer for expire list from table '{}'...",
                       table);
-            tile_list = get_tiles_from_table(db_connection, table, zoom);
+            get_tiles_from_table(db_connection, table, zoom, &tile_list);
             log_debug("Truncating table '{}'...", table);
             db_connection.exec("TRUNCATE {}", table);
         } else {

From 845995c8430b2f14dd3f6dae77e69a36bddf526a Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 4 Sep 2023 11:34:05 +0200
Subject: [PATCH 035/430] Generalization: Switch from using CImg to OpenCV
 library.

Processing is an order of magnitude faster.
---
 .../actions/ubuntu-prerequisites/action.yml   |  4 +-
 .github/actions/win-install/action.yml        |  2 +-
 .github/workflows/ci.yml                      |  2 +-
 .github/workflows/test-install.yml            |  4 +-
 CMakeLists.txt                                | 11 ++-
 README.md                                     |  9 +--
 src/gen/canvas.cpp                            | 72 ++++++++++++-------
 src/gen/canvas.hpp                            | 43 +++++------
 src/gen/osm2pgsql-gen.cpp                     |  1 -
 9 files changed, 83 insertions(+), 65 deletions(-)

diff --git a/.github/actions/ubuntu-prerequisites/action.yml b/.github/actions/ubuntu-prerequisites/action.yml
index c2b3248d2..a7e9ef42c 100644
--- a/.github/actions/ubuntu-prerequisites/action.yml
+++ b/.github/actions/ubuntu-prerequisites/action.yml
@@ -16,11 +16,13 @@ runs:
     - name: Install software
       run: |
         sudo apt-get install -yq --no-install-suggests --no-install-recommends \
-          cimg-dev \
           libboost-filesystem-dev \
           libboost-system-dev \
           libbz2-dev \
           libexpat1-dev \
+          libopencv-core-dev \
+          libopencv-imgcodecs-dev \
+          libopencv-imgproc-dev \
           libpotrace-dev \
           libpq-dev \
           libproj-dev \
diff --git a/.github/actions/win-install/action.yml b/.github/actions/win-install/action.yml
index 47eaf79cc..ff558df73 100644
--- a/.github/actions/win-install/action.yml
+++ b/.github/actions/win-install/action.yml
@@ -12,11 +12,11 @@ runs:
           boost-property-tree:x64-windows \
           boost-system:x64-windows \
           bzip2:x64-windows \
-          cimg:x64-windows \
           expat:x64-windows \
           libpq:x64-windows \
           lua:x64-windows \
           nlohmann-json:x64-windows \
+          opencv:x64-windows \
           proj4:x64-windows \
           zlib:x64-windows
       shell: bash
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6a3a51426..95d2b6001 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
 
       - name: Install prerequisites
         run: |
-          brew install lua boost postgis pandoc cimg potrace nlohmann-json
+          brew install boost lua nlohmann-json opencv pandoc postgis potrace
           pip3 install psycopg2 behave osmium
           pg_ctl -D /usr/local/var/postgres init
           pg_ctl -D /usr/local/var/postgres start
diff --git a/.github/workflows/test-install.yml b/.github/workflows/test-install.yml
index afec50300..2dd9acadd 100644
--- a/.github/workflows/test-install.yml
+++ b/.github/workflows/test-install.yml
@@ -38,13 +38,15 @@ jobs:
           sudo apt-get purge -yq postgresql*
           sudo apt-get update -qq
           sudo apt-get install -yq --no-install-suggests --no-install-recommends \
-            cimg-dev \
             libboost-filesystem-dev \
             libboost-system-dev \
             libbz2-dev \
             libexpat1-dev \
             liblua${LUA_VERSION}-dev \
             libluajit-5.1-dev \
+            libopencv-core-dev \
+            libopencv-imgcodecs-dev \
+            libopencv-imgproc-dev \
             libpotrace-dev \
             libpq-dev \
             libproj-dev \
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c1f38de3..c715ce1d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -211,7 +211,7 @@ include_directories(SYSTEM ${NLOHMANN_INCLUDE_DIR})
 find_path(POTRACE_INCLUDE_DIR potracelib.h)
 find_library(POTRACE_LIBRARY NAMES potrace)
 
-find_path(CIMG_INCLUDE_DIR CImg.h)
+find_package(OpenCV OPTIONAL_COMPONENTS core imgcodecs imgproc)
 
 ############### Libraries are found now ########################
 
@@ -284,13 +284,12 @@ add_subdirectory(src)
 add_executable(osm2pgsql src/osm2pgsql.cpp)
 target_link_libraries(osm2pgsql osm2pgsql_lib ${LIBS})
 
-if (${POTRACE_LIBRARY} STREQUAL "POTRACE_LIBRARY-NOTFOUND" OR ${CIMG_INCLUDE_DIR} STREQUAL "CIMG_INCLUDE_DIR-NOTFOUND")
-    message(STATUS "Did not find cimg and/or potrace library. Not building osm2pgsql-gen.")
+if (${POTRACE_LIBRARY} STREQUAL "POTRACE_LIBRARY-NOTFOUND" OR NOT OPENCV_CORE_FOUND)
+    message(STATUS "Did not find opencv and/or potrace library. Not building osm2pgsql-gen.")
 else()
     if (WITH_LUA)
-        message(STATUS "Found cimg and potrace library. Building osm2pgsql-gen.")
+        message(STATUS "Found opencv and potrace library. Building osm2pgsql-gen.")
         set(BUILD_GEN 1)
-        include_directories(SYSTEM ${CIMG_INCLUDE_DIR})
         include_directories(SYSTEM ${POTRACE_INCLUDE_DIR})
         add_executable(osm2pgsql-gen src/gen/osm2pgsql-gen.cpp
                     src/gen/canvas.cpp
@@ -305,7 +304,7 @@ else()
                     src/gen/params.cpp
                     src/gen/raster.cpp
                     src/gen/tracer.cpp)
-        target_link_libraries(osm2pgsql-gen osm2pgsql_lib ${LIBS} ${POTRACE_LIBRARY})
+        target_link_libraries(osm2pgsql-gen osm2pgsql_lib ${LIBS} ${POTRACE_LIBRARY} ${OpenCV_LIBS})
     else()
         message(STATUS "No Lua. Not building osm2pgsql-gen.")
     endif()
diff --git a/README.md b/README.md
index 06e9d68fc..71936bcb3 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ Required libraries are
 * [Boost libraries](https://www.boost.org/), including geometry, system and
   filesystem
 * [nlohmann/json](https://json.nlohmann.me/)
-* [CImg](https://cimg.eu/) (Optional, for generalization only)
+* [OpenCV](https://opencv.org/) (Optional, for generalization only)
 * [potrace](https://potrace.sourceforge.net/) (Optional, for generalization only)
 * [PostgreSQL](https://www.postgresql.org/) client libraries
 * [Lua](https://www.lua.org/) (Optional, used for Lua tag transforms
@@ -83,7 +83,8 @@ On a Debian or Ubuntu system, this can be done with:
 
 ```sh
 sudo apt-get install make cmake g++ libboost-dev libboost-system-dev \
-  libboost-filesystem-dev libexpat1-dev zlib1g-dev libpotrace-dev cimg-dev \
+  libboost-filesystem-dev libexpat1-dev zlib1g-dev libpotrace-dev \
+  libopencv-core-dev libopencv-imgcodecs-dev libopencv-imgproc-dev \
   libbz2-dev libpq-dev libproj-dev lua5.3 liblua5.3-dev pandoc \
   nlohmann-json3-dev pyosmium
 ```
@@ -92,7 +93,7 @@ On a Fedora system, use
 
 ```sh
 sudo dnf install cmake make gcc-c++ boost-devel expat-devel zlib-devel \
-  potrace-devel cimg-devel json-devel python3-osmium \
+  potrace-devel opencv-devel json-devel python3-osmium \
   bzip2-devel postgresql-devel proj-devel proj-epsg lua-devel pandoc
 ```
 
@@ -101,7 +102,7 @@ dependencies with:
 
 ```sh
 sudo yum install cmake make gcc-c++ boost-devel expat-devel zlib-devel \
-  potrace-devel cimg-devel json-devel python3-osmium \
+  potrace-devel opencv-devel json-devel python3-osmium \
   bzip2-devel postgresql-devel proj-devel proj-epsg lua-devel pandoc
 ```
 
diff --git a/src/gen/canvas.cpp b/src/gen/canvas.cpp
index faa402e54..ecb0ef156 100644
--- a/src/gen/canvas.cpp
+++ b/src/gen/canvas.cpp
@@ -8,40 +8,56 @@
  */
 
 #include "canvas.hpp"
+
 #include "raster.hpp"
 
-cimg_library::CImg<int> canvas_t::create_pointlist(geom::point_list_t const &pl,
-                                                   tile_t const &tile) const
+#include <opencv2/imgcodecs.hpp>
+#include <opencv2/imgproc.hpp>
+
+void canvas_t::open_close(unsigned int buffer_size)
 {
-    cimg_library::CImg<int> points{static_cast<unsigned int>(pl.size()), 2};
+    auto const kernel1 = cv::getStructuringElement(
+        cv::MORPH_RECT,
+        cv::Size(static_cast<int>(buffer_size), static_cast<int>(buffer_size)));
+    auto const kernel2 = cv::getStructuringElement(
+        cv::MORPH_RECT, cv::Size(static_cast<int>(buffer_size * 2),
+                                 static_cast<int>(buffer_size * 2)));
+
+    cv::erode(m_rast, m_rast, kernel1);
+    cv::dilate(m_rast, m_rast, kernel2);
+    cv::erode(m_rast, m_rast, kernel1);
+}
+
+void canvas_t::create_pointlist(std::vector<cv::Point> *out,
+                                geom::point_list_t const &pl,
+                                tile_t const &tile) const
+{
+    out->reserve(pl.size());
 
-    int n = 0;
     for (auto const point : pl) {
         auto const tp = tile.to_tile_coords(point, m_extent);
-        points(n, 0) = static_cast<int>(static_cast<double>(m_buffer) + tp.x());
-        points(n, 1) =
-            static_cast<int>(static_cast<double>(m_buffer + m_extent) - tp.y());
-        ++n;
+        auto const x = static_cast<double>(m_buffer) + tp.x();
+        auto const y = static_cast<double>(m_buffer + m_extent) - tp.y();
+        out->emplace_back(x, y);
     }
-
-    return points;
 }
 
 std::size_t canvas_t::draw_polygon(geom::polygon_t const &polygon,
                                    tile_t const &tile)
 {
-    if (polygon.inners().empty()) {
-        m_rast.draw_polygon(create_pointlist(polygon.outer(), tile), &White);
-        return polygon.outer().size();
-    }
-
     std::size_t num_points = polygon.outer().size();
-    m_temp.draw_polygon(create_pointlist(polygon.outer(), tile), &White);
+
+    std::vector<std::vector<cv::Point>> poly_data;
+    poly_data.resize(polygon.inners().size() + 1);
+
+    create_pointlist(poly_data.data(), polygon.outer(), tile);
+    std::size_t n = 1;
     for (auto const &inner : polygon.inners()) {
         num_points += inner.size();
-        m_temp.draw_polygon(create_pointlist(inner, tile), &Black);
+        create_pointlist(&poly_data[n], inner, tile);
+        n++;
     }
-    m_rast |= m_temp;
+    cv::fillPoly(m_rast, poly_data, cv::Scalar{255});
 
     return num_points;
 }
@@ -49,7 +65,9 @@ std::size_t canvas_t::draw_polygon(geom::polygon_t const &polygon,
 std::size_t canvas_t::draw_linestring(geom::linestring_t const &linestring,
                                       tile_t const &tile)
 {
-    m_rast.draw_line(create_pointlist(linestring, tile), &White);
+    std::vector<cv::Point> line_data;
+    create_pointlist(&line_data, linestring, tile);
+    cv::polylines(m_rast, line_data, false, cv::Scalar{255});
     return linestring.size();
 }
 
@@ -81,13 +99,13 @@ std::size_t canvas_t::draw(geom::geometry_t const &geometry, tile_t const &tile)
 
 void canvas_t::save(std::string const &filename) const
 {
-    m_rast.save(filename.c_str());
+    cv::imwrite(filename, m_rast);
 }
 
 std::string canvas_t::to_wkb(tile_t const &tile, double margin) const
 {
     std::string wkb;
-    wkb.reserve(61 + 2 + m_rast.size());
+    wkb.reserve(61 + 2 + size() * size());
 
     // header
     wkb_raster_header header{};
@@ -106,18 +124,24 @@ std::string canvas_t::to_wkb(tile_t const &tile, double margin) const
     add_raster_band(&wkb, band);
 
     // rasterdata
-    wkb.append(reinterpret_cast<char const *>(m_rast.data()), m_rast.size());
+    wkb.append(reinterpret_cast<char const *>(begin()),
+               reinterpret_cast<char const *>(end()));
 
-    assert(wkb.size() == 61 + 2 + m_rast.size());
+    assert(wkb.size() == 61 + 2 + size() * size());
 
     return wkb;
 }
 
-void canvas_t::merge(canvas_t const &other) { m_rast |= other.m_rast; }
+void canvas_t::merge(canvas_t const &other)
+{
+    cv::bitwise_or(m_rast, other.m_rast, m_rast);
+}
 
 std::string to_hex(std::string const &in)
 {
     std::string result;
+    result.reserve(in.size() * 2);
+
     char const *const lookup_hex = "0123456789ABCDEF";
 
     for (const auto c : in) {
diff --git a/src/gen/canvas.hpp b/src/gen/canvas.hpp
index bc439b947..6a6eba639 100644
--- a/src/gen/canvas.hpp
+++ b/src/gen/canvas.hpp
@@ -13,48 +13,42 @@
 #include "geom.hpp"
 #include "tile.hpp"
 
-#define cimg_display 0 // NOLINT(cppcoreguidelines-macro-usage)
-#include "CImg.h"
+#include <opencv2/core.hpp>
 
 #include <cstddef>
 
 /**
- * This class wraps the image class from the CImg library.
+ * This class wraps the image class from the OpenCV library.
  */
 class canvas_t
 {
 public:
-    static void info() { cimg_library::cimg::info(); }
-
     /**
      * Create a new image canvas. It will be quadratic and have the width and
      * height extent + 2*buffer.
      */
     canvas_t(std::size_t extent, std::size_t buffer)
-    : m_extent(extent),
-      m_buffer(buffer), m_rast{size(), size(), 1, 1, 0}, m_temp{size(), size(),
-                                                                1, 1, 0}
-    {}
+    : m_extent(extent), m_buffer(buffer), m_rast{static_cast<int>(size()),
+                                                 static_cast<int>(size()),
+                                                 CV_8UC1, cv::Scalar::all(0)}
+    {
+    }
 
     unsigned int size() const noexcept
     {
         return static_cast<unsigned int>(m_extent + 2 * m_buffer);
     }
 
-    unsigned char const *begin() const noexcept { return m_rast.begin(); }
-    unsigned char const *end() const noexcept { return m_rast.end(); }
-
-    std::size_t draw(geom::geometry_t const &geometry, tile_t const &tile);
+    unsigned char const *begin() const noexcept { return m_rast.data; }
 
-    unsigned char operator()(int x, int y) const noexcept
+    unsigned char const *end() const noexcept
     {
-        return m_rast(x, y, 0, 0);
+        return m_rast.data + (static_cast<size_t>(size() * size()));
     }
 
-    void open_close(unsigned int buffer_size)
-    {
-        m_rast.dilate(buffer_size).erode(buffer_size * 2).dilate(buffer_size);
-    }
+    std::size_t draw(geom::geometry_t const &geometry, tile_t const &tile);
+
+    void open_close(unsigned int buffer_size);
 
     void save(std::string const &filename) const;
 
@@ -63,13 +57,11 @@ class canvas_t
     void merge(canvas_t const &other);
 
 private:
-    constexpr static unsigned char const Black = 0;
-    constexpr static unsigned char const White = 255;
-
-    using image_type = cimg_library::CImg<unsigned char>;
+    using image_type = cv::Mat;
 
-    cimg_library::CImg<int> create_pointlist(geom::point_list_t const &pl,
-                                             tile_t const &tile) const;
+    void create_pointlist(std::vector<cv::Point> *out,
+                          geom::point_list_t const &pl,
+                          tile_t const &tile) const;
 
     std::size_t draw_polygon(geom::polygon_t const &polygon,
                              tile_t const &tile);
@@ -80,7 +72,6 @@ class canvas_t
     std::size_t m_extent;
     std::size_t m_buffer;
     image_type m_rast;
-    image_type m_temp;
 }; // class canvas_t
 
 std::string to_hex(std::string const &in);
diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index 6a3db8867..ca727522e 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -712,7 +712,6 @@ int main(int argc, char *argv[])
                 break;
             case 'V': // --version
                 log_info("osm2pgsql-gen version {}", get_osm2pgsql_version());
-                canvas_t::info();
                 return 0;
             case 201: // --log-sql
                 get_logger().enable_sql();

From e1c1630a9ad49dcae1586107714be589891d9bf7 Mon Sep 17 00:00:00 2001
From: Paul Norman <penorman@mac.com>
Date: Mon, 2 Oct 2023 19:22:56 -0700
Subject: [PATCH 036/430] Require libopencv-dev on Debian systems

This package contains the CMake files needed to build osm2pgsql.
---
 .github/actions/ubuntu-prerequisites/action.yml | 4 +---
 README.md                                       | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/actions/ubuntu-prerequisites/action.yml b/.github/actions/ubuntu-prerequisites/action.yml
index a7e9ef42c..2299044c8 100644
--- a/.github/actions/ubuntu-prerequisites/action.yml
+++ b/.github/actions/ubuntu-prerequisites/action.yml
@@ -20,9 +20,7 @@ runs:
           libboost-system-dev \
           libbz2-dev \
           libexpat1-dev \
-          libopencv-core-dev \
-          libopencv-imgcodecs-dev \
-          libopencv-imgproc-dev \
+          libopencv-dev \
           libpotrace-dev \
           libpq-dev \
           libproj-dev \
diff --git a/README.md b/README.md
index 71936bcb3..94012eeda 100644
--- a/README.md
+++ b/README.md
@@ -84,9 +84,8 @@ On a Debian or Ubuntu system, this can be done with:
 ```sh
 sudo apt-get install make cmake g++ libboost-dev libboost-system-dev \
   libboost-filesystem-dev libexpat1-dev zlib1g-dev libpotrace-dev \
-  libopencv-core-dev libopencv-imgcodecs-dev libopencv-imgproc-dev \
-  libbz2-dev libpq-dev libproj-dev lua5.3 liblua5.3-dev pandoc \
-  nlohmann-json3-dev pyosmium
+  libopencv-dev libbz2-dev libpq-dev libproj-dev lua5.3 liblua5.3-dev \
+  pandoc nlohmann-json3-dev pyosmium
 ```
 
 On a Fedora system, use

From 397e286ad688f2aa1a96ed3eae2d299dd4c0206a Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 21 Aug 2023 10:22:51 +0200
Subject: [PATCH 037/430] Refactor: Modernize copy functions using
 std::string_view

---
 src/middle-pgsql.cpp |  2 +-
 src/pgsql.cpp        | 15 +++++++--------
 src/pgsql.hpp        |  6 +++---
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index 45ef7fdf8..6daed404c 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -64,7 +64,7 @@ static void send_id_list(pg_conn_t const &db_connection,
     }
 
     auto const sql = fmt::format("COPY {} FROM STDIN", table);
-    db_connection.copy_start(sql.c_str());
+    db_connection.copy_start(sql);
     db_connection.copy_send(data, table);
     db_connection.copy_end(table);
 }
diff --git a/src/pgsql.cpp b/src/pgsql.cpp
index 2fb16d700..2a6808a42 100644
--- a/src/pgsql.cpp
+++ b/src/pgsql.cpp
@@ -91,25 +91,24 @@ pg_result_t pg_conn_t::exec(std::string const &sql) const
     return exec(sql.c_str());
 }
 
-void pg_conn_t::copy_start(char const *sql) const
+void pg_conn_t::copy_start(std::string_view sql) const
 {
     assert(m_conn);
 
     log_sql("(C{}) {}", m_connection_id, sql);
-    pg_result_t const res{PQexec(m_conn.get(), sql)};
+    pg_result_t const res{PQexec(m_conn.get(), sql.data())};
     if (res.status() != PGRES_COPY_IN) {
         throw fmt_error("Database error on COPY: {}", error_msg());
     }
 }
 
-void pg_conn_t::copy_send(std::string const &data,
-                          std::string const &context) const
+void pg_conn_t::copy_send(std::string_view data, std::string_view context) const
 {
     assert(m_conn);
 
     log_sql_data("(C{}) Copy data to '{}':\n{}", m_connection_id, context,
                  data);
-    int const r = PQputCopyData(m_conn.get(), data.c_str(), (int)data.size());
+    int const r = PQputCopyData(m_conn.get(), data.data(), (int)data.size());
 
     switch (r) {
     case 0: // need to wait for write ready
@@ -127,14 +126,14 @@ void pg_conn_t::copy_send(std::string const &data,
     if (data.size() < 1100) {
         log_error("Data: {}", data);
     } else {
-        log_error("Data: {}\n...\n{}", std::string(data, 0, 500),
-                  std::string(data, data.size() - 500));
+        log_error("Data: {}\n...\n{}", data.substr(0, 500),
+                  data.substr(data.size() - 500, 500));
     }
 
     throw std::runtime_error{"COPYing data to Postgresql."};
 }
 
-void pg_conn_t::copy_end(std::string const &context) const
+void pg_conn_t::copy_end(std::string_view context) const
 {
     assert(m_conn);
 
diff --git a/src/pgsql.hpp b/src/pgsql.hpp
index 99b27996c..f472eaf4d 100644
--- a/src/pgsql.hpp
+++ b/src/pgsql.hpp
@@ -215,9 +215,9 @@ class pg_conn_t
      */
     void set_config(char const *setting, char const *value) const;
 
-    void copy_start(char const *sql) const;
-    void copy_send(std::string const &data, std::string const &context) const;
-    void copy_end(std::string const &context) const;
+    void copy_start(std::string_view sql) const;
+    void copy_send(std::string_view data, std::string_view context) const;
+    void copy_end(std::string_view context) const;
 
     /// Return the latest generated error message on this connection.
     char const *error_msg() const noexcept;

From 90ac2c1475a97842e6cc09ff1ea0a33b8366d5ca Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 21 Aug 2023 10:43:04 +0200
Subject: [PATCH 038/430] Refactor: Modernize code, use nested namespace
 definition

---
 tests/common-cleanup.hpp | 6 ++----
 tests/common-pg.hpp      | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/tests/common-cleanup.hpp b/tests/common-cleanup.hpp
index 7da2bc2de..8e5cee6b1 100644
--- a/tests/common-cleanup.hpp
+++ b/tests/common-cleanup.hpp
@@ -16,8 +16,7 @@
 
 #include <boost/filesystem.hpp>
 
-namespace testing {
-namespace cleanup {
+namespace testing::cleanup {
 
 /**
  * RAII structure to remove a file upon destruction.
@@ -56,7 +55,6 @@ class file_t
     std::string m_filename;
 };
 
-} // namespace cleanup
-} // namespace testing
+} // namespace testing::cleanup
 
 #endif // OSM2PGSQL_TESTS_COMMON_CLEANUP_HPP
diff --git a/tests/common-pg.hpp b/tests/common-pg.hpp
index 4069a81de..01a7e1255 100644
--- a/tests/common-pg.hpp
+++ b/tests/common-pg.hpp
@@ -30,9 +30,8 @@
 #include <unistd.h>
 #endif
 
-namespace testing {
 /// Helper classes for postgres connections
-namespace pg {
+namespace testing::pg {
 
 class conn_t : public pg_conn_t
 {
@@ -153,7 +152,6 @@ class tempdb_t
     std::string m_db_name;
 };
 
-} // namespace pg
-} // namespace testing
+} // namespace testing::pg
 
 #endif // OSM2PGSQL_TESTS_COMMON_PG_HPP

From 368fbccaa9a46ea4b8180b54478e17fdb2cf6dcc Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 21 Aug 2023 10:41:32 +0200
Subject: [PATCH 039/430] Refactor: Modernize get_count and require_has_table

Use string_view parameters
---
 tests/common-pg.hpp       |  6 ++++--
 tests/test-properties.cpp | 10 +++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/tests/common-pg.hpp b/tests/common-pg.hpp
index 4069a81de..a917ee9a3 100644
--- a/tests/common-pg.hpp
+++ b/tests/common-pg.hpp
@@ -14,6 +14,7 @@
 #include <cstdlib>
 #include <stdexcept>
 #include <string>
+#include <string_view>
 
 #include "format.hpp"
 #include "options.hpp"
@@ -76,7 +77,8 @@ class conn_t : public pg_conn_t
         return res;
     }
 
-    int get_count(char const *table_name, std::string const &where = "") const
+    int get_count(std::string_view table_name,
+                  std::string_view where = "") const
     {
         auto const query =
             fmt::format("SELECT count(*) FROM {} {} {}", table_name,
@@ -85,7 +87,7 @@ class conn_t : public pg_conn_t
         return result_as_int(query);
     }
 
-    void require_has_table(char const *table_name) const
+    void require_has_table(std::string_view table_name) const
     {
         auto const where = fmt::format("oid = '{}'::regclass", table_name);
 
diff --git a/tests/test-properties.cpp b/tests/test-properties.cpp
index 42f0a28c8..3edc8384a 100644
--- a/tests/test-properties.cpp
+++ b/tests/test-properties.cpp
@@ -67,14 +67,14 @@ TEST_CASE("Store and retrieve properties (with database)")
             std::string const full_table_name =
                 (schema.empty() ? "" : schema + ".") + "osm2pgsql_properties";
 
-            REQUIRE(conn.get_count(full_table_name.c_str()) == 4);
-            REQUIRE(conn.get_count(full_table_name.c_str(),
+            REQUIRE(conn.get_count(full_table_name) == 4);
+            REQUIRE(conn.get_count(full_table_name,
                                    "property='foo' AND value='bar'") == 1);
-            REQUIRE(conn.get_count(full_table_name.c_str(),
+            REQUIRE(conn.get_count(full_table_name,
                                    "property='empty' AND value=''") == 1);
-            REQUIRE(conn.get_count(full_table_name.c_str(),
+            REQUIRE(conn.get_count(full_table_name,
                                    "property='number' AND value='123'") == 1);
-            REQUIRE(conn.get_count(full_table_name.c_str(),
+            REQUIRE(conn.get_count(full_table_name,
                                    "property='decide' AND value='true'") == 1);
 
             properties_t properties{db.conninfo(), schema};

From c7fbcb6b77e16ea9403aa08462e495926727ac4c Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 30 Oct 2023 08:48:00 +0100
Subject: [PATCH 040/430] Github action: Use clang 15 for C++20 test

---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 95d2b6001..4adbcbf60 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -360,12 +360,12 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  ubuntu22-pg16-clang14-cpp20:
+  ubuntu22-pg16-clang15-cpp20:
     runs-on: ubuntu-22.04
 
     env:
-      CC: clang-14
-      CXX: clang++-14
+      CC: clang-15
+      CXX: clang++-15
       LUA_VERSION: 5.3
       LUAJIT_OPTION: OFF
       POSTGRESQL_VERSION: 16

From 5c4dcc1aaa2f6578ddd89c95768e0cd745dce4a0 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 24 Oct 2023 13:59:55 +0200
Subject: [PATCH 041/430] Use tags = NULL in middle tables if object doesn't
 have any tags

This doesn't make much of a difference for the ways and rels table, but
if we store all nodes in the database, it does make a huge difference,
because most nodes don't have any tags. For a current planet, disk usage
for the nodes table goes from 476 GB down to 409 GB saving 67 GB or
nearly 15%.

Additionally it makes use of that table simpler. If you want to do any
queries on tags, you need an index on the tags column on the
nodes/ways/rels tables like this:

CREATE INDEX ON planet_osm_ways USING gin (tags);

But that is wasteful, because of the empty tags. We probably want to
generate them as

CREATE INDEX ON planet_osm_ways USING gin (tags) WHERE tags != '{}'::jsonb;

But now all queries on those tables have to include that extra condition
so that the query planner will use the index.

SELECT * FROM planet_osm_ways WHERE tags ? 'highway' AND tags != '{}'::jsonb;

If we use NULLs, the index can be created as:

CREATE INDEX ON planet_osm_ways USING gin (tags) WHERE tags IS NOT NULL;

And now the query becomes simpler, because the NOT NULL is automatically
taken into account by the query planner:

SELECT * FROM planet_osm_ways WHERE tags ? 'highway';

Note that this is an incompatible change to the new format middle
tables, but they are still marked as experimental, so we can do this.
---
 src/middle-pgsql.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index 6daed404c..e7ca279a1 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -323,6 +323,10 @@ template <typename T>
 void pgsql_parse_json_tags(char const *string, osmium::memory::Buffer *buffer,
                            T *obuilder)
 {
+    if (*string == '\0') { // NULL
+        return;
+    }
+
     auto const tags = nlohmann::json::parse(string);
     if (!tags.is_object()) {
         throw std::runtime_error{"Database format for tags invalid."};
@@ -613,6 +617,10 @@ void middle_pgsql_t::copy_attributes(osmium::OSMObject const &obj)
 void middle_pgsql_t::copy_tags(osmium::OSMObject const &obj)
 {
     if (m_store_options.db_format == 2) {
+        if (obj.tags().empty()) {
+            m_db_copy.add_null_column();
+            return;
+        }
         json_writer_t writer;
         tags_to_json(obj.tags(), &writer);
         m_db_copy.add_column(writer.json());
@@ -1464,7 +1472,7 @@ static table_sql sql_for_nodes_format2(middle_pgsql_options const &options)
             " lat int4 NOT NULL,"
             " lon int4 NOT NULL,"
             "{attribute_columns_definition}"
-            " tags jsonb NOT NULL"
+            " tags jsonb"
             ") {data_tablespace}";
 
         sql.prepare_queries = {
@@ -1530,7 +1538,7 @@ static table_sql sql_for_ways_format2(middle_pgsql_options const &options)
                        " id int8 PRIMARY KEY {using_tablespace},"
                        "{attribute_columns_definition}"
                        " nodes int8[] NOT NULL,"
-                       " tags jsonb NOT NULL"
+                       " tags jsonb"
                        ") {data_tablespace}";
 
     sql.prepare_queries = {"PREPARE get_way(int8) AS"
@@ -1601,7 +1609,7 @@ static table_sql sql_for_relations_format2()
                        " id int8 PRIMARY KEY {using_tablespace},"
                        "{attribute_columns_definition}"
                        " members jsonb NOT NULL,"
-                       " tags jsonb NOT NULL"
+                       " tags jsonb"
                        ") {data_tablespace}";
 
     sql.prepare_queries = {"PREPARE get_rel(int8) AS"

From 5b25afede97417477c325134cb059b685f1914d1 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 28 Oct 2023 14:53:41 +0200
Subject: [PATCH 042/430] Allow NULL values in new middle format members list

This makes osm2pgsql a bit more future proof by allowing the list of
members (which is encoded as JSON in the new middle format) to be empty,
i.e. to contain NULL. We currently don't write empty member lists as
NULL but as an empty JSON list, but if we change this in the future,
older versions of osm2pgsql will be able to read this correctly.
---
 src/middle-pgsql.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index e7ca279a1..a673472a5 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -443,6 +443,10 @@ template <typename T>
 void pgsql_parse_json_members(char const *string,
                               osmium::memory::Buffer *buffer, T *obuilder)
 {
+    if (*string == '\0') { // NULL
+        return;
+    }
+
     osmium::builder::RelationMemberListBuilder builder{*buffer, obuilder};
     member_list_json_builder parser{&builder};
     nlohmann::json::sax_parse(string, &parser);

From 2f0ec97632ad58b5e9c5d389f2ce1d0b129cf575 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 29 Oct 2023 09:57:21 +0100
Subject: [PATCH 043/430] Update included fmt lib to 10.1.0

---
 contrib/fmt/LICENSE.rst              |    2 +-
 contrib/fmt/README.contrib           |    2 +-
 contrib/fmt/README.rst               |   67 +-
 contrib/fmt/include/fmt/args.h       |    2 +-
 contrib/fmt/include/fmt/chrono.h     |  793 ++++++-----
 contrib/fmt/include/fmt/color.h      |   55 +-
 contrib/fmt/include/fmt/compile.h    |  131 +-
 contrib/fmt/include/fmt/core.h       | 1883 ++++++++++----------------
 contrib/fmt/include/fmt/format-inl.h |  243 ++--
 contrib/fmt/include/fmt/format.h     | 1848 ++++++++++++++-----------
 contrib/fmt/include/fmt/locale.h     |    2 -
 contrib/fmt/include/fmt/os.h         |  115 +-
 contrib/fmt/include/fmt/ostream.h    |   72 +-
 contrib/fmt/include/fmt/posix.h      |    2 -
 contrib/fmt/include/fmt/printf.h     |  375 ++---
 contrib/fmt/include/fmt/ranges.h     |  303 +++--
 contrib/fmt/include/fmt/std.h        |  343 ++++-
 contrib/fmt/include/fmt/xchar.h      |   95 +-
 18 files changed, 3244 insertions(+), 3089 deletions(-)
 delete mode 100644 contrib/fmt/include/fmt/locale.h
 delete mode 100644 contrib/fmt/include/fmt/posix.h

diff --git a/contrib/fmt/LICENSE.rst b/contrib/fmt/LICENSE.rst
index f0ec3db4d..1cd1ef926 100644
--- a/contrib/fmt/LICENSE.rst
+++ b/contrib/fmt/LICENSE.rst
@@ -1,4 +1,4 @@
-Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2012 - present, Victor Zverovich and {fmt} contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/contrib/fmt/README.contrib b/contrib/fmt/README.contrib
index ef4f7977e..326599199 100644
--- a/contrib/fmt/README.contrib
+++ b/contrib/fmt/README.contrib
@@ -1,2 +1,2 @@
 Source: https://github.com/fmtlib/fmt
-Revision: v9.1.0
+Revision: v10.1.0
diff --git a/contrib/fmt/README.rst b/contrib/fmt/README.rst
index cc6d7c41a..f51fefab7 100644
--- a/contrib/fmt/README.rst
+++ b/contrib/fmt/README.rst
@@ -47,7 +47,9 @@ Features
 * `Format string syntax <https://fmt.dev/latest/syntax.html>`_ similar to Python's
   `format <https://docs.python.org/3/library/stdtypes.html#str.format>`_
 * Fast IEEE 754 floating-point formatter with correct rounding, shortness and
-  round-trip guarantees
+  round-trip guarantees using the `Dragonbox <https://github.com/jk-jeon/dragonbox>`_
+  algorithm
+* Portable Unicode support
 * Safe `printf implementation
   <https://fmt.dev/latest/api.html#printf-formatting>`_ including the POSIX
   extension for positional arguments
@@ -64,7 +66,7 @@ Features
   <https://github.com/fmtlib/fmt/tree/master/test>`_ and is `continuously fuzzed
   <https://bugs.chromium.org/p/oss-fuzz/issues/list?colspec=ID%20Type%20
   Component%20Status%20Proj%20Reported%20Owner%20Summary&q=proj%3Dfmt&can=1>`_
-* Safety: the library is fully type safe, errors in format strings can be
+* Safety: the library is fully type-safe, errors in format strings can be
   reported at compile time, automatic memory management prevents buffer overflow
   errors
 * Ease of use: small self-contained code base, no external dependencies,
@@ -74,7 +76,7 @@ Features
   consistent output across platforms and support for older compilers
 * Clean warning-free codebase even on high warning levels such as
   ``-Wall -Wextra -pedantic``
-* Locale-independence by default
+* Locale independence by default
 * Optional header-only configuration enabled with the ``FMT_HEADER_ONLY`` macro
 
 See the `documentation <https://fmt.dev>`_ for more details.
@@ -191,24 +193,24 @@ Speed tests
 ================= ============= ===========
 Library           Method        Run Time, s
 ================= ============= ===========
-libc              printf          1.04
-libc++            std::ostream    3.05
-{fmt} 6.1.1       fmt::print      0.75
-Boost Format 1.67 boost::format   7.24
-Folly Format      folly::format   2.23
+libc              printf          0.91
+libc++            std::ostream    2.49
+{fmt} 9.1         fmt::print      0.74
+Boost Format 1.80 boost::format   6.26
+Folly Format      folly::format   1.87
 ================= ============= ===========
 
-{fmt} is the fastest of the benchmarked methods, ~35% faster than ``printf``.
+{fmt} is the fastest of the benchmarked methods, ~20% faster than ``printf``.
 
 The above results were generated by building ``tinyformat_test.cpp`` on macOS
-10.14.6 with ``clang++ -O3 -DNDEBUG -DSPEED_TEST -DHAVE_FORMAT``, and taking the
+12.6.1 with ``clang++ -O3 -DNDEBUG -DSPEED_TEST -DHAVE_FORMAT``, and taking the
 best of three runs. In the test, the format string ``"%0.10f:%04d:%+g:%s:%p:%c:%%\n"``
 or equivalent is filled 2,000,000 times with output sent to ``/dev/null``; for
 further details refer to the `source
 <https://github.com/fmtlib/format-benchmark/blob/master/src/tinyformat-test.cc>`_.
 
 {fmt} is up to 20-30x faster than ``std::ostringstream`` and ``sprintf`` on
-floating-point formatting (`dtoa-benchmark <https://github.com/fmtlib/dtoa-benchmark>`_)
+IEEE754 ``float`` and ``double`` formatting (`dtoa-benchmark <https://github.com/fmtlib/dtoa-benchmark>`_)
 and faster than `double-conversion <https://github.com/google/double-conversion>`_ and
 `ryu <https://github.com/ulfjack/ryu>`_:
 
@@ -224,7 +226,7 @@ The script `bloat-test.py
 from `format-benchmark <https://github.com/fmtlib/format-benchmark>`_
 tests compile time and code bloat for nontrivial projects.
 It generates 100 translation units and uses ``printf()`` or its alternative
-five times in each to simulate a medium sized project.  The resulting
+five times in each to simulate a medium-sized project.  The resulting
 executable size and compile time (Apple LLVM version 8.1.0 (clang-802.0.42),
 macOS Sierra, best of three) is shown in the following tables.
 
@@ -245,7 +247,7 @@ As you can see, {fmt} has 60% less overhead in terms of resulting binary code
 size compared to iostreams and comes pretty close to ``printf``. Boost Format
 and Folly Format have the largest overheads.
 
-``printf+string`` is the same as ``printf`` but with extra ``<string>``
+``printf+string`` is the same as ``printf`` but with an extra ``<string>``
 include to measure the overhead of the latter.
 
 **Non-optimized build**
@@ -261,14 +263,14 @@ Boost Format             54.1                  365                303
 Folly Format             79.9                  445                430
 ============= =============== ==================== ==================
 
-``libc``, ``lib(std)c++`` and ``libfmt`` are all linked as shared libraries to
+``libc``, ``lib(std)c++``, and ``libfmt`` are all linked as shared libraries to
 compare formatting function overhead only. Boost Format is a
 header-only library so it doesn't provide any linkage options.
 
 Running the tests
 ~~~~~~~~~~~~~~~~~
 
-Please refer to `Building the library`__ for the instructions on how to build
+Please refer to `Building the library`__ for instructions on how to build
 the library and run the unit tests.
 
 __ https://fmt.dev/latest/usage.html#building-the-library
@@ -293,9 +295,12 @@ or the bloat test::
 Migrating code
 --------------
 
-`clang-tidy-fmt <https://github.com/mikecrowe/clang-tidy-fmt>`_ provides clang
-tidy checks for converting occurrences of ``printf`` and ``fprintf`` to
-``fmt::print``.
+`clang-tidy <https://clang.llvm.org/extra/clang-tidy/>`_ v17 (not yet
+released) provides the `modernize-use-std-print
+<https://clang.llvm.org/extra/clang-tidy/checks/modernize/use-std-print.html>`_
+check that is capable of converting occurrences of ``printf`` and
+``fprintf`` to ``fmt::print`` if configured to do so. (By default it
+converts to ``std::print``.)
 
 Projects using this library
 ---------------------------
@@ -303,8 +308,6 @@ Projects using this library
 * `0 A.D. <https://play0ad.com/>`_: a free, open-source, cross-platform
   real-time strategy game
 
-* `2GIS <https://2gis.ru/>`_: free business listings with a city map
-
 * `AMPL/MP <https://github.com/ampl/mp>`_:
   an open-source library for mathematical programming
 
@@ -322,8 +325,10 @@ Projects using this library
 
 * `ccache <https://ccache.dev/>`_: a compiler cache
 
-* `ClickHouse <https://github.com/ClickHouse/ClickHouse>`_: analytical database
+* `ClickHouse <https://github.com/ClickHouse/ClickHouse>`_: an analytical database
   management system
+  
+* `Contour <https://github.com/contour-terminal/contour/>`_: a modern terminal emulator
 
 * `CUAUV <https://cuauv.org/>`_: Cornell University's autonomous underwater
   vehicle
@@ -360,6 +365,10 @@ Projects using this library
 
 * `Knuth <https://kth.cash/>`_: high-performance Bitcoin full-node
 
+* `libunicode <https://github.com/contour-terminal/libunicode/>`_: a modern C++17 Unicode library
+
+* `MariaDB <https://mariadb.org/>`_: relational database management system
+
 * `Microsoft Verona <https://github.com/microsoft/verona>`_:
   research programming language for concurrent ownership
 
@@ -389,7 +398,7 @@ Projects using this library
   proxy
 
 * `redpanda <https://vectorized.io/redpanda>`_: a 10x faster Kafka® replacement
-  for mission critical systems written in C++
+  for mission-critical systems written in C++
 
 * `rpclib <http://rpclib.net/>`_: a modern C++ msgpack-RPC server and client
   library
@@ -413,6 +422,9 @@ Projects using this library
 * `TrinityCore <https://github.com/TrinityCore/TrinityCore>`_: open-source
   MMORPG framework
 
+* `🐙 userver framework <https://userver.tech/>`_: open-source asynchronous
+  framework with a rich set of abstractions and database drivers
+
 * `Windows Terminal <https://github.com/microsoft/terminal>`_: the new Windows
   terminal
 
@@ -470,7 +482,7 @@ error handling is awkward.
 Boost Format
 ~~~~~~~~~~~~
 
-This is a very powerful library which supports both ``printf``-like format
+This is a very powerful library that supports both ``printf``-like format
 strings and positional arguments. Its main drawback is performance. According to
 various benchmarks, it is much slower than other methods considered here. Boost
 Format also has excessive build times and severe code bloat issues (see
@@ -479,7 +491,7 @@ Format also has excessive build times and severe code bloat issues (see
 FastFormat
 ~~~~~~~~~~
 
-This is an interesting library which is fast, safe and has positional arguments.
+This is an interesting library that is fast, safe, and has positional arguments.
 However, it has significant limitations, citing its author:
 
     Three features that have no hope of being accommodated within the
@@ -495,7 +507,7 @@ restrictive for using it in some projects.
 Boost Spirit.Karma
 ~~~~~~~~~~~~~~~~~~
 
-This is not really a formatting library but I decided to include it here for
+This is not a formatting library but I decided to include it here for
 completeness. As iostreams, it suffers from the problem of mixing verbatim text
 with arguments. The library is pretty fast, but slower on integer formatting
 than ``fmt::format_to`` with format string compilation on Karma's own benchmark,
@@ -514,7 +526,7 @@ Documentation License
 The `Format String Syntax <https://fmt.dev/latest/syntax.html>`_
 section in the documentation is based on the one from Python `string module
 documentation <https://docs.python.org/3/library/string.html#module-string>`_.
-For this reason the documentation is distributed under the Python Software
+For this reason, the documentation is distributed under the Python Software
 Foundation license available in `doc/python-license.txt
 <https://raw.github.com/fmtlib/fmt/master/doc/python-license.txt>`_.
 It only applies if you distribute the documentation of {fmt}.
@@ -523,8 +535,7 @@ Maintainers
 -----------
 
 The {fmt} library is maintained by Victor Zverovich (`vitaut
-<https://github.com/vitaut>`_) and Jonathan Müller (`foonathan
-<https://github.com/foonathan>`_) with contributions from many other people.
+<https://github.com/vitaut>`_) with contributions from many other people.
 See `Contributors <https://github.com/fmtlib/fmt/graphs/contributors>`_ and
 `Releases <https://github.com/fmtlib/fmt/releases>`_ for some of the names.
 Let us know if your contribution is not listed or mentioned incorrectly and
diff --git a/contrib/fmt/include/fmt/args.h b/contrib/fmt/include/fmt/args.h
index a3966d140..2d684e7cc 100644
--- a/contrib/fmt/include/fmt/args.h
+++ b/contrib/fmt/include/fmt/args.h
@@ -1,4 +1,4 @@
-// Formatting library for C++ - dynamic format arguments
+// Formatting library for C++ - dynamic argument lists
 //
 // Copyright (c) 2012 - present, Victor Zverovich
 // All rights reserved.
diff --git a/contrib/fmt/include/fmt/chrono.h b/contrib/fmt/include/fmt/chrono.h
index b112f76e9..ff3e1445b 100644
--- a/contrib/fmt/include/fmt/chrono.h
+++ b/contrib/fmt/include/fmt/chrono.h
@@ -22,6 +22,24 @@
 
 FMT_BEGIN_NAMESPACE
 
+// Check if std::chrono::local_t is available.
+#ifndef FMT_USE_LOCAL_TIME
+#  ifdef __cpp_lib_chrono
+#    define FMT_USE_LOCAL_TIME (__cpp_lib_chrono >= 201907L)
+#  else
+#    define FMT_USE_LOCAL_TIME 0
+#  endif
+#endif
+
+// Check if std::chrono::utc_timestamp is available.
+#ifndef FMT_USE_UTC_TIME
+#  ifdef __cpp_lib_chrono
+#    define FMT_USE_UTC_TIME (__cpp_lib_chrono >= 201907L)
+#  else
+#    define FMT_USE_UTC_TIME 0
+#  endif
+#endif
+
 // Enable tzset.
 #ifndef FMT_USE_TZSET
 // UWP doesn't provide _tzset.
@@ -203,7 +221,8 @@ To safe_duration_cast(std::chrono::duration<FromRep, FromPeriod> from,
     }
     const auto min1 =
         (std::numeric_limits<IntermediateRep>::min)() / Factor::num;
-    if (!std::is_unsigned<IntermediateRep>::value && count < min1) {
+    if (detail::const_check(!std::is_unsigned<IntermediateRep>::value) &&
+        count < min1) {
       ec = 1;
       return {};
     }
@@ -358,37 +377,11 @@ auto write_encoded_tm_str(OutputIt out, string_view in, const std::locale& loc)
     unit_t unit;
     write_codecvt(unit, in, loc);
     // In UTF-8 is used one to four one-byte code units.
-    auto&& buf = basic_memory_buffer<char, unit_t::max_size * 4>();
-    for (code_unit* p = unit.buf; p != unit.end; ++p) {
-      uint32_t c = static_cast<uint32_t>(*p);
-      if (sizeof(code_unit) == 2 && c >= 0xd800 && c <= 0xdfff) {
-        // surrogate pair
-        ++p;
-        if (p == unit.end || (c & 0xfc00) != 0xd800 ||
-            (*p & 0xfc00) != 0xdc00) {
-          FMT_THROW(format_error("failed to format time"));
-        }
-        c = (c << 10) + static_cast<uint32_t>(*p) - 0x35fdc00;
-      }
-      if (c < 0x80) {
-        buf.push_back(static_cast<char>(c));
-      } else if (c < 0x800) {
-        buf.push_back(static_cast<char>(0xc0 | (c >> 6)));
-        buf.push_back(static_cast<char>(0x80 | (c & 0x3f)));
-      } else if ((c >= 0x800 && c <= 0xd7ff) || (c >= 0xe000 && c <= 0xffff)) {
-        buf.push_back(static_cast<char>(0xe0 | (c >> 12)));
-        buf.push_back(static_cast<char>(0x80 | ((c & 0xfff) >> 6)));
-        buf.push_back(static_cast<char>(0x80 | (c & 0x3f)));
-      } else if (c >= 0x10000 && c <= 0x10ffff) {
-        buf.push_back(static_cast<char>(0xf0 | (c >> 18)));
-        buf.push_back(static_cast<char>(0x80 | ((c & 0x3ffff) >> 12)));
-        buf.push_back(static_cast<char>(0x80 | ((c & 0xfff) >> 6)));
-        buf.push_back(static_cast<char>(0x80 | (c & 0x3f)));
-      } else {
-        FMT_THROW(format_error("failed to format time"));
-      }
-    }
-    return copy_str<char>(buf.data(), buf.data() + buf.size(), out);
+    auto u =
+        to_utf8<code_unit, basic_memory_buffer<char, unit_t::max_size * 4>>();
+    if (!u.convert({unit.buf, to_unsigned(unit.end - unit.buf)}))
+      FMT_THROW(format_error("failed to format time"));
+    return copy_str<char>(u.c_str(), u.c_str() + u.size(), out);
   }
   return copy_str<char>(in.data(), in.data() + in.size(), out);
 }
@@ -427,7 +420,7 @@ auto write(OutputIt out, const std::tm& time, const std::locale& loc,
            char format, char modifier = 0) -> OutputIt {
   auto&& buf = get_buffer<Char>(out);
   do_write<Char>(buf, time, loc, format, modifier);
-  return buf.out();
+  return get_iterator(buf, out);
 }
 
 template <typename Char, typename OutputIt,
@@ -441,7 +434,7 @@ auto write(OutputIt out, const std::tm& time, const std::locale& loc,
 
 }  // namespace detail
 
-FMT_MODULE_EXPORT_BEGIN
+FMT_BEGIN_EXPORT
 
 /**
   Converts given time since epoch as ``std::time_t`` value into calendar time,
@@ -484,10 +477,13 @@ inline std::tm localtime(std::time_t time) {
   return lt.tm_;
 }
 
-inline std::tm localtime(
-    std::chrono::time_point<std::chrono::system_clock> time_point) {
-  return localtime(std::chrono::system_clock::to_time_t(time_point));
+#if FMT_USE_LOCAL_TIME
+template <typename Duration>
+inline auto localtime(std::chrono::local_time<Duration> time) -> std::tm {
+  return localtime(std::chrono::system_clock::to_time_t(
+      std::chrono::current_zone()->to_sys(time)));
 }
+#endif
 
 /**
   Converts given time since epoch as ``std::time_t`` value into calendar time,
@@ -523,7 +519,7 @@ inline std::tm gmtime(std::time_t time) {
     }
 #endif
   };
-  dispatcher gt(time);
+  auto gt = dispatcher(time);
   // Too big time values may be unsupported.
   if (!gt.run()) FMT_THROW(format_error("time_t value out of range"));
   return gt.tm_;
@@ -534,7 +530,7 @@ inline std::tm gmtime(
   return gmtime(std::chrono::system_clock::to_time_t(time_point));
 }
 
-FMT_BEGIN_DETAIL_NAMESPACE
+namespace detail {
 
 // Writes two-digit numbers a, b and c separated by sep to buf.
 // The method by Pavel Novikov based on
@@ -599,12 +595,39 @@ enum class numeric_system {
   alternative
 };
 
+// Glibc extensions for formatting numeric values.
+enum class pad_type {
+  unspecified,
+  // Do not pad a numeric result string.
+  none,
+  // Pad a numeric result string with zeros even if the conversion specifier
+  // character uses space-padding by default.
+  zero,
+  // Pad a numeric result string with spaces.
+  space,
+};
+
+template <typename OutputIt>
+auto write_padding(OutputIt out, pad_type pad, int width) -> OutputIt {
+  if (pad == pad_type::none) return out;
+  return std::fill_n(out, width, pad == pad_type::space ? ' ' : '0');
+}
+
+template <typename OutputIt>
+auto write_padding(OutputIt out, pad_type pad) -> OutputIt {
+  if (pad != pad_type::none) *out++ = pad == pad_type::space ? ' ' : '0';
+  return out;
+}
+
 // Parses a put_time-like format string and invokes handler actions.
 template <typename Char, typename Handler>
 FMT_CONSTEXPR const Char* parse_chrono_format(const Char* begin,
                                               const Char* end,
                                               Handler&& handler) {
+  if (begin == end || *begin == '}') return begin;
+  if (*begin != '%') FMT_THROW(format_error("invalid format"));
   auto ptr = begin;
+  pad_type pad = pad_type::unspecified;
   while (ptr != end) {
     auto c = *ptr;
     if (c == '}') break;
@@ -615,6 +638,22 @@ FMT_CONSTEXPR const Char* parse_chrono_format(const Char* begin,
     if (begin != ptr) handler.on_text(begin, ptr);
     ++ptr;  // consume '%'
     if (ptr == end) FMT_THROW(format_error("invalid format"));
+    c = *ptr;
+    switch (c) {
+    case '_':
+      pad = pad_type::space;
+      ++ptr;
+      break;
+    case '-':
+      pad = pad_type::none;
+      ++ptr;
+      break;
+    case '0':
+      pad = pad_type::zero;
+      ++ptr;
+      break;
+    }
+    if (ptr == end) FMT_THROW(format_error("invalid format"));
     c = *ptr++;
     switch (c) {
     case '%':
@@ -691,16 +730,16 @@ FMT_CONSTEXPR const Char* parse_chrono_format(const Char* begin,
       break;
     // Hour, minute, second:
     case 'H':
-      handler.on_24_hour(numeric_system::standard);
+      handler.on_24_hour(numeric_system::standard, pad);
       break;
     case 'I':
-      handler.on_12_hour(numeric_system::standard);
+      handler.on_12_hour(numeric_system::standard, pad);
       break;
     case 'M':
-      handler.on_minute(numeric_system::standard);
+      handler.on_minute(numeric_system::standard, pad);
       break;
     case 'S':
-      handler.on_second(numeric_system::standard);
+      handler.on_second(numeric_system::standard, pad);
       break;
     // Other:
     case 'c':
@@ -737,7 +776,7 @@ FMT_CONSTEXPR const Char* parse_chrono_format(const Char* begin,
       handler.on_duration_unit();
       break;
     case 'z':
-      handler.on_utc_offset();
+      handler.on_utc_offset(numeric_system::standard);
       break;
     case 'Z':
       handler.on_tz_name();
@@ -765,6 +804,9 @@ FMT_CONSTEXPR const Char* parse_chrono_format(const Char* begin,
       case 'X':
         handler.on_loc_time(numeric_system::alternative);
         break;
+      case 'z':
+        handler.on_utc_offset(numeric_system::alternative);
+        break;
       default:
         FMT_THROW(format_error("invalid format"));
       }
@@ -802,16 +844,19 @@ FMT_CONSTEXPR const Char* parse_chrono_format(const Char* begin,
         handler.on_dec1_weekday(numeric_system::alternative);
         break;
       case 'H':
-        handler.on_24_hour(numeric_system::alternative);
+        handler.on_24_hour(numeric_system::alternative, pad);
         break;
       case 'I':
-        handler.on_12_hour(numeric_system::alternative);
+        handler.on_12_hour(numeric_system::alternative, pad);
         break;
       case 'M':
-        handler.on_minute(numeric_system::alternative);
+        handler.on_minute(numeric_system::alternative, pad);
         break;
       case 'S':
-        handler.on_second(numeric_system::alternative);
+        handler.on_second(numeric_system::alternative, pad);
+        break;
+      case 'z':
+        handler.on_utc_offset(numeric_system::alternative);
         break;
       default:
         FMT_THROW(format_error("invalid format"));
@@ -864,7 +909,7 @@ template <typename Derived> struct null_chrono_spec_handler {
   FMT_CONSTEXPR void on_am_pm() { unsupported(); }
   FMT_CONSTEXPR void on_duration_value() { unsupported(); }
   FMT_CONSTEXPR void on_duration_unit() { unsupported(); }
-  FMT_CONSTEXPR void on_utc_offset() { unsupported(); }
+  FMT_CONSTEXPR void on_utc_offset(numeric_system) { unsupported(); }
   FMT_CONSTEXPR void on_tz_name() { unsupported(); }
 };
 
@@ -892,10 +937,10 @@ struct tm_format_checker : null_chrono_spec_handler<tm_format_checker> {
   FMT_CONSTEXPR void on_day_of_year() {}
   FMT_CONSTEXPR void on_day_of_month(numeric_system) {}
   FMT_CONSTEXPR void on_day_of_month_space(numeric_system) {}
-  FMT_CONSTEXPR void on_24_hour(numeric_system) {}
-  FMT_CONSTEXPR void on_12_hour(numeric_system) {}
-  FMT_CONSTEXPR void on_minute(numeric_system) {}
-  FMT_CONSTEXPR void on_second(numeric_system) {}
+  FMT_CONSTEXPR void on_24_hour(numeric_system, pad_type) {}
+  FMT_CONSTEXPR void on_12_hour(numeric_system, pad_type) {}
+  FMT_CONSTEXPR void on_minute(numeric_system, pad_type) {}
+  FMT_CONSTEXPR void on_second(numeric_system, pad_type) {}
   FMT_CONSTEXPR void on_datetime(numeric_system) {}
   FMT_CONSTEXPR void on_loc_date(numeric_system) {}
   FMT_CONSTEXPR void on_loc_time(numeric_system) {}
@@ -905,7 +950,7 @@ struct tm_format_checker : null_chrono_spec_handler<tm_format_checker> {
   FMT_CONSTEXPR void on_24_hour_time() {}
   FMT_CONSTEXPR void on_iso_time() {}
   FMT_CONSTEXPR void on_am_pm() {}
-  FMT_CONSTEXPR void on_utc_offset() {}
+  FMT_CONSTEXPR void on_utc_offset(numeric_system) {}
   FMT_CONSTEXPR void on_tz_name() {}
 };
 
@@ -957,13 +1002,130 @@ inline void tzset_once() {
 }
 #endif
 
-template <typename OutputIt, typename Char> class tm_writer {
+// Converts value to Int and checks that it's in the range [0, upper).
+template <typename T, typename Int, FMT_ENABLE_IF(std::is_integral<T>::value)>
+inline Int to_nonnegative_int(T value, Int upper) {
+  FMT_ASSERT(std::is_unsigned<Int>::value ||
+                 (value >= 0 && to_unsigned(value) <= to_unsigned(upper)),
+             "invalid value");
+  (void)upper;
+  return static_cast<Int>(value);
+}
+template <typename T, typename Int, FMT_ENABLE_IF(!std::is_integral<T>::value)>
+inline Int to_nonnegative_int(T value, Int upper) {
+  if (value < 0 || value > static_cast<T>(upper))
+    FMT_THROW(format_error("invalid value"));
+  return static_cast<Int>(value);
+}
+
+constexpr long long pow10(std::uint32_t n) {
+  return n == 0 ? 1 : 10 * pow10(n - 1);
+}
+
+// Counts the number of fractional digits in the range [0, 18] according to the
+// C++20 spec. If more than 18 fractional digits are required then returns 6 for
+// microseconds precision.
+template <long long Num, long long Den, int N = 0,
+          bool Enabled = (N < 19) && (Num <= max_value<long long>() / 10)>
+struct count_fractional_digits {
+  static constexpr int value =
+      Num % Den == 0 ? N : count_fractional_digits<Num * 10, Den, N + 1>::value;
+};
+
+// Base case that doesn't instantiate any more templates
+// in order to avoid overflow.
+template <long long Num, long long Den, int N>
+struct count_fractional_digits<Num, Den, N, false> {
+  static constexpr int value = (Num % Den == 0) ? N : 6;
+};
+
+// Format subseconds which are given as an integer type with an appropriate
+// number of digits.
+template <typename Char, typename OutputIt, typename Duration>
+void write_fractional_seconds(OutputIt& out, Duration d, int precision = -1) {
+  constexpr auto num_fractional_digits =
+      count_fractional_digits<Duration::period::num,
+                              Duration::period::den>::value;
+
+  using subsecond_precision = std::chrono::duration<
+      typename std::common_type<typename Duration::rep,
+                                std::chrono::seconds::rep>::type,
+      std::ratio<1, detail::pow10(num_fractional_digits)>>;
+
+  const auto fractional =
+      d - std::chrono::duration_cast<std::chrono::seconds>(d);
+  const auto subseconds =
+      std::chrono::treat_as_floating_point<
+          typename subsecond_precision::rep>::value
+          ? fractional.count()
+          : std::chrono::duration_cast<subsecond_precision>(fractional).count();
+  auto n = static_cast<uint32_or_64_or_128_t<long long>>(subseconds);
+  const int num_digits = detail::count_digits(n);
+
+  int leading_zeroes = (std::max)(0, num_fractional_digits - num_digits);
+  if (precision < 0) {
+    FMT_ASSERT(!std::is_floating_point<typename Duration::rep>::value, "");
+    if (std::ratio_less<typename subsecond_precision::period,
+                        std::chrono::seconds::period>::value) {
+      *out++ = '.';
+      out = std::fill_n(out, leading_zeroes, '0');
+      out = format_decimal<Char>(out, n, num_digits).end;
+    }
+  } else {
+    *out++ = '.';
+    leading_zeroes = (std::min)(leading_zeroes, precision);
+    out = std::fill_n(out, leading_zeroes, '0');
+    int remaining = precision - leading_zeroes;
+    if (remaining != 0 && remaining < num_digits) {
+      n /= to_unsigned(detail::pow10(to_unsigned(num_digits - remaining)));
+      out = format_decimal<Char>(out, n, remaining).end;
+      return;
+    }
+    out = format_decimal<Char>(out, n, num_digits).end;
+    remaining -= num_digits;
+    out = std::fill_n(out, remaining, '0');
+  }
+}
+
+// Format subseconds which are given as a floating point type with an
+// appropriate number of digits. We cannot pass the Duration here, as we
+// explicitly need to pass the Rep value in the chrono_formatter.
+template <typename Duration>
+void write_floating_seconds(memory_buffer& buf, Duration duration,
+                            int num_fractional_digits = -1) {
+  using rep = typename Duration::rep;
+  FMT_ASSERT(std::is_floating_point<rep>::value, "");
+
+  auto val = duration.count();
+
+  if (num_fractional_digits < 0) {
+    // For `std::round` with fallback to `round`:
+    // On some toolchains `std::round` is not available (e.g. GCC 6).
+    using namespace std;
+    num_fractional_digits =
+        count_fractional_digits<Duration::period::num,
+                                Duration::period::den>::value;
+    if (num_fractional_digits < 6 && static_cast<rep>(round(val)) != val)
+      num_fractional_digits = 6;
+  }
+
+  format_to(std::back_inserter(buf), FMT_STRING("{:.{}f}"),
+            std::fmod(val * static_cast<rep>(Duration::period::num) /
+                          static_cast<rep>(Duration::period::den),
+                      static_cast<rep>(60)),
+            num_fractional_digits);
+}
+
+template <typename OutputIt, typename Char,
+          typename Duration = std::chrono::seconds>
+class tm_writer {
  private:
   static constexpr int days_per_week = 7;
 
   const std::locale& loc_;
   const bool is_classic_;
   OutputIt out_;
+  const Duration* subsecs_;
   const std::tm& tm_;
 
   auto tm_sec() const noexcept -> int {
@@ -1051,6 +1213,17 @@ template <typename OutputIt, typename Char> class tm_writer {
     *out_++ = *d++;
     *out_++ = *d;
   }
+  void write2(int value, pad_type pad) {
+    unsigned int v = to_unsigned(value) % 100;
+    if (v >= 10) {
+      const char* d = digits2(v);
+      *out_++ = *d++;
+      *out_++ = *d;
+    } else {
+      out_ = detail::write_padding(out_, pad);
+      *out_++ = static_cast<char>('0' + v);
+    }
+  }
 
   void write_year_extended(long long year) {
     // At least 4 characters.
@@ -1074,7 +1247,7 @@ template <typename OutputIt, typename Char> class tm_writer {
     }
   }
 
-  void write_utc_offset(long offset) {
+  void write_utc_offset(long offset, numeric_system ns) {
     if (offset < 0) {
       *out_++ = '-';
       offset = -offset;
@@ -1083,14 +1256,15 @@ template <typename OutputIt, typename Char> class tm_writer {
     }
     offset /= 60;
     write2(static_cast<int>(offset / 60));
+    if (ns != numeric_system::standard) *out_++ = ':';
     write2(static_cast<int>(offset % 60));
   }
   template <typename T, FMT_ENABLE_IF(has_member_data_tm_gmtoff<T>::value)>
-  void format_utc_offset_impl(const T& tm) {
-    write_utc_offset(tm.tm_gmtoff);
+  void format_utc_offset_impl(const T& tm, numeric_system ns) {
+    write_utc_offset(tm.tm_gmtoff, ns);
   }
   template <typename T, FMT_ENABLE_IF(!has_member_data_tm_gmtoff<T>::value)>
-  void format_utc_offset_impl(const T& tm) {
+  void format_utc_offset_impl(const T& tm, numeric_system ns) {
 #if defined(_WIN32) && defined(_UCRT)
 #  if FMT_USE_TZSET
     tzset_once();
@@ -1102,10 +1276,17 @@ template <typename OutputIt, typename Char> class tm_writer {
       _get_dstbias(&dstbias);
       offset += dstbias;
     }
-    write_utc_offset(-offset);
+    write_utc_offset(-offset, ns);
 #else
-    ignore_unused(tm);
-    format_localized('z');
+    if (ns == numeric_system::standard) return format_localized('z');
+
+    // Extract timezone offset from timezone conversion functions.
+    std::tm gtm = tm;
+    std::time_t gt = std::mktime(&gtm);
+    std::tm ltm = gmtime(gt);
+    std::time_t lt = std::mktime(&ltm);
+    long offset = gt - lt;
+    write_utc_offset(offset, ns);
 #endif
   }
 
@@ -1126,10 +1307,12 @@ template <typename OutputIt, typename Char> class tm_writer {
   }
 
  public:
-  tm_writer(const std::locale& loc, OutputIt out, const std::tm& tm)
+  tm_writer(const std::locale& loc, OutputIt out, const std::tm& tm,
+            const Duration* subsecs = nullptr)
       : loc_(loc),
         is_classic_(loc_ == get_classic_locale()),
         out_(out),
+        subsecs_(subsecs),
         tm_(tm) {}
 
   OutputIt out() const { return out_; }
@@ -1227,7 +1410,7 @@ template <typename OutputIt, typename Char> class tm_writer {
     out_ = copy_str<Char>(std::begin(buf) + offset, std::end(buf), out_);
   }
 
-  void on_utc_offset() { format_utc_offset_impl(tm_); }
+  void on_utc_offset(numeric_system ns) { format_utc_offset_impl(tm_, ns); }
   void on_tz_name() { format_tz_name_impl(tm_); }
 
   void on_year(numeric_system ns) {
@@ -1315,22 +1498,41 @@ template <typename OutputIt, typename Char> class tm_writer {
     }
   }
 
-  void on_24_hour(numeric_system ns) {
-    if (is_classic_ || ns == numeric_system::standard) return write2(tm_hour());
+  void on_24_hour(numeric_system ns, pad_type pad) {
+    if (is_classic_ || ns == numeric_system::standard)
+      return write2(tm_hour(), pad);
     format_localized('H', 'O');
   }
-  void on_12_hour(numeric_system ns) {
+  void on_12_hour(numeric_system ns, pad_type pad) {
     if (is_classic_ || ns == numeric_system::standard)
-      return write2(tm_hour12());
+      return write2(tm_hour12(), pad);
     format_localized('I', 'O');
   }
-  void on_minute(numeric_system ns) {
-    if (is_classic_ || ns == numeric_system::standard) return write2(tm_min());
+  void on_minute(numeric_system ns, pad_type pad) {
+    if (is_classic_ || ns == numeric_system::standard)
+      return write2(tm_min(), pad);
     format_localized('M', 'O');
   }
-  void on_second(numeric_system ns) {
-    if (is_classic_ || ns == numeric_system::standard) return write2(tm_sec());
-    format_localized('S', 'O');
+
+  void on_second(numeric_system ns, pad_type pad) {
+    if (is_classic_ || ns == numeric_system::standard) {
+      write2(tm_sec(), pad);
+      if (subsecs_) {
+        if (std::is_floating_point<typename Duration::rep>::value) {
+          auto buf = memory_buffer();
+          write_floating_seconds(buf, *subsecs_);
+          if (buf.size() > 1) {
+            // Remove the leading "0", write something like ".123".
+            out_ = std::copy(buf.begin() + 1, buf.end(), out_);
+          }
+        } else {
+          write_fractional_seconds<Char>(out_, *subsecs_);
+        }
+      }
+    } else {
+      // Currently no formatting of subseconds when a locale is set.
+      format_localized('S', 'O');
+    }
   }
 
   void on_12_hour_time() {
@@ -1351,10 +1553,9 @@ template <typename OutputIt, typename Char> class tm_writer {
     write2(tm_min());
   }
   void on_iso_time() {
-    char buf[8];
-    write_digit2_separated(buf, to_unsigned(tm_hour()), to_unsigned(tm_min()),
-                           to_unsigned(tm_sec()), ':');
-    out_ = copy_str<Char>(std::begin(buf), std::end(buf), out_);
+    on_24_hour_time();
+    *out_++ = ':';
+    on_second(numeric_system::standard, pad_type::unspecified);
   }
 
   void on_am_pm() {
@@ -1372,43 +1573,34 @@ template <typename OutputIt, typename Char> class tm_writer {
 };
 
 struct chrono_format_checker : null_chrono_spec_handler<chrono_format_checker> {
+  bool has_precision_integral = false;
+
   FMT_NORETURN void unsupported() { FMT_THROW(format_error("no date")); }
 
   template <typename Char>
   FMT_CONSTEXPR void on_text(const Char*, const Char*) {}
-  FMT_CONSTEXPR void on_24_hour(numeric_system) {}
-  FMT_CONSTEXPR void on_12_hour(numeric_system) {}
-  FMT_CONSTEXPR void on_minute(numeric_system) {}
-  FMT_CONSTEXPR void on_second(numeric_system) {}
+  FMT_CONSTEXPR void on_24_hour(numeric_system, pad_type) {}
+  FMT_CONSTEXPR void on_12_hour(numeric_system, pad_type) {}
+  FMT_CONSTEXPR void on_minute(numeric_system, pad_type) {}
+  FMT_CONSTEXPR void on_second(numeric_system, pad_type) {}
   FMT_CONSTEXPR void on_12_hour_time() {}
   FMT_CONSTEXPR void on_24_hour_time() {}
   FMT_CONSTEXPR void on_iso_time() {}
   FMT_CONSTEXPR void on_am_pm() {}
-  FMT_CONSTEXPR void on_duration_value() {}
+  FMT_CONSTEXPR void on_duration_value() const {
+    if (has_precision_integral) {
+      FMT_THROW(format_error("precision not allowed for this argument type"));
+    }
+  }
   FMT_CONSTEXPR void on_duration_unit() {}
 };
 
-template <typename T, FMT_ENABLE_IF(std::is_integral<T>::value)>
+template <typename T,
+          FMT_ENABLE_IF(std::is_integral<T>::value&& has_isfinite<T>::value)>
 inline bool isfinite(T) {
   return true;
 }
 
-// Converts value to Int and checks that it's in the range [0, upper).
-template <typename T, typename Int, FMT_ENABLE_IF(std::is_integral<T>::value)>
-inline Int to_nonnegative_int(T value, Int upper) {
-  FMT_ASSERT(std::is_unsigned<Int>::value ||
-             (value >= 0 && to_unsigned(value) <= to_unsigned(upper)),
-             "invalid value");
-  (void)upper;
-  return static_cast<Int>(value);
-}
-template <typename T, typename Int, FMT_ENABLE_IF(!std::is_integral<T>::value)>
-inline Int to_nonnegative_int(T value, Int upper) {
-  if (value < 0 || value > static_cast<T>(upper))
-    FMT_THROW(format_error("invalid value"));
-  return static_cast<Int>(value);
-}
-
 template <typename T, FMT_ENABLE_IF(std::is_integral<T>::value)>
 inline T mod(T x, int y) {
   return x % static_cast<T>(y);
@@ -1463,47 +1655,6 @@ inline std::chrono::duration<Rep, std::milli> get_milliseconds(
 #endif
 }
 
-// Counts the number of fractional digits in the range [0, 18] according to the
-// C++20 spec. If more than 18 fractional digits are required then returns 6 for
-// microseconds precision.
-template <long long Num, long long Den, int N = 0,
-          bool Enabled = (N < 19) && (Num <= max_value<long long>() / 10)>
-struct count_fractional_digits {
-  static constexpr int value =
-      Num % Den == 0 ? N : count_fractional_digits<Num * 10, Den, N + 1>::value;
-};
-
-// Base case that doesn't instantiate any more templates
-// in order to avoid overflow.
-template <long long Num, long long Den, int N>
-struct count_fractional_digits<Num, Den, N, false> {
-  static constexpr int value = (Num % Den == 0) ? N : 6;
-};
-
-constexpr long long pow10(std::uint32_t n) {
-  return n == 0 ? 1 : 10 * pow10(n - 1);
-}
-
-template <class Rep, class Period,
-          FMT_ENABLE_IF(std::numeric_limits<Rep>::is_signed)>
-constexpr std::chrono::duration<Rep, Period> abs(
-    std::chrono::duration<Rep, Period> d) {
-  // We need to compare the duration using the count() method directly
-  // due to a compiler bug in clang-11 regarding the spaceship operator,
-  // when -Wzero-as-null-pointer-constant is enabled.
-  // In clang-12 the bug has been fixed. See
-  // https://bugs.llvm.org/show_bug.cgi?id=46235 and the reproducible example:
-  // https://www.godbolt.org/z/Knbb5joYx.
-  return d.count() >= d.zero().count() ? d : -d;
-}
-
-template <class Rep, class Period,
-          FMT_ENABLE_IF(!std::numeric_limits<Rep>::is_signed)>
-constexpr std::chrono::duration<Rep, Period> abs(
-    std::chrono::duration<Rep, Period> d) {
-  return d;
-}
-
 template <typename Char, typename Rep, typename OutputIt,
           FMT_ENABLE_IF(std::is_integral<Rep>::value)>
 OutputIt format_duration_value(OutputIt out, Rep val, int) {
@@ -1513,7 +1664,7 @@ OutputIt format_duration_value(OutputIt out, Rep val, int) {
 template <typename Char, typename Rep, typename OutputIt,
           FMT_ENABLE_IF(std::is_floating_point<Rep>::value)>
 OutputIt format_duration_value(OutputIt out, Rep val, int precision) {
-  auto specs = basic_format_specs<Char>();
+  auto specs = format_specs<Char>();
   specs.precision = precision;
   specs.type = precision >= 0 ? presentation_type::fixed_lower
                               : presentation_type::general_lower;
@@ -1654,44 +1805,16 @@ struct chrono_formatter {
     }
   }
 
-  void write(Rep value, int width) {
+  void write(Rep value, int width, pad_type pad = pad_type::unspecified) {
     write_sign();
     if (isnan(value)) return write_nan();
     uint32_or_64_or_128_t<int> n =
         to_unsigned(to_nonnegative_int(value, max_value<int>()));
     int num_digits = detail::count_digits(n);
-    if (width > num_digits) out = std::fill_n(out, width - num_digits, '0');
-    out = format_decimal<char_type>(out, n, num_digits).end;
-  }
-
-  template <typename Duration> void write_fractional_seconds(Duration d) {
-    FMT_ASSERT(!std::is_floating_point<typename Duration::rep>::value, "");
-    constexpr auto num_fractional_digits =
-        count_fractional_digits<Duration::period::num,
-                                Duration::period::den>::value;
-
-    using subsecond_precision = std::chrono::duration<
-        typename std::common_type<typename Duration::rep,
-                                  std::chrono::seconds::rep>::type,
-        std::ratio<1, detail::pow10(num_fractional_digits)>>;
-    if (std::ratio_less<typename subsecond_precision::period,
-                        std::chrono::seconds::period>::value) {
-      *out++ = '.';
-      auto fractional =
-          detail::abs(d) - std::chrono::duration_cast<std::chrono::seconds>(d);
-      auto subseconds =
-          std::chrono::treat_as_floating_point<
-              typename subsecond_precision::rep>::value
-              ? fractional.count()
-              : std::chrono::duration_cast<subsecond_precision>(fractional)
-                    .count();
-      uint32_or_64_or_128_t<long long> n =
-          to_unsigned(to_nonnegative_int(subseconds, max_value<long long>()));
-      int num_digits = detail::count_digits(n);
-      if (num_fractional_digits > num_digits)
-        out = std::fill_n(out, num_fractional_digits - num_digits, '0');
-      out = format_decimal<char_type>(out, n, num_digits).end;
+    if (width > num_digits) {
+      out = detail::write_padding(out, pad, width - num_digits);
     }
+    out = format_decimal<char_type>(out, n, num_digits).end;
   }
 
   void write_nan() { std::copy_n("nan", 3, out); }
@@ -1723,7 +1846,7 @@ struct chrono_formatter {
   void on_loc_time(numeric_system) {}
   void on_us_date() {}
   void on_iso_date() {}
-  void on_utc_offset() {}
+  void on_utc_offset(numeric_system) {}
   void on_tz_name() {}
   void on_year(numeric_system) {}
   void on_short_year(numeric_system) {}
@@ -1739,58 +1862,56 @@ struct chrono_formatter {
   void on_day_of_month(numeric_system) {}
   void on_day_of_month_space(numeric_system) {}
 
-  void on_24_hour(numeric_system ns) {
+  void on_24_hour(numeric_system ns, pad_type pad) {
     if (handle_nan_inf()) return;
 
-    if (ns == numeric_system::standard) return write(hour(), 2);
+    if (ns == numeric_system::standard) return write(hour(), 2, pad);
     auto time = tm();
     time.tm_hour = to_nonnegative_int(hour(), 24);
-    format_tm(time, &tm_writer_type::on_24_hour, ns);
+    format_tm(time, &tm_writer_type::on_24_hour, ns, pad);
   }
 
-  void on_12_hour(numeric_system ns) {
+  void on_12_hour(numeric_system ns, pad_type pad) {
     if (handle_nan_inf()) return;
 
-    if (ns == numeric_system::standard) return write(hour12(), 2);
+    if (ns == numeric_system::standard) return write(hour12(), 2, pad);
     auto time = tm();
     time.tm_hour = to_nonnegative_int(hour12(), 12);
-    format_tm(time, &tm_writer_type::on_12_hour, ns);
+    format_tm(time, &tm_writer_type::on_12_hour, ns, pad);
   }
 
-  void on_minute(numeric_system ns) {
+  void on_minute(numeric_system ns, pad_type pad) {
     if (handle_nan_inf()) return;
 
-    if (ns == numeric_system::standard) return write(minute(), 2);
+    if (ns == numeric_system::standard) return write(minute(), 2, pad);
     auto time = tm();
     time.tm_min = to_nonnegative_int(minute(), 60);
-    format_tm(time, &tm_writer_type::on_minute, ns);
+    format_tm(time, &tm_writer_type::on_minute, ns, pad);
   }
 
-  void on_second(numeric_system ns) {
+  void on_second(numeric_system ns, pad_type pad) {
     if (handle_nan_inf()) return;
 
     if (ns == numeric_system::standard) {
       if (std::is_floating_point<rep>::value) {
-        constexpr auto num_fractional_digits =
-            count_fractional_digits<Period::num, Period::den>::value;
         auto buf = memory_buffer();
-        format_to(std::back_inserter(buf), runtime("{:.{}f}"),
-                  std::fmod(val * static_cast<rep>(Period::num) /
-                                static_cast<rep>(Period::den),
-                            static_cast<rep>(60)),
-                  num_fractional_digits);
+        write_floating_seconds(buf, std::chrono::duration<rep, Period>(val),
+                               precision);
         if (negative) *out++ = '-';
-        if (buf.size() < 2 || buf[1] == '.') *out++ = '0';
+        if (buf.size() < 2 || buf[1] == '.') {
+          out = detail::write_padding(out, pad);
+        }
         out = std::copy(buf.begin(), buf.end(), out);
       } else {
-        write(second(), 2);
-        write_fractional_seconds(std::chrono::duration<rep, Period>(val));
+        write(second(), 2, pad);
+        write_fractional_seconds<char_type>(
+            out, std::chrono::duration<rep, Period>(val), precision);
       }
       return;
     }
     auto time = tm();
     time.tm_sec = to_nonnegative_int(second(), 60);
-    format_tm(time, &tm_writer_type::on_second, ns);
+    format_tm(time, &tm_writer_type::on_second, ns, pad);
   }
 
   void on_12_hour_time() {
@@ -1814,7 +1935,7 @@ struct chrono_formatter {
     on_24_hour_time();
     *out++ = ':';
     if (handle_nan_inf()) return;
-    on_second(numeric_system::standard);
+    on_second(numeric_system::standard, pad_type::unspecified);
   }
 
   void on_am_pm() {
@@ -1833,7 +1954,7 @@ struct chrono_formatter {
   }
 };
 
-FMT_END_DETAIL_NAMESPACE
+}  // namespace detail
 
 #if defined(__cpp_lib_chrono) && __cpp_lib_chrono >= 201907
 using weekday = std::chrono::weekday;
@@ -1883,118 +2004,67 @@ template <typename Char> struct formatter<weekday, Char> {
 template <typename Rep, typename Period, typename Char>
 struct formatter<std::chrono::duration<Rep, Period>, Char> {
  private:
-  basic_format_specs<Char> specs;
-  int precision = -1;
-  using arg_ref_type = detail::arg_ref<Char>;
-  arg_ref_type width_ref;
-  arg_ref_type precision_ref;
-  bool localized = false;
-  basic_string_view<Char> format_str;
-  using duration = std::chrono::duration<Rep, Period>;
-
-  struct spec_handler {
-    formatter& f;
-    basic_format_parse_context<Char>& context;
-    basic_string_view<Char> format_str;
-
-    template <typename Id> FMT_CONSTEXPR arg_ref_type make_arg_ref(Id arg_id) {
-      context.check_arg_id(arg_id);
-      return arg_ref_type(arg_id);
-    }
-
-    FMT_CONSTEXPR arg_ref_type make_arg_ref(basic_string_view<Char> arg_id) {
-      context.check_arg_id(arg_id);
-      return arg_ref_type(arg_id);
-    }
-
-    FMT_CONSTEXPR arg_ref_type make_arg_ref(detail::auto_id) {
-      return arg_ref_type(context.next_arg_id());
-    }
+  format_specs<Char> specs_;
+  detail::arg_ref<Char> width_ref_;
+  detail::arg_ref<Char> precision_ref_;
+  bool localized_ = false;
+  basic_string_view<Char> format_str_;
 
-    void on_error(const char* msg) { FMT_THROW(format_error(msg)); }
-    FMT_CONSTEXPR void on_fill(basic_string_view<Char> fill) {
-      f.specs.fill = fill;
-    }
-    FMT_CONSTEXPR void on_align(align_t align) { f.specs.align = align; }
-    FMT_CONSTEXPR void on_width(int width) { f.specs.width = width; }
-    FMT_CONSTEXPR void on_precision(int _precision) {
-      f.precision = _precision;
-    }
-    FMT_CONSTEXPR void end_precision() {}
+ public:
+  FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
+      -> decltype(ctx.begin()) {
+    auto it = ctx.begin(), end = ctx.end();
+    if (it == end || *it == '}') return it;
 
-    template <typename Id> FMT_CONSTEXPR void on_dynamic_width(Id arg_id) {
-      f.width_ref = make_arg_ref(arg_id);
-    }
+    it = detail::parse_align(it, end, specs_);
+    if (it == end) return it;
 
-    template <typename Id> FMT_CONSTEXPR void on_dynamic_precision(Id arg_id) {
-      f.precision_ref = make_arg_ref(arg_id);
-    }
-  };
+    it = detail::parse_dynamic_spec(it, end, specs_.width, width_ref_, ctx);
+    if (it == end) return it;
 
-  using iterator = typename basic_format_parse_context<Char>::iterator;
-  struct parse_range {
-    iterator begin;
-    iterator end;
-  };
-
-  FMT_CONSTEXPR parse_range do_parse(basic_format_parse_context<Char>& ctx) {
-    auto begin = ctx.begin(), end = ctx.end();
-    if (begin == end || *begin == '}') return {begin, begin};
-    spec_handler handler{*this, ctx, format_str};
-    begin = detail::parse_align(begin, end, handler);
-    if (begin == end) return {begin, begin};
-    begin = detail::parse_width(begin, end, handler);
-    if (begin == end) return {begin, begin};
-    if (*begin == '.') {
-      if (std::is_floating_point<Rep>::value)
-        begin = detail::parse_precision(begin, end, handler);
-      else
-        handler.on_error("precision not allowed for this argument type");
+    auto checker = detail::chrono_format_checker();
+    if (*it == '.') {
+      checker.has_precision_integral = !std::is_floating_point<Rep>::value;
+      it = detail::parse_precision(it, end, specs_.precision, precision_ref_,
+                                   ctx);
     }
-    if (begin != end && *begin == 'L') {
-      ++begin;
-      localized = true;
+    if (it != end && *it == 'L') {
+      localized_ = true;
+      ++it;
     }
-    end = detail::parse_chrono_format(begin, end,
-                                      detail::chrono_format_checker());
-    return {begin, end};
-  }
-
- public:
-  FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
-      -> decltype(ctx.begin()) {
-    auto range = do_parse(ctx);
-    format_str = basic_string_view<Char>(
-        &*range.begin, detail::to_unsigned(range.end - range.begin));
-    return range.end;
+    end = detail::parse_chrono_format(it, end, checker);
+    format_str_ = {it, detail::to_unsigned(end - it)};
+    return end;
   }
 
   template <typename FormatContext>
-  auto format(const duration& d, FormatContext& ctx) const
+  auto format(std::chrono::duration<Rep, Period> d, FormatContext& ctx) const
       -> decltype(ctx.out()) {
-    auto specs_copy = specs;
-    auto precision_copy = precision;
-    auto begin = format_str.begin(), end = format_str.end();
+    auto specs = specs_;
+    auto precision = specs.precision;
+    specs.precision = -1;
+    auto begin = format_str_.begin(), end = format_str_.end();
     // As a possible future optimization, we could avoid extra copying if width
     // is not specified.
-    basic_memory_buffer<Char> buf;
+    auto buf = basic_memory_buffer<Char>();
     auto out = std::back_inserter(buf);
-    detail::handle_dynamic_spec<detail::width_checker>(specs_copy.width,
-                                                       width_ref, ctx);
-    detail::handle_dynamic_spec<detail::precision_checker>(precision_copy,
-                                                           precision_ref, ctx);
+    detail::handle_dynamic_spec<detail::width_checker>(specs.width, width_ref_,
+                                                       ctx);
+    detail::handle_dynamic_spec<detail::precision_checker>(precision,
+                                                           precision_ref_, ctx);
     if (begin == end || *begin == '}') {
-      out = detail::format_duration_value<Char>(out, d.count(), precision_copy);
+      out = detail::format_duration_value<Char>(out, d.count(), precision);
       detail::format_duration_unit<Char, Period>(out);
     } else {
-      detail::chrono_formatter<FormatContext, decltype(out), Rep, Period> f(
-          ctx, out, d);
-      f.precision = precision_copy;
-      f.localized = localized;
+      using chrono_formatter =
+          detail::chrono_formatter<FormatContext, decltype(out), Rep, Period>;
+      auto f = chrono_formatter(ctx, out, d);
+      f.precision = precision;
+      f.localized = localized_;
       detail::parse_chrono_format(begin, end, f);
     }
     return detail::write(
-        ctx.out(), basic_string_view<Char>(buf.data(), buf.size()), specs_copy);
+        ctx.out(), basic_string_view<Char>(buf.data(), buf.size()), specs);
   }
 };
 
@@ -2002,68 +2072,137 @@ template <typename Char, typename Duration>
 struct formatter<std::chrono::time_point<std::chrono::system_clock, Duration>,
                  Char> : formatter<std::tm, Char> {
   FMT_CONSTEXPR formatter() {
-    basic_string_view<Char> default_specs =
-        detail::string_literal<Char, '%', 'F', ' ', '%', 'T'>{};
-    this->do_parse(default_specs.begin(), default_specs.end());
+    this->format_str_ = detail::string_literal<Char, '%', 'F', ' ', '%', 'T'>{};
   }
 
   template <typename FormatContext>
-  auto format(std::chrono::time_point<std::chrono::system_clock> val,
+  auto format(std::chrono::time_point<std::chrono::system_clock, Duration> val,
               FormatContext& ctx) const -> decltype(ctx.out()) {
-    return formatter<std::tm, Char>::format(localtime(val), ctx);
+    using period = typename Duration::period;
+    if (detail::const_check(
+            period::num != 1 || period::den != 1 ||
+            std::is_floating_point<typename Duration::rep>::value)) {
+      const auto epoch = val.time_since_epoch();
+      auto subsecs = std::chrono::duration_cast<Duration>(
+          epoch - std::chrono::duration_cast<std::chrono::seconds>(epoch));
+
+      if (subsecs.count() < 0) {
+        auto second =
+            std::chrono::duration_cast<Duration>(std::chrono::seconds(1));
+        if (epoch.count() < ((Duration::min)() + second).count())
+          FMT_THROW(format_error("duration is too small"));
+        subsecs += second;
+        val -= second;
+      }
+
+      return formatter<std::tm, Char>::do_format(
+          gmtime(std::chrono::time_point_cast<std::chrono::seconds>(val)), ctx,
+          &subsecs);
+    }
+
+    return formatter<std::tm, Char>::format(
+        gmtime(std::chrono::time_point_cast<std::chrono::seconds>(val)), ctx);
   }
 };
 
+#if FMT_USE_LOCAL_TIME
+template <typename Char, typename Duration>
+struct formatter<std::chrono::local_time<Duration>, Char>
+    : formatter<std::tm, Char> {
+  FMT_CONSTEXPR formatter() {
+    this->format_str_ = detail::string_literal<Char, '%', 'F', ' ', '%', 'T'>{};
+  }
+
+  template <typename FormatContext>
+  auto format(std::chrono::local_time<Duration> val, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    using period = typename Duration::period;
+    if (period::num != 1 || period::den != 1 ||
+        std::is_floating_point<typename Duration::rep>::value) {
+      const auto epoch = val.time_since_epoch();
+      const auto subsecs = std::chrono::duration_cast<Duration>(
+          epoch - std::chrono::duration_cast<std::chrono::seconds>(epoch));
+
+      return formatter<std::tm, Char>::do_format(
+          localtime(std::chrono::time_point_cast<std::chrono::seconds>(val)),
+          ctx, &subsecs);
+    }
+
+    return formatter<std::tm, Char>::format(
+        localtime(std::chrono::time_point_cast<std::chrono::seconds>(val)),
+        ctx);
+  }
+};
+#endif
+
+#if FMT_USE_UTC_TIME
+template <typename Char, typename Duration>
+struct formatter<std::chrono::time_point<std::chrono::utc_clock, Duration>,
+                 Char>
+    : formatter<std::chrono::time_point<std::chrono::system_clock, Duration>,
+                Char> {
+  template <typename FormatContext>
+  auto format(std::chrono::time_point<std::chrono::utc_clock, Duration> val,
+              FormatContext& ctx) const -> decltype(ctx.out()) {
+    return formatter<
+        std::chrono::time_point<std::chrono::system_clock, Duration>,
+        Char>::format(std::chrono::utc_clock::to_sys(val), ctx);
+  }
+};
+#endif
+
 template <typename Char> struct formatter<std::tm, Char> {
  private:
-  enum class spec {
-    unknown,
-    year_month_day,
-    hh_mm_ss,
-  };
-  spec spec_ = spec::unknown;
-  basic_string_view<Char> specs;
+  format_specs<Char> specs_;
+  detail::arg_ref<Char> width_ref_;
 
  protected:
-  template <typename It> FMT_CONSTEXPR auto do_parse(It begin, It end) -> It {
-    if (begin != end && *begin == ':') ++begin;
-    end = detail::parse_chrono_format(begin, end, detail::tm_format_checker());
-    // Replace default spec only if the new spec is not empty.
-    if (end != begin) specs = {begin, detail::to_unsigned(end - begin)};
-    return end;
+  basic_string_view<Char> format_str_;
+
+  template <typename FormatContext, typename Duration>
+  auto do_format(const std::tm& tm, FormatContext& ctx,
+                 const Duration* subsecs) const -> decltype(ctx.out()) {
+    auto specs = specs_;
+    auto buf = basic_memory_buffer<Char>();
+    auto out = std::back_inserter(buf);
+    detail::handle_dynamic_spec<detail::width_checker>(specs.width, width_ref_,
+                                                       ctx);
+
+    auto loc_ref = ctx.locale();
+    detail::get_locale loc(static_cast<bool>(loc_ref), loc_ref);
+    auto w =
+        detail::tm_writer<decltype(out), Char, Duration>(loc, out, tm, subsecs);
+    detail::parse_chrono_format(format_str_.begin(), format_str_.end(), w);
+    return detail::write(
+        ctx.out(), basic_string_view<Char>(buf.data(), buf.size()), specs);
   }
 
  public:
   FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
       -> decltype(ctx.begin()) {
-    auto end = this->do_parse(ctx.begin(), ctx.end());
-    // basic_string_view<>::compare isn't constexpr before C++17.
-    if (specs.size() == 2 && specs[0] == Char('%')) {
-      if (specs[1] == Char('F'))
-        spec_ = spec::year_month_day;
-      else if (specs[1] == Char('T'))
-        spec_ = spec::hh_mm_ss;
-    }
+    auto it = ctx.begin(), end = ctx.end();
+    if (it == end || *it == '}') return it;
+
+    it = detail::parse_align(it, end, specs_);
+    if (it == end) return it;
+
+    it = detail::parse_dynamic_spec(it, end, specs_.width, width_ref_, ctx);
+    if (it == end) return it;
+
+    end = detail::parse_chrono_format(it, end, detail::tm_format_checker());
+    // Replace the default format_str only if the new spec is not empty.
+    if (end != it) format_str_ = {it, detail::to_unsigned(end - it)};
     return end;
   }
 
   template <typename FormatContext>
   auto format(const std::tm& tm, FormatContext& ctx) const
       -> decltype(ctx.out()) {
-    const auto loc_ref = ctx.locale();
-    detail::get_locale loc(static_cast<bool>(loc_ref), loc_ref);
-    auto w = detail::tm_writer<decltype(ctx.out()), Char>(loc, ctx.out(), tm);
-    if (spec_ == spec::year_month_day)
-      w.on_iso_date();
-    else if (spec_ == spec::hh_mm_ss)
-      w.on_iso_time();
-    else
-      detail::parse_chrono_format(specs.begin(), specs.end(), w);
-    return w.out();
+    return do_format<FormatContext, std::chrono::seconds>(tm, ctx, nullptr);
   }
 };
 
-FMT_MODULE_EXPORT_END
+FMT_END_EXPORT
 FMT_END_NAMESPACE
 
 #endif  // FMT_CHRONO_H_
diff --git a/contrib/fmt/include/fmt/color.h b/contrib/fmt/include/fmt/color.h
index 4c163277e..8697e1ca0 100644
--- a/contrib/fmt/include/fmt/color.h
+++ b/contrib/fmt/include/fmt/color.h
@@ -11,7 +11,7 @@
 #include "format.h"
 
 FMT_BEGIN_NAMESPACE
-FMT_MODULE_EXPORT_BEGIN
+FMT_BEGIN_EXPORT
 
 enum class color : uint32_t {
   alice_blue = 0xF0F8FF,               // rgb(240,248,255)
@@ -203,7 +203,7 @@ struct rgb {
   uint8_t b;
 };
 
-FMT_BEGIN_DETAIL_NAMESPACE
+namespace detail {
 
 // color is a struct of either a rgb color or a terminal color.
 struct color_type {
@@ -225,8 +225,7 @@ struct color_type {
     uint32_t rgb_color;
   } value;
 };
-
-FMT_END_DETAIL_NAMESPACE
+}  // namespace detail
 
 /** A text style consisting of foreground and background colors and emphasis. */
 class text_style {
@@ -323,7 +322,7 @@ FMT_CONSTEXPR inline text_style operator|(emphasis lhs, emphasis rhs) noexcept {
   return text_style(lhs) | rhs;
 }
 
-FMT_BEGIN_DETAIL_NAMESPACE
+namespace detail {
 
 template <typename Char> struct ansi_color_escape {
   FMT_CONSTEXPR ansi_color_escape(detail::color_type text_color,
@@ -423,26 +422,6 @@ FMT_CONSTEXPR ansi_color_escape<Char> make_emphasis(emphasis em) noexcept {
   return ansi_color_escape<Char>(em);
 }
 
-template <typename Char> inline void fputs(const Char* chars, FILE* stream) {
-  int result = std::fputs(chars, stream);
-  if (result < 0)
-    FMT_THROW(system_error(errno, FMT_STRING("cannot write to file")));
-}
-
-template <> inline void fputs<wchar_t>(const wchar_t* chars, FILE* stream) {
-  int result = std::fputws(chars, stream);
-  if (result < 0)
-    FMT_THROW(system_error(errno, FMT_STRING("cannot write to file")));
-}
-
-template <typename Char> inline void reset_color(FILE* stream) {
-  fputs("\x1b[0m", stream);
-}
-
-template <> inline void reset_color<wchar_t>(FILE* stream) {
-  fputs(L"\x1b[0m", stream);
-}
-
 template <typename Char> inline void reset_color(buffer<Char>& buffer) {
   auto reset_color = string_view("\x1b[0m");
   buffer.append(reset_color.begin(), reset_color.end());
@@ -477,19 +456,21 @@ void vformat_to(buffer<Char>& buf, const text_style& ts,
   if (has_style) detail::reset_color<Char>(buf);
 }
 
-FMT_END_DETAIL_NAMESPACE
+}  // namespace detail
 
-template <typename S, typename Char = char_t<S>>
-void vprint(std::FILE* f, const text_style& ts, const S& format,
-            basic_format_args<buffer_context<type_identity_t<Char>>> args) {
-  basic_memory_buffer<Char> buf;
-  detail::vformat_to(buf, ts, detail::to_string_view(format), args);
+inline void vprint(std::FILE* f, const text_style& ts, string_view fmt,
+                   format_args args) {
+  // Legacy wide streams are not supported.
+  auto buf = memory_buffer();
+  detail::vformat_to(buf, ts, fmt, args);
   if (detail::is_utf8()) {
-    detail::print(f, basic_string_view<Char>(buf.begin(), buf.size()));
-  } else {
-    buf.push_back(Char(0));
-    detail::fputs(buf.data(), f);
+    detail::print(f, string_view(buf.begin(), buf.size()));
+    return;
   }
+  buf.push_back('\0');
+  int result = std::fputs(buf.data(), f);
+  if (result < 0)
+    FMT_THROW(system_error(errno, FMT_STRING("cannot write to file")));
 }
 
 /**
@@ -566,7 +547,7 @@ OutputIt vformat_to(
     basic_format_args<buffer_context<type_identity_t<Char>>> args) {
   auto&& buf = detail::get_buffer<Char>(out);
   detail::vformat_to(buf, ts, format_str, args);
-  return detail::get_iterator(buf);
+  return detail::get_iterator(buf, out);
 }
 
 /**
@@ -645,7 +626,7 @@ FMT_CONSTEXPR auto styled(const T& value, text_style ts)
   return detail::styled_arg<remove_cvref_t<T>>{value, ts};
 }
 
-FMT_MODULE_EXPORT_END
+FMT_END_EXPORT
 FMT_END_NAMESPACE
 
 #endif  // FMT_COLOR_H_
diff --git a/contrib/fmt/include/fmt/compile.h b/contrib/fmt/include/fmt/compile.h
index 933668c41..a4c7e4956 100644
--- a/contrib/fmt/include/fmt/compile.h
+++ b/contrib/fmt/include/fmt/compile.h
@@ -19,84 +19,6 @@ FMT_CONSTEXPR inline counting_iterator copy_str(InputIt begin, InputIt end,
   return it + (end - begin);
 }
 
-template <typename OutputIt> class truncating_iterator_base {
- protected:
-  OutputIt out_;
-  size_t limit_;
-  size_t count_ = 0;
-
-  truncating_iterator_base() : out_(), limit_(0) {}
-
-  truncating_iterator_base(OutputIt out, size_t limit)
-      : out_(out), limit_(limit) {}
-
- public:
-  using iterator_category = std::output_iterator_tag;
-  using value_type = typename std::iterator_traits<OutputIt>::value_type;
-  using difference_type = std::ptrdiff_t;
-  using pointer = void;
-  using reference = void;
-  FMT_UNCHECKED_ITERATOR(truncating_iterator_base);
-
-  OutputIt base() const { return out_; }
-  size_t count() const { return count_; }
-};
-
-// An output iterator that truncates the output and counts the number of objects
-// written to it.
-template <typename OutputIt,
-          typename Enable = typename std::is_void<
-              typename std::iterator_traits<OutputIt>::value_type>::type>
-class truncating_iterator;
-
-template <typename OutputIt>
-class truncating_iterator<OutputIt, std::false_type>
-    : public truncating_iterator_base<OutputIt> {
-  mutable typename truncating_iterator_base<OutputIt>::value_type blackhole_;
-
- public:
-  using value_type = typename truncating_iterator_base<OutputIt>::value_type;
-
-  truncating_iterator() = default;
-
-  truncating_iterator(OutputIt out, size_t limit)
-      : truncating_iterator_base<OutputIt>(out, limit) {}
-
-  truncating_iterator& operator++() {
-    if (this->count_++ < this->limit_) ++this->out_;
-    return *this;
-  }
-
-  truncating_iterator operator++(int) {
-    auto it = *this;
-    ++*this;
-    return it;
-  }
-
-  value_type& operator*() const {
-    return this->count_ < this->limit_ ? *this->out_ : blackhole_;
-  }
-};
-
-template <typename OutputIt>
-class truncating_iterator<OutputIt, std::true_type>
-    : public truncating_iterator_base<OutputIt> {
- public:
-  truncating_iterator() = default;
-
-  truncating_iterator(OutputIt out, size_t limit)
-      : truncating_iterator_base<OutputIt>(out, limit) {}
-
-  template <typename T> truncating_iterator& operator=(T val) {
-    if (this->count_++ < this->limit_) *this->out_++ = val;
-    return *this;
-  }
-
-  truncating_iterator& operator++() { return *this; }
-  truncating_iterator& operator++(int) { return *this; }
-  truncating_iterator& operator*() { return *this; }
-};
-
 // A compile-time string which is compiled into fast formatting code.
 class compiled_string {};
 
@@ -196,7 +118,8 @@ template <typename Char> struct code_unit {
 
   template <typename OutputIt, typename... Args>
   constexpr OutputIt format(OutputIt out, const Args&...) const {
-    return write<Char>(out, value);
+    *out++ = value;
+    return out;
   }
 };
 
@@ -220,7 +143,12 @@ template <typename Char, typename T, int N> struct field {
 
   template <typename OutputIt, typename... Args>
   constexpr OutputIt format(OutputIt out, const Args&... args) const {
-    return write<Char>(out, get_arg_checked<T, N>(args...));
+    const T& arg = get_arg_checked<T, N>(args...);
+    if constexpr (std::is_convertible_v<T, basic_string_view<Char>>) {
+      auto s = basic_string_view<Char>(arg);
+      return copy_str<Char>(s.begin(), s.end(), out);
+    }
+    return write<Char>(out, arg);
   }
 };
 
@@ -331,14 +259,14 @@ template <typename T, typename Char> struct parse_specs_result {
   int next_arg_id;
 };
 
-constexpr int manual_indexing_id = -1;
+enum { manual_indexing_id = -1 };
 
 template <typename T, typename Char>
 constexpr parse_specs_result<T, Char> parse_specs(basic_string_view<Char> str,
                                                   size_t pos, int next_arg_id) {
   str.remove_prefix(pos);
-  auto ctx = compile_parse_context<Char>(str, max_value<int>(), nullptr, {},
-                                         next_arg_id);
+  auto ctx =
+      compile_parse_context<Char>(str, max_value<int>(), nullptr, next_arg_id);
   auto f = formatter<T, Char>();
   auto end = f.parse(ctx);
   return {f, pos + fmt::detail::to_unsigned(end - str.data()),
@@ -348,22 +276,18 @@ constexpr parse_specs_result<T, Char> parse_specs(basic_string_view<Char> str,
 template <typename Char> struct arg_id_handler {
   arg_ref<Char> arg_id;
 
-  constexpr int operator()() {
+  constexpr int on_auto() {
     FMT_ASSERT(false, "handler cannot be used with automatic indexing");
     return 0;
   }
-  constexpr int operator()(int id) {
+  constexpr int on_index(int id) {
     arg_id = arg_ref<Char>(id);
     return 0;
   }
-  constexpr int operator()(basic_string_view<Char> id) {
+  constexpr int on_name(basic_string_view<Char> id) {
     arg_id = arg_ref<Char>(id);
     return 0;
   }
-
-  constexpr void on_error(const char* message) {
-    FMT_THROW(format_error(message));
-  }
 };
 
 template <typename Char> struct parse_arg_id_result {
@@ -452,20 +376,18 @@ constexpr auto compile_format_string(S format_str) {
       } else if constexpr (arg_id_result.arg_id.kind == arg_id_kind::name) {
         constexpr auto arg_index =
             get_arg_index_by_name(arg_id_result.arg_id.val.name, Args{});
-        if constexpr (arg_index != invalid_arg_index) {
+        if constexpr (arg_index >= 0) {
           constexpr auto next_id =
               ID != manual_indexing_id ? ID + 1 : manual_indexing_id;
           return parse_replacement_field_then_tail<
               decltype(get_type<arg_index, Args>::value), Args, arg_id_end_pos,
               arg_index, next_id>(format_str);
-        } else {
-          if constexpr (c == '}') {
-            return parse_tail<Args, arg_id_end_pos + 1, ID>(
-                runtime_named_field<char_type>{arg_id_result.arg_id.val.name},
-                format_str);
-          } else if constexpr (c == ':') {
-            return unknown_format();  // no type info for specs parsing
-          }
+        } else if constexpr (c == '}') {
+          return parse_tail<Args, arg_id_end_pos + 1, ID>(
+              runtime_named_field<char_type>{arg_id_result.arg_id.val.name},
+              format_str);
+        } else if constexpr (c == ':') {
+          return unknown_format();  // no type info for specs parsing
         }
       }
     }
@@ -501,7 +423,7 @@ constexpr auto compile(S format_str) {
 #endif  // defined(__cpp_if_constexpr) && defined(__cpp_return_type_deduction)
 }  // namespace detail
 
-FMT_MODULE_EXPORT_BEGIN
+FMT_BEGIN_EXPORT
 
 #if defined(__cpp_if_constexpr) && defined(__cpp_return_type_deduction)
 
@@ -568,9 +490,10 @@ template <typename OutputIt, typename S, typename... Args,
           FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
 format_to_n_result<OutputIt> format_to_n(OutputIt out, size_t n,
                                          const S& format_str, Args&&... args) {
-  auto it = fmt::format_to(detail::truncating_iterator<OutputIt>(out, n),
-                           format_str, std::forward<Args>(args)...);
-  return {it.base(), it.count()};
+  using traits = detail::fixed_buffer_traits;
+  auto buf = detail::iterator_buffer<OutputIt, char, traits>(out, n);
+  format_to(std::back_inserter(buf), format_str, std::forward<Args>(args)...);
+  return {buf.out(), buf.count()};
 }
 
 template <typename S, typename... Args,
@@ -605,7 +528,7 @@ template <detail_exported::fixed_string Str> constexpr auto operator""_cf() {
 }  // namespace literals
 #endif
 
-FMT_MODULE_EXPORT_END
+FMT_END_EXPORT
 FMT_END_NAMESPACE
 
 #endif  // FMT_COMPILE_H_
diff --git a/contrib/fmt/include/fmt/core.h b/contrib/fmt/include/fmt/core.h
index f6a37af9e..bfdca5f11 100644
--- a/contrib/fmt/include/fmt/core.h
+++ b/contrib/fmt/include/fmt/core.h
@@ -13,11 +13,12 @@
 #include <cstring>  // std::strlen
 #include <iterator>
 #include <limits>
+#include <memory>  // std::addressof
 #include <string>
 #include <type_traits>
 
 // The fmt library version in the form major * 10000 + minor * 100 + patch.
-#define FMT_VERSION 90100
+#define FMT_VERSION 100100
 
 #if defined(__clang__) && !defined(__ibmxl__)
 #  define FMT_CLANG_VERSION (__clang_major__ * 100 + __clang_minor__)
@@ -69,9 +70,7 @@
 #  define FMT_HAS_FEATURE(x) 0
 #endif
 
-#if (defined(__has_include) || FMT_ICC_VERSION >= 1600 || \
-     FMT_MSC_VERSION > 1900) &&                           \
-    !defined(__INTELLISENSE__)
+#if defined(__has_include) || FMT_ICC_VERSION >= 1600 || FMT_MSC_VERSION > 1900
 #  define FMT_HAS_INCLUDE(x) __has_include(x)
 #else
 #  define FMT_HAS_INCLUDE(x) 0
@@ -94,7 +93,7 @@
 #ifndef FMT_USE_CONSTEXPR
 #  if (FMT_HAS_FEATURE(cxx_relaxed_constexpr) || FMT_MSC_VERSION >= 1912 || \
        (FMT_GCC_VERSION >= 600 && FMT_CPLUSPLUS >= 201402L)) &&             \
-      !FMT_ICC_VERSION && !defined(__NVCC__)
+      !FMT_ICC_VERSION && (!defined(__NVCC__) || FMT_CPLUSPLUS >= 202002L)
 #    define FMT_USE_CONSTEXPR 1
 #  else
 #    define FMT_USE_CONSTEXPR 0
@@ -140,22 +139,7 @@
 #  endif
 #endif
 
-#ifndef FMT_DEPRECATED
-#  if FMT_HAS_CPP14_ATTRIBUTE(deprecated) || FMT_MSC_VERSION >= 1900
-#    define FMT_DEPRECATED [[deprecated]]
-#  else
-#    if (defined(__GNUC__) && !defined(__LCC__)) || defined(__clang__)
-#      define FMT_DEPRECATED __attribute__((deprecated))
-#    elif FMT_MSC_VERSION
-#      define FMT_DEPRECATED __declspec(deprecated)
-#    else
-#      define FMT_DEPRECATED /* deprecated */
-#    endif
-#  endif
-#endif
-
-// [[noreturn]] is disabled on MSVC and NVCC because of bogus unreachable code
-// warnings.
+// Disable [[noreturn]] on MSVC/NVCC because of bogus unreachable code warnings.
 #if FMT_EXCEPTIONS && FMT_HAS_CPP_ATTRIBUTE(noreturn) && !FMT_MSC_VERSION && \
     !defined(__NVCC__)
 #  define FMT_NORETURN [[noreturn]]
@@ -163,17 +147,6 @@
 #  define FMT_NORETURN
 #endif
 
-#if FMT_HAS_CPP17_ATTRIBUTE(fallthrough)
-#  define FMT_FALLTHROUGH [[fallthrough]]
-#elif defined(__clang__)
-#  define FMT_FALLTHROUGH [[clang::fallthrough]]
-#elif FMT_GCC_VERSION >= 700 && \
-    (!defined(__EDG_VERSION__) || __EDG_VERSION__ >= 520)
-#  define FMT_FALLTHROUGH [[gnu::fallthrough]]
-#else
-#  define FMT_FALLTHROUGH
-#endif
-
 #ifndef FMT_NODISCARD
 #  if FMT_HAS_CPP17_ATTRIBUTE(nodiscard)
 #    define FMT_NODISCARD [[nodiscard]]
@@ -182,16 +155,6 @@
 #  endif
 #endif
 
-#ifndef FMT_USE_FLOAT
-#  define FMT_USE_FLOAT 1
-#endif
-#ifndef FMT_USE_DOUBLE
-#  define FMT_USE_DOUBLE 1
-#endif
-#ifndef FMT_USE_LONG_DOUBLE
-#  define FMT_USE_LONG_DOUBLE 1
-#endif
-
 #ifndef FMT_INLINE
 #  if FMT_GCC_VERSION || FMT_CLANG_VERSION
 #    define FMT_INLINE inline __attribute__((always_inline))
@@ -200,9 +163,6 @@
 #  endif
 #endif
 
-// An inline std::forward replacement.
-#define FMT_FORWARD(...) static_cast<decltype(__VA_ARGS__)&&>(__VA_ARGS__)
-
 #ifdef _MSC_VER
 #  define FMT_UNCHECKED_ITERATOR(It) \
     using _Unchecked_type = It  // Mark iterator as checked.
@@ -213,30 +173,26 @@
 #ifndef FMT_BEGIN_NAMESPACE
 #  define FMT_BEGIN_NAMESPACE \
     namespace fmt {           \
-    inline namespace v9 {
+    inline namespace v10 {
 #  define FMT_END_NAMESPACE \
     }                       \
     }
 #endif
 
-#ifndef FMT_MODULE_EXPORT
-#  define FMT_MODULE_EXPORT
-#  define FMT_MODULE_EXPORT_BEGIN
-#  define FMT_MODULE_EXPORT_END
-#  define FMT_BEGIN_DETAIL_NAMESPACE namespace detail {
-#  define FMT_END_DETAIL_NAMESPACE }
+#ifndef FMT_EXPORT
+#  define FMT_EXPORT
+#  define FMT_BEGIN_EXPORT
+#  define FMT_END_EXPORT
 #endif
 
 #if !defined(FMT_HEADER_ONLY) && defined(_WIN32)
-#  define FMT_CLASS_API FMT_MSC_WARNING(suppress : 4275)
-#  ifdef FMT_EXPORT
+#  ifdef FMT_LIB_EXPORT
 #    define FMT_API __declspec(dllexport)
 #  elif defined(FMT_SHARED)
 #    define FMT_API __declspec(dllimport)
 #  endif
 #else
-#  define FMT_CLASS_API
-#  if defined(FMT_EXPORT) || defined(FMT_SHARED)
+#  if defined(FMT_LIB_EXPORT) || defined(FMT_SHARED)
 #    if defined(__GNUC__) || defined(__clang__)
 #      define FMT_API __attribute__((visibility("default")))
 #    endif
@@ -261,11 +217,13 @@
 #endif
 
 #ifndef FMT_CONSTEVAL
-#  if ((FMT_GCC_VERSION >= 1000 || FMT_CLANG_VERSION >= 1101) &&         \
-       FMT_CPLUSPLUS >= 202002L && !defined(__apple_build_version__)) || \
-      (defined(__cpp_consteval) &&                                       \
+#  if ((FMT_GCC_VERSION >= 1000 || FMT_CLANG_VERSION >= 1101) && \
+       (!defined(__apple_build_version__) ||                     \
+        __apple_build_version__ >= 14000029L) &&                 \
+       FMT_CPLUSPLUS >= 202002L) ||                              \
+      (defined(__cpp_consteval) &&                               \
        (!FMT_MSC_VERSION || _MSC_FULL_VER >= 193030704))
-// consteval is broken in MSVC before VS2022 and Apple clang 13.
+// consteval is broken in MSVC before VS2022 and Apple clang before 14.
 #    define FMT_CONSTEVAL consteval
 #    define FMT_HAS_CONSTEVAL
 #  else
@@ -277,7 +235,7 @@
 #  if defined(__cpp_nontype_template_args) &&                  \
       ((FMT_GCC_VERSION >= 903 && FMT_CPLUSPLUS >= 201709L) || \
        __cpp_nontype_template_args >= 201911L) &&              \
-      !defined(__NVCOMPILER)
+      !defined(__NVCOMPILER) && !defined(__LCC__)
 #    define FMT_USE_NONTYPE_TEMPLATE_ARGS 1
 #  else
 #    define FMT_USE_NONTYPE_TEMPLATE_ARGS 0
@@ -286,12 +244,12 @@
 
 // Enable minimal optimizations for more compact code in debug mode.
 FMT_GCC_PRAGMA("GCC push_options")
-#if !defined(__OPTIMIZE__) && !defined(__NVCOMPILER)
+#if !defined(__OPTIMIZE__) && !defined(__NVCOMPILER) && !defined(__LCC__) && \
+    !defined(__CUDACC__)
 FMT_GCC_PRAGMA("GCC optimize(\"Og\")")
 #endif
 
 FMT_BEGIN_NAMESPACE
-FMT_MODULE_EXPORT_BEGIN
 
 // Implementations of enable_if_t and other metafunctions for older systems.
 template <bool B, typename T = void>
@@ -310,17 +268,10 @@ template <typename T> using type_identity_t = typename type_identity<T>::type;
 template <typename T>
 using underlying_t = typename std::underlying_type<T>::type;
 
-template <typename...> struct disjunction : std::false_type {};
-template <typename P> struct disjunction<P> : P {};
-template <typename P1, typename... Pn>
-struct disjunction<P1, Pn...>
-    : conditional_t<bool(P1::value), P1, disjunction<Pn...>> {};
-
-template <typename...> struct conjunction : std::true_type {};
-template <typename P> struct conjunction<P> : P {};
-template <typename P1, typename... Pn>
-struct conjunction<P1, Pn...>
-    : conditional_t<bool(P1::value), conjunction<Pn...>, P1> {};
+// Checks whether T is a container with contiguous storage.
+template <typename T> struct is_contiguous : std::false_type {};
+template <typename Char>
+struct is_contiguous<std::basic_string<Char>> : std::true_type {};
 
 struct monostate {
   constexpr monostate() {}
@@ -332,11 +283,19 @@ struct monostate {
 #ifdef FMT_DOC
 #  define FMT_ENABLE_IF(...)
 #else
-#  define FMT_ENABLE_IF(...) enable_if_t<(__VA_ARGS__), int> = 0
+#  define FMT_ENABLE_IF(...) fmt::enable_if_t<(__VA_ARGS__), int> = 0
 #endif
 
-FMT_BEGIN_DETAIL_NAMESPACE
+// This is defined in core.h instead of format.h to avoid injecting in std.
+// It is a template to avoid undesirable implicit conversions to std::byte.
+#ifdef __cpp_lib_byte
+template <typename T, FMT_ENABLE_IF(std::is_same<T, std::byte>::value)>
+inline auto format_as(T b) -> unsigned char {
+  return static_cast<unsigned char>(b);
+}
+#endif
 
+namespace detail {
 // Suppresses "unused variable" warnings with the method described in
 // https://herbsutter.com/2009/10/18/mailbag-shutting-up-compiler-warnings/.
 // (void)var does not work on many Intel compilers.
@@ -344,7 +303,15 @@ template <typename... T> FMT_CONSTEXPR void ignore_unused(const T&...) {}
 
 constexpr FMT_INLINE auto is_constant_evaluated(
     bool default_value = false) noexcept -> bool {
-#ifdef __cpp_lib_is_constant_evaluated
+// Workaround for incompatibility between libstdc++ consteval-based
+// std::is_constant_evaluated() implementation and clang-14.
+// https://github.com/fmtlib/fmt/issues/3247
+#if FMT_CPLUSPLUS >= 202002L && defined(_GLIBCXX_RELEASE) && \
+    _GLIBCXX_RELEASE >= 12 &&                                \
+    (FMT_CLANG_VERSION >= 1400 && FMT_CLANG_VERSION < 1500)
+  ignore_unused(default_value);
+  return __builtin_is_constant_evaluated();
+#elif defined(__cpp_lib_is_constant_evaluated)
   ignore_unused(default_value);
   return std::is_constant_evaluated();
 #else
@@ -364,12 +331,12 @@ FMT_NORETURN FMT_API void assert_fail(const char* file, int line,
 #  ifdef NDEBUG
 // FMT_ASSERT is not empty to avoid -Wempty-body.
 #    define FMT_ASSERT(condition, message) \
-      ::fmt::detail::ignore_unused((condition), (message))
+      fmt::detail::ignore_unused((condition), (message))
 #  else
 #    define FMT_ASSERT(condition, message)                                    \
       ((condition) /* void() fails with -Winvalid-constexpr on clang 4.0.1 */ \
            ? (void)0                                                          \
-           : ::fmt::detail::assert_fail(__FILE__, __LINE__, (message)))
+           : fmt::detail::assert_fail(__FILE__, __LINE__, (message)))
 #  endif
 #endif
 
@@ -410,15 +377,15 @@ FMT_CONSTEXPR auto to_unsigned(Int value) ->
   return static_cast<typename std::make_unsigned<Int>::type>(value);
 }
 
-FMT_MSC_WARNING(suppress : 4566) constexpr unsigned char micro[] = "\u00B5";
+FMT_CONSTEXPR inline auto is_utf8() -> bool {
+  FMT_MSC_WARNING(suppress : 4566) constexpr unsigned char section[] = "\u00A7";
 
-constexpr auto is_utf8() -> bool {
   // Avoid buggy sign extensions in MSVC's constant evaluation mode (#2297).
   using uchar = unsigned char;
-  return FMT_UNICODE || (sizeof(micro) == 3 && uchar(micro[0]) == 0xC2 &&
-                         uchar(micro[1]) == 0xB5);
+  return FMT_UNICODE || (sizeof(section) == 3 && uchar(section[0]) == 0xC2 &&
+                         uchar(section[1]) == 0xA7);
 }
-FMT_END_DETAIL_NAMESPACE
+}  // namespace detail
 
 /**
   An implementation of ``std::basic_string_view`` for pre-C++17. It provides a
@@ -427,6 +394,7 @@ FMT_END_DETAIL_NAMESPACE
   compiled with a different ``-std`` option than the client code (which is not
   recommended).
  */
+FMT_EXPORT
 template <typename Char> class basic_string_view {
  private:
   const Char* data_;
@@ -486,6 +454,18 @@ template <typename Char> class basic_string_view {
     size_ -= n;
   }
 
+  FMT_CONSTEXPR_CHAR_TRAITS bool starts_with(
+      basic_string_view<Char> sv) const noexcept {
+    return size_ >= sv.size_ &&
+           std::char_traits<Char>::compare(data_, sv.data_, sv.size_) == 0;
+  }
+  FMT_CONSTEXPR_CHAR_TRAITS bool starts_with(Char c) const noexcept {
+    return size_ >= 1 && std::char_traits<Char>::eq(*data_, c);
+  }
+  FMT_CONSTEXPR_CHAR_TRAITS bool starts_with(const Char* s) const {
+    return starts_with(basic_string_view<Char>(s));
+  }
+
   // Lexicographically compare this string reference to other.
   FMT_CONSTEXPR_CHAR_TRAITS auto compare(basic_string_view other) const -> int {
     size_t str_size = size_ < other.size_ ? size_ : other.size_;
@@ -517,13 +497,15 @@ template <typename Char> class basic_string_view {
   }
 };
 
+FMT_EXPORT
 using string_view = basic_string_view<char>;
 
 /** Specifies if ``T`` is a character type. Can be specialized by users. */
+FMT_EXPORT
 template <typename T> struct is_char : std::false_type {};
 template <> struct is_char<char> : std::true_type {};
 
-FMT_BEGIN_DETAIL_NAMESPACE
+namespace detail {
 
 // A base class for compile-time strings.
 struct compile_string {};
@@ -531,7 +513,6 @@ struct compile_string {};
 template <typename S>
 struct is_compile_string : std::is_base_of<compile_string, S> {};
 
-// Returns a string view of `s`.
 template <typename Char, FMT_ENABLE_IF(is_char<Char>::value)>
 FMT_INLINE auto to_string_view(const Char* s) -> basic_string_view<Char> {
   return s;
@@ -561,10 +542,10 @@ void to_string_view(...);
 // Specifies whether S is a string type convertible to fmt::basic_string_view.
 // It should be a constexpr function but MSVC 2017 fails to compile it in
 // enable_if and MSVC 2015 fails to compile it as an alias template.
-// ADL invocation of to_string_view is DEPRECATED!
+// ADL is intentionally disabled as to_string_view is not an extension point.
 template <typename S>
-struct is_string : std::is_class<decltype(to_string_view(std::declval<S>()))> {
-};
+struct is_string
+    : std::is_class<decltype(detail::to_string_view(std::declval<S>()))> {};
 
 template <typename S, typename = void> struct char_t_impl {};
 template <typename S> struct char_t_impl<S, enable_if_t<is_string<S>::value>> {
@@ -622,23 +603,44 @@ FMT_TYPE_CONSTANT(const void*, pointer_type);
 constexpr bool is_integral_type(type t) {
   return t > type::none_type && t <= type::last_integer_type;
 }
-
 constexpr bool is_arithmetic_type(type t) {
   return t > type::none_type && t <= type::last_numeric_type;
 }
 
+constexpr auto set(type rhs) -> int { return 1 << static_cast<int>(rhs); }
+constexpr auto in(type t, int set) -> bool {
+  return ((set >> static_cast<int>(t)) & 1) != 0;
+}
+
+// Bitsets of types.
+enum {
+  sint_set =
+      set(type::int_type) | set(type::long_long_type) | set(type::int128_type),
+  uint_set = set(type::uint_type) | set(type::ulong_long_type) |
+             set(type::uint128_type),
+  bool_set = set(type::bool_type),
+  char_set = set(type::char_type),
+  float_set = set(type::float_type) | set(type::double_type) |
+              set(type::long_double_type),
+  string_set = set(type::string_type),
+  cstring_set = set(type::cstring_type),
+  pointer_set = set(type::pointer_type)
+};
+
 FMT_NORETURN FMT_API void throw_format_error(const char* message);
 
 struct error_handler {
   constexpr error_handler() = default;
-  constexpr error_handler(const error_handler&) = default;
 
   // This function is intentionally not constexpr to give a compile-time error.
   FMT_NORETURN void on_error(const char* message) {
     throw_format_error(message);
   }
 };
-FMT_END_DETAIL_NAMESPACE
+}  // namespace detail
+
+/** Throws ``format_error`` with a given message. */
+using detail::throw_format_error;
 
 /** String's character type. */
 template <typename S> using char_t = typename detail::char_t_impl<S>::type;
@@ -650,8 +652,8 @@ template <typename S> using char_t = typename detail::char_t_impl<S>::type;
   You can use the ``format_parse_context`` type alias for ``char`` instead.
   \endrst
  */
-template <typename Char, typename ErrorHandler = detail::error_handler>
-class basic_format_parse_context : private ErrorHandler {
+FMT_EXPORT
+template <typename Char> class basic_format_parse_context {
  private:
   basic_string_view<Char> format_str_;
   int next_arg_id_;
@@ -660,12 +662,11 @@ class basic_format_parse_context : private ErrorHandler {
 
  public:
   using char_type = Char;
-  using iterator = typename basic_string_view<Char>::iterator;
+  using iterator = const Char*;
 
   explicit constexpr basic_format_parse_context(
-      basic_string_view<Char> format_str, ErrorHandler eh = {},
-      int next_arg_id = 0)
-      : ErrorHandler(eh), format_str_(format_str), next_arg_id_(next_arg_id) {}
+      basic_string_view<Char> format_str, int next_arg_id = 0)
+      : format_str_(format_str), next_arg_id_(next_arg_id) {}
 
   /**
     Returns an iterator to the beginning of the format string range being
@@ -691,7 +692,8 @@ class basic_format_parse_context : private ErrorHandler {
    */
   FMT_CONSTEXPR auto next_arg_id() -> int {
     if (next_arg_id_ < 0) {
-      on_error("cannot switch from manual to automatic argument indexing");
+      detail::throw_format_error(
+          "cannot switch from manual to automatic argument indexing");
       return 0;
     }
     int id = next_arg_id_++;
@@ -705,7 +707,8 @@ class basic_format_parse_context : private ErrorHandler {
    */
   FMT_CONSTEXPR void check_arg_id(int id) {
     if (next_arg_id_ > 0) {
-      on_error("cannot switch from automatic to manual argument indexing");
+      detail::throw_format_error(
+          "cannot switch from automatic to manual argument indexing");
       return;
     }
     next_arg_id_ = -1;
@@ -713,117 +716,50 @@ class basic_format_parse_context : private ErrorHandler {
   }
   FMT_CONSTEXPR void check_arg_id(basic_string_view<Char>) {}
   FMT_CONSTEXPR void check_dynamic_spec(int arg_id);
-
-  FMT_CONSTEXPR void on_error(const char* message) {
-    ErrorHandler::on_error(message);
-  }
-
-  constexpr auto error_handler() const -> ErrorHandler { return *this; }
 };
 
+FMT_EXPORT
 using format_parse_context = basic_format_parse_context<char>;
 
-FMT_BEGIN_DETAIL_NAMESPACE
+namespace detail {
 // A parse context with extra data used only in compile-time checks.
-template <typename Char, typename ErrorHandler = detail::error_handler>
-class compile_parse_context
-    : public basic_format_parse_context<Char, ErrorHandler> {
+template <typename Char>
+class compile_parse_context : public basic_format_parse_context<Char> {
  private:
   int num_args_;
   const type* types_;
-  using base = basic_format_parse_context<Char, ErrorHandler>;
+  using base = basic_format_parse_context<Char>;
 
  public:
   explicit FMT_CONSTEXPR compile_parse_context(
       basic_string_view<Char> format_str, int num_args, const type* types,
-      ErrorHandler eh = {}, int next_arg_id = 0)
-      : base(format_str, eh, next_arg_id), num_args_(num_args), types_(types) {}
+      int next_arg_id = 0)
+      : base(format_str, next_arg_id), num_args_(num_args), types_(types) {}
 
   constexpr auto num_args() const -> int { return num_args_; }
   constexpr auto arg_type(int id) const -> type { return types_[id]; }
 
   FMT_CONSTEXPR auto next_arg_id() -> int {
     int id = base::next_arg_id();
-    if (id >= num_args_) this->on_error("argument not found");
+    if (id >= num_args_) throw_format_error("argument not found");
     return id;
   }
 
   FMT_CONSTEXPR void check_arg_id(int id) {
     base::check_arg_id(id);
-    if (id >= num_args_) this->on_error("argument not found");
+    if (id >= num_args_) throw_format_error("argument not found");
   }
   using base::check_arg_id;
 
   FMT_CONSTEXPR void check_dynamic_spec(int arg_id) {
+    detail::ignore_unused(arg_id);
+#if !defined(__LCC__)
     if (arg_id < num_args_ && types_ && !is_integral_type(types_[arg_id]))
-      this->on_error("width/precision is not integer");
-  }
-};
-FMT_END_DETAIL_NAMESPACE
-
-template <typename Char, typename ErrorHandler>
-FMT_CONSTEXPR void
-basic_format_parse_context<Char, ErrorHandler>::do_check_arg_id(int id) {
-  // Argument id is only checked at compile-time during parsing because
-  // formatting has its own validation.
-  if (detail::is_constant_evaluated() && FMT_GCC_VERSION >= 1200) {
-    using context = detail::compile_parse_context<Char, ErrorHandler>;
-    if (id >= static_cast<context*>(this)->num_args())
-      on_error("argument not found");
-  }
-}
-
-template <typename Char, typename ErrorHandler>
-FMT_CONSTEXPR void
-basic_format_parse_context<Char, ErrorHandler>::check_dynamic_spec(int arg_id) {
-  if (detail::is_constant_evaluated()) {
-    using context = detail::compile_parse_context<Char, ErrorHandler>;
-    static_cast<context*>(this)->check_dynamic_spec(arg_id);
+      throw_format_error("width/precision is not integer");
+#endif
   }
-}
-
-template <typename Context> class basic_format_arg;
-template <typename Context> class basic_format_args;
-template <typename Context> class dynamic_format_arg_store;
-
-// A formatter for objects of type T.
-template <typename T, typename Char = char, typename Enable = void>
-struct formatter {
-  // A deleted default constructor indicates a disabled formatter.
-  formatter() = delete;
 };
 
-// Specifies if T has an enabled formatter specialization. A type can be
-// formattable even if it doesn't have a formatter e.g. via a conversion.
-template <typename T, typename Context>
-using has_formatter =
-    std::is_constructible<typename Context::template formatter_type<T>>;
-
-// Checks whether T is a container with contiguous storage.
-template <typename T> struct is_contiguous : std::false_type {};
-template <typename Char>
-struct is_contiguous<std::basic_string<Char>> : std::true_type {};
-
-class appender;
-
-FMT_BEGIN_DETAIL_NAMESPACE
-
-template <typename Context, typename T>
-constexpr auto has_const_formatter_impl(T*)
-    -> decltype(typename Context::template formatter_type<T>().format(
-                    std::declval<const T&>(), std::declval<Context&>()),
-                true) {
-  return true;
-}
-template <typename Context>
-constexpr auto has_const_formatter_impl(...) -> bool {
-  return false;
-}
-template <typename T, typename Context>
-constexpr auto has_const_formatter() -> bool {
-  return has_const_formatter_impl<Context>(static_cast<T*>(nullptr));
-}
-
 // Extracts a reference to the container from back_insert_iterator.
 template <typename Container>
 inline auto get_container(std::back_insert_iterator<Container> it)
@@ -849,7 +785,7 @@ template <typename Char, typename T, typename U,
 FMT_CONSTEXPR auto copy_str(T* begin, T* end, U* out) -> U* {
   if (is_constant_evaluated()) return copy_str<Char, T*, U*>(begin, end, out);
   auto size = to_unsigned(end - begin);
-  memcpy(out, begin, size * sizeof(U));
+  if (size > 0) memcpy(out, begin, size * sizeof(U));
   return out + size;
 }
 
@@ -892,11 +828,11 @@ template <typename T> class buffer {
   buffer(const buffer&) = delete;
   void operator=(const buffer&) = delete;
 
-  auto begin() noexcept -> T* { return ptr_; }
-  auto end() noexcept -> T* { return ptr_ + size_; }
+  FMT_INLINE auto begin() noexcept -> T* { return ptr_; }
+  FMT_INLINE auto end() noexcept -> T* { return ptr_ + size_; }
 
-  auto begin() const noexcept -> const T* { return ptr_; }
-  auto end() const noexcept -> const T* { return ptr_ + size_; }
+  FMT_INLINE auto begin() const noexcept -> const T* { return ptr_; }
+  FMT_INLINE auto end() const noexcept -> const T* { return ptr_ + size_; }
 
   /** Returns the size of this buffer. */
   constexpr auto size() const noexcept -> size_t { return size_; }
@@ -904,10 +840,8 @@ template <typename T> class buffer {
   /** Returns the capacity of this buffer. */
   constexpr auto capacity() const noexcept -> size_t { return capacity_; }
 
-  /** Returns a pointer to the buffer data. */
+  /** Returns a pointer to the buffer data (not null-terminated). */
   FMT_CONSTEXPR auto data() noexcept -> T* { return ptr_; }
-
-  /** Returns a pointer to the buffer data. */
   FMT_CONSTEXPR auto data() const noexcept -> const T* { return ptr_; }
 
   /** Clears this buffer. */
@@ -1100,6 +1034,79 @@ template <typename T = char> class counting_buffer final : public buffer<T> {
 
   auto count() -> size_t { return count_ + this->size(); }
 };
+}  // namespace detail
+
+template <typename Char>
+FMT_CONSTEXPR void basic_format_parse_context<Char>::do_check_arg_id(int id) {
+  // Argument id is only checked at compile-time during parsing because
+  // formatting has its own validation.
+  if (detail::is_constant_evaluated() &&
+      (!FMT_GCC_VERSION || FMT_GCC_VERSION >= 1200)) {
+    using context = detail::compile_parse_context<Char>;
+    if (id >= static_cast<context*>(this)->num_args())
+      detail::throw_format_error("argument not found");
+  }
+}
+
+template <typename Char>
+FMT_CONSTEXPR void basic_format_parse_context<Char>::check_dynamic_spec(
+    int arg_id) {
+  if (detail::is_constant_evaluated() &&
+      (!FMT_GCC_VERSION || FMT_GCC_VERSION >= 1200)) {
+    using context = detail::compile_parse_context<Char>;
+    static_cast<context*>(this)->check_dynamic_spec(arg_id);
+  }
+}
+
+FMT_EXPORT template <typename Context> class basic_format_arg;
+FMT_EXPORT template <typename Context> class basic_format_args;
+FMT_EXPORT template <typename Context> class dynamic_format_arg_store;
+
+// A formatter for objects of type T.
+FMT_EXPORT
+template <typename T, typename Char = char, typename Enable = void>
+struct formatter {
+  // A deleted default constructor indicates a disabled formatter.
+  formatter() = delete;
+};
+
+// Specifies if T has an enabled formatter specialization. A type can be
+// formattable even if it doesn't have a formatter e.g. via a conversion.
+template <typename T, typename Context>
+using has_formatter =
+    std::is_constructible<typename Context::template formatter_type<T>>;
+
+// An output iterator that appends to a buffer.
+// It is used to reduce symbol sizes for the common case.
+class appender : public std::back_insert_iterator<detail::buffer<char>> {
+  using base = std::back_insert_iterator<detail::buffer<char>>;
+
+ public:
+  using std::back_insert_iterator<detail::buffer<char>>::back_insert_iterator;
+  appender(base it) noexcept : base(it) {}
+  FMT_UNCHECKED_ITERATOR(appender);
+
+  auto operator++() noexcept -> appender& { return *this; }
+  auto operator++(int) noexcept -> appender { return *this; }
+};
+
+namespace detail {
+
+template <typename Context, typename T>
+constexpr auto has_const_formatter_impl(T*)
+    -> decltype(typename Context::template formatter_type<T>().format(
+                    std::declval<const T&>(), std::declval<Context&>()),
+                true) {
+  return true;
+}
+template <typename Context>
+constexpr auto has_const_formatter_impl(...) -> bool {
+  return false;
+}
+template <typename T, typename Context>
+constexpr auto has_const_formatter() -> bool {
+  return has_const_formatter_impl<Context>(static_cast<T*>(nullptr));
+}
 
 template <typename T>
 using buffer_appender = conditional_t<std::is_same<T, char>::value, appender,
@@ -1110,29 +1117,21 @@ template <typename T, typename OutputIt>
 auto get_buffer(OutputIt out) -> iterator_buffer<OutputIt, T> {
   return iterator_buffer<OutputIt, T>(out);
 }
+template <typename T, typename Buf,
+          FMT_ENABLE_IF(std::is_base_of<buffer<char>, Buf>::value)>
+auto get_buffer(std::back_insert_iterator<Buf> out) -> buffer<char>& {
+  return get_container(out);
+}
 
-template <typename Buffer>
-auto get_iterator(Buffer& buf) -> decltype(buf.out()) {
+template <typename Buf, typename OutputIt>
+FMT_INLINE auto get_iterator(Buf& buf, OutputIt) -> decltype(buf.out()) {
   return buf.out();
 }
-template <typename T> auto get_iterator(buffer<T>& buf) -> buffer_appender<T> {
-  return buffer_appender<T>(buf);
+template <typename T, typename OutputIt>
+auto get_iterator(buffer<T>&, OutputIt out) -> OutputIt {
+  return out;
 }
 
-template <typename T, typename Char = char, typename Enable = void>
-struct fallback_formatter {
-  fallback_formatter() = delete;
-};
-
-// Specifies if T has an enabled fallback_formatter specialization.
-template <typename T, typename Char>
-using has_fallback_formatter =
-#ifdef FMT_DEPRECATED_OSTREAM
-    std::is_constructible<fallback_formatter<T, Char>>;
-#else
-    std::false_type;
-#endif
-
 struct view {};
 
 template <typename Char, typename T> struct named_arg : view {
@@ -1217,7 +1216,6 @@ constexpr auto count_statically_named_args() -> size_t {
 
 struct unformattable {};
 struct unformattable_char : unformattable {};
-struct unformattable_const : unformattable {};
 struct unformattable_pointer : unformattable {};
 
 template <typename Char> struct string_value {
@@ -1284,21 +1282,17 @@ template <typename Context> class value {
   FMT_INLINE value(const named_arg_info<char_type>* args, size_t size)
       : named_args{args, size} {}
 
-  template <typename T> FMT_CONSTEXPR FMT_INLINE value(T& val) {
-    using value_type = remove_cvref_t<T>;
-    custom.value = const_cast<value_type*>(&val);
+  template <typename T> FMT_CONSTEXPR20 FMT_INLINE value(T& val) {
+    using value_type = remove_const_t<T>;
+    custom.value = const_cast<value_type*>(std::addressof(val));
     // Get the formatter type through the context to allow different contexts
     // have different extension points, e.g. `formatter<T>` for `format` and
     // `printf_formatter<T>` for `printf`.
     custom.format = format_custom_arg<
-        value_type,
-        conditional_t<has_formatter<value_type, Context>::value,
-                      typename Context::template formatter_type<value_type>,
-                      fallback_formatter<value_type, char_type>>>;
+        value_type, typename Context::template formatter_type<value_type>>;
   }
   value(unformattable);
   value(unformattable_char);
-  value(unformattable_const);
   value(unformattable_pointer);
 
  private:
@@ -1315,29 +1309,25 @@ template <typename Context> class value {
   }
 };
 
-template <typename Context, typename T>
-FMT_CONSTEXPR auto make_arg(T&& value) -> basic_format_arg<Context>;
-
 // To minimize the number of types we need to deal with, long is translated
 // either to int or to long long depending on its size.
 enum { long_short = sizeof(long) == sizeof(int) };
 using long_type = conditional_t<long_short, int, long long>;
 using ulong_type = conditional_t<long_short, unsigned, unsigned long long>;
 
-#ifdef __cpp_lib_byte
-inline auto format_as(std::byte b) -> unsigned char {
-  return static_cast<unsigned char>(b);
-}
-#endif
-
-template <typename T> struct has_format_as {
-  template <typename U, typename V = decltype(format_as(U())),
-            FMT_ENABLE_IF(std::is_enum<U>::value&& std::is_integral<V>::value)>
-  static auto check(U*) -> std::true_type;
-  static auto check(...) -> std::false_type;
+template <typename T> struct format_as_result {
+  template <typename U,
+            FMT_ENABLE_IF(std::is_enum<U>::value || std::is_class<U>::value)>
+  static auto map(U*) -> decltype(format_as(std::declval<U>()));
+  static auto map(...) -> void;
 
-  enum { value = decltype(check(static_cast<T*>(nullptr)))::value };
+  using type = decltype(map(static_cast<T*>(nullptr)));
 };
+template <typename T> using format_as_t = typename format_as_result<T>::type;
+
+template <typename T>
+struct has_format_as
+    : bool_constant<!std::is_same<format_as_t<T>, void>::value> {};
 
 // Maps formatting arguments to core types.
 // arg_mapper reports errors by returning unformattable instead of using
@@ -1414,25 +1404,6 @@ template <typename Context> struct arg_mapper {
   FMT_CONSTEXPR FMT_INLINE auto map(const T&) -> unformattable_char {
     return {};
   }
-  template <typename T,
-            FMT_ENABLE_IF(
-                std::is_convertible<T, basic_string_view<char_type>>::value &&
-                !is_string<T>::value && !has_formatter<T, Context>::value &&
-                !has_fallback_formatter<T, char_type>::value)>
-  FMT_CONSTEXPR FMT_INLINE auto map(const T& val)
-      -> basic_string_view<char_type> {
-    return basic_string_view<char_type>(val);
-  }
-  template <typename T,
-            FMT_ENABLE_IF(
-                std::is_convertible<T, std_string_view<char_type>>::value &&
-                !std::is_convertible<T, basic_string_view<char_type>>::value &&
-                !is_string<T>::value && !has_formatter<T, Context>::value &&
-                !has_fallback_formatter<T, char_type>::value)>
-  FMT_CONSTEXPR FMT_INLINE auto map(const T& val)
-      -> basic_string_view<char_type> {
-    return std_string_view<char_type>(val);
-  }
 
   FMT_CONSTEXPR FMT_INLINE auto map(void* val) -> const void* { return val; }
   FMT_CONSTEXPR FMT_INLINE auto map(const void* val) -> const void* {
@@ -1442,8 +1413,8 @@ template <typename Context> struct arg_mapper {
     return val;
   }
 
-  // We use SFINAE instead of a const T* parameter to avoid conflicting with
-  // the C array overload.
+  // Use SFINAE instead of a const T* parameter to avoid a conflict with the
+  // array overload.
   template <
       typename T,
       FMT_ENABLE_IF(
@@ -1462,62 +1433,40 @@ template <typename Context> struct arg_mapper {
     return values;
   }
 
-  template <typename T,
-            FMT_ENABLE_IF(
-                std::is_enum<T>::value&& std::is_convertible<T, int>::value &&
-                !has_format_as<T>::value && !has_formatter<T, Context>::value &&
-                !has_fallback_formatter<T, char_type>::value)>
-  FMT_DEPRECATED FMT_CONSTEXPR FMT_INLINE auto map(const T& val)
-      -> decltype(std::declval<arg_mapper>().map(
-          static_cast<underlying_t<T>>(val))) {
-    return map(static_cast<underlying_t<T>>(val));
-  }
-
-  template <typename T, FMT_ENABLE_IF(has_format_as<T>::value &&
-                                      !has_formatter<T, Context>::value)>
-  FMT_CONSTEXPR FMT_INLINE auto map(const T& val)
-      -> decltype(std::declval<arg_mapper>().map(format_as(T()))) {
+  // Only map owning types because mapping views can be unsafe.
+  template <typename T, typename U = format_as_t<T>,
+            FMT_ENABLE_IF(std::is_arithmetic<U>::value)>
+  FMT_CONSTEXPR FMT_INLINE auto map(const T& val) -> decltype(this->map(U())) {
     return map(format_as(val));
   }
 
-  template <typename T, typename U = remove_cvref_t<T>>
-  struct formattable
-      : bool_constant<has_const_formatter<U, Context>() ||
-                      !std::is_const<remove_reference_t<T>>::value ||
-                      has_fallback_formatter<U, char_type>::value> {};
+  template <typename T, typename U = remove_const_t<T>>
+  struct formattable : bool_constant<has_const_formatter<U, Context>() ||
+                                     (has_formatter<U, Context>::value &&
+                                      !std::is_const<T>::value)> {};
 
-#if (FMT_MSC_VERSION != 0 && FMT_MSC_VERSION < 1910) || \
-    FMT_ICC_VERSION != 0 || defined(__NVCC__)
-  // Workaround a bug in MSVC and Intel (Issue 2746).
-  template <typename T> FMT_CONSTEXPR FMT_INLINE auto do_map(T&& val) -> T& {
-    return val;
-  }
-#else
   template <typename T, FMT_ENABLE_IF(formattable<T>::value)>
-  FMT_CONSTEXPR FMT_INLINE auto do_map(T&& val) -> T& {
+  FMT_CONSTEXPR FMT_INLINE auto do_map(T& val) -> T& {
     return val;
   }
   template <typename T, FMT_ENABLE_IF(!formattable<T>::value)>
-  FMT_CONSTEXPR FMT_INLINE auto do_map(T&&) -> unformattable_const {
+  FMT_CONSTEXPR FMT_INLINE auto do_map(T&) -> unformattable {
     return {};
   }
-#endif
 
-  template <typename T, typename U = remove_cvref_t<T>,
-            FMT_ENABLE_IF(!is_string<U>::value && !is_char<U>::value &&
-                          !std::is_array<U>::value &&
-                          !std::is_pointer<U>::value &&
-                          !has_format_as<U>::value &&
-                          (has_formatter<U, Context>::value ||
-                           has_fallback_formatter<U, char_type>::value))>
-  FMT_CONSTEXPR FMT_INLINE auto map(T&& val)
-      -> decltype(this->do_map(std::forward<T>(val))) {
-    return do_map(std::forward<T>(val));
+  template <typename T, typename U = remove_const_t<T>,
+            FMT_ENABLE_IF((std::is_class<U>::value || std::is_enum<U>::value ||
+                           std::is_union<U>::value) &&
+                          !is_string<U>::value && !is_char<U>::value &&
+                          !is_named_arg<U>::value &&
+                          !std::is_arithmetic<format_as_t<U>>::value)>
+  FMT_CONSTEXPR FMT_INLINE auto map(T& val) -> decltype(this->do_map(val)) {
+    return do_map(val);
   }
 
   template <typename T, FMT_ENABLE_IF(is_named_arg<T>::value)>
   FMT_CONSTEXPR FMT_INLINE auto map(const T& named_arg)
-      -> decltype(std::declval<arg_mapper>().map(named_arg.value)) {
+      -> decltype(this->map(named_arg.value)) {
     return map(named_arg.value);
   }
 
@@ -1536,53 +1485,146 @@ enum { max_packed_args = 62 / packed_arg_bits };
 enum : unsigned long long { is_unpacked_bit = 1ULL << 63 };
 enum : unsigned long long { has_named_args_bit = 1ULL << 62 };
 
-FMT_END_DETAIL_NAMESPACE
+template <typename Char, typename InputIt>
+auto copy_str(InputIt begin, InputIt end, appender out) -> appender {
+  get_container(out).append(begin, end);
+  return out;
+}
+template <typename Char, typename InputIt>
+auto copy_str(InputIt begin, InputIt end,
+              std::back_insert_iterator<std::string> out)
+    -> std::back_insert_iterator<std::string> {
+  get_container(out).append(begin, end);
+  return out;
+}
+
+template <typename Char, typename R, typename OutputIt>
+FMT_CONSTEXPR auto copy_str(R&& rng, OutputIt out) -> OutputIt {
+  return detail::copy_str<Char>(rng.begin(), rng.end(), out);
+}
 
-// An output iterator that appends to a buffer.
-// It is used to reduce symbol sizes for the common case.
-class appender : public std::back_insert_iterator<detail::buffer<char>> {
-  using base = std::back_insert_iterator<detail::buffer<char>>;
+#if FMT_GCC_VERSION && FMT_GCC_VERSION < 500
+// A workaround for gcc 4.8 to make void_t work in a SFINAE context.
+template <typename...> struct void_t_impl { using type = void; };
+template <typename... T> using void_t = typename void_t_impl<T...>::type;
+#else
+template <typename...> using void_t = void;
+#endif
 
-  template <typename T>
-  friend auto get_buffer(appender out) -> detail::buffer<char>& {
-    return detail::get_container(out);
-  }
+template <typename It, typename T, typename Enable = void>
+struct is_output_iterator : std::false_type {};
 
- public:
-  using std::back_insert_iterator<detail::buffer<char>>::back_insert_iterator;
-  appender(base it) noexcept : base(it) {}
-  FMT_UNCHECKED_ITERATOR(appender);
+template <typename It, typename T>
+struct is_output_iterator<
+    It, T,
+    void_t<typename std::iterator_traits<It>::iterator_category,
+           decltype(*std::declval<It>() = std::declval<T>())>>
+    : std::true_type {};
 
-  auto operator++() noexcept -> appender& { return *this; }
-  auto operator++(int) noexcept -> appender { return *this; }
-};
+template <typename It> struct is_back_insert_iterator : std::false_type {};
+template <typename Container>
+struct is_back_insert_iterator<std::back_insert_iterator<Container>>
+    : std::true_type {};
 
-// A formatting argument. It is a trivially copyable/constructible type to
-// allow storage in basic_memory_buffer.
-template <typename Context> class basic_format_arg {
+// A type-erased reference to an std::locale to avoid a heavy <locale> include.
+class locale_ref {
  private:
-  detail::value<Context> value_;
-  detail::type type_;
-
-  template <typename ContextType, typename T>
-  friend FMT_CONSTEXPR auto detail::make_arg(T&& value)
-      -> basic_format_arg<ContextType>;
+  const void* locale_;  // A type-erased pointer to std::locale.
 
-  template <typename Visitor, typename Ctx>
-  friend FMT_CONSTEXPR auto visit_format_arg(Visitor&& vis,
-                                             const basic_format_arg<Ctx>& arg)
-      -> decltype(vis(0));
+ public:
+  constexpr FMT_INLINE locale_ref() : locale_(nullptr) {}
+  template <typename Locale> explicit locale_ref(const Locale& loc);
 
-  friend class basic_format_args<Context>;
-  friend class dynamic_format_arg_store<Context>;
+  explicit operator bool() const noexcept { return locale_ != nullptr; }
 
-  using char_type = typename Context::char_type;
+  template <typename Locale> auto get() const -> Locale;
+};
 
-  template <typename T, typename Char, size_t NUM_ARGS, size_t NUM_NAMED_ARGS>
-  friend struct detail::arg_data;
+template <typename> constexpr auto encode_types() -> unsigned long long {
+  return 0;
+}
 
-  basic_format_arg(const detail::named_arg_info<char_type>* args, size_t size)
-      : value_(args, size) {}
+template <typename Context, typename Arg, typename... Args>
+constexpr auto encode_types() -> unsigned long long {
+  return static_cast<unsigned>(mapped_type_constant<Arg, Context>::value) |
+         (encode_types<Context, Args...>() << packed_arg_bits);
+}
+
+#if defined(__cpp_if_constexpr)
+// This type is intentionally undefined, only used for errors
+template <typename T, typename Char> struct type_is_unformattable_for;
+#endif
+
+template <bool PACKED, typename Context, typename T, FMT_ENABLE_IF(PACKED)>
+FMT_CONSTEXPR FMT_INLINE auto make_arg(T& val) -> value<Context> {
+  using arg_type = remove_cvref_t<decltype(arg_mapper<Context>().map(val))>;
+
+  constexpr bool formattable_char =
+      !std::is_same<arg_type, unformattable_char>::value;
+  static_assert(formattable_char, "Mixing character types is disallowed.");
+
+  // Formatting of arbitrary pointers is disallowed. If you want to format a
+  // pointer cast it to `void*` or `const void*`. In particular, this forbids
+  // formatting of `[const] volatile char*` printed as bool by iostreams.
+  constexpr bool formattable_pointer =
+      !std::is_same<arg_type, unformattable_pointer>::value;
+  static_assert(formattable_pointer,
+                "Formatting of non-void pointers is disallowed.");
+
+  constexpr bool formattable = !std::is_same<arg_type, unformattable>::value;
+#if defined(__cpp_if_constexpr)
+  if constexpr (!formattable) {
+    type_is_unformattable_for<T, typename Context::char_type> _;
+  }
+#endif
+  static_assert(
+      formattable,
+      "Cannot format an argument. To make type T formattable provide a "
+      "formatter<T> specialization: https://fmt.dev/latest/api.html#udt");
+  return {arg_mapper<Context>().map(val)};
+}
+
+template <typename Context, typename T>
+FMT_CONSTEXPR auto make_arg(T& val) -> basic_format_arg<Context> {
+  auto arg = basic_format_arg<Context>();
+  arg.type_ = mapped_type_constant<T, Context>::value;
+  arg.value_ = make_arg<true, Context>(val);
+  return arg;
+}
+
+template <bool PACKED, typename Context, typename T, FMT_ENABLE_IF(!PACKED)>
+FMT_CONSTEXPR inline auto make_arg(T& val) -> basic_format_arg<Context> {
+  return make_arg<Context>(val);
+}
+}  // namespace detail
+FMT_BEGIN_EXPORT
+
+// A formatting argument. It is a trivially copyable/constructible type to
+// allow storage in basic_memory_buffer.
+template <typename Context> class basic_format_arg {
+ private:
+  detail::value<Context> value_;
+  detail::type type_;
+
+  template <typename ContextType, typename T>
+  friend FMT_CONSTEXPR auto detail::make_arg(T& value)
+      -> basic_format_arg<ContextType>;
+
+  template <typename Visitor, typename Ctx>
+  friend FMT_CONSTEXPR auto visit_format_arg(Visitor&& vis,
+                                             const basic_format_arg<Ctx>& arg)
+      -> decltype(vis(0));
+
+  friend class basic_format_args<Context>;
+  friend class dynamic_format_arg_store<Context>;
+
+  using char_type = typename Context::char_type;
+
+  template <typename T, typename Char, size_t NUM_ARGS, size_t NUM_NAMED_ARGS>
+  friend struct detail::arg_data;
+
+  basic_format_arg(const detail::named_arg_info<char_type>* args, size_t size)
+      : value_(args, size) {}
 
  public:
   class handle {
@@ -1619,6 +1661,8 @@ template <typename Context> class basic_format_arg {
   ``vis(value)`` will be called with the value of type ``double``.
   \endrst
  */
+// DEPRECATED!
+FMT_EXPORT
 template <typename Visitor, typename Context>
 FMT_CONSTEXPR FMT_INLINE auto visit_format_arg(
     Visitor&& vis, const basic_format_arg<Context>& arg) -> decltype(vis(0)) {
@@ -1660,136 +1704,8 @@ FMT_CONSTEXPR FMT_INLINE auto visit_format_arg(
   return vis(monostate());
 }
 
-FMT_BEGIN_DETAIL_NAMESPACE
-
-template <typename Char, typename InputIt>
-auto copy_str(InputIt begin, InputIt end, appender out) -> appender {
-  get_container(out).append(begin, end);
-  return out;
-}
-
-template <typename Char, typename R, typename OutputIt>
-FMT_CONSTEXPR auto copy_str(R&& rng, OutputIt out) -> OutputIt {
-  return detail::copy_str<Char>(rng.begin(), rng.end(), out);
-}
-
-#if FMT_GCC_VERSION && FMT_GCC_VERSION < 500
-// A workaround for gcc 4.8 to make void_t work in a SFINAE context.
-template <typename... Ts> struct void_t_impl { using type = void; };
-template <typename... Ts>
-using void_t = typename detail::void_t_impl<Ts...>::type;
-#else
-template <typename...> using void_t = void;
-#endif
-
-template <typename It, typename T, typename Enable = void>
-struct is_output_iterator : std::false_type {};
-
-template <typename It, typename T>
-struct is_output_iterator<
-    It, T,
-    void_t<typename std::iterator_traits<It>::iterator_category,
-           decltype(*std::declval<It>() = std::declval<T>())>>
-    : std::true_type {};
-
-template <typename OutputIt>
-struct is_back_insert_iterator : std::false_type {};
-template <typename Container>
-struct is_back_insert_iterator<std::back_insert_iterator<Container>>
-    : std::true_type {};
-
-template <typename OutputIt>
-struct is_contiguous_back_insert_iterator : std::false_type {};
-template <typename Container>
-struct is_contiguous_back_insert_iterator<std::back_insert_iterator<Container>>
-    : is_contiguous<Container> {};
-template <>
-struct is_contiguous_back_insert_iterator<appender> : std::true_type {};
-
-// A type-erased reference to an std::locale to avoid a heavy <locale> include.
-class locale_ref {
- private:
-  const void* locale_;  // A type-erased pointer to std::locale.
-
- public:
-  constexpr locale_ref() : locale_(nullptr) {}
-  template <typename Locale> explicit locale_ref(const Locale& loc);
-
-  explicit operator bool() const noexcept { return locale_ != nullptr; }
-
-  template <typename Locale> auto get() const -> Locale;
-};
-
-template <typename> constexpr auto encode_types() -> unsigned long long {
-  return 0;
-}
-
-template <typename Context, typename Arg, typename... Args>
-constexpr auto encode_types() -> unsigned long long {
-  return static_cast<unsigned>(mapped_type_constant<Arg, Context>::value) |
-         (encode_types<Context, Args...>() << packed_arg_bits);
-}
-
-template <typename Context, typename T>
-FMT_CONSTEXPR FMT_INLINE auto make_value(T&& val) -> value<Context> {
-  const auto& arg = arg_mapper<Context>().map(FMT_FORWARD(val));
-
-  constexpr bool formattable_char =
-      !std::is_same<decltype(arg), const unformattable_char&>::value;
-  static_assert(formattable_char, "Mixing character types is disallowed.");
-
-  constexpr bool formattable_const =
-      !std::is_same<decltype(arg), const unformattable_const&>::value;
-  static_assert(formattable_const, "Cannot format a const argument.");
-
-  // Formatting of arbitrary pointers is disallowed. If you want to output
-  // a pointer cast it to "void *" or "const void *". In particular, this
-  // forbids formatting of "[const] volatile char *" which is printed as bool
-  // by iostreams.
-  constexpr bool formattable_pointer =
-      !std::is_same<decltype(arg), const unformattable_pointer&>::value;
-  static_assert(formattable_pointer,
-                "Formatting of non-void pointers is disallowed.");
-
-  constexpr bool formattable =
-      !std::is_same<decltype(arg), const unformattable&>::value;
-  static_assert(
-      formattable,
-      "Cannot format an argument. To make type T formattable provide a "
-      "formatter<T> specialization: https://fmt.dev/latest/api.html#udt");
-  return {arg};
-}
-
-template <typename Context, typename T>
-FMT_CONSTEXPR auto make_arg(T&& value) -> basic_format_arg<Context> {
-  basic_format_arg<Context> arg;
-  arg.type_ = mapped_type_constant<T, Context>::value;
-  arg.value_ = make_value<Context>(value);
-  return arg;
-}
-
-// The type template parameter is there to avoid an ODR violation when using
-// a fallback formatter in one translation unit and an implicit conversion in
-// another (not recommended).
-template <bool IS_PACKED, typename Context, type, typename T,
-          FMT_ENABLE_IF(IS_PACKED)>
-FMT_CONSTEXPR FMT_INLINE auto make_arg(T&& val) -> value<Context> {
-  return make_value<Context>(val);
-}
-
-template <bool IS_PACKED, typename Context, type, typename T,
-          FMT_ENABLE_IF(!IS_PACKED)>
-FMT_CONSTEXPR inline auto make_arg(T&& value) -> basic_format_arg<Context> {
-  return make_arg<Context>(value);
-}
-FMT_END_DETAIL_NAMESPACE
-
 // Formatting context.
 template <typename OutputIt, typename Char> class basic_format_context {
- public:
-  /** The character type for the output. */
-  using char_type = Char;
-
  private:
   OutputIt out_;
   basic_format_args<basic_format_context> args_;
@@ -1798,31 +1714,32 @@ template <typename OutputIt, typename Char> class basic_format_context {
  public:
   using iterator = OutputIt;
   using format_arg = basic_format_arg<basic_format_context>;
+  using format_args = basic_format_args<basic_format_context>;
   using parse_context_type = basic_format_parse_context<Char>;
-  template <typename T> using formatter_type = formatter<T, char_type>;
+  template <typename T> using formatter_type = formatter<T, Char>;
+
+  /** The character type for the output. */
+  using char_type = Char;
 
   basic_format_context(basic_format_context&&) = default;
   basic_format_context(const basic_format_context&) = delete;
   void operator=(const basic_format_context&) = delete;
   /**
-   Constructs a ``basic_format_context`` object. References to the arguments are
-   stored in the object so make sure they have appropriate lifetimes.
+    Constructs a ``basic_format_context`` object. References to the arguments
+    are stored in the object so make sure they have appropriate lifetimes.
    */
-  constexpr basic_format_context(
-      OutputIt out, basic_format_args<basic_format_context> ctx_args,
-      detail::locale_ref loc = detail::locale_ref())
+  constexpr basic_format_context(OutputIt out, format_args ctx_args,
+                                 detail::locale_ref loc = {})
       : out_(out), args_(ctx_args), loc_(loc) {}
 
   constexpr auto arg(int id) const -> format_arg { return args_.get(id); }
-  FMT_CONSTEXPR auto arg(basic_string_view<char_type> name) -> format_arg {
+  FMT_CONSTEXPR auto arg(basic_string_view<Char> name) -> format_arg {
     return args_.get(name);
   }
-  FMT_CONSTEXPR auto arg_id(basic_string_view<char_type> name) -> int {
+  FMT_CONSTEXPR auto arg_id(basic_string_view<Char> name) -> int {
     return args_.get_id(name);
   }
-  auto args() const -> const basic_format_args<basic_format_context>& {
-    return args_;
-  }
+  auto args() const -> const format_args& { return args_; }
 
   FMT_CONSTEXPR auto error_handler() -> detail::error_handler { return {}; }
   void on_error(const char* message) { error_handler().on_error(message); }
@@ -1843,16 +1760,10 @@ using buffer_context =
     basic_format_context<detail::buffer_appender<Char>, Char>;
 using format_context = buffer_context<char>;
 
-// Workaround an alias issue: https://stackoverflow.com/q/62767544/471164.
-#define FMT_BUFFER_CONTEXT(Char) \
-  basic_format_context<detail::buffer_appender<Char>, Char>
-
 template <typename T, typename Char = char>
-using is_formattable = bool_constant<
-    !std::is_base_of<detail::unformattable,
-                     decltype(detail::arg_mapper<buffer_context<Char>>().map(
-                         std::declval<T>()))>::value &&
-    !detail::has_fallback_formatter<T, Char>::value>;
+using is_formattable = bool_constant<!std::is_base_of<
+    detail::unformattable, decltype(detail::arg_mapper<buffer_context<Char>>()
+                                        .map(std::declval<T&>()))>::value>;
 
 /**
   \rst
@@ -1870,7 +1781,7 @@ class format_arg_store
 {
  private:
   static const size_t num_args = sizeof...(Args);
-  static const size_t num_named_args = detail::count_named_args<Args...>();
+  static constexpr size_t num_named_args = detail::count_named_args<Args...>();
   static const bool is_packed = num_args <= detail::max_packed_args;
 
   using value_type = conditional_t<is_packed, detail::value<Context>,
@@ -1891,16 +1802,14 @@ class format_arg_store
 
  public:
   template <typename... T>
-  FMT_CONSTEXPR FMT_INLINE format_arg_store(T&&... args)
+  FMT_CONSTEXPR FMT_INLINE format_arg_store(T&... args)
       :
 #if FMT_GCC_VERSION && FMT_GCC_VERSION < 409
         basic_format_args<Context>(*this),
 #endif
-        data_{detail::make_arg<
-            is_packed, Context,
-            detail::mapped_type_constant<remove_cvref_t<T>, Context>::value>(
-            FMT_FORWARD(args))...} {
-    detail::init_named_args(data_.named_args(), 0, 0, args...);
+        data_{detail::make_arg<is_packed, Context>(args)...} {
+    if (detail::const_check(num_named_args != 0))
+      detail::init_named_args(data_.named_args(), 0, 0, args...);
   }
 };
 
@@ -1908,14 +1817,15 @@ class format_arg_store
   \rst
   Constructs a `~fmt::format_arg_store` object that contains references to
   arguments and can be implicitly converted to `~fmt::format_args`. `Context`
-  can be omitted in which case it defaults to `~fmt::context`.
+  can be omitted in which case it defaults to `~fmt::format_context`.
   See `~fmt::arg` for lifetime considerations.
   \endrst
  */
-template <typename Context = format_context, typename... Args>
-constexpr auto make_format_args(Args&&... args)
-    -> format_arg_store<Context, remove_cvref_t<Args>...> {
-  return {FMT_FORWARD(args)...};
+// Arguments are taken by lvalue references to avoid some lifetime issues.
+template <typename Context = format_context, typename... T>
+constexpr auto make_format_args(T&... args)
+    -> format_arg_store<Context, remove_cvref_t<T>...> {
+  return {args...};
 }
 
 /**
@@ -1934,6 +1844,7 @@ inline auto arg(const Char* name, const T& arg) -> detail::named_arg<Char, T> {
   static_assert(!detail::is_named_arg<T>(), "nested named arguments");
   return {name, arg};
 }
+FMT_END_EXPORT
 
 /**
   \rst
@@ -1942,7 +1853,7 @@ inline auto arg(const Char* name, const T& arg) -> detail::named_arg<Char, T> {
   ``vformat``::
 
     void vlog(string_view format_str, format_args args);  // OK
-    format_args args = make_format_args(42);  // Error: dangling reference
+    format_args args = make_format_args();  // Error: dangling reference
   \endrst
  */
 template <typename Context> class basic_format_args {
@@ -2059,7 +1970,7 @@ template <typename Context> class basic_format_args {
 /** An alias to ``basic_format_args<format_context>``. */
 // A separate type would result in shorter symbols but break ABI compatibility
 // between clang and gcc on ARM (#1919).
-using format_args = basic_format_args<format_context>;
+FMT_EXPORT using format_args = basic_format_args<format_context>;
 
 // We cannot use enum classes as bit fields because of a gcc bug, so we put them
 // in namespaces instead (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61414).
@@ -2080,7 +1991,7 @@ enum type FMT_ENUM_UNDERLYING_TYPE(unsigned char){none, minus, plus, space};
 }
 using sign_t = sign::type;
 
-FMT_BEGIN_DETAIL_NAMESPACE
+namespace detail {
 
 // Workaround an array initialization issue in gcc 4.8.
 template <typename Char> struct fill_t {
@@ -2092,7 +2003,7 @@ template <typename Char> struct fill_t {
  public:
   FMT_CONSTEXPR void operator=(basic_string_view<Char> s) {
     auto size = s.size();
-    if (size > max_size) return throw_format_error("invalid fill");
+    FMT_ASSERT(size <= max_size, "invalid fill");
     for (size_t i = 0; i < size; ++i) data_[i] = s[i];
     size_ = static_cast<unsigned char>(size);
   }
@@ -2105,11 +2016,10 @@ template <typename Char> struct fill_t {
     return data_[index];
   }
 };
-FMT_END_DETAIL_NAMESPACE
+}  // namespace detail
 
 enum class presentation_type : unsigned char {
   none,
-  // Integer types should go first,
   dec,             // 'd'
   oct,             // 'o'
   hex_lower,       // 'x'
@@ -2131,7 +2041,7 @@ enum class presentation_type : unsigned char {
 };
 
 // Format specifiers for built-in and string types.
-template <typename Char> struct basic_format_specs {
+template <typename Char = char> struct format_specs {
   int width;
   int precision;
   presentation_type type;
@@ -2141,7 +2051,7 @@ template <typename Char> struct basic_format_specs {
   bool localized : 1;
   detail::fill_t<Char> fill;
 
-  constexpr basic_format_specs()
+  constexpr format_specs()
       : width(0),
         precision(-1),
         type(presentation_type::none),
@@ -2151,9 +2061,7 @@ template <typename Char> struct basic_format_specs {
         localized(false) {}
 };
 
-using format_specs = basic_format_specs<char>;
-
-FMT_BEGIN_DETAIL_NAMESPACE
+namespace detail {
 
 enum class arg_id_kind { none, index, name };
 
@@ -2174,7 +2082,7 @@ template <typename Char> struct arg_ref {
 
   arg_id_kind kind;
   union value {
-    FMT_CONSTEXPR value(int id = 0) : index{id} {}
+    FMT_CONSTEXPR value(int idx = 0) : index(idx) {}
     FMT_CONSTEXPR value(basic_string_view<Char> n) : name(n) {}
 
     int index;
@@ -2183,134 +2091,30 @@ template <typename Char> struct arg_ref {
 };
 
 // Format specifiers with width and precision resolved at formatting rather
-// than parsing time to allow re-using the same parsed specifiers with
+// than parsing time to allow reusing the same parsed specifiers with
 // different sets of arguments (precompilation of format strings).
-template <typename Char>
-struct dynamic_format_specs : basic_format_specs<Char> {
+template <typename Char = char>
+struct dynamic_format_specs : format_specs<Char> {
   arg_ref<Char> width_ref;
   arg_ref<Char> precision_ref;
 };
 
-struct auto_id {};
-
-// A format specifier handler that sets fields in basic_format_specs.
-template <typename Char> class specs_setter {
- protected:
-  basic_format_specs<Char>& specs_;
-
- public:
-  explicit FMT_CONSTEXPR specs_setter(basic_format_specs<Char>& specs)
-      : specs_(specs) {}
-
-  FMT_CONSTEXPR specs_setter(const specs_setter& other)
-      : specs_(other.specs_) {}
-
-  FMT_CONSTEXPR void on_align(align_t align) { specs_.align = align; }
-  FMT_CONSTEXPR void on_fill(basic_string_view<Char> fill) {
-    specs_.fill = fill;
-  }
-  FMT_CONSTEXPR void on_sign(sign_t s) { specs_.sign = s; }
-  FMT_CONSTEXPR void on_hash() { specs_.alt = true; }
-  FMT_CONSTEXPR void on_localized() { specs_.localized = true; }
-
-  FMT_CONSTEXPR void on_zero() {
-    if (specs_.align == align::none) specs_.align = align::numeric;
-    specs_.fill[0] = Char('0');
-  }
-
-  FMT_CONSTEXPR void on_width(int width) { specs_.width = width; }
-  FMT_CONSTEXPR void on_precision(int precision) {
-    specs_.precision = precision;
-  }
-  FMT_CONSTEXPR void end_precision() {}
-
-  FMT_CONSTEXPR void on_type(presentation_type type) { specs_.type = type; }
-};
-
-// Format spec handler that saves references to arguments representing dynamic
-// width and precision to be resolved at formatting time.
-template <typename ParseContext>
-class dynamic_specs_handler
-    : public specs_setter<typename ParseContext::char_type> {
- public:
-  using char_type = typename ParseContext::char_type;
-
-  FMT_CONSTEXPR dynamic_specs_handler(dynamic_format_specs<char_type>& specs,
-                                      ParseContext& ctx)
-      : specs_setter<char_type>(specs), specs_(specs), context_(ctx) {}
-
-  FMT_CONSTEXPR dynamic_specs_handler(const dynamic_specs_handler& other)
-      : specs_setter<char_type>(other),
-        specs_(other.specs_),
-        context_(other.context_) {}
-
-  template <typename Id> FMT_CONSTEXPR void on_dynamic_width(Id arg_id) {
-    specs_.width_ref = make_arg_ref(arg_id);
-  }
-
-  template <typename Id> FMT_CONSTEXPR void on_dynamic_precision(Id arg_id) {
-    specs_.precision_ref = make_arg_ref(arg_id);
-  }
-
-  FMT_CONSTEXPR void on_error(const char* message) {
-    context_.on_error(message);
-  }
-
- private:
-  dynamic_format_specs<char_type>& specs_;
-  ParseContext& context_;
-
-  using arg_ref_type = arg_ref<char_type>;
-
-  FMT_CONSTEXPR auto make_arg_ref(int arg_id) -> arg_ref_type {
-    context_.check_arg_id(arg_id);
-    context_.check_dynamic_spec(arg_id);
-    return arg_ref_type(arg_id);
-  }
-
-  FMT_CONSTEXPR auto make_arg_ref(auto_id) -> arg_ref_type {
-    int arg_id = context_.next_arg_id();
-    context_.check_dynamic_spec(arg_id);
-    return arg_ref_type(arg_id);
-  }
-
-  FMT_CONSTEXPR auto make_arg_ref(basic_string_view<char_type> arg_id)
-      -> arg_ref_type {
-    context_.check_arg_id(arg_id);
-    basic_string_view<char_type> format_str(
-        context_.begin(), to_unsigned(context_.end() - context_.begin()));
-    return arg_ref_type(arg_id);
-  }
-};
-
-template <typename Char> constexpr bool is_ascii_letter(Char c) {
-  return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
-}
-
-// Converts a character to ASCII. Returns a number > 127 on conversion failure.
+// Converts a character to ASCII. Returns '\0' on conversion failure.
 template <typename Char, FMT_ENABLE_IF(std::is_integral<Char>::value)>
-constexpr auto to_ascii(Char c) -> Char {
-  return c;
+constexpr auto to_ascii(Char c) -> char {
+  return c <= 0xff ? static_cast<char>(c) : '\0';
 }
 template <typename Char, FMT_ENABLE_IF(std::is_enum<Char>::value)>
-constexpr auto to_ascii(Char c) -> underlying_t<Char> {
-  return c;
-}
-
-FMT_CONSTEXPR inline auto code_point_length_impl(char c) -> int {
-  return "\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\0\0\0\0\0\0\0\0\2\2\2\2\3\3\4"
-      [static_cast<unsigned char>(c) >> 3];
+constexpr auto to_ascii(Char c) -> char {
+  return c <= 0xff ? static_cast<char>(c) : '\0';
 }
 
+// Returns the number of code units in a code point or 1 on error.
 template <typename Char>
 FMT_CONSTEXPR auto code_point_length(const Char* begin) -> int {
   if (const_check(sizeof(Char) != 1)) return 1;
-  int len = code_point_length_impl(static_cast<char>(*begin));
-
-  // Compute the pointer to the next character early so that the next
-  // iteration can start working on the next character. Neither Clang
-  // nor GCC figure out this reordering on their own.
-  return len + !len;
+  auto c = static_cast<unsigned char>(*begin);
+  return static_cast<int>((0x3a55000000000000ull >> (2 * (c >> 3))) & 0x3) + 1;
 }
 
 // Return the result via the out param to workaround gcc bug 77539.
@@ -2355,279 +2159,284 @@ FMT_CONSTEXPR auto parse_nonnegative_int(const Char*& begin, const Char* end,
              : error_value;
 }
 
-// Parses fill and alignment.
-template <typename Char, typename Handler>
-FMT_CONSTEXPR auto parse_align(const Char* begin, const Char* end,
-                               Handler&& handler) -> const Char* {
-  FMT_ASSERT(begin != end, "");
-  auto align = align::none;
-  auto p = begin + code_point_length(begin);
-  if (end - p <= 0) p = begin;
-  for (;;) {
-    switch (to_ascii(*p)) {
-    case '<':
-      align = align::left;
-      break;
-    case '>':
-      align = align::right;
-      break;
-    case '^':
-      align = align::center;
-      break;
-    default:
-      break;
-    }
-    if (align != align::none) {
-      if (p != begin) {
-        auto c = *begin;
-        if (c == '{')
-          return handler.on_error("invalid fill character '{'"), begin;
-        handler.on_fill(basic_string_view<Char>(begin, to_unsigned(p - begin)));
-        begin = p + 1;
-      } else
-        ++begin;
-      handler.on_align(align);
-      break;
-    } else if (p == begin) {
-      break;
-    }
-    p = begin;
+FMT_CONSTEXPR inline auto parse_align(char c) -> align_t {
+  switch (c) {
+  case '<':
+    return align::left;
+  case '>':
+    return align::right;
+  case '^':
+    return align::center;
   }
-  return begin;
+  return align::none;
 }
 
-template <typename Char> FMT_CONSTEXPR bool is_name_start(Char c) {
-  return ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || '_' == c;
+template <typename Char> constexpr auto is_name_start(Char c) -> bool {
+  return ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || c == '_';
 }
 
-template <typename Char, typename IDHandler>
+template <typename Char, typename Handler>
 FMT_CONSTEXPR auto do_parse_arg_id(const Char* begin, const Char* end,
-                                   IDHandler&& handler) -> const Char* {
-  FMT_ASSERT(begin != end, "");
+                                   Handler&& handler) -> const Char* {
   Char c = *begin;
   if (c >= '0' && c <= '9') {
     int index = 0;
+    constexpr int max = (std::numeric_limits<int>::max)();
     if (c != '0')
-      index =
-          parse_nonnegative_int(begin, end, (std::numeric_limits<int>::max)());
+      index = parse_nonnegative_int(begin, end, max);
     else
       ++begin;
     if (begin == end || (*begin != '}' && *begin != ':'))
-      handler.on_error("invalid format string");
+      throw_format_error("invalid format string");
     else
-      handler(index);
+      handler.on_index(index);
     return begin;
   }
   if (!is_name_start(c)) {
-    handler.on_error("invalid format string");
+    throw_format_error("invalid format string");
     return begin;
   }
   auto it = begin;
   do {
     ++it;
-  } while (it != end && (is_name_start(c = *it) || ('0' <= c && c <= '9')));
-  handler(basic_string_view<Char>(begin, to_unsigned(it - begin)));
+  } while (it != end && (is_name_start(*it) || ('0' <= *it && *it <= '9')));
+  handler.on_name({begin, to_unsigned(it - begin)});
   return it;
 }
 
-template <typename Char, typename IDHandler>
+template <typename Char, typename Handler>
 FMT_CONSTEXPR FMT_INLINE auto parse_arg_id(const Char* begin, const Char* end,
-                                           IDHandler&& handler) -> const Char* {
+                                           Handler&& handler) -> const Char* {
+  FMT_ASSERT(begin != end, "");
   Char c = *begin;
   if (c != '}' && c != ':') return do_parse_arg_id(begin, end, handler);
-  handler();
+  handler.on_auto();
   return begin;
 }
 
-template <typename Char, typename Handler>
-FMT_CONSTEXPR auto parse_width(const Char* begin, const Char* end,
-                               Handler&& handler) -> const Char* {
-  using detail::auto_id;
-  struct width_adapter {
-    Handler& handler;
+template <typename Char> struct dynamic_spec_id_handler {
+  basic_format_parse_context<Char>& ctx;
+  arg_ref<Char>& ref;
 
-    FMT_CONSTEXPR void operator()() { handler.on_dynamic_width(auto_id()); }
-    FMT_CONSTEXPR void operator()(int id) { handler.on_dynamic_width(id); }
-    FMT_CONSTEXPR void operator()(basic_string_view<Char> id) {
-      handler.on_dynamic_width(id);
-    }
-    FMT_CONSTEXPR void on_error(const char* message) {
-      if (message) handler.on_error(message);
-    }
-  };
+  FMT_CONSTEXPR void on_auto() {
+    int id = ctx.next_arg_id();
+    ref = arg_ref<Char>(id);
+    ctx.check_dynamic_spec(id);
+  }
+  FMT_CONSTEXPR void on_index(int id) {
+    ref = arg_ref<Char>(id);
+    ctx.check_arg_id(id);
+    ctx.check_dynamic_spec(id);
+  }
+  FMT_CONSTEXPR void on_name(basic_string_view<Char> id) {
+    ref = arg_ref<Char>(id);
+    ctx.check_arg_id(id);
+  }
+};
 
+// Parses [integer | "{" [arg_id] "}"].
+template <typename Char>
+FMT_CONSTEXPR auto parse_dynamic_spec(const Char* begin, const Char* end,
+                                      int& value, arg_ref<Char>& ref,
+                                      basic_format_parse_context<Char>& ctx)
+    -> const Char* {
   FMT_ASSERT(begin != end, "");
   if ('0' <= *begin && *begin <= '9') {
-    int width = parse_nonnegative_int(begin, end, -1);
-    if (width != -1)
-      handler.on_width(width);
+    int val = parse_nonnegative_int(begin, end, -1);
+    if (val != -1)
+      value = val;
     else
-      handler.on_error("number is too big");
+      throw_format_error("number is too big");
   } else if (*begin == '{') {
     ++begin;
-    if (begin != end) begin = parse_arg_id(begin, end, width_adapter{handler});
-    if (begin == end || *begin != '}')
-      return handler.on_error("invalid format string"), begin;
-    ++begin;
-  }
-  return begin;
-}
-
-template <typename Char, typename Handler>
-FMT_CONSTEXPR auto parse_precision(const Char* begin, const Char* end,
-                                   Handler&& handler) -> const Char* {
-  using detail::auto_id;
-  struct precision_adapter {
-    Handler& handler;
-
-    FMT_CONSTEXPR void operator()() { handler.on_dynamic_precision(auto_id()); }
-    FMT_CONSTEXPR void operator()(int id) { handler.on_dynamic_precision(id); }
-    FMT_CONSTEXPR void operator()(basic_string_view<Char> id) {
-      handler.on_dynamic_precision(id);
-    }
-    FMT_CONSTEXPR void on_error(const char* message) {
-      if (message) handler.on_error(message);
-    }
-  };
-
-  ++begin;
-  auto c = begin != end ? *begin : Char();
-  if ('0' <= c && c <= '9') {
-    auto precision = parse_nonnegative_int(begin, end, -1);
-    if (precision != -1)
-      handler.on_precision(precision);
-    else
-      handler.on_error("number is too big");
-  } else if (c == '{') {
-    ++begin;
-    if (begin != end)
-      begin = parse_arg_id(begin, end, precision_adapter{handler});
-    if (begin == end || *begin++ != '}')
-      return handler.on_error("invalid format string"), begin;
-  } else {
-    return handler.on_error("missing precision specifier"), begin;
+    auto handler = dynamic_spec_id_handler<Char>{ctx, ref};
+    if (begin != end) begin = parse_arg_id(begin, end, handler);
+    if (begin != end && *begin == '}') return ++begin;
+    throw_format_error("invalid format string");
   }
-  handler.end_precision();
   return begin;
 }
 
 template <typename Char>
-FMT_CONSTEXPR auto parse_presentation_type(Char type) -> presentation_type {
-  switch (to_ascii(type)) {
-  case 'd':
-    return presentation_type::dec;
-  case 'o':
-    return presentation_type::oct;
-  case 'x':
-    return presentation_type::hex_lower;
-  case 'X':
-    return presentation_type::hex_upper;
-  case 'b':
-    return presentation_type::bin_lower;
-  case 'B':
-    return presentation_type::bin_upper;
-  case 'a':
-    return presentation_type::hexfloat_lower;
-  case 'A':
-    return presentation_type::hexfloat_upper;
-  case 'e':
-    return presentation_type::exp_lower;
-  case 'E':
-    return presentation_type::exp_upper;
-  case 'f':
-    return presentation_type::fixed_lower;
-  case 'F':
-    return presentation_type::fixed_upper;
-  case 'g':
-    return presentation_type::general_lower;
-  case 'G':
-    return presentation_type::general_upper;
-  case 'c':
-    return presentation_type::chr;
-  case 's':
-    return presentation_type::string;
-  case 'p':
-    return presentation_type::pointer;
-  case '?':
-    return presentation_type::debug;
-  default:
-    return presentation_type::none;
-  }
-}
-
-// Parses standard format specifiers and sends notifications about parsed
-// components to handler.
-template <typename Char, typename SpecHandler>
-FMT_CONSTEXPR FMT_INLINE auto parse_format_specs(const Char* begin,
-                                                 const Char* end,
-                                                 SpecHandler&& handler)
+FMT_CONSTEXPR auto parse_precision(const Char* begin, const Char* end,
+                                   int& value, arg_ref<Char>& ref,
+                                   basic_format_parse_context<Char>& ctx)
     -> const Char* {
-  if (1 < end - begin && begin[1] == '}' && is_ascii_letter(*begin) &&
-      *begin != 'L') {
-    presentation_type type = parse_presentation_type(*begin++);
-    if (type == presentation_type::none)
-      handler.on_error("invalid type specifier");
-    handler.on_type(type);
+  ++begin;
+  if (begin == end || *begin == '}') {
+    throw_format_error("invalid precision");
     return begin;
   }
+  return parse_dynamic_spec(begin, end, value, ref, ctx);
+}
 
-  if (begin == end) return begin;
-
-  begin = parse_align(begin, end, handler);
-  if (begin == end) return begin;
-
-  // Parse sign.
-  switch (to_ascii(*begin)) {
-  case '+':
-    handler.on_sign(sign::plus);
-    ++begin;
-    break;
-  case '-':
-    handler.on_sign(sign::minus);
-    ++begin;
-    break;
-  case ' ':
-    handler.on_sign(sign::space);
-    ++begin;
-    break;
-  default:
-    break;
-  }
-  if (begin == end) return begin;
-
-  if (*begin == '#') {
-    handler.on_hash();
-    if (++begin == end) return begin;
-  }
-
-  // Parse zero flag.
-  if (*begin == '0') {
-    handler.on_zero();
-    if (++begin == end) return begin;
-  }
-
-  begin = parse_width(begin, end, handler);
-  if (begin == end) return begin;
+enum class state { start, align, sign, hash, zero, width, precision, locale };
 
-  // Parse precision.
-  if (*begin == '.') {
-    begin = parse_precision(begin, end, handler);
+// Parses standard format specifiers.
+template <typename Char>
+FMT_CONSTEXPR FMT_INLINE auto parse_format_specs(
+    const Char* begin, const Char* end, dynamic_format_specs<Char>& specs,
+    basic_format_parse_context<Char>& ctx, type arg_type) -> const Char* {
+  auto c = '\0';
+  if (end - begin > 1) {
+    auto next = to_ascii(begin[1]);
+    c = parse_align(next) == align::none ? to_ascii(*begin) : '\0';
+  } else {
     if (begin == end) return begin;
+    c = to_ascii(*begin);
   }
 
-  if (*begin == 'L') {
-    handler.on_localized();
-    ++begin;
-  }
+  struct {
+    state current_state = state::start;
+    FMT_CONSTEXPR void operator()(state s, bool valid = true) {
+      if (current_state >= s || !valid)
+        throw_format_error("invalid format specifier");
+      current_state = s;
+    }
+  } enter_state;
+
+  using pres = presentation_type;
+  constexpr auto integral_set = sint_set | uint_set | bool_set | char_set;
+  struct {
+    const Char*& begin;
+    dynamic_format_specs<Char>& specs;
+    type arg_type;
+
+    FMT_CONSTEXPR auto operator()(pres type, int set) -> const Char* {
+      if (!in(arg_type, set)) throw_format_error("invalid format specifier");
+      specs.type = type;
+      return begin + 1;
+    }
+  } parse_presentation_type{begin, specs, arg_type};
 
-  // Parse type.
-  if (begin != end && *begin != '}') {
-    presentation_type type = parse_presentation_type(*begin++);
-    if (type == presentation_type::none)
-      handler.on_error("invalid type specifier");
-    handler.on_type(type);
+  for (;;) {
+    switch (c) {
+    case '<':
+    case '>':
+    case '^':
+      enter_state(state::align);
+      specs.align = parse_align(c);
+      ++begin;
+      break;
+    case '+':
+    case '-':
+    case ' ':
+      enter_state(state::sign, in(arg_type, sint_set | float_set));
+      switch (c) {
+      case '+':
+        specs.sign = sign::plus;
+        break;
+      case '-':
+        specs.sign = sign::minus;
+        break;
+      case ' ':
+        specs.sign = sign::space;
+        break;
+      }
+      ++begin;
+      break;
+    case '#':
+      enter_state(state::hash, is_arithmetic_type(arg_type));
+      specs.alt = true;
+      ++begin;
+      break;
+    case '0':
+      enter_state(state::zero);
+      if (!is_arithmetic_type(arg_type))
+        throw_format_error("format specifier requires numeric argument");
+      if (specs.align == align::none) {
+        // Ignore 0 if align is specified for compatibility with std::format.
+        specs.align = align::numeric;
+        specs.fill[0] = Char('0');
+      }
+      ++begin;
+      break;
+    case '1':
+    case '2':
+    case '3':
+    case '4':
+    case '5':
+    case '6':
+    case '7':
+    case '8':
+    case '9':
+    case '{':
+      enter_state(state::width);
+      begin = parse_dynamic_spec(begin, end, specs.width, specs.width_ref, ctx);
+      break;
+    case '.':
+      enter_state(state::precision,
+                  in(arg_type, float_set | string_set | cstring_set));
+      begin = parse_precision(begin, end, specs.precision, specs.precision_ref,
+                              ctx);
+      break;
+    case 'L':
+      enter_state(state::locale, is_arithmetic_type(arg_type));
+      specs.localized = true;
+      ++begin;
+      break;
+    case 'd':
+      return parse_presentation_type(pres::dec, integral_set);
+    case 'o':
+      return parse_presentation_type(pres::oct, integral_set);
+    case 'x':
+      return parse_presentation_type(pres::hex_lower, integral_set);
+    case 'X':
+      return parse_presentation_type(pres::hex_upper, integral_set);
+    case 'b':
+      return parse_presentation_type(pres::bin_lower, integral_set);
+    case 'B':
+      return parse_presentation_type(pres::bin_upper, integral_set);
+    case 'a':
+      return parse_presentation_type(pres::hexfloat_lower, float_set);
+    case 'A':
+      return parse_presentation_type(pres::hexfloat_upper, float_set);
+    case 'e':
+      return parse_presentation_type(pres::exp_lower, float_set);
+    case 'E':
+      return parse_presentation_type(pres::exp_upper, float_set);
+    case 'f':
+      return parse_presentation_type(pres::fixed_lower, float_set);
+    case 'F':
+      return parse_presentation_type(pres::fixed_upper, float_set);
+    case 'g':
+      return parse_presentation_type(pres::general_lower, float_set);
+    case 'G':
+      return parse_presentation_type(pres::general_upper, float_set);
+    case 'c':
+      return parse_presentation_type(pres::chr, integral_set);
+    case 's':
+      return parse_presentation_type(pres::string,
+                                     bool_set | string_set | cstring_set);
+    case 'p':
+      return parse_presentation_type(pres::pointer, pointer_set | cstring_set);
+    case '?':
+      return parse_presentation_type(pres::debug,
+                                     char_set | string_set | cstring_set);
+    case '}':
+      return begin;
+    default: {
+      if (*begin == '}') return begin;
+      // Parse fill and alignment.
+      auto fill_end = begin + code_point_length(begin);
+      if (end - fill_end <= 0) {
+        throw_format_error("invalid format specifier");
+        return begin;
+      }
+      if (*begin == '{') {
+        throw_format_error("invalid fill character '{'");
+        return begin;
+      }
+      auto align = parse_align(to_ascii(*fill_end));
+      enter_state(state::align, align != align::none);
+      specs.fill = {begin, to_unsigned(fill_end - begin)};
+      specs.align = align;
+      begin = fill_end + 1;
+    }
+    }
+    if (begin == end) return begin;
+    c = to_ascii(*begin);
   }
-  return begin;
 }
 
 template <typename Char, typename Handler>
@@ -2637,14 +2446,11 @@ FMT_CONSTEXPR auto parse_replacement_field(const Char* begin, const Char* end,
     Handler& handler;
     int arg_id;
 
-    FMT_CONSTEXPR void operator()() { arg_id = handler.on_arg_id(); }
-    FMT_CONSTEXPR void operator()(int id) { arg_id = handler.on_arg_id(id); }
-    FMT_CONSTEXPR void operator()(basic_string_view<Char> id) {
+    FMT_CONSTEXPR void on_auto() { arg_id = handler.on_arg_id(); }
+    FMT_CONSTEXPR void on_index(int id) { arg_id = handler.on_arg_id(id); }
+    FMT_CONSTEXPR void on_name(basic_string_view<Char> id) {
       arg_id = handler.on_arg_id(id);
     }
-    FMT_CONSTEXPR void on_error(const char* message) {
-      if (message) handler.on_error(message);
-    }
   };
 
   ++begin;
@@ -2673,9 +2479,6 @@ FMT_CONSTEXPR auto parse_replacement_field(const Char* begin, const Char* end,
 template <bool IS_CONSTEXPR, typename Char, typename Handler>
 FMT_CONSTEXPR FMT_INLINE void parse_format_string(
     basic_string_view<Char> format_str, Handler&& handler) {
-  // Workaround a name-lookup bug in MSVC's modules implementation.
-  using detail::find;
-
   auto begin = format_str.data();
   auto end = begin + format_str.size();
   if (end - begin < 32) {
@@ -2735,189 +2538,46 @@ FMT_CONSTEXPR auto parse_format_specs(ParseContext& ctx)
     -> decltype(ctx.begin()) {
   using char_type = typename ParseContext::char_type;
   using context = buffer_context<char_type>;
-  using stripped_type = typename strip_named_arg<T>::type;
   using mapped_type = conditional_t<
       mapped_type_constant<T, context>::value != type::custom_type,
       decltype(arg_mapper<context>().map(std::declval<const T&>())),
-      stripped_type>;
-  auto f = conditional_t<has_formatter<mapped_type, context>::value,
-                         formatter<mapped_type, char_type>,
-                         fallback_formatter<stripped_type, char_type>>();
-  return f.parse(ctx);
-}
-
-template <typename ErrorHandler>
-FMT_CONSTEXPR void check_int_type_spec(presentation_type type,
-                                       ErrorHandler&& eh) {
-  if (type > presentation_type::bin_upper && type != presentation_type::chr)
-    eh.on_error("invalid type specifier");
+      typename strip_named_arg<T>::type>;
+#if defined(__cpp_if_constexpr)
+  if constexpr (std::is_default_constructible_v<
+                    formatter<mapped_type, char_type>>) {
+    return formatter<mapped_type, char_type>().parse(ctx);
+  } else {
+    type_is_unformattable_for<T, char_type> _;
+    return ctx.begin();
+  }
+#else
+  return formatter<mapped_type, char_type>().parse(ctx);
+#endif
 }
 
-// Checks char specs and returns true if the type spec is char (and not int).
-template <typename Char, typename ErrorHandler = error_handler>
-FMT_CONSTEXPR auto check_char_specs(const basic_format_specs<Char>& specs,
-                                    ErrorHandler&& eh = {}) -> bool {
+// Checks char specs and returns true iff the presentation type is char-like.
+template <typename Char>
+FMT_CONSTEXPR auto check_char_specs(const format_specs<Char>& specs) -> bool {
   if (specs.type != presentation_type::none &&
       specs.type != presentation_type::chr &&
       specs.type != presentation_type::debug) {
-    check_int_type_spec(specs.type, eh);
     return false;
   }
   if (specs.align == align::numeric || specs.sign != sign::none || specs.alt)
-    eh.on_error("invalid format specifier for char");
+    throw_format_error("invalid format specifier for char");
   return true;
 }
 
-// A floating-point presentation format.
-enum class float_format : unsigned char {
-  general,  // General: exponent notation or fixed point based on magnitude.
-  exp,      // Exponent notation with the default precision of 6, e.g. 1.2e-3.
-  fixed,    // Fixed point with the default precision of 6, e.g. 0.0012.
-  hex
-};
-
-struct float_specs {
-  int precision;
-  float_format format : 8;
-  sign_t sign : 8;
-  bool upper : 1;
-  bool locale : 1;
-  bool binary32 : 1;
-  bool showpoint : 1;
-};
-
-template <typename ErrorHandler = error_handler, typename Char>
-FMT_CONSTEXPR auto parse_float_type_spec(const basic_format_specs<Char>& specs,
-                                         ErrorHandler&& eh = {})
-    -> float_specs {
-  auto result = float_specs();
-  result.showpoint = specs.alt;
-  result.locale = specs.localized;
-  switch (specs.type) {
-  case presentation_type::none:
-    result.format = float_format::general;
-    break;
-  case presentation_type::general_upper:
-    result.upper = true;
-    FMT_FALLTHROUGH;
-  case presentation_type::general_lower:
-    result.format = float_format::general;
-    break;
-  case presentation_type::exp_upper:
-    result.upper = true;
-    FMT_FALLTHROUGH;
-  case presentation_type::exp_lower:
-    result.format = float_format::exp;
-    result.showpoint |= specs.precision != 0;
-    break;
-  case presentation_type::fixed_upper:
-    result.upper = true;
-    FMT_FALLTHROUGH;
-  case presentation_type::fixed_lower:
-    result.format = float_format::fixed;
-    result.showpoint |= specs.precision != 0;
-    break;
-  case presentation_type::hexfloat_upper:
-    result.upper = true;
-    FMT_FALLTHROUGH;
-  case presentation_type::hexfloat_lower:
-    result.format = float_format::hex;
-    break;
-  default:
-    eh.on_error("invalid type specifier");
-    break;
-  }
-  return result;
-}
-
-template <typename ErrorHandler = error_handler>
-FMT_CONSTEXPR auto check_cstring_type_spec(presentation_type type,
-                                           ErrorHandler&& eh = {}) -> bool {
-  if (type == presentation_type::none || type == presentation_type::string ||
-      type == presentation_type::debug)
-    return true;
-  if (type != presentation_type::pointer) eh.on_error("invalid type specifier");
-  return false;
-}
-
-template <typename ErrorHandler = error_handler>
-FMT_CONSTEXPR void check_string_type_spec(presentation_type type,
-                                          ErrorHandler&& eh = {}) {
-  if (type != presentation_type::none && type != presentation_type::string &&
-      type != presentation_type::debug)
-    eh.on_error("invalid type specifier");
-}
-
-template <typename ErrorHandler>
-FMT_CONSTEXPR void check_pointer_type_spec(presentation_type type,
-                                           ErrorHandler&& eh) {
-  if (type != presentation_type::none && type != presentation_type::pointer)
-    eh.on_error("invalid type specifier");
-}
-
-// A parse_format_specs handler that checks if specifiers are consistent with
-// the argument type.
-template <typename Handler> class specs_checker : public Handler {
- private:
-  detail::type arg_type_;
-
-  FMT_CONSTEXPR void require_numeric_argument() {
-    if (!is_arithmetic_type(arg_type_))
-      this->on_error("format specifier requires numeric argument");
-  }
-
- public:
-  FMT_CONSTEXPR specs_checker(const Handler& handler, detail::type arg_type)
-      : Handler(handler), arg_type_(arg_type) {}
-
-  FMT_CONSTEXPR void on_align(align_t align) {
-    if (align == align::numeric) require_numeric_argument();
-    Handler::on_align(align);
-  }
-
-  FMT_CONSTEXPR void on_sign(sign_t s) {
-    require_numeric_argument();
-    if (is_integral_type(arg_type_) && arg_type_ != type::int_type &&
-        arg_type_ != type::long_long_type && arg_type_ != type::int128_type &&
-        arg_type_ != type::char_type) {
-      this->on_error("format specifier requires signed argument");
-    }
-    Handler::on_sign(s);
-  }
-
-  FMT_CONSTEXPR void on_hash() {
-    require_numeric_argument();
-    Handler::on_hash();
-  }
-
-  FMT_CONSTEXPR void on_localized() {
-    require_numeric_argument();
-    Handler::on_localized();
-  }
-
-  FMT_CONSTEXPR void on_zero() {
-    require_numeric_argument();
-    Handler::on_zero();
-  }
-
-  FMT_CONSTEXPR void end_precision() {
-    if (is_integral_type(arg_type_) || arg_type_ == type::pointer_type)
-      this->on_error("precision not allowed for this argument type");
-  }
-};
-
-constexpr int invalid_arg_index = -1;
-
 #if FMT_USE_NONTYPE_TEMPLATE_ARGS
 template <int N, typename T, typename... Args, typename Char>
 constexpr auto get_arg_index_by_name(basic_string_view<Char> name) -> int {
-  if constexpr (detail::is_statically_named_arg<T>()) {
+  if constexpr (is_statically_named_arg<T>()) {
     if (name == T::name) return N;
   }
   if constexpr (sizeof...(Args) > 0)
     return get_arg_index_by_name<N + 1, Args...>(name);
   (void)name;  // Workaround an MSVC bug about "unused" parameter.
-  return invalid_arg_index;
+  return -1;
 }
 #endif
 
@@ -2928,34 +2588,29 @@ FMT_CONSTEXPR auto get_arg_index_by_name(basic_string_view<Char> name) -> int {
     return get_arg_index_by_name<0, Args...>(name);
 #endif
   (void)name;
-  return invalid_arg_index;
+  return -1;
 }
 
-template <typename Char, typename ErrorHandler, typename... Args>
-class format_string_checker {
+template <typename Char, typename... Args> class format_string_checker {
  private:
-  // In the future basic_format_parse_context will replace compile_parse_context
-  // here and will use is_constant_evaluated and downcasting to access the data
-  // needed for compile-time checks: https://godbolt.org/z/GvWzcTjh1.
-  using parse_context_type = compile_parse_context<Char, ErrorHandler>;
+  using parse_context_type = compile_parse_context<Char>;
   static constexpr int num_args = sizeof...(Args);
 
   // Format specifier parsing function.
+  // In the future basic_format_parse_context will replace compile_parse_context
+  // here and will use is_constant_evaluated and downcasting to access the data
+  // needed for compile-time checks: https://godbolt.org/z/GvWzcTjh1.
   using parse_func = const Char* (*)(parse_context_type&);
 
+  type types_[num_args > 0 ? static_cast<size_t>(num_args) : 1];
   parse_context_type context_;
   parse_func parse_funcs_[num_args > 0 ? static_cast<size_t>(num_args) : 1];
-  type types_[num_args > 0 ? static_cast<size_t>(num_args) : 1];
 
  public:
-  explicit FMT_CONSTEXPR format_string_checker(
-      basic_string_view<Char> format_str, ErrorHandler eh)
-      : context_(format_str, num_args, types_, eh),
-        parse_funcs_{&parse_format_specs<Args, parse_context_type>...},
-        types_{
-            mapped_type_constant<Args,
-                                 basic_format_context<Char*, Char>>::value...} {
-  }
+  explicit FMT_CONSTEXPR format_string_checker(basic_string_view<Char> fmt)
+      : types_{mapped_type_constant<Args, buffer_context<Char>>::value...},
+        context_(fmt, num_args, types_),
+        parse_funcs_{&parse_format_specs<Args, parse_context_type>...} {}
 
   FMT_CONSTEXPR void on_text(const Char*, const Char*) {}
 
@@ -2966,8 +2621,8 @@ class format_string_checker {
   FMT_CONSTEXPR auto on_arg_id(basic_string_view<Char> id) -> int {
 #if FMT_USE_NONTYPE_TEMPLATE_ARGS
     auto index = get_arg_index_by_name<Args...>(id);
-    if (index == invalid_arg_index) on_error("named argument is not found");
-    return context_.check_arg_id(index), index;
+    if (index < 0) on_error("named argument is not found");
+    return index;
 #else
     (void)id;
     on_error("compile-time checks for named arguments require C++20 support");
@@ -2975,17 +2630,19 @@ class format_string_checker {
 #endif
   }
 
-  FMT_CONSTEXPR void on_replacement_field(int, const Char*) {}
+  FMT_CONSTEXPR void on_replacement_field(int id, const Char* begin) {
+    on_format_specs(id, begin, begin);  // Call parse() on empty specs.
+  }
 
   FMT_CONSTEXPR auto on_format_specs(int id, const Char* begin, const Char*)
       -> const Char* {
-    context_.advance_to(context_.begin() + (begin - &*context_.begin()));
+    context_.advance_to(begin);
     // id >= 0 check is a workaround for gcc 10 bug (#2065).
     return id >= 0 && id < num_args ? parse_funcs_[id](context_) : begin;
   }
 
   FMT_CONSTEXPR void on_error(const char* message) {
-    context_.on_error(message);
+    throw_format_error(message);
   }
 };
 
@@ -3001,28 +2658,33 @@ FMT_INLINE void check_format_string(const S&) {
 template <typename... Args, typename S,
           FMT_ENABLE_IF(is_compile_string<S>::value)>
 void check_format_string(S format_str) {
-  FMT_CONSTEXPR auto s = basic_string_view<typename S::char_type>(format_str);
-  using checker = format_string_checker<typename S::char_type, error_handler,
-                                        remove_cvref_t<Args>...>;
-  FMT_CONSTEXPR bool invalid_format =
-      (parse_format_string<true>(s, checker(s, {})), true);
-  ignore_unused(invalid_format);
+  using char_t = typename S::char_type;
+  FMT_CONSTEXPR auto s = basic_string_view<char_t>(format_str);
+  using checker = format_string_checker<char_t, remove_cvref_t<Args>...>;
+  FMT_CONSTEXPR bool error = (parse_format_string<true>(s, checker(s)), true);
+  ignore_unused(error);
 }
 
+template <typename Char = char> struct vformat_args {
+  using type = basic_format_args<
+      basic_format_context<std::back_insert_iterator<buffer<Char>>, Char>>;
+};
+template <> struct vformat_args<char> { using type = format_args; };
+
+// Use vformat_args and avoid type_identity to keep symbols short.
 template <typename Char>
-void vformat_to(
-    buffer<Char>& buf, basic_string_view<Char> fmt,
-    basic_format_args<FMT_BUFFER_CONTEXT(type_identity_t<Char>)> args,
-    locale_ref loc = {});
+void vformat_to(buffer<Char>& buf, basic_string_view<Char> fmt,
+                typename vformat_args<Char>::type args, locale_ref loc = {});
 
 FMT_API void vprint_mojibake(std::FILE*, string_view, format_args);
 #ifndef _WIN32
 inline void vprint_mojibake(std::FILE*, string_view, format_args) {}
 #endif
-FMT_END_DETAIL_NAMESPACE
+}  // namespace detail
+
+FMT_BEGIN_EXPORT
 
-// A formatter specialization for the core types corresponding to detail::type
-// constants.
+// A formatter specialization for natively supported types.
 template <typename T, typename Char>
 struct formatter<T, Char,
                  enable_if_t<detail::type_constant<T, Char>::value !=
@@ -3031,81 +2693,21 @@ struct formatter<T, Char,
   detail::dynamic_format_specs<Char> specs_;
 
  public:
-  // Parses format specifiers stopping either at the end of the range or at the
-  // terminating '}'.
   template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
-    auto begin = ctx.begin(), end = ctx.end();
-    if (begin == end) return begin;
-    using handler_type = detail::dynamic_specs_handler<ParseContext>;
+  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> const Char* {
     auto type = detail::type_constant<T, Char>::value;
-    auto checker =
-        detail::specs_checker<handler_type>(handler_type(specs_, ctx), type);
-    auto it = detail::parse_format_specs(begin, end, checker);
-    auto eh = ctx.error_handler();
-    switch (type) {
-    case detail::type::none_type:
-      FMT_ASSERT(false, "invalid argument type");
-      break;
-    case detail::type::bool_type:
-      if (specs_.type == presentation_type::none ||
-          specs_.type == presentation_type::string) {
-        break;
-      }
-      FMT_FALLTHROUGH;
-    case detail::type::int_type:
-    case detail::type::uint_type:
-    case detail::type::long_long_type:
-    case detail::type::ulong_long_type:
-    case detail::type::int128_type:
-    case detail::type::uint128_type:
-      detail::check_int_type_spec(specs_.type, eh);
-      break;
-    case detail::type::char_type:
-      detail::check_char_specs(specs_, eh);
-      break;
-    case detail::type::float_type:
-      if (detail::const_check(FMT_USE_FLOAT))
-        detail::parse_float_type_spec(specs_, eh);
-      else
-        FMT_ASSERT(false, "float support disabled");
-      break;
-    case detail::type::double_type:
-      if (detail::const_check(FMT_USE_DOUBLE))
-        detail::parse_float_type_spec(specs_, eh);
-      else
-        FMT_ASSERT(false, "double support disabled");
-      break;
-    case detail::type::long_double_type:
-      if (detail::const_check(FMT_USE_LONG_DOUBLE))
-        detail::parse_float_type_spec(specs_, eh);
-      else
-        FMT_ASSERT(false, "long double support disabled");
-      break;
-    case detail::type::cstring_type:
-      detail::check_cstring_type_spec(specs_.type, eh);
-      break;
-    case detail::type::string_type:
-      detail::check_string_type_spec(specs_.type, eh);
-      break;
-    case detail::type::pointer_type:
-      detail::check_pointer_type_spec(specs_.type, eh);
-      break;
-    case detail::type::custom_type:
-      // Custom format specifiers are checked in parse functions of
-      // formatter specializations.
-      break;
-    }
-    return it;
+    auto end =
+        detail::parse_format_specs(ctx.begin(), ctx.end(), specs_, ctx, type);
+    if (type == detail::type::char_type) detail::check_char_specs(specs_);
+    return end;
   }
 
   template <detail::type U = detail::type_constant<T, Char>::value,
-            enable_if_t<(U == detail::type::string_type ||
-                         U == detail::type::cstring_type ||
-                         U == detail::type::char_type),
-                        int> = 0>
-  FMT_CONSTEXPR void set_debug_format() {
-    specs_.type = presentation_type::debug;
+            FMT_ENABLE_IF(U == detail::type::string_type ||
+                          U == detail::type::cstring_type ||
+                          U == detail::type::char_type)>
+  FMT_CONSTEXPR void set_debug_format(bool set = true) {
+    specs_.type = set ? presentation_type::debug : presentation_type::none;
   }
 
   template <typename FormatContext>
@@ -3113,28 +2715,9 @@ struct formatter<T, Char,
       -> decltype(ctx.out());
 };
 
-#define FMT_FORMAT_AS(Type, Base)                                        \
-  template <typename Char>                                               \
-  struct formatter<Type, Char> : formatter<Base, Char> {                 \
-    template <typename FormatContext>                                    \
-    auto format(Type const& val, FormatContext& ctx) const               \
-        -> decltype(ctx.out()) {                                         \
-      return formatter<Base, Char>::format(static_cast<Base>(val), ctx); \
-    }                                                                    \
-  }
-
-FMT_FORMAT_AS(signed char, int);
-FMT_FORMAT_AS(unsigned char, unsigned);
-FMT_FORMAT_AS(short, int);
-FMT_FORMAT_AS(unsigned short, unsigned);
-FMT_FORMAT_AS(long, long long);
-FMT_FORMAT_AS(unsigned long, unsigned long long);
-FMT_FORMAT_AS(Char*, const Char*);
-FMT_FORMAT_AS(std::basic_string<Char>, basic_string_view<Char>);
-FMT_FORMAT_AS(std::nullptr_t, const void*);
-FMT_FORMAT_AS(detail::std_string_view<Char>, basic_string_view<Char>);
-
-template <typename Char> struct basic_runtime { basic_string_view<Char> str; };
+template <typename Char = char> struct runtime_format_string {
+  basic_string_view<Char> str;
+};
 
 /** A compile-time format string. */
 template <typename Char, typename... Args> class basic_format_string {
@@ -3154,17 +2737,18 @@ template <typename Char, typename... Args> class basic_format_string {
 #ifdef FMT_HAS_CONSTEVAL
     if constexpr (detail::count_named_args<Args...>() ==
                   detail::count_statically_named_args<Args...>()) {
-      using checker = detail::format_string_checker<Char, detail::error_handler,
-                                                    remove_cvref_t<Args>...>;
-      detail::parse_format_string<true>(str_, checker(s, {}));
+      using checker =
+          detail::format_string_checker<Char, remove_cvref_t<Args>...>;
+      detail::parse_format_string<true>(str_, checker(s));
     }
 #else
     detail::check_format_string<Args...>(s);
 #endif
   }
-  basic_format_string(basic_runtime<Char> r) : str_(r.str) {}
+  basic_format_string(runtime_format_string<Char> fmt) : str_(fmt.str) {}
 
   FMT_INLINE operator basic_string_view<Char>() const { return str_; }
+  FMT_INLINE auto get() const -> basic_string_view<Char> { return str_; }
 };
 
 #if FMT_GCC_VERSION && FMT_GCC_VERSION < 409
@@ -3184,7 +2768,7 @@ using format_string = basic_format_string<char, type_identity_t<Args>...>;
     fmt::print(fmt::runtime("{:d}"), "I am not a number");
   \endrst
  */
-inline auto runtime(string_view s) -> basic_runtime<char> { return {{s}}; }
+inline auto runtime(string_view s) -> runtime_format_string<> { return {{s}}; }
 #endif
 
 FMT_API auto vformat(string_view fmt, format_args args) -> std::string;
@@ -3210,10 +2794,9 @@ FMT_NODISCARD FMT_INLINE auto format(format_string<T...> fmt, T&&... args)
 template <typename OutputIt,
           FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, char>::value)>
 auto vformat_to(OutputIt out, string_view fmt, format_args args) -> OutputIt {
-  using detail::get_buffer;
-  auto&& buf = get_buffer<char>(out);
+  auto&& buf = detail::get_buffer<char>(out);
   detail::vformat_to(buf, fmt, args, {});
-  return detail::get_iterator(buf);
+  return detail::get_iterator(buf, out);
 }
 
 /**
@@ -3272,7 +2855,7 @@ template <typename... T>
 FMT_NODISCARD FMT_INLINE auto formatted_size(format_string<T...> fmt,
                                              T&&... args) -> size_t {
   auto buf = detail::counting_buffer<>();
-  detail::vformat_to(buf, string_view(fmt), fmt::make_format_args(args...), {});
+  detail::vformat_to<char>(buf, fmt, fmt::make_format_args(args...), {});
   return buf.count();
 }
 
@@ -3313,7 +2896,25 @@ FMT_INLINE void print(std::FILE* f, format_string<T...> fmt, T&&... args) {
                            : detail::vprint_mojibake(f, fmt, vargs);
 }
 
-FMT_MODULE_EXPORT_END
+/**
+  Formats ``args`` according to specifications in ``fmt`` and writes the
+  output to the file ``f`` followed by a newline.
+ */
+template <typename... T>
+FMT_INLINE void println(std::FILE* f, format_string<T...> fmt, T&&... args) {
+  return fmt::print(f, "{}\n", fmt::format(fmt, std::forward<T>(args)...));
+}
+
+/**
+  Formats ``args`` according to specifications in ``fmt`` and writes the output
+  to ``stdout`` followed by a newline.
+ */
+template <typename... T>
+FMT_INLINE void println(format_string<T...> fmt, T&&... args) {
+  return fmt::println(stdout, fmt, std::forward<T>(args)...);
+}
+
+FMT_END_EXPORT
 FMT_GCC_PRAGMA("GCC pop_options")
 FMT_END_NAMESPACE
 
diff --git a/contrib/fmt/include/fmt/format-inl.h b/contrib/fmt/include/fmt/format-inl.h
index 22b1ec8df..dac2d437a 100644
--- a/contrib/fmt/include/fmt/format-inl.h
+++ b/contrib/fmt/include/fmt/format-inl.h
@@ -9,13 +9,9 @@
 #define FMT_FORMAT_INL_H_
 
 #include <algorithm>
-#include <cctype>
 #include <cerrno>  // errno
 #include <climits>
 #include <cmath>
-#include <cstdarg>
-#include <cstring>  // std::memmove
-#include <cwchar>
 #include <exception>
 
 #ifndef FMT_STATIC_THOUSANDS_SEPARATOR
@@ -115,16 +111,43 @@ template <typename Char> FMT_FUNC Char decimal_point_impl(locale_ref) {
   return '.';
 }
 #endif
+
+FMT_FUNC auto write_loc(appender out, loc_value value,
+                        const format_specs<>& specs, locale_ref loc) -> bool {
+#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
+  auto locale = loc.get<std::locale>();
+  // We cannot use the num_put<char> facet because it may produce output in
+  // a wrong encoding.
+  using facet = format_facet<std::locale>;
+  if (std::has_facet<facet>(locale))
+    return std::use_facet<facet>(locale).put(out, value, specs);
+  return facet(locale).put(out, value, specs);
+#endif
+  return false;
+}
 }  // namespace detail
 
-#if !FMT_MSC_VERSION
-FMT_API FMT_FUNC format_error::~format_error() noexcept = default;
+template <typename Locale> typename Locale::id format_facet<Locale>::id;
+
+#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
+template <typename Locale> format_facet<Locale>::format_facet(Locale& loc) {
+  auto& numpunct = std::use_facet<std::numpunct<char>>(loc);
+  grouping_ = numpunct.grouping();
+  if (!grouping_.empty()) separator_ = std::string(1, numpunct.thousands_sep());
+}
+
+template <>
+FMT_API FMT_FUNC auto format_facet<std::locale>::do_put(
+    appender out, loc_value val, const format_specs<>& specs) const -> bool {
+  return val.visit(
+      detail::loc_writer<>{out, specs, separator_, grouping_, decimal_point_});
+}
 #endif
 
-FMT_FUNC std::system_error vsystem_error(int error_code, string_view format_str,
+FMT_FUNC std::system_error vsystem_error(int error_code, string_view fmt,
                                          format_args args) {
   auto ec = std::error_code(error_code, std::generic_category());
-  return std::system_error(ec, vformat(format_str, args));
+  return std::system_error(ec, vformat(fmt, args));
 }
 
 namespace detail {
@@ -143,58 +166,8 @@ FMT_CONSTEXPR inline uint64_t rotr(uint64_t n, uint32_t r) noexcept {
   return (n >> r) | (n << (64 - r));
 }
 
-// Computes 128-bit result of multiplication of two 64-bit unsigned integers.
-inline uint128_fallback umul128(uint64_t x, uint64_t y) noexcept {
-#if FMT_USE_INT128
-  auto p = static_cast<uint128_opt>(x) * static_cast<uint128_opt>(y);
-  return {static_cast<uint64_t>(p >> 64), static_cast<uint64_t>(p)};
-#elif defined(_MSC_VER) && defined(_M_X64)
-  auto result = uint128_fallback();
-  result.lo_ = _umul128(x, y, &result.hi_);
-  return result;
-#else
-  const uint64_t mask = static_cast<uint64_t>(max_value<uint32_t>());
-
-  uint64_t a = x >> 32;
-  uint64_t b = x & mask;
-  uint64_t c = y >> 32;
-  uint64_t d = y & mask;
-
-  uint64_t ac = a * c;
-  uint64_t bc = b * c;
-  uint64_t ad = a * d;
-  uint64_t bd = b * d;
-
-  uint64_t intermediate = (bd >> 32) + (ad & mask) + (bc & mask);
-
-  return {ac + (intermediate >> 32) + (ad >> 32) + (bc >> 32),
-          (intermediate << 32) + (bd & mask)};
-#endif
-}
-
 // Implementation of Dragonbox algorithm: https://github.com/jk-jeon/dragonbox.
 namespace dragonbox {
-// Computes upper 64 bits of multiplication of two 64-bit unsigned integers.
-inline uint64_t umul128_upper64(uint64_t x, uint64_t y) noexcept {
-#if FMT_USE_INT128
-  auto p = static_cast<uint128_opt>(x) * static_cast<uint128_opt>(y);
-  return static_cast<uint64_t>(p >> 64);
-#elif defined(_MSC_VER) && defined(_M_X64)
-  return __umulh(x, y);
-#else
-  return umul128(x, y).high();
-#endif
-}
-
-// Computes upper 128 bits of multiplication of a 64-bit unsigned integer and a
-// 128-bit unsigned integer.
-inline uint128_fallback umul192_upper128(uint64_t x,
-                                         uint128_fallback y) noexcept {
-  uint128_fallback r = umul128(x, y.high());
-  r += umul128_upper64(x, y.low());
-  return r;
-}
-
 // Computes upper 64 bits of multiplication of a 32-bit unsigned integer and a
 // 64-bit unsigned integer.
 inline uint64_t umul96_upper64(uint32_t x, uint64_t y) noexcept {
@@ -216,25 +189,13 @@ inline uint64_t umul96_lower64(uint32_t x, uint64_t y) noexcept {
   return x * y;
 }
 
-// Computes floor(log10(pow(2, e))) for e in [-2620, 2620] using the method from
-// https://fmt.dev/papers/Dragonbox.pdf#page=28, section 6.1.
-inline int floor_log10_pow2(int e) noexcept {
-  FMT_ASSERT(e <= 2620 && e >= -2620, "too large exponent");
-  static_assert((-1 >> 1) == -1, "right shift is not arithmetic");
-  return (e * 315653) >> 20;
-}
-
 // Various fast log computations.
-inline int floor_log2_pow10(int e) noexcept {
-  FMT_ASSERT(e <= 1233 && e >= -1233, "too large exponent");
-  return (e * 1741647) >> 19;
-}
 inline int floor_log10_pow2_minus_log10_4_over_3(int e) noexcept {
   FMT_ASSERT(e <= 2936 && e >= -2985, "too large exponent");
   return (e * 631305 - 261663) >> 21;
 }
 
-static constexpr struct {
+FMT_INLINE_VARIABLE constexpr struct {
   uint32_t divisor;
   int shift_amount;
 } div_small_pow10_infos[] = {{10, 16}, {100, 16}};
@@ -288,7 +249,7 @@ inline uint64_t divide_by_10_to_kappa_plus_1(uint64_t n) noexcept {
 }
 
 // Various subroutines using pow10 cache
-template <class T> struct cache_accessor;
+template <typename T> struct cache_accessor;
 
 template <> struct cache_accessor<float> {
   using carrier_uint = float_info<float>::carrier_uint;
@@ -1009,8 +970,23 @@ template <> struct cache_accessor<double> {
       {0xfcf62c1dee382c42, 0x46729e03dd9ed7b6},
       {0x9e19db92b4e31ba9, 0x6c07a2c26a8346d2},
       {0xc5a05277621be293, 0xc7098b7305241886},
-      { 0xf70867153aa2db38,
-        0xb8cbee4fc66d1ea8 }
+      {0xf70867153aa2db38, 0xb8cbee4fc66d1ea8},
+      {0x9a65406d44a5c903, 0x737f74f1dc043329},
+      {0xc0fe908895cf3b44, 0x505f522e53053ff3},
+      {0xf13e34aabb430a15, 0x647726b9e7c68ff0},
+      {0x96c6e0eab509e64d, 0x5eca783430dc19f6},
+      {0xbc789925624c5fe0, 0xb67d16413d132073},
+      {0xeb96bf6ebadf77d8, 0xe41c5bd18c57e890},
+      {0x933e37a534cbaae7, 0x8e91b962f7b6f15a},
+      {0xb80dc58e81fe95a1, 0x723627bbb5a4adb1},
+      {0xe61136f2227e3b09, 0xcec3b1aaa30dd91d},
+      {0x8fcac257558ee4e6, 0x213a4f0aa5e8a7b2},
+      {0xb3bd72ed2af29e1f, 0xa988e2cd4f62d19e},
+      {0xe0accfa875af45a7, 0x93eb1b80a33b8606},
+      {0x8c6c01c9498d8b88, 0xbc72f130660533c4},
+      {0xaf87023b9bf0ee6a, 0xeb8fad7c7f8680b5},
+      { 0xdb68c2ca82ed2a05,
+        0xa67398db9f6820e2 }
 #else
       {0xff77b1fcbebcdc4f, 0x25e8e89c13bb0f7b},
       {0xce5d73ff402d98e3, 0xfb0a3d212dc81290},
@@ -1034,8 +1010,8 @@ template <> struct cache_accessor<double> {
       {0x8da471a9de737e24, 0x5ceaecfed289e5d3},
       {0xe4d5e82392a40515, 0x0fabaf3feaa5334b},
       {0xb8da1662e7b00a17, 0x3d6a751f3b936244},
-      { 0x95527a5202df0ccb,
-        0x0f37801e0c43ebc9 }
+      {0x95527a5202df0ccb, 0x0f37801e0c43ebc9},
+      {0xf13e34aabb430a15, 0x647726b9e7c68ff0}
 #endif
     };
 
@@ -1138,8 +1114,12 @@ template <> struct cache_accessor<double> {
   }
 };
 
+FMT_FUNC uint128_fallback get_cached_power(int k) noexcept {
+  return cache_accessor<double>::get_cached_power(k);
+}
+
 // Various integer checks
-template <class T>
+template <typename T>
 bool is_left_endpoint_integer_shorter_interval(int exponent) noexcept {
   const int case_shorter_interval_left_endpoint_lower_threshold = 2;
   const int case_shorter_interval_left_endpoint_upper_threshold = 3;
@@ -1148,12 +1128,12 @@ bool is_left_endpoint_integer_shorter_interval(int exponent) noexcept {
 }
 
 // Remove trailing zeros from n and return the number of zeros removed (float)
-FMT_INLINE int remove_trailing_zeros(uint32_t& n) noexcept {
+FMT_INLINE int remove_trailing_zeros(uint32_t& n, int s = 0) noexcept {
   FMT_ASSERT(n != 0, "");
-  const uint32_t mod_inv_5 = 0xcccccccd;
-  const uint32_t mod_inv_25 = mod_inv_5 * mod_inv_5;
+  // Modular inverse of 5 (mod 2^32): (mod_inv_5 * 5) mod 2^32 = 1.
+  constexpr uint32_t mod_inv_5 = 0xcccccccd;
+  constexpr uint32_t mod_inv_25 = 0xc28f5c29; // = mod_inv_5 * mod_inv_5
 
-  int s = 0;
   while (true) {
     auto q = rotr(n * mod_inv_25, 2);
     if (q > max_value<uint32_t>() / 100) break;
@@ -1165,7 +1145,6 @@ FMT_INLINE int remove_trailing_zeros(uint32_t& n) noexcept {
     n = q;
     s |= 1;
   }
-
   return s;
 }
 
@@ -1179,32 +1158,17 @@ FMT_INLINE int remove_trailing_zeros(uint64_t& n) noexcept {
 
   // Is n is divisible by 10^8?
   if ((nm.high() & ((1ull << (90 - 64)) - 1)) == 0 && nm.low() < magic_number) {
-    // If yes, work with the quotient.
+    // If yes, work with the quotient...
     auto n32 = static_cast<uint32_t>(nm.high() >> (90 - 64));
-
-    const uint32_t mod_inv_5 = 0xcccccccd;
-    const uint32_t mod_inv_25 = mod_inv_5 * mod_inv_5;
-
-    int s = 8;
-    while (true) {
-      auto q = rotr(n32 * mod_inv_25, 2);
-      if (q > max_value<uint32_t>() / 100) break;
-      n32 = q;
-      s += 2;
-    }
-    auto q = rotr(n32 * mod_inv_5, 1);
-    if (q <= max_value<uint32_t>() / 10) {
-      n32 = q;
-      s |= 1;
-    }
-
+    // ... and use the 32 bit variant of the function
+    int s = remove_trailing_zeros(n32, 8);
     n = n32;
     return s;
   }
 
   // If n is not divisible by 10^8, work with n itself.
-  const uint64_t mod_inv_5 = 0xcccccccccccccccd;
-  const uint64_t mod_inv_25 = mod_inv_5 * mod_inv_5;
+  constexpr uint64_t mod_inv_5 = 0xcccccccccccccccd;
+  constexpr uint64_t mod_inv_25 = 0x8f5c28f5c28f5c29; // = mod_inv_5 * mod_inv_5
 
   int s = 0;
   while (true) {
@@ -1223,7 +1187,7 @@ FMT_INLINE int remove_trailing_zeros(uint64_t& n) noexcept {
 }
 
 // The main algorithm for shorter interval case
-template <class T>
+template <typename T>
 FMT_INLINE decimal_fp<T> shorter_interval_case(int exponent) noexcept {
   decimal_fp<T> ret_value;
   // Compute k and beta
@@ -1394,17 +1358,6 @@ template <typename T> decimal_fp<T> to_decimal(T x) noexcept {
   return ret_value;
 }
 }  // namespace dragonbox
-
-#ifdef _MSC_VER
-FMT_FUNC auto fmt_snprintf(char* buf, size_t size, const char* fmt, ...)
-    -> int {
-  auto args = va_list();
-  va_start(args, fmt);
-  int result = vsnprintf_s(buf, size, _TRUNCATE, fmt, args);
-  va_end(args);
-  return result;
-}
-#endif
 }  // namespace detail
 
 template <> struct formatter<detail::bigint> {
@@ -1413,9 +1366,8 @@ template <> struct formatter<detail::bigint> {
     return ctx.begin();
   }
 
-  template <typename FormatContext>
-  auto format(const detail::bigint& n, FormatContext& ctx) const ->
-      typename FormatContext::iterator {
+  auto format(const detail::bigint& n, format_context& ctx) const
+      -> format_context::iterator {
     auto out = ctx.out();
     bool first = true;
     for (auto i = n.bigits_.size(); i > 0; --i) {
@@ -1474,57 +1426,44 @@ FMT_FUNC std::string vformat(string_view fmt, format_args args) {
 }
 
 namespace detail {
-#ifdef _WIN32
+#ifndef _WIN32
+FMT_FUNC bool write_console(std::FILE*, string_view) { return false; }
+#else
 using dword = conditional_t<sizeof(long) == 4, unsigned long, unsigned>;
 extern "C" __declspec(dllimport) int __stdcall WriteConsoleW(  //
     void*, const void*, dword, dword*, void*);
 
 FMT_FUNC bool write_console(std::FILE* f, string_view text) {
   auto fd = _fileno(f);
-  if (_isatty(fd)) {
-    detail::utf8_to_utf16 u16(string_view(text.data(), text.size()));
-    auto written = detail::dword();
-    if (detail::WriteConsoleW(reinterpret_cast<void*>(_get_osfhandle(fd)),
-                              u16.c_str(), static_cast<uint32_t>(u16.size()),
-                              &written, nullptr)) {
-      return true;
-    }
-  }
-  // We return false if the file descriptor was not TTY, or it was but
-  // SetConsoleW failed which can happen if the output has been redirected to
-  // NUL. In both cases when we return false, we should attempt to do regular
-  // write via fwrite or std::ostream::write.
-  return false;
+  if (!_isatty(fd)) return false;
+  auto u16 = utf8_to_utf16(text);
+  auto written = dword();
+  return WriteConsoleW(reinterpret_cast<void*>(_get_osfhandle(fd)), u16.c_str(),
+                       static_cast<uint32_t>(u16.size()), &written, nullptr) != 0;
+}
+
+// Print assuming legacy (non-Unicode) encoding.
+FMT_FUNC void vprint_mojibake(std::FILE* f, string_view fmt, format_args args) {
+  auto buffer = memory_buffer();
+  detail::vformat_to(buffer, fmt,
+                     basic_format_args<buffer_context<char>>(args));
+  fwrite_fully(buffer.data(), 1, buffer.size(), f);
 }
 #endif
 
 FMT_FUNC void print(std::FILE* f, string_view text) {
-#ifdef _WIN32
-  if (write_console(f, text)) return;
-#endif
-  detail::fwrite_fully(text.data(), 1, text.size(), f);
+  if (!write_console(f, text)) fwrite_fully(text.data(), 1, text.size(), f);
 }
 }  // namespace detail
 
-FMT_FUNC void vprint(std::FILE* f, string_view format_str, format_args args) {
-  memory_buffer buffer;
-  detail::vformat_to(buffer, format_str, args);
+FMT_FUNC void vprint(std::FILE* f, string_view fmt, format_args args) {
+  auto buffer = memory_buffer();
+  detail::vformat_to(buffer, fmt, args);
   detail::print(f, {buffer.data(), buffer.size()});
 }
 
-#ifdef _WIN32
-// Print assuming legacy (non-Unicode) encoding.
-FMT_FUNC void detail::vprint_mojibake(std::FILE* f, string_view format_str,
-                                      format_args args) {
-  memory_buffer buffer;
-  detail::vformat_to(buffer, format_str,
-                     basic_format_args<buffer_context<char>>(args));
-  fwrite_fully(buffer.data(), 1, buffer.size(), f);
-}
-#endif
-
-FMT_FUNC void vprint(string_view format_str, format_args args) {
-  vprint(stdout, format_str, args);
+FMT_FUNC void vprint(string_view fmt, format_args args) {
+  vprint(stdout, fmt, args);
 }
 
 namespace detail {
diff --git a/contrib/fmt/include/fmt/format.h b/contrib/fmt/include/fmt/format.h
index 7c607dbd3..e5bd8b110 100644
--- a/contrib/fmt/include/fmt/format.h
+++ b/contrib/fmt/include/fmt/format.h
@@ -33,13 +33,14 @@
 #ifndef FMT_FORMAT_H_
 #define FMT_FORMAT_H_
 
-#include <cmath>         // std::signbit
-#include <cstdint>       // uint32_t
-#include <cstring>       // std::memcpy
-#include <limits>        // std::numeric_limits
-#include <memory>        // std::uninitialized_copy
-#include <stdexcept>     // std::runtime_error
-#include <system_error>  // std::system_error
+#include <cmath>             // std::signbit
+#include <cstdint>           // uint32_t
+#include <cstring>           // std::memcpy
+#include <initializer_list>  // std::initializer_list
+#include <limits>            // std::numeric_limits
+#include <memory>            // std::uninitialized_copy
+#include <stdexcept>         // std::runtime_error
+#include <system_error>      // std::system_error
 
 #ifdef __cpp_lib_bit_cast
 #  include <bit>  // std::bitcast
@@ -47,16 +48,54 @@
 
 #include "core.h"
 
-#if FMT_GCC_VERSION
-#  define FMT_GCC_VISIBILITY_HIDDEN __attribute__((visibility("hidden")))
+#if defined __cpp_inline_variables && __cpp_inline_variables >= 201606L
+#  define FMT_INLINE_VARIABLE inline
 #else
-#  define FMT_GCC_VISIBILITY_HIDDEN
+#  define FMT_INLINE_VARIABLE
 #endif
 
-#ifdef __NVCC__
-#  define FMT_CUDA_VERSION (__CUDACC_VER_MAJOR__ * 100 + __CUDACC_VER_MINOR__)
+#if FMT_HAS_CPP17_ATTRIBUTE(fallthrough)
+#  define FMT_FALLTHROUGH [[fallthrough]]
+#elif defined(__clang__)
+#  define FMT_FALLTHROUGH [[clang::fallthrough]]
+#elif FMT_GCC_VERSION >= 700 && \
+    (!defined(__EDG_VERSION__) || __EDG_VERSION__ >= 520)
+#  define FMT_FALLTHROUGH [[gnu::fallthrough]]
 #else
-#  define FMT_CUDA_VERSION 0
+#  define FMT_FALLTHROUGH
+#endif
+
+#ifndef FMT_DEPRECATED
+#  if FMT_HAS_CPP14_ATTRIBUTE(deprecated) || FMT_MSC_VERSION >= 1900
+#    define FMT_DEPRECATED [[deprecated]]
+#  else
+#    if (defined(__GNUC__) && !defined(__LCC__)) || defined(__clang__)
+#      define FMT_DEPRECATED __attribute__((deprecated))
+#    elif FMT_MSC_VERSION
+#      define FMT_DEPRECATED __declspec(deprecated)
+#    else
+#      define FMT_DEPRECATED /* deprecated */
+#    endif
+#  endif
+#endif
+
+#ifndef FMT_NO_UNIQUE_ADDRESS
+#  if FMT_CPLUSPLUS >= 202002L
+#    if FMT_HAS_CPP_ATTRIBUTE(no_unique_address)
+#      define FMT_NO_UNIQUE_ADDRESS [[no_unique_address]]
+#    elif FMT_MSC_VERSION >= 1929  // VS2019 v16.10 and later
+#      define FMT_NO_UNIQUE_ADDRESS [[msvc::no_unique_address]]
+#    endif
+#  endif
+#endif
+#ifndef FMT_NO_UNIQUE_ADDRESS
+#  define FMT_NO_UNIQUE_ADDRESS
+#endif
+
+#if FMT_GCC_VERSION || defined(__clang__)
+#  define FMT_VISIBILITY(value) __attribute__((visibility(value)))
+#else
+#  define FMT_VISIBILITY(value)
 #endif
 
 #ifdef __has_builtin
@@ -71,12 +110,6 @@
 #  define FMT_NOINLINE
 #endif
 
-#if FMT_MSC_VERSION
-#  define FMT_MSC_DEFAULT = default
-#else
-#  define FMT_MSC_DEFAULT
-#endif
-
 #ifndef FMT_THROW
 #  if FMT_EXCEPTIONS
 #    if FMT_MSC_VERSION || defined(__NVCC__)
@@ -95,10 +128,8 @@ FMT_END_NAMESPACE
 #      define FMT_THROW(x) throw x
 #    endif
 #  else
-#    define FMT_THROW(x)               \
-      do {                             \
-        FMT_ASSERT(false, (x).what()); \
-      } while (false)
+#    define FMT_THROW(x) \
+      ::fmt::detail::assert_fail(__FILE__, __LINE__, (x).what())
 #  endif
 #endif
 
@@ -200,7 +231,8 @@ inline auto clzll(uint64_t x) -> int {
   _BitScanReverse64(&r, x);
 #  else
   // Scan the high 32 bits.
-  if (_BitScanReverse(&r, static_cast<uint32_t>(x >> 32))) return 63 ^ (r + 32);
+  if (_BitScanReverse(&r, static_cast<uint32_t>(x >> 32)))
+    return 63 ^ static_cast<int>(r + 32);
   // Scan the low 32 bits.
   _BitScanReverse(&r, static_cast<uint32_t>(x));
 #  endif
@@ -240,6 +272,19 @@ FMT_END_NAMESPACE
 #endif
 
 FMT_BEGIN_NAMESPACE
+
+template <typename...> struct disjunction : std::false_type {};
+template <typename P> struct disjunction<P> : P {};
+template <typename P1, typename... Pn>
+struct disjunction<P1, Pn...>
+    : conditional_t<bool(P1::value), P1, disjunction<Pn...>> {};
+
+template <typename...> struct conjunction : std::true_type {};
+template <typename P> struct conjunction<P> : P {};
+template <typename P1, typename... Pn>
+struct conjunction<P1, Pn...>
+    : conditional_t<bool(P1::value), conjunction<Pn...>, P1> {};
+
 namespace detail {
 
 FMT_CONSTEXPR inline void abort_fuzzing_if(bool condition) {
@@ -359,6 +404,10 @@ class uint128_fallback {
       -> uint128_fallback {
     return {lhs.hi_ & rhs.hi_, lhs.lo_ & rhs.lo_};
   }
+  friend constexpr auto operator~(const uint128_fallback& n)
+      -> uint128_fallback {
+    return {~n.hi_, ~n.lo_};
+  }
   friend auto operator+(const uint128_fallback& lhs,
                         const uint128_fallback& rhs) -> uint128_fallback {
     auto result = uint128_fallback(lhs);
@@ -397,6 +446,10 @@ class uint128_fallback {
     lo_ = new_lo;
     hi_ = new_hi;
   }
+  FMT_CONSTEXPR void operator&=(uint128_fallback n) {
+    lo_ &= n.lo_;
+    hi_ &= n.hi_;
+  }
 
   FMT_CONSTEXPR20 uint128_fallback& operator+=(uint64_t n) noexcept {
     if (is_constant_evaluated()) {
@@ -463,10 +516,34 @@ inline auto bit_cast(const From& from) -> To {
   return result;
 }
 
+template <typename UInt>
+FMT_CONSTEXPR20 inline auto countl_zero_fallback(UInt n) -> int {
+  int lz = 0;
+  constexpr UInt msb_mask = static_cast<UInt>(1) << (num_bits<UInt>() - 1);
+  for (; (n & msb_mask) == 0; n <<= 1) lz++;
+  return lz;
+}
+
+FMT_CONSTEXPR20 inline auto countl_zero(uint32_t n) -> int {
+#ifdef FMT_BUILTIN_CLZ
+  if (!is_constant_evaluated()) return FMT_BUILTIN_CLZ(n);
+#endif
+  return countl_zero_fallback(n);
+}
+
+FMT_CONSTEXPR20 inline auto countl_zero(uint64_t n) -> int {
+#ifdef FMT_BUILTIN_CLZLL
+  if (!is_constant_evaluated()) return FMT_BUILTIN_CLZLL(n);
+#endif
+  return countl_zero_fallback(n);
+}
+
 FMT_INLINE void assume(bool condition) {
   (void)condition;
 #if FMT_HAS_BUILTIN(__builtin_assume) && !FMT_ICC_VERSION
   __builtin_assume(condition);
+#elif FMT_GCC_VERSION
+  if (!condition) __builtin_unreachable();
 #endif
 }
 
@@ -485,20 +562,6 @@ inline auto get_data(Container& c) -> typename Container::value_type* {
   return c.data();
 }
 
-#if defined(_SECURE_SCL) && _SECURE_SCL
-// Make a checked iterator to avoid MSVC warnings.
-template <typename T> using checked_ptr = stdext::checked_array_iterator<T*>;
-template <typename T>
-constexpr auto make_checked(T* p, size_t size) -> checked_ptr<T> {
-  return {p, size};
-}
-#else
-template <typename T> using checked_ptr = T*;
-template <typename T> constexpr auto make_checked(T* p, size_t) -> T* {
-  return p;
-}
-#endif
-
 // Attempts to reserve space for n extra characters in the output range.
 // Returns a pointer to the reserved range or a reference to it.
 template <typename Container, FMT_ENABLE_IF(is_contiguous<Container>::value)>
@@ -506,12 +569,12 @@ template <typename Container, FMT_ENABLE_IF(is_contiguous<Container>::value)>
 __attribute__((no_sanitize("undefined")))
 #endif
 inline auto
-reserve(std::back_insert_iterator<Container> it, size_t n)
-    -> checked_ptr<typename Container::value_type> {
+reserve(std::back_insert_iterator<Container> it, size_t n) ->
+    typename Container::value_type* {
   Container& c = get_container(it);
   size_t size = c.size();
   c.resize(size + n);
-  return make_checked(get_data(c) + size, n);
+  return get_data(c) + size;
 }
 
 template <typename T>
@@ -543,8 +606,8 @@ template <typename T> auto to_pointer(buffer_appender<T> it, size_t n) -> T* {
 }
 
 template <typename Container, FMT_ENABLE_IF(is_contiguous<Container>::value)>
-inline auto base_iterator(std::back_insert_iterator<Container>& it,
-                          checked_ptr<typename Container::value_type>)
+inline auto base_iterator(std::back_insert_iterator<Container> it,
+                          typename Container::value_type*)
     -> std::back_insert_iterator<Container> {
   return it;
 }
@@ -607,7 +670,8 @@ FMT_CONSTEXPR inline auto utf8_decode(const char* s, uint32_t* c, int* e)
   constexpr const int shiftc[] = {0, 18, 12, 6, 0};
   constexpr const int shifte[] = {0, 6, 4, 2, 0};
 
-  int len = code_point_length_impl(*s);
+  int len = "\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\0\0\0\0\0\0\0\0\2\2\2\2\3\3\4"
+      [static_cast<unsigned char>(*s) >> 3];
   // Compute the pointer to the next character early so that the next
   // iteration can start working on the next character. Neither Clang
   // nor GCC figure out this reordering on their own.
@@ -636,7 +700,7 @@ FMT_CONSTEXPR inline auto utf8_decode(const char* s, uint32_t* c, int* e)
   return next;
 }
 
-constexpr uint32_t invalid_code_point = ~uint32_t();
+constexpr FMT_INLINE_VARIABLE uint32_t invalid_code_point = ~uint32_t();
 
 // Invokes f(cp, sv) for every code point cp in s with sv being the string view
 // corresponding to the code point. cp is invalid_code_point on error.
@@ -706,6 +770,7 @@ FMT_CONSTEXPR inline size_t compute_width(string_view s) {
       return true;
     }
   };
+  // We could avoid branches by using utf8_decode directly.
   for_each_codepoint(s, count_code_points{&num_code_points});
   return num_code_points;
 }
@@ -737,13 +802,48 @@ inline auto code_point_index(basic_string_view<char8_type> s, size_t n)
       string_view(reinterpret_cast<const char*>(s.data()), s.size()), n);
 }
 
+template <typename T> struct is_integral : std::is_integral<T> {};
+template <> struct is_integral<int128_opt> : std::true_type {};
+template <> struct is_integral<uint128_t> : std::true_type {};
+
+template <typename T>
+using is_signed =
+    std::integral_constant<bool, std::numeric_limits<T>::is_signed ||
+                                     std::is_same<T, int128_opt>::value>;
+
+template <typename T>
+using is_integer =
+    bool_constant<is_integral<T>::value && !std::is_same<T, bool>::value &&
+                  !std::is_same<T, char>::value &&
+                  !std::is_same<T, wchar_t>::value>;
+
+#ifndef FMT_USE_FLOAT
+#  define FMT_USE_FLOAT 1
+#endif
+#ifndef FMT_USE_DOUBLE
+#  define FMT_USE_DOUBLE 1
+#endif
+#ifndef FMT_USE_LONG_DOUBLE
+#  define FMT_USE_LONG_DOUBLE 1
+#endif
+
 #ifndef FMT_USE_FLOAT128
-#  ifdef __SIZEOF_FLOAT128__
-#    define FMT_USE_FLOAT128 1
-#  else
+#  ifdef __clang__
+// Clang emulates GCC, so it has to appear early.
+#    if FMT_HAS_INCLUDE(<quadmath.h>)
+#      define FMT_USE_FLOAT128 1
+#    endif
+#  elif defined(__GNUC__)
+// GNU C++:
+#    if defined(_GLIBCXX_USE_FLOAT128) && !defined(__STRICT_ANSI__)
+#      define FMT_USE_FLOAT128 1
+#    endif
+#  endif
+#  ifndef FMT_USE_FLOAT128
 #    define FMT_USE_FLOAT128 0
 #  endif
 #endif
+
 #if FMT_USE_FLOAT128
 using float128 = __float128;
 #else
@@ -775,7 +875,7 @@ void buffer<T>::append(const U* begin, const U* end) {
     try_reserve(size_ + count);
     auto free_cap = capacity_ - size_;
     if (free_cap < count) count = free_cap;
-    std::uninitialized_copy_n(begin, count, make_checked(ptr_ + size_, count));
+    std::uninitialized_copy_n(begin, count, ptr_ + size_);
     size_ += count;
     begin += count;
   }
@@ -787,7 +887,7 @@ template <typename T>
 struct is_locale<T, void_t<decltype(T::classic())>> : std::true_type {};
 }  // namespace detail
 
-FMT_MODULE_EXPORT_BEGIN
+FMT_BEGIN_EXPORT
 
 // The number of characters to store in the basic_memory_buffer object itself
 // to avoid dynamic memory allocation.
@@ -820,8 +920,8 @@ class basic_memory_buffer final : public detail::buffer<T> {
  private:
   T store_[SIZE];
 
-  // Don't inherit from Allocator avoid generating type_info for it.
-  Allocator alloc_;
+  // Don't inherit from Allocator to avoid generating type_info for it.
+  FMT_NO_UNIQUE_ADDRESS Allocator alloc_;
 
   // Deallocate memory allocated by the buffer.
   FMT_CONSTEXPR20 void deallocate() {
@@ -830,7 +930,28 @@ class basic_memory_buffer final : public detail::buffer<T> {
   }
 
  protected:
-  FMT_CONSTEXPR20 void grow(size_t size) override;
+  FMT_CONSTEXPR20 void grow(size_t size) override {
+    detail::abort_fuzzing_if(size > 5000);
+    const size_t max_size = std::allocator_traits<Allocator>::max_size(alloc_);
+    size_t old_capacity = this->capacity();
+    size_t new_capacity = old_capacity + old_capacity / 2;
+    if (size > new_capacity)
+      new_capacity = size;
+    else if (new_capacity > max_size)
+      new_capacity = size > max_size ? size : max_size;
+    T* old_data = this->data();
+    T* new_data =
+        std::allocator_traits<Allocator>::allocate(alloc_, new_capacity);
+    // Suppress a bogus -Wstringop-overflow in gcc 13.1 (#3481).
+    detail::assume(this->size() <= new_capacity);
+    // The following code doesn't throw, so the raw pointer above doesn't leak.
+    std::uninitialized_copy_n(old_data, this->size(), new_data);
+    this->set(new_data, new_capacity);
+    // deallocate must not throw according to the standard, but even if it does,
+    // the buffer already uses the new storage and will deallocate it in
+    // destructor.
+    if (old_data != store_) alloc_.deallocate(old_data, old_capacity);
+  }
 
  public:
   using value_type = T;
@@ -852,8 +973,7 @@ class basic_memory_buffer final : public detail::buffer<T> {
     size_t size = other.size(), capacity = other.capacity();
     if (data == other.store_) {
       this->set(store_, capacity);
-      detail::copy_str<T>(other.store_, other.store_ + size,
-                          detail::make_checked(store_, capacity));
+      detail::copy_str<T>(other.store_, other.store_ + size, store_);
     } else {
       this->set(data, capacity);
       // Set pointer to the inline array so that delete is not called
@@ -907,55 +1027,28 @@ class basic_memory_buffer final : public detail::buffer<T> {
   }
 };
 
-template <typename T, size_t SIZE, typename Allocator>
-FMT_CONSTEXPR20 void basic_memory_buffer<T, SIZE, Allocator>::grow(
-    size_t size) {
-  detail::abort_fuzzing_if(size > 5000);
-  const size_t max_size = std::allocator_traits<Allocator>::max_size(alloc_);
-  size_t old_capacity = this->capacity();
-  size_t new_capacity = old_capacity + old_capacity / 2;
-  if (size > new_capacity)
-    new_capacity = size;
-  else if (new_capacity > max_size)
-    new_capacity = size > max_size ? size : max_size;
-  T* old_data = this->data();
-  T* new_data =
-      std::allocator_traits<Allocator>::allocate(alloc_, new_capacity);
-  // The following code doesn't throw, so the raw pointer above doesn't leak.
-  std::uninitialized_copy(old_data, old_data + this->size(),
-                          detail::make_checked(new_data, new_capacity));
-  this->set(new_data, new_capacity);
-  // deallocate must not throw according to the standard, but even if it does,
-  // the buffer already uses the new storage and will deallocate it in
-  // destructor.
-  if (old_data != store_) alloc_.deallocate(old_data, old_capacity);
-}
-
 using memory_buffer = basic_memory_buffer<char>;
 
 template <typename T, size_t SIZE, typename Allocator>
 struct is_contiguous<basic_memory_buffer<T, SIZE, Allocator>> : std::true_type {
 };
 
+FMT_END_EXPORT
 namespace detail {
-#ifdef _WIN32
 FMT_API bool write_console(std::FILE* f, string_view text);
-#endif
 FMT_API void print(std::FILE*, string_view);
 }  // namespace detail
+FMT_BEGIN_EXPORT
+
+// Suppress a misleading warning in older versions of clang.
+#if FMT_CLANG_VERSION
+#  pragma clang diagnostic ignored "-Wweak-vtables"
+#endif
 
-/** A formatting error such as invalid format string. */
-FMT_CLASS_API
-class FMT_API format_error : public std::runtime_error {
+/** An error reported from a formatting function. */
+class FMT_VISIBILITY("default") format_error : public std::runtime_error {
  public:
-  explicit format_error(const char* message) : std::runtime_error(message) {}
-  explicit format_error(const std::string& message)
-      : std::runtime_error(message) {}
-  format_error(const format_error&) = default;
-  format_error& operator=(const format_error&) = default;
-  format_error(format_error&&) = default;
-  format_error& operator=(format_error&&) = default;
-  ~format_error() noexcept override FMT_MSC_DEFAULT;
+  using std::runtime_error::runtime_error;
 };
 
 namespace detail_exported {
@@ -984,16 +1077,52 @@ constexpr auto compile_string_to_view(detail::std_string_view<Char> s)
 }
 }  // namespace detail_exported
 
-FMT_BEGIN_DETAIL_NAMESPACE
+class loc_value {
+ private:
+  basic_format_arg<format_context> value_;
 
-template <typename T> struct is_integral : std::is_integral<T> {};
-template <> struct is_integral<int128_opt> : std::true_type {};
-template <> struct is_integral<uint128_t> : std::true_type {};
+ public:
+  template <typename T, FMT_ENABLE_IF(!detail::is_float128<T>::value)>
+  loc_value(T value) : value_(detail::make_arg<format_context>(value)) {}
 
-template <typename T>
-using is_signed =
-    std::integral_constant<bool, std::numeric_limits<T>::is_signed ||
-                                     std::is_same<T, int128_opt>::value>;
+  template <typename T, FMT_ENABLE_IF(detail::is_float128<T>::value)>
+  loc_value(T) {}
+
+  template <typename Visitor> auto visit(Visitor&& vis) -> decltype(vis(0)) {
+    return visit_format_arg(vis, value_);
+  }
+};
+
+// A locale facet that formats values in UTF-8.
+// It is parameterized on the locale to avoid the heavy <locale> include.
+template <typename Locale> class format_facet : public Locale::facet {
+ private:
+  std::string separator_;
+  std::string grouping_;
+  std::string decimal_point_;
+
+ protected:
+  virtual auto do_put(appender out, loc_value val,
+                      const format_specs<>& specs) const -> bool;
+
+ public:
+  static FMT_API typename Locale::id id;
+
+  explicit format_facet(Locale& loc);
+  explicit format_facet(string_view sep = "",
+                        std::initializer_list<unsigned char> g = {3},
+                        std::string decimal_point = ".")
+      : separator_(sep.data(), sep.size()),
+        grouping_(g.begin(), g.end()),
+        decimal_point_(decimal_point) {}
+
+  auto put(appender out, loc_value val, const format_specs<>& specs) const
+      -> bool {
+    return do_put(out, val, specs);
+  }
+};
+
+namespace detail {
 
 // Returns true if value is negative, false otherwise.
 // Same as `value < 0` but doesn't produce warnings if T is an unsigned type.
@@ -1122,7 +1251,7 @@ FMT_CONSTEXPR auto count_digits(UInt n) -> int {
 FMT_INLINE auto do_count_digits(uint32_t n) -> int {
 // An optimization by Kendall Willets from https://bit.ly/3uOIQrB.
 // This increments the upper 32 bits (log10(T) - 1) when >= T is added.
-#  define FMT_INC(T) (((sizeof(#  T) - 1ull) << 32) - T)
+#  define FMT_INC(T) (((sizeof(#T) - 1ull) << 32) - T)
   static constexpr uint64_t table[] = {
       FMT_INC(0),          FMT_INC(0),          FMT_INC(0),           // 8
       FMT_INC(10),         FMT_INC(10),         FMT_INC(10),          // 64
@@ -1238,7 +1367,7 @@ template <typename Char, typename UInt, typename Iterator,
 FMT_CONSTEXPR inline auto format_decimal(Iterator out, UInt value, int size)
     -> format_decimal_result<Iterator> {
   // Buffer is large enough to hold all digits (digits10 + 1).
-  Char buffer[digits10<UInt>() + 1];
+  Char buffer[digits10<UInt>() + 1] = {};
   auto end = format_decimal(buffer, value, size).end;
   return {out, detail::copy_str_noinline<Char>(buffer, end, out)};
 }
@@ -1283,7 +1412,139 @@ class utf8_to_utf16 {
   auto str() const -> std::wstring { return {&buffer_[0], size()}; }
 };
 
+enum class to_utf8_error_policy { abort, replace };
+
+// A converter from UTF-16/UTF-32 (host endian) to UTF-8.
+template <typename WChar, typename Buffer = memory_buffer> class to_utf8 {
+ private:
+  Buffer buffer_;
+
+ public:
+  to_utf8() {}
+  explicit to_utf8(basic_string_view<WChar> s,
+                   to_utf8_error_policy policy = to_utf8_error_policy::abort) {
+    static_assert(sizeof(WChar) == 2 || sizeof(WChar) == 4,
+                  "Expect utf16 or utf32");
+    if (!convert(s, policy))
+      FMT_THROW(std::runtime_error(sizeof(WChar) == 2 ? "invalid utf16"
+                                                      : "invalid utf32"));
+  }
+  operator string_view() const { return string_view(&buffer_[0], size()); }
+  size_t size() const { return buffer_.size() - 1; }
+  const char* c_str() const { return &buffer_[0]; }
+  std::string str() const { return std::string(&buffer_[0], size()); }
+
+  // Performs conversion returning a bool instead of throwing exception on
+  // conversion error. This method may still throw in case of memory allocation
+  // error.
+  bool convert(basic_string_view<WChar> s,
+               to_utf8_error_policy policy = to_utf8_error_policy::abort) {
+    if (!convert(buffer_, s, policy)) return false;
+    buffer_.push_back(0);
+    return true;
+  }
+  static bool convert(
+      Buffer& buf, basic_string_view<WChar> s,
+      to_utf8_error_policy policy = to_utf8_error_policy::abort) {
+    for (auto p = s.begin(); p != s.end(); ++p) {
+      uint32_t c = static_cast<uint32_t>(*p);
+      if (sizeof(WChar) == 2 && c >= 0xd800 && c <= 0xdfff) {
+        // Handle a surrogate pair.
+        ++p;
+        if (p == s.end() || (c & 0xfc00) != 0xd800 || (*p & 0xfc00) != 0xdc00) {
+          if (policy == to_utf8_error_policy::abort) return false;
+          buf.append(string_view("�"));
+          --p;
+        } else {
+          c = (c << 10) + static_cast<uint32_t>(*p) - 0x35fdc00;
+        }
+      } else if (c < 0x80) {
+        buf.push_back(static_cast<char>(c));
+      } else if (c < 0x800) {
+        buf.push_back(static_cast<char>(0xc0 | (c >> 6)));
+        buf.push_back(static_cast<char>(0x80 | (c & 0x3f)));
+      } else if ((c >= 0x800 && c <= 0xd7ff) || (c >= 0xe000 && c <= 0xffff)) {
+        buf.push_back(static_cast<char>(0xe0 | (c >> 12)));
+        buf.push_back(static_cast<char>(0x80 | ((c & 0xfff) >> 6)));
+        buf.push_back(static_cast<char>(0x80 | (c & 0x3f)));
+      } else if (c >= 0x10000 && c <= 0x10ffff) {
+        buf.push_back(static_cast<char>(0xf0 | (c >> 18)));
+        buf.push_back(static_cast<char>(0x80 | ((c & 0x3ffff) >> 12)));
+        buf.push_back(static_cast<char>(0x80 | ((c & 0xfff) >> 6)));
+        buf.push_back(static_cast<char>(0x80 | (c & 0x3f)));
+      } else {
+        return false;
+      }
+    }
+    return true;
+  }
+};
+
+// Computes 128-bit result of multiplication of two 64-bit unsigned integers.
+inline uint128_fallback umul128(uint64_t x, uint64_t y) noexcept {
+#if FMT_USE_INT128
+  auto p = static_cast<uint128_opt>(x) * static_cast<uint128_opt>(y);
+  return {static_cast<uint64_t>(p >> 64), static_cast<uint64_t>(p)};
+#elif defined(_MSC_VER) && defined(_M_X64)
+  auto result = uint128_fallback();
+  result.lo_ = _umul128(x, y, &result.hi_);
+  return result;
+#else
+  const uint64_t mask = static_cast<uint64_t>(max_value<uint32_t>());
+
+  uint64_t a = x >> 32;
+  uint64_t b = x & mask;
+  uint64_t c = y >> 32;
+  uint64_t d = y & mask;
+
+  uint64_t ac = a * c;
+  uint64_t bc = b * c;
+  uint64_t ad = a * d;
+  uint64_t bd = b * d;
+
+  uint64_t intermediate = (bd >> 32) + (ad & mask) + (bc & mask);
+
+  return {ac + (intermediate >> 32) + (ad >> 32) + (bc >> 32),
+          (intermediate << 32) + (bd & mask)};
+#endif
+}
+
 namespace dragonbox {
+// Computes floor(log10(pow(2, e))) for e in [-2620, 2620] using the method from
+// https://fmt.dev/papers/Dragonbox.pdf#page=28, section 6.1.
+inline int floor_log10_pow2(int e) noexcept {
+  FMT_ASSERT(e <= 2620 && e >= -2620, "too large exponent");
+  static_assert((-1 >> 1) == -1, "right shift is not arithmetic");
+  return (e * 315653) >> 20;
+}
+
+inline int floor_log2_pow10(int e) noexcept {
+  FMT_ASSERT(e <= 1233 && e >= -1233, "too large exponent");
+  return (e * 1741647) >> 19;
+}
+
+// Computes upper 64 bits of multiplication of two 64-bit unsigned integers.
+inline uint64_t umul128_upper64(uint64_t x, uint64_t y) noexcept {
+#if FMT_USE_INT128
+  auto p = static_cast<uint128_opt>(x) * static_cast<uint128_opt>(y);
+  return static_cast<uint64_t>(p >> 64);
+#elif defined(_MSC_VER) && defined(_M_X64)
+  return __umulh(x, y);
+#else
+  return umul128(x, y).high();
+#endif
+}
+
+// Computes upper 128 bits of multiplication of a 64-bit unsigned integer and a
+// 128-bit unsigned integer.
+inline uint128_fallback umul192_upper128(uint64_t x,
+                                         uint128_fallback y) noexcept {
+  uint128_fallback r = umul128(x, y.high());
+  r += umul128_upper64(x, y.low());
+  return r;
+}
+
+FMT_API uint128_fallback get_cached_power(int k) noexcept;
 
 // Type-specific information that Dragonbox uses.
 template <typename T, typename Enable = void> struct float_info;
@@ -1307,7 +1568,7 @@ template <> struct float_info<double> {
   static const int big_divisor = 1000;
   static const int small_divisor = 100;
   static const int min_k = -292;
-  static const int max_k = 326;
+  static const int max_k = 341;
   static const int shorter_interval_tie_lower_threshold = -77;
   static const int shorter_interval_tie_upper_threshold = -77;
 };
@@ -1354,8 +1615,8 @@ template <typename Float> constexpr int num_significand_bits() {
 template <typename Float>
 constexpr auto exponent_mask() ->
     typename dragonbox::float_info<Float>::carrier_uint {
-  using uint = typename dragonbox::float_info<Float>::carrier_uint;
-  return ((uint(1) << dragonbox::float_info<Float>::exponent_bits) - 1)
+  using float_uint = typename dragonbox::float_info<Float>::carrier_uint;
+  return ((float_uint(1) << dragonbox::float_info<Float>::exponent_bits) - 1)
          << num_significand_bits<Float>();
 }
 template <typename Float> constexpr auto exponent_bias() -> int {
@@ -1476,157 +1737,31 @@ FMT_CONSTEXPR inline fp operator*(fp x, fp y) {
 }
 
 template <typename T = void> struct basic_data {
-  // Normalized 64-bit significands of pow(10, k), for k = -348, -340, ..., 340.
-  // These are generated by support/compute-powers.py.
-  static constexpr uint64_t pow10_significands[87] = {
-      0xfa8fd5a0081c0288, 0xbaaee17fa23ebf76, 0x8b16fb203055ac76,
-      0xcf42894a5dce35ea, 0x9a6bb0aa55653b2d, 0xe61acf033d1a45df,
-      0xab70fe17c79ac6ca, 0xff77b1fcbebcdc4f, 0xbe5691ef416bd60c,
-      0x8dd01fad907ffc3c, 0xd3515c2831559a83, 0x9d71ac8fada6c9b5,
-      0xea9c227723ee8bcb, 0xaecc49914078536d, 0x823c12795db6ce57,
-      0xc21094364dfb5637, 0x9096ea6f3848984f, 0xd77485cb25823ac7,
-      0xa086cfcd97bf97f4, 0xef340a98172aace5, 0xb23867fb2a35b28e,
-      0x84c8d4dfd2c63f3b, 0xc5dd44271ad3cdba, 0x936b9fcebb25c996,
-      0xdbac6c247d62a584, 0xa3ab66580d5fdaf6, 0xf3e2f893dec3f126,
-      0xb5b5ada8aaff80b8, 0x87625f056c7c4a8b, 0xc9bcff6034c13053,
-      0x964e858c91ba2655, 0xdff9772470297ebd, 0xa6dfbd9fb8e5b88f,
-      0xf8a95fcf88747d94, 0xb94470938fa89bcf, 0x8a08f0f8bf0f156b,
-      0xcdb02555653131b6, 0x993fe2c6d07b7fac, 0xe45c10c42a2b3b06,
-      0xaa242499697392d3, 0xfd87b5f28300ca0e, 0xbce5086492111aeb,
-      0x8cbccc096f5088cc, 0xd1b71758e219652c, 0x9c40000000000000,
-      0xe8d4a51000000000, 0xad78ebc5ac620000, 0x813f3978f8940984,
-      0xc097ce7bc90715b3, 0x8f7e32ce7bea5c70, 0xd5d238a4abe98068,
-      0x9f4f2726179a2245, 0xed63a231d4c4fb27, 0xb0de65388cc8ada8,
-      0x83c7088e1aab65db, 0xc45d1df942711d9a, 0x924d692ca61be758,
-      0xda01ee641a708dea, 0xa26da3999aef774a, 0xf209787bb47d6b85,
-      0xb454e4a179dd1877, 0x865b86925b9bc5c2, 0xc83553c5c8965d3d,
-      0x952ab45cfa97a0b3, 0xde469fbd99a05fe3, 0xa59bc234db398c25,
-      0xf6c69a72a3989f5c, 0xb7dcbf5354e9bece, 0x88fcf317f22241e2,
-      0xcc20ce9bd35c78a5, 0x98165af37b2153df, 0xe2a0b5dc971f303a,
-      0xa8d9d1535ce3b396, 0xfb9b7cd9a4a7443c, 0xbb764c4ca7a44410,
-      0x8bab8eefb6409c1a, 0xd01fef10a657842c, 0x9b10a4e5e9913129,
-      0xe7109bfba19c0c9d, 0xac2820d9623bf429, 0x80444b5e7aa7cf85,
-      0xbf21e44003acdd2d, 0x8e679c2f5e44ff8f, 0xd433179d9c8cb841,
-      0x9e19db92b4e31ba9, 0xeb96bf6ebadf77d9, 0xaf87023b9bf0ee6b,
+  // For checking rounding thresholds.
+  // The kth entry is chosen to be the smallest integer such that the
+  // upper 32-bits of 10^(k+1) times it is strictly bigger than 5 * 10^k.
+  static constexpr uint32_t fractional_part_rounding_thresholds[8] = {
+      2576980378U,  // ceil(2^31 + 2^32/10^1)
+      2190433321U,  // ceil(2^31 + 2^32/10^2)
+      2151778616U,  // ceil(2^31 + 2^32/10^3)
+      2147913145U,  // ceil(2^31 + 2^32/10^4)
+      2147526598U,  // ceil(2^31 + 2^32/10^5)
+      2147487943U,  // ceil(2^31 + 2^32/10^6)
+      2147484078U,  // ceil(2^31 + 2^32/10^7)
+      2147483691U   // ceil(2^31 + 2^32/10^8)
   };
-
-#if FMT_GCC_VERSION && FMT_GCC_VERSION < 409
-#  pragma GCC diagnostic push
-#  pragma GCC diagnostic ignored "-Wnarrowing"
-#endif
-  // Binary exponents of pow(10, k), for k = -348, -340, ..., 340, corresponding
-  // to significands above.
-  static constexpr int16_t pow10_exponents[87] = {
-      -1220, -1193, -1166, -1140, -1113, -1087, -1060, -1034, -1007, -980, -954,
-      -927,  -901,  -874,  -847,  -821,  -794,  -768,  -741,  -715,  -688, -661,
-      -635,  -608,  -582,  -555,  -529,  -502,  -475,  -449,  -422,  -396, -369,
-      -343,  -316,  -289,  -263,  -236,  -210,  -183,  -157,  -130,  -103, -77,
-      -50,   -24,   3,     30,    56,    83,    109,   136,   162,   189,  216,
-      242,   269,   295,   322,   348,   375,   402,   428,   455,   481,  508,
-      534,   561,   588,   614,   641,   667,   694,   720,   747,   774,  800,
-      827,   853,   880,   907,   933,   960,   986,   1013,  1039,  1066};
-#if FMT_GCC_VERSION && FMT_GCC_VERSION < 409
-#  pragma GCC diagnostic pop
-#endif
-
-  static constexpr uint64_t power_of_10_64[20] = {
-      1, FMT_POWERS_OF_10(1ULL), FMT_POWERS_OF_10(1000000000ULL),
-      10000000000000000000ULL};
 };
-
-#if FMT_CPLUSPLUS < 201703L
-template <typename T> constexpr uint64_t basic_data<T>::pow10_significands[];
-template <typename T> constexpr int16_t basic_data<T>::pow10_exponents[];
-template <typename T> constexpr uint64_t basic_data<T>::power_of_10_64[];
-#endif
-
 // This is a struct rather than an alias to avoid shadowing warnings in gcc.
 struct data : basic_data<> {};
 
-// Returns a cached power of 10 `c_k = c_k.f * pow(2, c_k.e)` such that its
-// (binary) exponent satisfies `min_exponent <= c_k.e <= min_exponent + 28`.
-FMT_CONSTEXPR inline fp get_cached_power(int min_exponent,
-                                         int& pow10_exponent) {
-  const int shift = 32;
-  // log10(2) = 0x0.4d104d427de7fbcc...
-  const int64_t significand = 0x4d104d427de7fbcc;
-  int index = static_cast<int>(
-      ((min_exponent + fp::num_significand_bits - 1) * (significand >> shift) +
-       ((int64_t(1) << shift) - 1))  // ceil
-      >> 32                          // arithmetic shift
-  );
-  // Decimal exponent of the first (smallest) cached power of 10.
-  const int first_dec_exp = -348;
-  // Difference between 2 consecutive decimal exponents in cached powers of 10.
-  const int dec_exp_step = 8;
-  index = (index - first_dec_exp - 1) / dec_exp_step + 1;
-  pow10_exponent = first_dec_exp + index * dec_exp_step;
-  // Using *(x + index) instead of x[index] avoids an issue with some compilers
-  // using the EDG frontend (e.g. nvhpc/22.3 in C++17 mode).
-  return {*(data::pow10_significands + index),
-          *(data::pow10_exponents + index)};
-}
-
-#ifndef _MSC_VER
-#  define FMT_SNPRINTF snprintf
-#else
-FMT_API auto fmt_snprintf(char* buf, size_t size, const char* fmt, ...) -> int;
-#  define FMT_SNPRINTF fmt_snprintf
-#endif  // _MSC_VER
-
-// Formats a floating-point number with snprintf using the hexfloat format.
+#if FMT_CPLUSPLUS < 201703L
 template <typename T>
-auto snprintf_float(T value, int precision, float_specs specs,
-                    buffer<char>& buf) -> int {
-  // Buffer capacity must be non-zero, otherwise MSVC's vsnprintf_s will fail.
-  FMT_ASSERT(buf.capacity() > buf.size(), "empty buffer");
-  FMT_ASSERT(specs.format == float_format::hex, "");
-  static_assert(!std::is_same<T, float>::value, "");
-
-  // Build the format string.
-  char format[7];  // The longest format is "%#.*Le".
-  char* format_ptr = format;
-  *format_ptr++ = '%';
-  if (specs.showpoint) *format_ptr++ = '#';
-  if (precision >= 0) {
-    *format_ptr++ = '.';
-    *format_ptr++ = '*';
-  }
-  if (std::is_same<T, long double>()) *format_ptr++ = 'L';
-  *format_ptr++ = specs.upper ? 'A' : 'a';
-  *format_ptr = '\0';
-
-  // Format using snprintf.
-  auto offset = buf.size();
-  for (;;) {
-    auto begin = buf.data() + offset;
-    auto capacity = buf.capacity() - offset;
-    abort_fuzzing_if(precision > 100000);
-    // Suppress the warning about a nonliteral format string.
-    // Cannot use auto because of a bug in MinGW (#1532).
-    int (*snprintf_ptr)(char*, size_t, const char*, ...) = FMT_SNPRINTF;
-    int result = precision >= 0
-                     ? snprintf_ptr(begin, capacity, format, precision, value)
-                     : snprintf_ptr(begin, capacity, format, value);
-    if (result < 0) {
-      // The buffer will grow exponentially.
-      buf.try_reserve(buf.capacity() + 1);
-      continue;
-    }
-    auto size = to_unsigned(result);
-    // Size equal to capacity means that the last character was truncated.
-    if (size < capacity) {
-      buf.try_resize(size + offset);
-      return 0;
-    }
-    buf.try_reserve(size + offset + 1);  // Add 1 for the terminating '\0'.
-  }
-}
+constexpr uint32_t basic_data<T>::fractional_part_rounding_thresholds[];
+#endif
 
-template <typename T>
+template <typename T, bool doublish = num_bits<T>() == num_bits<double>()>
 using convert_float_result =
-    conditional_t<std::is_same<T, float>::value || sizeof(T) == sizeof(double),
-                  double, T>;
+    conditional_t<std::is_same<T, float>::value || doublish, double, T>;
 
 template <typename T>
 constexpr auto convert_float(T value) -> convert_float_result<T> {
@@ -1649,8 +1784,7 @@ FMT_NOINLINE FMT_CONSTEXPR auto fill(OutputIt it, size_t n,
 // width: output display width in (terminal) column positions.
 template <align::type align = align::left, typename OutputIt, typename Char,
           typename F>
-FMT_CONSTEXPR auto write_padded(OutputIt out,
-                                const basic_format_specs<Char>& specs,
+FMT_CONSTEXPR auto write_padded(OutputIt out, const format_specs<Char>& specs,
                                 size_t size, size_t width, F&& f) -> OutputIt {
   static_assert(align == align::left || align == align::right, "");
   unsigned spec_width = to_unsigned(specs.width);
@@ -1669,15 +1803,14 @@ FMT_CONSTEXPR auto write_padded(OutputIt out,
 
 template <align::type align = align::left, typename OutputIt, typename Char,
           typename F>
-constexpr auto write_padded(OutputIt out, const basic_format_specs<Char>& specs,
+constexpr auto write_padded(OutputIt out, const format_specs<Char>& specs,
                             size_t size, F&& f) -> OutputIt {
   return write_padded<align>(out, specs, size, size, f);
 }
 
 template <align::type align = align::left, typename Char, typename OutputIt>
 FMT_CONSTEXPR auto write_bytes(OutputIt out, string_view bytes,
-                               const basic_format_specs<Char>& specs)
-    -> OutputIt {
+                               const format_specs<Char>& specs) -> OutputIt {
   return write_padded<align>(
       out, specs, bytes.size(), [bytes](reserve_iterator<OutputIt> it) {
         const char* data = bytes.data();
@@ -1686,8 +1819,8 @@ FMT_CONSTEXPR auto write_bytes(OutputIt out, string_view bytes,
 }
 
 template <typename Char, typename OutputIt, typename UIntPtr>
-auto write_ptr(OutputIt out, UIntPtr value,
-               const basic_format_specs<Char>* specs) -> OutputIt {
+auto write_ptr(OutputIt out, UIntPtr value, const format_specs<Char>* specs)
+    -> OutputIt {
   int num_digits = count_digits<4>(value);
   auto size = to_unsigned(num_digits) + size_t(2);
   auto write = [=](reserve_iterator<OutputIt> it) {
@@ -1749,7 +1882,7 @@ inline auto find_escape(const char* begin, const char* end)
   [] {                                                                        \
     /* Use the hidden visibility as a workaround for a GCC bug (#1973). */    \
     /* Use a macro-like name to avoid shadowing warnings. */                  \
-    struct FMT_GCC_VISIBILITY_HIDDEN FMT_COMPILE_STRING : base {              \
+    struct FMT_VISIBILITY("hidden") FMT_COMPILE_STRING : base {               \
       using char_type FMT_MAYBE_UNUSED = fmt::remove_cvref_t<decltype(s[0])>; \
       FMT_MAYBE_UNUSED FMT_CONSTEXPR explicit                                 \
       operator fmt::basic_string_view<char_type>() const {                    \
@@ -1806,16 +1939,14 @@ auto write_escaped_cp(OutputIt out, const find_escape_result<Char>& escape)
     *out++ = static_cast<Char>('\\');
     break;
   default:
-    if (is_utf8()) {
-      if (escape.cp < 0x100) {
-        return write_codepoint<2, Char>(out, 'x', escape.cp);
-      }
-      if (escape.cp < 0x10000) {
-        return write_codepoint<4, Char>(out, 'u', escape.cp);
-      }
-      if (escape.cp < 0x110000) {
-        return write_codepoint<8, Char>(out, 'U', escape.cp);
-      }
+    if (escape.cp < 0x100) {
+      return write_codepoint<2, Char>(out, 'x', escape.cp);
+    }
+    if (escape.cp < 0x10000) {
+      return write_codepoint<4, Char>(out, 'u', escape.cp);
+    }
+    if (escape.cp < 0x110000) {
+      return write_codepoint<8, Char>(out, 'U', escape.cp);
     }
     for (Char escape_char : basic_string_view<Char>(
              escape.begin, to_unsigned(escape.end - escape.begin))) {
@@ -1860,8 +1991,7 @@ auto write_escaped_char(OutputIt out, Char v) -> OutputIt {
 
 template <typename Char, typename OutputIt>
 FMT_CONSTEXPR auto write_char(OutputIt out, Char value,
-                              const basic_format_specs<Char>& specs)
-    -> OutputIt {
+                              const format_specs<Char>& specs) -> OutputIt {
   bool is_debug = specs.type == presentation_type::debug;
   return write_padded(out, specs, 1, [=](reserve_iterator<OutputIt> it) {
     if (is_debug) return write_escaped_char(it, value);
@@ -1871,11 +2001,14 @@ FMT_CONSTEXPR auto write_char(OutputIt out, Char value,
 }
 template <typename Char, typename OutputIt>
 FMT_CONSTEXPR auto write(OutputIt out, Char value,
-                         const basic_format_specs<Char>& specs,
-                         locale_ref loc = {}) -> OutputIt {
+                         const format_specs<Char>& specs, locale_ref loc = {})
+    -> OutputIt {
+  // char is formatted as unsigned char for consistency across platforms.
+  using unsigned_type =
+      conditional_t<std::is_same<Char, char>::value, unsigned char, unsigned>;
   return check_char_specs(specs)
              ? write_char(out, value, specs)
-             : write(out, static_cast<int>(value), specs, loc);
+             : write(out, static_cast<unsigned_type>(value), specs, loc);
 }
 
 // Data for write_int that doesn't depend on output iterator type. It is used to
@@ -1885,7 +2018,7 @@ template <typename Char> struct write_int_data {
   size_t padding;
 
   FMT_CONSTEXPR write_int_data(int num_digits, unsigned prefix,
-                               const basic_format_specs<Char>& specs)
+                               const format_specs<Char>& specs)
       : size((prefix >> 24) + to_unsigned(num_digits)), padding(0) {
     if (specs.align == align::numeric) {
       auto width = to_unsigned(specs.width);
@@ -1907,7 +2040,7 @@ template <typename Char> struct write_int_data {
 template <typename OutputIt, typename Char, typename W>
 FMT_CONSTEXPR FMT_INLINE auto write_int(OutputIt out, int num_digits,
                                         unsigned prefix,
-                                        const basic_format_specs<Char>& specs,
+                                        const format_specs<Char>& specs,
                                         W write_digits) -> OutputIt {
   // Slightly faster check for specs.width == 0 && specs.precision == -1.
   if ((specs.width | (specs.precision + 1)) == 0) {
@@ -1930,19 +2063,19 @@ FMT_CONSTEXPR FMT_INLINE auto write_int(OutputIt out, int num_digits,
 
 template <typename Char> class digit_grouping {
  private:
-  thousands_sep_result<Char> sep_;
+  std::string grouping_;
+  std::basic_string<Char> thousands_sep_;
 
   struct next_state {
     std::string::const_iterator group;
     int pos;
   };
-  next_state initial_state() const { return {sep_.grouping.begin(), 0}; }
+  next_state initial_state() const { return {grouping_.begin(), 0}; }
 
   // Returns the next digit group separator position.
   int next(next_state& state) const {
-    if (!sep_.thousands_sep) return max_value<int>();
-    if (state.group == sep_.grouping.end())
-      return state.pos += sep_.grouping.back();
+    if (thousands_sep_.empty()) return max_value<int>();
+    if (state.group == grouping_.end()) return state.pos += grouping_.back();
     if (*state.group <= 0 || *state.group == max_value<char>())
       return max_value<int>();
     state.pos += *state.group++;
@@ -1951,14 +2084,15 @@ template <typename Char> class digit_grouping {
 
  public:
   explicit digit_grouping(locale_ref loc, bool localized = true) {
-    if (localized)
-      sep_ = thousands_sep<Char>(loc);
-    else
-      sep_.thousands_sep = Char();
+    if (!localized) return;
+    auto sep = thousands_sep<Char>(loc);
+    grouping_ = sep.grouping;
+    if (sep.thousands_sep) thousands_sep_.assign(1, sep.thousands_sep);
   }
-  explicit digit_grouping(thousands_sep_result<Char> sep) : sep_(sep) {}
+  digit_grouping(std::string grouping, std::basic_string<Char> sep)
+      : grouping_(std::move(grouping)), thousands_sep_(std::move(sep)) {}
 
-  Char separator() const { return sep_.thousands_sep; }
+  bool has_separator() const { return !thousands_sep_.empty(); }
 
   int count_separators(int num_digits) const {
     int count = 0;
@@ -1981,7 +2115,9 @@ template <typename Char> class digit_grouping {
     for (int i = 0, sep_index = static_cast<int>(separators.size() - 1);
          i < num_digits; ++i) {
       if (num_digits - i == separators[sep_index]) {
-        *out++ = separator();
+        out =
+            copy_str<Char>(thousands_sep_.data(),
+                           thousands_sep_.data() + thousands_sep_.size(), out);
         --sep_index;
       }
       *out++ = static_cast<Char>(digits[to_unsigned(i)]);
@@ -1990,10 +2126,11 @@ template <typename Char> class digit_grouping {
   }
 };
 
+// Writes a decimal integer with digit grouping.
 template <typename OutputIt, typename UInt, typename Char>
-auto write_int_localized(OutputIt out, UInt value, unsigned prefix,
-                         const basic_format_specs<Char>& specs,
-                         const digit_grouping<Char>& grouping) -> OutputIt {
+auto write_int(OutputIt out, UInt value, unsigned prefix,
+               const format_specs<Char>& specs,
+               const digit_grouping<Char>& grouping) -> OutputIt {
   static_assert(std::is_same<uint64_or_128_t<UInt>, UInt>::value, "");
   int num_digits = count_digits(value);
   char digits[40];
@@ -2010,13 +2147,13 @@ auto write_int_localized(OutputIt out, UInt value, unsigned prefix,
       });
 }
 
-template <typename OutputIt, typename UInt, typename Char>
-auto write_int_localized(OutputIt& out, UInt value, unsigned prefix,
-                         const basic_format_specs<Char>& specs, locale_ref loc)
-    -> bool {
-  auto grouping = digit_grouping<Char>(loc);
-  out = write_int_localized(out, value, prefix, specs, grouping);
-  return true;
+// Writes a localized value.
+FMT_API auto write_loc(appender out, loc_value value,
+                       const format_specs<>& specs, locale_ref loc) -> bool;
+template <typename OutputIt, typename Char>
+inline auto write_loc(OutputIt, loc_value, const format_specs<Char>&,
+                      locale_ref) -> bool {
+  return false;
 }
 
 FMT_CONSTEXPR inline void prefix_append(unsigned& prefix, unsigned value) {
@@ -2045,21 +2182,37 @@ FMT_CONSTEXPR auto make_write_int_arg(T value, sign_t sign)
   return {abs_value, prefix};
 }
 
+template <typename Char = char> struct loc_writer {
+  buffer_appender<Char> out;
+  const format_specs<Char>& specs;
+  std::basic_string<Char> sep;
+  std::string grouping;
+  std::basic_string<Char> decimal_point;
+
+  template <typename T, FMT_ENABLE_IF(is_integer<T>::value)>
+  auto operator()(T value) -> bool {
+    auto arg = make_write_int_arg(value, specs.sign);
+    write_int(out, static_cast<uint64_or_128_t<T>>(arg.abs_value), arg.prefix,
+              specs, digit_grouping<Char>(grouping, sep));
+    return true;
+  }
+
+  template <typename T, FMT_ENABLE_IF(!is_integer<T>::value)>
+  auto operator()(T) -> bool {
+    return false;
+  }
+};
+
 template <typename Char, typename OutputIt, typename T>
 FMT_CONSTEXPR FMT_INLINE auto write_int(OutputIt out, write_int_arg<T> arg,
-                                        const basic_format_specs<Char>& specs,
-                                        locale_ref loc) -> OutputIt {
+                                        const format_specs<Char>& specs,
+                                        locale_ref) -> OutputIt {
   static_assert(std::is_same<T, uint32_or_64_or_128_t<T>>::value, "");
   auto abs_value = arg.abs_value;
   auto prefix = arg.prefix;
   switch (specs.type) {
   case presentation_type::none:
   case presentation_type::dec: {
-    if (specs.localized &&
-        write_int_localized(out, static_cast<uint64_or_128_t<T>>(abs_value),
-                            prefix, specs, loc)) {
-      return out;
-    }
     auto num_digits = count_digits(abs_value);
     return write_int(
         out, num_digits, prefix, specs, [=](reserve_iterator<OutputIt> it) {
@@ -2102,13 +2255,13 @@ FMT_CONSTEXPR FMT_INLINE auto write_int(OutputIt out, write_int_arg<T> arg,
   case presentation_type::chr:
     return write_char(out, static_cast<Char>(abs_value), specs);
   default:
-    throw_format_error("invalid type specifier");
+    throw_format_error("invalid format specifier");
   }
   return out;
 }
 template <typename Char, typename OutputIt, typename T>
 FMT_CONSTEXPR FMT_NOINLINE auto write_int_noinline(
-    OutputIt out, write_int_arg<T> arg, const basic_format_specs<Char>& specs,
+    OutputIt out, write_int_arg<T> arg, const format_specs<Char>& specs,
     locale_ref loc) -> OutputIt {
   return write_int(out, arg, specs, loc);
 }
@@ -2117,8 +2270,9 @@ template <typename Char, typename OutputIt, typename T,
                         !std::is_same<T, bool>::value &&
                         std::is_same<OutputIt, buffer_appender<Char>>::value)>
 FMT_CONSTEXPR FMT_INLINE auto write(OutputIt out, T value,
-                                    const basic_format_specs<Char>& specs,
+                                    const format_specs<Char>& specs,
                                     locale_ref loc) -> OutputIt {
+  if (specs.localized && write_loc(out, value, specs, loc)) return out;
   return write_int_noinline(out, make_write_int_arg(value, specs.sign), specs,
                             loc);
 }
@@ -2128,8 +2282,9 @@ template <typename Char, typename OutputIt, typename T,
                         !std::is_same<T, bool>::value &&
                         !std::is_same<OutputIt, buffer_appender<Char>>::value)>
 FMT_CONSTEXPR FMT_INLINE auto write(OutputIt out, T value,
-                                    const basic_format_specs<Char>& specs,
+                                    const format_specs<Char>& specs,
                                     locale_ref loc) -> OutputIt {
+  if (specs.localized && write_loc(out, value, specs, loc)) return out;
   return write_int(out, make_write_int_arg(value, specs.sign), specs, loc);
 }
 
@@ -2175,7 +2330,7 @@ class counting_iterator {
 
 template <typename Char, typename OutputIt>
 FMT_CONSTEXPR auto write(OutputIt out, basic_string_view<Char> s,
-                         const basic_format_specs<Char>& specs) -> OutputIt {
+                         const format_specs<Char>& specs) -> OutputIt {
   auto data = s.data();
   auto size = s.size();
   if (specs.precision >= 0 && to_unsigned(specs.precision) < size)
@@ -2197,16 +2352,15 @@ FMT_CONSTEXPR auto write(OutputIt out, basic_string_view<Char> s,
 template <typename Char, typename OutputIt>
 FMT_CONSTEXPR auto write(OutputIt out,
                          basic_string_view<type_identity_t<Char>> s,
-                         const basic_format_specs<Char>& specs, locale_ref)
+                         const format_specs<Char>& specs, locale_ref)
     -> OutputIt {
-  check_string_type_spec(specs.type);
   return write(out, s, specs);
 }
 template <typename Char, typename OutputIt>
 FMT_CONSTEXPR auto write(OutputIt out, const Char* s,
-                         const basic_format_specs<Char>& specs, locale_ref)
+                         const format_specs<Char>& specs, locale_ref)
     -> OutputIt {
-  return check_cstring_type_spec(specs.type)
+  return specs.type != presentation_type::pointer
              ? write(out, basic_string_view<Char>(s), specs, {})
              : write_ptr<Char>(out, bit_cast<uintptr_t>(s), &specs);
 }
@@ -2233,9 +2387,114 @@ FMT_CONSTEXPR auto write(OutputIt out, T value) -> OutputIt {
   return base_iterator(out, it);
 }
 
+// DEPRECATED!
+template <typename Char>
+FMT_CONSTEXPR auto parse_align(const Char* begin, const Char* end,
+                               format_specs<Char>& specs) -> const Char* {
+  FMT_ASSERT(begin != end, "");
+  auto align = align::none;
+  auto p = begin + code_point_length(begin);
+  if (end - p <= 0) p = begin;
+  for (;;) {
+    switch (to_ascii(*p)) {
+    case '<':
+      align = align::left;
+      break;
+    case '>':
+      align = align::right;
+      break;
+    case '^':
+      align = align::center;
+      break;
+    }
+    if (align != align::none) {
+      if (p != begin) {
+        auto c = *begin;
+        if (c == '}') return begin;
+        if (c == '{') {
+          throw_format_error("invalid fill character '{'");
+          return begin;
+        }
+        specs.fill = {begin, to_unsigned(p - begin)};
+        begin = p + 1;
+      } else {
+        ++begin;
+      }
+      break;
+    } else if (p == begin) {
+      break;
+    }
+    p = begin;
+  }
+  specs.align = align;
+  return begin;
+}
+
+// A floating-point presentation format.
+enum class float_format : unsigned char {
+  general,  // General: exponent notation or fixed point based on magnitude.
+  exp,      // Exponent notation with the default precision of 6, e.g. 1.2e-3.
+  fixed,    // Fixed point with the default precision of 6, e.g. 0.0012.
+  hex
+};
+
+struct float_specs {
+  int precision;
+  float_format format : 8;
+  sign_t sign : 8;
+  bool upper : 1;
+  bool locale : 1;
+  bool binary32 : 1;
+  bool showpoint : 1;
+};
+
+template <typename ErrorHandler = error_handler, typename Char>
+FMT_CONSTEXPR auto parse_float_type_spec(const format_specs<Char>& specs,
+                                         ErrorHandler&& eh = {})
+    -> float_specs {
+  auto result = float_specs();
+  result.showpoint = specs.alt;
+  result.locale = specs.localized;
+  switch (specs.type) {
+  case presentation_type::none:
+    result.format = float_format::general;
+    break;
+  case presentation_type::general_upper:
+    result.upper = true;
+    FMT_FALLTHROUGH;
+  case presentation_type::general_lower:
+    result.format = float_format::general;
+    break;
+  case presentation_type::exp_upper:
+    result.upper = true;
+    FMT_FALLTHROUGH;
+  case presentation_type::exp_lower:
+    result.format = float_format::exp;
+    result.showpoint |= specs.precision != 0;
+    break;
+  case presentation_type::fixed_upper:
+    result.upper = true;
+    FMT_FALLTHROUGH;
+  case presentation_type::fixed_lower:
+    result.format = float_format::fixed;
+    result.showpoint |= specs.precision != 0;
+    break;
+  case presentation_type::hexfloat_upper:
+    result.upper = true;
+    FMT_FALLTHROUGH;
+  case presentation_type::hexfloat_lower:
+    result.format = float_format::hex;
+    break;
+  default:
+    eh.on_error("invalid format specifier");
+    break;
+  }
+  return result;
+}
+
 template <typename Char, typename OutputIt>
 FMT_CONSTEXPR20 auto write_nonfinite(OutputIt out, bool isnan,
-                                     basic_format_specs<Char> specs,
+                                     format_specs<Char> specs,
                                      const float_specs& fspecs) -> OutputIt {
   auto str =
       isnan ? (fspecs.upper ? "NAN" : "nan") : (fspecs.upper ? "INF" : "inf");
@@ -2281,7 +2540,7 @@ template <typename Char, typename OutputIt, typename T, typename Grouping>
 FMT_CONSTEXPR20 auto write_significand(OutputIt out, T significand,
                                        int significand_size, int exponent,
                                        const Grouping& grouping) -> OutputIt {
-  if (!grouping.separator()) {
+  if (!grouping.has_separator()) {
     out = write_significand<Char>(out, significand, significand_size);
     return detail::fill_n(out, exponent, static_cast<Char>('0'));
   }
@@ -2343,7 +2602,7 @@ FMT_CONSTEXPR20 auto write_significand(OutputIt out, T significand,
                                        int significand_size, int integral_size,
                                        Char decimal_point,
                                        const Grouping& grouping) -> OutputIt {
-  if (!grouping.separator()) {
+  if (!grouping.has_separator()) {
     return write_significand(out, significand, significand_size, integral_size,
                              decimal_point);
   }
@@ -2359,7 +2618,7 @@ FMT_CONSTEXPR20 auto write_significand(OutputIt out, T significand,
 template <typename OutputIt, typename DecimalFP, typename Char,
           typename Grouping = digit_grouping<Char>>
 FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& f,
-                                    const basic_format_specs<Char>& specs,
+                                    const format_specs<Char>& specs,
                                     float_specs fspecs, locale_ref loc)
     -> OutputIt {
   auto significand = f.significand;
@@ -2418,7 +2677,7 @@ FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& f,
     abort_fuzzing_if(num_zeros > 5000);
     if (fspecs.showpoint) {
       ++size;
-      if (num_zeros <= 0 && fspecs.format != float_format::fixed) num_zeros = 1;
+      if (num_zeros <= 0 && fspecs.format != float_format::fixed) num_zeros = 0;
       if (num_zeros > 0) size += to_unsigned(num_zeros);
     }
     auto grouping = Grouping(loc, fspecs.locale);
@@ -2436,7 +2695,7 @@ FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& f,
     int num_zeros = fspecs.showpoint ? fspecs.precision - significand_size : 0;
     size += 1 + to_unsigned(num_zeros > 0 ? num_zeros : 0);
     auto grouping = Grouping(loc, fspecs.locale);
-    size += to_unsigned(grouping.count_separators(significand_size));
+    size += to_unsigned(grouping.count_separators(exp));
     return write_padded<align::right>(out, specs, size, [&](iterator it) {
       if (sign) *it++ = detail::sign<Char>(sign);
       it = write_significand(it, significand, significand_size, exp,
@@ -2466,7 +2725,7 @@ template <typename Char> class fallback_digit_grouping {
  public:
   constexpr fallback_digit_grouping(locale_ref, bool) {}
 
-  constexpr Char separator() const { return Char(); }
+  constexpr bool has_separator() const { return false; }
 
   constexpr int count_separators(int) const { return 0; }
 
@@ -2478,7 +2737,7 @@ template <typename Char> class fallback_digit_grouping {
 
 template <typename OutputIt, typename DecimalFP, typename Char>
 FMT_CONSTEXPR20 auto write_float(OutputIt out, const DecimalFP& f,
-                                 const basic_format_specs<Char>& specs,
+                                 const format_specs<Char>& specs,
                                  float_specs fspecs, locale_ref loc)
     -> OutputIt {
   if (is_constant_evaluated()) {
@@ -2506,14 +2765,14 @@ template <typename T, FMT_ENABLE_IF(std::is_floating_point<T>::value&&
 FMT_CONSTEXPR20 bool isfinite(T value) {
   constexpr T inf = T(std::numeric_limits<double>::infinity());
   if (is_constant_evaluated())
-    return !detail::isnan(value) && value != inf && value != -inf;
+    return !detail::isnan(value) && value < inf && value > -inf;
   return std::isfinite(value);
 }
 template <typename T, FMT_ENABLE_IF(!has_isfinite<T>::value)>
 FMT_CONSTEXPR bool isfinite(T value) {
   T inf = T(std::numeric_limits<double>::infinity());
   // std::isfinite doesn't support __float128.
-  return !detail::isnan(value) && value != inf && value != -inf;
+  return !detail::isnan(value) && value < inf && value > -inf;
 }
 
 template <typename T, FMT_ENABLE_IF(is_floating_point<T>::value)>
@@ -2529,78 +2788,6 @@ FMT_INLINE FMT_CONSTEXPR bool signbit(T value) {
   return std::signbit(static_cast<double>(value));
 }
 
-enum class round_direction { unknown, up, down };
-
-// Given the divisor (normally a power of 10), the remainder = v % divisor for
-// some number v and the error, returns whether v should be rounded up, down, or
-// whether the rounding direction can't be determined due to error.
-// error should be less than divisor / 2.
-FMT_CONSTEXPR inline round_direction get_round_direction(uint64_t divisor,
-                                                         uint64_t remainder,
-                                                         uint64_t error) {
-  FMT_ASSERT(remainder < divisor, "");  // divisor - remainder won't overflow.
-  FMT_ASSERT(error < divisor, "");      // divisor - error won't overflow.
-  FMT_ASSERT(error < divisor - error, "");  // error * 2 won't overflow.
-  // Round down if (remainder + error) * 2 <= divisor.
-  if (remainder <= divisor - remainder && error * 2 <= divisor - remainder * 2)
-    return round_direction::down;
-  // Round up if (remainder - error) * 2 >= divisor.
-  if (remainder >= error &&
-      remainder - error >= divisor - (remainder - error)) {
-    return round_direction::up;
-  }
-  return round_direction::unknown;
-}
-
-namespace digits {
-enum result {
-  more,  // Generate more digits.
-  done,  // Done generating digits.
-  error  // Digit generation cancelled due to an error.
-};
-}
-
-struct gen_digits_handler {
-  char* buf;
-  int size;
-  int precision;
-  int exp10;
-  bool fixed;
-
-  FMT_CONSTEXPR digits::result on_digit(char digit, uint64_t divisor,
-                                        uint64_t remainder, uint64_t error,
-                                        bool integral) {
-    FMT_ASSERT(remainder < divisor, "");
-    buf[size++] = digit;
-    if (!integral && error >= remainder) return digits::error;
-    if (size < precision) return digits::more;
-    if (!integral) {
-      // Check if error * 2 < divisor with overflow prevention.
-      // The check is not needed for the integral part because error = 1
-      // and divisor > (1 << 32) there.
-      if (error >= divisor || error >= divisor - error) return digits::error;
-    } else {
-      FMT_ASSERT(error == 1 && divisor > 2, "");
-    }
-    auto dir = get_round_direction(divisor, remainder, error);
-    if (dir != round_direction::up)
-      return dir == round_direction::down ? digits::done : digits::error;
-    ++buf[size - 1];
-    for (int i = size - 1; i > 0 && buf[i] > '9'; --i) {
-      buf[i] = '0';
-      ++buf[i - 1];
-    }
-    if (buf[0] > '9') {
-      buf[0] = '1';
-      if (fixed)
-        buf[size++] = '0';
-      else
-        ++exp10;
-    }
-    return digits::done;
-  }
-};
-
 inline FMT_CONSTEXPR20 void adjust_precision(int& precision, int exp10) {
   // Adjust fixed precision by exponent because it is relative to decimal
   // point.
@@ -2609,101 +2796,6 @@ inline FMT_CONSTEXPR20 void adjust_precision(int& precision, int exp10) {
   precision += exp10;
 }
 
-// Generates output using the Grisu digit-gen algorithm.
-// error: the size of the region (lower, upper) outside of which numbers
-// definitely do not round to value (Delta in Grisu3).
-FMT_INLINE FMT_CONSTEXPR20 auto grisu_gen_digits(fp value, uint64_t error,
-                                                 int& exp,
-                                                 gen_digits_handler& handler)
-    -> digits::result {
-  const fp one(1ULL << -value.e, value.e);
-  // The integral part of scaled value (p1 in Grisu) = value / one. It cannot be
-  // zero because it contains a product of two 64-bit numbers with MSB set (due
-  // to normalization) - 1, shifted right by at most 60 bits.
-  auto integral = static_cast<uint32_t>(value.f >> -one.e);
-  FMT_ASSERT(integral != 0, "");
-  FMT_ASSERT(integral == value.f >> -one.e, "");
-  // The fractional part of scaled value (p2 in Grisu) c = value % one.
-  uint64_t fractional = value.f & (one.f - 1);
-  exp = count_digits(integral);  // kappa in Grisu.
-  // Non-fixed formats require at least one digit and no precision adjustment.
-  if (handler.fixed) {
-    adjust_precision(handler.precision, exp + handler.exp10);
-    // Check if precision is satisfied just by leading zeros, e.g.
-    // format("{:.2f}", 0.001) gives "0.00" without generating any digits.
-    if (handler.precision <= 0) {
-      if (handler.precision < 0) return digits::done;
-      // Divide by 10 to prevent overflow.
-      uint64_t divisor = data::power_of_10_64[exp - 1] << -one.e;
-      auto dir = get_round_direction(divisor, value.f / 10, error * 10);
-      if (dir == round_direction::unknown) return digits::error;
-      handler.buf[handler.size++] = dir == round_direction::up ? '1' : '0';
-      return digits::done;
-    }
-  }
-  // Generate digits for the integral part. This can produce up to 10 digits.
-  do {
-    uint32_t digit = 0;
-    auto divmod_integral = [&](uint32_t divisor) {
-      digit = integral / divisor;
-      integral %= divisor;
-    };
-    // This optimization by Milo Yip reduces the number of integer divisions by
-    // one per iteration.
-    switch (exp) {
-    case 10:
-      divmod_integral(1000000000);
-      break;
-    case 9:
-      divmod_integral(100000000);
-      break;
-    case 8:
-      divmod_integral(10000000);
-      break;
-    case 7:
-      divmod_integral(1000000);
-      break;
-    case 6:
-      divmod_integral(100000);
-      break;
-    case 5:
-      divmod_integral(10000);
-      break;
-    case 4:
-      divmod_integral(1000);
-      break;
-    case 3:
-      divmod_integral(100);
-      break;
-    case 2:
-      divmod_integral(10);
-      break;
-    case 1:
-      digit = integral;
-      integral = 0;
-      break;
-    default:
-      FMT_ASSERT(false, "invalid number of digits");
-    }
-    --exp;
-    auto remainder = (static_cast<uint64_t>(integral) << -one.e) + fractional;
-    auto result = handler.on_digit(static_cast<char>('0' + digit),
-                                   data::power_of_10_64[exp] << -one.e,
-                                   remainder, error, true);
-    if (result != digits::more) return result;
-  } while (exp > 0);
-  // Generate digits for the fractional part.
-  for (;;) {
-    fractional *= 10;
-    error *= 10;
-    char digit = static_cast<char>('0' + (fractional >> -one.e));
-    fractional &= one.f - 1;
-    --exp;
-    auto result = handler.on_digit(digit, one.f, fractional, error, false);
-    if (result != digits::more) return result;
-  }
-}
-
 class bigint {
  private:
   // A bigint is stored as an array of bigits (big digits), with bigit at index
@@ -2804,7 +2896,7 @@ class bigint {
     auto size = other.bigits_.size();
     bigits_.resize(size);
     auto data = other.bigits_.data();
-    std::copy(data, data + size, make_checked(bigits_.data(), size));
+    copy_str<bigit>(data, data + size, bigits_.data());
     exp_ = other.exp_;
   }
 
@@ -3018,6 +3110,7 @@ FMT_CONSTEXPR20 inline void format_dragon(basic_fp<uint128_t> value,
   }
   int even = static_cast<int>((value.f & 1) == 0);
   if (!upper) upper = &lower;
+  bool shortest = num_digits < 0;
   if ((flags & dragon::fixup) != 0) {
     if (add_compare(numerator, *upper, denominator) + even <= 0) {
       --exp10;
@@ -3030,7 +3123,7 @@ FMT_CONSTEXPR20 inline void format_dragon(basic_fp<uint128_t> value,
     if ((flags & dragon::fixed) != 0) adjust_precision(num_digits, exp10 + 1);
   }
   // Invariant: value == (numerator / denominator) * pow(10, exp10).
-  if (num_digits < 0) {
+  if (shortest) {
     // Generate the shortest representation.
     num_digits = 0;
     char* data = buf.data();
@@ -3060,7 +3153,7 @@ FMT_CONSTEXPR20 inline void format_dragon(basic_fp<uint128_t> value,
   }
   // Generate the given number of digits.
   exp10 -= num_digits - 1;
-  if (num_digits == 0) {
+  if (num_digits <= 0) {
     denominator *= 10;
     auto digit = add_compare(numerator, numerator, denominator) > 0 ? '1' : '0';
     buf.push_back(digit);
@@ -3085,7 +3178,8 @@ FMT_CONSTEXPR20 inline void format_dragon(basic_fp<uint128_t> value,
       }
       if (buf[0] == overflow) {
         buf[0] = '1';
-        ++exp10;
+        if ((flags & dragon::fixed) != 0) buf.push_back('0');
+        else ++exp10;
       }
       return;
     }
@@ -3094,6 +3188,94 @@ FMT_CONSTEXPR20 inline void format_dragon(basic_fp<uint128_t> value,
   buf[num_digits - 1] = static_cast<char>('0' + digit);
 }
 
+// Formats a floating-point number using the hexfloat format.
+template <typename Float, FMT_ENABLE_IF(!is_double_double<Float>::value)>
+FMT_CONSTEXPR20 void format_hexfloat(Float value, int precision,
+                                     float_specs specs, buffer<char>& buf) {
+  // float is passed as double to reduce the number of instantiations and to
+  // simplify implementation.
+  static_assert(!std::is_same<Float, float>::value, "");
+
+  using info = dragonbox::float_info<Float>;
+
+  // Assume Float is in the format [sign][exponent][significand].
+  using carrier_uint = typename info::carrier_uint;
+
+  constexpr auto num_float_significand_bits =
+      detail::num_significand_bits<Float>();
+
+  basic_fp<carrier_uint> f(value);
+  f.e += num_float_significand_bits;
+  if (!has_implicit_bit<Float>()) --f.e;
+
+  constexpr auto num_fraction_bits =
+      num_float_significand_bits + (has_implicit_bit<Float>() ? 1 : 0);
+  constexpr auto num_xdigits = (num_fraction_bits + 3) / 4;
+
+  constexpr auto leading_shift = ((num_xdigits - 1) * 4);
+  const auto leading_mask = carrier_uint(0xF) << leading_shift;
+  const auto leading_xdigit =
+      static_cast<uint32_t>((f.f & leading_mask) >> leading_shift);
+  if (leading_xdigit > 1) f.e -= (32 - countl_zero(leading_xdigit) - 1);
+
+  int print_xdigits = num_xdigits - 1;
+  if (precision >= 0 && print_xdigits > precision) {
+    const int shift = ((print_xdigits - precision - 1) * 4);
+    const auto mask = carrier_uint(0xF) << shift;
+    const auto v = static_cast<uint32_t>((f.f & mask) >> shift);
+
+    if (v >= 8) {
+      const auto inc = carrier_uint(1) << (shift + 4);
+      f.f += inc;
+      f.f &= ~(inc - 1);
+    }
+
+    // Check long double overflow
+    if (!has_implicit_bit<Float>()) {
+      const auto implicit_bit = carrier_uint(1) << num_float_significand_bits;
+      if ((f.f & implicit_bit) == implicit_bit) {
+        f.f >>= 4;
+        f.e += 4;
+      }
+    }
+
+    print_xdigits = precision;
+  }
+
+  char xdigits[num_bits<carrier_uint>() / 4];
+  detail::fill_n(xdigits, sizeof(xdigits), '0');
+  format_uint<4>(xdigits, f.f, num_xdigits, specs.upper);
+
+  // Remove zero tail
+  while (print_xdigits > 0 && xdigits[print_xdigits] == '0') --print_xdigits;
+
+  buf.push_back('0');
+  buf.push_back(specs.upper ? 'X' : 'x');
+  buf.push_back(xdigits[0]);
+  if (specs.showpoint || print_xdigits > 0 || print_xdigits < precision)
+    buf.push_back('.');
+  buf.append(xdigits + 1, xdigits + 1 + print_xdigits);
+  for (; print_xdigits < precision; ++print_xdigits) buf.push_back('0');
+
+  buf.push_back(specs.upper ? 'P' : 'p');
+
+  uint32_t abs_e;
+  if (f.e < 0) {
+    buf.push_back('-');
+    abs_e = static_cast<uint32_t>(-f.e);
+  } else {
+    buf.push_back('+');
+    abs_e = static_cast<uint32_t>(f.e);
+  }
+  format_decimal<char>(appender(buf), abs_e, detail::count_digits(abs_e));
+}
+
+template <typename Float, FMT_ENABLE_IF(is_double_double<Float>::value)>
+FMT_CONSTEXPR20 void format_hexfloat(Float value, int precision,
+                                     float_specs specs, buffer<char>& buf) {
+  format_hexfloat(static_cast<double>(value), precision, specs, buf);
+}
+
 template <typename Float>
 FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
                                   buffer<char>& buf) -> int {
@@ -3116,7 +3298,7 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
   int exp = 0;
   bool use_dragon = true;
   unsigned dragon_flags = 0;
-  if (!is_fast_float<Float>()) {
+  if (!is_fast_float<Float>() || is_constant_evaluated()) {
     const auto inv_log2_10 = 0.3010299956639812;  // 1 / log2(10)
     using info = dragonbox::float_info<decltype(converted_value)>;
     const auto f = basic_fp<typename info::carrier_uint>(converted_value);
@@ -3124,10 +3306,11 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
     //   10^(exp - 1) <= value < 10^exp or 10^exp <= value < 10^(exp + 1).
     // This is based on log10(value) == log2(value) / log2(10) and approximation
     // of log2(value) by e + num_fraction_bits idea from double-conversion.
-    exp = static_cast<int>(
-        std::ceil((f.e + count_digits<1>(f.f) - 1) * inv_log2_10 - 1e-10));
+    auto e = (f.e + count_digits<1>(f.f) - 1) * inv_log2_10 - 1e-10;
+    exp = static_cast<int>(e);
+    if (e > exp) ++exp;  // Compute ceil.
     dragon_flags = dragon::fixup;
-  } else if (!is_constant_evaluated() && precision < 0) {
+  } else if (precision < 0) {
     // Use Dragonbox for the shortest format.
     if (specs.binary32) {
       auto dec = dragonbox::to_decimal(static_cast<float>(value));
@@ -3138,23 +3321,244 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
     write<char>(buffer_appender<char>(buf), dec.significand);
     return dec.exponent;
   } else {
-    // Use Grisu + Dragon4 for the given precision:
-    // https://www.cs.tufts.edu/~nr/cs257/archive/florian-loitsch/printf.pdf.
-    const int min_exp = -60;  // alpha in Grisu.
-    int cached_exp10 = 0;     // K in Grisu.
-    fp normalized = normalize(fp(converted_value));
-    const auto cached_pow = get_cached_power(
-        min_exp - (normalized.e + fp::num_significand_bits), cached_exp10);
-    normalized = normalized * cached_pow;
-    gen_digits_handler handler{buf.data(), 0, precision, -cached_exp10, fixed};
-    if (grisu_gen_digits(normalized, 1, exp, handler) != digits::error &&
-        !is_constant_evaluated()) {
-      exp += handler.exp10;
-      buf.try_resize(to_unsigned(handler.size));
-      use_dragon = false;
+    // Extract significand bits and exponent bits.
+    using info = dragonbox::float_info<double>;
+    auto br = bit_cast<uint64_t>(static_cast<double>(value));
+
+    const uint64_t significand_mask =
+        (static_cast<uint64_t>(1) << num_significand_bits<double>()) - 1;
+    uint64_t significand = (br & significand_mask);
+    int exponent = static_cast<int>((br & exponent_mask<double>()) >>
+                                    num_significand_bits<double>());
+
+    if (exponent != 0) {  // Check if normal.
+      exponent -= exponent_bias<double>() + num_significand_bits<double>();
+      significand |=
+          (static_cast<uint64_t>(1) << num_significand_bits<double>());
+      significand <<= 1;
     } else {
-      exp += handler.size - cached_exp10 - 1;
-      precision = handler.precision;
+      // Normalize subnormal inputs.
+      FMT_ASSERT(significand != 0, "zeros should not appear here");
+      int shift = countl_zero(significand);
+      FMT_ASSERT(shift >= num_bits<uint64_t>() - num_significand_bits<double>(),
+                 "");
+      shift -= (num_bits<uint64_t>() - num_significand_bits<double>() - 2);
+      exponent = (std::numeric_limits<double>::min_exponent -
+                  num_significand_bits<double>()) -
+                 shift;
+      significand <<= shift;
+    }
+
+    // Compute the first several nonzero decimal significand digits.
+    // We call the number we get the first segment.
+    const int k = info::kappa - dragonbox::floor_log10_pow2(exponent);
+    exp = -k;
+    const int beta = exponent + dragonbox::floor_log2_pow10(k);
+    uint64_t first_segment;
+    bool has_more_segments;
+    int digits_in_the_first_segment;
+    {
+      const auto r = dragonbox::umul192_upper128(
+          significand << beta, dragonbox::get_cached_power(k));
+      first_segment = r.high();
+      has_more_segments = r.low() != 0;
+
+      // The first segment can have 18 ~ 19 digits.
+      if (first_segment >= 1000000000000000000ULL) {
+        digits_in_the_first_segment = 19;
+      } else {
+        // When it is of 18-digits, we align it to 19-digits by adding a bogus
+        // zero at the end.
+        digits_in_the_first_segment = 18;
+        first_segment *= 10;
+      }
+    }
+
+    // Compute the actual number of decimal digits to print.
+    if (fixed) adjust_precision(precision, exp + digits_in_the_first_segment);
+
+    // Use Dragon4 only when there might be not enough digits in the first
+    // segment.
+    if (digits_in_the_first_segment > precision) {
+      use_dragon = false;
+
+      if (precision <= 0) {
+        exp += digits_in_the_first_segment;
+
+        if (precision < 0) {
+          // Nothing to do, since all we have are just leading zeros.
+          buf.try_resize(0);
+        } else {
+          // We may need to round-up.
+          buf.try_resize(1);
+          if ((first_segment | static_cast<uint64_t>(has_more_segments)) >
+              5000000000000000000ULL) {
+            buf[0] = '1';
+          } else {
+            buf[0] = '0';
+          }
+        }
+      }  // precision <= 0
+      else {
+        exp += digits_in_the_first_segment - precision;
+
+        // When precision > 0, we divide the first segment into three
+        // subsegments, each with 9, 9, and 0 ~ 1 digits so that each fits
+        // in 32-bits which usually allows faster calculation than in
+        // 64-bits. Since some compiler (e.g. MSVC) doesn't know how to optimize
+        // division-by-constant for large 64-bit divisors, we do it here
+        // manually. The magic number 7922816251426433760 below is equal to
+        // ceil(2^(64+32) / 10^10).
+        const uint32_t first_subsegment = static_cast<uint32_t>(
+            dragonbox::umul128_upper64(first_segment, 7922816251426433760ULL) >>
+            32);
+        const uint64_t second_third_subsegments =
+            first_segment - first_subsegment * 10000000000ULL;
+
+        uint64_t prod;
+        uint32_t digits;
+        bool should_round_up;
+        int number_of_digits_to_print = precision > 9 ? 9 : precision;
+
+        // Print a 9-digits subsegment, either the first or the second.
+        auto print_subsegment = [&](uint32_t subsegment, char* buffer) {
+          int number_of_digits_printed = 0;
+
+          // If we want to print an odd number of digits from the subsegment,
+          if ((number_of_digits_to_print & 1) != 0) {
+            // Convert to 64-bit fixed-point fractional form with 1-digit
+            // integer part. The magic number 720575941 is a good enough
+            // approximation of 2^(32 + 24) / 10^8; see
+            // https://jk-jeon.github.io/posts/2022/12/fixed-precision-formatting/#fixed-length-case
+            // for details.
+            prod = ((subsegment * static_cast<uint64_t>(720575941)) >> 24) + 1;
+            digits = static_cast<uint32_t>(prod >> 32);
+            *buffer = static_cast<char>('0' + digits);
+            number_of_digits_printed++;
+          }
+          // If we want to print an even number of digits from the
+          // first_subsegment,
+          else {
+            // Convert to 64-bit fixed-point fractional form with 2-digits
+            // integer part. The magic number 450359963 is a good enough
+            // approximation of 2^(32 + 20) / 10^7; see
+            // https://jk-jeon.github.io/posts/2022/12/fixed-precision-formatting/#fixed-length-case
+            // for details.
+            prod = ((subsegment * static_cast<uint64_t>(450359963)) >> 20) + 1;
+            digits = static_cast<uint32_t>(prod >> 32);
+            copy2(buffer, digits2(digits));
+            number_of_digits_printed += 2;
+          }
+
+          // Print all digit pairs.
+          while (number_of_digits_printed < number_of_digits_to_print) {
+            prod = static_cast<uint32_t>(prod) * static_cast<uint64_t>(100);
+            digits = static_cast<uint32_t>(prod >> 32);
+            copy2(buffer + number_of_digits_printed, digits2(digits));
+            number_of_digits_printed += 2;
+          }
+        };
+
+        // Print first subsegment.
+        print_subsegment(first_subsegment, buf.data());
+
+        // Perform rounding if the first subsegment is the last subsegment to
+        // print.
+        if (precision <= 9) {
+          // Rounding inside the subsegment.
+          // We round-up if:
+          //  - either the fractional part is strictly larger than 1/2, or
+          //  - the fractional part is exactly 1/2 and the last digit is odd.
+          // We rely on the following observations:
+          //  - If fractional_part >= threshold, then the fractional part is
+          //    strictly larger than 1/2.
+          //  - If the MSB of fractional_part is set, then the fractional part
+          //    must be at least 1/2.
+          //  - When the MSB of fractional_part is set, either
+          //    second_third_subsegments being nonzero or has_more_segments
+          //    being true means there are further digits not printed, so the
+          //    fractional part is strictly larger than 1/2.
+          if (precision < 9) {
+            uint32_t fractional_part = static_cast<uint32_t>(prod);
+            should_round_up = fractional_part >=
+                                  data::fractional_part_rounding_thresholds
+                                      [8 - number_of_digits_to_print] ||
+                              ((fractional_part >> 31) &
+                               ((digits & 1) | (second_third_subsegments != 0) |
+                                has_more_segments)) != 0;
+          }
+          // Rounding at the subsegment boundary.
+          // In this case, the fractional part is at least 1/2 if and only if
+          // second_third_subsegments >= 5000000000ULL, and is strictly larger
+          // than 1/2 if we further have either second_third_subsegments >
+          // 5000000000ULL or has_more_segments == true.
+          else {
+            should_round_up = second_third_subsegments > 5000000000ULL ||
+                              (second_third_subsegments == 5000000000ULL &&
+                               ((digits & 1) != 0 || has_more_segments));
+          }
+        }
+        // Otherwise, print the second subsegment.
+        else {
+          // Compilers are not aware of how to leverage the maximum value of
+          // second_third_subsegments to find out a better magic number which
+          // allows us to eliminate an additional shift. 1844674407370955162 =
+          // ceil(2^64/10) < ceil(2^64*(10^9/(10^10 - 1))).
+          const uint32_t second_subsegment =
+              static_cast<uint32_t>(dragonbox::umul128_upper64(
+                  second_third_subsegments, 1844674407370955162ULL));
+          const uint32_t third_subsegment =
+              static_cast<uint32_t>(second_third_subsegments) -
+              second_subsegment * 10;
+
+          number_of_digits_to_print = precision - 9;
+          print_subsegment(second_subsegment, buf.data() + 9);
+
+          // Rounding inside the subsegment.
+          if (precision < 18) {
+            // The condition third_subsegment != 0 implies that the segment was
+            // of 19 digits, so in this case the third segment should be
+            // consisting of a genuine digit from the input.
+            uint32_t fractional_part = static_cast<uint32_t>(prod);
+            should_round_up = fractional_part >=
+                                  data::fractional_part_rounding_thresholds
+                                      [8 - number_of_digits_to_print] ||
+                              ((fractional_part >> 31) &
+                               ((digits & 1) | (third_subsegment != 0) |
+                                has_more_segments)) != 0;
+          }
+          // Rounding at the subsegment boundary.
+          else {
+            // In this case, the segment must be of 19 digits, thus
+            // the third subsegment should be consisting of a genuine digit from
+            // the input.
+            should_round_up = third_subsegment > 5 ||
+                              (third_subsegment == 5 &&
+                               ((digits & 1) != 0 || has_more_segments));
+          }
+        }
+
+        // Round-up if necessary.
+        if (should_round_up) {
+          ++buf[precision - 1];
+          for (int i = precision - 1; i > 0 && buf[i] > '9'; --i) {
+            buf[i] = '0';
+            ++buf[i - 1];
+          }
+          if (buf[0] > '9') {
+            buf[0] = '1';
+            if (fixed)
+              buf[precision++] = '0';
+            else
+              ++exp;
+          }
+        }
+        buf.try_resize(to_unsigned(precision));
+      }
+    }  // if (digits_in_the_first_segment > precision)
+    else {
+      // Adjust the exponent for its use in Dragon4.
+      exp += digits_in_the_first_segment - 1;
     }
   }
   if (use_dragon) {
@@ -3181,13 +3585,10 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
   }
   return exp;
 }
-
-template <typename Char, typename OutputIt, typename T,
-          FMT_ENABLE_IF(is_floating_point<T>::value)>
-FMT_CONSTEXPR20 auto write(OutputIt out, T value,
-                           basic_format_specs<Char> specs, locale_ref loc = {})
+template <typename Char, typename OutputIt, typename T>
+FMT_CONSTEXPR20 auto write_float(OutputIt out, T value,
+                                 format_specs<Char> specs, locale_ref loc)
     -> OutputIt {
-  if (const_check(!is_supported_floating_point(value))) return out;
   float_specs fspecs = parse_float_type_spec(specs);
   fspecs.sign = specs.sign;
   if (detail::signbit(value)) {  // value < 0 is false for NaN so use signbit.
@@ -3211,7 +3612,7 @@ FMT_CONSTEXPR20 auto write(OutputIt out, T value,
   memory_buffer buffer;
   if (fspecs.format == float_format::hex) {
     if (fspecs.sign) buffer.push_back(detail::sign<char>(fspecs.sign));
-    snprintf_float(convert_float(value), specs.precision, fspecs, buffer);
+    format_hexfloat(convert_float(value), specs.precision, fspecs, buffer);
     return write_bytes<align::right>(out, {buffer.data(), buffer.size()},
                                      specs);
   }
@@ -3233,11 +3634,20 @@ FMT_CONSTEXPR20 auto write(OutputIt out, T value,
   return write_float(out, f, specs, fspecs, loc);
 }
 
+template <typename Char, typename OutputIt, typename T,
+          FMT_ENABLE_IF(is_floating_point<T>::value)>
+FMT_CONSTEXPR20 auto write(OutputIt out, T value, format_specs<Char> specs,
+                           locale_ref loc = {}) -> OutputIt {
+  if (const_check(!is_supported_floating_point(value))) return out;
+  return specs.localized && write_loc(out, value, specs, loc)
+             ? out
+             : write_float(out, value, specs, loc);
+}
+
 template <typename Char, typename OutputIt, typename T,
           FMT_ENABLE_IF(is_fast_float<T>::value)>
 FMT_CONSTEXPR20 auto write(OutputIt out, T value) -> OutputIt {
-  if (is_constant_evaluated())
-    return write(out, value, basic_format_specs<Char>());
+  if (is_constant_evaluated()) return write(out, value, format_specs<Char>());
   if (const_check(!is_supported_floating_point(value))) return out;
 
   auto fspecs = float_specs();
@@ -3246,11 +3656,11 @@ FMT_CONSTEXPR20 auto write(OutputIt out, T value) -> OutputIt {
     value = -value;
   }
 
-  constexpr auto specs = basic_format_specs<Char>();
+  constexpr auto specs = format_specs<Char>();
   using floaty = conditional_t<std::is_same<T, long double>::value, double, T>;
-  using uint = typename dragonbox::float_info<floaty>::carrier_uint;
-  uint mask = exponent_mask<floaty>();
-  if ((bit_cast<uint>(value) & mask) == mask)
+  using floaty_uint = typename dragonbox::float_info<floaty>::carrier_uint;
+  floaty_uint mask = exponent_mask<floaty>();
+  if ((bit_cast<floaty_uint>(value) & mask) == mask)
     return write_nonfinite(out, std::isnan(value), specs, fspecs);
 
   auto dec = dragonbox::to_decimal(static_cast<floaty>(value));
@@ -3261,12 +3671,12 @@ template <typename Char, typename OutputIt, typename T,
           FMT_ENABLE_IF(is_floating_point<T>::value &&
                         !is_fast_float<T>::value)>
 inline auto write(OutputIt out, T value) -> OutputIt {
-  return write(out, value, basic_format_specs<Char>());
+  return write(out, value, format_specs<Char>());
 }
 
 template <typename Char, typename OutputIt>
-auto write(OutputIt out, monostate, basic_format_specs<Char> = {},
-           locale_ref = {}) -> OutputIt {
+auto write(OutputIt out, monostate, format_specs<Char> = {}, locale_ref = {})
+    -> OutputIt {
   FMT_ASSERT(false, "");
   return out;
 }
@@ -3300,8 +3710,8 @@ FMT_CONSTEXPR auto write(OutputIt out, T value) -> OutputIt {
 template <typename Char, typename OutputIt, typename T,
           FMT_ENABLE_IF(std::is_same<T, bool>::value)>
 FMT_CONSTEXPR auto write(OutputIt out, T value,
-                         const basic_format_specs<Char>& specs = {},
-                         locale_ref = {}) -> OutputIt {
+                         const format_specs<Char>& specs = {}, locale_ref = {})
+    -> OutputIt {
   return specs.type != presentation_type::none &&
                  specs.type != presentation_type::string
              ? write(out, value ? 1 : 0, specs, {})
@@ -3318,20 +3728,15 @@ FMT_CONSTEXPR auto write(OutputIt out, Char value) -> OutputIt {
 template <typename Char, typename OutputIt>
 FMT_CONSTEXPR_CHAR_TRAITS auto write(OutputIt out, const Char* value)
     -> OutputIt {
-  if (!value) {
-    throw_format_error("string pointer is null");
-  } else {
-    out = write(out, basic_string_view<Char>(value));
-  }
+  if (value) return write(out, basic_string_view<Char>(value));
+  throw_format_error("string pointer is null");
   return out;
 }
 
 template <typename Char, typename OutputIt, typename T,
           FMT_ENABLE_IF(std::is_same<T, void>::value)>
-auto write(OutputIt out, const T* value,
-           const basic_format_specs<Char>& specs = {}, locale_ref = {})
-    -> OutputIt {
-  check_pointer_type_spec(specs.type, error_handler());
+auto write(OutputIt out, const T* value, const format_specs<Char>& specs = {},
+           locale_ref = {}) -> OutputIt {
   return write_ptr<Char>(out, bit_cast<uintptr_t>(value), &specs);
 }
 
@@ -3341,8 +3746,8 @@ template <typename Char, typename OutputIt, typename T,
 FMT_CONSTEXPR auto write(OutputIt out, const T& value) -> enable_if_t<
     std::is_class<T>::value && !is_string<T>::value &&
         !is_floating_point<T>::value && !std::is_same<T, Char>::value &&
-        !std::is_same<const T&,
-                      decltype(arg_mapper<Context>().map(value))>::value,
+        !std::is_same<T, remove_cvref_t<decltype(arg_mapper<Context>().map(
+                             value))>>::value,
     OutputIt> {
   return write<Char>(out, arg_mapper<Context>().map(value));
 }
@@ -3352,12 +3757,8 @@ template <typename Char, typename OutputIt, typename T,
 FMT_CONSTEXPR auto write(OutputIt out, const T& value)
     -> enable_if_t<mapped_type_constant<T, Context>::value == type::custom_type,
                    OutputIt> {
-  using formatter_type =
-      conditional_t<has_formatter<T, Context>::value,
-                    typename Context::template formatter_type<T>,
-                    fallback_formatter<T, Char>>;
   auto ctx = Context(out, {}, {});
-  return formatter_type().format(value, ctx);
+  return typename Context::template formatter_type<T>().format(value, ctx);
 }
 
 // An argument visitor that formats the argument and writes it via the output
@@ -3386,7 +3787,7 @@ template <typename Char> struct arg_formatter {
   using context = buffer_context<Char>;
 
   iterator out;
-  const basic_format_specs<Char>& specs;
+  const format_specs<Char>& specs;
   locale_ref locale;
 
   template <typename T>
@@ -3411,12 +3812,6 @@ template <typename Char> struct custom_formatter {
   template <typename T> void operator()(T) const {}
 };
 
-template <typename T>
-using is_integer =
-    bool_constant<is_integral<T>::value && !std::is_same<T, bool>::value &&
-                  !std::is_same<T, char>::value &&
-                  !std::is_same<T, wchar_t>::value>;
-
 template <typename ErrorHandler> class width_checker {
  public:
   explicit FMT_CONSTEXPR width_checker(ErrorHandler& eh) : handler_(eh) {}
@@ -3466,55 +3861,12 @@ FMT_CONSTEXPR auto get_dynamic_spec(FormatArg arg, ErrorHandler eh) -> int {
 }
 
 template <typename Context, typename ID>
-FMT_CONSTEXPR auto get_arg(Context& ctx, ID id) ->
-    typename Context::format_arg {
+FMT_CONSTEXPR auto get_arg(Context& ctx, ID id) -> decltype(ctx.arg(id)) {
   auto arg = ctx.arg(id);
   if (!arg) ctx.on_error("argument not found");
   return arg;
 }
 
-// The standard format specifier handler with checking.
-template <typename Char> class specs_handler : public specs_setter<Char> {
- private:
-  basic_format_parse_context<Char>& parse_context_;
-  buffer_context<Char>& context_;
-
-  // This is only needed for compatibility with gcc 4.4.
-  using format_arg = basic_format_arg<buffer_context<Char>>;
-
-  FMT_CONSTEXPR auto get_arg(auto_id) -> format_arg {
-    return detail::get_arg(context_, parse_context_.next_arg_id());
-  }
-
-  FMT_CONSTEXPR auto get_arg(int arg_id) -> format_arg {
-    parse_context_.check_arg_id(arg_id);
-    return detail::get_arg(context_, arg_id);
-  }
-
-  FMT_CONSTEXPR auto get_arg(basic_string_view<Char> arg_id) -> format_arg {
-    parse_context_.check_arg_id(arg_id);
-    return detail::get_arg(context_, arg_id);
-  }
-
- public:
-  FMT_CONSTEXPR specs_handler(basic_format_specs<Char>& specs,
-                              basic_format_parse_context<Char>& parse_ctx,
-                              buffer_context<Char>& ctx)
-      : specs_setter<Char>(specs), parse_context_(parse_ctx), context_(ctx) {}
-
-  template <typename Id> FMT_CONSTEXPR void on_dynamic_width(Id arg_id) {
-    this->specs_.width = get_dynamic_spec<width_checker>(
-        get_arg(arg_id), context_.error_handler());
-  }
-
-  template <typename Id> FMT_CONSTEXPR void on_dynamic_precision(Id arg_id) {
-    this->specs_.precision = get_dynamic_spec<precision_checker>(
-        get_arg(arg_id), context_.error_handler());
-  }
-
-  void on_error(const char* message) { context_.on_error(message); }
-};
-
 template <template <typename> class Handler, typename Context>
 FMT_CONSTEXPR void handle_dynamic_spec(int& value,
                                        arg_ref<typename Context::char_type> ref,
@@ -3523,26 +3875,17 @@ FMT_CONSTEXPR void handle_dynamic_spec(int& value,
   case arg_id_kind::none:
     break;
   case arg_id_kind::index:
-    value = detail::get_dynamic_spec<Handler>(ctx.arg(ref.val.index),
+    value = detail::get_dynamic_spec<Handler>(get_arg(ctx, ref.val.index),
                                               ctx.error_handler());
     break;
   case arg_id_kind::name:
-    value = detail::get_dynamic_spec<Handler>(ctx.arg(ref.val.name),
+    value = detail::get_dynamic_spec<Handler>(get_arg(ctx, ref.val.name),
                                               ctx.error_handler());
     break;
   }
 }
 
 #if FMT_USE_USER_DEFINED_LITERALS
-template <typename Char> struct udl_formatter {
-  basic_string_view<Char> str;
-
-  template <typename... T>
-  auto operator()(T&&... args) const -> std::basic_string<Char> {
-    return vformat(str, fmt::make_format_args<buffer_context<Char>>(args...));
-  }
-};
-
 #  if FMT_USE_NONTYPE_TEMPLATE_ARGS
 template <typename T, typename Char, size_t N,
           fmt::detail_exported::fixed_string<Char, N> Str>
@@ -3581,12 +3924,12 @@ template <typename Char> struct udl_arg {
 #endif  // FMT_USE_USER_DEFINED_LITERALS
 
 template <typename Locale, typename Char>
-auto vformat(const Locale& loc, basic_string_view<Char> format_str,
+auto vformat(const Locale& loc, basic_string_view<Char> fmt,
              basic_format_args<buffer_context<type_identity_t<Char>>> args)
     -> std::basic_string<Char> {
-  basic_memory_buffer<Char> buffer;
-  detail::vformat_to(buffer, format_str, args, detail::locale_ref(loc));
-  return {buffer.data(), buffer.size()};
+  auto buf = basic_memory_buffer<Char>();
+  detail::vformat_to(buf, fmt, args, detail::locale_ref(loc));
+  return {buf.data(), buf.size()};
 }
 
 using format_func = void (*)(detail::buffer<char>&, int, const char*);
@@ -3596,28 +3939,28 @@ FMT_API void format_error_code(buffer<char>& out, int error_code,
 
 FMT_API void report_error(format_func func, int error_code,
                           const char* message) noexcept;
-FMT_END_DETAIL_NAMESPACE
+}  // namespace detail
 
 FMT_API auto vsystem_error(int error_code, string_view format_str,
                            format_args args) -> std::system_error;
 
 /**
- \rst
- Constructs :class:`std::system_error` with a message formatted with
- ``fmt::format(fmt, args...)``.
+  \rst
+  Constructs :class:`std::system_error` with a message formatted with
+  ``fmt::format(fmt, args...)``.
   *error_code* is a system error code as given by ``errno``.
 
- **Example**::
-
-   // This throws std::system_error with the description
-   //   cannot open file 'madeup': No such file or directory
-   // or similar (system message may vary).
-   const char* filename = "madeup";
-   std::FILE* file = std::fopen(filename, "r");
-   if (!file)
-     throw fmt::system_error(errno, "cannot open file '{}'", filename);
- \endrst
-*/
+  **Example**::
+
+    // This throws std::system_error with the description
+    //   cannot open file 'madeup': No such file or directory
+    // or similar (system message may vary).
+    const char* filename = "madeup";
+    std::FILE* file = std::fopen(filename, "r");
+    if (!file)
+      throw fmt::system_error(errno, "cannot open file '{}'", filename);
+  \endrst
+ */
 template <typename... T>
 auto system_error(int error_code, format_string<T...> fmt, T&&... args)
     -> std::system_error {
@@ -3708,93 +4051,35 @@ class format_int {
 };
 
 template <typename T, typename Char>
-template <typename FormatContext>
-FMT_CONSTEXPR FMT_INLINE auto
-formatter<T, Char,
-          enable_if_t<detail::type_constant<T, Char>::value !=
-                      detail::type::custom_type>>::format(const T& val,
-                                                          FormatContext& ctx)
-    const -> decltype(ctx.out()) {
-  if (specs_.width_ref.kind != detail::arg_id_kind::none ||
-      specs_.precision_ref.kind != detail::arg_id_kind::none) {
-    auto specs = specs_;
-    detail::handle_dynamic_spec<detail::width_checker>(specs.width,
-                                                       specs.width_ref, ctx);
-    detail::handle_dynamic_spec<detail::precision_checker>(
-        specs.precision, specs.precision_ref, ctx);
-    return detail::write<Char>(ctx.out(), val, specs, ctx.locale());
-  }
-  return detail::write<Char>(ctx.out(), val, specs_, ctx.locale());
-}
+struct formatter<T, Char, enable_if_t<detail::has_format_as<T>::value>>
+    : private formatter<detail::format_as_t<T>, Char> {
+  using base = formatter<detail::format_as_t<T>, Char>;
+  using base::parse;
 
-template <typename Char>
-struct formatter<void*, Char> : formatter<const void*, Char> {
   template <typename FormatContext>
-  auto format(void* val, FormatContext& ctx) const -> decltype(ctx.out()) {
-    return formatter<const void*, Char>::format(val, ctx);
+  auto format(const T& value, FormatContext& ctx) const -> decltype(ctx.out()) {
+    return base::format(format_as(value), ctx);
   }
 };
 
-template <typename Char, size_t N>
-struct formatter<Char[N], Char> : formatter<basic_string_view<Char>, Char> {
-  template <typename FormatContext>
-  FMT_CONSTEXPR auto format(const Char* val, FormatContext& ctx) const
-      -> decltype(ctx.out()) {
-    return formatter<basic_string_view<Char>, Char>::format(val, ctx);
-  }
-};
+#define FMT_FORMAT_AS(Type, Base) \
+  template <typename Char>        \
+  struct formatter<Type, Char> : formatter<Base, Char> {}
+
+FMT_FORMAT_AS(signed char, int);
+FMT_FORMAT_AS(unsigned char, unsigned);
+FMT_FORMAT_AS(short, int);
+FMT_FORMAT_AS(unsigned short, unsigned);
+FMT_FORMAT_AS(long, detail::long_type);
+FMT_FORMAT_AS(unsigned long, detail::ulong_type);
+FMT_FORMAT_AS(Char*, const Char*);
+FMT_FORMAT_AS(std::basic_string<Char>, basic_string_view<Char>);
+FMT_FORMAT_AS(std::nullptr_t, const void*);
+FMT_FORMAT_AS(detail::std_string_view<Char>, basic_string_view<Char>);
+FMT_FORMAT_AS(void*, const void*);
 
-// A formatter for types known only at run time such as variant alternatives.
-//
-// Usage:
-//   using variant = std::variant<int, std::string>;
-//   template <>
-//   struct formatter<variant>: dynamic_formatter<> {
-//     auto format(const variant& v, format_context& ctx) {
-//       return visit([&](const auto& val) {
-//           return dynamic_formatter<>::format(val, ctx);
-//       }, v);
-//     }
-//   };
-template <typename Char = char> class dynamic_formatter {
- private:
-  detail::dynamic_format_specs<Char> specs_;
-  const Char* format_str_;
-
-  struct null_handler : detail::error_handler {
-    void on_align(align_t) {}
-    void on_sign(sign_t) {}
-    void on_hash() {}
-  };
-
-  template <typename Context> void handle_specs(Context& ctx) {
-    detail::handle_dynamic_spec<detail::width_checker>(specs_.width,
-                                                       specs_.width_ref, ctx);
-    detail::handle_dynamic_spec<detail::precision_checker>(
-        specs_.precision, specs_.precision_ref, ctx);
-  }
-
- public:
-  template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
-    format_str_ = ctx.begin();
-    // Checks are deferred to formatting time when the argument type is known.
-    detail::dynamic_specs_handler<ParseContext> handler(specs_, ctx);
-    return detail::parse_format_specs(ctx.begin(), ctx.end(), handler);
-  }
-
-  template <typename T, typename FormatContext>
-  auto format(const T& val, FormatContext& ctx) -> decltype(ctx.out()) {
-    handle_specs(ctx);
-    detail::specs_checker<null_handler> checker(
-        null_handler(), detail::mapped_type_constant<T, FormatContext>::value);
-    checker.on_align(specs_.align);
-    if (specs_.sign != sign::none) checker.on_sign(specs_.sign);
-    if (specs_.alt) checker.on_hash();
-    if (specs_.precision >= 0) checker.end_precision();
-    return detail::write<Char>(ctx.out(), val, specs_, ctx.locale());
-  }
-};
+template <typename Char, size_t N>
+struct formatter<Char[N], Char> : formatter<basic_string_view<Char>, Char> {};
 
 /**
   \rst
@@ -3809,7 +4094,8 @@ template <typename T> auto ptr(T p) -> const void* {
   static_assert(std::is_pointer<T>::value, "");
   return detail::bit_cast<const void*>(p);
 }
-template <typename T> auto ptr(const std::unique_ptr<T>& p) -> const void* {
+template <typename T, typename Deleter>
+auto ptr(const std::unique_ptr<T, Deleter>& p) -> const void* {
   return p.get();
 }
 template <typename T> auto ptr(const std::shared_ptr<T>& p) -> const void* {
@@ -3849,17 +4135,13 @@ class bytes {
 
 template <> struct formatter<bytes> {
  private:
-  detail::dynamic_format_specs<char> specs_;
+  detail::dynamic_format_specs<> specs_;
 
  public:
   template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
-    using handler_type = detail::dynamic_specs_handler<ParseContext>;
-    detail::specs_checker<handler_type> handler(handler_type(specs_, ctx),
-                                                detail::type::string_type);
-    auto it = parse_format_specs(ctx.begin(), ctx.end(), handler);
-    detail::check_string_type_spec(specs_.type, ctx.error_handler());
-    return it;
+  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> const char* {
+    return parse_format_specs(ctx.begin(), ctx.end(), specs_, ctx,
+                              detail::type::string_type);
   }
 
   template <typename FormatContext>
@@ -3873,7 +4155,9 @@ template <> struct formatter<bytes> {
 };
 
 // group_digits_view is not derived from view because it copies the argument.
-template <typename T> struct group_digits_view { T value; };
+template <typename T> struct group_digits_view {
+  T value;
+};
 
 /**
   \rst
@@ -3892,17 +4176,13 @@ template <typename T> auto group_digits(T value) -> group_digits_view<T> {
 
 template <typename T> struct formatter<group_digits_view<T>> : formatter<T> {
  private:
-  detail::dynamic_format_specs<char> specs_;
+  detail::dynamic_format_specs<> specs_;
 
  public:
   template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
-    using handler_type = detail::dynamic_specs_handler<ParseContext>;
-    detail::specs_checker<handler_type> handler(handler_type(specs_, ctx),
-                                                detail::type::int_type);
-    auto it = parse_format_specs(ctx.begin(), ctx.end(), handler);
-    detail::check_string_type_spec(specs_.type, ctx.error_handler());
-    return it;
+  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> const char* {
+    return parse_format_specs(ctx.begin(), ctx.end(), specs_, ctx,
+                              detail::type::int_type);
   }
 
   template <typename FormatContext>
@@ -3912,12 +4192,13 @@ template <typename T> struct formatter<group_digits_view<T>> : formatter<T> {
                                                        specs_.width_ref, ctx);
     detail::handle_dynamic_spec<detail::precision_checker>(
         specs_.precision, specs_.precision_ref, ctx);
-    return detail::write_int_localized(
+    return detail::write_int(
         ctx.out(), static_cast<detail::uint64_or_128_t<T>>(t.value), 0, specs_,
-        detail::digit_grouping<char>({"\3", ','}));
+        detail::digit_grouping<char>("\3", ","));
   }
 };
 
+// DEPRECATED! join_view will be moved to ranges.h.
 template <typename It, typename Sentinel, typename Char = char>
 struct join_view : detail::view {
   It begin;
@@ -3937,30 +4218,11 @@ struct formatter<join_view<It, Sentinel, Char>, Char> {
 #else
       typename std::iterator_traits<It>::value_type;
 #endif
-  using context = buffer_context<Char>;
-  using mapper = detail::arg_mapper<context>;
-
-  template <typename T, FMT_ENABLE_IF(has_formatter<T, context>::value)>
-  static auto map(const T& value) -> const T& {
-    return value;
-  }
-  template <typename T, FMT_ENABLE_IF(!has_formatter<T, context>::value)>
-  static auto map(const T& value) -> decltype(mapper().map(value)) {
-    return mapper().map(value);
-  }
-
-  using formatter_type =
-      conditional_t<is_formattable<value_type, Char>::value,
-                    formatter<remove_cvref_t<decltype(map(
-                                  std::declval<const value_type&>()))>,
-                              Char>,
-                    detail::fallback_formatter<value_type, Char>>;
-
-  formatter_type value_formatter_;
+  formatter<remove_cvref_t<value_type>, Char> value_formatter_;
 
  public:
   template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
+  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> const Char* {
     return value_formatter_.parse(ctx);
   }
 
@@ -3970,12 +4232,12 @@ struct formatter<join_view<It, Sentinel, Char>, Char> {
     auto it = value.begin;
     auto out = ctx.out();
     if (it != value.end) {
-      out = value_formatter_.format(map(*it), ctx);
+      out = value_formatter_.format(*it, ctx);
       ++it;
       while (it != value.end) {
         out = detail::copy_str<Char>(value.sep.begin(), value.sep.end(), out);
         ctx.advance_to(out);
-        out = value_formatter_.format(map(*it), ctx);
+        out = value_formatter_.format(*it, ctx);
         ++it;
       }
     }
@@ -4027,9 +4289,9 @@ auto join(Range&& range, string_view sep)
  */
 template <typename T, FMT_ENABLE_IF(!std::is_integral<T>::value)>
 inline auto to_string(const T& value) -> std::string {
-  auto result = std::string();
-  detail::write<char>(std::back_inserter(result), value);
-  return result;
+  auto buffer = memory_buffer();
+  detail::write<char>(appender(buffer), value);
+  return {buffer.data(), buffer.size()};
 }
 
 template <typename T, FMT_ENABLE_IF(std::is_integral<T>::value)>
@@ -4050,27 +4312,11 @@ FMT_NODISCARD auto to_string(const basic_memory_buffer<Char, SIZE>& buf)
   return std::basic_string<Char>(buf.data(), size);
 }
 
-FMT_BEGIN_DETAIL_NAMESPACE
+namespace detail {
 
 template <typename Char>
-void vformat_to(
-    buffer<Char>& buf, basic_string_view<Char> fmt,
-    basic_format_args<FMT_BUFFER_CONTEXT(type_identity_t<Char>)> args,
-    locale_ref loc) {
-  // workaround for msvc bug regarding name-lookup in module
-  // link names into function scope
-  using detail::arg_formatter;
-  using detail::buffer_appender;
-  using detail::custom_formatter;
-  using detail::default_arg_formatter;
-  using detail::get_arg;
-  using detail::locale_ref;
-  using detail::parse_format_specs;
-  using detail::specs_checker;
-  using detail::specs_handler;
-  using detail::to_unsigned;
-  using detail::type;
-  using detail::write;
+void vformat_to(buffer<Char>& buf, basic_string_view<Char> fmt,
+                typename vformat_args<Char>::type args, locale_ref loc) {
   auto out = buffer_appender<Char>(buf);
   if (fmt.size() == 2 && equal2(fmt.data(), "{}")) {
     auto arg = args.get(0);
@@ -4117,15 +4363,16 @@ void vformat_to(
         -> const Char* {
       auto arg = get_arg(context, id);
       if (arg.type() == type::custom_type) {
-        parse_context.advance_to(parse_context.begin() +
-                                 (begin - &*parse_context.begin()));
+        parse_context.advance_to(begin);
         visit_format_arg(custom_formatter<Char>{parse_context, context}, arg);
         return parse_context.begin();
       }
-      auto specs = basic_format_specs<Char>();
-      specs_checker<specs_handler<Char>> handler(
-          specs_handler<Char>(specs, parse_context, context), arg.type());
-      begin = parse_format_specs(begin, end, handler);
+      auto specs = detail::dynamic_format_specs<Char>();
+      begin = parse_format_specs(begin, end, specs, parse_context, arg.type());
+      detail::handle_dynamic_spec<detail::width_checker>(
+          specs.width, specs.width_ref, context);
+      detail::handle_dynamic_spec<detail::precision_checker>(
+          specs.precision, specs.precision_ref, context);
       if (begin == end || *begin != '}')
         on_error("missing '}' in format string");
       auto f = arg_formatter<Char>{context.out(), specs, context.locale()};
@@ -4137,6 +4384,9 @@ void vformat_to(
 }
 
 #ifndef FMT_HEADER_ONLY
+extern template FMT_API void vformat_to(buffer<char>&, string_view,
+                                        typename vformat_args<>::type,
+                                        locale_ref);
 extern template FMT_API auto thousands_sep_impl<char>(locale_ref)
     -> thousands_sep_result<char>;
 extern template FMT_API auto thousands_sep_impl<wchar_t>(locale_ref)
@@ -4145,7 +4395,7 @@ extern template FMT_API auto decimal_point_impl(locale_ref) -> char;
 extern template FMT_API auto decimal_point_impl(locale_ref) -> wchar_t;
 #endif  // FMT_HEADER_ONLY
 
-FMT_END_DETAIL_NAMESPACE
+}  // namespace detail
 
 #if FMT_USE_USER_DEFINED_LITERALS
 inline namespace literals {
@@ -4182,7 +4432,7 @@ template <typename Locale, typename... T,
           FMT_ENABLE_IF(detail::is_locale<Locale>::value)>
 inline auto format(const Locale& loc, format_string<T...> fmt, T&&... args)
     -> std::string {
-  return vformat(loc, string_view(fmt), fmt::make_format_args(args...));
+  return fmt::vformat(loc, string_view(fmt), fmt::make_format_args(args...));
 }
 
 template <typename OutputIt, typename Locale,
@@ -4193,7 +4443,7 @@ auto vformat_to(OutputIt out, const Locale& loc, string_view fmt,
   using detail::get_buffer;
   auto&& buf = get_buffer<char>(out);
   detail::vformat_to(buf, fmt, args, detail::locale_ref(loc));
-  return detail::get_iterator(buf);
+  return detail::get_iterator(buf, out);
 }
 
 template <typename OutputIt, typename Locale, typename... T,
@@ -4204,7 +4454,39 @@ FMT_INLINE auto format_to(OutputIt out, const Locale& loc,
   return vformat_to(out, loc, fmt, fmt::make_format_args(args...));
 }
 
-FMT_MODULE_EXPORT_END
+template <typename Locale, typename... T,
+          FMT_ENABLE_IF(detail::is_locale<Locale>::value)>
+FMT_NODISCARD FMT_INLINE auto formatted_size(const Locale& loc,
+                                             format_string<T...> fmt,
+                                             T&&... args) -> size_t {
+  auto buf = detail::counting_buffer<>();
+  detail::vformat_to<char>(buf, fmt, fmt::make_format_args(args...),
+                           detail::locale_ref(loc));
+  return buf.count();
+}
+
+FMT_END_EXPORT
+
+template <typename T, typename Char>
+template <typename FormatContext>
+FMT_CONSTEXPR FMT_INLINE auto
+formatter<T, Char,
+          enable_if_t<detail::type_constant<T, Char>::value !=
+                      detail::type::custom_type>>::format(const T& val,
+                                                          FormatContext& ctx)
+    const -> decltype(ctx.out()) {
+  if (specs_.width_ref.kind != detail::arg_id_kind::none ||
+      specs_.precision_ref.kind != detail::arg_id_kind::none) {
+    auto specs = specs_;
+    detail::handle_dynamic_spec<detail::width_checker>(specs.width,
+                                                       specs.width_ref, ctx);
+    detail::handle_dynamic_spec<detail::precision_checker>(
+        specs.precision, specs.precision_ref, ctx);
+    return detail::write<Char>(ctx.out(), val, specs, ctx.locale());
+  }
+  return detail::write<Char>(ctx.out(), val, specs_, ctx.locale());
+}
+
 FMT_END_NAMESPACE
 
 #ifdef FMT_HEADER_ONLY
diff --git a/contrib/fmt/include/fmt/locale.h b/contrib/fmt/include/fmt/locale.h
deleted file mode 100644
index 7571b5261..000000000
--- a/contrib/fmt/include/fmt/locale.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "xchar.h"
-#warning fmt/locale.h is deprecated, include fmt/format.h or fmt/xchar.h instead
diff --git a/contrib/fmt/include/fmt/os.h b/contrib/fmt/include/fmt/os.h
index d82be1125..2126424d3 100644
--- a/contrib/fmt/include/fmt/os.h
+++ b/contrib/fmt/include/fmt/os.h
@@ -71,7 +71,7 @@
 #define FMT_RETRY(result, expression) FMT_RETRY_VAL(result, expression, -1)
 
 FMT_BEGIN_NAMESPACE
-FMT_MODULE_EXPORT_BEGIN
+FMT_BEGIN_EXPORT
 
 /**
   \rst
@@ -120,51 +120,13 @@ template <typename Char> class basic_cstring_view {
 using cstring_view = basic_cstring_view<char>;
 using wcstring_view = basic_cstring_view<wchar_t>;
 
-template <typename Char> struct formatter<std::error_code, Char> {
-  template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
-    return ctx.begin();
-  }
-
-  template <typename FormatContext>
-  FMT_CONSTEXPR auto format(const std::error_code& ec, FormatContext& ctx) const
-      -> decltype(ctx.out()) {
-    auto out = ctx.out();
-    out = detail::write_bytes(out, ec.category().name(),
-                              basic_format_specs<Char>());
-    out = detail::write<Char>(out, Char(':'));
-    out = detail::write<Char>(out, ec.value());
-    return out;
-  }
-};
-
 #ifdef _WIN32
 FMT_API const std::error_category& system_category() noexcept;
 
-FMT_BEGIN_DETAIL_NAMESPACE
-// A converter from UTF-16 to UTF-8.
-// It is only provided for Windows since other systems support UTF-8 natively.
-class utf16_to_utf8 {
- private:
-  memory_buffer buffer_;
-
- public:
-  utf16_to_utf8() {}
-  FMT_API explicit utf16_to_utf8(basic_string_view<wchar_t> s);
-  operator string_view() const { return string_view(&buffer_[0], size()); }
-  size_t size() const { return buffer_.size() - 1; }
-  const char* c_str() const { return &buffer_[0]; }
-  std::string str() const { return std::string(&buffer_[0], size()); }
-
-  // Performs conversion returning a system error code instead of
-  // throwing exception on conversion error. This method may still throw
-  // in case of memory allocation error.
-  FMT_API int convert(basic_string_view<wchar_t> s);
-};
-
+namespace detail {
 FMT_API void format_windows_error(buffer<char>& out, int error_code,
                                   const char* message) noexcept;
-FMT_END_DETAIL_NAMESPACE
+}
 
 FMT_API std::system_error vwindows_error(int error_code, string_view format_str,
                                          format_args args);
@@ -355,12 +317,18 @@ class FMT_API file {
   // Creates a buffered_file object associated with this file and detaches
   // this file object from the file.
   buffered_file fdopen(const char* mode);
+
+#  if defined(_WIN32) && !defined(__MINGW32__)
+  // Opens a file and constructs a file object representing this file by
+  // wcstring_view filename. Windows only.
+  static file open_windows_file(wcstring_view path, int oflag);
+#  endif
 };
 
 // Returns the memory page size.
 long getpagesize();
 
-FMT_BEGIN_DETAIL_NAMESPACE
+namespace detail {
 
 struct buffer_size {
   buffer_size() = default;
@@ -397,56 +365,61 @@ struct ostream_params {
 #  endif
 };
 
-FMT_END_DETAIL_NAMESPACE
+class file_buffer final : public buffer<char> {
+  file file_;
+
+  FMT_API void grow(size_t) override;
+
+ public:
+  FMT_API file_buffer(cstring_view path, const ostream_params& params);
+  FMT_API file_buffer(file_buffer&& other);
+  FMT_API ~file_buffer();
+
+  void flush() {
+    if (size() == 0) return;
+    file_.write(data(), size() * sizeof(data()[0]));
+    clear();
+  }
+
+  void close() {
+    flush();
+    file_.close();
+  }
+};
+
+}  // namespace detail
 
 // Added {} below to work around default constructor error known to
 // occur in Xcode versions 7.2.1 and 8.2.1.
 constexpr detail::buffer_size buffer_size{};
 
 /** A fast output stream which is not thread-safe. */
-class FMT_API ostream final : private detail::buffer<char> {
+class FMT_API ostream {
  private:
-  file file_;
-
-  void grow(size_t) override;
+  FMT_MSC_WARNING(suppress : 4251)
+  detail::file_buffer buffer_;
 
   ostream(cstring_view path, const detail::ostream_params& params)
-      : file_(path, params.oflag) {
-    set(new char[params.buffer_size], params.buffer_size);
-  }
+      : buffer_(path, params) {}
 
  public:
-  ostream(ostream&& other)
-      : detail::buffer<char>(other.data(), other.size(), other.capacity()),
-        file_(std::move(other.file_)) {
-    other.clear();
-    other.set(nullptr, 0);
-  }
-  ~ostream() {
-    flush();
-    delete[] data();
-  }
+  ostream(ostream&& other) : buffer_(std::move(other.buffer_)) {}
 
-  void flush() {
-    if (size() == 0) return;
-    file_.write(data(), size());
-    clear();
-  }
+  ~ostream();
+
+  void flush() { buffer_.flush(); }
 
   template <typename... T>
   friend ostream output_file(cstring_view path, T... params);
 
-  void close() {
-    flush();
-    file_.close();
-  }
+  void close() { buffer_.close(); }
 
   /**
     Formats ``args`` according to specifications in ``fmt`` and writes the
     output to the file.
    */
   template <typename... T> void print(format_string<T...> fmt, T&&... args) {
-    vformat_to(detail::buffer_appender<char>(*this), fmt,
+    vformat_to(detail::buffer_appender<char>(buffer_), fmt,
                fmt::make_format_args(args...));
   }
 };
@@ -472,7 +445,7 @@ inline ostream output_file(cstring_view path, T... params) {
 }
 #endif  // FMT_USE_FCNTL
 
-FMT_MODULE_EXPORT_END
+FMT_END_EXPORT
 FMT_END_NAMESPACE
 
 #endif  // FMT_OS_H_
diff --git a/contrib/fmt/include/fmt/ostream.h b/contrib/fmt/include/fmt/ostream.h
index c3cdd4a61..a112fe7ba 100644
--- a/contrib/fmt/include/fmt/ostream.h
+++ b/contrib/fmt/include/fmt/ostream.h
@@ -8,8 +8,8 @@
 #ifndef FMT_OSTREAM_H_
 #define FMT_OSTREAM_H_
 
-#include <fstream>
-#include <ostream>
+#include <fstream>  // std::filebuf
+
 #if defined(_WIN32) && defined(__GLIBCXX__)
 #  include <ext/stdio_filebuf.h>
 #  include <ext/stdio_sync_filebuf.h>
@@ -21,48 +21,14 @@
 
 FMT_BEGIN_NAMESPACE
 
-template <typename OutputIt, typename Char> class basic_printf_context;
-
 namespace detail {
 
-// Checks if T has a user-defined operator<<.
-template <typename T, typename Char, typename Enable = void>
-class is_streamable {
- private:
-  template <typename U>
-  static auto test(int)
-      -> bool_constant<sizeof(std::declval<std::basic_ostream<Char>&>()
-                              << std::declval<U>()) != 0>;
-
-  template <typename> static auto test(...) -> std::false_type;
-
-  using result = decltype(test<T>(0));
-
- public:
-  is_streamable() = default;
-
-  static const bool value = result::value;
-};
-
-// Formatting of built-in types and arrays is intentionally disabled because
-// it's handled by standard (non-ostream) formatters.
-template <typename T, typename Char>
-struct is_streamable<
-    T, Char,
-    enable_if_t<
-        std::is_arithmetic<T>::value || std::is_array<T>::value ||
-        std::is_pointer<T>::value || std::is_same<T, char8_type>::value ||
-        std::is_convertible<T, fmt::basic_string_view<Char>>::value ||
-        std::is_same<T, std_string_view<Char>>::value ||
-        (std::is_convertible<T, int>::value && !std::is_enum<T>::value)>>
-    : std::false_type {};
-
 // Generate a unique explicit instantion in every translation unit using a tag
 // type in an anonymous namespace.
 namespace {
 struct file_access_tag {};
 }  // namespace
-template <class Tag, class BufType, FILE* BufType::*FileMemberPtr>
+template <typename Tag, typename BufType, FILE* BufType::*FileMemberPtr>
 class file_access {
   friend auto get_file(BufType& obj) -> FILE* { return obj.*FileMemberPtr; }
 };
@@ -84,8 +50,8 @@ inline bool write_ostream_unicode(std::ostream& os, fmt::string_view data) {
 #elif defined(_WIN32) && defined(__GLIBCXX__)
   auto* rdbuf = os.rdbuf();
   FILE* c_file;
-  if (auto* fbuf = dynamic_cast<__gnu_cxx::stdio_sync_filebuf<char>*>(rdbuf))
-    c_file = fbuf->file();
+  if (auto* sfbuf = dynamic_cast<__gnu_cxx::stdio_sync_filebuf<char>*>(rdbuf))
+    c_file = sfbuf->file();
   else if (auto* fbuf = dynamic_cast<__gnu_cxx::stdio_filebuf<char>*>(rdbuf))
     c_file = fbuf->file();
   else
@@ -145,7 +111,7 @@ struct basic_ostream_formatter : formatter<basic_string_view<Char>, Char> {
   auto format(const T& value, basic_format_context<OutputIt, Char>& ctx) const
       -> OutputIt {
     auto buffer = basic_memory_buffer<Char>();
-    format_value(buffer, value, ctx.locale());
+    detail::format_value(buffer, value, ctx.locale());
     return formatter<basic_string_view<Char>, Char>::format(
         {buffer.data(), buffer.size()}, ctx);
   }
@@ -180,13 +146,6 @@ auto streamed(const T& value) -> detail::streamed_view<T> {
 
 namespace detail {
 
-// Formats an object of type T that has an overloaded ostream operator<<.
-template <typename T, typename Char>
-struct fallback_formatter<T, Char, enable_if_t<is_streamable<T, Char>::value>>
-    : basic_ostream_formatter<Char> {
-  using basic_ostream_formatter<Char>::format;
-};
-
 inline void vprint_directly(std::ostream& os, string_view format_str,
                             format_args args) {
   auto buffer = memory_buffer();
@@ -196,7 +155,7 @@ inline void vprint_directly(std::ostream& os, string_view format_str,
 
 }  // namespace detail
 
-FMT_MODULE_EXPORT template <typename Char>
+FMT_EXPORT template <typename Char>
 void vprint(std::basic_ostream<Char>& os,
             basic_string_view<type_identity_t<Char>> format_str,
             basic_format_args<buffer_context<type_identity_t<Char>>> args) {
@@ -215,7 +174,7 @@ void vprint(std::basic_ostream<Char>& os,
     fmt::print(cerr, "Don't {}!", "panic");
   \endrst
  */
-FMT_MODULE_EXPORT template <typename... T>
+FMT_EXPORT template <typename... T>
 void print(std::ostream& os, format_string<T...> fmt, T&&... args) {
   const auto& vargs = fmt::make_format_args(args...);
   if (detail::is_utf8())
@@ -224,7 +183,7 @@ void print(std::ostream& os, format_string<T...> fmt, T&&... args) {
     detail::vprint_directly(os, fmt, vargs);
 }
 
-FMT_MODULE_EXPORT
+FMT_EXPORT
 template <typename... Args>
 void print(std::wostream& os,
            basic_format_string<wchar_t, type_identity_t<Args>...> fmt,
@@ -232,6 +191,19 @@ void print(std::wostream& os,
   vprint(os, fmt, fmt::make_format_args<buffer_context<wchar_t>>(args...));
 }
 
+FMT_EXPORT template <typename... T>
+void println(std::ostream& os, format_string<T...> fmt, T&&... args) {
+  fmt::print(os, "{}\n", fmt::format(fmt, std::forward<T>(args)...));
+}
+
+FMT_EXPORT
+template <typename... Args>
+void println(std::wostream& os,
+             basic_format_string<wchar_t, type_identity_t<Args>...> fmt,
+             Args&&... args) {
+  print(os, L"{}\n", fmt::format(fmt, std::forward<Args>(args)...));
+}
+
 FMT_END_NAMESPACE
 
 #endif  // FMT_OSTREAM_H_
diff --git a/contrib/fmt/include/fmt/posix.h b/contrib/fmt/include/fmt/posix.h
deleted file mode 100644
index da19e9d53..000000000
--- a/contrib/fmt/include/fmt/posix.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "os.h"
-#warning "fmt/posix.h is deprecated; use fmt/os.h instead"
diff --git a/contrib/fmt/include/fmt/printf.h b/contrib/fmt/include/fmt/printf.h
index 70a592dc2..adef6adf8 100644
--- a/contrib/fmt/include/fmt/printf.h
+++ b/contrib/fmt/include/fmt/printf.h
@@ -14,24 +14,18 @@
 #include "format.h"
 
 FMT_BEGIN_NAMESPACE
-FMT_MODULE_EXPORT_BEGIN
+FMT_BEGIN_EXPORT
 
 template <typename T> struct printf_formatter { printf_formatter() = delete; };
 
-template <typename Char>
-class basic_printf_parse_context : public basic_format_parse_context<Char> {
-  using basic_format_parse_context<Char>::basic_format_parse_context;
-};
-
-template <typename OutputIt, typename Char> class basic_printf_context {
+template <typename Char> class basic_printf_context {
  private:
-  OutputIt out_;
+  detail::buffer_appender<Char> out_;
   basic_format_args<basic_printf_context> args_;
 
  public:
   using char_type = Char;
-  using format_arg = basic_format_arg<basic_printf_context>;
-  using parse_context_type = basic_printf_parse_context<Char>;
+  using parse_context_type = basic_format_parse_context<Char>;
   template <typename T> using formatter_type = printf_formatter<T>;
 
   /**
@@ -40,68 +34,68 @@ template <typename OutputIt, typename Char> class basic_printf_context {
     stored in the context object so make sure they have appropriate lifetimes.
     \endrst
    */
-  basic_printf_context(OutputIt out,
+  basic_printf_context(detail::buffer_appender<Char> out,
                        basic_format_args<basic_printf_context> args)
       : out_(out), args_(args) {}
 
-  OutputIt out() { return out_; }
-  void advance_to(OutputIt it) { out_ = it; }
+  auto out() -> detail::buffer_appender<Char> { return out_; }
+  void advance_to(detail::buffer_appender<Char>) {}
 
-  detail::locale_ref locale() { return {}; }
+  auto locale() -> detail::locale_ref { return {}; }
 
-  format_arg arg(int id) const { return args_.get(id); }
+  auto arg(int id) const -> basic_format_arg<basic_printf_context> {
+    return args_.get(id);
+  }
 
   FMT_CONSTEXPR void on_error(const char* message) {
     detail::error_handler().on_error(message);
   }
 };
 
-FMT_BEGIN_DETAIL_NAMESPACE
+namespace detail {
 
 // Checks if a value fits in int - used to avoid warnings about comparing
 // signed and unsigned integers.
 template <bool IsSigned> struct int_checker {
-  template <typename T> static bool fits_in_int(T value) {
+  template <typename T> static auto fits_in_int(T value) -> bool {
     unsigned max = max_value<int>();
     return value <= max;
   }
-  static bool fits_in_int(bool) { return true; }
+  static auto fits_in_int(bool) -> bool { return true; }
 };
 
 template <> struct int_checker<true> {
-  template <typename T> static bool fits_in_int(T value) {
+  template <typename T> static auto fits_in_int(T value) -> bool {
     return value >= (std::numeric_limits<int>::min)() &&
            value <= max_value<int>();
   }
-  static bool fits_in_int(int) { return true; }
+  static auto fits_in_int(int) -> bool { return true; }
 };
 
-class printf_precision_handler {
- public:
+struct printf_precision_handler {
   template <typename T, FMT_ENABLE_IF(std::is_integral<T>::value)>
-  int operator()(T value) {
+  auto operator()(T value) -> int {
     if (!int_checker<std::numeric_limits<T>::is_signed>::fits_in_int(value))
-      FMT_THROW(format_error("number is too big"));
+      throw_format_error("number is too big");
     return (std::max)(static_cast<int>(value), 0);
   }
 
   template <typename T, FMT_ENABLE_IF(!std::is_integral<T>::value)>
-  int operator()(T) {
-    FMT_THROW(format_error("precision is not integer"));
+  auto operator()(T) -> int {
+    throw_format_error("precision is not integer");
     return 0;
   }
 };
 
 // An argument visitor that returns true iff arg is a zero integer.
-class is_zero_int {
- public:
+struct is_zero_int {
   template <typename T, FMT_ENABLE_IF(std::is_integral<T>::value)>
-  bool operator()(T value) {
+  auto operator()(T value) -> bool {
     return value == 0;
   }
 
   template <typename T, FMT_ENABLE_IF(!std::is_integral<T>::value)>
-  bool operator()(T) {
+  auto operator()(T) -> bool {
     return false;
   }
 };
@@ -132,22 +126,23 @@ template <typename T, typename Context> class arg_converter {
     if (const_check(sizeof(target_type) <= sizeof(int))) {
       // Extra casts are used to silence warnings.
       if (is_signed) {
-        arg_ = detail::make_arg<Context>(
-            static_cast<int>(static_cast<target_type>(value)));
+        auto n = static_cast<int>(static_cast<target_type>(value));
+        arg_ = detail::make_arg<Context>(n);
       } else {
         using unsigned_type = typename make_unsigned_or_bool<target_type>::type;
-        arg_ = detail::make_arg<Context>(
-            static_cast<unsigned>(static_cast<unsigned_type>(value)));
+        auto n = static_cast<unsigned>(static_cast<unsigned_type>(value));
+        arg_ = detail::make_arg<Context>(n);
       }
     } else {
       if (is_signed) {
         // glibc's printf doesn't sign extend arguments of smaller types:
         //   std::printf("%lld", -42);  // prints "4294967254"
         // but we don't have to do the same because it's a UB.
-        arg_ = detail::make_arg<Context>(static_cast<long long>(value));
+        auto n = static_cast<long long>(value);
+        arg_ = detail::make_arg<Context>(n);
       } else {
-        arg_ = detail::make_arg<Context>(
-            static_cast<typename make_unsigned_or_bool<U>::type>(value));
+        auto n = static_cast<typename make_unsigned_or_bool<U>::type>(value);
+        arg_ = detail::make_arg<Context>(n);
       }
     }
   }
@@ -175,8 +170,8 @@ template <typename Context> class char_converter {
 
   template <typename T, FMT_ENABLE_IF(std::is_integral<T>::value)>
   void operator()(T value) {
-    arg_ = detail::make_arg<Context>(
-        static_cast<typename Context::char_type>(value));
+    auto c = static_cast<typename Context::char_type>(value);
+    arg_ = detail::make_arg<Context>(c);
   }
 
   template <typename T, FMT_ENABLE_IF(!std::is_integral<T>::value)>
@@ -186,122 +181,131 @@ template <typename Context> class char_converter {
 // An argument visitor that return a pointer to a C string if argument is a
 // string or null otherwise.
 template <typename Char> struct get_cstring {
-  template <typename T> const Char* operator()(T) { return nullptr; }
-  const Char* operator()(const Char* s) { return s; }
+  template <typename T> auto operator()(T) -> const Char* { return nullptr; }
+  auto operator()(const Char* s) -> const Char* { return s; }
 };
 
 // Checks if an argument is a valid printf width specifier and sets
 // left alignment if it is negative.
 template <typename Char> class printf_width_handler {
  private:
-  using format_specs = basic_format_specs<Char>;
-
-  format_specs& specs_;
+  format_specs<Char>& specs_;
 
  public:
-  explicit printf_width_handler(format_specs& specs) : specs_(specs) {}
+  explicit printf_width_handler(format_specs<Char>& specs) : specs_(specs) {}
 
   template <typename T, FMT_ENABLE_IF(std::is_integral<T>::value)>
-  unsigned operator()(T value) {
+  auto operator()(T value) -> unsigned {
     auto width = static_cast<uint32_or_64_or_128_t<T>>(value);
     if (detail::is_negative(value)) {
       specs_.align = align::left;
       width = 0 - width;
     }
     unsigned int_max = max_value<int>();
-    if (width > int_max) FMT_THROW(format_error("number is too big"));
+    if (width > int_max) throw_format_error("number is too big");
     return static_cast<unsigned>(width);
   }
 
   template <typename T, FMT_ENABLE_IF(!std::is_integral<T>::value)>
-  unsigned operator()(T) {
-    FMT_THROW(format_error("width is not integer"));
+  auto operator()(T) -> unsigned {
+    throw_format_error("width is not integer");
     return 0;
   }
 };
 
+// Workaround for a bug with the XL compiler when initializing
+// printf_arg_formatter's base class.
+template <typename Char>
+auto make_arg_formatter(buffer_appender<Char> iter, format_specs<Char>& s)
+    -> arg_formatter<Char> {
+  return {iter, s, locale_ref()};
+}
+
 // The ``printf`` argument formatter.
-template <typename OutputIt, typename Char>
+template <typename Char>
 class printf_arg_formatter : public arg_formatter<Char> {
  private:
   using base = arg_formatter<Char>;
-  using context_type = basic_printf_context<OutputIt, Char>;
-  using format_specs = basic_format_specs<Char>;
+  using context_type = basic_printf_context<Char>;
 
   context_type& context_;
 
-  OutputIt write_null_pointer(bool is_string = false) {
+  void write_null_pointer(bool is_string = false) {
     auto s = this->specs;
     s.type = presentation_type::none;
-    return write_bytes(this->out, is_string ? "(null)" : "(nil)", s);
+    write_bytes(this->out, is_string ? "(null)" : "(nil)", s);
   }
 
  public:
-  printf_arg_formatter(OutputIt iter, format_specs& s, context_type& ctx)
-      : base{iter, s, locale_ref()}, context_(ctx) {}
+  printf_arg_formatter(buffer_appender<Char> iter, format_specs<Char>& s,
+                       context_type& ctx)
+      : base(make_arg_formatter(iter, s)), context_(ctx) {}
 
-  OutputIt operator()(monostate value) { return base::operator()(value); }
+  void operator()(monostate value) { base::operator()(value); }
 
   template <typename T, FMT_ENABLE_IF(detail::is_integral<T>::value)>
-  OutputIt operator()(T value) {
+  void operator()(T value) {
     // MSVC2013 fails to compile separate overloads for bool and Char so use
     // std::is_same instead.
-    if (std::is_same<T, Char>::value) {
-      format_specs fmt_specs = this->specs;
-      if (fmt_specs.type != presentation_type::none &&
-          fmt_specs.type != presentation_type::chr) {
-        return (*this)(static_cast<int>(value));
-      }
-      fmt_specs.sign = sign::none;
-      fmt_specs.alt = false;
-      fmt_specs.fill[0] = ' ';  // Ignore '0' flag for char types.
-      // align::numeric needs to be overwritten here since the '0' flag is
-      // ignored for non-numeric types
-      if (fmt_specs.align == align::none || fmt_specs.align == align::numeric)
-        fmt_specs.align = align::right;
-      return write<Char>(this->out, static_cast<Char>(value), fmt_specs);
+    if (!std::is_same<T, Char>::value) {
+      base::operator()(value);
+      return;
+    }
+    format_specs<Char> fmt_specs = this->specs;
+    if (fmt_specs.type != presentation_type::none &&
+        fmt_specs.type != presentation_type::chr) {
+      return (*this)(static_cast<int>(value));
     }
-    return base::operator()(value);
+    fmt_specs.sign = sign::none;
+    fmt_specs.alt = false;
+    fmt_specs.fill[0] = ' ';  // Ignore '0' flag for char types.
+    // align::numeric needs to be overwritten here since the '0' flag is
+    // ignored for non-numeric types
+    if (fmt_specs.align == align::none || fmt_specs.align == align::numeric)
+      fmt_specs.align = align::right;
+    write<Char>(this->out, static_cast<Char>(value), fmt_specs);
   }
 
   template <typename T, FMT_ENABLE_IF(std::is_floating_point<T>::value)>
-  OutputIt operator()(T value) {
-    return base::operator()(value);
+  void operator()(T value) {
+    base::operator()(value);
   }
 
   /** Formats a null-terminated C string. */
-  OutputIt operator()(const char* value) {
-    if (value) return base::operator()(value);
-    return write_null_pointer(this->specs.type != presentation_type::pointer);
+  void operator()(const char* value) {
+    if (value)
+      base::operator()(value);
+    else
+      write_null_pointer(this->specs.type != presentation_type::pointer);
   }
 
   /** Formats a null-terminated wide C string. */
-  OutputIt operator()(const wchar_t* value) {
-    if (value) return base::operator()(value);
-    return write_null_pointer(this->specs.type != presentation_type::pointer);
+  void operator()(const wchar_t* value) {
+    if (value)
+      base::operator()(value);
+    else
+      write_null_pointer(this->specs.type != presentation_type::pointer);
   }
 
-  OutputIt operator()(basic_string_view<Char> value) {
-    return base::operator()(value);
-  }
+  void operator()(basic_string_view<Char> value) { base::operator()(value); }
 
   /** Formats a pointer. */
-  OutputIt operator()(const void* value) {
-    return value ? base::operator()(value) : write_null_pointer();
+  void operator()(const void* value) {
+    if (value)
+      base::operator()(value);
+    else
+      write_null_pointer();
   }
 
   /** Formats an argument of a custom (user-defined) type. */
-  OutputIt operator()(typename basic_format_arg<context_type>::handle handle) {
-    auto parse_ctx =
-        basic_printf_parse_context<Char>(basic_string_view<Char>());
+  void operator()(typename basic_format_arg<context_type>::handle handle) {
+    auto parse_ctx = basic_format_parse_context<Char>({});
     handle.format(parse_ctx, context_);
-    return this->out;
   }
 };
 
 template <typename Char>
-void parse_flags(basic_format_specs<Char>& specs, const Char*& it,
-                 const Char* end) {
+void parse_flags(format_specs<Char>& specs, const Char*& it, const Char* end) {
   for (; it != end; ++it) {
     switch (*it) {
     case '-':
@@ -314,9 +318,7 @@ void parse_flags(basic_format_specs<Char>& specs, const Char*& it,
       specs.fill[0] = '0';
       break;
     case ' ':
-      if (specs.sign != sign::plus) {
-        specs.sign = sign::space;
-      }
+      if (specs.sign != sign::plus) specs.sign = sign::space;
       break;
     case '#':
       specs.alt = true;
@@ -328,8 +330,8 @@ void parse_flags(basic_format_specs<Char>& specs, const Char*& it,
 }
 
 template <typename Char, typename GetArg>
-int parse_header(const Char*& it, const Char* end,
-                 basic_format_specs<Char>& specs, GetArg get_arg) {
+auto parse_header(const Char*& it, const Char* end, format_specs<Char>& specs,
+                  GetArg get_arg) -> int {
   int arg_index = -1;
   Char c = *it;
   if (c >= '0' && c <= '9') {
@@ -344,7 +346,7 @@ int parse_header(const Char*& it, const Char* end,
       if (value != 0) {
         // Nonzero value means that we parsed width and don't need to
         // parse it or flags again, so return now.
-        if (value == -1) FMT_THROW(format_error("number is too big"));
+        if (value == -1) throw_format_error("number is too big");
         specs.width = value;
         return arg_index;
       }
@@ -355,7 +357,7 @@ int parse_header(const Char*& it, const Char* end,
   if (it != end) {
     if (*it >= '0' && *it <= '9') {
       specs.width = parse_nonnegative_int(it, end, -1);
-      if (specs.width == -1) FMT_THROW(format_error("number is too big"));
+      if (specs.width == -1) throw_format_error("number is too big");
     } else if (*it == '*') {
       ++it;
       specs.width = static_cast<int>(visit_format_arg(
@@ -365,13 +367,53 @@ int parse_header(const Char*& it, const Char* end,
   return arg_index;
 }
 
+inline auto parse_printf_presentation_type(char c, type t)
+    -> presentation_type {
+  using pt = presentation_type;
+  constexpr auto integral_set = sint_set | uint_set | bool_set | char_set;
+  switch (c) {
+  case 'd':
+    return in(t, integral_set) ? pt::dec : pt::none;
+  case 'o':
+    return in(t, integral_set) ? pt::oct : pt::none;
+  case 'x':
+    return in(t, integral_set) ? pt::hex_lower : pt::none;
+  case 'X':
+    return in(t, integral_set) ? pt::hex_upper : pt::none;
+  case 'a':
+    return in(t, float_set) ? pt::hexfloat_lower : pt::none;
+  case 'A':
+    return in(t, float_set) ? pt::hexfloat_upper : pt::none;
+  case 'e':
+    return in(t, float_set) ? pt::exp_lower : pt::none;
+  case 'E':
+    return in(t, float_set) ? pt::exp_upper : pt::none;
+  case 'f':
+    return in(t, float_set) ? pt::fixed_lower : pt::none;
+  case 'F':
+    return in(t, float_set) ? pt::fixed_upper : pt::none;
+  case 'g':
+    return in(t, float_set) ? pt::general_lower : pt::none;
+  case 'G':
+    return in(t, float_set) ? pt::general_upper : pt::none;
+  case 'c':
+    return in(t, integral_set) ? pt::chr : pt::none;
+  case 's':
+    return in(t, string_set | cstring_set) ? pt::string : pt::none;
+  case 'p':
+    return in(t, pointer_set | cstring_set) ? pt::pointer : pt::none;
+  default:
+    return pt::none;
+  }
+}
+
 template <typename Char, typename Context>
 void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
              basic_format_args<Context> args) {
-  using OutputIt = buffer_appender<Char>;
-  auto out = OutputIt(buf);
-  auto context = basic_printf_context<OutputIt, Char>(out, args);
-  auto parse_ctx = basic_printf_parse_context<Char>(format);
+  using iterator = buffer_appender<Char>;
+  auto out = iterator(buf);
+  auto context = basic_printf_context<Char>(out, args);
+  auto parse_ctx = basic_format_parse_context<Char>(format);
 
   // Returns the argument with specified index or, if arg_index is -1, the next
   // argument.
@@ -387,26 +429,24 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
   const Char* end = parse_ctx.end();
   auto it = start;
   while (it != end) {
-    if (!detail::find<false, Char>(it, end, '%', it)) {
-      it = end;  // detail::find leaves it == nullptr if it doesn't find '%'
+    if (!find<false, Char>(it, end, '%', it)) {
+      it = end;  // find leaves it == nullptr if it doesn't find '%'.
       break;
     }
     Char c = *it++;
     if (it != end && *it == c) {
-      out = detail::write(
-          out, basic_string_view<Char>(start, detail::to_unsigned(it - start)));
+      write(out, basic_string_view<Char>(start, to_unsigned(it - start)));
       start = ++it;
       continue;
     }
-    out = detail::write(out, basic_string_view<Char>(
-                                 start, detail::to_unsigned(it - 1 - start)));
+    write(out, basic_string_view<Char>(start, to_unsigned(it - 1 - start)));
 
-    basic_format_specs<Char> specs;
+    auto specs = format_specs<Char>();
     specs.align = align::right;
 
     // Parse argument index, flags and width.
     int arg_index = parse_header(it, end, specs, get_arg);
-    if (arg_index == 0) parse_ctx.on_error("argument not found");
+    if (arg_index == 0) throw_format_error("argument not found");
 
     // Parse precision.
     if (it != end && *it == '.') {
@@ -417,7 +457,7 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
       } else if (c == '*') {
         ++it;
         specs.precision = static_cast<int>(
-            visit_format_arg(detail::printf_precision_handler(), get_arg(-1)));
+            visit_format_arg(printf_precision_handler(), get_arg(-1)));
       } else {
         specs.precision = 0;
       }
@@ -426,20 +466,19 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
     auto arg = get_arg(arg_index);
     // For d, i, o, u, x, and X conversion specifiers, if a precision is
     // specified, the '0' flag is ignored
-    if (specs.precision >= 0 && arg.is_integral())
-      specs.fill[0] =
-          ' ';  // Ignore '0' flag for non-numeric types or if '-' present.
-    if (specs.precision >= 0 && arg.type() == detail::type::cstring_type) {
-      auto str = visit_format_arg(detail::get_cstring<Char>(), arg);
+    if (specs.precision >= 0 && arg.is_integral()) {
+      // Ignore '0' for non-numeric types or if '-' present.
+      specs.fill[0] = ' ';
+    }
+    if (specs.precision >= 0 && arg.type() == type::cstring_type) {
+      auto str = visit_format_arg(get_cstring<Char>(), arg);
       auto str_end = str + specs.precision;
       auto nul = std::find(str, str_end, Char());
-      arg = detail::make_arg<basic_printf_context<OutputIt, Char>>(
-          basic_string_view<Char>(
-              str, detail::to_unsigned(nul != str_end ? nul - str
-                                                      : specs.precision)));
+      auto sv = basic_string_view<Char>(
+          str, to_unsigned(nul != str_end ? nul - str : specs.precision));
+      arg = make_arg<basic_printf_context<Char>>(sv);
     }
-    if (specs.alt && visit_format_arg(detail::is_zero_int(), arg))
-      specs.alt = false;
+    if (specs.alt && visit_format_arg(is_zero_int(), arg)) specs.alt = false;
     if (specs.fill[0] == '0') {
       if (arg.is_arithmetic() && specs.align != align::left)
         specs.align = align::numeric;
@@ -451,7 +490,6 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
     // Parse length and convert the argument to the required type.
     c = it != end ? *it++ : 0;
     Char t = it != end ? *it : 0;
-    using detail::convert_arg;
     switch (c) {
     case 'h':
       if (t == 'h') {
@@ -490,7 +528,7 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
     }
 
     // Parse type.
-    if (it == end) FMT_THROW(format_error("invalid format string"));
+    if (it == end) throw_format_error("invalid format string");
     char type = static_cast<char>(*it++);
     if (arg.is_integral()) {
       // Normalize type.
@@ -500,32 +538,25 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
         type = 'd';
         break;
       case 'c':
-        visit_format_arg(
-            detail::char_converter<basic_printf_context<OutputIt, Char>>(arg),
-            arg);
+        visit_format_arg(char_converter<basic_printf_context<Char>>(arg), arg);
         break;
       }
     }
-    specs.type = parse_presentation_type(type);
+    specs.type = parse_printf_presentation_type(type, arg.type());
     if (specs.type == presentation_type::none)
-      parse_ctx.on_error("invalid type specifier");
+      throw_format_error("invalid format specifier");
 
     start = it;
 
     // Format argument.
-    out = visit_format_arg(
-        detail::printf_arg_formatter<OutputIt, Char>(out, specs, context), arg);
+    visit_format_arg(printf_arg_formatter<Char>(out, specs, context), arg);
   }
-  detail::write(out, basic_string_view<Char>(start, to_unsigned(it - start)));
+  write(out, basic_string_view<Char>(start, to_unsigned(it - start)));
 }
-FMT_END_DETAIL_NAMESPACE
-
-template <typename Char>
-using basic_printf_context_t =
-    basic_printf_context<detail::buffer_appender<Char>, Char>;
+}  // namespace detail
 
-using printf_context = basic_printf_context_t<char>;
-using wprintf_context = basic_printf_context_t<wchar_t>;
+using printf_context = basic_printf_context<char>;
+using wprintf_context = basic_printf_context<wchar_t>;
 
 using printf_args = basic_format_args<printf_context>;
 using wprintf_args = basic_format_args<wprintf_context>;
@@ -542,26 +573,21 @@ inline auto make_printf_args(const T&... args)
   return {args...};
 }
 
-/**
-  \rst
-  Constructs an `~fmt::format_arg_store` object that contains references to
-  arguments and can be implicitly converted to `~fmt::wprintf_args`.
-  \endrst
- */
+// DEPRECATED!
 template <typename... T>
 inline auto make_wprintf_args(const T&... args)
     -> format_arg_store<wprintf_context, T...> {
   return {args...};
 }
 
-template <typename S, typename Char = char_t<S>>
+template <typename Char>
 inline auto vsprintf(
-    const S& fmt,
-    basic_format_args<basic_printf_context_t<type_identity_t<Char>>> args)
+    basic_string_view<Char> fmt,
+    basic_format_args<basic_printf_context<type_identity_t<Char>>> args)
     -> std::basic_string<Char> {
-  basic_memory_buffer<Char> buffer;
-  vprintf(buffer, detail::to_string_view(fmt), args);
-  return to_string(buffer);
+  auto buf = basic_memory_buffer<Char>();
+  detail::vprintf(buf, fmt, args);
+  return to_string(buf);
 }
 
 /**
@@ -576,20 +602,19 @@ inline auto vsprintf(
 template <typename S, typename... T,
           typename Char = enable_if_t<detail::is_string<S>::value, char_t<S>>>
 inline auto sprintf(const S& fmt, const T&... args) -> std::basic_string<Char> {
-  using context = basic_printf_context_t<Char>;
   return vsprintf(detail::to_string_view(fmt),
-                  fmt::make_format_args<context>(args...));
+                  fmt::make_format_args<basic_printf_context<Char>>(args...));
 }
 
-template <typename S, typename Char = char_t<S>>
+template <typename Char>
 inline auto vfprintf(
-    std::FILE* f, const S& fmt,
-    basic_format_args<basic_printf_context_t<type_identity_t<Char>>> args)
+    std::FILE* f, basic_string_view<Char> fmt,
+    basic_format_args<basic_printf_context<type_identity_t<Char>>> args)
     -> int {
-  basic_memory_buffer<Char> buffer;
-  vprintf(buffer, detail::to_string_view(fmt), args);
-  size_t size = buffer.size();
-  return std::fwrite(buffer.data(), sizeof(Char), size, f) < size
+  auto buf = basic_memory_buffer<Char>();
+  detail::vprintf(buf, fmt, args);
+  size_t size = buf.size();
+  return std::fwrite(buf.data(), sizeof(Char), size, f) < size
              ? -1
              : static_cast<int>(size);
 }
@@ -605,17 +630,16 @@ inline auto vfprintf(
  */
 template <typename S, typename... T, typename Char = char_t<S>>
 inline auto fprintf(std::FILE* f, const S& fmt, const T&... args) -> int {
-  using context = basic_printf_context_t<Char>;
   return vfprintf(f, detail::to_string_view(fmt),
-                  fmt::make_format_args<context>(args...));
+                  fmt::make_format_args<basic_printf_context<Char>>(args...));
 }
 
-template <typename S, typename Char = char_t<S>>
-inline auto vprintf(
-    const S& fmt,
-    basic_format_args<basic_printf_context_t<type_identity_t<Char>>> args)
+template <typename Char>
+FMT_DEPRECATED inline auto vprintf(
+    basic_string_view<Char> fmt,
+    basic_format_args<basic_printf_context<type_identity_t<Char>>> args)
     -> int {
-  return vfprintf(stdout, detail::to_string_view(fmt), args);
+  return vfprintf(stdout, fmt, args);
 }
 
 /**
@@ -627,14 +651,17 @@ inline auto vprintf(
     fmt::printf("Elapsed time: %.2f seconds", 1.23);
   \endrst
  */
-template <typename S, typename... T, FMT_ENABLE_IF(detail::is_string<S>::value)>
-inline auto printf(const S& fmt, const T&... args) -> int {
-  return vprintf(
-      detail::to_string_view(fmt),
-      fmt::make_format_args<basic_printf_context_t<char_t<S>>>(args...));
+template <typename... T>
+inline auto printf(string_view fmt, const T&... args) -> int {
+  return vfprintf(stdout, fmt, make_printf_args(args...));
+}
+template <typename... T>
+FMT_DEPRECATED inline auto printf(basic_string_view<wchar_t> fmt,
+                                  const T&... args) -> int {
+  return vfprintf(stdout, fmt, make_wprintf_args(args...));
 }
 
-FMT_MODULE_EXPORT_END
+FMT_END_EXPORT
 FMT_END_NAMESPACE
 
 #endif  // FMT_PRINTF_H_
diff --git a/contrib/fmt/include/fmt/ranges.h b/contrib/fmt/include/fmt/ranges.h
index dea7d60dd..65beba5bf 100644
--- a/contrib/fmt/include/fmt/ranges.h
+++ b/contrib/fmt/include/fmt/ranges.h
@@ -22,27 +22,25 @@ FMT_BEGIN_NAMESPACE
 
 namespace detail {
 
-template <typename RangeT, typename OutputIterator>
-OutputIterator copy(const RangeT& range, OutputIterator out) {
+template <typename Range, typename OutputIt>
+auto copy(const Range& range, OutputIt out) -> OutputIt {
   for (auto it = range.begin(), end = range.end(); it != end; ++it)
     *out++ = *it;
   return out;
 }
 
-template <typename OutputIterator>
-OutputIterator copy(const char* str, OutputIterator out) {
+template <typename OutputIt>
+auto copy(const char* str, OutputIt out) -> OutputIt {
   while (*str) *out++ = *str++;
   return out;
 }
 
-template <typename OutputIterator>
-OutputIterator copy(char ch, OutputIterator out) {
+template <typename OutputIt> auto copy(char ch, OutputIt out) -> OutputIt {
   *out++ = ch;
   return out;
 }
 
-template <typename OutputIterator>
-OutputIterator copy(wchar_t ch, OutputIterator out) {
+template <typename OutputIt> auto copy(wchar_t ch, OutputIt out) -> OutputIt {
   *out++ = ch;
   return out;
 }
@@ -69,7 +67,7 @@ template <typename T> class is_map {
   template <typename> static void check(...);
 
  public:
-#ifdef FMT_FORMAT_MAP_AS_LIST
+#ifdef FMT_FORMAT_MAP_AS_LIST  // DEPRECATED!
   static constexpr const bool value = false;
 #else
   static constexpr const bool value =
@@ -82,7 +80,7 @@ template <typename T> class is_set {
   template <typename> static void check(...);
 
  public:
-#ifdef FMT_FORMAT_SET_AS_LIST
+#ifdef FMT_FORMAT_SET_AS_LIST  // DEPRECATED!
   static constexpr const bool value = false;
 #else
   static constexpr const bool value =
@@ -157,8 +155,9 @@ template <typename T>
 struct has_mutable_begin_end<
     T, void_t<decltype(detail::range_begin(std::declval<T>())),
               decltype(detail::range_end(std::declval<T>())),
-              enable_if_t<std::is_copy_constructible<T>::value>>>
-    : std::true_type {};
+              // the extra int here is because older versions of MSVC don't
+              // SFINAE properly unless there are distinct types
+              int>> : std::true_type {};
 
 template <typename T>
 struct is_range_<T, void>
@@ -211,41 +210,61 @@ class is_tuple_formattable_ {
   static constexpr const bool value = false;
 };
 template <typename T, typename C> class is_tuple_formattable_<T, C, true> {
-  template <std::size_t... I>
-  static std::true_type check2(index_sequence<I...>,
-                               integer_sequence<bool, (I == I)...>);
+  template <std::size_t... Is>
+  static std::true_type check2(index_sequence<Is...>,
+                               integer_sequence<bool, (Is == Is)...>);
   static std::false_type check2(...);
-  template <std::size_t... I>
+  template <std::size_t... Is>
   static decltype(check2(
-      index_sequence<I...>{},
+      index_sequence<Is...>{},
       integer_sequence<
-          bool, (is_formattable<typename std::tuple_element<I, T>::type,
-                                C>::value)...>{})) check(index_sequence<I...>);
+          bool, (is_formattable<typename std::tuple_element<Is, T>::type,
+                                C>::value)...>{})) check(index_sequence<Is...>);
 
  public:
   static constexpr const bool value =
       decltype(check(tuple_index_sequence<T>{}))::value;
 };
 
-template <class Tuple, class F, size_t... Is>
-void for_each(index_sequence<Is...>, Tuple&& tup, F&& f) noexcept {
+template <typename Tuple, typename F, size_t... Is>
+FMT_CONSTEXPR void for_each(index_sequence<Is...>, Tuple&& t, F&& f) {
   using std::get;
-  // using free function get<I>(T) now.
-  const int _[] = {0, ((void)f(get<Is>(tup)), 0)...};
-  (void)_;  // blocks warnings
+  // Using a free function get<Is>(Tuple) now.
+  const int unused[] = {0, ((void)f(get<Is>(t)), 0)...};
+  ignore_unused(unused);
 }
 
-template <class T>
-FMT_CONSTEXPR make_index_sequence<std::tuple_size<T>::value> get_indexes(
-    T const&) {
-  return {};
+template <typename Tuple, typename F>
+FMT_CONSTEXPR void for_each(Tuple&& t, F&& f) {
+  for_each(tuple_index_sequence<remove_cvref_t<Tuple>>(),
+           std::forward<Tuple>(t), std::forward<F>(f));
 }
 
-template <class Tuple, class F> void for_each(Tuple&& tup, F&& f) {
-  const auto indexes = get_indexes(tup);
-  for_each(indexes, std::forward<Tuple>(tup), std::forward<F>(f));
+template <typename Tuple1, typename Tuple2, typename F, size_t... Is>
+void for_each2(index_sequence<Is...>, Tuple1&& t1, Tuple2&& t2, F&& f) {
+  using std::get;
+  const int unused[] = {0, ((void)f(get<Is>(t1), get<Is>(t2)), 0)...};
+  ignore_unused(unused);
 }
 
+template <typename Tuple1, typename Tuple2, typename F>
+void for_each2(Tuple1&& t1, Tuple2&& t2, F&& f) {
+  for_each2(tuple_index_sequence<remove_cvref_t<Tuple1>>(),
+            std::forward<Tuple1>(t1), std::forward<Tuple2>(t2),
+            std::forward<F>(f));
+}
+
+namespace tuple {
+// Workaround a bug in MSVC 2019 (v140).
+template <typename Char, typename... T>
+using result_t = std::tuple<formatter<remove_cvref_t<T>, Char>...>;
+
+using std::get;
+template <typename Tuple, typename Char, std::size_t... Is>
+auto get_formatters(index_sequence<Is...>)
+    -> result_t<Char, decltype(get<Is>(std::declval<Tuple>()))...>;
+}  // namespace tuple
+
 #if FMT_MSC_VERSION && FMT_MSC_VERSION < 1920
 // Older MSVC doesn't get the reference type correctly for arrays.
 template <typename R> struct range_reference_type_impl {
@@ -269,45 +288,37 @@ using range_reference_type =
 template <typename Range>
 using uncvref_type = remove_cvref_t<range_reference_type<Range>>;
 
-template <typename Range>
-using uncvref_first_type =
-    remove_cvref_t<decltype(std::declval<range_reference_type<Range>>().first)>;
-
-template <typename Range>
-using uncvref_second_type = remove_cvref_t<
-    decltype(std::declval<range_reference_type<Range>>().second)>;
-
-template <typename OutputIt> OutputIt write_delimiter(OutputIt out) {
-  *out++ = ',';
-  *out++ = ' ';
-  return out;
-}
-
-template <typename Char, typename OutputIt>
-auto write_range_entry(OutputIt out, basic_string_view<Char> str) -> OutputIt {
-  return write_escaped_string(out, str);
-}
-
-template <typename Char, typename OutputIt, typename T,
-          FMT_ENABLE_IF(std::is_convertible<T, std_string_view<char>>::value)>
-inline auto write_range_entry(OutputIt out, const T& str) -> OutputIt {
-  auto sv = std_string_view<Char>(str);
-  return write_range_entry<Char>(out, basic_string_view<Char>(sv));
-}
-
-template <typename Char, typename OutputIt, typename Arg,
-          FMT_ENABLE_IF(std::is_same<Arg, Char>::value)>
-OutputIt write_range_entry(OutputIt out, const Arg v) {
-  return write_escaped_char(out, v);
+template <typename Formatter>
+FMT_CONSTEXPR auto maybe_set_debug_format(Formatter& f, bool set)
+    -> decltype(f.set_debug_format(set)) {
+  f.set_debug_format(set);
 }
+template <typename Formatter>
+FMT_CONSTEXPR void maybe_set_debug_format(Formatter&, ...) {}
+
+// These are not generic lambdas for compatibility with C++11.
+template <typename ParseContext> struct parse_empty_specs {
+  template <typename Formatter> FMT_CONSTEXPR void operator()(Formatter& f) {
+    f.parse(ctx);
+    detail::maybe_set_debug_format(f, true);
+  }
+  ParseContext& ctx;
+};
+template <typename FormatContext> struct format_tuple_element {
+  using char_type = typename FormatContext::char_type;
+
+  template <typename T>
+  void operator()(const formatter<T, char_type>& f, const T& v) {
+    if (i > 0)
+      ctx.advance_to(detail::copy_str<char_type>(separator, ctx.out()));
+    ctx.advance_to(f.format(v, ctx));
+    ++i;
+  }
 
-template <
-    typename Char, typename OutputIt, typename Arg,
-    FMT_ENABLE_IF(!is_std_string_like<typename std::decay<Arg>::type>::value &&
-                  !std::is_same<Arg, Char>::value)>
-OutputIt write_range_entry(OutputIt out, const Arg& v) {
-  return write<Char>(out, v);
-}
+  int i;
+  FormatContext& ctx;
+  basic_string_view<char_type> separator;
+};
 
 }  // namespace detail
 
@@ -321,29 +332,20 @@ template <typename T, typename C> struct is_tuple_formattable {
       detail::is_tuple_formattable_<T, C>::value;
 };
 
-template <typename TupleT, typename Char>
-struct formatter<TupleT, Char,
-                 enable_if_t<fmt::is_tuple_like<TupleT>::value &&
-                             fmt::is_tuple_formattable<TupleT, Char>::value>> {
+template <typename Tuple, typename Char>
+struct formatter<Tuple, Char,
+                 enable_if_t<fmt::is_tuple_like<Tuple>::value &&
+                             fmt::is_tuple_formattable<Tuple, Char>::value>> {
  private:
+  decltype(detail::tuple::get_formatters<Tuple, Char>(
+      detail::tuple_index_sequence<Tuple>())) formatters_;
+
   basic_string_view<Char> separator_ = detail::string_literal<Char, ',', ' '>{};
   basic_string_view<Char> opening_bracket_ =
       detail::string_literal<Char, '('>{};
   basic_string_view<Char> closing_bracket_ =
       detail::string_literal<Char, ')'>{};
 
-  // C++11 generic lambda for format().
-  template <typename FormatContext> struct format_each {
-    template <typename T> void operator()(const T& v) {
-      if (i > 0) out = detail::copy_str<Char>(separator, out);
-      out = detail::write_range_entry<Char>(out, v);
-      ++i;
-    }
-    int i;
-    typename FormatContext::iterator& out;
-    basic_string_view<Char> separator;
-  };
-
  public:
   FMT_CONSTEXPR formatter() {}
 
@@ -359,17 +361,21 @@ struct formatter<TupleT, Char,
 
   template <typename ParseContext>
   FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
-    return ctx.begin();
+    auto it = ctx.begin();
+    if (it != ctx.end() && *it != '}')
+      FMT_THROW(format_error("invalid format specifier"));
+    detail::for_each(formatters_, detail::parse_empty_specs<ParseContext>{ctx});
+    return it;
   }
 
-  template <typename FormatContext = format_context>
-  auto format(const TupleT& values, FormatContext& ctx) const
+  template <typename FormatContext>
+  auto format(const Tuple& value, FormatContext& ctx) const
       -> decltype(ctx.out()) {
-    auto out = ctx.out();
-    out = detail::copy_str<Char>(opening_bracket_, out);
-    detail::for_each(values, format_each<FormatContext>{0, out, separator_});
-    out = detail::copy_str<Char>(closing_bracket_, out);
-    return out;
+    ctx.advance_to(detail::copy_str<Char>(opening_bracket_, ctx.out()));
+    detail::for_each2(
+        formatters_, value,
+        detail::format_tuple_element<FormatContext>{0, ctx, separator_});
+    return detail::copy_str<Char>(closing_bracket_, ctx.out());
   }
 };
 
@@ -398,12 +404,10 @@ template <typename Context> struct range_mapper {
 };
 
 template <typename Char, typename Element>
-using range_formatter_type = conditional_t<
-    is_formattable<Element, Char>::value,
+using range_formatter_type =
     formatter<remove_cvref_t<decltype(range_mapper<buffer_context<Char>>{}.map(
                   std::declval<Element>()))>,
-              Char>,
-    fallback_formatter<Element, Char>>;
+              Char>;
 
 template <typename R>
 using maybe_const_range =
@@ -413,11 +417,8 @@ using maybe_const_range =
 #if !FMT_MSC_VERSION || FMT_MSC_VERSION >= 1910
 template <typename R, typename Char>
 struct is_formattable_delayed
-    : disjunction<
-          is_formattable<uncvref_type<maybe_const_range<R>>, Char>,
-          has_fallback_formatter<uncvref_type<maybe_const_range<R>>, Char>> {};
+    : is_formattable<uncvref_type<maybe_const_range<R>>, Char> {};
 #endif
-
 }  // namespace detail
 
 template <typename T, typename Char, typename Enable = void>
@@ -426,32 +427,16 @@ struct range_formatter;
 template <typename T, typename Char>
 struct range_formatter<
     T, Char,
-    enable_if_t<conjunction<
-        std::is_same<T, remove_cvref_t<T>>,
-        disjunction<is_formattable<T, Char>,
-                    detail::has_fallback_formatter<T, Char>>>::value>> {
+    enable_if_t<conjunction<std::is_same<T, remove_cvref_t<T>>,
+                            is_formattable<T, Char>>::value>> {
  private:
   detail::range_formatter_type<Char, T> underlying_;
-  bool custom_specs_ = false;
   basic_string_view<Char> separator_ = detail::string_literal<Char, ',', ' '>{};
   basic_string_view<Char> opening_bracket_ =
       detail::string_literal<Char, '['>{};
   basic_string_view<Char> closing_bracket_ =
       detail::string_literal<Char, ']'>{};
 
-  template <class U>
-  FMT_CONSTEXPR static auto maybe_set_debug_format(U& u, int)
-      -> decltype(u.set_debug_format()) {
-    u.set_debug_format();
-  }
-
-  template <class U>
-  FMT_CONSTEXPR static void maybe_set_debug_format(U&, ...) {}
-
-  FMT_CONSTEXPR void maybe_set_debug_format() {
-    maybe_set_debug_format(underlying_, 0);
-  }
-
  public:
   FMT_CONSTEXPR range_formatter() {}
 
@@ -473,31 +458,24 @@ struct range_formatter<
   FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
     auto it = ctx.begin();
     auto end = ctx.end();
-    if (it == end || *it == '}') {
-      maybe_set_debug_format();
-      return it;
-    }
 
-    if (*it == 'n') {
+    if (it != end && *it == 'n') {
       set_brackets({}, {});
       ++it;
     }
 
-    if (*it == '}') {
-      maybe_set_debug_format();
-      return it;
+    if (it != end && *it != '}') {
+      if (*it != ':') FMT_THROW(format_error("invalid format specifier"));
+      ++it;
+    } else {
+      detail::maybe_set_debug_format(underlying_, true);
     }
 
-    if (*it != ':')
-      FMT_THROW(format_error("no other top-level range formatters supported"));
-
-    custom_specs_ = true;
-    ++it;
     ctx.advance_to(it);
     return underlying_.parse(ctx);
   }
 
-  template <typename R, class FormatContext>
+  template <typename R, typename FormatContext>
   auto format(R&& range, FormatContext& ctx) const -> decltype(ctx.out()) {
     detail::range_mapper<buffer_context<Char>> mapper;
     auto out = ctx.out();
@@ -507,7 +485,6 @@ struct range_formatter<
     auto end = detail::range_end(range);
     for (; it != end; ++it) {
       if (i > 0) out = detail::copy_str<Char>(separator_, out);
-      ;
       ctx.advance_to(out);
       out = underlying_.format(mapper.map(*it), ctx);
       ++i;
@@ -520,13 +497,14 @@ struct range_formatter<
 enum class range_format { disabled, map, set, sequence, string, debug_string };
 
 namespace detail {
-template <typename T> struct range_format_kind_ {
-  static constexpr auto value = std::is_same<range_reference_type<T>, T>::value
-                                    ? range_format::disabled
-                                : is_map<T>::value ? range_format::map
-                                : is_set<T>::value ? range_format::set
-                                                   : range_format::sequence;
-};
+template <typename T>
+struct range_format_kind_
+    : std::integral_constant<range_format,
+                             std::is_same<uncvref_type<T>, T>::value
+                                 ? range_format::disabled
+                             : is_map<T>::value ? range_format::map
+                             : is_set<T>::value ? range_format::set
+                                                : range_format::sequence> {};
 
 template <range_format K, typename R, typename Char, typename Enable = void>
 struct range_default_formatter;
@@ -601,9 +579,6 @@ template <typename Char, typename... T> struct tuple_join_view : detail::view {
       : tuple(t), sep{s} {}
 };
 
-template <typename Char, typename... T>
-using tuple_arg_join = tuple_join_view<Char, T...>;
-
 // Define FMT_TUPLE_JOIN_SPECIFIERS to enable experimental format specifiers
 // support in tuple_join. It is disabled by default because of issues with
 // the dynamic width and precision.
@@ -673,7 +648,45 @@ struct formatter<tuple_join_view<Char, T...>, Char> {
   }
 };
 
-FMT_MODULE_EXPORT_BEGIN
+namespace detail {
+// Check if T has an interface like a container adaptor (e.g. std::stack,
+// std::queue, std::priority_queue).
+template <typename T> class is_container_adaptor_like {
+  template <typename U> static auto check(U* p) -> typename U::container_type;
+  template <typename> static void check(...);
+
+ public:
+  static constexpr const bool value =
+      !std::is_void<decltype(check<T>(nullptr))>::value;
+};
+
+template <typename Container> struct all {
+  const Container& c;
+  auto begin() const -> typename Container::const_iterator { return c.begin(); }
+  auto end() const -> typename Container::const_iterator { return c.end(); }
+};
+}  // namespace detail
+
+template <typename T, typename Char>
+struct formatter<
+    T, Char,
+    enable_if_t<conjunction<detail::is_container_adaptor_like<T>,
+                            bool_constant<range_format_kind<T, Char>::value ==
+                                          range_format::disabled>>::value>>
+    : formatter<detail::all<typename T::container_type>, Char> {
+  using all = detail::all<typename T::container_type>;
+  template <typename FormatContext>
+  auto format(const T& t, FormatContext& ctx) const -> decltype(ctx.out()) {
+    struct getter : T {
+      static auto get(const T& t) -> all {
+        return {t.*(&getter::c)};  // Access c through the derived class.
+      }
+    };
+    return formatter<all>::format(getter::get(t), ctx);
+  }
+};
+
+FMT_BEGIN_EXPORT
 
 /**
   \rst
@@ -716,7 +729,7 @@ auto join(std::initializer_list<T> list, string_view sep)
   return join(std::begin(list), std::end(list), sep);
 }
 
-FMT_MODULE_EXPORT_END
+FMT_END_EXPORT
 FMT_END_NAMESPACE
 
 #endif  // FMT_RANGES_H_
diff --git a/contrib/fmt/include/fmt/std.h b/contrib/fmt/include/fmt/std.h
index 41d2b2838..b0e78e10d 100644
--- a/contrib/fmt/include/fmt/std.h
+++ b/contrib/fmt/include/fmt/std.h
@@ -8,10 +8,17 @@
 #ifndef FMT_STD_H_
 #define FMT_STD_H_
 
+#include <bitset>
+#include <cstdlib>
+#include <exception>
+#include <memory>
 #include <thread>
 #include <type_traits>
+#include <typeinfo>
 #include <utility>
+#include <vector>
 
+#include "format.h"
 #include "ostream.h"
 
 #if FMT_HAS_INCLUDE(<version>)
@@ -25,6 +32,30 @@
 #  if FMT_HAS_INCLUDE(<variant>)
 #    include <variant>
 #  endif
+#  if FMT_HAS_INCLUDE(<optional>)
+#    include <optional>
+#  endif
+#endif
+
+// GCC 4 does not support FMT_HAS_INCLUDE.
+#if FMT_HAS_INCLUDE(<cxxabi.h>) || defined(__GLIBCXX__)
+#  include <cxxabi.h>
+// Android NDK with gabi++ library on some architectures does not implement
+// abi::__cxa_demangle().
+#  ifndef __GABIXX_CXXABI_H__
+#    define FMT_HAS_ABI_CXA_DEMANGLE
+#  endif
+#endif
+
+// Check if typeid is available.
+#ifndef FMT_USE_TYPEID
+// __RTTI is for EDG compilers. In MSVC typeid is available without RTTI.
+#  if defined(__GXX_RTTI) || FMT_HAS_FEATURE(cxx_rtti) || FMT_MSC_VERSION || \
+      defined(__INTEL_RTTI__) || defined(__RTTI)
+#    define FMT_USE_TYPEID 1
+#  else
+#    define FMT_USE_TYPEID 0
+#  endif
 #endif
 
 #ifdef __cpp_lib_filesystem
@@ -32,21 +63,32 @@ FMT_BEGIN_NAMESPACE
 
 namespace detail {
 
+template <typename Char> auto get_path_string(const std::filesystem::path& p) {
+  return p.string<Char>();
+}
+
 template <typename Char>
 void write_escaped_path(basic_memory_buffer<Char>& quoted,
                         const std::filesystem::path& p) {
   write_escaped_string<Char>(std::back_inserter(quoted), p.string<Char>());
 }
+
 #  ifdef _WIN32
 template <>
-inline void write_escaped_path<char>(basic_memory_buffer<char>& quoted,
+inline auto get_path_string<char>(const std::filesystem::path& p) {
+  return to_utf8<wchar_t>(p.native(), to_utf8_error_policy::replace);
+}
+
+template <>
+inline void write_escaped_path<char>(memory_buffer& quoted,
                                      const std::filesystem::path& p) {
-  auto s = p.u8string();
-  write_escaped_string<char>(
-      std::back_inserter(quoted),
-      string_view(reinterpret_cast<const char*>(s.c_str()), s.size()));
+  auto buf = basic_memory_buffer<wchar_t>();
+  write_escaped_string<wchar_t>(std::back_inserter(buf), p.native());
+  bool valid = to_utf8<wchar_t>::convert(quoted, {buf.data(), buf.size()});
+  FMT_ASSERT(valid, "invalid utf16");
 }
-#  endif
+#  endif  // _WIN32
+
 template <>
 inline void write_escaped_path<std::filesystem::path::value_type>(
     basic_memory_buffer<std::filesystem::path::value_type>& quoted,
@@ -57,62 +99,118 @@ inline void write_escaped_path<std::filesystem::path::value_type>(
 
 }  // namespace detail
 
-template <typename Char>
-struct formatter<std::filesystem::path, Char>
-    : formatter<basic_string_view<Char>> {
+FMT_EXPORT
+template <typename Char> struct formatter<std::filesystem::path, Char> {
+ private:
+  format_specs<Char> specs_;
+  detail::arg_ref<Char> width_ref_;
+  bool debug_ = false;
+
+ public:
+  FMT_CONSTEXPR void set_debug_format(bool set = true) { debug_ = set; }
+
+  template <typename ParseContext> FMT_CONSTEXPR auto parse(ParseContext& ctx) {
+    auto it = ctx.begin(), end = ctx.end();
+    if (it == end) return it;
+
+    it = detail::parse_align(it, end, specs_);
+    if (it == end) return it;
+
+    it = detail::parse_dynamic_spec(it, end, specs_.width, width_ref_, ctx);
+    if (it != end && *it == '?') {
+      debug_ = true;
+      ++it;
+    }
+    return it;
+  }
+
   template <typename FormatContext>
-  auto format(const std::filesystem::path& p, FormatContext& ctx) const ->
-      typename FormatContext::iterator {
-    basic_memory_buffer<Char> quoted;
+  auto format(const std::filesystem::path& p, FormatContext& ctx) const {
+    auto specs = specs_;
+    detail::handle_dynamic_spec<detail::width_checker>(specs.width, width_ref_,
+                                                       ctx);
+    if (!debug_) {
+      auto s = detail::get_path_string<Char>(p);
+      return detail::write(ctx.out(), basic_string_view<Char>(s), specs);
+    }
+    auto quoted = basic_memory_buffer<Char>();
     detail::write_escaped_path(quoted, p);
-    return formatter<basic_string_view<Char>>::format(
-        basic_string_view<Char>(quoted.data(), quoted.size()), ctx);
+    return detail::write(ctx.out(),
+                         basic_string_view<Char>(quoted.data(), quoted.size()),
+                         specs);
   }
 };
 FMT_END_NAMESPACE
 #endif
 
 FMT_BEGIN_NAMESPACE
+FMT_EXPORT
 template <typename Char>
 struct formatter<std::thread::id, Char> : basic_ostream_formatter<Char> {};
 FMT_END_NAMESPACE
 
-#ifdef __cpp_lib_variant
+#ifdef __cpp_lib_optional
 FMT_BEGIN_NAMESPACE
-template <typename Char> struct formatter<std::monostate, Char> {
-  template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
-    return ctx.begin();
+FMT_EXPORT
+template <typename T, typename Char>
+struct formatter<std::optional<T>, Char,
+                 std::enable_if_t<is_formattable<T, Char>::value>> {
+ private:
+  formatter<T, Char> underlying_;
+  static constexpr basic_string_view<Char> optional =
+      detail::string_literal<Char, 'o', 'p', 't', 'i', 'o', 'n', 'a', 'l',
+                             '('>{};
+  static constexpr basic_string_view<Char> none =
+      detail::string_literal<Char, 'n', 'o', 'n', 'e'>{};
+
+  template <class U>
+  FMT_CONSTEXPR static auto maybe_set_debug_format(U& u, bool set)
+      -> decltype(u.set_debug_format(set)) {
+    u.set_debug_format(set);
+  }
+
+  template <class U>
+  FMT_CONSTEXPR static void maybe_set_debug_format(U&, ...) {}
+
+ public:
+  template <typename ParseContext> FMT_CONSTEXPR auto parse(ParseContext& ctx) {
+    maybe_set_debug_format(underlying_, true);
+    return underlying_.parse(ctx);
   }
 
   template <typename FormatContext>
-  auto format(const std::monostate&, FormatContext& ctx) const
+  auto format(std::optional<T> const& opt, FormatContext& ctx) const
       -> decltype(ctx.out()) {
+    if (!opt) return detail::write<Char>(ctx.out(), none);
+
     auto out = ctx.out();
-    out = detail::write<Char>(out, "monostate");
-    return out;
+    out = detail::write<Char>(out, optional);
+    ctx.advance_to(out);
+    out = underlying_.format(*opt, ctx);
+    return detail::write(out, ')');
   }
 };
+FMT_END_NAMESPACE
+#endif  // __cpp_lib_optional
 
+#ifdef __cpp_lib_variant
+FMT_BEGIN_NAMESPACE
 namespace detail {
 
 template <typename T>
 using variant_index_sequence =
     std::make_index_sequence<std::variant_size<T>::value>;
 
-// variant_size and variant_alternative check.
-template <typename T, typename U = void>
-struct is_variant_like_ : std::false_type {};
-template <typename T>
-struct is_variant_like_<T, std::void_t<decltype(std::variant_size<T>::value)>>
-    : std::true_type {};
+template <typename> struct is_variant_like_ : std::false_type {};
+template <typename... Types>
+struct is_variant_like_<std::variant<Types...>> : std::true_type {};
 
-// formattable element check
+// formattable element check.
 template <typename T, typename C> class is_variant_formattable_ {
-  template <std::size_t... I>
+  template <std::size_t... Is>
   static std::conjunction<
-      is_formattable<std::variant_alternative_t<I, T>, C>...>
-      check(std::index_sequence<I...>);
+      is_formattable<std::variant_alternative_t<Is, T>, C>...>
+      check(std::index_sequence<Is...>);
 
  public:
   static constexpr const bool value =
@@ -140,6 +238,21 @@ template <typename T, typename C> struct is_variant_formattable {
       detail::is_variant_formattable_<T, C>::value;
 };
 
+FMT_EXPORT
+template <typename Char> struct formatter<std::monostate, Char> {
+  template <typename ParseContext>
+  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
+    return ctx.begin();
+  }
+
+  template <typename FormatContext>
+  auto format(const std::monostate&, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    return detail::write<Char>(ctx.out(), "monostate");
+  }
+};
+
+FMT_EXPORT
 template <typename Variant, typename Char>
 struct formatter<
     Variant, Char,
@@ -156,16 +269,172 @@ struct formatter<
     auto out = ctx.out();
 
     out = detail::write<Char>(out, "variant(");
-    std::visit(
-        [&](const auto& v) {
-          out = detail::write_variant_alternative<Char>(out, v);
-        },
-        value);
+    FMT_TRY {
+      std::visit(
+          [&](const auto& v) {
+            out = detail::write_variant_alternative<Char>(out, v);
+          },
+          value);
+    }
+    FMT_CATCH(const std::bad_variant_access&) {
+      detail::write<Char>(out, "valueless by exception");
+    }
     *out++ = ')';
     return out;
   }
 };
 FMT_END_NAMESPACE
+#endif  // __cpp_lib_variant
+
+FMT_BEGIN_NAMESPACE
+FMT_EXPORT
+template <typename Char> struct formatter<std::error_code, Char> {
+  template <typename ParseContext>
+  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
+    return ctx.begin();
+  }
+
+  template <typename FormatContext>
+  FMT_CONSTEXPR auto format(const std::error_code& ec, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    auto out = ctx.out();
+    out = detail::write_bytes(out, ec.category().name(), format_specs<Char>());
+    out = detail::write<Char>(out, Char(':'));
+    out = detail::write<Char>(out, ec.value());
+    return out;
+  }
+};
+
+FMT_EXPORT
+template <typename T, typename Char>
+struct formatter<
+    T, Char,
+    typename std::enable_if<std::is_base_of<std::exception, T>::value>::type> {
+ private:
+  bool with_typename_ = false;
+
+ public:
+  FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
+      -> decltype(ctx.begin()) {
+    auto it = ctx.begin();
+    auto end = ctx.end();
+    if (it == end || *it == '}') return it;
+    if (*it == 't') {
+      ++it;
+      with_typename_ = FMT_USE_TYPEID != 0;
+    }
+    return it;
+  }
+
+  template <typename OutputIt>
+  auto format(const std::exception& ex,
+              basic_format_context<OutputIt, Char>& ctx) const -> OutputIt {
+    format_specs<Char> spec;
+    auto out = ctx.out();
+    if (!with_typename_)
+      return detail::write_bytes(out, string_view(ex.what()), spec);
+
+#if FMT_USE_TYPEID
+    const std::type_info& ti = typeid(ex);
+#  ifdef FMT_HAS_ABI_CXA_DEMANGLE
+    int status = 0;
+    std::size_t size = 0;
+    std::unique_ptr<char, decltype(&std::free)> demangled_name_ptr(
+        abi::__cxa_demangle(ti.name(), nullptr, &size, &status), &std::free);
+
+    string_view demangled_name_view;
+    if (demangled_name_ptr) {
+      demangled_name_view = demangled_name_ptr.get();
+
+      // Normalization of stdlib inline namespace names.
+      // libc++ inline namespaces.
+      //  std::__1::*       -> std::*
+      //  std::__1::__fs::* -> std::*
+      // libstdc++ inline namespaces.
+      //  std::__cxx11::*             -> std::*
+      //  std::filesystem::__cxx11::* -> std::filesystem::*
+      if (demangled_name_view.starts_with("std::")) {
+        char* begin = demangled_name_ptr.get();
+        char* to = begin + 5;  // std::
+        for (char *from = to, *end = begin + demangled_name_view.size();
+             from < end;) {
+          // This is safe, because demangled_name is NUL-terminated.
+          if (from[0] == '_' && from[1] == '_') {
+            char* next = from + 1;
+            while (next < end && *next != ':') next++;
+            if (next[0] == ':' && next[1] == ':') {
+              from = next + 2;
+              continue;
+            }
+          }
+          *to++ = *from++;
+        }
+        demangled_name_view = {begin, detail::to_unsigned(to - begin)};
+      }
+    } else {
+      demangled_name_view = string_view(ti.name());
+    }
+    out = detail::write_bytes(out, demangled_name_view, spec);
+#  elif FMT_MSC_VERSION
+    string_view demangled_name_view(ti.name());
+    if (demangled_name_view.starts_with("class "))
+      demangled_name_view.remove_prefix(6);
+    else if (demangled_name_view.starts_with("struct "))
+      demangled_name_view.remove_prefix(7);
+    out = detail::write_bytes(out, demangled_name_view, spec);
+#  else
+    out = detail::write_bytes(out, string_view(ti.name()), spec);
+#  endif
+    *out++ = ':';
+    *out++ = ' ';
+    return detail::write_bytes(out, string_view(ex.what()), spec);
 #endif
+  }
+};
+
+namespace detail {
+
+template <typename T, typename Enable = void>
+struct has_flip : std::false_type {};
+
+template <typename T>
+struct has_flip<T, void_t<decltype(std::declval<T>().flip())>>
+    : std::true_type {};
+
+template <typename T> struct is_bit_reference_like {
+  static constexpr const bool value =
+      std::is_convertible<T, bool>::value &&
+      std::is_nothrow_assignable<T, bool>::value && has_flip<T>::value;
+};
+
+#ifdef _LIBCPP_VERSION
+
+// Workaround for libc++ incompatibility with C++ standard.
+// According to the Standard, `bitset::operator[] const` returns bool.
+template <typename C>
+struct is_bit_reference_like<std::__bit_const_reference<C>> {
+  static constexpr const bool value = true;
+};
+
+#endif
+
+}  // namespace detail
+
+// We can't use std::vector<bool, Allocator>::reference and
+// std::bitset<N>::reference because the compiler can't deduce Allocator and N
+// in partial specialization.
+FMT_EXPORT
+template <typename BitRef, typename Char>
+struct formatter<BitRef, Char,
+                 enable_if_t<detail::is_bit_reference_like<BitRef>::value>>
+    : formatter<bool, Char> {
+  template <typename FormatContext>
+  FMT_CONSTEXPR auto format(const BitRef& v, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    return formatter<bool, Char>::format(v, ctx);
+  }
+};
+
+FMT_END_NAMESPACE
 
 #endif  // FMT_STD_H_
diff --git a/contrib/fmt/include/fmt/xchar.h b/contrib/fmt/include/fmt/xchar.h
index 3b5bc15ca..625ec3692 100644
--- a/contrib/fmt/include/fmt/xchar.h
+++ b/contrib/fmt/include/fmt/xchar.h
@@ -12,13 +12,32 @@
 
 #include "format.h"
 
+#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
+#  include <locale>
+#endif
+
 FMT_BEGIN_NAMESPACE
 namespace detail {
+
 template <typename T>
 using is_exotic_char = bool_constant<!std::is_same<T, char>::value>;
+
+inline auto write_loc(std::back_insert_iterator<detail::buffer<wchar_t>> out,
+                      loc_value value, const format_specs<wchar_t>& specs,
+                      locale_ref loc) -> bool {
+#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
+  auto& numpunct =
+      std::use_facet<std::numpunct<wchar_t>>(loc.get<std::locale>());
+  auto separator = std::wstring();
+  auto grouping = numpunct.grouping();
+  if (!grouping.empty()) separator = std::wstring(1, numpunct.thousands_sep());
+  return value.visit(loc_writer<wchar_t>{out, specs, separator, grouping, {}});
+#endif
+  return false;
 }
+}  // namespace detail
 
-FMT_MODULE_EXPORT_BEGIN
+FMT_BEGIN_EXPORT
 
 using wstring_view = basic_string_view<wchar_t>;
 using wformat_parse_context = basic_format_parse_context<wchar_t>;
@@ -33,7 +52,9 @@ inline auto runtime(wstring_view s) -> wstring_view { return s; }
 #else
 template <typename... Args>
 using wformat_string = basic_format_string<wchar_t, type_identity_t<Args>...>;
-inline auto runtime(wstring_view s) -> basic_runtime<wchar_t> { return {{s}}; }
+inline auto runtime(wstring_view s) -> runtime_format_string<wchar_t> {
+  return {{s}};
+}
 #endif
 
 template <> struct is_char<wchar_t> : std::true_type {};
@@ -41,9 +62,9 @@ template <> struct is_char<detail::char8_type> : std::true_type {};
 template <> struct is_char<char16_t> : std::true_type {};
 template <> struct is_char<char32_t> : std::true_type {};
 
-template <typename... Args>
-constexpr format_arg_store<wformat_context, Args...> make_wformat_args(
-    const Args&... args) {
+template <typename... T>
+constexpr format_arg_store<wformat_context, T...> make_wformat_args(
+    const T&... args) {
   return {args...};
 }
 
@@ -78,9 +99,9 @@ template <typename Char, FMT_ENABLE_IF(!std::is_same<Char, char>::value)>
 auto vformat(basic_string_view<Char> format_str,
              basic_format_args<buffer_context<type_identity_t<Char>>> args)
     -> std::basic_string<Char> {
-  basic_memory_buffer<Char> buffer;
-  detail::vformat_to(buffer, format_str, args);
-  return to_string(buffer);
+  auto buf = basic_memory_buffer<Char>();
+  detail::vformat_to(buf, format_str, args);
+  return to_string(buf);
 }
 
 template <typename... T>
@@ -90,10 +111,10 @@ auto format(wformat_string<T...> fmt, T&&... args) -> std::wstring {
 
 // Pass char_t as a default template parameter instead of using
 // std::basic_string<char_t<S>> to reduce the symbol size.
-template <typename S, typename... Args, typename Char = char_t<S>,
+template <typename S, typename... T, typename Char = char_t<S>,
           FMT_ENABLE_IF(!std::is_same<Char, char>::value &&
                         !std::is_same<Char, wchar_t>::value)>
-auto format(const S& format_str, Args&&... args) -> std::basic_string<Char> {
+auto format(const S& format_str, T&&... args) -> std::basic_string<Char> {
   return vformat(detail::to_string_view(format_str),
                  fmt::make_format_args<buffer_context<Char>>(args...));
 }
@@ -108,11 +129,10 @@ inline auto vformat(
   return detail::vformat(loc, detail::to_string_view(format_str), args);
 }
 
-template <typename Locale, typename S, typename... Args,
-          typename Char = char_t<S>,
+template <typename Locale, typename S, typename... T, typename Char = char_t<S>,
           FMT_ENABLE_IF(detail::is_locale<Locale>::value&&
                             detail::is_exotic_char<Char>::value)>
-inline auto format(const Locale& loc, const S& format_str, Args&&... args)
+inline auto format(const Locale& loc, const S& format_str, T&&... args)
     -> std::basic_string<Char> {
   return detail::vformat(loc, detail::to_string_view(format_str),
                          fmt::make_format_args<buffer_context<Char>>(args...));
@@ -126,14 +146,14 @@ auto vformat_to(OutputIt out, const S& format_str,
     -> OutputIt {
   auto&& buf = detail::get_buffer<Char>(out);
   detail::vformat_to(buf, detail::to_string_view(format_str), args);
-  return detail::get_iterator(buf);
+  return detail::get_iterator(buf, out);
 }
 
-template <typename OutputIt, typename S, typename... Args,
+template <typename OutputIt, typename S, typename... T,
           typename Char = char_t<S>,
           FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value&&
                             detail::is_exotic_char<Char>::value)>
-inline auto format_to(OutputIt out, const S& fmt, Args&&... args) -> OutputIt {
+inline auto format_to(OutputIt out, const S& fmt, T&&... args) -> OutputIt {
   return vformat_to(out, detail::to_string_view(fmt),
                     fmt::make_format_args<buffer_context<Char>>(args...));
 }
@@ -149,18 +169,18 @@ inline auto vformat_to(
   auto&& buf = detail::get_buffer<Char>(out);
   vformat_to(buf, detail::to_string_view(format_str), args,
              detail::locale_ref(loc));
-  return detail::get_iterator(buf);
+  return detail::get_iterator(buf, out);
 }
 
 template <
-    typename OutputIt, typename Locale, typename S, typename... Args,
+    typename OutputIt, typename Locale, typename S, typename... T,
     typename Char = char_t<S>,
     bool enable = detail::is_output_iterator<OutputIt, Char>::value&&
         detail::is_locale<Locale>::value&& detail::is_exotic_char<Char>::value>
 inline auto format_to(OutputIt out, const Locale& loc, const S& format_str,
-                      Args&&... args) ->
+                      T&&... args) ->
     typename std::enable_if<enable, OutputIt>::type {
-  return vformat_to(out, loc, to_string_view(format_str),
+  return vformat_to(out, loc, detail::to_string_view(format_str),
                     fmt::make_format_args<buffer_context<Char>>(args...));
 }
 
@@ -171,36 +191,36 @@ inline auto vformat_to_n(
     OutputIt out, size_t n, basic_string_view<Char> format_str,
     basic_format_args<buffer_context<type_identity_t<Char>>> args)
     -> format_to_n_result<OutputIt> {
-  detail::iterator_buffer<OutputIt, Char, detail::fixed_buffer_traits> buf(out,
-                                                                           n);
+  using traits = detail::fixed_buffer_traits;
+  auto buf = detail::iterator_buffer<OutputIt, Char, traits>(out, n);
   detail::vformat_to(buf, format_str, args);
   return {buf.out(), buf.count()};
 }
 
-template <typename OutputIt, typename S, typename... Args,
+template <typename OutputIt, typename S, typename... T,
           typename Char = char_t<S>,
           FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value&&
                             detail::is_exotic_char<Char>::value)>
-inline auto format_to_n(OutputIt out, size_t n, const S& fmt,
-                        const Args&... args) -> format_to_n_result<OutputIt> {
+inline auto format_to_n(OutputIt out, size_t n, const S& fmt, T&&... args)
+    -> format_to_n_result<OutputIt> {
   return vformat_to_n(out, n, detail::to_string_view(fmt),
                       fmt::make_format_args<buffer_context<Char>>(args...));
 }
 
-template <typename S, typename... Args, typename Char = char_t<S>,
+template <typename S, typename... T, typename Char = char_t<S>,
           FMT_ENABLE_IF(detail::is_exotic_char<Char>::value)>
-inline auto formatted_size(const S& fmt, Args&&... args) -> size_t {
-  detail::counting_buffer<Char> buf;
+inline auto formatted_size(const S& fmt, T&&... args) -> size_t {
+  auto buf = detail::counting_buffer<Char>();
   detail::vformat_to(buf, detail::to_string_view(fmt),
                      fmt::make_format_args<buffer_context<Char>>(args...));
   return buf.count();
 }
 
 inline void vprint(std::FILE* f, wstring_view fmt, wformat_args args) {
-  wmemory_buffer buffer;
-  detail::vformat_to(buffer, fmt, args);
-  buffer.push_back(L'\0');
-  if (std::fputws(buffer.data(), f) == -1)
+  auto buf = wmemory_buffer();
+  detail::vformat_to(buf, fmt, args);
+  buf.push_back(L'\0');
+  if (std::fputws(buf.data(), f) == -1)
     FMT_THROW(system_error(errno, FMT_STRING("cannot write to file")));
 }
 
@@ -217,13 +237,22 @@ template <typename... T> void print(wformat_string<T...> fmt, T&&... args) {
   return vprint(wstring_view(fmt), fmt::make_wformat_args(args...));
 }
 
+template <typename... T>
+void println(std::FILE* f, wformat_string<T...> fmt, T&&... args) {
+  return print(f, L"{}\n", fmt::format(fmt, std::forward<T>(args)...));
+}
+
+template <typename... T> void println(wformat_string<T...> fmt, T&&... args) {
+  return print(L"{}\n", fmt::format(fmt, std::forward<T>(args)...));
+}
+
 /**
   Converts *value* to ``std::wstring`` using the default format for type *T*.
  */
 template <typename T> inline auto to_wstring(const T& value) -> std::wstring {
   return format(FMT_STRING(L"{}"), value);
 }
-FMT_MODULE_EXPORT_END
+FMT_END_EXPORT
 FMT_END_NAMESPACE
 
 #endif  // FMT_XCHAR_H_

From 2f0df8d6a4d2b54c8693a4a6354db72e830c8b3d Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 1 Nov 2023 13:55:01 +0100
Subject: [PATCH 044/430] Update included libosmium to version 2.20.0

---
 contrib/libosmium/README.contrib              |   2 +-
 contrib/libosmium/README.md                   |  16 +-
 .../osmium/area/detail/node_ref_segment.hpp   |   6 +-
 .../include/osmium/area/detail/proto_ring.hpp |   8 +-
 .../include/osmium/area/detail/vector.hpp     |   4 +-
 .../osmium/area/problem_reporter_ogr.hpp      |  16 +-
 .../include/osmium/builder/builder_helper.hpp | 120 -------------
 .../osmium/builder/osm_object_builder.hpp     |  20 +--
 .../libosmium/include/osmium/geom/factory.hpp |   6 +-
 .../include/osmium/index/bool_vector.hpp      |  50 ------
 .../osmium/index/map/sparse_mem_table.hpp     | 161 ------------------
 .../include/osmium/io/compression.hpp         |   2 +-
 .../osmium/io/detail/debug_output_format.hpp  |   6 +-
 .../osmium/io/detail/opl_parser_functions.hpp |   2 +-
 .../include/osmium/io/detail/pbf_decoder.hpp  |  62 +++----
 .../osmium/io/detail/pbf_output_format.hpp    |  36 ++--
 .../include/osmium/io/detail/read_write.hpp   |   9 +-
 .../include/osmium/io/detail/string_util.hpp  |   2 +-
 .../libosmium/include/osmium/io/reader.hpp    |   2 +-
 .../libosmium/include/osmium/memory/item.hpp  |   4 +-
 contrib/libosmium/include/osmium/osm/box.hpp  |   2 +-
 contrib/libosmium/include/osmium/osm/crc.hpp  |   4 +-
 .../include/osmium/osm/item_type.hpp          |   2 +-
 .../include/osmium/osm/node_ref_list.hpp      |   8 +-
 .../libosmium/include/osmium/osm/object.hpp   |   5 +-
 .../include/osmium/osm/timestamp.hpp          |  49 ++++--
 .../libosmium/include/osmium/thread/pool.hpp  |   2 +-
 .../libosmium/include/osmium/thread/util.hpp  |   2 +-
 .../libosmium/include/osmium/util/cast.hpp    | 105 ------------
 .../libosmium/include/osmium/util/timer.hpp   |   4 +-
 contrib/libosmium/include/osmium/version.hpp  |   9 +-
 31 files changed, 160 insertions(+), 566 deletions(-)
 delete mode 100644 contrib/libosmium/include/osmium/builder/builder_helper.hpp
 delete mode 100644 contrib/libosmium/include/osmium/index/bool_vector.hpp
 delete mode 100644 contrib/libosmium/include/osmium/index/map/sparse_mem_table.hpp
 delete mode 100644 contrib/libosmium/include/osmium/util/cast.hpp

diff --git a/contrib/libosmium/README.contrib b/contrib/libosmium/README.contrib
index 810369d18..9f7e2eff7 100644
--- a/contrib/libosmium/README.contrib
+++ b/contrib/libosmium/README.contrib
@@ -1,2 +1,2 @@
 Source: https://github.com/osmcode/libosmium
-Revision: v2.19.0
+Revision: v2.20.0
diff --git a/contrib/libosmium/README.md b/contrib/libosmium/README.md
index fbb4f62bb..4d73ed7a8 100644
--- a/contrib/libosmium/README.md
+++ b/contrib/libosmium/README.md
@@ -7,8 +7,6 @@ A fast and flexible C++ library for working with OpenStreetMap data.
 Libosmium works on Linux, macOS and Windows.
 
 [![Github Build Status](https://github.com/osmcode/libosmium/workflows/CI/badge.svg?branch=master)](https://github.com/osmcode/libosmium/actions)
-[![Appveyor Build status](https://ci.appveyor.com/api/projects/status/yy099a4vxcb604rn/branch/master?svg=true)](https://ci.appveyor.com/project/lonvia/libosmium-eq41p/branch/master)
-[![Coverage Status](https://codecov.io/gh/osmcode/libosmium/branch/master/graph/badge.svg)](https://codecov.io/gh/osmcode/libosmium)
 [![Packaging status](https://repology.org/badge/tiny-repos/libosmium.svg)](https://repology.org/metapackage/libosmium)
 
 Please see the [Libosmium manual](https://osmcode.org/libosmium/manual.html)
@@ -17,9 +15,8 @@ for more details than this README can provide.
 
 ## Prerequisites
 
-Because Libosmium uses many C++11 features you need a modern compiler and
-standard C++ library. Osmium needs at least GCC 4.8 or clang (LLVM) 3.4.
-(Some parts may work with older versions.)
+You need a C++11 compiler and standard C++ library. Osmium needs at least GCC
+4.8 or clang (LLVM) 3.4. (Some parts may work with older versions.)
 
 Different parts of Libosmium (and the applications built on top of it) need
 different libraries. You DO NOT NEED to install all of them, just install those
@@ -88,16 +85,9 @@ See the
 for instructions.
 
 
-## Switching from the old Osmium
-
-If you have been using the old version of Osmium at
-https://github.com/joto/osmium you might want to read about the [changes
-needed](https://osmcode.org/libosmium/manual.html#changes-from-old-versions-of-osmium).
-
-
 ## License
 
-Libosmium is available under the Boost Software License. See LICENSE.txt.
+Libosmium is available under the Boost Software License. See LICENSE.
 
 
 ## Authors
diff --git a/contrib/libosmium/include/osmium/area/detail/node_ref_segment.hpp b/contrib/libosmium/include/osmium/area/detail/node_ref_segment.hpp
index 6ceb32450..8da4f8ccf 100644
--- a/contrib/libosmium/include/osmium/area/detail/node_ref_segment.hpp
+++ b/contrib/libosmium/include/osmium/area/detail/node_ref_segment.hpp
@@ -193,7 +193,7 @@ namespace osmium {
 
                 const char* role_name() const noexcept {
                     static const std::array<const char*, 4> names = {{"unknown", "outer", "inner", "empty"}};
-                    return names[int(m_role)];
+                    return names[static_cast<int>(m_role)];
                 }
 
                 const osmium::Way* way() const noexcept {
@@ -327,9 +327,9 @@ namespace osmium {
 
                     if ((d > 0 && na >= 0 && na <= d && nb >= 0 && nb <= d) ||
                         (d < 0 && na <= 0 && na >= d && nb <= 0 && nb >= d)) {
-                        const double ua = double(na) / double(d);
+                        const double ua = static_cast<double>(na) / static_cast<double>(d);
                         const vec i = p0 + ua * (p1 - p0);
-                        return osmium::Location{int32_t(i.x), int32_t(i.y)};
+                        return osmium::Location{static_cast<int32_t>(i.x), static_cast<int32_t>(i.y)};
                     }
 
                     return osmium::Location{};
diff --git a/contrib/libosmium/include/osmium/area/detail/proto_ring.hpp b/contrib/libosmium/include/osmium/area/detail/proto_ring.hpp
index d6b2b0820..9b773a0a9 100644
--- a/contrib/libosmium/include/osmium/area/detail/proto_ring.hpp
+++ b/contrib/libosmium/include/osmium/area/detail/proto_ring.hpp
@@ -86,16 +86,16 @@ namespace osmium {
                 int64_t m_num;
 #endif
 
-                int64_t m_sum;
+                int64_t m_sum = 0;
 
             public:
 
                 explicit ProtoRing(NodeRefSegment* segment) noexcept :
-                    m_min_segment(segment),
+                    m_min_segment(segment)
 #ifdef OSMIUM_DEBUG_RING_NO
-                    m_num(next_num()),
+                    , m_num(next_num())
 #endif
-                    m_sum(0) {
+                    {
                     add_segment_back(segment);
                 }
 
diff --git a/contrib/libosmium/include/osmium/area/detail/vector.hpp b/contrib/libosmium/include/osmium/area/detail/vector.hpp
index 50e1cf247..e52a65cc5 100644
--- a/contrib/libosmium/include/osmium/area/detail/vector.hpp
+++ b/contrib/libosmium/include/osmium/area/detail/vector.hpp
@@ -89,12 +89,12 @@ namespace osmium {
 
             // scale vector
             constexpr inline vec operator*(double s, const vec& v) noexcept {
-                return vec{int64_t(s * double(v.x)), int64_t(s * double(v.y))};
+                return vec{static_cast<int64_t>(s * static_cast<double>(v.x)), static_cast<int64_t>(s * static_cast<double>(v.y))};
             }
 
             // scale vector
             constexpr inline vec operator*(const vec& v, double s) noexcept {
-                return vec{int64_t(s * double(v.x)), int64_t(s * double(v.y))};
+                return vec{static_cast<int64_t>(s * static_cast<double>(v.x)), static_cast<int64_t>(s * static_cast<double>(v.y))};
             }
 
             // equality
diff --git a/contrib/libosmium/include/osmium/area/problem_reporter_ogr.hpp b/contrib/libosmium/include/osmium/area/problem_reporter_ogr.hpp
index dc02cda32..bad49f89c 100644
--- a/contrib/libosmium/include/osmium/area/problem_reporter_ogr.hpp
+++ b/contrib/libosmium/include/osmium/area/problem_reporter_ogr.hpp
@@ -75,15 +75,15 @@ namespace osmium {
             void set_object(gdalcpp::Feature& feature) {
                 const char t[2] = {osmium::item_type_to_char(m_object_type), '\0'};
                 feature.set_field("obj_type", t);
-                feature.set_field("obj_id", int32_t(m_object_id));
-                feature.set_field("nodes", int32_t(m_nodes));
+                feature.set_field("obj_id", static_cast<int32_t>(m_object_id));
+                feature.set_field("nodes", static_cast<int32_t>(m_nodes));
             }
 
             void write_point(const char* problem_type, osmium::object_id_type id1, osmium::object_id_type id2, osmium::Location location) {
                 gdalcpp::Feature feature{m_layer_perror, m_ogr_factory.create_point(location)};
                 set_object(feature);
-                feature.set_field("id1", double(id1));
-                feature.set_field("id2", double(id2));
+                feature.set_field("id1", static_cast<double>(id1));
+                feature.set_field("id2", static_cast<double>(id2));
                 feature.set_field("problem", problem_type);
                 feature.add_to_layer();
             }
@@ -176,7 +176,7 @@ namespace osmium {
                 try {
                     gdalcpp::Feature feature{m_layer_lerror, m_ogr_factory.create_linestring(way)};
                     set_object(feature);
-                    feature.set_field("id1", int32_t(way.id()));
+                    feature.set_field("id1", static_cast<int32_t>(way.id()));
                     feature.set_field("id2", 0);
                     feature.set_field("problem", "way_in_multiple_rings");
                     feature.add_to_layer();
@@ -192,7 +192,7 @@ namespace osmium {
                 try {
                     gdalcpp::Feature feature{m_layer_lerror, m_ogr_factory.create_linestring(way)};
                     set_object(feature);
-                    feature.set_field("id1", int32_t(way.id()));
+                    feature.set_field("id1", static_cast<int32_t>(way.id()));
                     feature.set_field("id2", 0);
                     feature.set_field("problem", "inner_with_same_tags");
                     feature.add_to_layer();
@@ -208,7 +208,7 @@ namespace osmium {
                 try {
                     gdalcpp::Feature feature{m_layer_lerror, m_ogr_factory.create_linestring(way)};
                     set_object(feature);
-                    feature.set_field("id1", int32_t(way.id()));
+                    feature.set_field("id1", static_cast<int32_t>(way.id()));
                     feature.set_field("id2", 0);
                     feature.set_field("problem", "duplicate_way");
                     feature.add_to_layer();
@@ -229,7 +229,7 @@ namespace osmium {
                 try {
                     gdalcpp::Feature feature{m_layer_ways, m_ogr_factory.create_linestring(way)};
                     set_object(feature);
-                    feature.set_field("way_id", int32_t(way.id()));
+                    feature.set_field("way_id", static_cast<int32_t>(way.id()));
                     feature.add_to_layer();
                 } catch (const osmium::geometry_error&) {
                     // XXX
diff --git a/contrib/libosmium/include/osmium/builder/builder_helper.hpp b/contrib/libosmium/include/osmium/builder/builder_helper.hpp
deleted file mode 100644
index 97445cb6b..000000000
--- a/contrib/libosmium/include/osmium/builder/builder_helper.hpp
+++ /dev/null
@@ -1,120 +0,0 @@
-#ifndef OSMIUM_BUILDER_BUILDER_HELPER_HPP
-#define OSMIUM_BUILDER_BUILDER_HELPER_HPP
-
-/*
-
-This file is part of Osmium (https://osmcode.org/libosmium).
-
-Copyright 2013-2022 Jochen Topf <jochen@topf.org> and others (see README).
-
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-*/
-
-#include <osmium/builder/osm_object_builder.hpp>
-#include <osmium/memory/buffer.hpp>
-#include <osmium/util/compatibility.hpp>
-
-#include <cstddef>
-#include <functional>
-#include <initializer_list>
-#include <map>
-#include <utility>
-
-namespace osmium {
-
-    class NodeRef;
-    class TagList;
-    class WayNodeList;
-
-    namespace builder {
-
-        /**
-         * @deprecated
-         * Use osmium::builder::add_way_node_list() instead.
-         */
-        OSMIUM_DEPRECATED inline const osmium::WayNodeList& build_way_node_list(osmium::memory::Buffer& buffer, const std::initializer_list<osmium::NodeRef>& nodes) {
-            const size_t pos = buffer.committed();
-            {
-                osmium::builder::WayNodeListBuilder wnl_builder(buffer);
-                for (const auto& node_ref : nodes) {
-                    wnl_builder.add_node_ref(node_ref);
-                }
-            }
-            buffer.commit();
-            return buffer.get<const osmium::WayNodeList>(pos);
-        }
-
-        /**
-         * @deprecated
-         * Use osmium::builder::add_tag_list() instead.
-         */
-        OSMIUM_DEPRECATED inline const osmium::TagList& build_tag_list(osmium::memory::Buffer& buffer, const std::initializer_list<std::pair<const char*, const char*>>& tags) {
-            const size_t pos = buffer.committed();
-            {
-                osmium::builder::TagListBuilder tl_builder(buffer);
-                for (const auto& p : tags) {
-                    tl_builder.add_tag(p.first, p.second);
-                }
-            }
-            buffer.commit();
-            return buffer.get<const osmium::TagList>(pos);
-        }
-
-        /**
-         * @deprecated
-         * Use osmium::builder::add_tag_list() instead.
-         */
-        OSMIUM_DEPRECATED inline const osmium::TagList& build_tag_list_from_map(osmium::memory::Buffer& buffer, const std::map<const char*, const char*>& tags) {
-            const size_t pos = buffer.committed();
-            {
-                osmium::builder::TagListBuilder tl_builder(buffer);
-                for (const auto& p : tags) {
-                    tl_builder.add_tag(p.first, p.second);
-                }
-            }
-            buffer.commit();
-            return buffer.get<const osmium::TagList>(pos);
-        }
-
-        /**
-         * @deprecated
-         * Use osmium::builder::add_tag_list() instead.
-         */
-        OSMIUM_DEPRECATED inline const osmium::TagList& build_tag_list_from_func(osmium::memory::Buffer& buffer, const std::function<void(osmium::builder::TagListBuilder&)>& func) {
-            const size_t pos = buffer.committed();
-            {
-                osmium::builder::TagListBuilder tl_builder(buffer);
-                func(tl_builder);
-            }
-            buffer.commit();
-            return buffer.get<const osmium::TagList>(pos);
-        }
-
-    } // namespace builder
-
-} // namespace osmium
-
-#endif // OSMIUM_BUILDER_BUILDER_HELPER_HPP
diff --git a/contrib/libosmium/include/osmium/builder/osm_object_builder.hpp b/contrib/libosmium/include/osmium/builder/osm_object_builder.hpp
index 589cf3f79..c3228ca7d 100644
--- a/contrib/libosmium/include/osmium/builder/osm_object_builder.hpp
+++ b/contrib/libosmium/include/osmium/builder/osm_object_builder.hpp
@@ -125,8 +125,8 @@ namespace osmium {
                 if (value_length > osmium::max_osm_string_length) {
                     throw std::length_error{"OSM tag value is too long"};
                 }
-                add_size(append_with_zero(key,   osmium::memory::item_size_type(key_length)));
-                add_size(append_with_zero(value, osmium::memory::item_size_type(value_length)));
+                add_size(append_with_zero(key,   static_cast<osmium::memory::item_size_type>(key_length)));
+                add_size(append_with_zero(value, static_cast<osmium::memory::item_size_type>(value_length)));
             }
 
             /**
@@ -142,8 +142,8 @@ namespace osmium {
                 if (value.size() > osmium::max_osm_string_length) {
                     throw std::length_error{"OSM tag value is too long"};
                 }
-                add_size(append(key.data(),   osmium::memory::item_size_type(key.size())   + 1));
-                add_size(append(value.data(), osmium::memory::item_size_type(value.size()) + 1));
+                add_size(append(key.data(),   static_cast<osmium::memory::item_size_type>(key.size())   + 1));
+                add_size(append(value.data(), static_cast<osmium::memory::item_size_type>(value.size()) + 1));
             }
 
             /**
@@ -240,8 +240,8 @@ namespace osmium {
                 if (length > osmium::max_osm_string_length) {
                     throw std::length_error{"OSM relation member role is too long"};
                 }
-                member.set_role_size(osmium::string_size_type(length) + 1);
-                add_size(append_with_zero(role, osmium::memory::item_size_type(length)));
+                member.set_role_size(static_cast<osmium::string_size_type>(length) + 1);
+                add_size(append_with_zero(role, static_cast<osmium::memory::item_size_type>(length)));
                 add_padding(true);
             }
 
@@ -330,16 +330,16 @@ namespace osmium {
                 if (length > osmium::max_osm_string_length) {
                     throw std::length_error{"OSM user name is too long"};
                 }
-                comment.set_user_size(osmium::string_size_type(length) + 1);
-                add_size(append_with_zero(user, osmium::memory::item_size_type(length)));
+                comment.set_user_size(static_cast<osmium::string_size_type>(length) + 1);
+                add_size(append_with_zero(user, static_cast<osmium::memory::item_size_type>(length)));
             }
 
             void add_text(osmium::ChangesetComment& comment, const char* text, const std::size_t length) {
                 if (length > std::numeric_limits<osmium::changeset_comment_size_type>::max() - 1) {
                     throw std::length_error{"OSM changeset comment is too long"};
                 }
-                comment.set_text_size(osmium::changeset_comment_size_type(length) + 1);
-                add_size(append_with_zero(text, osmium::memory::item_size_type(length)));
+                comment.set_text_size(static_cast<osmium::changeset_comment_size_type>(length) + 1);
+                add_size(append_with_zero(text, static_cast<osmium::memory::item_size_type>(length)));
                 add_padding(true);
             }
 
diff --git a/contrib/libosmium/include/osmium/geom/factory.hpp b/contrib/libosmium/include/osmium/geom/factory.hpp
index a3004118b..07c7f2e67 100644
--- a/contrib/libosmium/include/osmium/geom/factory.hpp
+++ b/contrib/libosmium/include/osmium/geom/factory.hpp
@@ -166,7 +166,7 @@ namespace osmium {
 
         public:
 
-            GeometryFactory<TGeomImpl, TProjection>() :
+            GeometryFactory() :
                 m_projection(),
                 m_impl(m_projection.epsg()) {
             }
@@ -175,7 +175,7 @@ namespace osmium {
              * Constructor for default initialized projection.
              */
             template <typename... TArgs>
-            explicit GeometryFactory<TGeomImpl, TProjection>(TArgs&&... args) :
+            explicit GeometryFactory(TArgs&&... args) :
                 m_projection(),
                 m_impl(m_projection.epsg(), std::forward<TArgs>(args)...) {
             }
@@ -185,7 +185,7 @@ namespace osmium {
              * projection is moved into the GeometryFactory.
              */
             template <typename... TArgs>
-            explicit GeometryFactory<TGeomImpl, TProjection>(TProjection&& projection, TArgs&&... args) :
+            explicit GeometryFactory(TProjection&& projection, TArgs&&... args) :
                 m_projection(std::move(projection)),
                 m_impl(m_projection.epsg(), std::forward<TArgs>(args)...) {
             }
diff --git a/contrib/libosmium/include/osmium/index/bool_vector.hpp b/contrib/libosmium/include/osmium/index/bool_vector.hpp
deleted file mode 100644
index 529063565..000000000
--- a/contrib/libosmium/include/osmium/index/bool_vector.hpp
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef OSMIUM_INDEX_BOOL_VECTOR_HPP
-#define OSMIUM_INDEX_BOOL_VECTOR_HPP
-
-/*
-
-This file is part of Osmium (https://osmcode.org/libosmium).
-
-Copyright 2013-2022 Jochen Topf <jochen@topf.org> and others (see README).
-
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-*/
-
-#include <osmium/index/id_set.hpp>
-
-namespace osmium {
-
-    namespace index {
-
-        /// @deprecated Use osmium::index::IdSet instead.
-        template <typename T>
-        using BoolVector = IdSet<T>;
-
-    } // namespace index
-
-} // namespace osmium
-
-#endif // OSMIUM_INDEX_BOOL_VECTOR_HPP
diff --git a/contrib/libosmium/include/osmium/index/map/sparse_mem_table.hpp b/contrib/libosmium/include/osmium/index/map/sparse_mem_table.hpp
deleted file mode 100644
index d92af4de0..000000000
--- a/contrib/libosmium/include/osmium/index/map/sparse_mem_table.hpp
+++ /dev/null
@@ -1,161 +0,0 @@
-#ifndef OSMIUM_INDEX_MAP_SPARSE_MEM_TABLE_HPP
-#define OSMIUM_INDEX_MAP_SPARSE_MEM_TABLE_HPP
-
-/*
-
-This file is part of Osmium (https://osmcode.org/libosmium).
-
-Copyright 2013-2022 Jochen Topf <jochen@topf.org> and others (see README).
-
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-*/
-
-#ifdef OSMIUM_WITH_SPARSEHASH
-
-#include <osmium/index/index.hpp>
-#include <osmium/index/map.hpp>
-#include <osmium/io/detail/read_write.hpp>
-#include <osmium/util/compatibility.hpp>
-
-#include <google/sparsetable>
-
-#include <cstddef>
-#include <utility>
-#include <vector>
-
-#define OSMIUM_HAS_INDEX_MAP_SPARSE_MEM_TABLE
-
-namespace osmium {
-
-    namespace index {
-
-        namespace map {
-
-            /**
-             * The SparseMemTable index stores elements in a Google sparsetable,
-             * a data structure that can hold sparsly filled tables in a
-             * space efficient way. It will resize automatically.
-             *
-             * Use this index if the ID space is only sparsly
-             * populated, such as when working with smaller OSM files (like
-             * country extracts).
-             *
-             * This will only work on 64 bit machines.
-             *
-             * @deprecated
-             * Use one of the other indexes instead.
-             */
-            template <typename TId, typename TValue>
-            class OSMIUM_DEPRECATED SparseMemTable : public osmium::index::map::Map<TId, TValue> {
-
-                TId m_grow_size;
-
-                google::sparsetable<TValue> m_elements;
-
-                static_assert(sizeof(typename google::sparsetable<TValue>::size_type) >= 8, "google::sparsetable needs 64bit machine");
-
-            public:
-
-                /**
-                * Constructor.
-                *
-                * @param grow_size The initial size of the index (ie number of
-                *                  elements that fit into the index).
-                *                  The storage will grow by at least this size
-                *                  every time it runs out of space.
-                */
-                explicit SparseMemTable(const TId grow_size = 10000) :
-                    m_grow_size(grow_size),
-                    m_elements(grow_size) {
-                }
-
-                void set(const TId id, const TValue value) final {
-                    if (id >= m_elements.size()) {
-                        m_elements.resize(id + m_grow_size);
-                    }
-                    m_elements[id] = value;
-                }
-
-                TValue get(const TId id) const final {
-                    if (id >= m_elements.size()) {
-                        throw osmium::not_found{id};
-                    }
-                    const TValue value = m_elements[id];
-                    if (value == osmium::index::empty_value<TValue>()) {
-                        throw osmium::not_found{id};
-                    }
-                    return value;
-                }
-
-                TValue get_noexcept(const TId id) const noexcept final {
-                    if (id >= m_elements.size()) {
-                        return osmium::index::empty_value<TValue>();
-                    }
-                    return m_elements[id];
-                }
-
-                size_t size() const final {
-                    return m_elements.size();
-                }
-
-                size_t used_memory() const final {
-                    // unused elements use 1 bit, used elements sizeof(TValue) bytes
-                    // https://github.com/sparsehash/sparsehash/blob/master/doc/sparsetable.html
-                    return (m_elements.size() / 8) + (m_elements.num_nonempty() * sizeof(TValue));
-                }
-
-                void clear() final {
-                    m_elements.clear();
-                }
-
-                void dump_as_list(const int fd) final {
-                    std::vector<std::pair<TId, TValue>> v;
-                    v.reserve(m_elements.size());
-                    int n = 0;
-                    for (const TValue value : m_elements) {
-                        if (value != osmium::index::empty_value<TValue>()) {
-                            v.emplace_back(n, value);
-                        }
-                        ++n;
-                    }
-                    osmium::io::detail::reliable_write(fd, reinterpret_cast<const char*>(v.data()), sizeof(std::pair<TId, TValue>) * v.size());
-                }
-
-            }; // class SparseMemTable
-
-        } // namespace map
-
-    } // namespace index
-
-} // namespace osmium
-
-#ifdef OSMIUM_WANT_NODE_LOCATION_MAPS
-    REGISTER_MAP(osmium::unsigned_object_id_type, osmium::Location, osmium::index::map::SparseMemTable, sparse_mem_table)
-#endif
-
-#endif // OSMIUM_WITH_SPARSEHASH
-
-#endif // OSMIUM_INDEX_MAP_SPARSE_MEM_TABLE_HPP
diff --git a/contrib/libosmium/include/osmium/io/compression.hpp b/contrib/libosmium/include/osmium/io/compression.hpp
index de7bbfacc..cd45791fd 100644
--- a/contrib/libosmium/include/osmium/io/compression.hpp
+++ b/contrib/libosmium/include/osmium/io/compression.hpp
@@ -357,7 +357,7 @@ namespace osmium {
                         osmium::io::detail::remove_buffered_pages(m_fd, m_offset);
                     }
                     const auto nread = detail::reliable_read(m_fd, &*buffer.begin(), osmium::io::Decompressor::input_buffer_size);
-                    buffer.resize(std::string::size_type(nread));
+                    buffer.resize(static_cast<std::string::size_type>(nread));
                 }
 
                 m_offset += buffer.size();
diff --git a/contrib/libosmium/include/osmium/io/detail/debug_output_format.hpp b/contrib/libosmium/include/osmium/io/detail/debug_output_format.hpp
index 518029a27..d2a09598f 100644
--- a/contrib/libosmium/include/osmium/io/detail/debug_output_format.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/debug_output_format.hpp
@@ -392,7 +392,7 @@ namespace osmium {
                         *m_out += " (open)\n";
                     }
 
-                    const int width = int(std::log10(way.nodes().size())) + 1;
+                    const int width = static_cast<int>(std::log10(way.nodes().size())) + 1;
                     int n = 0;
                     for (const auto& node_ref : way.nodes()) {
                         write_diff();
@@ -427,7 +427,7 @@ namespace osmium {
                     output_int(relation.members().size());
                     *m_out += '\n';
 
-                    const int width = int(std::log10(relation.members().size())) + 1;
+                    const int width = static_cast<int>(std::log10(relation.members().size())) + 1;
                     int n = 0;
                     for (const auto& member : relation.members()) {
                         write_diff();
@@ -485,7 +485,7 @@ namespace osmium {
                         output_int(changeset.num_comments());
                         *m_out += '\n';
 
-                        const int width = int(std::log10(changeset.num_comments())) + 1;
+                        const int width = static_cast<int>(std::log10(changeset.num_comments())) + 1;
                         int n = 0;
                         for (const auto& comment : changeset.discussion()) {
                             write_counter(width, n++);
diff --git a/contrib/libosmium/include/osmium/io/detail/opl_parser_functions.hpp b/contrib/libosmium/include/osmium/io/detail/opl_parser_functions.hpp
index 56f9f5c12..3ce11b44c 100644
--- a/contrib/libosmium/include/osmium/io/detail/opl_parser_functions.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/opl_parser_functions.hpp
@@ -243,7 +243,7 @@ namespace osmium {
                     }
                 }
 
-                return T(value);
+                return static_cast<T>(value);
             }
 
             inline osmium::object_id_type opl_parse_id(const char** s) {
diff --git a/contrib/libosmium/include/osmium/io/detail/pbf_decoder.hpp b/contrib/libosmium/include/osmium/io/detail/pbf_decoder.hpp
index 9d2589dfe..804dd5831 100644
--- a/contrib/libosmium/include/osmium/io/detail/pbf_decoder.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/pbf_decoder.hpp
@@ -168,7 +168,7 @@ namespace osmium {
                             const std::string start_of_string(str_view.data(), 20);
                             throw osmium::pbf_error{"overlong string (" +  start_of_string + "...) in string table"};
                         }
-                        m_stringtable.emplace_back(str_view.data(), osmium::string_size_type(str_view.size()));
+                        m_stringtable.emplace_back(str_view.data(), static_cast<osmium::string_size_type>(str_view.size()));
                     }
                 }
 
@@ -314,11 +314,11 @@ namespace osmium {
                 }
 
                 int32_t convert_pbf_lon(const int64_t c) const noexcept {
-                    return int32_t((c * m_granularity + m_lon_offset) / resolution_convert);
+                    return static_cast<int32_t>((c * m_granularity + m_lon_offset) / resolution_convert);
                 }
 
                 int32_t convert_pbf_lat(const int64_t c) const noexcept {
-                    return int32_t((c * m_granularity + m_lat_offset) / resolution_convert);
+                    return static_cast<int32_t>((c * m_granularity + m_lat_offset) / resolution_convert);
                 }
 
                 void decode_node(const data_view& data) {
@@ -503,7 +503,7 @@ namespace osmium {
                                 throw osmium::pbf_error{"unknown relation member type"};
                             }
                             rml_builder.add_member(
-                                osmium::item_type(type + 1),
+                                static_cast<osmium::item_type>(type + 1),
                                 ref.update(refs.next_sint64()),
                                 r.first,
                                 r.second
@@ -788,7 +788,7 @@ namespace osmium {
                             }
                         case protozero::tag_and_type(FileFormat::Blob::optional_int32_raw_size, protozero::pbf_wire_type::varint):
                             raw_size = pbf_blob.get_int32();
-                            if (raw_size <= 0 || uint32_t(raw_size) > max_uncompressed_blob_size) {
+                            if (raw_size <= 0 || static_cast<uint32_t>(raw_size) > max_uncompressed_blob_size) {
                                 throw osmium::pbf_error{"illegal blob size"};
                             }
                             break;
@@ -809,37 +809,41 @@ namespace osmium {
                         case protozero::tag_and_type(FileFormat::Blob::optional_bytes_zstd_data, protozero::pbf_wire_type::length_delimited):
                             throw osmium::pbf_error{"zstd blobs not supported"};
                         default:
-                            throw osmium::pbf_error{"unknown compression"};
+                            pbf_blob.skip();
                     }
                 }
 
-                if (!compressed_data.empty() && raw_size != 0) {
-                    switch (use_compression) {
-                        case pbf_compression::none:
-                            break;
-                        case pbf_compression::zlib:
-                            return osmium::io::detail::zlib_uncompress_string(
-                                compressed_data.data(),
-                                static_cast<unsigned long>(compressed_data.size()), // NOLINT(google-runtime-int)
-                                static_cast<unsigned long>(raw_size), // NOLINT(google-runtime-int)
-                                output
-                            );
-                        case pbf_compression::lz4:
+                if (compressed_data.empty()) {
+                    throw osmium::pbf_error{"blob contains no data or unknown compression method"};
+                }
+
+                if (raw_size == 0) {
+                    throw osmium::pbf_error{"missing raw_size in compressed blob"};
+                }
+
+                switch (use_compression) {
+                    case pbf_compression::none:
+                        break;
+                    case pbf_compression::zlib:
+                        return osmium::io::detail::zlib_uncompress_string(
+                            compressed_data.data(),
+                            static_cast<unsigned long>(compressed_data.size()), // NOLINT(google-runtime-int)
+                            static_cast<unsigned long>(raw_size), // NOLINT(google-runtime-int)
+                            output
+                        );
+                    case pbf_compression::lz4:
 #ifdef OSMIUM_WITH_LZ4
-                            return osmium::io::detail::lz4_uncompress_string(
-                                compressed_data.data(),
-                                static_cast<unsigned long>(compressed_data.size()), // NOLINT(google-runtime-int)
-                                static_cast<unsigned long>(raw_size), // NOLINT(google-runtime-int)
-                                output
-                            );
+                        return osmium::io::detail::lz4_uncompress_string(
+                            compressed_data.data(),
+                            static_cast<unsigned long>(compressed_data.size()), // NOLINT(google-runtime-int)
+                            static_cast<unsigned long>(raw_size), // NOLINT(google-runtime-int)
+                            output
+                        );
 #else
-                            break;
+                        break;
 #endif
-                    }
-                    std::abort(); // should never be here
                 }
-
-                throw osmium::pbf_error{"blob contains no data"};
+                std::abort(); // should never be here
             }
 
             inline osmium::Box decode_header_bbox(const data_view& data) {
diff --git a/contrib/libosmium/include/osmium/io/detail/pbf_output_format.hpp b/contrib/libosmium/include/osmium/io/detail/pbf_output_format.hpp
index 065014c0e..f6e0f6dcc 100644
--- a/contrib/libosmium/include/osmium/io/detail/pbf_output_format.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/pbf_output_format.hpp
@@ -206,7 +206,7 @@ namespace osmium {
                         m_versions.push_back(static_cast<int32_t>(node.version()));
                     }
                     if (m_options->add_metadata.timestamp()) {
-                        m_timestamps.push_back(m_delta_timestamp.update(uint32_t(node.timestamp())));
+                        m_timestamps.push_back(m_delta_timestamp.update(static_cast<uint32_t>(node.timestamp())));
                     }
                     if (m_options->add_metadata.changeset()) {
                         m_changesets.push_back(m_delta_changeset.update(node.changeset()));
@@ -435,12 +435,12 @@ namespace osmium {
                             pbf_blob.add_bytes(FileFormat::Blob::optional_bytes_raw, m_msg);
                             break;
                         case pbf_compression::zlib:
-                            pbf_blob.add_int32(FileFormat::Blob::optional_int32_raw_size, int32_t(m_msg.size()));
+                            pbf_blob.add_int32(FileFormat::Blob::optional_int32_raw_size, static_cast<int32_t>(m_msg.size()));
                             pbf_blob.add_bytes(FileFormat::Blob::optional_bytes_zlib_data, osmium::io::detail::zlib_compress(m_msg, m_compression_level));
                             break;
                         case pbf_compression::lz4:
 #ifdef OSMIUM_WITH_LZ4
-                            pbf_blob.add_int32(FileFormat::Blob::optional_int32_raw_size, int32_t(m_msg.size()));
+                            pbf_blob.add_int32(FileFormat::Blob::optional_int32_raw_size, static_cast<int32_t>(m_msg.size()));
                             pbf_blob.add_bytes(FileFormat::Blob::optional_bytes_lz4_data, osmium::io::detail::lz4_compress(m_msg, m_compression_level));
                             break;
 #else
@@ -511,14 +511,14 @@ namespace osmium {
                 template <typename T>
                 void add_meta(const osmium::OSMObject& object, T& pbf_object) {
                     {
-                        protozero::packed_field_uint32 field{pbf_object, protozero::pbf_tag_type(T::enum_type::packed_uint32_keys)};
+                        protozero::packed_field_uint32 field{pbf_object, static_cast<protozero::pbf_tag_type>(T::enum_type::packed_uint32_keys)};
                         for (const auto& tag : object.tags()) {
                             field.add_element(m_primitive_block->store_in_stringtable_unsigned(tag.key()));
                         }
                     }
 
                     {
-                        protozero::packed_field_uint32 field{pbf_object, protozero::pbf_tag_type(T::enum_type::packed_uint32_vals)};
+                        protozero::packed_field_uint32 field{pbf_object, static_cast<protozero::pbf_tag_type>(T::enum_type::packed_uint32_vals)};
                         for (const auto& tag : object.tags()) {
                             field.add_element(m_primitive_block->store_in_stringtable_unsigned(tag.value()));
                         }
@@ -532,7 +532,7 @@ namespace osmium {
                             pbf_info.add_int32(OSMFormat::Info::optional_int32_version, static_cast<int32_t>(object.version()));
                         }
                         if (m_options.add_metadata.timestamp()) {
-                            pbf_info.add_int64(OSMFormat::Info::optional_int64_timestamp, uint32_t(object.timestamp()));
+                            pbf_info.add_int64(OSMFormat::Info::optional_int64_timestamp, static_cast<uint32_t>(object.timestamp()));
                         }
                         if (m_options.add_metadata.changeset()) {
                             pbf_info.add_int64(OSMFormat::Info::optional_int64_changeset, object.changeset());
@@ -617,10 +617,10 @@ namespace osmium {
                         protozero::pbf_builder<OSMFormat::HeaderBBox> pbf_header_bbox{pbf_header_block, OSMFormat::HeaderBlock::optional_HeaderBBox_bbox};
 
                         osmium::Box box = header.joined_boxes();
-                        pbf_header_bbox.add_sint64(OSMFormat::HeaderBBox::required_sint64_left,   int64_t(box.bottom_left().lon() * lonlat_resolution));
-                        pbf_header_bbox.add_sint64(OSMFormat::HeaderBBox::required_sint64_right,  int64_t(box.top_right().lon()   * lonlat_resolution));
-                        pbf_header_bbox.add_sint64(OSMFormat::HeaderBBox::required_sint64_top,    int64_t(box.top_right().lat()   * lonlat_resolution));
-                        pbf_header_bbox.add_sint64(OSMFormat::HeaderBBox::required_sint64_bottom, int64_t(box.bottom_left().lat() * lonlat_resolution));
+                        pbf_header_bbox.add_sint64(OSMFormat::HeaderBBox::required_sint64_left,   static_cast<int64_t>(box.bottom_left().lon() * lonlat_resolution));
+                        pbf_header_bbox.add_sint64(OSMFormat::HeaderBBox::required_sint64_right,  static_cast<int64_t>(box.top_right().lon()   * lonlat_resolution));
+                        pbf_header_bbox.add_sint64(OSMFormat::HeaderBBox::required_sint64_top,    static_cast<int64_t>(box.top_right().lat()   * lonlat_resolution));
+                        pbf_header_bbox.add_sint64(OSMFormat::HeaderBBox::required_sint64_bottom, static_cast<int64_t>(box.bottom_left().lat() * lonlat_resolution));
                     }
 
                     pbf_header_block.add_string(OSMFormat::HeaderBlock::repeated_string_required_features, "OsmSchema-V0.6");
@@ -646,7 +646,7 @@ namespace osmium {
                     const std::string osmosis_replication_timestamp{header.get("osmosis_replication_timestamp")};
                     if (!osmosis_replication_timestamp.empty()) {
                         const osmium::Timestamp ts{osmosis_replication_timestamp.c_str()};
-                        pbf_header_block.add_int64(OSMFormat::HeaderBlock::optional_int64_osmosis_replication_timestamp, uint32_t(ts));
+                        pbf_header_block.add_int64(OSMFormat::HeaderBlock::optional_int64_osmosis_replication_timestamp, static_cast<uint32_t>(ts));
                     }
 
                     const std::string osmosis_replication_sequence_number{header.get("osmosis_replication_sequence_number")};
@@ -700,7 +700,7 @@ namespace osmium {
 
                     {
                         osmium::DeltaEncode<object_id_type, int64_t> delta_id;
-                        protozero::packed_field_sint64 field{pbf_way, protozero::pbf_tag_type(OSMFormat::Way::packed_sint64_refs)};
+                        protozero::packed_field_sint64 field{pbf_way, static_cast<protozero::pbf_tag_type>(OSMFormat::Way::packed_sint64_refs)};
                         for (const auto& node_ref : way.nodes()) {
                             field.add_element(delta_id.update(node_ref.ref()));
                         }
@@ -709,14 +709,14 @@ namespace osmium {
                     if (m_options.locations_on_ways) {
                         {
                             osmium::DeltaEncode<int64_t, int64_t> delta;
-                            protozero::packed_field_sint64 field{pbf_way, protozero::pbf_tag_type(OSMFormat::Way::packed_sint64_lon)};
+                            protozero::packed_field_sint64 field{pbf_way, static_cast<protozero::pbf_tag_type>(OSMFormat::Way::packed_sint64_lon)};
                             for (const auto& node_ref : way.nodes()) {
                                 field.add_element(delta.update(node_ref.location().x()));
                             }
                         }
                         {
                             osmium::DeltaEncode<int64_t, int64_t> delta;
-                            protozero::packed_field_sint64 field{pbf_way, protozero::pbf_tag_type(OSMFormat::Way::packed_sint64_lat)};
+                            protozero::packed_field_sint64 field{pbf_way, static_cast<protozero::pbf_tag_type>(OSMFormat::Way::packed_sint64_lat)};
                             for (const auto& node_ref : way.nodes()) {
                                 field.add_element(delta.update(node_ref.location().y()));
                             }
@@ -732,7 +732,7 @@ namespace osmium {
                     add_meta(relation, pbf_relation);
 
                     {
-                        protozero::packed_field_int32 field{pbf_relation, protozero::pbf_tag_type(OSMFormat::Relation::packed_int32_roles_sid)};
+                        protozero::packed_field_int32 field{pbf_relation, static_cast<protozero::pbf_tag_type>(OSMFormat::Relation::packed_int32_roles_sid)};
                         for (const auto& member : relation.members()) {
                             field.add_element(m_primitive_block->store_in_stringtable(member.role()));
                         }
@@ -740,16 +740,16 @@ namespace osmium {
 
                     {
                         osmium::DeltaEncode<object_id_type, int64_t> delta_id;
-                        protozero::packed_field_sint64 field{pbf_relation, protozero::pbf_tag_type(OSMFormat::Relation::packed_sint64_memids)};
+                        protozero::packed_field_sint64 field{pbf_relation, static_cast<protozero::pbf_tag_type>(OSMFormat::Relation::packed_sint64_memids)};
                         for (const auto& member : relation.members()) {
                             field.add_element(delta_id.update(member.ref()));
                         }
                     }
 
                     {
-                        protozero::packed_field_int32 field{pbf_relation, protozero::pbf_tag_type(OSMFormat::Relation::packed_MemberType_types)};
+                        protozero::packed_field_int32 field{pbf_relation, static_cast<protozero::pbf_tag_type>(OSMFormat::Relation::packed_MemberType_types)};
                         for (const auto& member : relation.members()) {
-                            field.add_element(int32_t(osmium::item_type_to_nwr_index(member.type())));
+                            field.add_element(static_cast<int32_t>(osmium::item_type_to_nwr_index(member.type())));
                         }
                     }
                 }
diff --git a/contrib/libosmium/include/osmium/io/detail/read_write.hpp b/contrib/libosmium/include/osmium/io/detail/read_write.hpp
index 53cf30d42..bde056b6d 100644
--- a/contrib/libosmium/include/osmium/io/detail/read_write.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/read_write.hpp
@@ -106,9 +106,10 @@ namespace osmium {
                     return 0; // stdin
                 }
 
-                int flags = O_RDONLY;
 #ifdef _WIN32
-                flags |= O_BINARY;
+                const int flags = O_RDONLY | O_BINARY;
+#else
+                const int flags = O_RDONLY;
 #endif
                 const int fd = ::open(filename.c_str(), flags);
                 if (fd < 0) {
@@ -253,7 +254,7 @@ namespace osmium {
              * needed again soon. Keeps the buffer cache clear for other
              * things.
              */
-#ifdef __linux__
+#if defined(__linux__) || defined(__FreeBSD__)
             inline void remove_buffered_pages(int fd) noexcept {
                 if (fd > 0) {
                     ::posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED);
@@ -269,7 +270,7 @@ namespace osmium {
              * file that will not be needed again soon. Keeps the buffer cache
              * clear for other things.
              */
-#ifdef __linux__
+#if defined(__linux__) || defined(__FreeBSD__)
             inline void remove_buffered_pages(int fd, std::size_t size) noexcept {
                 constexpr const std::size_t block_size = 4096;
                 // Make sure to keep the last 10 blocks around, so were are
diff --git a/contrib/libosmium/include/osmium/io/detail/string_util.hpp b/contrib/libosmium/include/osmium/io/detail/string_util.hpp
index 706619881..ea5855613 100644
--- a/contrib/libosmium/include/osmium/io/detail/string_util.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/string_util.hpp
@@ -113,7 +113,7 @@ namespace osmium {
 #endif
                                      string_snprintf(out,
                                                      old_size,
-                                                     std::size_t(len) + 1,
+                                                     static_cast<std::size_t>(len) + 1,
                                                      format,
                                                      args...);
                     assert(len2 == len);
diff --git a/contrib/libosmium/include/osmium/io/reader.hpp b/contrib/libosmium/include/osmium/io/reader.hpp
index 691638069..643ffcd0c 100644
--- a/contrib/libosmium/include/osmium/io/reader.hpp
+++ b/contrib/libosmium/include/osmium/io/reader.hpp
@@ -248,7 +248,7 @@ namespace osmium {
 #endif
                 }
                 const int fd = osmium::io::detail::open_for_reading(filename);
-#if __linux__
+#if defined(__linux__) || defined(__FreeBSD__)
                 if (fd >= 0) {
                     // Tell the kernel we are going to read this file sequentially
                     ::posix_fadvise(fd, 0, 0, POSIX_FADV_SEQUENTIAL);
diff --git a/contrib/libosmium/include/osmium/memory/item.hpp b/contrib/libosmium/include/osmium/memory/item.hpp
index 3c6b2ecd5..a262371dd 100644
--- a/contrib/libosmium/include/osmium/memory/item.hpp
+++ b/contrib/libosmium/include/osmium/memory/item.hpp
@@ -181,7 +181,7 @@ namespace osmium {
             }
 
             diff_indicator_type diff() const noexcept {
-                return diff_indicator_type(m_diff);
+                return static_cast<diff_indicator_type>(m_diff);
             }
 
             char diff_as_char() const noexcept {
@@ -190,7 +190,7 @@ namespace osmium {
             }
 
             void set_diff(const diff_indicator_type diff) noexcept {
-                m_diff = uint16_t(diff);
+                m_diff = static_cast<uint16_t>(diff);
             }
 
         }; // class Item
diff --git a/contrib/libosmium/include/osmium/osm/box.hpp b/contrib/libosmium/include/osmium/osm/box.hpp
index f4da3fdca..f477a4f81 100644
--- a/contrib/libosmium/include/osmium/osm/box.hpp
+++ b/contrib/libosmium/include/osmium/osm/box.hpp
@@ -136,7 +136,7 @@ namespace osmium {
          * Box is defined, ie. contains defined locations.
          */
         explicit constexpr operator bool() const noexcept {
-            return bool(m_bottom_left) && bool(m_top_right);
+            return static_cast<bool>(m_bottom_left) && static_cast<bool>(m_top_right);
         }
 
         /**
diff --git a/contrib/libosmium/include/osmium/osm/crc.hpp b/contrib/libosmium/include/osmium/osm/crc.hpp
index b6a806c1c..88441cae2 100644
--- a/contrib/libosmium/include/osmium/osm/crc.hpp
+++ b/contrib/libosmium/include/osmium/osm/crc.hpp
@@ -155,7 +155,7 @@ namespace osmium {
         }
 
         void update(const Timestamp& timestamp) noexcept {
-            update_int32(uint32_t(timestamp));
+            update_int32(static_cast<uint32_t>(timestamp));
         }
 
         void update(const osmium::Location& location) noexcept {
@@ -188,7 +188,7 @@ namespace osmium {
 
         void update(const osmium::RelationMember& member) noexcept {
             update_int64(static_cast<uint64_t>(member.ref()));
-            update_int16(uint16_t(member.type()));
+            update_int16(static_cast<uint16_t>(member.type()));
             update_string(member.role());
         }
 
diff --git a/contrib/libosmium/include/osmium/osm/item_type.hpp b/contrib/libosmium/include/osmium/osm/item_type.hpp
index 5217d1639..c10eca7d6 100644
--- a/contrib/libosmium/include/osmium/osm/item_type.hpp
+++ b/contrib/libosmium/include/osmium/osm/item_type.hpp
@@ -70,7 +70,7 @@ namespace osmium {
      */
     inline item_type nwr_index_to_item_type(unsigned int i) noexcept {
         assert(i <= 2);
-        return item_type(i + 1);
+        return static_cast<item_type>(i + 1);
     }
 
     /**
diff --git a/contrib/libosmium/include/osmium/osm/node_ref_list.hpp b/contrib/libosmium/include/osmium/osm/node_ref_list.hpp
index 12b2b1d85..6d7c67b77 100644
--- a/contrib/libosmium/include/osmium/osm/node_ref_list.hpp
+++ b/contrib/libosmium/include/osmium/osm/node_ref_list.hpp
@@ -197,22 +197,22 @@ namespace osmium {
 
         /// Returns an iterator to the beginning.
         iterator begin() noexcept {
-            return iterator(data() + sizeof(NodeRefList));
+            return reinterpret_cast<iterator>(data() + sizeof(NodeRefList));
         }
 
         /// Returns an iterator to the end.
         iterator end() noexcept {
-            return iterator(data() + byte_size());
+            return reinterpret_cast<iterator>(data() + byte_size());
         }
 
         /// Returns an iterator to the beginning.
         const_iterator cbegin() const noexcept {
-            return const_iterator(data() + sizeof(NodeRefList));
+            return reinterpret_cast<const_iterator>(data() + sizeof(NodeRefList));
         }
 
         /// Returns an iterator to the end.
         const_iterator cend() const noexcept {
-            return const_iterator(data() + byte_size());
+            return reinterpret_cast<const_iterator>(data() + byte_size());
         }
 
         /// Returns an iterator to the beginning.
diff --git a/contrib/libosmium/include/osmium/osm/object.hpp b/contrib/libosmium/include/osmium/osm/object.hpp
index c4a07f492..a62c7603a 100644
--- a/contrib/libosmium/include/osmium/osm/object.hpp
+++ b/contrib/libosmium/include/osmium/osm/object.hpp
@@ -307,8 +307,9 @@ namespace osmium {
          */
         OSMObject& set_timestamp(const char* timestamp) {
             assert(timestamp);
-            m_timestamp = detail::parse_timestamp(timestamp);
-            if (timestamp[20] != '\0') {
+            const char** str = &timestamp;
+            m_timestamp = detail::parse_timestamp(str);
+            if (**str != '\0') {
                 throw std::invalid_argument{"can not parse timestamp: garbage after timestamp"};
             }
             return *this;
diff --git a/contrib/libosmium/include/osmium/osm/timestamp.hpp b/contrib/libosmium/include/osmium/osm/timestamp.hpp
index 55dc777b5..e6cf1c458 100644
--- a/contrib/libosmium/include/osmium/osm/timestamp.hpp
+++ b/contrib/libosmium/include/osmium/osm/timestamp.hpp
@@ -79,7 +79,30 @@ namespace osmium {
             out += static_cast<char>('0' + value);
         }
 
-        inline time_t parse_timestamp(const char* str) {
+        inline bool fractional_seconds(const char** s) noexcept {
+            const char* str = *s;
+
+            if (*str != '.' && *str != ',') {
+                return false;
+            }
+
+            ++str;
+            if (*str < '0' || *str > '9') {
+                return false;
+            }
+
+            do {
+                ++str;
+            } while (*str >= '0' && *str <= '9');
+
+            *s = str;
+            return *str == 'Z';
+        }
+
+        inline std::time_t parse_timestamp(const char** s) {
+            const char* str = *s;
+            *s += 19;
+
             static const std::array<int, 12> mon_lengths = {{
                 31, 29, 31, 30, 31, 30,
                 31, 31, 30, 31, 30, 31
@@ -104,7 +127,8 @@ namespace osmium {
                 str[16] == ':' &&
                 str[17] >= '0' && str[17] <= '9' &&
                 str[18] >= '0' && str[18] <= '9' &&
-                str[19] == 'Z') {
+                (str[19] == 'Z' || fractional_seconds(s))) {
+                ++(*s);
                 std::tm tm; // NOLINT(cppcoreguidelines-pro-type-member-init,hicpp-member-init)
                 tm.tm_year = (str[ 0] - '0') * 1000 +
                              (str[ 1] - '0') *  100 +
@@ -134,6 +158,11 @@ namespace osmium {
             throw std::invalid_argument{std::string{"can not parse timestamp: '"} + str + "'"};
         }
 
+        inline std::time_t parse_timestamp(const char* s) {
+            const char** str = &s;
+            return parse_timestamp(str);
+        }
+
     } // namespace detail
 
     /**
@@ -149,7 +178,7 @@ namespace osmium {
 
         void to_iso_str(std::string& s) const {
             std::tm tm; // NOLINT(cppcoreguidelines-pro-type-member-init,hicpp-member-init)
-            time_t sse = seconds_since_epoch();
+            const std::time_t sse = seconds_since_epoch();
 #ifndef NDEBUG
             auto result =
 #endif
@@ -193,7 +222,7 @@ namespace osmium {
          */
         template <typename T, typename std::enable_if<std::is_integral<T>::value, int>::type = 0>
         constexpr Timestamp(T timestamp) noexcept : // NOLINT(google-explicit-constructor, hicpp-explicit-conversions)
-            m_timestamp(uint32_t(timestamp)) {
+            m_timestamp(static_cast<uint32_t>(timestamp)) {
         }
 
         /**
@@ -230,18 +259,18 @@ namespace osmium {
         }
 
         /// Explicit conversion into time_t.
-        constexpr time_t seconds_since_epoch() const noexcept {
-            return time_t(m_timestamp);
+        constexpr std::time_t seconds_since_epoch() const noexcept {
+            return static_cast<std::time_t>(m_timestamp);
         }
 
         /// Explicit conversion into uint32_t.
         explicit constexpr operator uint32_t() const noexcept {
-            return uint32_t(m_timestamp);
+            return m_timestamp;
         }
 
         /// Explicit conversion into uint64_t.
         explicit constexpr operator uint64_t() const noexcept {
-            return uint64_t(m_timestamp);
+            return static_cast<uint64_t>(m_timestamp);
         }
 
         template <typename T>
@@ -307,7 +336,7 @@ namespace osmium {
     }
 
     inline bool operator==(const Timestamp& lhs, const Timestamp& rhs) noexcept {
-        return uint32_t(lhs) == uint32_t(rhs);
+        return static_cast<uint32_t>(lhs) == static_cast<uint32_t>(rhs);
     }
 
     inline bool operator!=(const Timestamp& lhs, const Timestamp& rhs) noexcept {
@@ -315,7 +344,7 @@ namespace osmium {
     }
 
     inline bool operator<(const Timestamp& lhs, const Timestamp& rhs) noexcept {
-        return uint32_t(lhs) < uint32_t(rhs);
+        return static_cast<uint32_t>(lhs) < static_cast<uint32_t>(rhs);
     }
 
     inline bool operator>(const Timestamp& lhs, const Timestamp& rhs) noexcept {
diff --git a/contrib/libosmium/include/osmium/thread/pool.hpp b/contrib/libosmium/include/osmium/thread/pool.hpp
index fbc5deea9..889113289 100644
--- a/contrib/libosmium/include/osmium/thread/pool.hpp
+++ b/contrib/libosmium/include/osmium/thread/pool.hpp
@@ -66,7 +66,7 @@ namespace osmium {
                 }
 
                 if (num_threads < 0) {
-                    num_threads += int(hardware_concurrency);
+                    num_threads += static_cast<int>(hardware_concurrency);
                 }
 
                 if (num_threads < 1) {
diff --git a/contrib/libosmium/include/osmium/thread/util.hpp b/contrib/libosmium/include/osmium/thread/util.hpp
index 694165964..b5a2ef10d 100644
--- a/contrib/libosmium/include/osmium/thread/util.hpp
+++ b/contrib/libosmium/include/osmium/thread/util.hpp
@@ -72,7 +72,7 @@ namespace osmium {
         }
 
         /**
-         * Set name of current thread for debugging. This only works on Linux.
+         * Set name of current thread for debugging. This currently only works on Linux and FreeBSD.
          */
 #if defined(__linux__)
         inline void set_thread_name(const char* name) noexcept {
diff --git a/contrib/libosmium/include/osmium/util/cast.hpp b/contrib/libosmium/include/osmium/util/cast.hpp
deleted file mode 100644
index 9d2a37a6a..000000000
--- a/contrib/libosmium/include/osmium/util/cast.hpp
+++ /dev/null
@@ -1,105 +0,0 @@
-#ifndef OSMIUM_UTIL_CAST_HPP
-#define OSMIUM_UTIL_CAST_HPP
-
-/*
-
-This file is part of Osmium (https://osmcode.org/libosmium).
-
-Copyright 2013-2022 Jochen Topf <jochen@topf.org> and others (see README).
-
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-*/
-
-#include <osmium/util/compatibility.hpp>
-
-#ifndef assert
-# include <cassert>
-#endif
-
-#include <cstdint>
-#include <limits>
-#include <type_traits>
-
-namespace osmium {
-
-    // These functions are wrappers around static_cast<>() that call assert()
-    // to check that there is no integer overflow happening before doing the
-    // cast. There are several versions of this templated function here
-    // depending on the types of the input and output. In any case, both input
-    // and output have to be integral types. If the cast can't overflow, no
-    // check is done.
-
-    template <typename A, typename B>
-    struct are_real_integers :
-        std::integral_constant<bool,
-            std::is_integral<A>::value &&
-            std::is_integral<B>::value &&
-            !std::is_same<A, bool>::value &&
-            !std::is_same<B, bool>::value> {
-    };
-
-    template <typename T, typename F, typename std::enable_if<are_real_integers<T, F>::value && std::is_same<T, F>::value, int>::type = 0>
-    OSMIUM_DEPRECATED inline T static_cast_with_assert(const F value) {
-        return value;
-    }
-
-    template <typename T, typename F, typename std::enable_if<are_real_integers<T, F>::value && !std::is_same<T, F>::value && (sizeof(T) > sizeof(F)), int>::type = 0>
-    OSMIUM_DEPRECATED inline T static_cast_with_assert(const F value) {
-        return static_cast<T>(value);
-    }
-
-    template <typename T, typename F, typename std::enable_if<are_real_integers<T, F>::value && !std::is_same<T, F>::value && std::is_signed<T>::value == std::is_signed<F>::value && (sizeof(T) == sizeof(F)), int>::type = 0>
-    OSMIUM_DEPRECATED inline T static_cast_with_assert(const F value) {
-        return static_cast<T>(value);
-    }
-
-    template <typename T, typename F, typename std::enable_if<are_real_integers<T, F>::value && !std::is_same<T, F>::value && (sizeof(T) < sizeof(F)) && std::is_signed<T>::value && std::is_signed<F>::value, int>::type = 0>
-    OSMIUM_DEPRECATED inline T static_cast_with_assert(const F value) {
-        assert(value >= std::numeric_limits<T>::min() && value <= std::numeric_limits<T>::max());
-        return static_cast<T>(value);
-    }
-
-    template <typename T, typename F, typename std::enable_if<are_real_integers<T, F>::value && !std::is_same<T, F>::value && (sizeof(T) <= sizeof(F)) && std::is_unsigned<T>::value && std::is_signed<F>::value, int>::type = 0>
-    OSMIUM_DEPRECATED inline T static_cast_with_assert(const F value) {
-        assert(value >= 0 && static_cast<typename std::make_unsigned<F>::type>(value) <= std::numeric_limits<T>::max());
-        return static_cast<T>(value);
-    }
-
-    template <typename T, typename F, typename std::enable_if<are_real_integers<T, F>::value && !std::is_same<T, F>::value && (sizeof(T) < sizeof(F)) && std::is_unsigned<T>::value && std::is_unsigned<F>::value, int>::type = 0>
-    OSMIUM_DEPRECATED inline T static_cast_with_assert(const F value) {
-        assert(value <= std::numeric_limits<T>::max());
-        return static_cast<T>(value);
-    }
-
-    template <typename T, typename F, typename std::enable_if<are_real_integers<T, F>::value && !std::is_same<T, F>::value && (sizeof(T) <= sizeof(F)) && std::is_signed<T>::value && std::is_unsigned<F>::value, int>::type = 0>
-    OSMIUM_DEPRECATED inline T static_cast_with_assert(const F value) {
-        assert(static_cast<int64_t>(value) <= static_cast<int64_t>(std::numeric_limits<T>::max()));
-        return static_cast<T>(value);
-    }
-
-} // namespace osmium
-
-#endif // OSMIUM_UTIL_CAST_HPP
diff --git a/contrib/libosmium/include/osmium/util/timer.hpp b/contrib/libosmium/include/osmium/util/timer.hpp
index adcdcbf98..58ea1deb3 100644
--- a/contrib/libosmium/include/osmium/util/timer.hpp
+++ b/contrib/libosmium/include/osmium/util/timer.hpp
@@ -79,10 +79,10 @@ namespace osmium {
 
         Timer() = default;
 
-        void start() const noexcept { // NOLINT(readability-convert-member-functions-to-static)
+        void start() noexcept { // NOLINT(readability-convert-member-functions-to-static)
         }
 
-        void stop() const noexcept { // NOLINT(readability-convert-member-functions-to-static)
+        void stop() noexcept { // NOLINT(readability-convert-member-functions-to-static)
         }
 
         int64_t elapsed_microseconds() const noexcept { // NOLINT(readability-convert-member-functions-to-static)
diff --git a/contrib/libosmium/include/osmium/version.hpp b/contrib/libosmium/include/osmium/version.hpp
index bd240ee3b..1ecfc3c7f 100644
--- a/contrib/libosmium/include/osmium/version.hpp
+++ b/contrib/libosmium/include/osmium/version.hpp
@@ -33,10 +33,15 @@ DEALINGS IN THE SOFTWARE.
 
 */
 
+// NOLINTNEXTLINE(modernize-macro-to-enum)
 #define LIBOSMIUM_VERSION_MAJOR 2
-#define LIBOSMIUM_VERSION_MINOR 19
+
+// NOLINTNEXTLINE(modernize-macro-to-enum)
+#define LIBOSMIUM_VERSION_MINOR 20
+
+// NOLINTNEXTLINE(modernize-macro-to-enum)
 #define LIBOSMIUM_VERSION_PATCH 0
 
-#define LIBOSMIUM_VERSION_STRING "2.19.0"
+#define LIBOSMIUM_VERSION_STRING "2.20.0"
 
 #endif // OSMIUM_VERSION_HPP

From 4666b4e663e5e3c4b7e876ceb869938cdf671296 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 1 Nov 2023 14:22:11 +0100
Subject: [PATCH 045/430] Increase the max number of jobs for osm2pgsql-gen to
 256

We have a limit of 256 set in line 688 already.

Fixes #2086
---
 src/gen/osm2pgsql-gen.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index 24dffe431..31cbaa50b 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -89,7 +89,7 @@ Main Options:
     -a|--append           Run in append mode
     -c|--create           Run in create mode (default)
     -S|--style=FILE       The Lua config file (same as for osm2pgsql)
-    -j|--jobs=NUM         Number of parallel jobs (default 1)
+    -j|--jobs=NUM         Number of parallel jobs (default 1, max 256)
        --middle-schema=SCHEMA  Database schema for middle tables (default set with --schema)
        --schema=SCHEMA    Default database schema (default: 'public')
 
@@ -751,11 +751,6 @@ int main(int argc, char *argv[])
             return 2;
         }
 
-        if (jobs < 1 || jobs > 32) {
-            log_error("The --jobs/-j parameter must be between 1 and 32.");
-            return 2;
-        }
-
         if (middle_dbschema.empty()) {
             middle_dbschema = dbschema;
         }

From 20e94c97882a200ae3ee7f020ea90ada4ecbc67c Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 3 Nov 2023 11:01:32 +0100
Subject: [PATCH 046/430] Github action: Remove OpenCV lib from windows build

It is only needed for building osm2pgsql-gen but that also needs potrace
which is not installed, because it isn't available as vcpkg.
---
 .github/actions/win-install/action.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/actions/win-install/action.yml b/.github/actions/win-install/action.yml
index ff558df73..e44cfd300 100644
--- a/.github/actions/win-install/action.yml
+++ b/.github/actions/win-install/action.yml
@@ -16,7 +16,6 @@ runs:
           libpq:x64-windows \
           lua:x64-windows \
           nlohmann-json:x64-windows \
-          opencv:x64-windows \
           proj4:x64-windows \
           zlib:x64-windows
       shell: bash

From 3f1731f5832c45a985705377190895fc69dc1447 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 3 Nov 2023 20:25:46 +0100
Subject: [PATCH 047/430] Github action: Disable build on macOS 11

Because it doesn't work any more. Github actions output shows this
message:

Error: You are using macOS 11.
We (and Apple) do not provide support for this old version.
It is expected behaviour that some formulae will fail to build in this old version.
It is expected behaviour that Homebrew will be buggy and slow.
Do not create any issues about this on Homebrew's GitHub repositories.
Do not create any issues even if you think this message is unrelated.
Any opened issues will be immediately closed without response.
Do not ask for help from Homebrew or its maintainers on social media.
You may ask for help in Homebrew's discussions but are unlikely to receive a response.
Try to figure out the problem yourself and submit a fix as a pull request.
We will review it but may or may not accept it.
---
 .github/workflows/ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4adbcbf60..e79640345 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,6 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - "macos-11"
           - "macos-12" # latest
           - "macos-13"
     runs-on: ${{ matrix.os }}

From dccc0ba5b0015179521e1b55c2a757edfe4caa61 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 1 Nov 2023 22:15:12 +0100
Subject: [PATCH 048/430] Add proj.db to Windows artifact

See #1949
---
 .github/actions/win-install/action.yml | 2 +-
 .github/workflows/ci.yml               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/win-install/action.yml b/.github/actions/win-install/action.yml
index e44cfd300..82bcf0c84 100644
--- a/.github/actions/win-install/action.yml
+++ b/.github/actions/win-install/action.yml
@@ -16,7 +16,7 @@ runs:
           libpq:x64-windows \
           lua:x64-windows \
           nlohmann-json:x64-windows \
-          proj4:x64-windows \
+          proj:x64-windows \
           zlib:x64-windows
       shell: bash
     - name: Install psycopg2 and behave
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e79640345..fef5c3daf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -436,7 +436,7 @@ jobs:
         run: |
           mkdir c:/artifact/
           mkdir c:/artifact/osm2pgsql-bin
-          cp -r Release/* ../README.md ../COPYING ../*.style ../scripts ../flex-config c:/artifact/osm2pgsql-bin/
+          cp -r Release/* ../README.md ../COPYING ../*.style ../scripts ../flex-config c:/vcpkg/installed/x64-windows/share/proj/proj.db c:/artifact/osm2pgsql-bin/
         shell: bash
         working-directory: build
         if: matrix.os == 'windows-2022'

From 1c4093562c68eba9869d2bbc8f89a92acda4e273 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 7 Nov 2023 10:55:33 +0100
Subject: [PATCH 049/430] Make CMake quiet if opencv ist not found

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c715ce1d8..06e1176ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -211,7 +211,7 @@ include_directories(SYSTEM ${NLOHMANN_INCLUDE_DIR})
 find_path(POTRACE_INCLUDE_DIR potracelib.h)
 find_library(POTRACE_LIBRARY NAMES potrace)
 
-find_package(OpenCV OPTIONAL_COMPONENTS core imgcodecs imgproc)
+find_package(OpenCV QUIET OPTIONAL_COMPONENTS core imgcodecs imgproc)
 
 ############### Libraries are found now ########################
 

From fbdfef855fdcec4983f8063d40250c3896ad673f Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 7 Nov 2023 10:59:26 +0100
Subject: [PATCH 050/430] prepare release 1.10.0

---
 CMakeLists.txt              |  2 +-
 man/osm2pgsql-gen.1         | 23 +++++++++++++++++++----
 man/osm2pgsql-replication.1 |  2 +-
 man/osm2pgsql.1             |  2 +-
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06e1176ba..2ef07fd34 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 cmake_minimum_required(VERSION 3.8.0)
 
-project(osm2pgsql VERSION 1.9.2 LANGUAGES CXX C)
+project(osm2pgsql VERSION 1.10.0 LANGUAGES CXX C)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
diff --git a/man/osm2pgsql-gen.1 b/man/osm2pgsql-gen.1
index 8055c5e18..6075f0f2f 100644
--- a/man/osm2pgsql-gen.1
+++ b/man/osm2pgsql-gen.1
@@ -1,4 +1,4 @@
-.TH "OSM2PGSQL" "1" "1.8.1" "" ""
+.TH "OSM2PGSQL" "1" "1.10.0" "" ""
 .SH NAME
 .PP
 osm2pgsql-gen - Generalize OpenStreetMap data - EXPERIMENTAL!
@@ -23,7 +23,7 @@ information.
 .SH OPTIONS
 .PP
 This program follows the usual GNU command line syntax, with long
-options starting with two dashes (\f[C]--\f[R]).
+options starting with two dashes (\f[V]--\f[R]).
 Mandatory arguments to long options are mandatory for short options too.
 .SH MAIN OPTIONS
 .TP
@@ -37,6 +37,8 @@ This is the default if \f[B]-a, --append\f[R] is not specified.
 -S, --style=FILE
 The Lua config file.
 Same as for \f[B]osm2pgsql\f[R].
+Usually not required because it is read from the
+\f[V]osm2pgsql_properties\f[R] table.
 .TP
 -j, -jobs=NUM
 Specifies the number of parallel threads used for certain operations.
@@ -60,8 +62,8 @@ Enable logging of SQL commands for debugging.
 .TP
 -d, --database=NAME
 The name of the PostgreSQL database to connect to.
-If this parameter contains an \f[C]=\f[R] sign or starts with a valid
-URI prefix (\f[C]postgresql://\f[R] or \f[C]postgres://\f[R]), it is
+If this parameter contains an \f[V]=\f[R] sign or starts with a valid
+URI prefix (\f[V]postgresql://\f[R] or \f[V]postgres://\f[R]), it is
 treated as a conninfo string.
 See the PostgreSQL manual for details.
 .TP
@@ -76,6 +78,19 @@ Database server hostname or unix domain socket location.
 .TP
 -P, --port=PORT
 Database server port.
+.TP
+--schema=SCHEMA
+Default for various schema settings throughout osm2pgsql-gen (default:
+\f[V]public\f[R]).
+The schema must exist in the database and be writable by the database
+user.
+It must be the same as used with \f[V]osm2pgsql\f[R].
+.TP
+--middle-schema=SCHEMA
+Database schema where the \f[V]osm2pgsql_properties\f[R] table is to be
+found.
+Default set with \f[V]--schema\f[R].
+Set to the same value as on the \f[V]osm2pgsql\f[R] command line.
 .SH SEE ALSO
 .IP \[bu] 2
 osm2pgsql website (https://osm2pgsql.org)
diff --git a/man/osm2pgsql-replication.1 b/man/osm2pgsql-replication.1
index 3d1109b03..df8211242 100644
--- a/man/osm2pgsql-replication.1
+++ b/man/osm2pgsql-replication.1
@@ -1,4 +1,4 @@
-.TH "OSM2PGSQL-REPLICATION" "1" "1.9.2" "" ""
+.TH "OSM2PGSQL-REPLICATION" "1" "1.10.0" "" ""
 .SH NAME
 osm2pgsql-replication \- osm2pgsql database updater
 .SH SYNOPSIS
diff --git a/man/osm2pgsql.1 b/man/osm2pgsql.1
index dd69f9556..75c10115c 100644
--- a/man/osm2pgsql.1
+++ b/man/osm2pgsql.1
@@ -1,4 +1,4 @@
-.TH "OSM2PGSQL" "1" "1.9.2" "" ""
+.TH "OSM2PGSQL" "1" "1.10.0" "" ""
 .SH NAME
 .PP
 osm2pgsql - OpenStreetMap data to PostgreSQL converter

From 6ea486502fd0ae030ab12c052a60a1fd66b24644 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 18 Dec 2023 17:34:25 +0100
Subject: [PATCH 051/430] Github action: Disable build on macOS 13

Because it doesn't work due to some problem with Homebrew
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fef5c3daf..57e13814e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
       matrix:
         os:
           - "macos-12" # latest
-          - "macos-13"
+#          - "macos-13" disabled, because it doesn't work due to some problem with Homebrew
     runs-on: ${{ matrix.os }}
 
     env:

From d9d0d63572b328c428d780dda7adf0a2927aedf2 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 14 Dec 2023 15:50:15 +0100
Subject: [PATCH 052/430] Remove need for style_set boolean

---
 src/command-line-parser.cpp | 1 -
 src/options.hpp             | 1 -
 src/osm2pgsql.cpp           | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index 79c1749f1..d49733501 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -617,7 +617,6 @@ options_t parse_command_line(int argc, char *argv[])
             break;
         case 'S': // --style
             options.style = optarg;
-            options.style_set = true;
             break;
         case 'i': // --tablespace-index
             options.tblsmain_index = optarg;
diff --git a/src/options.hpp b/src/options.hpp
index dea7367a0..a0e455f3f 100644
--- a/src/options.hpp
+++ b/src/options.hpp
@@ -164,7 +164,6 @@ struct options_t
     bool pass_prompt = false;
 
     bool output_backend_set = false;
-    bool style_set = false;
 }; // struct options_t
 
 #endif // OSM2PGSQL_OPTIONS_HPP
diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
index 656954454..075b2d77f 100644
--- a/src/osm2pgsql.cpp
+++ b/src/osm2pgsql.cpp
@@ -336,7 +336,7 @@ static void check_for_nodes_table(options_t const &options)
 
 static void check_and_set_style(options_t *options)
 {
-    if (!options->style_set) {
+    if (options->style.empty()) {
         if (options->output_backend == "flex" ||
             options->output_backend == "gazetteer") {
             throw std::runtime_error{"You have to set the config file "

From aa4507fad72bb01c939c1784e0868d06f5c91aa7 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 14 Dec 2023 16:28:33 +0100
Subject: [PATCH 053/430] Remove need for output_backend_set boolean

---
 src/command-line-parser.cpp       |  1 -
 src/options.hpp                   |  4 +---
 src/osm2pgsql.cpp                 | 12 ++++++++----
 tests/common-options.hpp          |  1 +
 tests/test-options-projection.cpp |  5 +++--
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index d49733501..6e63f5c4f 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -646,7 +646,6 @@ options_t parse_command_line(int argc, char *argv[])
             break;
         case 'O': // --output
             options.output_backend = optarg;
-            options.output_backend_set = true;
             break;
         case 'x': // --extra-attributes
             options.extra_attributes = true;
diff --git a/src/options.hpp b/src/options.hpp
index a0e455f3f..b9f886587 100644
--- a/src/options.hpp
+++ b/src/options.hpp
@@ -92,7 +92,7 @@ struct options_t
     /// File name to output expired tiles list to
     std::string expire_tiles_filename{"dirty_tiles"};
 
-    std::string output_backend{"pgsql"};
+    std::string output_backend;
     std::string input_format; ///< input file format (default: autodetect)
 
     osmium::Box bbox;
@@ -162,8 +162,6 @@ struct options_t
     bool parallel_indexing = true;
     bool create = false;
     bool pass_prompt = false;
-
-    bool output_backend_set = false;
 }; // struct options_t
 
 #endif // OSM2PGSQL_OPTIONS_HPP
diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
index 075b2d77f..676a06186 100644
--- a/src/osm2pgsql.cpp
+++ b/src/osm2pgsql.cpp
@@ -256,7 +256,7 @@ static void check_output(properties_t const &properties, options_t *options)
 {
     auto const output = properties.get_string("output", "pgsql");
 
-    if (!options->output_backend_set) {
+    if (options->output_backend.empty()) {
         options->output_backend = output;
         log_info("Using output '{}' (same as on import).", output);
         return;
@@ -334,8 +334,12 @@ static void check_for_nodes_table(options_t const &options)
     }
 }
 
-static void check_and_set_style(options_t *options)
+static void set_option_defaults(options_t *options)
 {
+    if (options->output_backend.empty()) {
+        options->output_backend = "pgsql";
+    }
+
     if (options->style.empty()) {
         if (options->output_backend == "flex" ||
             options->output_backend == "gazetteer") {
@@ -375,7 +379,7 @@ int main(int argc, char *argv[])
             if (properties.load()) {
                 check_and_update_properties(&properties, &options);
             } else {
-                check_and_set_style(&options);
+                set_option_defaults(&options);
                 check_for_nodes_table(options);
             }
 
@@ -393,7 +397,7 @@ int main(int argc, char *argv[])
                 }
             }
         } else {
-            check_and_set_style(&options);
+            set_option_defaults(&options);
             store_properties(&properties, options);
             auto const finfo = run(options);
             store_data_properties(&properties, finfo);
diff --git a/tests/common-options.hpp b/tests/common-options.hpp
index 7c0bb81d3..05050af8d 100644
--- a/tests/common-options.hpp
+++ b/tests/common-options.hpp
@@ -22,6 +22,7 @@ class opt_t
 public:
     opt_t()
     {
+        m_opt.output_backend = "pgsql";
         m_opt.prefix = "osm2pgsql_test";
         m_opt.style = OSM2PGSQLDATA_DIR "default.style";
         m_opt.num_procs = 1;
diff --git a/tests/test-options-projection.cpp b/tests/test-options-projection.cpp
index 90d75a9b6..265770ea0 100644
--- a/tests/test-options-projection.cpp
+++ b/tests/test-options-projection.cpp
@@ -22,8 +22,9 @@ TEST_CASE("Projection setup")
 {
     char const* const style_file = OSM2PGSQLDATA_DIR "default.style";
 
-    std::vector<char const *> option_params = {"osm2pgsql", "-S", style_file,
-                                               "--number-processes", "1"};
+    std::vector<char const *> option_params = {"osm2pgsql", "--output=pgsql",
+                                               "-S", style_file,
+                                               "--number-processes=1"};
 
     std::string proj_name;
     char const *srid = "";

From 26dd4e6e2c5e34522e491de529e1eacc31650e78 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 20 Dec 2023 12:03:12 +0100
Subject: [PATCH 054/430] Check that we are using flex output in osm2pgsql-gen

---
 src/gen/osm2pgsql-gen.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index 31cbaa50b..55a9ce46e 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -796,6 +796,11 @@ int main(int argc, char *argv[])
             }
         }
 
+        if (properties.get_string("output", "flex") != "flex") {
+            throw std::runtime_error{
+                "osm2pgsql-gen only works with flex output"};
+        }
+
         bool const updatable = properties.get_bool("updatable", false);
         genproc_t gen{style, conninfo, dbschema, append, updatable, jobs};
         gen.run();

From 09d5b39208954490f1fc6fb44c17c50f036fab10 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 22 Sep 2023 11:07:55 +0200
Subject: [PATCH 055/430] Add consts

---
 src/gen/osm2pgsql-gen.cpp | 2 +-
 src/gen/tracer.cpp        | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index 31cbaa50b..4c3ad12f4 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -272,7 +272,7 @@ void run_tile_gen(std::string const &conninfo, gen_base_t *master_generalizer,
             queue->pop_back();
         }
 
-        tile_t tile{zoom, p.first, p.second};
+        tile_t const tile{zoom, p.first, p.second};
         log_debug("Processing tile {}/{}/{}...", tile.zoom(), tile.x(),
                   tile.y());
         generalizer->process(tile);
diff --git a/src/gen/tracer.cpp b/src/gen/tracer.cpp
index e0bcddcad..c7a2c1367 100644
--- a/src/gen/tracer.cpp
+++ b/src/gen/tracer.cpp
@@ -26,8 +26,9 @@ tracer_t::trace(canvas_t const &canvas, tile_t const &tile, double min_area)
 {
     prepare(canvas);
 
-    potrace_bitmap_t bitmap{int(canvas.size()), int(canvas.size()),
-                            int(canvas.size() / bits_per_word), m_bits.data()};
+    potrace_bitmap_t const bitmap{int(canvas.size()), int(canvas.size()),
+                                  int(canvas.size() / bits_per_word),
+                                  m_bits.data()};
 
     std::unique_ptr<potrace_state_t, potrace_state_deleter> state{
         potrace_trace(m_param.get(), &bitmap)};

From 482719e541d53778d8ace042108dcc801d83a90e Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 12 Dec 2023 16:41:33 +0100
Subject: [PATCH 056/430] Use CLI11 command line parser library

This switches parsing of command line arguments from getopt to the CLI11
library.

Its adds CLI11 as a new dependency. With this commit CLI11 is vendored
in in the contrib directory, because it is not available in Ubuntu 20.04
and Debian before Bookworm. It is available in Ubuntu 22.04 und Debian
Bookworm and it is available in Homebrew and as vcpkg. So a bit down the
line we can switch to the versions available from the OS distribution.

For Windows we don't need the getopt version from alex85k any more and
this commit also removes that code from the Github action setup.

This commit is quite large, because we have to change everything at the
same time. Changes are for osm2pgsql and osm2pgsql-gen which now share
part of the option parsing code (database and logging options), in the
new src/command-line-app.[ch]pp files.

The code tries to keep the functionality the same as much as possible.
So no extra checks on command line options or so, these can come later.

There are some unavoidable changes:
* Some error messages have changed
* Help output is now generated by the CLI11 library so it looks very
  different. There is no verbose help version any more. All command
  line options are shown with --help, but some with a bit less detail
  than before. But all the detail is in the man page anyway.
* CLI11 can not parse an empty option parameter, so something like
  "--foo=" does not work, it tries to use the next option as value
  for the option. This is not very relevant in the real world, but
  there might be some corner cases where this changes behaviour.

See #142
---
 .github/actions/win-getopt/action.yml         |   20 -
 .github/workflows/ci.yml                      |    3 -
 CMakeLists.txt                                |   17 +-
 README.md                                     |    1 +
 contrib/CLI11/LICENSE                         |   25 +
 contrib/CLI11/README.contrib                  |    2 +
 contrib/CLI11/README.md                       | 1828 ++++++++++++++
 contrib/CLI11/include/CLI/App.hpp             | 1399 +++++++++++
 contrib/CLI11/include/CLI/CLI.hpp             |   36 +
 contrib/CLI11/include/CLI/Config.hpp          |   48 +
 contrib/CLI11/include/CLI/ConfigFwd.hpp       |  185 ++
 contrib/CLI11/include/CLI/Error.hpp           |  354 +++
 contrib/CLI11/include/CLI/Formatter.hpp       |   25 +
 contrib/CLI11/include/CLI/FormatterFwd.hpp    |  189 ++
 contrib/CLI11/include/CLI/Macros.hpp          |   75 +
 contrib/CLI11/include/CLI/Option.hpp          |  807 +++++++
 contrib/CLI11/include/CLI/Split.hpp           |   48 +
 contrib/CLI11/include/CLI/StringTools.hpp     |  234 ++
 contrib/CLI11/include/CLI/Timer.hpp           |  135 ++
 contrib/CLI11/include/CLI/TypeTools.hpp       | 1588 +++++++++++++
 contrib/CLI11/include/CLI/Validators.hpp      |  916 +++++++
 contrib/CLI11/include/CLI/Version.hpp         |   16 +
 contrib/CLI11/include/CLI/impl/App_inl.hpp    | 2105 +++++++++++++++++
 contrib/CLI11/include/CLI/impl/Config_inl.hpp |  395 ++++
 .../CLI11/include/CLI/impl/Formatter_inl.hpp  |  291 +++
 contrib/CLI11/include/CLI/impl/Option_inl.hpp |  653 +++++
 contrib/CLI11/include/CLI/impl/Split_inl.hpp  |  139 ++
 .../include/CLI/impl/StringTools_inl.hpp      |  260 ++
 .../CLI11/include/CLI/impl/Validators_inl.hpp |  347 +++
 man/osm2pgsql-gen.md                          |    8 +-
 src/CMakeLists.txt                            |    1 +
 src/command-line-app.cpp                      |  112 +
 src/command-line-app.hpp                      |   42 +
 src/command-line-parser.cpp                   |  977 ++++----
 src/gen/osm2pgsql-gen.cpp                     |  199 +-
 src/osm2pgsql.cpp                             |    2 -
 tests/bdd/regression/properties.feature       |   11 +-
 tests/test-options-parse.cpp                  |   12 +-
 38 files changed, 12779 insertions(+), 726 deletions(-)
 delete mode 100644 .github/actions/win-getopt/action.yml
 create mode 100644 contrib/CLI11/LICENSE
 create mode 100644 contrib/CLI11/README.contrib
 create mode 100644 contrib/CLI11/README.md
 create mode 100644 contrib/CLI11/include/CLI/App.hpp
 create mode 100644 contrib/CLI11/include/CLI/CLI.hpp
 create mode 100644 contrib/CLI11/include/CLI/Config.hpp
 create mode 100644 contrib/CLI11/include/CLI/ConfigFwd.hpp
 create mode 100644 contrib/CLI11/include/CLI/Error.hpp
 create mode 100644 contrib/CLI11/include/CLI/Formatter.hpp
 create mode 100644 contrib/CLI11/include/CLI/FormatterFwd.hpp
 create mode 100644 contrib/CLI11/include/CLI/Macros.hpp
 create mode 100644 contrib/CLI11/include/CLI/Option.hpp
 create mode 100644 contrib/CLI11/include/CLI/Split.hpp
 create mode 100644 contrib/CLI11/include/CLI/StringTools.hpp
 create mode 100644 contrib/CLI11/include/CLI/Timer.hpp
 create mode 100644 contrib/CLI11/include/CLI/TypeTools.hpp
 create mode 100644 contrib/CLI11/include/CLI/Validators.hpp
 create mode 100644 contrib/CLI11/include/CLI/Version.hpp
 create mode 100644 contrib/CLI11/include/CLI/impl/App_inl.hpp
 create mode 100644 contrib/CLI11/include/CLI/impl/Config_inl.hpp
 create mode 100644 contrib/CLI11/include/CLI/impl/Formatter_inl.hpp
 create mode 100644 contrib/CLI11/include/CLI/impl/Option_inl.hpp
 create mode 100644 contrib/CLI11/include/CLI/impl/Split_inl.hpp
 create mode 100644 contrib/CLI11/include/CLI/impl/StringTools_inl.hpp
 create mode 100644 contrib/CLI11/include/CLI/impl/Validators_inl.hpp
 create mode 100644 src/command-line-app.cpp
 create mode 100644 src/command-line-app.hpp

diff --git a/.github/actions/win-getopt/action.yml b/.github/actions/win-getopt/action.yml
deleted file mode 100644
index 0eb5da8aa..000000000
--- a/.github/actions/win-getopt/action.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: Windows getopt
-
-runs:
-  using: composite
-
-  steps:
-    - name: Install wingetopt
-      env:
-        WINGETOPT_VER: v0.95
-      run: |
-        git clone --quiet --depth 1 https://github.com/alex85k/wingetopt -b $WINGETOPT_VER ../wingetopt
-        mkdir ../wingetopt/build
-      shell: bash
-
-    - name: Build wingetopt
-      run: |
-        cmake -LA .. -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
-        cmake --build . --config Release --verbose
-      working-directory: ../wingetopt/build
-      shell: bash
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 57e13814e..6aefe0645 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -405,8 +405,6 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     env:
-      GETOPT_INCLUDE_DIR: ${{ github.workspace }}/../wingetopt/src
-      GETOPT_LIBRARY: ${{ github.workspace }}/../wingetopt/build/Release/wingetopt.lib
       VCPKG_DEFAULT_BINARY_CACHE: C:/vcpkg_binary_cache
 
     steps:
@@ -428,7 +426,6 @@ jobs:
         shell: bash
       - uses: ./.github/actions/win-postgres
       - uses: ./.github/actions/win-install
-      - uses: ./.github/actions/win-getopt
       - uses: ./.github/actions/win-cmake
       - uses: ./.github/actions/win-build
       - uses: ./.github/actions/win-test
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ef07fd34..9ab83b895 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,6 +55,7 @@ endif()
 option(EXTERNAL_LIBOSMIUM "Do not use the bundled libosmium" OFF)
 option(EXTERNAL_PROTOZERO "Do not use the bundled protozero" OFF)
 option(EXTERNAL_FMT       "Do not use the bundled fmt"       OFF)
+option(EXTERNAL_CLI11     "Do not use the bundled CLI11"     OFF)
 
 set(USE_PROJ_LIB "auto" CACHE STRING "Which version of PROJ API to use: ('4', '6', 'off', or 'auto')")
 
@@ -175,10 +176,14 @@ if (NOT EXTERNAL_FMT)
     set(FMT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/contrib/fmt/include")
 endif()
 
+if (NOT EXTERNAL_CLI11)
+    set(CLI11_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/contrib/CLI11/include")
+endif()
+
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR})
 
 find_package(Osmium 2.17.3 REQUIRED COMPONENTS io)
-include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR} ${FMT_INCLUDE_DIR})
+include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR} ${FMT_INCLUDE_DIR} ${CLI11_INCLUDE_DIR})
 
 if (WITH_LUA)
     if (WITH_LUAJIT)
@@ -261,16 +266,6 @@ endif()
 
 if (WIN32)
     list(APPEND LIBS ws2_32)
-    if (MSVC)
-        find_path(GETOPT_INCLUDE_DIR getopt.h)
-        find_library(GETOPT_LIBRARY NAMES wingetopt getopt)
-        if (GETOPT_INCLUDE_DIR AND GETOPT_LIBRARY)
-            include_directories(SYSTEM ${GETOPT_INCLUDE_DIR})
-            list(APPEND LIBS ${GETOPT_LIBRARY})
-        else()
-            message(FATAL_ERROR "Can not find getopt library for Windows. Please get it from https://github.com/alex85k/wingetopt or alternative source.")
-        endif()
-    endif()
 endif()
 
 message(STATUS "Libraries used to build: ${LIBS}")
diff --git a/README.md b/README.md
index 94012eeda..dd7e65303 100644
--- a/README.md
+++ b/README.md
@@ -43,6 +43,7 @@ to configure and build itself.
 
 Required libraries are
 
+* [CLI11](https://github.com/CLIUtils/CLI11)
 * [expat](https://libexpat.github.io/)
 * [proj](https://proj.org/)
 * [bzip2](http://www.bzip.org/)
diff --git a/contrib/CLI11/LICENSE b/contrib/CLI11/LICENSE
new file mode 100644
index 000000000..aae15855e
--- /dev/null
+++ b/contrib/CLI11/LICENSE
@@ -0,0 +1,25 @@
+CLI11 2.2 Copyright (c) 2017-2023 University of Cincinnati, developed by Henry
+Schreiner under NSF AWARD 1414736. All rights reserved.
+
+Redistribution and use in source and binary forms of CLI11, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+3. Neither the name of the copyright holder nor the names of its contributors
+   may be used to endorse or promote products derived from this software without
+   specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/contrib/CLI11/README.contrib b/contrib/CLI11/README.contrib
new file mode 100644
index 000000000..c0e274270
--- /dev/null
+++ b/contrib/CLI11/README.contrib
@@ -0,0 +1,2 @@
+Source: https://github.com/CLIUtils/CLI11
+Revision: v2.3.2
diff --git a/contrib/CLI11/README.md b/contrib/CLI11/README.md
new file mode 100644
index 000000000..3127be8a3
--- /dev/null
+++ b/contrib/CLI11/README.md
@@ -0,0 +1,1828 @@
+# CLI11: Command line parser for C++11
+
+![CLI11 Logo](./docs/CLI11_300.png)
+
+[![Build Status Azure][azure-badge]][azure]
+[![Actions Status][actions-badge]][actions-link]
+[![Build Status AppVeyor][appveyor-badge]][appveyor]
+[![Code Coverage][codecov-badge]][codecov]
+[![Codacy Badge][codacy-badge]][codacy-link]
+[![License: BSD][license-badge]](./LICENSE) [![DOI][doi-badge]][doi-link]
+
+[![Gitter chat][gitter-badge]][gitter]
+[![Latest GHA release][releases-badge]][github releases]
+[![Latest release][repology-badge]][repology]
+[![Conan.io][conan-badge]][conan-link]
+[![Conda Version][conda-badge]][conda-link]
+[![Try CLI11 2.1 online][wandbox-badge]][wandbox-link]
+
+[What's new](./CHANGELOG.md) • [Documentation][gitbook] • [API
+Reference][api-docs]
+
+CLI11 is a command line parser for C++11 and beyond that provides a rich feature
+set with a simple and intuitive interface.
+
+## Table of Contents
+
+- [CLI11: Command line parser for C++11](#cli11-command-line-parser-for-c11)
+  - [Table of Contents](#table-of-contents)
+  - [Background](#background)
+    - [Introduction](#introduction)
+    - [Why write another CLI parser?](#why-write-another-cli-parser)
+    - [Other parsers](#other-parsers)
+    - [Features not supported by this library](#features-not-supported-by-this-library)
+  - [Install](#install)
+  - [Usage](#usage)
+    - [Adding options](#adding-options)
+      - [Option types](#option-types)
+      - [Example](#example)
+      - [Option options](#option-options)
+      - [Validators](#validators)
+        - [Transforming Validators](#transforming-validators)
+        - [Validator operations](#validator-operations)
+        - [Custom Validators](#custom-validators)
+        - [Querying Validators](#querying-validators)
+      - [Getting results](#getting-results)
+    - [Subcommands](#subcommands)
+      - [Subcommand options](#subcommand-options)
+      - [Callbacks](#callbacks)
+      - [Option groups](#option-groups)
+    - [Configuration file](#configuration-file)
+    - [Inheriting defaults](#inheriting-defaults)
+    - [Formatting](#formatting)
+    - [Subclassing](#subclassing)
+    - [How it works](#how-it-works)
+      - [Example](#example-1)
+    - [Unicode support](#unicode-support)
+      - [Note on using Unicode paths](#note-on-using-unicode-paths)
+    - [Utilities](#utilities)
+    - [Other libraries](#other-libraries)
+  - [API](#api)
+  - [Examples](#examples)
+  - [Contribute](#contribute)
+  - [License](#license)
+
+Features that were added in the last released minor version are marked with
+"🆕". Features only available in main are marked with "🚧".
+
+## Background
+
+### Introduction
+
+CLI11 provides all the features you expect in a powerful command line parser,
+with a beautiful, minimal syntax and no dependencies beyond C++11. It is header
+only, and comes in a single file form for easy inclusion in projects. It is easy
+to use for small projects, but powerful enough for complex command line
+projects, and can be customized for frameworks. It is tested on [Azure][] and
+[GitHub Actions][actions-link], and was originally used by the [GooFit GPU
+fitting framework][goofit]. It was inspired by [`plumbum.cli`][plumbum] for
+Python. CLI11 has a user friendly introduction in this README, a more in-depth
+tutorial [GitBook][], as well as [API documentation][api-docs] generated by
+Travis. See the [changelog](./CHANGELOG.md) or [GitHub Releases][] for details
+for current and past releases. Also see the [Version 1.0 post][], [Version 1.3
+post][], [Version 1.6 post][], or [Version 2.0 post][] for more information.
+
+You can be notified when new releases are made by subscribing to
+<https://github.com/CLIUtils/CLI11/releases.atom> on an RSS reader, like Feedly,
+or use the releases mode of the GitHub watching tool.
+
+### Why write another CLI parser?
+
+An acceptable CLI parser library should be all of the following:
+
+- Easy to include (i.e., header only, one file if possible, **no external
+  requirements**).
+- Short, simple syntax: This is one of the main reasons to use a CLI parser, it
+  should make variables from the command line nearly as easy to define as any
+  other variables. If most of your program is hidden in CLI parsing, this is a
+  problem for readability.
+- C++11 or better: Should work with GCC 4.8+ (default on CentOS/RHEL 7), Clang
+  3.4+, AppleClang 7+, NVCC 7.0+, or MSVC 2015+.
+- Work on Linux, macOS, and Windows.
+- Well tested on all common platforms and compilers. "Well" is defined as having
+  good coverage measured by [CodeCov][].
+- Clear help printing.
+- Nice error messages.
+- Standard shell idioms supported naturally, like grouping flags, a positional
+  separator, etc.
+- Easy to execute, with help, parse errors, etc. providing correct exit and
+  details.
+- Easy to extend as part of a framework that provides "applications" to users.
+- Usable subcommand syntax, with support for multiple subcommands, nested
+  subcommands, option groups, and optional fallthrough (explained later).
+- Ability to add a configuration file (`TOML`, `INI`, or custom format), and
+  produce it as well.
+- Produce real values that can be used directly in code, not something you have
+  pay compute time to look up, for HPC applications.
+- Work with common types, simple custom types, and extensible to exotic types.
+- Permissively licensed.
+
+### Other parsers
+
+<details><summary>The major CLI parsers for C++ include, with my biased opinions: (click to expand)</summary><p>
+
+| Library                             | My biased opinion                                                                                                                                                                                                                                                                                                                                                                                                                  |
+| ----------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [Boost Program Options][]           | A great library if you already depend on Boost, but its pre-C++11 syntax is really odd and setting up the correct call in the main function is poorly documented (and is nearly a page of code). A simple wrapper for the Boost library was originally developed, but was discarded as CLI11 became more powerful. The idea of capturing a value and setting it originated with Boost PO. [See this comparison.][cli11-po-compare] |
+| [The Lean Mean C++ Option Parser][] | One header file is great, but the syntax is atrocious, in my opinion. It was quite impractical to wrap the syntax or to use in a complex project. It seems to handle standard parsing quite well.                                                                                                                                                                                                                                  |
+| [TCLAP][]                           | The not-quite-standard command line parsing causes common shortcuts to fail. It also seems to be poorly supported, with only minimal bugfixes accepted. Header only, but in quite a few files. Has not managed to get enough support to move to GitHub yet. No subcommands. Produces wrapped values.                                                                                                                               |
+| [Cxxopts][]                         | C++11, single file, and nice CMake support, but requires regex, therefore GCC 4.8 (CentOS 7 default) does not work. Syntax closely based on Boost PO, so not ideal but familiar.                                                                                                                                                                                                                                                   |
+| [DocOpt][]                          | Completely different approach to program options in C++11, you write the docs and the interface is generated. Too fragile and specialized.                                                                                                                                                                                                                                                                                         |
+
+After I wrote this, I also found the following libraries:
+
+| Library                 | My biased opinion                                                                                                                                                                    |
+| ----------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| [GFlags][]              | The Google Commandline Flags library. Uses macros heavily, and is limited in scope, missing things like subcommands. It provides a simple syntax and supports config files/env vars. |
+| [GetOpt][]              | Very limited C solution with long, convoluted syntax. Does not support much of anything, like help generation. Always available on UNIX, though (but in different flavors).          |
+| [ProgramOptions.hxx][]  | Interesting library, less powerful and no subcommands. Nice callback system.                                                                                                         |
+| [Args][]                | Also interesting, and supports subcommands. I like the optional-like design, but CLI11 is cleaner and provides direct value access, and is less verbose.                             |
+| [Argument Aggregator][] | I'm a big fan of the [fmt][] library, and the try-catch statement looks familiar. :thumbsup: Doesn't seem to support subcommands.                                                    |
+| [Clara][]               | Simple library built for the excellent [Catch][] testing framework. Unique syntax, limited scope.                                                                                    |
+| [Argh!][]               | Very minimalistic C++11 parser, single header. Don't have many features. No help generation?!?! At least it's exception-free.                                                        |
+| [CLI][]                 | Custom language and parser. Huge build-system overkill for very little benefit. Last release in 2009, but still occasionally active.                                                 |
+| [argparse][]            | C++17 single file argument parser. Design seems similar to CLI11 in some ways. The author has several other interesting projects.                                                    |
+| [lyra][]                | a simple header only parser with composable options. Might work well for simple standardized parsing                                                                                 |
+
+See [Awesome C++][] for a less-biased list of parsers. You can also find other
+single file libraries at [Single file libs][].
+
+</p></details>
+<br/>
+
+None of these libraries fulfill all the above requirements, or really even come
+close. As you probably have already guessed, CLI11 does. So, this library was
+designed to provide a great syntax, good compiler compatibility, and minimal
+installation fuss.
+
+### Features not supported by this library
+
+There are some other possible "features" that are intentionally not supported by
+this library:
+
+- Non-standard variations on syntax, like `-long` options. This is non-standard
+  and should be avoided, so that is enforced by this library.
+- Completion of partial options, such as Python's `argparse` supplies for
+  incomplete arguments. It's better not to guess. Most third party command line
+  parsers for python actually reimplement command line parsing rather than using
+  argparse because of this perceived design flaw (recent versions do have an
+  option to disable it).
+- Autocomplete: This might eventually be added to both Plumbum and CLI11, but it
+  is not supported yet.
+
+## Install
+
+To use, the most common methods are described here additional methods and
+details are available at [installation][]:
+
+- All-in-one local header: Copy `CLI11.hpp` from the [most recent
+  release][github releases] into your include directory, and you are set. This
+  is combined from the source files for every release. This includes the entire
+  command parser library, but does not include separate utilities (like `Timer`,
+  `AutoTimer`). The utilities are completely self contained and can be copied
+  separately.
+- All-in-one global header: Like above, but copying the file to a shared folder
+  location like `/opt/CLI11`. Then, the C++ include path has to be extended to
+  point at this folder. With CMake 3.5+, use `include_directories(/opt/CLI11)`
+- For other methods including using CMake or vcpkg and some specific
+  instructions for GCC 8 or WASI see [installation][].
+
+## Usage
+
+### Adding options
+
+To set up, add options, and run, your main function will look something like
+this:
+
+```cpp
+int main(int argc, char** argv) {
+    CLI::App app{"App description"};
+    argv = app.ensure_utf8(argv);
+
+    std::string filename = "default";
+    app.add_option("-f,--file", filename, "A help string");
+
+    CLI11_PARSE(app, argc, argv);
+    return 0;
+}
+```
+
+For more information about 🚧`ensure_utf8` the section on
+[Unicode support](#unicode-support) below. The 🚧`ensure_utf8` function is only
+available in main currently and not in a release.
+
+<details><summary>Note: If you don't like macros, this is what that macro expands to: (click to expand)</summary><p>
+
+```cpp
+try {
+    app.parse(argc, argv);
+} catch (const CLI::ParseError &e) {
+    return app.exit(e);
+}
+```
+
+The try/catch block ensures that `-h,--help` or a parse error will exit with the
+correct return code (selected from `CLI::ExitCodes`). (The return here should be
+inside `main`). You should not assume that the option values have been set
+inside the catch block; for example, help flags intentionally short-circuit all
+other processing for speed and to ensure required options and the like do not
+interfere.
+
+</p></details>
+</br>
+
+The initialization is just one line, adding options is just two each. The parse
+macro is just one line (or 5 for the contents of the macro). After the app runs,
+the filename will be set to the correct value if it was passed, otherwise it
+will be set to the default. You can check to see if this was passed on the
+command line with `app.count("--file")`.
+
+#### Option types
+
+While all options internally are the same type, there are several ways to add an
+option depending on what you need. The supported values are:
+
+```cpp
+// Add options
+app.add_option(option_name, help_str="")
+
+app.add_option(option_name,
+               variable_to_bind_to, // bool, char(see note), int, float, vector, enum, std::atomic, or string-like, or anything with a defined conversion from a string or that takes an int, double, or string in a constructor. Also allowed are tuples, std::array or std::pair. Also supported are complex numbers, wrapper types, and containers besides vectors of any other supported type.
+               help_string="")
+
+app.add_option_function<type>(option_name,
+               function <void(const type &value)>, // type can be any type supported by add_option
+               help_string="")
+
+// char as an option type is supported before 2.0 but in 2.0 it defaulted to allowing single non numerical characters in addition to the numeric values.
+
+// There is a template overload which takes two template parameters the first is the type of object to assign the value to, the second is the conversion type.  The conversion type should have a known way to convert from a string, such as any of the types that work in the non-template version.  If XC is a std::pair and T is some non pair type.  Then a two argument constructor for T is called to assign the value.  For tuples or other multi element types, XC must be a single type or a tuple like object of the same size as the assignment type
+app.add_option<typename T, typename XC>(option_name,
+               T &output, // output must be assignable or constructible from a value of type XC
+               help_string="")
+
+// Add flags
+app.add_flag(option_name,
+             help_string="")
+
+app.add_flag(option_name,
+             variable_to_bind_to, // bool, int, float, complex, containers, enum, std::atomic, or string-like, or any singular object with a defined conversion from a string like add_option
+             help_string="")
+
+app.add_flag_function(option_name,
+             function <void(std::int64_t count)>,
+             help_string="")
+
+app.add_flag_callback(option_name,function<void(void)>,help_string="")
+
+// Add subcommands
+App* subcom = app.add_subcommand(name, description);
+
+Option_group *app.add_option_group(name,description);
+```
+
+An option name may start with any character except ('-', ' ', '\n', and '!').
+For long options, after the first character all characters are allowed except
+('=',':','{',' ', '\n'). For the `add_flag*` functions '{' and '!' have special
+meaning which is why they are not allowed. Names are given as a comma separated
+string, with the dash or dashes. An option or flag can have as many names as you
+want, and afterward, using `count`, you can use any of the names, with dashes as
+needed, to count the options. One of the names is allowed to be given without
+proceeding dash(es); if present the option is a positional option, and that name
+will be used on the help line for its positional form.
+
+The `add_option_function<type>(...` function will typically require the template
+parameter be given unless a `std::function` object with an exact match is
+passed. The type can be any type supported by the `add_option` function. The
+function should throw an error (`CLI::ConversionError` or `CLI::ValidationError`
+possibly) if the value is not valid.
+
+The two parameter template overload can be used in cases where you want to
+restrict the input such as
+
+```cpp
+double val
+app.add_option<double,unsigned int>("-v",val);
+```
+
+which would first verify the input is convertible to an `unsigned int` before
+assigning it. Or using some variant type
+
+```cpp
+using vtype=std::variant<int, double, std::string>;
+ vtype v1;
+app.add_option<vtype,std:string>("--vs",v1);
+app.add_option<vtype,int>("--vi",v1);
+app.add_option<vtype,double>("--vf",v1);
+```
+
+otherwise the output would default to a string. The `add_option` can be used
+with any integral or floating point types, enumerations, or strings. Or any type
+that takes an int, double, or std\::string in an assignment operator or
+constructor. If an object can take multiple varieties of those, std::string
+takes precedence, then double then int. To better control which one is used or
+to use another type for the underlying conversions use the two parameter
+template to directly specify the conversion type.
+
+Types such as (std or boost) `optional<int>`, `optional<double>`, and
+`optional<string>` and any other wrapper types are supported directly. For
+purposes of CLI11 wrapper types are those which `value_type` definition. See
+[CLI11 Advanced Topics/Custom Converters][] for information on how you can add
+your own converters for additional types.
+
+Vector types can also be used in the two parameter template overload
+
+```cpp
+std::vector<double> v1;
+app.add_option<std::vector<double>,int>("--vs",v1);
+```
+
+would load a vector of doubles but ensure all values can be represented as
+integers.
+
+Automatic direct capture of the default string is disabled when using the two
+parameter template. Use `set_default_str(...)` or
+`->default_function(std::string())` to set the default string or capture
+function directly for these cases.
+
+Flag options specified through the `add_flag*` functions allow a syntax for the
+option names to default particular options to a false value or any other value
+if some flags are passed. For example:
+
+```cpp
+app.add_flag("--flag,!--no-flag",result,"help for flag");
+```
+
+specifies that if `--flag` is passed on the command line result will be true or
+contain a value of 1. If `--no-flag` is passed `result` will contain false or -1
+if `result` is a signed integer type, or 0 if it is an unsigned type. An
+alternative form of the syntax is more explicit: `"--flag,--no-flag{false}"`;
+this is equivalent to the previous example. This also works for short form
+options `"-f,!-n"` or `"-f,-n{false}"`. If `variable_to_bind_to` is anything but
+an integer value the default behavior is to take the last value given, while if
+`variable_to_bind_to` is an integer type the behavior will be to sum all the
+given arguments and return the result. This can be modified if needed by
+changing the `multi_option_policy` on each flag (this is not inherited). The
+default value can be any value. For example if you wished to define a numerical
+flag:
+
+```cpp
+app.add_flag("-1{1},-2{2},-3{3}",result,"numerical flag")
+```
+
+Using any of those flags on the command line will result in the specified number
+in the output. Similar things can be done for string values, and enumerations,
+as long as the default value can be converted to the given type.
+
+On a `C++14` compiler, you can pass a callback function directly to `.add_flag`,
+while in C++11 mode you'll need to use `.add_flag_function` if you want a
+callback function. The function will be given the number of times the flag was
+passed. You can throw a relevant `CLI::ParseError` to signal a failure.
+
+#### Example
+
+- `"one,-o,--one"`: Valid as long as not a flag, would create an option that can
+  be specified positionally, or with `-o` or `--one`
+- `"this"` Can only be passed positionally
+- `"-a,-b,-c"` No limit to the number of non-positional option names
+
+The add commands return a pointer to an internally stored `Option`. This option
+can be used directly to check for the count (`->count()`) after parsing to avoid
+a string based lookup.
+
+#### Option options
+
+Before parsing, you can set the following options:
+
+- `->required()`: The program will quit if this option is not present. This is
+  `mandatory` in Plumbum, but required options seems to be a more standard term.
+  For compatibility, `->mandatory()` also works.
+- `->expected(N)`: Take `N` values instead of as many as possible, only for
+  vector args. If negative, require at least `-N`; end with `--` or another
+  recognized option or subcommand.
+- `->expected(MIN,MAX)`: Set a range of expected values to accompany an option.
+  `expected(0,1)` is the equivalent of making a flag.
+- `->type_name(typename)`: Set the name of an Option's type (`type_name_fn`
+  allows a function instead)
+- `->type_size(N)`: Set the intrinsic size of an option value. The parser will
+  require multiples of this number if negative. Most of the time this is
+  detected automatically though can be modified for specific use cases.
+- `->type_size(MIN,MAX)`: Set the intrinsic size of an option to a range.
+- `->needs(opt)`: This option requires another option to also be present, opt is
+  an `Option` pointer. Options can be removed from the `needs` with
+  `remove_needs(opt)`. The option can also be specified with a string containing
+  the name of the option
+- `->excludes(opt)`: This option cannot be given with `opt` present, opt is an
+  `Option` pointer. Can also be given as a string containing the name of the
+  option. Options can be removed from the excludes list with
+  `->remove_excludes(opt)`
+- `->envname(name)`: Gets the value from the environment if present and not
+  passed on the command line. 🚧 The value must also pass any validators to be
+  used.
+- `->group(name)`: The help group to put the option in. No effect for positional
+  options. Defaults to `"Options"`. Options given an empty string will not show
+  up in the help print (hidden).
+- `->ignore_case()`: Ignore the case on the command line (also works on
+  subcommands, does not affect arguments).
+- `->ignore_underscore()`: Ignore any underscores in the options names (also
+  works on subcommands, does not affect arguments). For example "option_one"
+  will match with "optionone". This does not apply to short form options since
+  they only have one character
+- `->disable_flag_override()`: From the command line long form flag options can
+  be assigned a value on the command line using the `=` notation `--flag=value`.
+  If this behavior is not desired, the `disable_flag_override()` disables it and
+  will generate an exception if it is done on the command line. The `=` does not
+  work with short form flag options.
+- `->allow_extra_args(true/false)`: If set to true the option will take an
+  unlimited number of arguments like a vector, if false it will limit the number
+  of arguments to the size of the type used in the option. Default value depends
+  on the nature of the type use, containers default to true, others default to
+  false.
+- `->delimiter(char)`: Allows specification of a custom delimiter for separating
+  single arguments into vector arguments, for example specifying
+  `->delimiter(',')` on an option would result in `--opt=1,2,3` producing 3
+  elements of a vector and the equivalent of --opt 1 2 3 assuming opt is a
+  vector value.
+- `->description(str)`: Set/change the description.
+- `->multi_option_policy(CLI::MultiOptionPolicy::Throw)`: Set the multi-option
+  policy. Shortcuts available: `->take_last()`, `->take_first()`,`->take_all()`,
+  and `->join()`. This will only affect options expecting 1 argument or bool
+  flags (which do not inherit their default but always start with a specific
+  policy). `->join(delim)` can also be used to join with a specific delimiter.
+  This equivalent to calling `->delimiter(delim)` and `->join()`. Valid values
+  are `CLI::MultiOptionPolicy::Throw`, `CLI::MultiOptionPolicy::Throw`,
+  `CLI::MultiOptionPolicy::TakeLast`, `CLI::MultiOptionPolicy::TakeFirst`,
+  `CLI::MultiOptionPolicy::Join`, `CLI::MultiOptionPolicy::TakeAll`, and
+  `CLI::MultiOptionPolicy::Sum` 🆕.
+- `->check(std::string(const std::string &), validator_name="",validator_description="")`:
+  Define a check function. The function should return a non empty string with
+  the error message if the check fails
+- `->check(Validator)`: Use a Validator object to do the check see
+  [Validators](#validators) for a description of available Validators and how to
+  create new ones.
+- `->transform(std::string(std::string &), validator_name="",validator_description=")`:
+  Converts the input string into the output string, in-place in the parsed
+  options.
+- `->transform(Validator)`: Uses a Validator object to do the transformation see
+  [Validators](#validators) for a description of available Validators and how to
+  create new ones.
+- `->each(void(const std::string &)>`: Run this function on each value received,
+  as it is received. It should throw a `ValidationError` if an error is
+  encountered.
+- `->configurable(false)`: Disable this option from being in a configuration
+  file.
+- `->capture_default_str()`: Store the current value attached and display it in
+  the help string.
+- `->default_function(std::string())`: Advanced: Change the function that
+  `capture_default_str()` uses.
+- `->always_capture_default()`: Always run `capture_default_str()` when creating
+  new options. Only useful on an App's `option_defaults`.
+- `->default_str(string)`: Set the default string directly (NO VALIDATION OR
+  CALLBACKS). This string will also be used as a default value if no arguments
+  are passed and the value is requested.
+- `->default_val(value)`: Generate the default string from a value and validate
+  that the value is also valid. For options that assign directly to a value type
+  the value in that type is also updated. Value must be convertible to a
+  string(one of known types or have a stream operator). The callback may be
+  triggered if the `run_callback_for_default` is set.
+- `->run_callback_for_default()`: This will force the option callback to be
+  executed or the variable set when the `default_val` is set.
+- `->option_text(string)`: Sets the text between the option name and
+  description.
+- `->force_callback()`: Causes the option callback or value set to be triggered
+  even if the option was not present in parsing.
+- `->trigger_on_parse()`: If set, causes the callback and all associated
+  validation checks for the option to be executed when the option value is
+  parsed vs. at the end of all parsing. This could cause the callback to be
+  executed multiple times. Also works with positional options.
+
+These options return the `Option` pointer, so you can chain them together, and
+even skip storing the pointer entirely. The `each` function takes any function
+that has the signature `void(const std::string&)`; it should throw a
+`ValidationError` when validation fails. The help message will have the name of
+the parent option prepended. Since `each`, `check` and `transform` use the same
+underlying mechanism, you can chain as many as you want, and they will be
+executed in order. Operations added through `transform` are executed first in
+reverse order of addition, and `check` and `each` are run following the
+transform functions in order of addition. If you just want to see the
+unconverted values, use `.results()` to get the `std::vector<std::string>` of
+results.
+
+On the command line, options can be given as:
+
+- `-a` (flag)
+- `-abc` (flags can be combined)
+- `-f filename` (option)
+- `-ffilename` (no space required)
+- `-abcf filename` (flags and option can be combined)
+- `--long` (long flag)
+- `--long_flag=true` (long flag with equals to override default value)
+- `--file filename` (space)
+- `--file=filename` (equals)
+
+If `allow_windows_style_options()` is specified in the application or subcommand
+options can also be given as:
+
+- `/a` (flag)
+- `/f filename` (option)
+- `/long` (long flag)
+- `/file filename` (space)
+- `/file:filename` (colon)
+- `/long_flag:false` (long flag with : to override the default value)
+  - Windows style options do not allow combining short options or values not
+    separated from the short option like with `-` options
+
+Long flag options may be given with an `=<value>` to allow specifying a false
+value, or some other value to the flag. See [config files](#configuration-file)
+for details on the values supported. NOTE: only the `=` or `:` for windows-style
+options may be used for this, using a space will result in the argument being
+interpreted as a positional argument. This syntax can override the default
+values, and can be disabled by using `disable_flag_override()`.
+
+Extra positional arguments will cause the program to exit, so at least one
+positional option with a vector is recommended if you want to allow extraneous
+arguments. If you set `.allow_extras()` on the main `App`, you will not get an
+error. You can access the missing options using `remaining` (if you have
+subcommands, `app.remaining(true)` will get all remaining options, subcommands
+included). If the remaining arguments are to processed by another `App` then the
+function `remaining_for_passthrough()` can be used to get the remaining
+arguments in reverse order such that `app.parse(vector)` works directly and
+could even be used inside a subcommand callback.
+
+You can access a vector of pointers to the parsed options in the original order
+using `parse_order()`. If `--` is present in the command line that does not end
+an unlimited option, then everything after that is positional only.
+
+#### Validators
+
+Validators are structures to check or modify inputs, they can be used to verify
+that an input meets certain criteria or transform it into another value. They
+are added through the `check` or `transform` functions. The differences between
+the two function are that checks do not modify the input whereas transforms can
+and are executed before any Validators added through `check`.
+
+CLI11 has several Validators built-in that perform some common checks
+
+- `CLI::IsMember(...)`: Require an option be a member of a given set. See
+  [Transforming Validators](#transforming-validators) for more details.
+- `CLI::Transformer(...)`: Modify the input using a map. See
+  [Transforming Validators](#transforming-validators) for more details.
+- `CLI::CheckedTransformer(...)`: Modify the input using a map, and require that
+  the input is either in the set or already one of the outputs of the set. See
+  [Transforming Validators](#transforming-validators) for more details.
+- `CLI::AsNumberWithUnit(...)`: Modify the `<NUMBER> <UNIT>` pair by matching
+  the unit and multiplying the number by the corresponding factor. It can be
+  used as a base for transformers, that accept things like size values (`1 KB`)
+  or durations (`0.33 ms`).
+- `CLI::AsSizeValue(...)`: Convert inputs like `100b`, `42 KB`, `101 Mb`,
+  `11 Mib` to absolute values. `KB` can be configured to be interpreted as 10^3
+  or 2^10.
+- `CLI::ExistingFile`: Requires that the file exists if given.
+- `CLI::ExistingDirectory`: Requires that the directory exists.
+- `CLI::ExistingPath`: Requires that the path (file or directory) exists.
+- `CLI::NonexistentPath`: Requires that the path does not exist.
+- `CLI::FileOnDefaultPath`: Best used as a transform, Will check that a file
+  exists either directly or in a default path and update the path appropriately.
+  See [Transforming Validators](#transforming-validators) for more details
+- `CLI::Range(min,max)`: Requires that the option be between min and max (make
+  sure to use floating point if needed). Min defaults to 0.
+- `CLI::Bounded(min,max)`: Modify the input such that it is always between min
+  and max (make sure to use floating point if needed). Min defaults to 0. Will
+  produce an error if conversion is not possible.
+- `CLI::PositiveNumber`: Requires the number be greater than 0
+- `CLI::NonNegativeNumber`: Requires the number be greater or equal to 0
+- `CLI::Number`: Requires the input be a number.
+- `CLI::ValidIPV4`: Requires that the option be a valid IPv4 string e.g.
+  `'255.255.255.255'`, `'10.1.1.7'`.
+- `CLI::TypeValidator<TYPE>`:Requires that the option be convertible to the
+  specified type e.g. `CLI::TypeValidator<unsigned int>()` would require that
+  the input be convertible to an `unsigned int` regardless of the end
+  conversion.
+
+These Validators can be used by simply passing the name into the `check` or
+`transform` methods on an option
+
+```cpp
+->check(CLI::ExistingFile);
+->check(CLI::Range(0,10));
+```
+
+Validators can be merged using `&` and `|` and inverted using `!`. For example:
+
+```cpp
+->check(CLI::Range(0,10)|CLI::Range(20,30));
+```
+
+will produce a check to ensure a value is between 0 and 10 or 20 and 30.
+
+```cpp
+->check(!CLI::PositiveNumber);
+```
+
+will produce a check for a number less than or equal to 0.
+
+##### Transforming Validators
+
+There are a few built in Validators that let you transform values if used with
+the `transform` function. If they also do some checks then they can be used
+`check` but some may do nothing in that case.
+
+- `CLI::Bounded(min,max)` will bound values between min and max and values
+  outside of that range are limited to min or max, it will fail if the value
+  cannot be converted and produce a `ValidationError`
+- The `IsMember` Validator lets you specify a set of predefined options. You can
+  pass any container or copyable pointer (including `std::shared_ptr`) to a
+  container to this Validator; the container just needs to be iterable and have
+  a `::value_type`. The key type should be convertible from a string, You can
+  use an initializer list directly if you like. If you need to modify the set
+  later, the pointer form lets you do that; the type message and check will
+  correctly refer to the current version of the set. The container passed in can
+  be a set, vector, or a map like structure. If used in the `transform` method
+  the output value will be the matching key as it could be modified by filters.
+
+After specifying a set of options, you can also specify "filter" functions of
+the form `T(T)`, where `T` is the type of the values. The most common choices
+probably will be `CLI::ignore_case` an `CLI::ignore_underscore`, and
+`CLI::ignore_space`. These all work on strings but it is possible to define
+functions that work on other types. Here are some examples of `IsMember`:
+
+- `CLI::IsMember({"choice1", "choice2"})`: Select from exact match to choices.
+- `CLI::IsMember({"choice1", "choice2"}, CLI::ignore_case, CLI::ignore_underscore)`:
+  Match things like `Choice_1`, too.
+- `CLI::IsMember(std::set<int>({2,3,4}))`: Most containers and types work; you
+  just need `std::begin`, `std::end`, and `::value_type`.
+- `CLI::IsMember(std::map<std::string, TYPE>({{"one", 1}, {"two", 2}}))`: You
+  can use maps; in `->transform()` these replace the matched value with the
+  matched key. The value member of the map is not used in `IsMember`, so it can
+  be any type.
+- `auto p = std::make_shared<std::vector<std::string>>(std::initializer_list<std::string>("one", "two")); CLI::IsMember(p)`:
+  You can modify `p` later.
+- The `Transformer` and `CheckedTransformer` Validators transform one value into
+  another. Any container or copyable pointer (including `std::shared_ptr`) to a
+  container that generates pairs of values can be passed to these `Validator's`;
+  the container just needs to be iterable and have a `::value_type` that
+  consists of pairs. The key type should be convertible from a string, and the
+  value type should be convertible to a string You can use an initializer list
+  directly if you like. If you need to modify the map later, the pointer form
+  lets you do that; the description message will correctly refer to the current
+  version of the map. `Transformer` does not do any checking so values not in
+  the map are ignored. `CheckedTransformer` takes an extra step of verifying
+  that the value is either one of the map key values, in which case it is
+  transformed, or one of the expected output values, and if not will generate a
+  `ValidationError`. A Transformer placed using `check` will not do anything.
+
+After specifying a map of options, you can also specify "filter" just like in
+`CLI::IsMember`. Here are some examples (`Transformer` and `CheckedTransformer`
+are interchangeable in the examples) of `Transformer`:
+
+- `CLI::Transformer({{"key1", "map1"},{"key2","map2"}})`: Select from key values
+  and produce map values.
+- `CLI::Transformer(std::map<std::string,int>({"two",2},{"three",3},{"four",4}}))`:
+  most maplike containers work, the `::value_type` needs to produce a pair of
+  some kind.
+- `CLI::CheckedTransformer(std::map<std::string, int>({{"one", 1}, {"two", 2}}))`:
+  You can use maps; in `->transform()` these replace the matched key with the
+  value. `CheckedTransformer` also requires that the value either match one of
+  the keys or match one of known outputs.
+- `auto p = std::make_shared<CLI::TransformPairs<std::string>>(std::initializer_list<std::pair<std::string,std::string>>({"key1", "map1"},{"key2","map2"})); CLI::Transformer(p)`:
+  You can modify `p` later. `TransformPairs<T>` is an alias for
+  `std::vector<std::pair<<std::string,T>>`
+
+NOTES: If the container used in `IsMember`, `Transformer`, or
+`CheckedTransformer` has a `find` function like `std::unordered_map` or
+`std::map` then that function is used to do the searching. If it does not have a
+`find` function a linear search is performed. If there are filters present, the
+fast search is performed first, and if that fails a linear search with the
+filters on the key values is performed.
+
+- `CLI::FileOnDefaultPath(default_path)`: 🆕 can be used to check for files in a
+  default path. If used as a transform it will first check that a file exists,
+  if it does nothing further is done, if it does not it tries to add a default
+  Path to the file and search there again. If the file does not exist an error
+  is returned normally but this can be disabled using
+  `CLI::FileOnDefaultPath(default_path, false)`. This allows multiple paths to
+  be chained using multiple transform calls.
+
+##### Validator operations
+
+Validators are copyable and have a few operations that can be performed on them
+to alter settings. Most of the built in Validators have a default description
+that is displayed in the help. This can be altered via
+`.description(validator_description)`. The name of a Validator, which is useful
+for later reference from the `get_validator(name)` method of an `Option` can be
+set via `.name(validator_name)` The operation function of a Validator can be set
+via `.operation(std::function<std::string(std::string &>)`. The `.active()`
+function can activate or deactivate a Validator from the operation. A validator
+can be set to apply only to a specific element of the output. For example in a
+pair option `std::pair<int, std::string>` the first element may need to be a
+positive integer while the second may need to be a valid file. The
+`.application_index(int)` function can specify this. It is zero based and
+negative indices apply to all values.
+
+```cpp
+opt->check(CLI::Validator(CLI::PositiveNumber).application_index(0));
+opt->check(CLI::Validator(CLI::ExistingFile).application_index(1));
+```
+
+All the validator operation functions return a Validator reference allowing them
+to be chained. For example
+
+```cpp
+opt->check(CLI::Range(10,20).description("range is limited to sensible values").active(false).name("range"));
+```
+
+will specify a check on an option with a name "range", but deactivate it for the
+time being. The check can later be activated through
+
+```cpp
+opt->get_validator("range")->active();
+```
+
+##### Custom Validators
+
+A validator object with a custom function can be created via
+
+```cpp
+CLI::Validator(std::function<std::string(std::string &)>,validator_description,validator_name="");
+```
+
+or if the operation function is set later they can be created with
+
+```cpp
+CLI::Validator(validator_description);
+```
+
+It is also possible to create a subclass of `CLI::Validator`, in which case it
+can also set a custom description function, and operation function.
+
+##### Querying Validators
+
+Once loaded into an Option, a pointer to a named Validator can be retrieved via
+
+```cpp
+opt->get_validator(name);
+```
+
+This will retrieve a Validator with the given name or throw a
+`CLI::OptionNotFound` error. If no name is given or name is empty the first
+unnamed Validator will be returned or the first Validator if there is only one.
+
+or
+
+```cpp
+opt->get_validator(index);
+```
+
+Which will return a validator in the index it is applied which isn't necessarily
+the order in which was defined. The pointer can be `nullptr` if an invalid index
+is given. Validators have a few functions to query the current values:
+
+- `get_description()`: Will return a description string
+- `get_name()`: Will return the Validator name
+- `get_active()`: Will return the current active state, true if the Validator is
+  active.
+- `get_application_index()`: Will return the current application index.
+- `get_modifying()`: Will return true if the Validator is allowed to modify the
+  input, this can be controlled via the `non_modifying()` method, though it is
+  recommended to let `check` and `transform` option methods manipulate it if
+  needed.
+
+#### Getting results
+
+In most cases, the fastest and easiest way is to return the results through a
+callback or variable specified in one of the `add_*` functions. But there are
+situations where this is not possible or desired. For these cases the results
+may be obtained through one of the following functions. Please note that these
+functions will do any type conversions and processing during the call so should
+not used in performance critical code:
+
+- `->results()`: Retrieves a vector of strings with all the results in the order
+  they were given.
+- `->results(variable_to_bind_to)`: Gets the results according to the
+  MultiOptionPolicy and converts them just like the `add_option_function` with a
+  variable.
+- `Value=opt->as<type>()`: Returns the result or default value directly as the
+  specified type if possible, can be vector to return all results, and a
+  non-vector to get the result according to the MultiOptionPolicy in place.
+
+### Subcommands
+
+Subcommands are keywords that invoke a new set of options and features. For
+example, the `git` command has a long series of subcommands, like `add` and
+`commit`. Each can have its own options and implementations. Subcommands are
+supported in CLI11, and can be nested infinitely. To add a subcommand, call the
+`add_subcommand` method with a name and an optional description. This gives a
+pointer to an `App` that behaves just like the main app, and can take options or
+further subcommands. Add `->ignore_case()` to a subcommand to allow any
+variation of caps to also be accepted. `->ignore_underscore()` is similar, but
+for underscores. Children inherit the current setting from the parent. You
+cannot add multiple matching subcommand names at the same level (including
+`ignore_case` and `ignore_underscore`).
+
+If you want to require that at least one subcommand is given, use
+`.require_subcommand()` on the parent app. You can optionally give an exact
+number of subcommands to require, as well. If you give two arguments, that sets
+the min and max number allowed. 0 for the max number allowed will allow an
+unlimited number of subcommands. As a handy shortcut, a single negative value N
+will set "up to N" values. Limiting the maximum number allows you to keep
+arguments that match a previous subcommand name from matching.
+
+If an `App` (main or subcommand) has been parsed on the command line, `->parsed`
+will be true (or convert directly to bool). All `App`s have a
+`get_subcommands()` method, which returns a list of pointers to the subcommands
+passed on the command line. A `got_subcommand(App_or_name)` method is also
+provided that will check to see if an `App` pointer or a string name was
+collected on the command line.
+
+For many cases, however, using an app's callback capabilities may be easier.
+Every app has a set of callbacks that can be executed at various stages of
+parsing; a `C++` lambda function (with capture to get parsed values) can be used
+as input to the callback definition function. If you throw `CLI::Success` or
+`CLI::RuntimeError(return_value)`, you can even exit the program through the
+callback.
+
+Multiple subcommands are allowed, to allow [`Click`][click] like series of
+commands (order is preserved). The same subcommand can be triggered multiple
+times but all positional arguments will take precedence over the second and
+future calls of the subcommand. `->count()` on the subcommand will return the
+number of times the subcommand was called. The subcommand callback will only be
+triggered once unless the `.immediate_callback()` flag is set or the callback is
+specified through the `parse_complete_callback()` function. The
+`final_callback()` is triggered only once. In which case the callback executes
+on completion of the subcommand arguments but after the arguments for that
+subcommand have been parsed, and can be triggered multiple times.
+
+Subcommands may also have an empty name either by calling `add_subcommand` with
+an empty string for the name or with no arguments. Nameless subcommands function
+a similarly to groups in the main `App`. See [Option groups](#option-groups) to
+see how this might work. If an option is not defined in the main App, all
+nameless subcommands are checked as well. This allows for the options to be
+defined in a composable group. The `add_subcommand` function has an overload for
+adding a `shared_ptr<App>` so the subcommand(s) could be defined in different
+components and merged into a main `App`, or possibly multiple `Apps`. Multiple
+nameless subcommands are allowed. Callbacks for nameless subcommands are only
+triggered if any options from the subcommand were parsed. Subcommand names given
+through the `add_subcommand` method have the same restrictions as option names.
+
+🚧 Options or flags in a subcommand may be directly specified using dot notation
+
+- `--subcommand.long=val` (long subcommand option)
+- `--subcommand.long val` (long subcommand option)
+- `--subcommand.f=val` (short form subcommand option)
+- `--subcommand.f val` (short form subcommand option)
+- `--subcommand.f` (short form subcommand flag)
+- `--subcommand1.subsub.f val` (short form nested subcommand option)
+
+The use of dot notation in this form is equivalent `--subcommand.long <args>` =>
+`subcommand --long <args> ++`. Nested subcommands also work `"sub1.subsub"`
+would trigger the subsub subcommand in `sub1`. This is equivalent to "sub1
+subsub"
+
+#### Subcommand options
+
+There are several options that are supported on the main app and subcommands and
+option_groups. These are:
+
+- `.ignore_case()`: Ignore the case of this subcommand. Inherited by added
+  subcommands, so is usually used on the main `App`.
+- `.ignore_underscore()`: Ignore any underscores in the subcommand name.
+  Inherited by added subcommands, so is usually used on the main `App`.
+- `.allow_windows_style_options()`: Allow command line options to be parsed in
+  the form of `/s /long /file:file_name.ext` This option does not change how
+  options are specified in the `add_option` calls or the ability to process
+  options in the form of `-s --long --file=file_name.ext`.
+- `.fallthrough()`: Allow extra unmatched options and positionals to "fall
+  through" and be matched on a parent option. Subcommands always are allowed to
+  "fall through" as in they will first attempt to match on the current
+  subcommand and if they fail will progressively check parents for matching
+  subcommands.
+- `.configurable()`: Allow the subcommand to be triggered from a configuration
+  file. By default subcommand options in a configuration file do not trigger a
+  subcommand but will just update default values.
+- `.disable()`: Specify that the subcommand is disabled, if given with a bool
+  value it will enable or disable the subcommand or option group.
+- `.disabled_by_default()`: Specify that at the start of parsing the
+  subcommand/option_group should be disabled. This is useful for allowing some
+  Subcommands to trigger others.
+- `.enabled_by_default()`: Specify that at the start of each parse the
+  subcommand/option_group should be enabled. This is useful for allowing some
+  Subcommands to disable others.
+- `.silent()`: Specify that the subcommand is silent meaning that if used it
+  won't show up in the subcommand list. This allows the use of subcommands as
+  modifiers
+- `.validate_positionals()`: Specify that positionals should pass validation
+  before matching. Validation is specified through `transform`, `check`, and
+  `each` for an option. If an argument fails validation it is not an error and
+  matching proceeds to the next available positional or extra arguments.
+- `.validate_optional_arguments()`:🆕 Specify that optional arguments should
+  pass validation before being assigned to an option. Validation is specified
+  through `transform`, `check`, and `each` for an option. If an argument fails
+  validation it is not an error and matching proceeds to the next available
+  positional subcommand or extra arguments.
+- `.excludes(option_or_subcommand)`: If given an option pointer or pointer to
+  another subcommand, these subcommands cannot be given together. In the case of
+  options, if the option is passed the subcommand cannot be used and will
+  generate an error.
+- `.needs(option_or_subcommand)`: If given an option pointer or pointer to
+  another subcommand, the subcommands will require the given option to have been
+  given before this subcommand is validated which occurs prior to execution of
+  any callback or after parsing is completed.
+- `.require_option()`: Require 1 or more options or option groups be used.
+- `.require_option(N)`: Require `N` options or option groups, if `N>0`, or up to
+  `N` if `N<0`. `N=0` resets to the default to 0 or more.
+- `.require_option(min, max)`: Explicitly set min and max allowed options or
+  option groups. Setting `max` to 0 implies unlimited options.
+- `.require_subcommand()`: Require 1 or more subcommands.
+- `.require_subcommand(N)`: Require `N` subcommands if `N>0`, or up to `N` if
+  `N<0`. `N=0` resets to the default to 0 or more.
+- `.require_subcommand(min, max)`: Explicitly set min and max allowed
+  subcommands. Setting `max` to 0 is unlimited.
+- `.add_subcommand(name="", description="")`: Add a subcommand, returns a
+  pointer to the internally stored subcommand.
+- `.add_subcommand(shared_ptr<App>)`: Add a subcommand by shared_ptr, returns a
+  pointer to the internally stored subcommand.
+- `.remove_subcommand(App)`: Remove a subcommand from the app or subcommand.
+- `.got_subcommand(App_or_name)`: Check to see if a subcommand was received on
+  the command line.
+- `.get_subcommands(filter)`: The list of subcommands that match a particular
+  filter function.
+- `.add_option_group(name="", description="")`: Add an
+  [option group](#option-groups) to an App, an option group is specialized
+  subcommand intended for containing groups of options or other groups for
+  controlling how options interact.
+- `.get_parent()`: Get the parent App or `nullptr` if called on main App.
+- `.get_option(name)`: Get an option pointer by option name will throw if the
+  specified option is not available, nameless subcommands are also searched
+- `.get_option_no_throw(name)`: Get an option pointer by option name. This
+  function will return a `nullptr` instead of throwing if the option is not
+  available.
+- `.get_options(filter)`: Get the list of all defined option pointers (useful
+  for processing the app for custom output formats).
+- `.parse_order()`: Get the list of option pointers in the order they were
+  parsed (including duplicates).
+- `.formatter(fmt)`: Set a formatter, with signature
+  `std::string(const App*, std::string, AppFormatMode)`. See Formatting for more
+  details.
+- `.description(str)`: Set/change the description.
+- `.get_description()`: Access the description.
+- `.alias(str)`: set an alias for the subcommand, this allows subcommands to be
+  called by more than one name.
+- `.parsed()`: True if this subcommand was given on the command line.
+- `.count()`: Returns the number of times the subcommand was called.
+- `.count(option_name)`: Returns the number of times a particular option was
+  called.
+- `.count_all()`: Returns the total number of arguments a particular subcommand
+  processed, on the main App it returns the total number of processed commands.
+- `.name(name)`: Add or change the name.
+- `.callback(void() function)`: Set the callback for an app. Either sets the
+  `pre_parse_callback` or the `final_callback` depending on the value of
+  `immediate_callback`. See [Subcommand callbacks](#callbacks) for some
+  additional details.
+- `.parse_complete_callback(void() function)`: Set the callback that runs at the
+  completion of parsing. For subcommands this is executed at the completion of
+  the single subcommand and can be executed multiple times. See
+  [Subcommand callbacks](#callbacks) for some additional details.
+- `.final_callback(void() function)`: Set the callback that runs at the end of
+  all processing. This is the last thing that is executed before returning. See
+  [Subcommand callbacks](#callbacks) for some additional details.
+- `.immediate_callback()`: Specifies whether the callback for a subcommand
+  should be run as a `parse_complete_callback`(true) or `final_callback`(false).
+  When used on the main app it will execute the main app callback prior to the
+  callbacks for a subcommand if they do not also have the `immediate_callback`
+  flag set. It is preferable to use the `parse_complete_callback` or
+  `final_callback` directly instead of the `callback` and `immediate_callback`
+  if one wishes to control the ordering and timing of callback. Though
+  `immediate_callback` can be used to swap them if that is needed.
+- `.pre_parse_callback(void(std::size_t) function)`: Set a callback that
+  executes after the first argument of an application is processed. See
+  [Subcommand callbacks](#callbacks) for some additional details.
+- `.allow_extras()`: Do not throw an error if extra arguments are left over.
+- `.positionals_at_end()`: Specify that positional arguments occur as the last
+  arguments and throw an error if an unexpected positional is encountered.
+- `.prefix_command()`: Like `allow_extras`, but stop immediately on the first
+  unrecognized item. It is ideal for allowing your app or subcommand to be a
+  "prefix" to calling another app.
+- `.usage(message)`: Replace text to appear at the start of the help string
+  after description.
+- `.usage(std::string())`: Set a callback to generate a string that will appear
+  at the start of the help string after description.
+- `.footer(message)`: Set text to appear at the bottom of the help string.
+- `.footer(std::string())`: Set a callback to generate a string that will appear
+  at the end of the help string.
+- `.set_help_flag(name, message)`: Set the help flag name and message, returns a
+  pointer to the created option.
+- `.set_version_flag(name, versionString or callback, help_message)`: Set the
+  version flag name and version string or callback and optional help message,
+  returns a pointer to the created option.
+- `.set_help_all_flag(name, message)`: Set the help all flag name and message,
+  returns a pointer to the created option. Expands subcommands.
+- `.failure_message(func)`: Set the failure message function. Two provided:
+  `CLI::FailureMessage::help` and `CLI::FailureMessage::simple` (the default).
+- `.group(name)`: Set a group name, defaults to `"Subcommands"`. Setting an
+  empty string for the name will be hide the subcommand.
+- `[option_name]`: retrieve a const pointer to an option given by `option_name`
+  for Example `app["--flag1"]` will get a pointer to the option for the
+  "--flag1" value, `app["--flag1"]->as<bool>()` will get the results of the
+  command line for a flag. The operation will throw an exception if the option
+  name is not valid.
+
+> Note: if you have a fixed number of required positional options, that will
+> match before subcommand names. `{}` is an empty filter function, and any
+> positional argument will match before repeated subcommand names.
+
+#### Callbacks
+
+A subcommand has three optional callbacks that are executed at different stages
+of processing. The `preparse_callback` is executed once after the first argument
+of a subcommand or application is processed and gives an argument for the number
+of remaining arguments to process. For the main app the first argument is
+considered the program name, for subcommands the first argument is the
+subcommand name. For Option groups and nameless subcommands the first argument
+is after the first argument or subcommand is processed from that group. The
+second callback is executed after parsing. This is known as the
+`parse_complete_callback`. For subcommands this is executed immediately after
+parsing and can be executed multiple times if a subcommand is called multiple
+times. On the main app this callback is executed after all the
+`parse_complete_callback`s for the subcommands are executed but prior to any
+`final_callback` calls in the subcommand or option groups. If the main app or
+subcommand has a config file, no data from the config file will be reflected in
+`parse_complete_callback` on named subcommands. For `option_group`s the
+`parse_complete_callback` is executed prior to the `parse_complete_callback` on
+the main app but after the `config_file` is loaded (if specified). The
+`final_callback` is executed after all processing is complete. After the
+`parse_complete_callback` is executed on the main app, the used subcommand
+`final_callback` are executed followed by the "final callback" for option
+groups. The last thing to execute is the `final_callback` for the `main_app`.
+For example say an application was set up like
+
+```cpp
+app.parse_complete_callback(ac1);
+app.final_callback(ac2);
+auto sub1=app.add_subcommand("sub1")->parse_complete_callback(c1)->preparse_callback(pc1);
+auto sub2=app.add_subcommand("sub2")->final_callback(c2)->preparse_callback(pc2);
+app.preparse_callback( pa);
+
+... A bunch of other options
+```
+
+Then the command line is given as
+
+```bash
+program --opt1 opt1_val  sub1 --sub1opt --sub1optb val sub2 --sub2opt sub1 --sub1opt2 sub2 --sub2opt2 val
+```
+
+- `pa` will be called prior to parsing any values with an argument of 13.
+- `pc1` will be called immediately after processing the `sub1` command with a
+  value of 10.
+- `c1` will be called when the `sub2` command is encountered.
+- `pc2` will be called with value of 6 after the `sub2` command is encountered.
+- `c1` will be called again after the second `sub2` command is encountered.
+- `ac1` will be called after processing of all arguments
+- `c2` will be called once after processing all arguments.
+- `ac2` will be called last after completing all lower level callbacks have been
+  executed.
+
+A subcommand is considered terminated when one of the following conditions are
+met.
+
+1. There are no more arguments to process
+2. Another subcommand is encountered that would not fit in an optional slot of
+   the subcommand
+3. The `positional_mark` (`--`) is encountered and there are no available
+   positional slots in the subcommand.
+4. The `subcommand_terminator` mark (`++`) is encountered
+
+Prior to executed a `parse_complete_callback` all contained options are
+processed before the callback is triggered. If a subcommand with a
+`parse_complete_callback` is called again, then the contained options are reset,
+and can be triggered again.
+
+#### Option groups
+
+The subcommand method
+
+```cpp
+.add_option_group(name,description)
+```
+
+Will create an option group, and return a pointer to it. The argument for
+`description` is optional and can be omitted. An option group allows creation of
+a collection of options, similar to the groups function on options, but with
+additional controls and requirements. They allow specific sets of options to be
+composed and controlled as a collective. For an example see
+[range example](https://github.com/CLIUtils/CLI11/blob/main/examples/ranges.cpp).
+Option groups are a specialization of an App so all
+[functions](#subcommand-options) that work with an App or subcommand also work
+on option groups. Options can be created as part of an option group using the
+add functions just like a subcommand, or previously created options can be added
+through. The name given in an option group must not contain newlines or null
+characters.
+
+```cpp
+ogroup->add_option(option_pointer);
+ogroup->add_options(option_pointer);
+ogroup->add_options(option1,option2,option3,...);
+```
+
+The option pointers used in this function must be options defined in the parent
+application of the option group otherwise an error will be generated.
+Subcommands can also be added via
+
+```cpp
+ogroup->add_subcommand(subcom_pointer);
+```
+
+This results in the subcommand being moved from its parent into the option
+group.
+
+Options in an option group are searched for a command line match after any
+options in the main app, so any positionals in the main app would be matched
+first. So care must be taken to make sure of the order when using positional
+arguments and option groups. Option groups work well with `excludes` and
+`require_options` methods, as an application will treat an option group as a
+single option for the purpose of counting and requirements, and an option group
+will be considered used if any of the options or subcommands contained in it are
+used. Option groups allow specifying requirements such as requiring 1 of 3
+options in one group and 1 of 3 options in a different group. Option groups can
+contain other groups as well. Disabling an option group will turn off all
+options within the group.
+
+The `CLI::TriggerOn` and `CLI::TriggerOff` methods are helper functions to allow
+the use of options/subcommands from one group to trigger another group on or
+off.
+
+```cpp
+CLI::TriggerOn(group1_pointer, triggered_group);
+CLI::TriggerOff(group2_pointer, disabled_group);
+```
+
+These functions make use of `preparse_callback`, `enabled_by_default()` and
+`disabled_by_default`. The triggered group may be a vector of group pointers.
+These methods should only be used once per group and will override any previous
+use of the underlying functions. More complex arrangements can be accomplished
+using similar methodology with a custom `preparse_callback` function that does
+more.
+
+Additional helper functions `deprecate_option` and `retire_option` are available
+to deprecate or retire options
+
+```cpp
+CLI::deprecate_option(option *, replacement_name="");
+CLI::deprecate_option(App,option_name,replacement_name="");
+```
+
+will specify that the option is deprecated which will display a message in the
+help and a warning on first usage. Deprecated options function normally but will
+add a message in the help and display a warning on first use.
+
+```cpp
+CLI::retire_option(App,option *);
+CLI::retire_option(App,option_name);
+```
+
+will create an option that does nothing by default and will display a warning on
+first usage that the option is retired and has no effect. If the option exists
+it is replaces with a dummy option that takes the same arguments.
+
+If an empty string is passed the option group name the entire group will be
+hidden in the help results. For example.
+
+```cpp
+auto hidden_group=app.add_option_group("");
+```
+
+will create a group such that no options in that group are displayed in the help
+string.
+
+### Configuration file
+
+```cpp
+app.set_config(option_name="",
+               default_file_name="",
+               help_string="Read an ini file",
+               required=false)
+```
+
+If this is called with no arguments, it will remove the configuration file
+option (like `set_help_flag`). Setting a configuration option is special. If it
+is present, it will be read along with the normal command line arguments. The
+file will be read if it exists, and does not throw an error unless `required` is
+`true`. Configuration files are in [TOML][] format by default, though the
+default reader can also accept files in INI format as well. It should be noted
+that CLI11 does not contain a full TOML parser but can read strings from most
+TOML file and run them through the CLI11 parser. Other formats can be added by
+an adept user, some variations are available through customization points in the
+default formatter. An example of a TOML file:
+
+```toml
+# Comments are supported, using a #
+# The default section is [default], case insensitive
+
+value = 1
+str = "A string"
+vector = [1,2,3]
+str_vector = ["one","two","and three"]
+
+# Sections map to subcommands
+[subcommand]
+in_subcommand = Wow
+sub.subcommand = true
+```
+
+or equivalently in INI format
+
+```ini
+; Comments are supported, using a ;
+; The default section is [default], case insensitive
+
+value = 1
+str = "A string"
+vector = 1 2 3
+str_vector = "one" "two" "and three"
+
+; Sections map to subcommands
+[subcommand]
+in_subcommand = Wow
+sub.subcommand = true
+```
+
+Spaces before and after the name and argument are ignored. Multiple arguments
+are separated by spaces. One set of quotes will be removed, preserving spaces
+(the same way the command line works). Boolean options can be `true`, `on`, `1`,
+`yes`, `enable`; or `false`, `off`, `0`, `no`, `disable` (case insensitive).
+Sections (and `.` separated names) are treated as subcommands (note: this does
+not necessarily mean that subcommand was passed, it just sets the "defaults").
+You cannot set positional-only arguments. Subcommands can be triggered from
+configuration files if the `configurable` flag was set on the subcommand. Then
+the use of `[subcommand]` notation will trigger a subcommand and cause it to act
+as if it were on the command line.
+
+To print a configuration file from the passed arguments, use
+`.config_to_str(default_also=false, write_description=false)`, where
+`default_also` will also show any defaulted arguments, and `write_description`
+will include the app and option descriptions. See
+[Config files](https://cliutils.github.io/CLI11/book/chapters/config.html) for
+some additional details and customization points.
+
+If it is desired that multiple configuration be allowed. Use
+
+```cpp
+app.set_config("--config")->expected(1, X);
+```
+
+Where X is some positive number and will allow up to `X` configuration files to
+be specified by separate `--config` arguments. Value strings with quote
+characters in it will be printed with a single quote. All other arguments will
+use double quote. Empty strings will use a double quoted argument. Numerical or
+boolean values are not quoted.
+
+For options or flags which allow 0 arguments to be passed using an empty string
+in the config file, `{}`, or `[]` will convert the result to the default value
+specified via `default_str` or `default_val` on the option 🆕. If no user
+specified default is given the result is an empty string or the converted value
+of an empty string.
+
+NOTE: Transforms and checks can be used with the option pointer returned from
+set_config like any other option to validate the input if needed. It can also be
+used with the built in transform `CLI::FileOnDefaultPath` to look in a default
+path as well as the current one. For example
+
+```cpp
+app.set_config("--config")->transform(CLI::FileOnDefaultPath("/to/default/path/"));
+```
+
+See [Transforming Validators](#transforming-validators) for additional details
+on this validator. Multiple transforms or validators can be used either by
+multiple calls or using `|` operations with the transform.
+
+### Inheriting defaults
+
+Many of the defaults for subcommands and even options are inherited from their
+creators. The inherited default values for subcommands are `allow_extras`,
+`prefix_command`, `ignore_case`, `ignore_underscore`, `fallthrough`, `group`,
+`usage`, `footer`, `immediate_callback` and maximum number of required
+subcommands. The help flag existence, name, and description are inherited, as
+well.
+
+Options have defaults for `group`, `required`, `multi_option_policy`,
+`ignore_case`, `ignore_underscore`, `delimiter`, and `disable_flag_override`. To
+set these defaults, you should set the `option_defaults()` object, for example:
+
+```cpp
+app.option_defaults()->required();
+// All future options will be required
+```
+
+The default settings for options are inherited to subcommands, as well.
+
+### Formatting
+
+The job of formatting help printouts is delegated to a formatter callable object
+on Apps and Options. You are free to replace either formatter by calling
+`formatter(fmt)` on an `App`, where fmt is any copyable callable with the
+correct signature. CLI11 comes with a default App formatter functional,
+`Formatter`. It is customizable; you can set `label(key, value)` to replace the
+default labels like `REQUIRED`, and `column_width(n)` to set the width of the
+columns before you add the functional to the app or option. You can also
+override almost any stage of the formatting process in a subclass of either
+formatter. If you want to make a new formatter from scratch, you can do that
+too; you just need to implement the correct signature. The first argument is a
+const pointer to the in question. The formatter will get a `std::string` usage
+name as the second option, and a `AppFormatMode` mode for the final option. It
+should return a `std::string`.
+
+The `AppFormatMode` can be `Normal`, `All`, or `Sub`, and it indicates the
+situation the help was called in. `Sub` is optional, but the default formatter
+uses it to make sure expanded subcommands are called with their own formatter
+since you can't access anything but the call operator once a formatter has been
+set.
+
+### Subclassing
+
+The App class was designed allow toolkits to subclass it, to provide preset
+default options (see above) and setup/teardown code. Subcommands remain an
+unsubclassed `App`, since those are not expected to need setup and teardown. The
+default `App` only adds a help flag, `-h,--help`, than can removed/replaced
+using `.set_help_flag(name, help_string)`. You can also set a help-all flag with
+`.set_help_all_flag(name, help_string)`; this will expand the subcommands (one
+level only). You can remove options if you have pointers to them using
+`.remove_option(opt)`. You can add a `pre_callback` override to customize the
+after parse but before run behavior, while still giving the user freedom to
+`callback` on the main app.
+
+The most important parse function is `parse(std::vector<std::string>)`, which
+takes a reversed list of arguments (so that `pop_back` processes the args in the
+correct order). `get_help_ptr` and `get_config_ptr` give you access to the
+help/config option pointers. The standard `parse` manually sets the name from
+the first argument, so it should not be in this vector. You can also use
+`parse(string, bool)` to split up and parse a single string; the optional
+boolean should be set to true if you are including the program name in the
+string, and false otherwise. The program name can contain spaces if it is an
+existing file, otherwise can be enclosed in quotes(single quote, double quote or
+backtick). Embedded quote characters can be escaped with `\`.
+
+Also, in a related note, the `App` you get a pointer to is stored in the parent
+`App` in a `shared_ptr`s (similar to `Option`s) and are deleted when the main
+`App` goes out of scope unless the object has another owner.
+
+### How it works
+
+Every `add_` option you have seen so far depends on one method that takes a
+lambda function. Each of these methods is just making a different lambda
+function with capture to populate the option. The function has full access to
+the vector of strings, so it knows how many times an option was passed or how
+many arguments it received. The lambda returns `true` if it could validate the
+option strings, and `false` if it failed.
+
+Other values can be added as long as they support `operator>>` (and defaults can
+be printed if they support `operator<<`). To add a new type, for example,
+provide a custom `operator>>` with an `istream` (inside the CLI namespace is
+fine if you don't want to interfere with an existing `operator>>`).
+
+If you wanted to extend this to support a completely new type, use a lambda or
+add an overload of the `lexical_cast` function in the namespace of the type you
+need to convert to. Some examples of some new parsers for `complex<double>` that
+support all of the features of a standard `add_options` call are in
+[one of the tests](./tests/NewParseTest.cpp). A simpler example is shown below:
+
+```cpp
+app.add_option("--fancy-count", [](std::vector<std::string> val){
+    std::cout << "This option was given " << val.size() << " times." << std::endl;
+    return true;
+    });
+```
+
+### Unicode support
+
+CLI11 supports Unicode and wide strings as defined in the
+[UTF-8 Everywhere](http://utf8everywhere.org/) manifesto. In particular:
+
+- The library can parse a wide version of command-line arguments on Windows,
+  which are converted internally to UTF-8 (more on this below);
+- You can store option values in `std::wstring`, in which case they will be
+  converted to a correct wide string encoding on your system (UTF-16 on Windows
+  and UTF-32 on most other systems);
+- Instead of storing wide strings, it is recommended to use provided `widen` and
+  `narrow` functions to convert to and from wide strings when actually necessary
+  (such as when calling into Windows APIs).
+
+When using the command line on Windows with unicode arguments, your `main`
+function may already receive broken Unicode. Parsing `argv` at that point will
+not give you a correct string. To fix this, you have three good options and two
+bad ones:
+
+1. Replace `argv` with `app.ensure_utf8(argv)` before any arguments are parsed.
+   `ensure_utf8` will do nothing on systems where `argv` is already in UTF-8
+   (Such as Linux or macOS) and return `argv` unmodified. On Windows, it will
+   discard `argv` and replace it with a correctly decoded array or arguments
+   from win32 API.
+
+   ```cpp
+   int main(int argc, char** argv) {
+       CLI::App app;
+       argv = app.ensure_utf8(argv);  // new argv memory is held by app
+       // ...
+       CLI11_PARSE(app, argc, argv);
+   }
+   ```
+
+2. If you pass unmodified command-line arguments to CLI11, call `app.parse()`
+   instead of `app.parse(argc, argv)` (or `CLI11_PARSE(app)` instead of
+   `CLI11_PARSE(app, argc, argv)`). The library will find correct arguments by
+   itself.
+
+   Note: this approach may not work on weird OS configurations, such as when the
+   `/proc` dir is missing on Linux systems (see also
+   [#845](https://github.com/CLIUtils/CLI11/issues/845)).
+
+   ```cpp
+   int main() {
+       CLI::App app;
+       // ...
+       CLI11_PARSE(app);
+   }
+   ```
+
+3. Get correct arguments with which the program was originally executed using
+   provided functions: `CLI::argc()` and `CLI::argv()`. These three methods are
+   the only cross-platform ways of handling unicode correctly.
+
+   ```cpp
+   int main() {
+       CLI::App app;
+       // ...
+       CLI11_PARSE(app, CLI::argc(), CLI::argv());
+   }
+   ```
+
+<details><summary>Bad options (click to expand)</summary><p>
+
+4. Use the Windows-only non-standard `wmain` function, which accepts
+   `wchar_t *argv[]` instead of `char* argv[]`. Parsing this will allow CLI to
+   convert wide strings to UTF-8 without losing information.
+
+   ```cpp
+   int wmain(int argc, wchar_t *argv[]) {
+       CLI::App app;
+       // ...
+       CLI11_PARSE(app, argc, argv);
+   }
+   ```
+
+5. Retrieve arguments yourself by using Windows APIs like
+   [`CommandLineToArgvW`](https://learn.microsoft.com/en-us/windows/win32/api/shellapi/nf-shellapi-commandlinetoargvw)
+   and pass them to CLI. This is what the library is doing under the hood in
+   `CLI::argv()`.
+
+</p></details>
+</br>
+
+The library provides functions to convert between UTF-8 and wide strings:
+
+```cpp
+namespace CLI {
+    std::string narrow(const std::wstring &str);
+    std::string narrow(const wchar_t *str);
+    std::string narrow(const wchar_t *str, std::size_t size);
+    std::string narrow(std::wstring_view str);  // C++17
+
+    std::wstring widen(const std::string &str);
+    std::wstring widen(const char *str);
+    std::wstring widen(const char *str, std::size_t size);
+    std::wstring widen(std::string_view str);  // C++17
+}
+```
+
+#### Note on using Unicode paths
+
+When creating a `filesystem::path` from a UTF-8 path on Windows, you need to
+convert it to a wide string first. CLI11 provides a platform-independent
+`to_path` function, which will convert a UTF-8 string to path, the right way:
+
+```cpp
+std::string utf8_name = "Hello Halló Привет 你好 👩‍🚀❤️.txt";
+
+std::filesystem::path p = CLI::to_path(utf8_name);
+std::ifstream stream(CLI::to_path(utf8_name));
+// etc.
+```
+
+### Utilities
+
+There are a few other utilities that are often useful in CLI programming. These
+are in separate headers, and do not appear in `CLI11.hpp`, but are completely
+independent and can be used as needed. The `Timer`/`AutoTimer` class allows you
+to easily time a block of code, with custom print output.
+
+```cpp
+{
+CLI::AutoTimer timer {"My Long Process", CLI::Timer::Big};
+some_long_running_process();
+}
+```
+
+This will create a timer with a title (default: `Timer`), and will customize the
+output using the predefined `Big` output (default: `Simple`). Because it is an
+`AutoTimer`, it will print out the time elapsed when the timer is destroyed at
+the end of the block. If you use `Timer` instead, you can use `to_string` or
+`std::cout << timer << std::endl;` to print the time. The print function can be
+any function that takes two strings, the title and the time, and returns a
+formatted string for printing.
+
+### Other libraries
+
+If you use the excellent [Rang][] library to add color to your terminal in a
+safe, multi-platform way, you can combine it with CLI11 nicely:
+
+```cpp
+std::atexit([](){std::cout << rang::style::reset;});
+try {
+    app.parse(argc, argv);
+} catch (const CLI::ParseError &e) {
+    std::cout << (e.get_exit_code()==0 ? rang::fg::blue : rang::fg::red);
+    return app.exit(e);
+}
+```
+
+This will print help in blue, errors in red, and will reset before returning the
+terminal to the user.
+
+If you are on a Unix-like system, and you'd like to handle control-c and color,
+you can add:
+
+```cpp
+ #include <csignal>
+ void signal_handler(int s) {
+     std::cout << std::endl << rang::style::reset << rang::fg::red << rang::fg::bold;
+     std::cout << "Control-C detected, exiting..." << rang::style::reset << std::endl;
+     std::exit(1); // will call the correct exit func, no unwinding of the stack though
+ }
+```
+
+And, in your main function:
+
+```cpp
+     // Nice Control-C
+     struct sigaction sigIntHandler;
+     sigIntHandler.sa_handler = signal_handler;
+     sigemptyset(&sigIntHandler.sa_mask);
+     sigIntHandler.sa_flags = 0;
+     sigaction(SIGINT, &sigIntHandler, nullptr);
+```
+
+## API
+
+The API is [documented here][api-docs]. Also see the [CLI11 tutorial
+GitBook][gitbook].
+
+## Examples
+
+Several short examples of different features are included in the repository. A
+brief description of each is included here
+
+- [callback_passthrough](https://github.com/CLIUtils/CLI11/blob/main/examples/callback_passthrough.cpp):
+  Example of directly passing remaining arguments through to a callback function
+  which generates a CLI11 application based on existing arguments.
+- [custom_parse](https://github.com/CLIUtils/CLI11/blob/main/examples/custom_parse.cpp):
+  Based on [Issue #566](https://github.com/CLIUtils/CLI11/issues/566), example
+  of custom parser
+- [digit_args](https://github.com/CLIUtils/CLI11/blob/main/examples/digit_args.cpp):
+  Based on [Issue #123](https://github.com/CLIUtils/CLI11/issues/123), uses
+  digit flags to pass a value
+- [enum](https://github.com/CLIUtils/CLI11/blob/main/examples/enum.cpp): Using
+  enumerations in an option, and the use of
+  [CheckedTransformer](#transforming-validators)
+- [enum_ostream](https://github.com/CLIUtils/CLI11/blob/main/examples/enum_ostream.cpp):
+  In addition to the contents of example enum.cpp, this example shows how a
+  custom ostream operator overrides CLI11's enum streaming.
+- [formatter](https://github.com/CLIUtils/CLI11/blob/main/examples/formatter.cpp):
+  Illustrating usage of a custom formatter
+- [groups](https://github.com/CLIUtils/CLI11/blob/main/examples/groups.cpp):
+  Example using groups of options for help grouping and a the timer helper class
+- [inter_argument_order](https://github.com/CLIUtils/CLI11/blob/main/examples/inter_argument_order.cpp):
+  An app to practice mixing unlimited arguments, but still recover the original
+  order.
+- [json](https://github.com/CLIUtils/CLI11/blob/main/examples/json.cpp): Using
+  JSON as a config file parser
+- [modhelp](https://github.com/CLIUtils/CLI11/blob/main/examples/modhelp.cpp):
+  How to modify the help flag to do something other than default
+- [nested](https://github.com/CLIUtils/CLI11/blob/main/examples/nested.cpp):
+  Nested subcommands
+- [option_groups](https://github.com/CLIUtils/CLI11/blob/main/examples/option_groups.cpp):
+  Illustrating the use of option groups and a required number of options. Based
+  on [Issue #88](https://github.com/CLIUtils/CLI11/issues/88) to set interacting
+  groups of options
+- [positional_arity](https://github.com/CLIUtils/CLI11/blob/main/examples/positional_arity.cpp):
+  Illustrating use of `preparse_callback` to handle situations where the number
+  of arguments can determine which should get parsed, Based on
+  [Issue #166](https://github.com/CLIUtils/CLI11/issues/166)
+- [positional_validation](https://github.com/CLIUtils/CLI11/blob/main/examples/positional_validation.cpp):
+  Example of how positional arguments are validated using the
+  `validate_positional` flag, also based on
+  [Issue #166](https://github.com/CLIUtils/CLI11/issues/166)
+- [prefix_command](https://github.com/CLIUtils/CLI11/blob/main/examples/prefix_command.cpp):
+  Illustrating use of the `prefix_command` flag.
+- [ranges](https://github.com/CLIUtils/CLI11/blob/main/examples/ranges.cpp): App
+  to demonstrate exclusionary option groups based on
+  [Issue #88](https://github.com/CLIUtils/CLI11/issues/88)
+- [shapes](https://github.com/CLIUtils/CLI11/blob/main/examples/shapes.cpp):
+  Illustrating how to set up repeated subcommands Based on
+  [gitter discussion](https://gitter.im/CLI11gitter/Lobby?at=5c7af6b965ffa019ea788cd5)
+- [simple](https://github.com/CLIUtils/CLI11/blob/main/examples/simple.cpp): A
+  simple example of how to set up a CLI11 Application with different flags and
+  options
+- [subcom_help](https://github.com/CLIUtils/CLI11/blob/main/examples/subcom_help.cpp):
+  Configuring help for subcommands
+- [subcom_partitioned](https://github.com/CLIUtils/CLI11/blob/main/examples/subcom_partitioned.cpp):
+  Example with a timer and subcommands generated separately and added to the
+  main app later.
+- [subcommands](https://github.com/CLIUtils/CLI11/blob/main/examples/subcommands.cpp):
+  Short example of subcommands
+- [validators](https://github.com/CLIUtils/CLI11/blob/main/examples/validators.cpp):
+  Example illustrating use of validators
+
+## Contribute
+
+To contribute, open an [issue][github issues] or [pull
+request][github pull requests] on GitHub, or ask a question on [gitter][]. There
+is also a short note to contributors [here](./.github/CONTRIBUTING.md). This
+readme roughly follows the [Standard Readme Style][] and includes a mention of
+almost every feature of the library. More complex features are documented in
+more detail in the [CLI11 tutorial GitBook][gitbook].
+
+This project was created by [Henry Schreiner](https://github.com/henryiii) and
+major features were added by [Philip Top](https://github.com/phlptp). Special
+thanks to all the contributors
+([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="http://iscinumpy.gitlab.io"><img src="https://avatars1.githubusercontent.com/u/4616906?v=4?s=100" width="100px;" alt="Henry Schreiner"/><br /><sub><b>Henry Schreiner</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Ahenryiii" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=henryiii" title="Documentation">📖</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=henryiii" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/phlptp"><img src="https://avatars0.githubusercontent.com/u/20667153?v=4?s=100" width="100px;" alt="Philip Top"/><br /><sub><b>Philip Top</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Aphlptp" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=phlptp" title="Documentation">📖</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=phlptp" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/cbachhuber/"><img src="https://avatars0.githubusercontent.com/u/27212661?v=4?s=100" width="100px;" alt="Christoph Bachhuber"/><br /><sub><b>Christoph Bachhuber</b></sub></a><br /><a href="#example-cbachhuber" title="Examples">💡</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=cbachhuber" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://lambdafu.net/"><img src="https://avatars1.githubusercontent.com/u/1138455?v=4?s=100" width="100px;" alt="Marcus Brinkmann"/><br /><sub><b>Marcus Brinkmann</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Alambdafu" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=lambdafu" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/SkyToGround"><img src="https://avatars1.githubusercontent.com/u/58835?v=4?s=100" width="100px;" alt="Jonas Nilsson"/><br /><sub><b>Jonas Nilsson</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3ASkyToGround" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=SkyToGround" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dvj"><img src="https://avatars2.githubusercontent.com/u/77217?v=4?s=100" width="100px;" alt="Doug Johnston"/><br /><sub><b>Doug Johnston</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Advj" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=dvj" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://lucas-czech.de"><img src="https://avatars0.githubusercontent.com/u/4741887?v=4?s=100" width="100px;" alt="Lucas Czech"/><br /><sub><b>Lucas Czech</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Alczech" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=lczech" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/rafiw"><img src="https://avatars3.githubusercontent.com/u/3034707?v=4?s=100" width="100px;" alt="Rafi Wiener"/><br /><sub><b>Rafi Wiener</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Arafiw" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=rafiw" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/mensinda"><img src="https://avatars3.githubusercontent.com/u/3407462?v=4?s=100" width="100px;" alt="Daniel Mensinger"/><br /><sub><b>Daniel Mensinger</b></sub></a><br /><a href="#platform-mensinda" title="Packaging/porting to new platform">📦</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jbriales"><img src="https://avatars1.githubusercontent.com/u/6850478?v=4?s=100" width="100px;" alt="Jesus Briales"/><br /><sub><b>Jesus Briales</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=jbriales" title="Code">💻</a> <a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Ajbriales" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://seanfisk.com/"><img src="https://avatars0.githubusercontent.com/u/410322?v=4?s=100" width="100px;" alt="Sean Fisk"/><br /><sub><b>Sean Fisk</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Aseanfisk" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=seanfisk" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/fpeng1985"><img src="https://avatars1.githubusercontent.com/u/87981?v=4?s=100" width="100px;" alt="fpeng1985"/><br /><sub><b>fpeng1985</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=fpeng1985" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/almikhayl"><img src="https://avatars2.githubusercontent.com/u/6747040?v=4?s=100" width="100px;" alt="almikhayl"/><br /><sub><b>almikhayl</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=almikhayl" title="Code">💻</a> <a href="#platform-almikhayl" title="Packaging/porting to new platform">📦</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/andrew-hardin"><img src="https://avatars0.githubusercontent.com/u/16496326?v=4?s=100" width="100px;" alt="Andrew Hardin"/><br /><sub><b>Andrew Hardin</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=andrew-hardin" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/SX91"><img src="https://avatars2.githubusercontent.com/u/754754?v=4?s=100" width="100px;" alt="Anton"/><br /><sub><b>Anton</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=SX91" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/helmesjo"><img src="https://avatars0.githubusercontent.com/u/2501070?v=4?s=100" width="100px;" alt="Fred Helmesjö"/><br /><sub><b>Fred Helmesjö</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Ahelmesjo" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=helmesjo" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/skannan89"><img src="https://avatars0.githubusercontent.com/u/11918764?v=4?s=100" width="100px;" alt="Kannan"/><br /><sub><b>Kannan</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Askannan89" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=skannan89" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://himvis.com"><img src="https://avatars3.githubusercontent.com/u/465279?v=4?s=100" width="100px;" alt="Khem Raj"/><br /><sub><b>Khem Raj</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=kraj" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.mogigoma.com/"><img src="https://avatars2.githubusercontent.com/u/130862?v=4?s=100" width="100px;" alt="Mak Kolybabi"/><br /><sub><b>Mak Kolybabi</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=mogigoma" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://msoeken.github.io"><img src="https://avatars0.githubusercontent.com/u/1998245?v=4?s=100" width="100px;" alt="Mathias Soeken"/><br /><sub><b>Mathias Soeken</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=msoeken" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/nathanhourt"><img src="https://avatars2.githubusercontent.com/u/271977?v=4?s=100" width="100px;" alt="Nathan Hourt"/><br /><sub><b>Nathan Hourt</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Anathanhourt" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=nathanhourt" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/pleroux0"><img src="https://avatars2.githubusercontent.com/u/39619854?v=4?s=100" width="100px;" alt="Paul le Roux"/><br /><sub><b>Paul le Roux</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=pleroux0" title="Code">💻</a> <a href="#platform-pleroux0" title="Packaging/porting to new platform">📦</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/chfast"><img src="https://avatars1.githubusercontent.com/u/573380?v=4?s=100" width="100px;" alt="Paweł Bylica"/><br /><sub><b>Paweł Bylica</b></sub></a><br /><a href="#platform-chfast" title="Packaging/porting to new platform">📦</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/peterazmanov"><img src="https://avatars0.githubusercontent.com/u/15322318?v=4?s=100" width="100px;" alt="Peter Azmanov"/><br /><sub><b>Peter Azmanov</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=peterazmanov" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/delpinux"><img src="https://avatars0.githubusercontent.com/u/35096584?v=4?s=100" width="100px;" alt="Stéphane Del Pino"/><br /><sub><b>Stéphane Del Pino</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=delpinux" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/metopa"><img src="https://avatars2.githubusercontent.com/u/3974178?v=4?s=100" width="100px;" alt="Viacheslav Kroilov"/><br /><sub><b>Viacheslav Kroilov</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=metopa" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://cs.odu.edu/~ctsolakis"><img src="https://avatars0.githubusercontent.com/u/6725596?v=4?s=100" width="100px;" alt="christos"/><br /><sub><b>christos</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=ChristosT" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/deining"><img src="https://avatars3.githubusercontent.com/u/18169566?v=4?s=100" width="100px;" alt="deining"/><br /><sub><b>deining</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=deining" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/elszon"><img src="https://avatars0.githubusercontent.com/u/2971495?v=4?s=100" width="100px;" alt="elszon"/><br /><sub><b>elszon</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=elszon" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ncihnegn"><img src="https://avatars3.githubusercontent.com/u/12021721?v=4?s=100" width="100px;" alt="ncihnegn"/><br /><sub><b>ncihnegn</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=ncihnegn" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/nurelin"><img src="https://avatars3.githubusercontent.com/u/5276274?v=4?s=100" width="100px;" alt="nurelin"/><br /><sub><b>nurelin</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=nurelin" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ryan4729"><img src="https://avatars3.githubusercontent.com/u/40183301?v=4?s=100" width="100px;" alt="ryan4729"/><br /><sub><b>ryan4729</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=ryan4729" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://izzys.casa"><img src="https://avatars0.githubusercontent.com/u/63051?v=4?s=100" width="100px;" alt="Isabella Muerte"/><br /><sub><b>Isabella Muerte</b></sub></a><br /><a href="#platform-slurps-mad-rips" title="Packaging/porting to new platform">📦</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/KOLANICH"><img src="https://avatars1.githubusercontent.com/u/240344?v=4?s=100" width="100px;" alt="KOLANICH"/><br /><sub><b>KOLANICH</b></sub></a><br /><a href="#platform-KOLANICH" title="Packaging/porting to new platform">📦</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jgerityneurala"><img src="https://avatars2.githubusercontent.com/u/57360646?v=4?s=100" width="100px;" alt="James Gerity"/><br /><sub><b>James Gerity</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=jgerityneurala" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jsoref"><img src="https://avatars0.githubusercontent.com/u/2119212?v=4?s=100" width="100px;" alt="Josh Soref"/><br /><sub><b>Josh Soref</b></sub></a><br /><a href="#tool-jsoref" title="Tools">🔧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/geir-t"><img src="https://avatars3.githubusercontent.com/u/35292136?v=4?s=100" width="100px;" alt="geir-t"/><br /><sub><b>geir-t</b></sub></a><br /><a href="#platform-geir-t" title="Packaging/porting to new platform">📦</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://ondrejcertik.com/"><img src="https://avatars3.githubusercontent.com/u/20568?v=4?s=100" width="100px;" alt="Ondřej Čertík"/><br /><sub><b>Ondřej Čertík</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Acertik" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://sam.hocevar.net/"><img src="https://avatars2.githubusercontent.com/u/245089?v=4?s=100" width="100px;" alt="Sam Hocevar"/><br /><sub><b>Sam Hocevar</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=samhocevar" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://www.ratml.org/"><img src="https://avatars0.githubusercontent.com/u/1845039?v=4?s=100" width="100px;" alt="Ryan Curtin"/><br /><sub><b>Ryan Curtin</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=rcurtin" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://mbh.sh"><img src="https://avatars3.githubusercontent.com/u/20403931?v=4?s=100" width="100px;" alt="Michael Hall"/><br /><sub><b>Michael Hall</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=mbhall88" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ferdymercury"><img src="https://avatars3.githubusercontent.com/u/10653970?v=4?s=100" width="100px;" alt="ferdymercury"/><br /><sub><b>ferdymercury</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=ferdymercury" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jakoblover"><img src="https://avatars0.githubusercontent.com/u/14160441?v=4?s=100" width="100px;" alt="Jakob Lover"/><br /><sub><b>Jakob Lover</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=jakoblover" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ZeeD26"><img src="https://avatars2.githubusercontent.com/u/2487468?v=4?s=100" width="100px;" alt="Dominik Steinberger"/><br /><sub><b>Dominik Steinberger</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=ZeeD26" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dfleury2"><img src="https://avatars1.githubusercontent.com/u/4805384?v=4?s=100" width="100px;" alt="D. Fleury"/><br /><sub><b>D. Fleury</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=dfleury2" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dbarowy"><img src="https://avatars3.githubusercontent.com/u/573142?v=4?s=100" width="100px;" alt="Dan Barowy"/><br /><sub><b>Dan Barowy</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=dbarowy" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/paddy-hack"><img src="https://avatars.githubusercontent.com/u/6804372?v=4?s=100" width="100px;" alt="Olaf Meeuwissen"/><br /><sub><b>Olaf Meeuwissen</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=paddy-hack" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dryleev"><img src="https://avatars.githubusercontent.com/u/83670813?v=4?s=100" width="100px;" alt="dryleev"/><br /><sub><b>dryleev</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=dryleev" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/AnticliMaxtic"><img src="https://avatars.githubusercontent.com/u/43995389?v=4?s=100" width="100px;" alt="Max"/><br /><sub><b>Max</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=AnticliMaxtic" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://profiles.sussex.ac.uk/p281168-alex-dewar/publications"><img src="https://avatars.githubusercontent.com/u/23149834?v=4?s=100" width="100px;" alt="Alex Dewar"/><br /><sub><b>Alex Dewar</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=alexdewar" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/trokhymchuk"><img src="https://avatars.githubusercontent.com/u/66204814?v=4?s=100" width="100px;" alt="Artem Trokhymchuk "/><br /><sub><b>Artem Trokhymchuk </b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=trokhymchuk" title="Code">💻</a></td>
+    </tr>
+  </tbody>
+</table>
+
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
+
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+This project follows the
+[all-contributors](https://github.com/all-contributors/all-contributors)
+specification. Contributions of any kind welcome!
+
+## License
+
+As of version 1.0, this library is available under a 3-Clause BSD license. See
+the [LICENSE](./LICENSE) file for details.
+
+CLI11 was developed at the [University of Cincinnati][] to support of the
+[GooFit][] library under [NSF Award 1414736][]. Version 0.9 was featured in a
+[DIANA/HEP][] meeting at CERN ([see the slides][diana slides]). Please give it a
+try! Feedback is always welcome.
+
+[doi-badge]: https://zenodo.org/badge/80064252.svg
+[doi-link]: https://zenodo.org/badge/latestdoi/80064252
+[azure-badge]:
+  https://dev.azure.com/CLIUtils/CLI11/_apis/build/status/CLIUtils.CLI11?branchName=main
+[azure]: https://dev.azure.com/CLIUtils/CLI11
+[actions-link]: https://github.com/CLIUtils/CLI11/actions
+[actions-badge]:
+  https://github.com/CLIUtils/CLI11/actions/workflows/tests.yml/badge.svg
+[appveyor-badge]:
+  https://ci.appveyor.com/api/projects/status/82niaxpaa28dwbms/branch/main?svg=true
+[appveyor]: https://ci.appveyor.com/project/HenrySchreiner/cli11
+[repology-badge]: https://repology.org/badge/latest-versions/cli11.svg
+[repology]: https://repology.org/project/cli11/versions
+[codecov-badge]:
+  https://codecov.io/gh/CLIUtils/CLI11/branch/main/graph/badge.svg?token=2O4wfs8NJO
+[codecov]: https://codecov.io/gh/CLIUtils/CLI11
+[gitter-badge]: https://badges.gitter.im/CLI11gitter/Lobby.svg
+[gitter]: https://gitter.im/CLI11gitter/Lobby
+[license-badge]: https://img.shields.io/badge/License-BSD-blue.svg
+[conan-badge]: https://img.shields.io/badge/conan-io-blue
+[conan-link]: https://conan.io/center/cli11
+[conda-badge]: https://img.shields.io/conda/vn/conda-forge/cli11.svg
+[conda-link]: https://github.com/conda-forge/cli11-feedstock
+[github releases]: https://github.com/CLIUtils/CLI11/releases
+[github issues]: https://github.com/CLIUtils/CLI11/issues
+[github pull requests]: https://github.com/CLIUtils/CLI11/pulls
+[goofit]: https://GooFit.github.io
+[plumbum]: https://plumbum.readthedocs.io/en/latest/
+[click]: http://click.pocoo.org
+[api-docs]: https://CLIUtils.github.io/CLI11/index.html
+[rang]: https://github.com/agauniyal/rang
+[boost program options]:
+  http://www.boost.org/doc/libs/1_63_0/doc/html/program_options.html
+[the lean mean c++ option parser]: http://optionparser.sourceforge.net
+[tclap]: http://tclap.sourceforge.net
+[cxxopts]: https://github.com/jarro2783/cxxopts
+[docopt]: https://github.com/docopt/docopt.cpp
+[gflags]: https://gflags.github.io/gflags
+[getopt]: https://www.gnu.org/software/libc/manual/html_node/Getopt.html
+[diana/hep]: http://diana-hep.org
+[nsf award 1414736]: https://nsf.gov/awardsearch/showAward?AWD_ID=1414736
+[university of cincinnati]: http://www.uc.edu
+[gitbook]: https://cliutils.github.io/CLI11/book/
+[cli11 advanced topics/custom converters]:
+  https://cliutils.gitlab.io/CLI11Tutorial/chapters/advanced-topics.html#custom-converters
+[programoptions.hxx]: https://github.com/Fytch/ProgramOptions.hxx
+[argument aggregator]: https://github.com/vietjtnguyen/argagg
+[args]: https://github.com/Taywee/args
+[argh!]: https://github.com/adishavit/argh
+[fmt]: https://github.com/fmtlib/fmt
+[catch]: https://github.com/philsquared/Catch
+[clara]: https://github.com/philsquared/Clara
+[version 1.0 post]: https://iscinumpy.gitlab.io/post/announcing-cli11-10/
+[version 1.3 post]: https://iscinumpy.gitlab.io/post/announcing-cli11-13/
+[version 1.6 post]: https://iscinumpy.gitlab.io/post/announcing-cli11-16/
+[version 2.0 post]: https://iscinumpy.gitlab.io/post/announcing-cli11-20/
+[wandbox-badge]: https://img.shields.io/badge/try_2.1-online-blue.svg
+[wandbox-link]: https://wandbox.org/permlink/CA5bymNHh0AczdeN
+[releases-badge]: https://img.shields.io/github/release/CLIUtils/CLI11.svg
+[cli11-po-compare]:
+  https://iscinumpy.gitlab.io/post/comparing-cli11-and-boostpo/
+[diana slides]:
+  https://indico.cern.ch/event/619465/contributions/2507949/attachments/1448567/2232649/20170424-diana-2.pdf
+[awesome c++]: https://github.com/fffaraz/awesome-cpp/blob/master/README.md#cli
+[cli]: https://codesynthesis.com/projects/cli/
+[single file libs]:
+  https://github.com/nothings/single_file_libs/blob/master/README.md
+[codacy-badge]:
+  https://app.codacy.com/project/badge/Grade/2796b969c1b54321a02ad08affec0800
+[codacy-link]:
+  https://www.codacy.com/gh/CLIUtils/CLI11/dashboard?utm_source=github.com&utm_medium=referral&utm_content=CLIUtils/CLI11&utm_campaign=Badge_Grade
+[hunter]: https://docs.hunter.sh/en/latest/packages/pkg/CLI11.html
+[standard readme style]: https://github.com/RichardLitt/standard-readme
+[argparse]: https://github.com/p-ranav/argparse
+[toml]: https://toml.io
+[lyra]: https://github.com/bfgroup/Lyra
+[installation]: https://cliutils.github.io/CLI11/book/chapters/installation.html
diff --git a/contrib/CLI11/include/CLI/App.hpp b/contrib/CLI11/include/CLI/App.hpp
new file mode 100644
index 000000000..979237f3b
--- /dev/null
+++ b/contrib/CLI11/include/CLI/App.hpp
@@ -0,0 +1,1399 @@
+// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+// [CLI11:public_includes:set]
+#include <algorithm>
+#include <cstdint>
+#include <functional>
+#include <iostream>
+#include <iterator>
+#include <memory>
+#include <numeric>
+#include <set>
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
+// [CLI11:public_includes:end]
+
+// CLI Library includes
+#include "ConfigFwd.hpp"
+#include "Error.hpp"
+#include "FormatterFwd.hpp"
+#include "Macros.hpp"
+#include "Option.hpp"
+#include "Split.hpp"
+#include "StringTools.hpp"
+#include "TypeTools.hpp"
+
+namespace CLI {
+// [CLI11:app_hpp:verbatim]
+
+#ifndef CLI11_PARSE
+#define CLI11_PARSE(app, argc, argv)                                                                                   \
+    try {                                                                                                              \
+        (app).parse((argc), (argv));                                                                                   \
+    } catch(const CLI::ParseError &e) {                                                                                \
+        return (app).exit(e);                                                                                          \
+    }
+#endif
+
+namespace detail {
+enum class Classifier { NONE, POSITIONAL_MARK, SHORT, LONG, WINDOWS_STYLE, SUBCOMMAND, SUBCOMMAND_TERMINATOR };
+struct AppFriend;
+}  // namespace detail
+
+namespace FailureMessage {
+/// Printout a clean, simple message on error (the default in CLI11 1.5+)
+CLI11_INLINE std::string simple(const App *app, const Error &e);
+
+/// Printout the full help string on error (if this fn is set, the old default for CLI11)
+CLI11_INLINE std::string help(const App *app, const Error &e);
+}  // namespace FailureMessage
+
+/// enumeration of modes of how to deal with extras in config files
+
+enum class config_extras_mode : char { error = 0, ignore, ignore_all, capture };
+
+class App;
+
+using App_p = std::shared_ptr<App>;
+
+namespace detail {
+/// helper functions for adding in appropriate flag modifiers for add_flag
+
+template <typename T, enable_if_t<!std::is_integral<T>::value || (sizeof(T) <= 1U), detail::enabler> = detail::dummy>
+Option *default_flag_modifiers(Option *opt) {
+    return opt->always_capture_default();
+}
+
+/// summing modifiers
+template <typename T, enable_if_t<std::is_integral<T>::value && (sizeof(T) > 1U), detail::enabler> = detail::dummy>
+Option *default_flag_modifiers(Option *opt) {
+    return opt->multi_option_policy(MultiOptionPolicy::Sum)->default_str("0")->force_callback();
+}
+
+}  // namespace detail
+
+class Option_group;
+/// Creates a command line program, with very few defaults.
+/** To use, create a new `Program()` instance with `argc`, `argv`, and a help description. The templated
+ *  add_option methods make it easy to prepare options. Remember to call `.start` before starting your
+ * program, so that the options can be evaluated and the help option doesn't accidentally run your program. */
+class App {
+    friend Option;
+    friend detail::AppFriend;
+
+  protected:
+    // This library follows the Google style guide for member names ending in underscores
+
+    /// @name Basics
+    ///@{
+
+    /// Subcommand name or program name (from parser if name is empty)
+    std::string name_{};
+
+    /// Description of the current program/subcommand
+    std::string description_{};
+
+    /// If true, allow extra arguments (ie, don't throw an error). INHERITABLE
+    bool allow_extras_{false};
+
+    /// If ignore, allow extra arguments in the ini file (ie, don't throw an error). INHERITABLE
+    /// if error error on an extra argument, and if capture feed it to the app
+    config_extras_mode allow_config_extras_{config_extras_mode::ignore};
+
+    ///  If true, return immediately on an unrecognized option (implies allow_extras) INHERITABLE
+    bool prefix_command_{false};
+
+    /// If set to true the name was automatically generated from the command line vs a user set name
+    bool has_automatic_name_{false};
+
+    /// If set to true the subcommand is required to be processed and used, ignored for main app
+    bool required_{false};
+
+    /// If set to true the subcommand is disabled and cannot be used, ignored for main app
+    bool disabled_{false};
+
+    /// Flag indicating that the pre_parse_callback has been triggered
+    bool pre_parse_called_{false};
+
+    /// Flag indicating that the callback for the subcommand should be executed immediately on parse completion which is
+    /// before help or ini files are processed. INHERITABLE
+    bool immediate_callback_{false};
+
+    /// This is a function that runs prior to the start of parsing
+    std::function<void(std::size_t)> pre_parse_callback_{};
+
+    /// This is a function that runs when parsing has finished.
+    std::function<void()> parse_complete_callback_{};
+
+    /// This is a function that runs when all processing has completed
+    std::function<void()> final_callback_{};
+
+    ///@}
+    /// @name Options
+    ///@{
+
+    /// The default values for options, customizable and changeable INHERITABLE
+    OptionDefaults option_defaults_{};
+
+    /// The list of options, stored locally
+    std::vector<Option_p> options_{};
+
+    ///@}
+    /// @name Help
+    ///@{
+
+    /// Footer to put after all options in the help output INHERITABLE
+    std::string footer_{};
+
+    /// This is a function that generates a footer to put after all other options in help output
+    std::function<std::string()> footer_callback_{};
+
+    /// A pointer to the help flag if there is one INHERITABLE
+    Option *help_ptr_{nullptr};
+
+    /// A pointer to the help all flag if there is one INHERITABLE
+    Option *help_all_ptr_{nullptr};
+
+    /// A pointer to a version flag if there is one
+    Option *version_ptr_{nullptr};
+
+    /// This is the formatter for help printing. Default provided. INHERITABLE (same pointer)
+    std::shared_ptr<FormatterBase> formatter_{new Formatter()};
+
+    /// The error message printing function INHERITABLE
+    std::function<std::string(const App *, const Error &e)> failure_message_{FailureMessage::simple};
+
+    ///@}
+    /// @name Parsing
+    ///@{
+
+    using missing_t = std::vector<std::pair<detail::Classifier, std::string>>;
+
+    /// Pair of classifier, string for missing options. (extra detail is removed on returning from parse)
+    ///
+    /// This is faster and cleaner than storing just a list of strings and reparsing. This may contain the -- separator.
+    missing_t missing_{};
+
+    /// This is a list of pointers to options with the original parse order
+    std::vector<Option *> parse_order_{};
+
+    /// This is a list of the subcommands collected, in order
+    std::vector<App *> parsed_subcommands_{};
+
+    /// this is a list of subcommands that are exclusionary to this one
+    std::set<App *> exclude_subcommands_{};
+
+    /// This is a list of options which are exclusionary to this App, if the options were used this subcommand should
+    /// not be
+    std::set<Option *> exclude_options_{};
+
+    /// this is a list of subcommands or option groups that are required by this one, the list is not mutual,  the
+    /// listed subcommands do not require this one
+    std::set<App *> need_subcommands_{};
+
+    /// This is a list of options which are required by this app, the list is not mutual, listed options do not need the
+    /// subcommand not be
+    std::set<Option *> need_options_{};
+
+    ///@}
+    /// @name Subcommands
+    ///@{
+
+    /// Storage for subcommand list
+    std::vector<App_p> subcommands_{};
+
+    /// If true, the program name is not case sensitive INHERITABLE
+    bool ignore_case_{false};
+
+    /// If true, the program should ignore underscores INHERITABLE
+    bool ignore_underscore_{false};
+
+    /// Allow subcommand fallthrough, so that parent commands can collect commands after subcommand.  INHERITABLE
+    bool fallthrough_{false};
+
+    /// Allow '/' for options for Windows like options. Defaults to true on Windows, false otherwise. INHERITABLE
+    bool allow_windows_style_options_{
+#ifdef _WIN32
+        true
+#else
+        false
+#endif
+    };
+    /// specify that positional arguments come at the end of the argument sequence not inheritable
+    bool positionals_at_end_{false};
+
+    enum class startup_mode : char { stable, enabled, disabled };
+    /// specify the startup mode for the app
+    /// stable=no change, enabled= startup enabled, disabled=startup disabled
+    startup_mode default_startup{startup_mode::stable};
+
+    /// if set to true the subcommand can be triggered via configuration files INHERITABLE
+    bool configurable_{false};
+
+    /// If set to true positional options are validated before assigning INHERITABLE
+    bool validate_positionals_{false};
+
+    /// If set to true optional vector arguments are validated before assigning INHERITABLE
+    bool validate_optional_arguments_{false};
+
+    /// indicator that the subcommand is silent and won't show up in subcommands list
+    /// This is potentially useful as a modifier subcommand
+    bool silent_{false};
+
+    /// Counts the number of times this command/subcommand was parsed
+    std::uint32_t parsed_{0U};
+
+    /// Minimum required subcommands (not inheritable!)
+    std::size_t require_subcommand_min_{0};
+
+    /// Max number of subcommands allowed (parsing stops after this number). 0 is unlimited INHERITABLE
+    std::size_t require_subcommand_max_{0};
+
+    /// Minimum required options (not inheritable!)
+    std::size_t require_option_min_{0};
+
+    /// Max number of options allowed. 0 is unlimited (not inheritable)
+    std::size_t require_option_max_{0};
+
+    /// A pointer to the parent if this is a subcommand
+    App *parent_{nullptr};
+
+    /// The group membership INHERITABLE
+    std::string group_{"Subcommands"};
+
+    /// Alias names for the subcommand
+    std::vector<std::string> aliases_{};
+
+    ///@}
+    /// @name Config
+    ///@{
+
+    /// Pointer to the config option
+    Option *config_ptr_{nullptr};
+
+    /// This is the formatter for help printing. Default provided. INHERITABLE (same pointer)
+    std::shared_ptr<Config> config_formatter_{new ConfigTOML()};
+
+    ///@}
+
+    /// Special private constructor for subcommand
+    App(std::string app_description, std::string app_name, App *parent);
+
+  public:
+    /// @name Basic
+    ///@{
+
+    /// Create a new program. Pass in the same arguments as main(), along with a help string.
+    explicit App(std::string app_description = "", std::string app_name = "")
+        : App(app_description, app_name, nullptr) {
+        set_help_flag("-h,--help", "Print this help message and exit");
+    }
+
+    App(const App &) = delete;
+    App &operator=(const App &) = delete;
+
+    /// virtual destructor
+    virtual ~App() = default;
+
+    /// Set a callback for execution when all parsing and processing has completed
+    ///
+    /// Due to a bug in c++11,
+    /// it is not possible to overload on std::function (fixed in c++14
+    /// and backported to c++11 on newer compilers). Use capture by reference
+    /// to get a pointer to App if needed.
+    App *callback(std::function<void()> app_callback) {
+        if(immediate_callback_) {
+            parse_complete_callback_ = std::move(app_callback);
+        } else {
+            final_callback_ = std::move(app_callback);
+        }
+        return this;
+    }
+
+    /// Set a callback for execution when all parsing and processing has completed
+    /// aliased as callback
+    App *final_callback(std::function<void()> app_callback) {
+        final_callback_ = std::move(app_callback);
+        return this;
+    }
+
+    /// Set a callback to execute when parsing has completed for the app
+    ///
+    App *parse_complete_callback(std::function<void()> pc_callback) {
+        parse_complete_callback_ = std::move(pc_callback);
+        return this;
+    }
+
+    /// Set a callback to execute prior to parsing.
+    ///
+    App *preparse_callback(std::function<void(std::size_t)> pp_callback) {
+        pre_parse_callback_ = std::move(pp_callback);
+        return this;
+    }
+
+    /// Set a name for the app (empty will use parser to set the name)
+    App *name(std::string app_name = "");
+
+    /// Set an alias for the app
+    App *alias(std::string app_name);
+
+    /// Remove the error when extras are left over on the command line.
+    App *allow_extras(bool allow = true) {
+        allow_extras_ = allow;
+        return this;
+    }
+
+    /// Remove the error when extras are left over on the command line.
+    App *required(bool require = true) {
+        required_ = require;
+        return this;
+    }
+
+    /// Disable the subcommand or option group
+    App *disabled(bool disable = true) {
+        disabled_ = disable;
+        return this;
+    }
+
+    /// silence the subcommand from showing up in the processed list
+    App *silent(bool silence = true) {
+        silent_ = silence;
+        return this;
+    }
+
+    /// Set the subcommand to be disabled by default, so on clear(), at the start of each parse it is disabled
+    App *disabled_by_default(bool disable = true) {
+        if(disable) {
+            default_startup = startup_mode::disabled;
+        } else {
+            default_startup = (default_startup == startup_mode::enabled) ? startup_mode::enabled : startup_mode::stable;
+        }
+        return this;
+    }
+
+    /// Set the subcommand to be enabled by default, so on clear(), at the start of each parse it is enabled (not
+    /// disabled)
+    App *enabled_by_default(bool enable = true) {
+        if(enable) {
+            default_startup = startup_mode::enabled;
+        } else {
+            default_startup =
+                (default_startup == startup_mode::disabled) ? startup_mode::disabled : startup_mode::stable;
+        }
+        return this;
+    }
+
+    /// Set the subcommand callback to be executed immediately on subcommand completion
+    App *immediate_callback(bool immediate = true);
+
+    /// Set the subcommand to validate positional arguments before assigning
+    App *validate_positionals(bool validate = true) {
+        validate_positionals_ = validate;
+        return this;
+    }
+
+    /// Set the subcommand to validate optional vector arguments before assigning
+    App *validate_optional_arguments(bool validate = true) {
+        validate_optional_arguments_ = validate;
+        return this;
+    }
+
+    /// ignore extras in config files
+    App *allow_config_extras(bool allow = true) {
+        if(allow) {
+            allow_config_extras_ = config_extras_mode::capture;
+            allow_extras_ = true;
+        } else {
+            allow_config_extras_ = config_extras_mode::error;
+        }
+        return this;
+    }
+
+    /// ignore extras in config files
+    App *allow_config_extras(config_extras_mode mode) {
+        allow_config_extras_ = mode;
+        return this;
+    }
+
+    /// Do not parse anything after the first unrecognized option and return
+    App *prefix_command(bool allow = true) {
+        prefix_command_ = allow;
+        return this;
+    }
+
+    /// Ignore case. Subcommands inherit value.
+    App *ignore_case(bool value = true);
+
+    /// Allow windows style options, such as `/opt`. First matching short or long name used. Subcommands inherit
+    /// value.
+    App *allow_windows_style_options(bool value = true) {
+        allow_windows_style_options_ = value;
+        return this;
+    }
+
+    /// Specify that the positional arguments are only at the end of the sequence
+    App *positionals_at_end(bool value = true) {
+        positionals_at_end_ = value;
+        return this;
+    }
+
+    /// Specify that the subcommand can be triggered by a config file
+    App *configurable(bool value = true) {
+        configurable_ = value;
+        return this;
+    }
+
+    /// Ignore underscore. Subcommands inherit value.
+    App *ignore_underscore(bool value = true);
+
+    /// Set the help formatter
+    App *formatter(std::shared_ptr<FormatterBase> fmt) {
+        formatter_ = fmt;
+        return this;
+    }
+
+    /// Set the help formatter
+    App *formatter_fn(std::function<std::string(const App *, std::string, AppFormatMode)> fmt) {
+        formatter_ = std::make_shared<FormatterLambda>(fmt);
+        return this;
+    }
+
+    /// Set the config formatter
+    App *config_formatter(std::shared_ptr<Config> fmt) {
+        config_formatter_ = fmt;
+        return this;
+    }
+
+    /// Check to see if this subcommand was parsed, true only if received on command line.
+    CLI11_NODISCARD bool parsed() const { return parsed_ > 0; }
+
+    /// Get the OptionDefault object, to set option defaults
+    OptionDefaults *option_defaults() { return &option_defaults_; }
+
+    ///@}
+    /// @name Adding options
+    ///@{
+
+    /// Add an option, will automatically understand the type for common types.
+    ///
+    /// To use, create a variable with the expected type, and pass it in after the name.
+    /// After start is called, you can use count to see if the value was passed, and
+    /// the value will be initialized properly. Numbers, vectors, and strings are supported.
+    ///
+    /// ->required(), ->default, and the validators are options,
+    /// The positional options take an optional number of arguments.
+    ///
+    /// For example,
+    ///
+    ///     std::string filename;
+    ///     program.add_option("filename", filename, "description of filename");
+    ///
+    Option *add_option(std::string option_name,
+                       callback_t option_callback,
+                       std::string option_description = "",
+                       bool defaulted = false,
+                       std::function<std::string()> func = {});
+
+    /// Add option for assigning to a variable
+    template <typename AssignTo,
+              typename ConvertTo = AssignTo,
+              enable_if_t<!std::is_const<ConvertTo>::value, detail::enabler> = detail::dummy>
+    Option *add_option(std::string option_name,
+                       AssignTo &variable,  ///< The variable to set
+                       std::string option_description = "") {
+
+        auto fun = [&variable](const CLI::results_t &res) {  // comment for spacing
+            return detail::lexical_conversion<AssignTo, ConvertTo>(res, variable);
+        };
+
+        Option *opt = add_option(option_name, fun, option_description, false, [&variable]() {
+            return CLI::detail::checked_to_string<AssignTo, ConvertTo>(variable);
+        });
+        opt->type_name(detail::type_name<ConvertTo>());
+        // these must be actual lvalues since (std::max) sometimes is defined in terms of references and references
+        // to structs used in the evaluation can be temporary so that would cause issues.
+        auto Tcount = detail::type_count<AssignTo>::value;
+        auto XCcount = detail::type_count<ConvertTo>::value;
+        opt->type_size(detail::type_count_min<ConvertTo>::value, (std::max)(Tcount, XCcount));
+        opt->expected(detail::expected_count<ConvertTo>::value);
+        opt->run_callback_for_default();
+        return opt;
+    }
+
+    /// Add option for assigning to a variable
+    template <typename AssignTo, enable_if_t<!std::is_const<AssignTo>::value, detail::enabler> = detail::dummy>
+    Option *add_option_no_stream(std::string option_name,
+                                 AssignTo &variable,  ///< The variable to set
+                                 std::string option_description = "") {
+
+        auto fun = [&variable](const CLI::results_t &res) {  // comment for spacing
+            return detail::lexical_conversion<AssignTo, AssignTo>(res, variable);
+        };
+
+        Option *opt = add_option(option_name, fun, option_description, false, []() { return std::string{}; });
+        opt->type_name(detail::type_name<AssignTo>());
+        opt->type_size(detail::type_count_min<AssignTo>::value, detail::type_count<AssignTo>::value);
+        opt->expected(detail::expected_count<AssignTo>::value);
+        opt->run_callback_for_default();
+        return opt;
+    }
+
+    /// Add option for a callback of a specific type
+    template <typename ArgType>
+    Option *add_option_function(std::string option_name,
+                                const std::function<void(const ArgType &)> &func,  ///< the callback to execute
+                                std::string option_description = "") {
+
+        auto fun = [func](const CLI::results_t &res) {
+            ArgType variable;
+            bool result = detail::lexical_conversion<ArgType, ArgType>(res, variable);
+            if(result) {
+                func(variable);
+            }
+            return result;
+        };
+
+        Option *opt = add_option(option_name, std::move(fun), option_description, false);
+        opt->type_name(detail::type_name<ArgType>());
+        opt->type_size(detail::type_count_min<ArgType>::value, detail::type_count<ArgType>::value);
+        opt->expected(detail::expected_count<ArgType>::value);
+        return opt;
+    }
+
+    /// Add option with no description or variable assignment
+    Option *add_option(std::string option_name) {
+        return add_option(option_name, CLI::callback_t{}, std::string{}, false);
+    }
+
+    /// Add option with description but with no variable assignment or callback
+    template <typename T,
+              enable_if_t<std::is_const<T>::value && std::is_constructible<std::string, T>::value, detail::enabler> =
+                  detail::dummy>
+    Option *add_option(std::string option_name, T &option_description) {
+        return add_option(option_name, CLI::callback_t(), option_description, false);
+    }
+
+    /// Set a help flag, replace the existing one if present
+    Option *set_help_flag(std::string flag_name = "", const std::string &help_description = "");
+
+    /// Set a help all flag, replaced the existing one if present
+    Option *set_help_all_flag(std::string help_name = "", const std::string &help_description = "");
+
+    /// Set a version flag and version display string, replace the existing one if present
+    Option *set_version_flag(std::string flag_name = "",
+                             const std::string &versionString = "",
+                             const std::string &version_help = "Display program version information and exit");
+
+    /// Generate the version string through a callback function
+    Option *set_version_flag(std::string flag_name,
+                             std::function<std::string()> vfunc,
+                             const std::string &version_help = "Display program version information and exit");
+
+  private:
+    /// Internal function for adding a flag
+    Option *_add_flag_internal(std::string flag_name, CLI::callback_t fun, std::string flag_description);
+
+  public:
+    /// Add a flag with no description or variable assignment
+    Option *add_flag(std::string flag_name) { return _add_flag_internal(flag_name, CLI::callback_t(), std::string{}); }
+
+    /// Add flag with description but with no variable assignment or callback
+    /// takes a constant string,  if a variable string is passed that variable will be assigned the results from the
+    /// flag
+    template <typename T,
+              enable_if_t<std::is_const<T>::value && std::is_constructible<std::string, T>::value, detail::enabler> =
+                  detail::dummy>
+    Option *add_flag(std::string flag_name, T &flag_description) {
+        return _add_flag_internal(flag_name, CLI::callback_t(), flag_description);
+    }
+
+    /// Other type version accepts all other types that are not vectors such as bool, enum, string or other classes
+    /// that can be converted from a string
+    template <typename T,
+              enable_if_t<!detail::is_mutable_container<T>::value && !std::is_const<T>::value &&
+                              !std::is_constructible<std::function<void(int)>, T>::value,
+                          detail::enabler> = detail::dummy>
+    Option *add_flag(std::string flag_name,
+                     T &flag_result,  ///< A variable holding the flag result
+                     std::string flag_description = "") {
+
+        CLI::callback_t fun = [&flag_result](const CLI::results_t &res) {
+            using CLI::detail::lexical_cast;
+            return lexical_cast(res[0], flag_result);
+        };
+        auto *opt = _add_flag_internal(flag_name, std::move(fun), std::move(flag_description));
+        return detail::default_flag_modifiers<T>(opt);
+    }
+
+    /// Vector version to capture multiple flags.
+    template <typename T,
+              enable_if_t<!std::is_assignable<std::function<void(std::int64_t)> &, T>::value, detail::enabler> =
+                  detail::dummy>
+    Option *add_flag(std::string flag_name,
+                     std::vector<T> &flag_results,  ///< A vector of values with the flag results
+                     std::string flag_description = "") {
+        CLI::callback_t fun = [&flag_results](const CLI::results_t &res) {
+            bool retval = true;
+            for(const auto &elem : res) {
+                using CLI::detail::lexical_cast;
+                flag_results.emplace_back();
+                retval &= lexical_cast(elem, flag_results.back());
+            }
+            return retval;
+        };
+        return _add_flag_internal(flag_name, std::move(fun), std::move(flag_description))
+            ->multi_option_policy(MultiOptionPolicy::TakeAll)
+            ->run_callback_for_default();
+    }
+
+    /// Add option for callback that is triggered with a true flag and takes no arguments
+    Option *add_flag_callback(std::string flag_name,
+                              std::function<void(void)> function,  ///< A function to call, void(void)
+                              std::string flag_description = "");
+
+    /// Add option for callback with an integer value
+    Option *add_flag_function(std::string flag_name,
+                              std::function<void(std::int64_t)> function,  ///< A function to call, void(int)
+                              std::string flag_description = "");
+
+#ifdef CLI11_CPP14
+    /// Add option for callback (C++14 or better only)
+    Option *add_flag(std::string flag_name,
+                     std::function<void(std::int64_t)> function,  ///< A function to call, void(std::int64_t)
+                     std::string flag_description = "") {
+        return add_flag_function(std::move(flag_name), std::move(function), std::move(flag_description));
+    }
+#endif
+
+    /// Set a configuration ini file option, or clear it if no name passed
+    Option *set_config(std::string option_name = "",
+                       std::string default_filename = "",
+                       const std::string &help_message = "Read an ini file",
+                       bool config_required = false);
+
+    /// Removes an option from the App. Takes an option pointer. Returns true if found and removed.
+    bool remove_option(Option *opt);
+
+    /// creates an option group as part of the given app
+    template <typename T = Option_group>
+    T *add_option_group(std::string group_name, std::string group_description = "") {
+        if(!detail::valid_alias_name_string(group_name)) {
+            throw IncorrectConstruction("option group names may not contain newlines or null characters");
+        }
+        auto option_group = std::make_shared<T>(std::move(group_description), group_name, this);
+        auto *ptr = option_group.get();
+        // move to App_p for overload resolution on older gcc versions
+        App_p app_ptr = std::dynamic_pointer_cast<App>(option_group);
+        add_subcommand(std::move(app_ptr));
+        return ptr;
+    }
+
+    ///@}
+    /// @name Subcommands
+    ///@{
+
+    /// Add a subcommand. Inherits INHERITABLE and OptionDefaults, and help flag
+    App *add_subcommand(std::string subcommand_name = "", std::string subcommand_description = "");
+
+    /// Add a previously created app as a subcommand
+    App *add_subcommand(CLI::App_p subcom);
+
+    /// Removes a subcommand from the App. Takes a subcommand pointer. Returns true if found and removed.
+    bool remove_subcommand(App *subcom);
+
+    /// Check to see if a subcommand is part of this command (doesn't have to be in command line)
+    /// returns the first subcommand if passed a nullptr
+    App *get_subcommand(const App *subcom) const;
+
+    /// Check to see if a subcommand is part of this command (text version)
+    CLI11_NODISCARD App *get_subcommand(std::string subcom) const;
+
+    /// Get a pointer to subcommand by index
+    CLI11_NODISCARD App *get_subcommand(int index = 0) const;
+
+    /// Check to see if a subcommand is part of this command and get a shared_ptr to it
+    CLI::App_p get_subcommand_ptr(App *subcom) const;
+
+    /// Check to see if a subcommand is part of this command (text version)
+    CLI11_NODISCARD CLI::App_p get_subcommand_ptr(std::string subcom) const;
+
+    /// Get an owning pointer to subcommand by index
+    CLI11_NODISCARD CLI::App_p get_subcommand_ptr(int index = 0) const;
+
+    /// Check to see if an option group is part of this App
+    CLI11_NODISCARD App *get_option_group(std::string group_name) const;
+
+    /// No argument version of count counts the number of times this subcommand was
+    /// passed in. The main app will return 1. Unnamed subcommands will also return 1 unless
+    /// otherwise modified in a callback
+    CLI11_NODISCARD std::size_t count() const { return parsed_; }
+
+    /// Get a count of all the arguments processed in options and subcommands, this excludes arguments which were
+    /// treated as extras.
+    CLI11_NODISCARD std::size_t count_all() const;
+
+    /// Changes the group membership
+    App *group(std::string group_name) {
+        group_ = group_name;
+        return this;
+    }
+
+    /// The argumentless form of require subcommand requires 1 or more subcommands
+    App *require_subcommand() {
+        require_subcommand_min_ = 1;
+        require_subcommand_max_ = 0;
+        return this;
+    }
+
+    /// Require a subcommand to be given (does not affect help call)
+    /// The number required can be given. Negative values indicate maximum
+    /// number allowed (0 for any number). Max number inheritable.
+    App *require_subcommand(int value) {
+        if(value < 0) {
+            require_subcommand_min_ = 0;
+            require_subcommand_max_ = static_cast<std::size_t>(-value);
+        } else {
+            require_subcommand_min_ = static_cast<std::size_t>(value);
+            require_subcommand_max_ = static_cast<std::size_t>(value);
+        }
+        return this;
+    }
+
+    /// Explicitly control the number of subcommands required. Setting 0
+    /// for the max means unlimited number allowed. Max number inheritable.
+    App *require_subcommand(std::size_t min, std::size_t max) {
+        require_subcommand_min_ = min;
+        require_subcommand_max_ = max;
+        return this;
+    }
+
+    /// The argumentless form of require option requires 1 or more options be used
+    App *require_option() {
+        require_option_min_ = 1;
+        require_option_max_ = 0;
+        return this;
+    }
+
+    /// Require an option to be given (does not affect help call)
+    /// The number required can be given. Negative values indicate maximum
+    /// number allowed (0 for any number).
+    App *require_option(int value) {
+        if(value < 0) {
+            require_option_min_ = 0;
+            require_option_max_ = static_cast<std::size_t>(-value);
+        } else {
+            require_option_min_ = static_cast<std::size_t>(value);
+            require_option_max_ = static_cast<std::size_t>(value);
+        }
+        return this;
+    }
+
+    /// Explicitly control the number of options required. Setting 0
+    /// for the max means unlimited number allowed. Max number inheritable.
+    App *require_option(std::size_t min, std::size_t max) {
+        require_option_min_ = min;
+        require_option_max_ = max;
+        return this;
+    }
+
+    /// Stop subcommand fallthrough, so that parent commands cannot collect commands after subcommand.
+    /// Default from parent, usually set on parent.
+    App *fallthrough(bool value = true) {
+        fallthrough_ = value;
+        return this;
+    }
+
+    /// Check to see if this subcommand was parsed, true only if received on command line.
+    /// This allows the subcommand to be directly checked.
+    explicit operator bool() const { return parsed_ > 0; }
+
+    ///@}
+    /// @name Extras for subclassing
+    ///@{
+
+    /// This allows subclasses to inject code before callbacks but after parse.
+    ///
+    /// This does not run if any errors or help is thrown.
+    virtual void pre_callback() {}
+
+    ///@}
+    /// @name Parsing
+    ///@{
+    //
+    /// Reset the parsed data
+    void clear();
+
+    /// Parses the command line - throws errors.
+    /// This must be called after the options are in but before the rest of the program.
+    void parse(int argc, const char *const *argv);
+
+    /// Parse a single string as if it contained command line arguments.
+    /// This function splits the string into arguments then calls parse(std::vector<std::string> &)
+    /// the function takes an optional boolean argument specifying if the programName is included in the string to
+    /// process
+    void parse(std::string commandline, bool program_name_included = false);
+
+    /// The real work is done here. Expects a reversed vector.
+    /// Changes the vector to the remaining options.
+    void parse(std::vector<std::string> &args);
+
+    /// The real work is done here. Expects a reversed vector.
+    void parse(std::vector<std::string> &&args);
+
+    void parse_from_stream(std::istream &input);
+
+    /// Provide a function to print a help message. The function gets access to the App pointer and error.
+    void failure_message(std::function<std::string(const App *, const Error &e)> function) {
+        failure_message_ = function;
+    }
+
+    /// Print a nice error message and return the exit code
+    int exit(const Error &e, std::ostream &out = std::cout, std::ostream &err = std::cerr) const;
+
+    ///@}
+    /// @name Post parsing
+    ///@{
+
+    /// Counts the number of times the given option was passed.
+    CLI11_NODISCARD std::size_t count(std::string option_name) const { return get_option(option_name)->count(); }
+
+    /// Get a subcommand pointer list to the currently selected subcommands (after parsing by default, in command
+    /// line order; use parsed = false to get the original definition list.)
+    CLI11_NODISCARD std::vector<App *> get_subcommands() const { return parsed_subcommands_; }
+
+    /// Get a filtered subcommand pointer list from the original definition list. An empty function will provide all
+    /// subcommands (const)
+    std::vector<const App *> get_subcommands(const std::function<bool(const App *)> &filter) const;
+
+    /// Get a filtered subcommand pointer list from the original definition list. An empty function will provide all
+    /// subcommands
+    std::vector<App *> get_subcommands(const std::function<bool(App *)> &filter);
+
+    /// Check to see if given subcommand was selected
+    bool got_subcommand(const App *subcom) const {
+        // get subcom needed to verify that this was a real subcommand
+        return get_subcommand(subcom)->parsed_ > 0;
+    }
+
+    /// Check with name instead of pointer to see if subcommand was selected
+    CLI11_NODISCARD bool got_subcommand(std::string subcommand_name) const {
+        return get_subcommand(subcommand_name)->parsed_ > 0;
+    }
+
+    /// Sets excluded options for the subcommand
+    App *excludes(Option *opt) {
+        if(opt == nullptr) {
+            throw OptionNotFound("nullptr passed");
+        }
+        exclude_options_.insert(opt);
+        return this;
+    }
+
+    /// Sets excluded subcommands for the subcommand
+    App *excludes(App *app) {
+        if(app == nullptr) {
+            throw OptionNotFound("nullptr passed");
+        }
+        if(app == this) {
+            throw OptionNotFound("cannot self reference in needs");
+        }
+        auto res = exclude_subcommands_.insert(app);
+        // subcommand exclusion should be symmetric
+        if(res.second) {
+            app->exclude_subcommands_.insert(this);
+        }
+        return this;
+    }
+
+    App *needs(Option *opt) {
+        if(opt == nullptr) {
+            throw OptionNotFound("nullptr passed");
+        }
+        need_options_.insert(opt);
+        return this;
+    }
+
+    App *needs(App *app) {
+        if(app == nullptr) {
+            throw OptionNotFound("nullptr passed");
+        }
+        if(app == this) {
+            throw OptionNotFound("cannot self reference in needs");
+        }
+        need_subcommands_.insert(app);
+        return this;
+    }
+
+    /// Removes an option from the excludes list of this subcommand
+    bool remove_excludes(Option *opt);
+
+    /// Removes a subcommand from the excludes list of this subcommand
+    bool remove_excludes(App *app);
+
+    /// Removes an option from the needs list of this subcommand
+    bool remove_needs(Option *opt);
+
+    /// Removes a subcommand from the needs list of this subcommand
+    bool remove_needs(App *app);
+    ///@}
+    /// @name Help
+    ///@{
+
+    /// Set footer.
+    App *footer(std::string footer_string) {
+        footer_ = std::move(footer_string);
+        return this;
+    }
+    /// Set footer.
+    App *footer(std::function<std::string()> footer_function) {
+        footer_callback_ = std::move(footer_function);
+        return this;
+    }
+    /// Produce a string that could be read in as a config of the current values of the App. Set default_also to
+    /// include default arguments. write_descriptions will print a description for the App and for each option.
+    CLI11_NODISCARD std::string config_to_str(bool default_also = false, bool write_description = false) const {
+        return config_formatter_->to_config(this, default_also, write_description, "");
+    }
+
+    /// Makes a help message, using the currently configured formatter
+    /// Will only do one subcommand at a time
+    CLI11_NODISCARD std::string help(std::string prev = "", AppFormatMode mode = AppFormatMode::Normal) const;
+
+    /// Displays a version string
+    CLI11_NODISCARD std::string version() const;
+    ///@}
+    /// @name Getters
+    ///@{
+
+    /// Access the formatter
+    CLI11_NODISCARD std::shared_ptr<FormatterBase> get_formatter() const { return formatter_; }
+
+    /// Access the config formatter
+    CLI11_NODISCARD std::shared_ptr<Config> get_config_formatter() const { return config_formatter_; }
+
+    /// Access the config formatter as a configBase pointer
+    CLI11_NODISCARD std::shared_ptr<ConfigBase> get_config_formatter_base() const {
+        // This is safer as a dynamic_cast if we have RTTI, as Config -> ConfigBase
+#if CLI11_USE_STATIC_RTTI == 0
+        return std::dynamic_pointer_cast<ConfigBase>(config_formatter_);
+#else
+        return std::static_pointer_cast<ConfigBase>(config_formatter_);
+#endif
+    }
+
+    /// Get the app or subcommand description
+    CLI11_NODISCARD std::string get_description() const { return description_; }
+
+    /// Set the description of the app
+    App *description(std::string app_description) {
+        description_ = std::move(app_description);
+        return this;
+    }
+
+    /// Get the list of options (user facing function, so returns raw pointers), has optional filter function
+    std::vector<const Option *> get_options(const std::function<bool(const Option *)> filter = {}) const;
+
+    /// Non-const version of the above
+    std::vector<Option *> get_options(const std::function<bool(Option *)> filter = {});
+
+    /// Get an option by name (noexcept non-const version)
+    Option *get_option_no_throw(std::string option_name) noexcept;
+
+    /// Get an option by name (noexcept const version)
+    CLI11_NODISCARD const Option *get_option_no_throw(std::string option_name) const noexcept;
+
+    /// Get an option by name
+    CLI11_NODISCARD const Option *get_option(std::string option_name) const {
+        const auto *opt = get_option_no_throw(option_name);
+        if(opt == nullptr) {
+            throw OptionNotFound(option_name);
+        }
+        return opt;
+    }
+
+    /// Get an option by name (non-const version)
+    Option *get_option(std::string option_name) {
+        auto *opt = get_option_no_throw(option_name);
+        if(opt == nullptr) {
+            throw OptionNotFound(option_name);
+        }
+        return opt;
+    }
+
+    /// Shortcut bracket operator for getting a pointer to an option
+    const Option *operator[](const std::string &option_name) const { return get_option(option_name); }
+
+    /// Shortcut bracket operator for getting a pointer to an option
+    const Option *operator[](const char *option_name) const { return get_option(option_name); }
+
+    /// Check the status of ignore_case
+    CLI11_NODISCARD bool get_ignore_case() const { return ignore_case_; }
+
+    /// Check the status of ignore_underscore
+    CLI11_NODISCARD bool get_ignore_underscore() const { return ignore_underscore_; }
+
+    /// Check the status of fallthrough
+    CLI11_NODISCARD bool get_fallthrough() const { return fallthrough_; }
+
+    /// Check the status of the allow windows style options
+    CLI11_NODISCARD bool get_allow_windows_style_options() const { return allow_windows_style_options_; }
+
+    /// Check the status of the allow windows style options
+    CLI11_NODISCARD bool get_positionals_at_end() const { return positionals_at_end_; }
+
+    /// Check the status of the allow windows style options
+    CLI11_NODISCARD bool get_configurable() const { return configurable_; }
+
+    /// Get the group of this subcommand
+    CLI11_NODISCARD const std::string &get_group() const { return group_; }
+
+    /// Generate and return the footer.
+    CLI11_NODISCARD std::string get_footer() const {
+        return (footer_callback_) ? footer_callback_() + '\n' + footer_ : footer_;
+    }
+
+    /// Get the required min subcommand value
+    CLI11_NODISCARD std::size_t get_require_subcommand_min() const { return require_subcommand_min_; }
+
+    /// Get the required max subcommand value
+    CLI11_NODISCARD std::size_t get_require_subcommand_max() const { return require_subcommand_max_; }
+
+    /// Get the required min option value
+    CLI11_NODISCARD std::size_t get_require_option_min() const { return require_option_min_; }
+
+    /// Get the required max option value
+    CLI11_NODISCARD std::size_t get_require_option_max() const { return require_option_max_; }
+
+    /// Get the prefix command status
+    CLI11_NODISCARD bool get_prefix_command() const { return prefix_command_; }
+
+    /// Get the status of allow extras
+    CLI11_NODISCARD bool get_allow_extras() const { return allow_extras_; }
+
+    /// Get the status of required
+    CLI11_NODISCARD bool get_required() const { return required_; }
+
+    /// Get the status of disabled
+    CLI11_NODISCARD bool get_disabled() const { return disabled_; }
+
+    /// Get the status of silence
+    CLI11_NODISCARD bool get_silent() const { return silent_; }
+
+    /// Get the status of disabled
+    CLI11_NODISCARD bool get_immediate_callback() const { return immediate_callback_; }
+
+    /// Get the status of disabled by default
+    CLI11_NODISCARD bool get_disabled_by_default() const { return (default_startup == startup_mode::disabled); }
+
+    /// Get the status of disabled by default
+    CLI11_NODISCARD bool get_enabled_by_default() const { return (default_startup == startup_mode::enabled); }
+    /// Get the status of validating positionals
+    CLI11_NODISCARD bool get_validate_positionals() const { return validate_positionals_; }
+    /// Get the status of validating optional vector arguments
+    CLI11_NODISCARD bool get_validate_optional_arguments() const { return validate_optional_arguments_; }
+
+    /// Get the status of allow extras
+    CLI11_NODISCARD config_extras_mode get_allow_config_extras() const { return allow_config_extras_; }
+
+    /// Get a pointer to the help flag.
+    Option *get_help_ptr() { return help_ptr_; }
+
+    /// Get a pointer to the help flag. (const)
+    CLI11_NODISCARD const Option *get_help_ptr() const { return help_ptr_; }
+
+    /// Get a pointer to the help all flag. (const)
+    CLI11_NODISCARD const Option *get_help_all_ptr() const { return help_all_ptr_; }
+
+    /// Get a pointer to the config option.
+    Option *get_config_ptr() { return config_ptr_; }
+
+    /// Get a pointer to the config option. (const)
+    CLI11_NODISCARD const Option *get_config_ptr() const { return config_ptr_; }
+
+    /// Get a pointer to the version option.
+    Option *get_version_ptr() { return version_ptr_; }
+
+    /// Get a pointer to the version option. (const)
+    CLI11_NODISCARD const Option *get_version_ptr() const { return version_ptr_; }
+
+    /// Get the parent of this subcommand (or nullptr if main app)
+    App *get_parent() { return parent_; }
+
+    /// Get the parent of this subcommand (or nullptr if main app) (const version)
+    CLI11_NODISCARD const App *get_parent() const { return parent_; }
+
+    /// Get the name of the current app
+    CLI11_NODISCARD const std::string &get_name() const { return name_; }
+
+    /// Get the aliases of the current app
+    CLI11_NODISCARD const std::vector<std::string> &get_aliases() const { return aliases_; }
+
+    /// clear all the aliases of the current App
+    App *clear_aliases() {
+        aliases_.clear();
+        return this;
+    }
+
+    /// Get a display name for an app
+    CLI11_NODISCARD std::string get_display_name(bool with_aliases = false) const;
+
+    /// Check the name, case insensitive and underscore insensitive if set
+    CLI11_NODISCARD bool check_name(std::string name_to_check) const;
+
+    /// Get the groups available directly from this option (in order)
+    CLI11_NODISCARD std::vector<std::string> get_groups() const;
+
+    /// This gets a vector of pointers with the original parse order
+    CLI11_NODISCARD const std::vector<Option *> &parse_order() const { return parse_order_; }
+
+    /// This returns the missing options from the current subcommand
+    CLI11_NODISCARD std::vector<std::string> remaining(bool recurse = false) const;
+
+    /// This returns the missing options in a form ready for processing by another command line program
+    CLI11_NODISCARD std::vector<std::string> remaining_for_passthrough(bool recurse = false) const;
+
+    /// This returns the number of remaining options, minus the -- separator
+    CLI11_NODISCARD std::size_t remaining_size(bool recurse = false) const;
+
+    ///@}
+
+  protected:
+    /// Check the options to make sure there are no conflicts.
+    ///
+    /// Currently checks to see if multiple positionals exist with unlimited args and checks if the min and max options
+    /// are feasible
+    void _validate() const;
+
+    /// configure subcommands to enable parsing through the current object
+    /// set the correct fallthrough and prefix for nameless subcommands and manage the automatic enable or disable
+    /// makes sure parent is set correctly
+    void _configure();
+
+    /// Internal function to run (App) callback, bottom up
+    void run_callback(bool final_mode = false, bool suppress_final_callback = false);
+
+    /// Check to see if a subcommand is valid. Give up immediately if subcommand max has been reached.
+    CLI11_NODISCARD bool _valid_subcommand(const std::string &current, bool ignore_used = true) const;
+
+    /// Selects a Classifier enum based on the type of the current argument
+    CLI11_NODISCARD detail::Classifier _recognize(const std::string &current,
+                                                  bool ignore_used_subcommands = true) const;
+
+    // The parse function is now broken into several parts, and part of process
+
+    /// Read and process a configuration file (main app only)
+    void _process_config_file();
+
+    /// Get envname options if not yet passed. Runs on *all* subcommands.
+    void _process_env();
+
+    /// Process callbacks. Runs on *all* subcommands.
+    void _process_callbacks();
+
+    /// Run help flag processing if any are found.
+    ///
+    /// The flags allow recursive calls to remember if there was a help flag on a parent.
+    void _process_help_flags(bool trigger_help = false, bool trigger_all_help = false) const;
+
+    /// Verify required options and cross requirements. Subcommands too (only if selected).
+    void _process_requirements();
+
+    /// Process callbacks and such.
+    void _process();
+
+    /// Throw an error if anything is left over and should not be.
+    void _process_extras();
+
+    /// Throw an error if anything is left over and should not be.
+    /// Modifies the args to fill in the missing items before throwing.
+    void _process_extras(std::vector<std::string> &args);
+
+    /// Internal function to recursively increment the parsed counter on the current app as well unnamed subcommands
+    void increment_parsed();
+
+    /// Internal parse function
+    void _parse(std::vector<std::string> &args);
+
+    /// Internal parse function
+    void _parse(std::vector<std::string> &&args);
+
+    /// Internal function to parse a stream
+    void _parse_stream(std::istream &input);
+
+    /// Parse one config param, return false if not found in any subcommand, remove if it is
+    ///
+    /// If this has more than one dot.separated.name, go into the subcommand matching it
+    /// Returns true if it managed to find the option, if false you'll need to remove the arg manually.
+    void _parse_config(const std::vector<ConfigItem> &args);
+
+    /// Fill in a single config option
+    bool _parse_single_config(const ConfigItem &item, std::size_t level = 0);
+
+    /// Parse "one" argument (some may eat more than one), delegate to parent if fails, add to missing if missing
+    /// from main return false if the parse has failed and needs to return to parent
+    bool _parse_single(std::vector<std::string> &args, bool &positional_only);
+
+    /// Count the required remaining positional arguments
+    CLI11_NODISCARD std::size_t _count_remaining_positionals(bool required_only = false) const;
+
+    /// Count the required remaining positional arguments
+    CLI11_NODISCARD bool _has_remaining_positionals() const;
+
+    /// Parse a positional, go up the tree to check
+    /// @param haltOnSubcommand if set to true the operation will not process subcommands merely return false
+    /// Return true if the positional was used false otherwise
+    bool _parse_positional(std::vector<std::string> &args, bool haltOnSubcommand);
+
+    /// Locate a subcommand by name with two conditions, should disabled subcommands be ignored, and should used
+    /// subcommands be ignored
+    CLI11_NODISCARD App *
+    _find_subcommand(const std::string &subc_name, bool ignore_disabled, bool ignore_used) const noexcept;
+
+    /// Parse a subcommand, modify args and continue
+    ///
+    /// Unlike the others, this one will always allow fallthrough
+    /// return true if the subcommand was processed false otherwise
+    bool _parse_subcommand(std::vector<std::string> &args);
+
+    /// Parse a short (false) or long (true) argument, must be at the top of the list
+    /// return true if the argument was processed or false if nothing was done
+    bool _parse_arg(std::vector<std::string> &args, detail::Classifier current_type);
+
+    /// Trigger the pre_parse callback if needed
+    void _trigger_pre_parse(std::size_t remaining_args);
+
+    /// Get the appropriate parent to fallthrough to which is the first one that has a name or the main app
+    App *_get_fallthrough_parent();
+
+    /// Helper function to run through all possible comparisons of subcommand names to check there is no overlap
+    CLI11_NODISCARD const std::string &_compare_subcommand_names(const App &subcom, const App &base) const;
+
+    /// Helper function to place extra values in the most appropriate position
+    void _move_to_missing(detail::Classifier val_type, const std::string &val);
+
+  public:
+    /// function that could be used by subclasses of App to shift options around into subcommands
+    void _move_option(Option *opt, App *app);
+};  // namespace CLI
+
+/// Extension of App to better manage groups of options
+class Option_group : public App {
+  public:
+    Option_group(std::string group_description, std::string group_name, App *parent)
+        : App(std::move(group_description), "", parent) {
+        group(group_name);
+        // option groups should have automatic fallthrough
+    }
+    using App::add_option;
+    /// Add an existing option to the Option_group
+    Option *add_option(Option *opt) {
+        if(get_parent() == nullptr) {
+            throw OptionNotFound("Unable to locate the specified option");
+        }
+        get_parent()->_move_option(opt, this);
+        return opt;
+    }
+    /// Add an existing option to the Option_group
+    void add_options(Option *opt) { add_option(opt); }
+    /// Add a bunch of options to the group
+    template <typename... Args> void add_options(Option *opt, Args... args) {
+        add_option(opt);
+        add_options(args...);
+    }
+    using App::add_subcommand;
+    /// Add an existing subcommand to be a member of an option_group
+    App *add_subcommand(App *subcom) {
+        App_p subc = subcom->get_parent()->get_subcommand_ptr(subcom);
+        subc->get_parent()->remove_subcommand(subcom);
+        add_subcommand(std::move(subc));
+        return subcom;
+    }
+};
+
+/// Helper function to enable one option group/subcommand when another is used
+CLI11_INLINE void TriggerOn(App *trigger_app, App *app_to_enable);
+
+/// Helper function to enable one option group/subcommand when another is used
+CLI11_INLINE void TriggerOn(App *trigger_app, std::vector<App *> apps_to_enable);
+
+/// Helper function to disable one option group/subcommand when another is used
+CLI11_INLINE void TriggerOff(App *trigger_app, App *app_to_enable);
+
+/// Helper function to disable one option group/subcommand when another is used
+CLI11_INLINE void TriggerOff(App *trigger_app, std::vector<App *> apps_to_enable);
+
+/// Helper function to mark an option as deprecated
+CLI11_INLINE void deprecate_option(Option *opt, const std::string &replacement = "");
+
+/// Helper function to mark an option as deprecated
+inline void deprecate_option(App *app, const std::string &option_name, const std::string &replacement = "") {
+    auto *opt = app->get_option(option_name);
+    deprecate_option(opt, replacement);
+}
+
+/// Helper function to mark an option as deprecated
+inline void deprecate_option(App &app, const std::string &option_name, const std::string &replacement = "") {
+    auto *opt = app.get_option(option_name);
+    deprecate_option(opt, replacement);
+}
+
+/// Helper function to mark an option as retired
+CLI11_INLINE void retire_option(App *app, Option *opt);
+
+/// Helper function to mark an option as retired
+CLI11_INLINE void retire_option(App &app, Option *opt);
+
+/// Helper function to mark an option as retired
+CLI11_INLINE void retire_option(App *app, const std::string &option_name);
+
+/// Helper function to mark an option as retired
+CLI11_INLINE void retire_option(App &app, const std::string &option_name);
+
+namespace detail {
+/// This class is simply to allow tests access to App's protected functions
+struct AppFriend {
+#ifdef CLI11_CPP14
+
+    /// Wrap _parse_short, perfectly forward arguments and return
+    template <typename... Args> static decltype(auto) parse_arg(App *app, Args &&...args) {
+        return app->_parse_arg(std::forward<Args>(args)...);
+    }
+
+    /// Wrap _parse_subcommand, perfectly forward arguments and return
+    template <typename... Args> static decltype(auto) parse_subcommand(App *app, Args &&...args) {
+        return app->_parse_subcommand(std::forward<Args>(args)...);
+    }
+#else
+    /// Wrap _parse_short, perfectly forward arguments and return
+    template <typename... Args>
+    static auto parse_arg(App *app, Args &&...args) ->
+        typename std::result_of<decltype (&App::_parse_arg)(App, Args...)>::type {
+        return app->_parse_arg(std::forward<Args>(args)...);
+    }
+
+    /// Wrap _parse_subcommand, perfectly forward arguments and return
+    template <typename... Args>
+    static auto parse_subcommand(App *app, Args &&...args) ->
+        typename std::result_of<decltype (&App::_parse_subcommand)(App, Args...)>::type {
+        return app->_parse_subcommand(std::forward<Args>(args)...);
+    }
+#endif
+    /// Wrap the fallthrough parent function to make sure that is working correctly
+    static App *get_fallthrough_parent(App *app) { return app->_get_fallthrough_parent(); }
+};
+}  // namespace detail
+
+// [CLI11:app_hpp:end]
+}  // namespace CLI
+
+#ifndef CLI11_COMPILE
+#include "impl/App_inl.hpp"
+#endif
diff --git a/contrib/CLI11/include/CLI/CLI.hpp b/contrib/CLI11/include/CLI/CLI.hpp
new file mode 100644
index 000000000..ae4fc604d
--- /dev/null
+++ b/contrib/CLI11/include/CLI/CLI.hpp
@@ -0,0 +1,36 @@
+// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+// CLI Library includes
+// Order is important for combiner script
+
+#include "Version.hpp"
+
+#include "Macros.hpp"
+
+#include "StringTools.hpp"
+
+#include "Error.hpp"
+
+#include "TypeTools.hpp"
+
+#include "Split.hpp"
+
+#include "ConfigFwd.hpp"
+
+#include "Validators.hpp"
+
+#include "FormatterFwd.hpp"
+
+#include "Option.hpp"
+
+#include "App.hpp"
+
+#include "Config.hpp"
+
+#include "Formatter.hpp"
diff --git a/contrib/CLI11/include/CLI/Config.hpp b/contrib/CLI11/include/CLI/Config.hpp
new file mode 100644
index 000000000..8dfcddd95
--- /dev/null
+++ b/contrib/CLI11/include/CLI/Config.hpp
@@ -0,0 +1,48 @@
+// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+// [CLI11:public_includes:set]
+#include <algorithm>
+#include <cctype>
+#include <fstream>
+#include <iostream>
+#include <string>
+#include <utility>
+#include <vector>
+// [CLI11:public_includes:set]
+
+#include "App.hpp"
+#include "ConfigFwd.hpp"
+#include "StringTools.hpp"
+
+namespace CLI {
+// [CLI11:config_hpp:verbatim]
+namespace detail {
+
+std::string convert_arg_for_ini(const std::string &arg, char stringQuote = '"', char characterQuote = '\'');
+
+/// Comma separated join, adds quotes if needed
+std::string ini_join(const std::vector<std::string> &args,
+                     char sepChar = ',',
+                     char arrayStart = '[',
+                     char arrayEnd = ']',
+                     char stringQuote = '"',
+                     char characterQuote = '\'');
+
+std::vector<std::string> generate_parents(const std::string &section, std::string &name, char parentSeparator);
+
+/// assuming non default segments do a check on the close and open of the segments in a configItem structure
+void checkParentSegments(std::vector<ConfigItem> &output, const std::string &currentSection, char parentSeparator);
+}  // namespace detail
+
+// [CLI11:config_hpp:end]
+}  // namespace CLI
+
+#ifndef CLI11_COMPILE
+#include "impl/Config_inl.hpp"
+#endif
diff --git a/contrib/CLI11/include/CLI/ConfigFwd.hpp b/contrib/CLI11/include/CLI/ConfigFwd.hpp
new file mode 100644
index 000000000..a9ae2176a
--- /dev/null
+++ b/contrib/CLI11/include/CLI/ConfigFwd.hpp
@@ -0,0 +1,185 @@
+// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+// [CLI11:public_includes:set]
+#include <algorithm>
+#include <fstream>
+#include <iostream>
+#include <string>
+#include <vector>
+// [CLI11:public_includes:end]
+
+#include "Error.hpp"
+#include "StringTools.hpp"
+
+namespace CLI {
+// [CLI11:config_fwd_hpp:verbatim]
+
+class App;
+
+/// Holds values to load into Options
+struct ConfigItem {
+    /// This is the list of parents
+    std::vector<std::string> parents{};
+
+    /// This is the name
+    std::string name{};
+
+    /// Listing of inputs
+    std::vector<std::string> inputs{};
+
+    /// The list of parents and name joined by "."
+    CLI11_NODISCARD std::string fullname() const {
+        std::vector<std::string> tmp = parents;
+        tmp.emplace_back(name);
+        return detail::join(tmp, ".");
+    }
+};
+
+/// This class provides a converter for configuration files.
+class Config {
+  protected:
+    std::vector<ConfigItem> items{};
+
+  public:
+    /// Convert an app into a configuration
+    virtual std::string to_config(const App *, bool, bool, std::string) const = 0;
+
+    /// Convert a configuration into an app
+    virtual std::vector<ConfigItem> from_config(std::istream &) const = 0;
+
+    /// Get a flag value
+    CLI11_NODISCARD virtual std::string to_flag(const ConfigItem &item) const {
+        if(item.inputs.size() == 1) {
+            return item.inputs.at(0);
+        }
+        if(item.inputs.empty()) {
+            return "{}";
+        }
+        throw ConversionError::TooManyInputsFlag(item.fullname());  // LCOV_EXCL_LINE
+    }
+
+    /// Parse a config file, throw an error (ParseError:ConfigParseError or FileError) on failure
+    CLI11_NODISCARD std::vector<ConfigItem> from_file(const std::string &name) const {
+        std::ifstream input{name};
+        if(!input.good())
+            throw FileError::Missing(name);
+
+        return from_config(input);
+    }
+
+    /// Virtual destructor
+    virtual ~Config() = default;
+};
+
+/// This converter works with INI/TOML files; to write INI files use ConfigINI
+class ConfigBase : public Config {
+  protected:
+    /// the character used for comments
+    char commentChar = '#';
+    /// the character used to start an array '\0' is a default to not use
+    char arrayStart = '[';
+    /// the character used to end an array '\0' is a default to not use
+    char arrayEnd = ']';
+    /// the character used to separate elements in an array
+    char arraySeparator = ',';
+    /// the character used separate the name from the value
+    char valueDelimiter = '=';
+    /// the character to use around strings
+    char stringQuote = '"';
+    /// the character to use around single characters
+    char characterQuote = '\'';
+    /// the maximum number of layers to allow
+    uint8_t maximumLayers{255};
+    /// the separator used to separator parent layers
+    char parentSeparatorChar{'.'};
+    /// Specify the configuration index to use for arrayed sections
+    int16_t configIndex{-1};
+    /// Specify the configuration section that should be used
+    std::string configSection{};
+
+  public:
+    std::string
+    to_config(const App * /*app*/, bool default_also, bool write_description, std::string prefix) const override;
+
+    std::vector<ConfigItem> from_config(std::istream &input) const override;
+    /// Specify the configuration for comment characters
+    ConfigBase *comment(char cchar) {
+        commentChar = cchar;
+        return this;
+    }
+    /// Specify the start and end characters for an array
+    ConfigBase *arrayBounds(char aStart, char aEnd) {
+        arrayStart = aStart;
+        arrayEnd = aEnd;
+        return this;
+    }
+    /// Specify the delimiter character for an array
+    ConfigBase *arrayDelimiter(char aSep) {
+        arraySeparator = aSep;
+        return this;
+    }
+    /// Specify the delimiter between a name and value
+    ConfigBase *valueSeparator(char vSep) {
+        valueDelimiter = vSep;
+        return this;
+    }
+    /// Specify the quote characters used around strings and characters
+    ConfigBase *quoteCharacter(char qString, char qChar) {
+        stringQuote = qString;
+        characterQuote = qChar;
+        return this;
+    }
+    /// Specify the maximum number of parents
+    ConfigBase *maxLayers(uint8_t layers) {
+        maximumLayers = layers;
+        return this;
+    }
+    /// Specify the separator to use for parent layers
+    ConfigBase *parentSeparator(char sep) {
+        parentSeparatorChar = sep;
+        return this;
+    }
+    /// get a reference to the configuration section
+    std::string &sectionRef() { return configSection; }
+    /// get the section
+    CLI11_NODISCARD const std::string &section() const { return configSection; }
+    /// specify a particular section of the configuration file to use
+    ConfigBase *section(const std::string &sectionName) {
+        configSection = sectionName;
+        return this;
+    }
+
+    /// get a reference to the configuration index
+    int16_t &indexRef() { return configIndex; }
+    /// get the section index
+    CLI11_NODISCARD int16_t index() const { return configIndex; }
+    /// specify a particular index in the section to use (-1) for all sections to use
+    ConfigBase *index(int16_t sectionIndex) {
+        configIndex = sectionIndex;
+        return this;
+    }
+};
+
+/// the default Config is the TOML file format
+using ConfigTOML = ConfigBase;
+
+/// ConfigINI generates a "standard" INI compliant output
+class ConfigINI : public ConfigTOML {
+
+  public:
+    ConfigINI() {
+        commentChar = ';';
+        arrayStart = '\0';
+        arrayEnd = '\0';
+        arraySeparator = ' ';
+        valueDelimiter = '=';
+    }
+};
+// [CLI11:config_fwd_hpp:end]
+}  // namespace CLI
diff --git a/contrib/CLI11/include/CLI/Error.hpp b/contrib/CLI11/include/CLI/Error.hpp
new file mode 100644
index 000000000..0900da53c
--- /dev/null
+++ b/contrib/CLI11/include/CLI/Error.hpp
@@ -0,0 +1,354 @@
+// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+// [CLI11:public_includes:set]
+#include <exception>
+#include <stdexcept>
+#include <string>
+#include <utility>
+#include <vector>
+// [CLI11:public_includes:end]
+
+// CLI library includes
+#include "Macros.hpp"
+#include "StringTools.hpp"
+
+namespace CLI {
+// [CLI11:error_hpp:verbatim]
+
+// Use one of these on all error classes.
+// These are temporary and are undef'd at the end of this file.
+#define CLI11_ERROR_DEF(parent, name)                                                                                  \
+  protected:                                                                                                           \
+    name(std::string ename, std::string msg, int exit_code) : parent(std::move(ename), std::move(msg), exit_code) {}   \
+    name(std::string ename, std::string msg, ExitCodes exit_code)                                                      \
+        : parent(std::move(ename), std::move(msg), exit_code) {}                                                       \
+                                                                                                                       \
+  public:                                                                                                              \
+    name(std::string msg, ExitCodes exit_code) : parent(#name, std::move(msg), exit_code) {}                           \
+    name(std::string msg, int exit_code) : parent(#name, std::move(msg), exit_code) {}
+
+// This is added after the one above if a class is used directly and builds its own message
+#define CLI11_ERROR_SIMPLE(name)                                                                                       \
+    explicit name(std::string msg) : name(#name, msg, ExitCodes::name) {}
+
+/// These codes are part of every error in CLI. They can be obtained from e using e.exit_code or as a quick shortcut,
+/// int values from e.get_error_code().
+enum class ExitCodes {
+    Success = 0,
+    IncorrectConstruction = 100,
+    BadNameString,
+    OptionAlreadyAdded,
+    FileError,
+    ConversionError,
+    ValidationError,
+    RequiredError,
+    RequiresError,
+    ExcludesError,
+    ExtrasError,
+    ConfigError,
+    InvalidError,
+    HorribleError,
+    OptionNotFound,
+    ArgumentMismatch,
+    BaseClass = 127
+};
+
+// Error definitions
+
+/// @defgroup error_group Errors
+/// @brief Errors thrown by CLI11
+///
+/// These are the errors that can be thrown. Some of them, like CLI::Success, are not really errors.
+/// @{
+
+/// All errors derive from this one
+class Error : public std::runtime_error {
+    int actual_exit_code;
+    std::string error_name{"Error"};
+
+  public:
+    CLI11_NODISCARD int get_exit_code() const { return actual_exit_code; }
+
+    CLI11_NODISCARD std::string get_name() const { return error_name; }
+
+    Error(std::string name, std::string msg, int exit_code = static_cast<int>(ExitCodes::BaseClass))
+        : runtime_error(msg), actual_exit_code(exit_code), error_name(std::move(name)) {}
+
+    Error(std::string name, std::string msg, ExitCodes exit_code) : Error(name, msg, static_cast<int>(exit_code)) {}
+};
+
+// Note: Using Error::Error constructors does not work on GCC 4.7
+
+/// Construction errors (not in parsing)
+class ConstructionError : public Error {
+    CLI11_ERROR_DEF(Error, ConstructionError)
+};
+
+/// Thrown when an option is set to conflicting values (non-vector and multi args, for example)
+class IncorrectConstruction : public ConstructionError {
+    CLI11_ERROR_DEF(ConstructionError, IncorrectConstruction)
+    CLI11_ERROR_SIMPLE(IncorrectConstruction)
+    static IncorrectConstruction PositionalFlag(std::string name) {
+        return IncorrectConstruction(name + ": Flags cannot be positional");
+    }
+    static IncorrectConstruction Set0Opt(std::string name) {
+        return IncorrectConstruction(name + ": Cannot set 0 expected, use a flag instead");
+    }
+    static IncorrectConstruction SetFlag(std::string name) {
+        return IncorrectConstruction(name + ": Cannot set an expected number for flags");
+    }
+    static IncorrectConstruction ChangeNotVector(std::string name) {
+        return IncorrectConstruction(name + ": You can only change the expected arguments for vectors");
+    }
+    static IncorrectConstruction AfterMultiOpt(std::string name) {
+        return IncorrectConstruction(
+            name + ": You can't change expected arguments after you've changed the multi option policy!");
+    }
+    static IncorrectConstruction MissingOption(std::string name) {
+        return IncorrectConstruction("Option " + name + " is not defined");
+    }
+    static IncorrectConstruction MultiOptionPolicy(std::string name) {
+        return IncorrectConstruction(name + ": multi_option_policy only works for flags and exact value options");
+    }
+};
+
+/// Thrown on construction of a bad name
+class BadNameString : public ConstructionError {
+    CLI11_ERROR_DEF(ConstructionError, BadNameString)
+    CLI11_ERROR_SIMPLE(BadNameString)
+    static BadNameString OneCharName(std::string name) { return BadNameString("Invalid one char name: " + name); }
+    static BadNameString BadLongName(std::string name) { return BadNameString("Bad long name: " + name); }
+    static BadNameString DashesOnly(std::string name) {
+        return BadNameString("Must have a name, not just dashes: " + name);
+    }
+    static BadNameString MultiPositionalNames(std::string name) {
+        return BadNameString("Only one positional name allowed, remove: " + name);
+    }
+};
+
+/// Thrown when an option already exists
+class OptionAlreadyAdded : public ConstructionError {
+    CLI11_ERROR_DEF(ConstructionError, OptionAlreadyAdded)
+    explicit OptionAlreadyAdded(std::string name)
+        : OptionAlreadyAdded(name + " is already added", ExitCodes::OptionAlreadyAdded) {}
+    static OptionAlreadyAdded Requires(std::string name, std::string other) {
+        return {name + " requires " + other, ExitCodes::OptionAlreadyAdded};
+    }
+    static OptionAlreadyAdded Excludes(std::string name, std::string other) {
+        return {name + " excludes " + other, ExitCodes::OptionAlreadyAdded};
+    }
+};
+
+// Parsing errors
+
+/// Anything that can error in Parse
+class ParseError : public Error {
+    CLI11_ERROR_DEF(Error, ParseError)
+};
+
+// Not really "errors"
+
+/// This is a successful completion on parsing, supposed to exit
+class Success : public ParseError {
+    CLI11_ERROR_DEF(ParseError, Success)
+    Success() : Success("Successfully completed, should be caught and quit", ExitCodes::Success) {}
+};
+
+/// -h or --help on command line
+class CallForHelp : public Success {
+    CLI11_ERROR_DEF(Success, CallForHelp)
+    CallForHelp() : CallForHelp("This should be caught in your main function, see examples", ExitCodes::Success) {}
+};
+
+/// Usually something like --help-all on command line
+class CallForAllHelp : public Success {
+    CLI11_ERROR_DEF(Success, CallForAllHelp)
+    CallForAllHelp()
+        : CallForAllHelp("This should be caught in your main function, see examples", ExitCodes::Success) {}
+};
+
+/// -v or --version on command line
+class CallForVersion : public Success {
+    CLI11_ERROR_DEF(Success, CallForVersion)
+    CallForVersion()
+        : CallForVersion("This should be caught in your main function, see examples", ExitCodes::Success) {}
+};
+
+/// Does not output a diagnostic in CLI11_PARSE, but allows main() to return with a specific error code.
+class RuntimeError : public ParseError {
+    CLI11_ERROR_DEF(ParseError, RuntimeError)
+    explicit RuntimeError(int exit_code = 1) : RuntimeError("Runtime error", exit_code) {}
+};
+
+/// Thrown when parsing an INI file and it is missing
+class FileError : public ParseError {
+    CLI11_ERROR_DEF(ParseError, FileError)
+    CLI11_ERROR_SIMPLE(FileError)
+    static FileError Missing(std::string name) { return FileError(name + " was not readable (missing?)"); }
+};
+
+/// Thrown when conversion call back fails, such as when an int fails to coerce to a string
+class ConversionError : public ParseError {
+    CLI11_ERROR_DEF(ParseError, ConversionError)
+    CLI11_ERROR_SIMPLE(ConversionError)
+    ConversionError(std::string member, std::string name)
+        : ConversionError("The value " + member + " is not an allowed value for " + name) {}
+    ConversionError(std::string name, std::vector<std::string> results)
+        : ConversionError("Could not convert: " + name + " = " + detail::join(results)) {}
+    static ConversionError TooManyInputsFlag(std::string name) {
+        return ConversionError(name + ": too many inputs for a flag");
+    }
+    static ConversionError TrueFalse(std::string name) {
+        return ConversionError(name + ": Should be true/false or a number");
+    }
+};
+
+/// Thrown when validation of results fails
+class ValidationError : public ParseError {
+    CLI11_ERROR_DEF(ParseError, ValidationError)
+    CLI11_ERROR_SIMPLE(ValidationError)
+    explicit ValidationError(std::string name, std::string msg) : ValidationError(name + ": " + msg) {}
+};
+
+/// Thrown when a required option is missing
+class RequiredError : public ParseError {
+    CLI11_ERROR_DEF(ParseError, RequiredError)
+    explicit RequiredError(std::string name) : RequiredError(name + " is required", ExitCodes::RequiredError) {}
+    static RequiredError Subcommand(std::size_t min_subcom) {
+        if(min_subcom == 1) {
+            return RequiredError("A subcommand");
+        }
+        return {"Requires at least " + std::to_string(min_subcom) + " subcommands", ExitCodes::RequiredError};
+    }
+    static RequiredError
+    Option(std::size_t min_option, std::size_t max_option, std::size_t used, const std::string &option_list) {
+        if((min_option == 1) && (max_option == 1) && (used == 0))
+            return RequiredError("Exactly 1 option from [" + option_list + "]");
+        if((min_option == 1) && (max_option == 1) && (used > 1)) {
+            return {"Exactly 1 option from [" + option_list + "] is required and " + std::to_string(used) +
+                        " were given",
+                    ExitCodes::RequiredError};
+        }
+        if((min_option == 1) && (used == 0))
+            return RequiredError("At least 1 option from [" + option_list + "]");
+        if(used < min_option) {
+            return {"Requires at least " + std::to_string(min_option) + " options used and only " +
+                        std::to_string(used) + "were given from [" + option_list + "]",
+                    ExitCodes::RequiredError};
+        }
+        if(max_option == 1)
+            return {"Requires at most 1 options be given from [" + option_list + "]", ExitCodes::RequiredError};
+
+        return {"Requires at most " + std::to_string(max_option) + " options be used and " + std::to_string(used) +
+                    "were given from [" + option_list + "]",
+                ExitCodes::RequiredError};
+    }
+};
+
+/// Thrown when the wrong number of arguments has been received
+class ArgumentMismatch : public ParseError {
+    CLI11_ERROR_DEF(ParseError, ArgumentMismatch)
+    CLI11_ERROR_SIMPLE(ArgumentMismatch)
+    ArgumentMismatch(std::string name, int expected, std::size_t received)
+        : ArgumentMismatch(expected > 0 ? ("Expected exactly " + std::to_string(expected) + " arguments to " + name +
+                                           ", got " + std::to_string(received))
+                                        : ("Expected at least " + std::to_string(-expected) + " arguments to " + name +
+                                           ", got " + std::to_string(received)),
+                           ExitCodes::ArgumentMismatch) {}
+
+    static ArgumentMismatch AtLeast(std::string name, int num, std::size_t received) {
+        return ArgumentMismatch(name + ": At least " + std::to_string(num) + " required but received " +
+                                std::to_string(received));
+    }
+    static ArgumentMismatch AtMost(std::string name, int num, std::size_t received) {
+        return ArgumentMismatch(name + ": At Most " + std::to_string(num) + " required but received " +
+                                std::to_string(received));
+    }
+    static ArgumentMismatch TypedAtLeast(std::string name, int num, std::string type) {
+        return ArgumentMismatch(name + ": " + std::to_string(num) + " required " + type + " missing");
+    }
+    static ArgumentMismatch FlagOverride(std::string name) {
+        return ArgumentMismatch(name + " was given a disallowed flag override");
+    }
+    static ArgumentMismatch PartialType(std::string name, int num, std::string type) {
+        return ArgumentMismatch(name + ": " + type + " only partially specified: " + std::to_string(num) +
+                                " required for each element");
+    }
+};
+
+/// Thrown when a requires option is missing
+class RequiresError : public ParseError {
+    CLI11_ERROR_DEF(ParseError, RequiresError)
+    RequiresError(std::string curname, std::string subname)
+        : RequiresError(curname + " requires " + subname, ExitCodes::RequiresError) {}
+};
+
+/// Thrown when an excludes option is present
+class ExcludesError : public ParseError {
+    CLI11_ERROR_DEF(ParseError, ExcludesError)
+    ExcludesError(std::string curname, std::string subname)
+        : ExcludesError(curname + " excludes " + subname, ExitCodes::ExcludesError) {}
+};
+
+/// Thrown when too many positionals or options are found
+class ExtrasError : public ParseError {
+    CLI11_ERROR_DEF(ParseError, ExtrasError)
+    explicit ExtrasError(std::vector<std::string> args)
+        : ExtrasError((args.size() > 1 ? "The following arguments were not expected: "
+                                       : "The following argument was not expected: ") +
+                          detail::rjoin(args, " "),
+                      ExitCodes::ExtrasError) {}
+    ExtrasError(const std::string &name, std::vector<std::string> args)
+        : ExtrasError(name,
+                      (args.size() > 1 ? "The following arguments were not expected: "
+                                       : "The following argument was not expected: ") +
+                          detail::rjoin(args, " "),
+                      ExitCodes::ExtrasError) {}
+};
+
+/// Thrown when extra values are found in an INI file
+class ConfigError : public ParseError {
+    CLI11_ERROR_DEF(ParseError, ConfigError)
+    CLI11_ERROR_SIMPLE(ConfigError)
+    static ConfigError Extras(std::string item) { return ConfigError("INI was not able to parse " + item); }
+    static ConfigError NotConfigurable(std::string item) {
+        return ConfigError(item + ": This option is not allowed in a configuration file");
+    }
+};
+
+/// Thrown when validation fails before parsing
+class InvalidError : public ParseError {
+    CLI11_ERROR_DEF(ParseError, InvalidError)
+    explicit InvalidError(std::string name)
+        : InvalidError(name + ": Too many positional arguments with unlimited expected args", ExitCodes::InvalidError) {
+    }
+};
+
+/// This is just a safety check to verify selection and parsing match - you should not ever see it
+/// Strings are directly added to this error, but again, it should never be seen.
+class HorribleError : public ParseError {
+    CLI11_ERROR_DEF(ParseError, HorribleError)
+    CLI11_ERROR_SIMPLE(HorribleError)
+};
+
+// After parsing
+
+/// Thrown when counting a non-existent option
+class OptionNotFound : public Error {
+    CLI11_ERROR_DEF(Error, OptionNotFound)
+    explicit OptionNotFound(std::string name) : OptionNotFound(name + " not found", ExitCodes::OptionNotFound) {}
+};
+
+#undef CLI11_ERROR_DEF
+#undef CLI11_ERROR_SIMPLE
+
+/// @}
+
+// [CLI11:error_hpp:end]
+}  // namespace CLI
diff --git a/contrib/CLI11/include/CLI/Formatter.hpp b/contrib/CLI11/include/CLI/Formatter.hpp
new file mode 100644
index 000000000..f58058f27
--- /dev/null
+++ b/contrib/CLI11/include/CLI/Formatter.hpp
@@ -0,0 +1,25 @@
+// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+// [CLI11:public_includes:set]
+#include <algorithm>
+#include <string>
+#include <vector>
+// [CLI11:public_includes:end]
+
+#include "App.hpp"
+#include "FormatterFwd.hpp"
+
+namespace CLI {
+// [CLI11:formatter_hpp:verbatim]
+// [CLI11:formatter_hpp:end]
+}  // namespace CLI
+
+#ifndef CLI11_COMPILE
+#include "impl/Formatter_inl.hpp"
+#endif
diff --git a/contrib/CLI11/include/CLI/FormatterFwd.hpp b/contrib/CLI11/include/CLI/FormatterFwd.hpp
new file mode 100644
index 000000000..5ef0a5b58
--- /dev/null
+++ b/contrib/CLI11/include/CLI/FormatterFwd.hpp
@@ -0,0 +1,189 @@
+// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+// [CLI11:public_includes:set]
+#include <functional>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+// [CLI11:public_includes:end]
+
+#include "StringTools.hpp"
+
+namespace CLI {
+// [CLI11:formatter_fwd_hpp:verbatim]
+
+class Option;
+class App;
+
+/// This enum signifies the type of help requested
+///
+/// This is passed in by App; all user classes must accept this as
+/// the second argument.
+
+enum class AppFormatMode {
+    Normal,  ///< The normal, detailed help
+    All,     ///< A fully expanded help
+    Sub,     ///< Used when printed as part of expanded subcommand
+};
+
+/// This is the minimum requirements to run a formatter.
+///
+/// A user can subclass this is if they do not care at all
+/// about the structure in CLI::Formatter.
+class FormatterBase {
+  protected:
+    /// @name Options
+    ///@{
+
+    /// The width of the first column
+    std::size_t column_width_{30};
+
+    /// @brief The required help printout labels (user changeable)
+    /// Values are Needs, Excludes, etc.
+    std::map<std::string, std::string> labels_{};
+
+    ///@}
+    /// @name Basic
+    ///@{
+
+  public:
+    FormatterBase() = default;
+    FormatterBase(const FormatterBase &) = default;
+    FormatterBase(FormatterBase &&) = default;
+    FormatterBase &operator=(const FormatterBase &) = default;
+    FormatterBase &operator=(FormatterBase &&) = default;
+
+    /// Adding a destructor in this form to work around bug in GCC 4.7
+    virtual ~FormatterBase() noexcept {}  // NOLINT(modernize-use-equals-default)
+
+    /// This is the key method that puts together help
+    virtual std::string make_help(const App *, std::string, AppFormatMode) const = 0;
+
+    ///@}
+    /// @name Setters
+    ///@{
+
+    /// Set the "REQUIRED" label
+    void label(std::string key, std::string val) { labels_[key] = val; }
+
+    /// Set the column width
+    void column_width(std::size_t val) { column_width_ = val; }
+
+    ///@}
+    /// @name Getters
+    ///@{
+
+    /// Get the current value of a name (REQUIRED, etc.)
+    CLI11_NODISCARD std::string get_label(std::string key) const {
+        if(labels_.find(key) == labels_.end())
+            return key;
+        return labels_.at(key);
+    }
+
+    /// Get the current column width
+    CLI11_NODISCARD std::size_t get_column_width() const { return column_width_; }
+
+    ///@}
+};
+
+/// This is a specialty override for lambda functions
+class FormatterLambda final : public FormatterBase {
+    using funct_t = std::function<std::string(const App *, std::string, AppFormatMode)>;
+
+    /// The lambda to hold and run
+    funct_t lambda_;
+
+  public:
+    /// Create a FormatterLambda with a lambda function
+    explicit FormatterLambda(funct_t funct) : lambda_(std::move(funct)) {}
+
+    /// Adding a destructor (mostly to make GCC 4.7 happy)
+    ~FormatterLambda() noexcept override {}  // NOLINT(modernize-use-equals-default)
+
+    /// This will simply call the lambda function
+    std::string make_help(const App *app, std::string name, AppFormatMode mode) const override {
+        return lambda_(app, name, mode);
+    }
+};
+
+/// This is the default Formatter for CLI11. It pretty prints help output, and is broken into quite a few
+/// overridable methods, to be highly customizable with minimal effort.
+class Formatter : public FormatterBase {
+  public:
+    Formatter() = default;
+    Formatter(const Formatter &) = default;
+    Formatter(Formatter &&) = default;
+    Formatter &operator=(const Formatter &) = default;
+    Formatter &operator=(Formatter &&) = default;
+
+    /// @name Overridables
+    ///@{
+
+    /// This prints out a group of options with title
+    ///
+    CLI11_NODISCARD virtual std::string
+    make_group(std::string group, bool is_positional, std::vector<const Option *> opts) const;
+
+    /// This prints out just the positionals "group"
+    virtual std::string make_positionals(const App *app) const;
+
+    /// This prints out all the groups of options
+    std::string make_groups(const App *app, AppFormatMode mode) const;
+
+    /// This prints out all the subcommands
+    virtual std::string make_subcommands(const App *app, AppFormatMode mode) const;
+
+    /// This prints out a subcommand
+    virtual std::string make_subcommand(const App *sub) const;
+
+    /// This prints out a subcommand in help-all
+    virtual std::string make_expanded(const App *sub) const;
+
+    /// This prints out all the groups of options
+    virtual std::string make_footer(const App *app) const;
+
+    /// This displays the description line
+    virtual std::string make_description(const App *app) const;
+
+    /// This displays the usage line
+    virtual std::string make_usage(const App *app, std::string name) const;
+
+    /// This puts everything together
+    std::string make_help(const App * /*app*/, std::string, AppFormatMode) const override;
+
+    ///@}
+    /// @name Options
+    ///@{
+
+    /// This prints out an option help line, either positional or optional form
+    virtual std::string make_option(const Option *opt, bool is_positional) const {
+        std::stringstream out;
+        detail::format_help(
+            out, make_option_name(opt, is_positional) + make_option_opts(opt), make_option_desc(opt), column_width_);
+        return out.str();
+    }
+
+    /// @brief This is the name part of an option, Default: left column
+    virtual std::string make_option_name(const Option *, bool) const;
+
+    /// @brief This is the options part of the name, Default: combined into left column
+    virtual std::string make_option_opts(const Option *) const;
+
+    /// @brief This is the description. Default: Right column, on new line if left column too large
+    virtual std::string make_option_desc(const Option *) const;
+
+    /// @brief This is used to print the name on the USAGE line
+    virtual std::string make_option_usage(const Option *opt) const;
+
+    ///@}
+};
+
+// [CLI11:formatter_fwd_hpp:end]
+}  // namespace CLI
diff --git a/contrib/CLI11/include/CLI/Macros.hpp b/contrib/CLI11/include/CLI/Macros.hpp
new file mode 100644
index 000000000..e85439030
--- /dev/null
+++ b/contrib/CLI11/include/CLI/Macros.hpp
@@ -0,0 +1,75 @@
+// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+// [CLI11:macros_hpp:verbatim]
+
+// The following version macro is very similar to the one in pybind11
+#if !(defined(_MSC_VER) && __cplusplus == 199711L) && !defined(__INTEL_COMPILER)
+#if __cplusplus >= 201402L
+#define CLI11_CPP14
+#if __cplusplus >= 201703L
+#define CLI11_CPP17
+#if __cplusplus > 201703L
+#define CLI11_CPP20
+#endif
+#endif
+#endif
+#elif defined(_MSC_VER) && __cplusplus == 199711L
+// MSVC sets _MSVC_LANG rather than __cplusplus (supposedly until the standard is fully implemented)
+// Unless you use the /Zc:__cplusplus flag on Visual Studio 2017 15.7 Preview 3 or newer
+#if _MSVC_LANG >= 201402L
+#define CLI11_CPP14
+#if _MSVC_LANG > 201402L && _MSC_VER >= 1910
+#define CLI11_CPP17
+#if _MSVC_LANG > 201703L && _MSC_VER >= 1910
+#define CLI11_CPP20
+#endif
+#endif
+#endif
+#endif
+
+#if defined(CLI11_CPP14)
+#define CLI11_DEPRECATED(reason) [[deprecated(reason)]]
+#elif defined(_MSC_VER)
+#define CLI11_DEPRECATED(reason) __declspec(deprecated(reason))
+#else
+#define CLI11_DEPRECATED(reason) __attribute__((deprecated(reason)))
+#endif
+
+// GCC < 10 doesn't ignore this in unevaluated contexts
+#if !defined(CLI11_CPP17) ||                                                                                           \
+    (defined(__GNUC__) && !defined(__llvm__) && !defined(__INTEL_COMPILER) && __GNUC__ < 10 && __GNUC__ > 4)
+#define CLI11_NODISCARD
+#else
+#define CLI11_NODISCARD [[nodiscard]]
+#endif
+
+/** detection of rtti */
+#ifndef CLI11_USE_STATIC_RTTI
+#if(defined(_HAS_STATIC_RTTI) && _HAS_STATIC_RTTI)
+#define CLI11_USE_STATIC_RTTI 1
+#elif defined(__cpp_rtti)
+#if(defined(_CPPRTTI) && _CPPRTTI == 0)
+#define CLI11_USE_STATIC_RTTI 1
+#else
+#define CLI11_USE_STATIC_RTTI 0
+#endif
+#elif(defined(__GCC_RTTI) && __GXX_RTTI)
+#define CLI11_USE_STATIC_RTTI 0
+#else
+#define CLI11_USE_STATIC_RTTI 1
+#endif
+#endif
+
+/** Inline macro **/
+#ifdef CLI11_COMPILE
+#define CLI11_INLINE
+#else
+#define CLI11_INLINE inline
+#endif
+// [CLI11:macros_hpp:end]
diff --git a/contrib/CLI11/include/CLI/Option.hpp b/contrib/CLI11/include/CLI/Option.hpp
new file mode 100644
index 000000000..d32350738
--- /dev/null
+++ b/contrib/CLI11/include/CLI/Option.hpp
@@ -0,0 +1,807 @@
+// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+// [CLI11:public_includes:set]
+#include <algorithm>
+#include <functional>
+#include <memory>
+#include <set>
+#include <string>
+#include <tuple>
+#include <utility>
+#include <vector>
+// [CLI11:public_includes:end]
+
+#include "Error.hpp"
+#include "Macros.hpp"
+#include "Split.hpp"
+#include "StringTools.hpp"
+#include "Validators.hpp"
+
+namespace CLI {
+// [CLI11:option_hpp:verbatim]
+
+using results_t = std::vector<std::string>;
+/// callback function definition
+using callback_t = std::function<bool(const results_t &)>;
+
+class Option;
+class App;
+
+using Option_p = std::unique_ptr<Option>;
+/// Enumeration of the multiOption Policy selection
+enum class MultiOptionPolicy : char {
+    Throw,      //!< Throw an error if any extra arguments were given
+    TakeLast,   //!< take only the last Expected number of arguments
+    TakeFirst,  //!< take only the first Expected number of arguments
+    Join,       //!< merge all the arguments together into a single string via the delimiter character default('\n')
+    TakeAll,    //!< just get all the passed argument regardless
+    Sum         //!< sum all the arguments together if numerical or concatenate directly without delimiter
+};
+
+/// This is the CRTP base class for Option and OptionDefaults. It was designed this way
+/// to share parts of the class; an OptionDefaults can copy to an Option.
+template <typename CRTP> class OptionBase {
+    friend App;
+
+  protected:
+    /// The group membership
+    std::string group_ = std::string("Options");
+
+    /// True if this is a required option
+    bool required_{false};
+
+    /// Ignore the case when matching (option, not value)
+    bool ignore_case_{false};
+
+    /// Ignore underscores when matching (option, not value)
+    bool ignore_underscore_{false};
+
+    /// Allow this option to be given in a configuration file
+    bool configurable_{true};
+
+    /// Disable overriding flag values with '=value'
+    bool disable_flag_override_{false};
+
+    /// Specify a delimiter character for vector arguments
+    char delimiter_{'\0'};
+
+    /// Automatically capture default value
+    bool always_capture_default_{false};
+
+    /// Policy for handling multiple arguments beyond the expected Max
+    MultiOptionPolicy multi_option_policy_{MultiOptionPolicy::Throw};
+
+    /// Copy the contents to another similar class (one based on OptionBase)
+    template <typename T> void copy_to(T *other) const;
+
+  public:
+    // setters
+
+    /// Changes the group membership
+    CRTP *group(const std::string &name) {
+        if(!detail::valid_alias_name_string(name)) {
+            throw IncorrectConstruction("Group names may not contain newlines or null characters");
+        }
+        group_ = name;
+        return static_cast<CRTP *>(this);
+    }
+
+    /// Set the option as required
+    CRTP *required(bool value = true) {
+        required_ = value;
+        return static_cast<CRTP *>(this);
+    }
+
+    /// Support Plumbum term
+    CRTP *mandatory(bool value = true) { return required(value); }
+
+    CRTP *always_capture_default(bool value = true) {
+        always_capture_default_ = value;
+        return static_cast<CRTP *>(this);
+    }
+
+    // Getters
+
+    /// Get the group of this option
+    CLI11_NODISCARD const std::string &get_group() const { return group_; }
+
+    /// True if this is a required option
+    CLI11_NODISCARD bool get_required() const { return required_; }
+
+    /// The status of ignore case
+    CLI11_NODISCARD bool get_ignore_case() const { return ignore_case_; }
+
+    /// The status of ignore_underscore
+    CLI11_NODISCARD bool get_ignore_underscore() const { return ignore_underscore_; }
+
+    /// The status of configurable
+    CLI11_NODISCARD bool get_configurable() const { return configurable_; }
+
+    /// The status of configurable
+    CLI11_NODISCARD bool get_disable_flag_override() const { return disable_flag_override_; }
+
+    /// Get the current delimiter char
+    CLI11_NODISCARD char get_delimiter() const { return delimiter_; }
+
+    /// Return true if this will automatically capture the default value for help printing
+    CLI11_NODISCARD bool get_always_capture_default() const { return always_capture_default_; }
+
+    /// The status of the multi option policy
+    CLI11_NODISCARD MultiOptionPolicy get_multi_option_policy() const { return multi_option_policy_; }
+
+    // Shortcuts for multi option policy
+
+    /// Set the multi option policy to take last
+    CRTP *take_last() {
+        auto *self = static_cast<CRTP *>(this);
+        self->multi_option_policy(MultiOptionPolicy::TakeLast);
+        return self;
+    }
+
+    /// Set the multi option policy to take last
+    CRTP *take_first() {
+        auto *self = static_cast<CRTP *>(this);
+        self->multi_option_policy(MultiOptionPolicy::TakeFirst);
+        return self;
+    }
+
+    /// Set the multi option policy to take all arguments
+    CRTP *take_all() {
+        auto self = static_cast<CRTP *>(this);
+        self->multi_option_policy(MultiOptionPolicy::TakeAll);
+        return self;
+    }
+
+    /// Set the multi option policy to join
+    CRTP *join() {
+        auto *self = static_cast<CRTP *>(this);
+        self->multi_option_policy(MultiOptionPolicy::Join);
+        return self;
+    }
+
+    /// Set the multi option policy to join with a specific delimiter
+    CRTP *join(char delim) {
+        auto self = static_cast<CRTP *>(this);
+        self->delimiter_ = delim;
+        self->multi_option_policy(MultiOptionPolicy::Join);
+        return self;
+    }
+
+    /// Allow in a configuration file
+    CRTP *configurable(bool value = true) {
+        configurable_ = value;
+        return static_cast<CRTP *>(this);
+    }
+
+    /// Allow in a configuration file
+    CRTP *delimiter(char value = '\0') {
+        delimiter_ = value;
+        return static_cast<CRTP *>(this);
+    }
+};
+
+/// This is a version of OptionBase that only supports setting values,
+/// for defaults. It is stored as the default option in an App.
+class OptionDefaults : public OptionBase<OptionDefaults> {
+  public:
+    OptionDefaults() = default;
+
+    // Methods here need a different implementation if they are Option vs. OptionDefault
+
+    /// Take the last argument if given multiple times
+    OptionDefaults *multi_option_policy(MultiOptionPolicy value = MultiOptionPolicy::Throw) {
+        multi_option_policy_ = value;
+        return this;
+    }
+
+    /// Ignore the case of the option name
+    OptionDefaults *ignore_case(bool value = true) {
+        ignore_case_ = value;
+        return this;
+    }
+
+    /// Ignore underscores in the option name
+    OptionDefaults *ignore_underscore(bool value = true) {
+        ignore_underscore_ = value;
+        return this;
+    }
+
+    /// Disable overriding flag values with an '=<value>' segment
+    OptionDefaults *disable_flag_override(bool value = true) {
+        disable_flag_override_ = value;
+        return this;
+    }
+
+    /// set a delimiter character to split up single arguments to treat as multiple inputs
+    OptionDefaults *delimiter(char value = '\0') {
+        delimiter_ = value;
+        return this;
+    }
+};
+
+class Option : public OptionBase<Option> {
+    friend App;
+
+  protected:
+    /// @name Names
+    ///@{
+
+    /// A list of the short names (`-a`) without the leading dashes
+    std::vector<std::string> snames_{};
+
+    /// A list of the long names (`--long`) without the leading dashes
+    std::vector<std::string> lnames_{};
+
+    /// A list of the flag names with the appropriate default value, the first part of the pair should be duplicates of
+    /// what is in snames or lnames but will trigger a particular response on a flag
+    std::vector<std::pair<std::string, std::string>> default_flag_values_{};
+
+    /// a list of flag names with specified default values;
+    std::vector<std::string> fnames_{};
+
+    /// A positional name
+    std::string pname_{};
+
+    /// If given, check the environment for this option
+    std::string envname_{};
+
+    ///@}
+    /// @name Help
+    ///@{
+
+    /// The description for help strings
+    std::string description_{};
+
+    /// A human readable default value, either manually set, captured, or captured by default
+    std::string default_str_{};
+
+    /// If given, replace the text that describes the option type and usage in the help text
+    std::string option_text_{};
+
+    /// A human readable type value, set when App creates this
+    ///
+    /// This is a lambda function so "types" can be dynamic, such as when a set prints its contents.
+    std::function<std::string()> type_name_{[]() { return std::string(); }};
+
+    /// Run this function to capture a default (ignore if empty)
+    std::function<std::string()> default_function_{};
+
+    ///@}
+    /// @name Configuration
+    ///@{
+
+    /// The number of arguments that make up one option. max is the nominal type size, min is the minimum number of
+    /// strings
+    int type_size_max_{1};
+    /// The minimum number of arguments an option should be expecting
+    int type_size_min_{1};
+
+    /// The minimum number of expected values
+    int expected_min_{1};
+    /// The maximum number of expected values
+    int expected_max_{1};
+
+    /// A list of Validators to run on each value parsed
+    std::vector<Validator> validators_{};
+
+    /// A list of options that are required with this option
+    std::set<Option *> needs_{};
+
+    /// A list of options that are excluded with this option
+    std::set<Option *> excludes_{};
+
+    ///@}
+    /// @name Other
+    ///@{
+
+    /// link back up to the parent App for fallthrough
+    App *parent_{nullptr};
+
+    /// Options store a callback to do all the work
+    callback_t callback_{};
+
+    ///@}
+    /// @name Parsing results
+    ///@{
+
+    /// complete Results of parsing
+    results_t results_{};
+    /// results after reduction
+    results_t proc_results_{};
+    /// enumeration for the option state machine
+    enum class option_state : char {
+        parsing = 0,       //!< The option is currently collecting parsed results
+        validated = 2,     //!< the results have been validated
+        reduced = 4,       //!< a subset of results has been generated
+        callback_run = 6,  //!< the callback has been executed
+    };
+    /// Whether the callback has run (needed for INI parsing)
+    option_state current_option_state_{option_state::parsing};
+    /// Specify that extra args beyond type_size_max should be allowed
+    bool allow_extra_args_{false};
+    /// Specify that the option should act like a flag vs regular option
+    bool flag_like_{false};
+    /// Control option to run the callback to set the default
+    bool run_callback_for_default_{false};
+    /// flag indicating a separator needs to be injected after each argument call
+    bool inject_separator_{false};
+    /// flag indicating that the option should trigger the validation and callback chain on each result when loaded
+    bool trigger_on_result_{false};
+    /// flag indicating that the option should force the callback regardless if any results present
+    bool force_callback_{false};
+    ///@}
+
+    /// Making an option by hand is not defined, it must be made by the App class
+    Option(std::string option_name, std::string option_description, callback_t callback, App *parent)
+        : description_(std::move(option_description)), parent_(parent), callback_(std::move(callback)) {
+        std::tie(snames_, lnames_, pname_) = detail::get_names(detail::split_names(option_name));
+    }
+
+  public:
+    /// @name Basic
+    ///@{
+
+    Option(const Option &) = delete;
+    Option &operator=(const Option &) = delete;
+
+    /// Count the total number of times an option was passed
+    CLI11_NODISCARD std::size_t count() const { return results_.size(); }
+
+    /// True if the option was not passed
+    CLI11_NODISCARD bool empty() const { return results_.empty(); }
+
+    /// This bool operator returns true if any arguments were passed or the option callback is forced
+    explicit operator bool() const { return !empty() || force_callback_; }
+
+    /// Clear the parsed results (mostly for testing)
+    void clear() {
+        results_.clear();
+        current_option_state_ = option_state::parsing;
+    }
+
+    ///@}
+    /// @name Setting options
+    ///@{
+
+    /// Set the number of expected arguments
+    Option *expected(int value);
+
+    /// Set the range of expected arguments
+    Option *expected(int value_min, int value_max);
+
+    /// Set the value of allow_extra_args which allows extra value arguments on the flag or option to be included
+    /// with each instance
+    Option *allow_extra_args(bool value = true) {
+        allow_extra_args_ = value;
+        return this;
+    }
+    /// Get the current value of allow extra args
+    CLI11_NODISCARD bool get_allow_extra_args() const { return allow_extra_args_; }
+    /// Set the value of trigger_on_parse which specifies that the option callback should be triggered on every parse
+    Option *trigger_on_parse(bool value = true) {
+        trigger_on_result_ = value;
+        return this;
+    }
+    /// The status of trigger on parse
+    CLI11_NODISCARD bool get_trigger_on_parse() const { return trigger_on_result_; }
+
+    /// Set the value of force_callback
+    Option *force_callback(bool value = true) {
+        force_callback_ = value;
+        return this;
+    }
+    /// The status of force_callback
+    CLI11_NODISCARD bool get_force_callback() const { return force_callback_; }
+
+    /// Set the value of run_callback_for_default which controls whether the callback function should be called to set
+    /// the default This is controlled automatically but could be manipulated by the user.
+    Option *run_callback_for_default(bool value = true) {
+        run_callback_for_default_ = value;
+        return this;
+    }
+    /// Get the current value of run_callback_for_default
+    CLI11_NODISCARD bool get_run_callback_for_default() const { return run_callback_for_default_; }
+
+    /// Adds a Validator with a built in type name
+    Option *check(Validator validator, const std::string &validator_name = "");
+
+    /// Adds a Validator. Takes a const string& and returns an error message (empty if conversion/check is okay).
+    Option *check(std::function<std::string(const std::string &)> Validator,
+                  std::string Validator_description = "",
+                  std::string Validator_name = "");
+
+    /// Adds a transforming Validator with a built in type name
+    Option *transform(Validator Validator, const std::string &Validator_name = "");
+
+    /// Adds a Validator-like function that can change result
+    Option *transform(const std::function<std::string(std::string)> &func,
+                      std::string transform_description = "",
+                      std::string transform_name = "");
+
+    /// Adds a user supplied function to run on each item passed in (communicate though lambda capture)
+    Option *each(const std::function<void(std::string)> &func);
+
+    /// Get a named Validator
+    Validator *get_validator(const std::string &Validator_name = "");
+
+    /// Get a Validator by index NOTE: this may not be the order of definition
+    Validator *get_validator(int index);
+
+    /// Sets required options
+    Option *needs(Option *opt) {
+        if(opt != this) {
+            needs_.insert(opt);
+        }
+        return this;
+    }
+
+    /// Can find a string if needed
+    template <typename T = App> Option *needs(std::string opt_name) {
+        auto opt = static_cast<T *>(parent_)->get_option_no_throw(opt_name);
+        if(opt == nullptr) {
+            throw IncorrectConstruction::MissingOption(opt_name);
+        }
+        return needs(opt);
+    }
+
+    /// Any number supported, any mix of string and Opt
+    template <typename A, typename B, typename... ARG> Option *needs(A opt, B opt1, ARG... args) {
+        needs(opt);
+        return needs(opt1, args...);  // NOLINT(readability-suspicious-call-argument)
+    }
+
+    /// Remove needs link from an option. Returns true if the option really was in the needs list.
+    bool remove_needs(Option *opt);
+
+    /// Sets excluded options
+    Option *excludes(Option *opt);
+
+    /// Can find a string if needed
+    template <typename T = App> Option *excludes(std::string opt_name) {
+        auto opt = static_cast<T *>(parent_)->get_option_no_throw(opt_name);
+        if(opt == nullptr) {
+            throw IncorrectConstruction::MissingOption(opt_name);
+        }
+        return excludes(opt);
+    }
+
+    /// Any number supported, any mix of string and Opt
+    template <typename A, typename B, typename... ARG> Option *excludes(A opt, B opt1, ARG... args) {
+        excludes(opt);
+        return excludes(opt1, args...);
+    }
+
+    /// Remove needs link from an option. Returns true if the option really was in the needs list.
+    bool remove_excludes(Option *opt);
+
+    /// Sets environment variable to read if no option given
+    Option *envname(std::string name) {
+        envname_ = std::move(name);
+        return this;
+    }
+
+    /// Ignore case
+    ///
+    /// The template hides the fact that we don't have the definition of App yet.
+    /// You are never expected to add an argument to the template here.
+    template <typename T = App> Option *ignore_case(bool value = true);
+
+    /// Ignore underscores in the option names
+    ///
+    /// The template hides the fact that we don't have the definition of App yet.
+    /// You are never expected to add an argument to the template here.
+    template <typename T = App> Option *ignore_underscore(bool value = true);
+
+    /// Take the last argument if given multiple times (or another policy)
+    Option *multi_option_policy(MultiOptionPolicy value = MultiOptionPolicy::Throw);
+
+    /// Disable flag overrides values, e.g. --flag=<value> is not allowed
+    Option *disable_flag_override(bool value = true) {
+        disable_flag_override_ = value;
+        return this;
+    }
+    ///@}
+    /// @name Accessors
+    ///@{
+
+    /// The number of arguments the option expects
+    CLI11_NODISCARD int get_type_size() const { return type_size_min_; }
+
+    /// The minimum number of arguments the option expects
+    CLI11_NODISCARD int get_type_size_min() const { return type_size_min_; }
+    /// The maximum number of arguments the option expects
+    CLI11_NODISCARD int get_type_size_max() const { return type_size_max_; }
+
+    /// Return the inject_separator flag
+    CLI11_NODISCARD bool get_inject_separator() const { return inject_separator_; }
+
+    /// The environment variable associated to this value
+    CLI11_NODISCARD std::string get_envname() const { return envname_; }
+
+    /// The set of options needed
+    CLI11_NODISCARD std::set<Option *> get_needs() const { return needs_; }
+
+    /// The set of options excluded
+    CLI11_NODISCARD std::set<Option *> get_excludes() const { return excludes_; }
+
+    /// The default value (for help printing)
+    CLI11_NODISCARD std::string get_default_str() const { return default_str_; }
+
+    /// Get the callback function
+    CLI11_NODISCARD callback_t get_callback() const { return callback_; }
+
+    /// Get the long names
+    CLI11_NODISCARD const std::vector<std::string> &get_lnames() const { return lnames_; }
+
+    /// Get the short names
+    CLI11_NODISCARD const std::vector<std::string> &get_snames() const { return snames_; }
+
+    /// Get the flag names with specified default values
+    CLI11_NODISCARD const std::vector<std::string> &get_fnames() const { return fnames_; }
+    /// Get a single name for the option, first of lname, pname, sname, envname
+    CLI11_NODISCARD const std::string &get_single_name() const {
+        if(!lnames_.empty()) {
+            return lnames_[0];
+        }
+        if(!pname_.empty()) {
+            return pname_;
+        }
+        if(!snames_.empty()) {
+            return snames_[0];
+        }
+        return envname_;
+    }
+    /// The number of times the option expects to be included
+    CLI11_NODISCARD int get_expected() const { return expected_min_; }
+
+    /// The number of times the option expects to be included
+    CLI11_NODISCARD int get_expected_min() const { return expected_min_; }
+    /// The max number of times the option expects to be included
+    CLI11_NODISCARD int get_expected_max() const { return expected_max_; }
+
+    /// The total min number of expected  string values to be used
+    CLI11_NODISCARD int get_items_expected_min() const { return type_size_min_ * expected_min_; }
+
+    /// Get the maximum number of items expected to be returned and used for the callback
+    CLI11_NODISCARD int get_items_expected_max() const {
+        int t = type_size_max_;
+        return detail::checked_multiply(t, expected_max_) ? t : detail::expected_max_vector_size;
+    }
+    /// The total min number of expected  string values to be used
+    CLI11_NODISCARD int get_items_expected() const { return get_items_expected_min(); }
+
+    /// True if the argument can be given directly
+    CLI11_NODISCARD bool get_positional() const { return pname_.length() > 0; }
+
+    /// True if option has at least one non-positional name
+    CLI11_NODISCARD bool nonpositional() const { return (snames_.size() + lnames_.size()) > 0; }
+
+    /// True if option has description
+    CLI11_NODISCARD bool has_description() const { return description_.length() > 0; }
+
+    /// Get the description
+    CLI11_NODISCARD const std::string &get_description() const { return description_; }
+
+    /// Set the description
+    Option *description(std::string option_description) {
+        description_ = std::move(option_description);
+        return this;
+    }
+
+    Option *option_text(std::string text) {
+        option_text_ = std::move(text);
+        return this;
+    }
+
+    CLI11_NODISCARD const std::string &get_option_text() const { return option_text_; }
+
+    ///@}
+    /// @name Help tools
+    ///@{
+
+    /// \brief Gets a comma separated list of names.
+    /// Will include / prefer the positional name if positional is true.
+    /// If all_options is false, pick just the most descriptive name to show.
+    /// Use `get_name(true)` to get the positional name (replaces `get_pname`)
+    CLI11_NODISCARD std::string get_name(bool positional = false,  ///< Show the positional name
+                                         bool all_options = false  ///< Show every option
+    ) const;
+
+    ///@}
+    /// @name Parser tools
+    ///@{
+
+    /// Process the callback
+    void run_callback();
+
+    /// If options share any of the same names, find it
+    CLI11_NODISCARD const std::string &matching_name(const Option &other) const;
+
+    /// If options share any of the same names, they are equal (not counting positional)
+    bool operator==(const Option &other) const { return !matching_name(other).empty(); }
+
+    /// Check a name. Requires "-" or "--" for short / long, supports positional name
+    CLI11_NODISCARD bool check_name(const std::string &name) const;
+
+    /// Requires "-" to be removed from string
+    CLI11_NODISCARD bool check_sname(std::string name) const {
+        return (detail::find_member(std::move(name), snames_, ignore_case_) >= 0);
+    }
+
+    /// Requires "--" to be removed from string
+    CLI11_NODISCARD bool check_lname(std::string name) const {
+        return (detail::find_member(std::move(name), lnames_, ignore_case_, ignore_underscore_) >= 0);
+    }
+
+    /// Requires "--" to be removed from string
+    CLI11_NODISCARD bool check_fname(std::string name) const {
+        if(fnames_.empty()) {
+            return false;
+        }
+        return (detail::find_member(std::move(name), fnames_, ignore_case_, ignore_underscore_) >= 0);
+    }
+
+    /// Get the value that goes for a flag, nominally gets the default value but allows for overrides if not
+    /// disabled
+    CLI11_NODISCARD std::string get_flag_value(const std::string &name, std::string input_value) const;
+
+    /// Puts a result at the end
+    Option *add_result(std::string s);
+
+    /// Puts a result at the end and get a count of the number of arguments actually added
+    Option *add_result(std::string s, int &results_added);
+
+    /// Puts a result at the end
+    Option *add_result(std::vector<std::string> s);
+
+    /// Get the current complete results set
+    CLI11_NODISCARD const results_t &results() const { return results_; }
+
+    /// Get a copy of the results
+    CLI11_NODISCARD results_t reduced_results() const;
+
+    /// Get the results as a specified type
+    template <typename T> void results(T &output) const {
+        bool retval = false;
+        if(current_option_state_ >= option_state::reduced || (results_.size() == 1 && validators_.empty())) {
+            const results_t &res = (proc_results_.empty()) ? results_ : proc_results_;
+            retval = detail::lexical_conversion<T, T>(res, output);
+        } else {
+            results_t res;
+            if(results_.empty()) {
+                if(!default_str_.empty()) {
+                    // _add_results takes an rvalue only
+                    _add_result(std::string(default_str_), res);
+                    _validate_results(res);
+                    results_t extra;
+                    _reduce_results(extra, res);
+                    if(!extra.empty()) {
+                        res = std::move(extra);
+                    }
+                } else {
+                    res.emplace_back();
+                }
+            } else {
+                res = reduced_results();
+            }
+            retval = detail::lexical_conversion<T, T>(res, output);
+        }
+        if(!retval) {
+            throw ConversionError(get_name(), results_);
+        }
+    }
+
+    /// Return the results as the specified type
+    template <typename T> CLI11_NODISCARD T as() const {
+        T output;
+        results(output);
+        return output;
+    }
+
+    /// See if the callback has been run already
+    CLI11_NODISCARD bool get_callback_run() const { return (current_option_state_ == option_state::callback_run); }
+
+    ///@}
+    /// @name Custom options
+    ///@{
+
+    /// Set the type function to run when displayed on this option
+    Option *type_name_fn(std::function<std::string()> typefun) {
+        type_name_ = std::move(typefun);
+        return this;
+    }
+
+    /// Set a custom option typestring
+    Option *type_name(std::string typeval) {
+        type_name_fn([typeval]() { return typeval; });
+        return this;
+    }
+
+    /// Set a custom option size
+    Option *type_size(int option_type_size);
+
+    /// Set a custom option type size range
+    Option *type_size(int option_type_size_min, int option_type_size_max);
+
+    /// Set the value of the separator injection flag
+    void inject_separator(bool value = true) { inject_separator_ = value; }
+
+    /// Set a capture function for the default. Mostly used by App.
+    Option *default_function(const std::function<std::string()> &func) {
+        default_function_ = func;
+        return this;
+    }
+
+    /// Capture the default value from the original value (if it can be captured)
+    Option *capture_default_str() {
+        if(default_function_) {
+            default_str_ = default_function_();
+        }
+        return this;
+    }
+
+    /// Set the default value string representation (does not change the contained value)
+    Option *default_str(std::string val) {
+        default_str_ = std::move(val);
+        return this;
+    }
+
+    /// Set the default value and validate the results and run the callback if appropriate to set the value into the
+    /// bound value only available for types that can be converted to a string
+    template <typename X> Option *default_val(const X &val) {
+        std::string val_str = detail::to_string(val);
+        auto old_option_state = current_option_state_;
+        results_t old_results{std::move(results_)};
+        results_.clear();
+        try {
+            add_result(val_str);
+            // if trigger_on_result_ is set the callback already ran
+            if(run_callback_for_default_ && !trigger_on_result_) {
+                run_callback();  // run callback sets the state, we need to reset it again
+                current_option_state_ = option_state::parsing;
+            } else {
+                _validate_results(results_);
+                current_option_state_ = old_option_state;
+            }
+        } catch(const CLI::Error &) {
+            // this should be done
+            results_ = std::move(old_results);
+            current_option_state_ = old_option_state;
+            throw;
+        }
+        results_ = std::move(old_results);
+        default_str_ = std::move(val_str);
+        return this;
+    }
+
+    /// Get the full typename for this option
+    CLI11_NODISCARD std::string get_type_name() const;
+
+  private:
+    /// Run the results through the Validators
+    void _validate_results(results_t &res) const;
+
+    /** reduce the results in accordance with the MultiOptionPolicy
+    @param[out] out results are assigned to res if there if they are different
+    */
+    void _reduce_results(results_t &out, const results_t &original) const;
+
+    // Run a result through the Validators
+    std::string _validate(std::string &result, int index) const;
+
+    /// Add a single result to the result set, taking into account delimiters
+    int _add_result(std::string &&result, std::vector<std::string> &res) const;
+};
+
+// [CLI11:option_hpp:end]
+}  // namespace CLI
+
+#ifndef CLI11_COMPILE
+#include "impl/Option_inl.hpp"
+#endif
diff --git a/contrib/CLI11/include/CLI/Split.hpp b/contrib/CLI11/include/CLI/Split.hpp
new file mode 100644
index 000000000..d00e7f8cb
--- /dev/null
+++ b/contrib/CLI11/include/CLI/Split.hpp
@@ -0,0 +1,48 @@
+// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+// [CLI11:public_includes:set]
+#include <string>
+#include <tuple>
+#include <utility>
+#include <vector>
+// [CLI11:public_includes:end]
+
+#include "Macros.hpp"
+
+namespace CLI {
+// [CLI11:split_hpp:verbatim]
+
+namespace detail {
+
+// Returns false if not a short option. Otherwise, sets opt name and rest and returns true
+CLI11_INLINE bool split_short(const std::string &current, std::string &name, std::string &rest);
+
+// Returns false if not a long option. Otherwise, sets opt name and other side of = and returns true
+CLI11_INLINE bool split_long(const std::string &current, std::string &name, std::string &value);
+
+// Returns false if not a windows style option. Otherwise, sets opt name and value and returns true
+CLI11_INLINE bool split_windows_style(const std::string &current, std::string &name, std::string &value);
+
+// Splits a string into multiple long and short names
+CLI11_INLINE std::vector<std::string> split_names(std::string current);
+
+/// extract default flag values either {def} or starting with a !
+CLI11_INLINE std::vector<std::pair<std::string, std::string>> get_default_flag_values(const std::string &str);
+
+/// Get a vector of short names, one of long names, and a single name
+CLI11_INLINE std::tuple<std::vector<std::string>, std::vector<std::string>, std::string>
+get_names(const std::vector<std::string> &input);
+
+}  // namespace detail
+// [CLI11:split_hpp:end]
+}  // namespace CLI
+
+#ifndef CLI11_COMPILE
+#include "impl/Split_inl.hpp"
+#endif
diff --git a/contrib/CLI11/include/CLI/StringTools.hpp b/contrib/CLI11/include/CLI/StringTools.hpp
new file mode 100644
index 000000000..2a31005c8
--- /dev/null
+++ b/contrib/CLI11/include/CLI/StringTools.hpp
@@ -0,0 +1,234 @@
+// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+// [CLI11:public_includes:set]
+#include <algorithm>
+#include <iomanip>
+#include <locale>
+#include <sstream>
+#include <stdexcept>
+#include <string>
+#include <type_traits>
+#include <vector>
+// [CLI11:public_includes:end]
+
+#include "Macros.hpp"
+
+namespace CLI {
+
+// [CLI11:string_tools_hpp:verbatim]
+
+/// Include the items in this namespace to get free conversion of enums to/from streams.
+/// (This is available inside CLI as well, so CLI11 will use this without a using statement).
+namespace enums {
+
+/// output streaming for enumerations
+template <typename T, typename = typename std::enable_if<std::is_enum<T>::value>::type>
+std::ostream &operator<<(std::ostream &in, const T &item) {
+    // make sure this is out of the detail namespace otherwise it won't be found when needed
+    return in << static_cast<typename std::underlying_type<T>::type>(item);
+}
+
+}  // namespace enums
+
+/// Export to CLI namespace
+using enums::operator<<;
+
+namespace detail {
+/// a constant defining an expected max vector size defined to be a big number that could be multiplied by 4 and not
+/// produce overflow for some expected uses
+constexpr int expected_max_vector_size{1 << 29};
+// Based on http://stackoverflow.com/questions/236129/split-a-string-in-c
+/// Split a string by a delim
+CLI11_INLINE std::vector<std::string> split(const std::string &s, char delim);
+
+/// Simple function to join a string
+template <typename T> std::string join(const T &v, std::string delim = ",") {
+    std::ostringstream s;
+    auto beg = std::begin(v);
+    auto end = std::end(v);
+    if(beg != end)
+        s << *beg++;
+    while(beg != end) {
+        s << delim << *beg++;
+    }
+    return s.str();
+}
+
+/// Simple function to join a string from processed elements
+template <typename T,
+          typename Callable,
+          typename = typename std::enable_if<!std::is_constructible<std::string, Callable>::value>::type>
+std::string join(const T &v, Callable func, std::string delim = ",") {
+    std::ostringstream s;
+    auto beg = std::begin(v);
+    auto end = std::end(v);
+    auto loc = s.tellp();
+    while(beg != end) {
+        auto nloc = s.tellp();
+        if(nloc > loc) {
+            s << delim;
+            loc = nloc;
+        }
+        s << func(*beg++);
+    }
+    return s.str();
+}
+
+/// Join a string in reverse order
+template <typename T> std::string rjoin(const T &v, std::string delim = ",") {
+    std::ostringstream s;
+    for(std::size_t start = 0; start < v.size(); start++) {
+        if(start > 0)
+            s << delim;
+        s << v[v.size() - start - 1];
+    }
+    return s.str();
+}
+
+// Based roughly on http://stackoverflow.com/questions/25829143/c-trim-whitespace-from-a-string
+
+/// Trim whitespace from left of string
+CLI11_INLINE std::string &ltrim(std::string &str);
+
+/// Trim anything from left of string
+CLI11_INLINE std::string &ltrim(std::string &str, const std::string &filter);
+
+/// Trim whitespace from right of string
+CLI11_INLINE std::string &rtrim(std::string &str);
+
+/// Trim anything from right of string
+CLI11_INLINE std::string &rtrim(std::string &str, const std::string &filter);
+
+/// Trim whitespace from string
+inline std::string &trim(std::string &str) { return ltrim(rtrim(str)); }
+
+/// Trim anything from string
+inline std::string &trim(std::string &str, const std::string filter) { return ltrim(rtrim(str, filter), filter); }
+
+/// Make a copy of the string and then trim it
+inline std::string trim_copy(const std::string &str) {
+    std::string s = str;
+    return trim(s);
+}
+
+/// remove quotes at the front and back of a string either '"' or '\''
+CLI11_INLINE std::string &remove_quotes(std::string &str);
+
+/// Add a leader to the beginning of all new lines (nothing is added
+/// at the start of the first line). `"; "` would be for ini files
+///
+/// Can't use Regex, or this would be a subs.
+CLI11_INLINE std::string fix_newlines(const std::string &leader, std::string input);
+
+/// Make a copy of the string and then trim it, any filter string can be used (any char in string is filtered)
+inline std::string trim_copy(const std::string &str, const std::string &filter) {
+    std::string s = str;
+    return trim(s, filter);
+}
+/// Print a two part "help" string
+CLI11_INLINE std::ostream &
+format_help(std::ostream &out, std::string name, const std::string &description, std::size_t wid);
+
+/// Print subcommand aliases
+CLI11_INLINE std::ostream &format_aliases(std::ostream &out, const std::vector<std::string> &aliases, std::size_t wid);
+
+/// Verify the first character of an option
+/// - is a trigger character, ! has special meaning and new lines would just be annoying to deal with
+template <typename T> bool valid_first_char(T c) { return ((c != '-') && (c != '!') && (c != ' ') && c != '\n'); }
+
+/// Verify following characters of an option
+template <typename T> bool valid_later_char(T c) {
+    // = and : are value separators, { has special meaning for option defaults,
+    // and \n would just be annoying to deal with in many places allowing space here has too much potential for
+    // inadvertent entry errors and bugs
+    return ((c != '=') && (c != ':') && (c != '{') && (c != ' ') && c != '\n');
+}
+
+/// Verify an option/subcommand name
+CLI11_INLINE bool valid_name_string(const std::string &str);
+
+/// Verify an app name
+inline bool valid_alias_name_string(const std::string &str) {
+    static const std::string badChars(std::string("\n") + '\0');
+    return (str.find_first_of(badChars) == std::string::npos);
+}
+
+/// check if a string is a container segment separator (empty or "%%")
+inline bool is_separator(const std::string &str) {
+    static const std::string sep("%%");
+    return (str.empty() || str == sep);
+}
+
+/// Verify that str consists of letters only
+inline bool isalpha(const std::string &str) {
+    return std::all_of(str.begin(), str.end(), [](char c) { return std::isalpha(c, std::locale()); });
+}
+
+/// Return a lower case version of a string
+inline std::string to_lower(std::string str) {
+    std::transform(std::begin(str), std::end(str), std::begin(str), [](const std::string::value_type &x) {
+        return std::tolower(x, std::locale());
+    });
+    return str;
+}
+
+/// remove underscores from a string
+inline std::string remove_underscore(std::string str) {
+    str.erase(std::remove(std::begin(str), std::end(str), '_'), std::end(str));
+    return str;
+}
+
+/// Find and replace a substring with another substring
+CLI11_INLINE std::string find_and_replace(std::string str, std::string from, std::string to);
+
+/// check if the flag definitions has possible false flags
+inline bool has_default_flag_values(const std::string &flags) {
+    return (flags.find_first_of("{!") != std::string::npos);
+}
+
+CLI11_INLINE void remove_default_flag_values(std::string &flags);
+
+/// Check if a string is a member of a list of strings and optionally ignore case or ignore underscores
+CLI11_INLINE std::ptrdiff_t find_member(std::string name,
+                                        const std::vector<std::string> names,
+                                        bool ignore_case = false,
+                                        bool ignore_underscore = false);
+
+/// Find a trigger string and call a modify callable function that takes the current string and starting position of the
+/// trigger and returns the position in the string to search for the next trigger string
+template <typename Callable> inline std::string find_and_modify(std::string str, std::string trigger, Callable modify) {
+    std::size_t start_pos = 0;
+    while((start_pos = str.find(trigger, start_pos)) != std::string::npos) {
+        start_pos = modify(str, start_pos);
+    }
+    return str;
+}
+
+/// Split a string '"one two" "three"' into 'one two', 'three'
+/// Quote characters can be ` ' or "
+CLI11_INLINE std::vector<std::string> split_up(std::string str, char delimiter = '\0');
+
+/// This function detects an equal or colon followed by an escaped quote after an argument
+/// then modifies the string to replace the equality with a space.  This is needed
+/// to allow the split up function to work properly and is intended to be used with the find_and_modify function
+/// the return value is the offset+1 which is required by the find_and_modify function.
+CLI11_INLINE std::size_t escape_detect(std::string &str, std::size_t offset);
+
+/// Add quotes if the string contains spaces
+CLI11_INLINE std::string &add_quotes_if_needed(std::string &str);
+
+}  // namespace detail
+
+// [CLI11:string_tools_hpp:end]
+
+}  // namespace CLI
+
+#ifndef CLI11_COMPILE
+#include "impl/StringTools_inl.hpp"
+#endif
diff --git a/contrib/CLI11/include/CLI/Timer.hpp b/contrib/CLI11/include/CLI/Timer.hpp
new file mode 100644
index 000000000..b185d3302
--- /dev/null
+++ b/contrib/CLI11/include/CLI/Timer.hpp
@@ -0,0 +1,135 @@
+// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+// On GCC < 4.8, the following define is often missing. Due to the
+// fact that this library only uses sleep_for, this should be safe
+#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 5 && __GNUC_MINOR__ < 8
+#define _GLIBCXX_USE_NANOSLEEP
+#endif
+
+#include <cmath>
+
+#include <array>
+#include <chrono>
+#include <functional>
+#include <iostream>
+#include <string>
+#include <utility>
+
+namespace CLI {
+
+/// This is a simple timer with pretty printing. Creating the timer starts counting.
+class Timer {
+  protected:
+    /// This is a typedef to make clocks easier to use
+    using clock = std::chrono::steady_clock;
+
+    /// This typedef is for points in time
+    using time_point = std::chrono::time_point<clock>;
+
+    /// This is the type of a printing function, you can make your own
+    using time_print_t = std::function<std::string(std::string, std::string)>;
+
+    /// This is the title of the timer
+    std::string title_;
+
+    /// This is the function that is used to format most of the timing message
+    time_print_t time_print_;
+
+    /// This is the starting point (when the timer was created)
+    time_point start_;
+
+    /// This is the number of times cycles (print divides by this number)
+    std::size_t cycles{1};
+
+  public:
+    /// Standard print function, this one is set by default
+    static std::string Simple(std::string title, std::string time) { return title + ": " + time; }
+
+    /// This is a fancy print function with --- headers
+    static std::string Big(std::string title, std::string time) {
+        return std::string("-----------------------------------------\n") + "| " + title + " | Time = " + time + "\n" +
+               "-----------------------------------------";
+    }
+
+  public:
+    /// Standard constructor, can set title and print function
+    explicit Timer(std::string title = "Timer", time_print_t time_print = Simple)
+        : title_(std::move(title)), time_print_(std::move(time_print)), start_(clock::now()) {}
+
+    /// Time a function by running it multiple times. Target time is the len to target.
+    std::string time_it(std::function<void()> f, double target_time = 1) {
+        time_point start = start_;
+        double total_time = NAN;
+
+        start_ = clock::now();
+        std::size_t n = 0;
+        do {
+            f();
+            std::chrono::duration<double> elapsed = clock::now() - start_;
+            total_time = elapsed.count();
+        } while(n++ < 100u && total_time < target_time);
+
+        std::string out = make_time_str(total_time / static_cast<double>(n)) + " for " + std::to_string(n) + " tries";
+        start_ = start;
+        return out;
+    }
+
+    /// This formats the numerical value for the time string
+    std::string make_time_str() const {  // NOLINT(modernize-use-nodiscard)
+        time_point stop = clock::now();
+        std::chrono::duration<double> elapsed = stop - start_;
+        double time = elapsed.count() / static_cast<double>(cycles);
+        return make_time_str(time);
+    }
+
+    // LCOV_EXCL_START
+    /// This prints out a time string from a time
+    std::string make_time_str(double time) const {  // NOLINT(modernize-use-nodiscard)
+        auto print_it = [](double x, std::string unit) {
+            const unsigned int buffer_length = 50;
+            std::array<char, buffer_length> buffer;
+            std::snprintf(buffer.data(), buffer_length, "%.5g", x);
+            return buffer.data() + std::string(" ") + unit;
+        };
+
+        if(time < .000001)
+            return print_it(time * 1000000000, "ns");
+        if(time < .001)
+            return print_it(time * 1000000, "us");
+        if(time < 1)
+            return print_it(time * 1000, "ms");
+        return print_it(time, "s");
+    }
+    // LCOV_EXCL_STOP
+
+    /// This is the main function, it creates a string
+    std::string to_string() const { return time_print_(title_, make_time_str()); }  // NOLINT(modernize-use-nodiscard)
+
+    /// Division sets the number of cycles to divide by (no graphical change)
+    Timer &operator/(std::size_t val) {
+        cycles = val;
+        return *this;
+    }
+};
+
+/// This class prints out the time upon destruction
+class AutoTimer : public Timer {
+  public:
+    /// Reimplementing the constructor is required in GCC 4.7
+    explicit AutoTimer(std::string title = "Timer", time_print_t time_print = Simple) : Timer(title, time_print) {}
+    // GCC 4.7 does not support using inheriting constructors.
+
+    /// This destructor prints the string
+    ~AutoTimer() { std::cout << to_string() << std::endl; }
+};
+
+}  // namespace CLI
+
+/// This prints out the time if shifted into a std::cout like stream.
+inline std::ostream &operator<<(std::ostream &in, const CLI::Timer &timer) { return in << timer.to_string(); }
diff --git a/contrib/CLI11/include/CLI/TypeTools.hpp b/contrib/CLI11/include/CLI/TypeTools.hpp
new file mode 100644
index 000000000..1555b2994
--- /dev/null
+++ b/contrib/CLI11/include/CLI/TypeTools.hpp
@@ -0,0 +1,1588 @@
+// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+// [CLI11:public_includes:set]
+#include <cmath>
+#include <cstdint>
+#include <exception>
+#include <limits>
+#include <memory>
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <vector>
+// [CLI11:public_includes:end]
+
+#include "StringTools.hpp"
+
+namespace CLI {
+// [CLI11:type_tools_hpp:verbatim]
+
+// Type tools
+
+// Utilities for type enabling
+namespace detail {
+// Based generally on https://rmf.io/cxx11/almost-static-if
+/// Simple empty scoped class
+enum class enabler {};
+
+/// An instance to use in EnableIf
+constexpr enabler dummy = {};
+}  // namespace detail
+
+/// A copy of enable_if_t from C++14, compatible with C++11.
+///
+/// We could check to see if C++14 is being used, but it does not hurt to redefine this
+/// (even Google does this: https://github.com/google/skia/blob/main/include/private/SkTLogic.h)
+/// It is not in the std namespace anyway, so no harm done.
+template <bool B, class T = void> using enable_if_t = typename std::enable_if<B, T>::type;
+
+/// A copy of std::void_t from C++17 (helper for C++11 and C++14)
+template <typename... Ts> struct make_void {
+    using type = void;
+};
+
+/// A copy of std::void_t from C++17 - same reasoning as enable_if_t, it does not hurt to redefine
+template <typename... Ts> using void_t = typename make_void<Ts...>::type;
+
+/// A copy of std::conditional_t from C++14 - same reasoning as enable_if_t, it does not hurt to redefine
+template <bool B, class T, class F> using conditional_t = typename std::conditional<B, T, F>::type;
+
+/// Check to see if something is bool (fail check by default)
+template <typename T> struct is_bool : std::false_type {};
+
+/// Check to see if something is bool (true if actually a bool)
+template <> struct is_bool<bool> : std::true_type {};
+
+/// Check to see if something is a shared pointer
+template <typename T> struct is_shared_ptr : std::false_type {};
+
+/// Check to see if something is a shared pointer (True if really a shared pointer)
+template <typename T> struct is_shared_ptr<std::shared_ptr<T>> : std::true_type {};
+
+/// Check to see if something is a shared pointer (True if really a shared pointer)
+template <typename T> struct is_shared_ptr<const std::shared_ptr<T>> : std::true_type {};
+
+/// Check to see if something is copyable pointer
+template <typename T> struct is_copyable_ptr {
+    static bool const value = is_shared_ptr<T>::value || std::is_pointer<T>::value;
+};
+
+/// This can be specialized to override the type deduction for IsMember.
+template <typename T> struct IsMemberType {
+    using type = T;
+};
+
+/// The main custom type needed here is const char * should be a string.
+template <> struct IsMemberType<const char *> {
+    using type = std::string;
+};
+
+namespace detail {
+
+// These are utilities for IsMember and other transforming objects
+
+/// Handy helper to access the element_type generically. This is not part of is_copyable_ptr because it requires that
+/// pointer_traits<T> be valid.
+
+/// not a pointer
+template <typename T, typename Enable = void> struct element_type {
+    using type = T;
+};
+
+template <typename T> struct element_type<T, typename std::enable_if<is_copyable_ptr<T>::value>::type> {
+    using type = typename std::pointer_traits<T>::element_type;
+};
+
+/// Combination of the element type and value type - remove pointer (including smart pointers) and get the value_type of
+/// the container
+template <typename T> struct element_value_type {
+    using type = typename element_type<T>::type::value_type;
+};
+
+/// Adaptor for set-like structure: This just wraps a normal container in a few utilities that do almost nothing.
+template <typename T, typename _ = void> struct pair_adaptor : std::false_type {
+    using value_type = typename T::value_type;
+    using first_type = typename std::remove_const<value_type>::type;
+    using second_type = typename std::remove_const<value_type>::type;
+
+    /// Get the first value (really just the underlying value)
+    template <typename Q> static auto first(Q &&pair_value) -> decltype(std::forward<Q>(pair_value)) {
+        return std::forward<Q>(pair_value);
+    }
+    /// Get the second value (really just the underlying value)
+    template <typename Q> static auto second(Q &&pair_value) -> decltype(std::forward<Q>(pair_value)) {
+        return std::forward<Q>(pair_value);
+    }
+};
+
+/// Adaptor for map-like structure (true version, must have key_type and mapped_type).
+/// This wraps a mapped container in a few utilities access it in a general way.
+template <typename T>
+struct pair_adaptor<
+    T,
+    conditional_t<false, void_t<typename T::value_type::first_type, typename T::value_type::second_type>, void>>
+    : std::true_type {
+    using value_type = typename T::value_type;
+    using first_type = typename std::remove_const<typename value_type::first_type>::type;
+    using second_type = typename std::remove_const<typename value_type::second_type>::type;
+
+    /// Get the first value (really just the underlying value)
+    template <typename Q> static auto first(Q &&pair_value) -> decltype(std::get<0>(std::forward<Q>(pair_value))) {
+        return std::get<0>(std::forward<Q>(pair_value));
+    }
+    /// Get the second value (really just the underlying value)
+    template <typename Q> static auto second(Q &&pair_value) -> decltype(std::get<1>(std::forward<Q>(pair_value))) {
+        return std::get<1>(std::forward<Q>(pair_value));
+    }
+};
+
+// Warning is suppressed due to "bug" in gcc<5.0 and gcc 7.0 with c++17 enabled that generates a Wnarrowing warning
+// in the unevaluated context even if the function that was using this wasn't used.  The standard says narrowing in
+// brace initialization shouldn't be allowed but for backwards compatibility gcc allows it in some contexts.  It is a
+// little fuzzy what happens in template constructs and I think that was something GCC took a little while to work out.
+// But regardless some versions of gcc generate a warning when they shouldn't from the following code so that should be
+// suppressed
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wnarrowing"
+#endif
+// check for constructibility from a specific type and copy assignable used in the parse detection
+template <typename T, typename C> class is_direct_constructible {
+    template <typename TT, typename CC>
+    static auto test(int, std::true_type) -> decltype(
+// NVCC warns about narrowing conversions here
+#ifdef __CUDACC__
+#pragma diag_suppress 2361
+#endif
+        TT{std::declval<CC>()}
+#ifdef __CUDACC__
+#pragma diag_default 2361
+#endif
+        ,
+        std::is_move_assignable<TT>());
+
+    template <typename TT, typename CC> static auto test(int, std::false_type) -> std::false_type;
+
+    template <typename, typename> static auto test(...) -> std::false_type;
+
+  public:
+    static constexpr bool value = decltype(test<T, C>(0, typename std::is_constructible<T, C>::type()))::value;
+};
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
+// Check for output streamability
+// Based on https://stackoverflow.com/questions/22758291/how-can-i-detect-if-a-type-can-be-streamed-to-an-stdostream
+
+template <typename T, typename S = std::ostringstream> class is_ostreamable {
+    template <typename TT, typename SS>
+    static auto test(int) -> decltype(std::declval<SS &>() << std::declval<TT>(), std::true_type());
+
+    template <typename, typename> static auto test(...) -> std::false_type;
+
+  public:
+    static constexpr bool value = decltype(test<T, S>(0))::value;
+};
+
+/// Check for input streamability
+template <typename T, typename S = std::istringstream> class is_istreamable {
+    template <typename TT, typename SS>
+    static auto test(int) -> decltype(std::declval<SS &>() >> std::declval<TT &>(), std::true_type());
+
+    template <typename, typename> static auto test(...) -> std::false_type;
+
+  public:
+    static constexpr bool value = decltype(test<T, S>(0))::value;
+};
+
+/// Check for complex
+template <typename T> class is_complex {
+    template <typename TT>
+    static auto test(int) -> decltype(std::declval<TT>().real(), std::declval<TT>().imag(), std::true_type());
+
+    template <typename> static auto test(...) -> std::false_type;
+
+  public:
+    static constexpr bool value = decltype(test<T>(0))::value;
+};
+
+/// Templated operation to get a value from a stream
+template <typename T, enable_if_t<is_istreamable<T>::value, detail::enabler> = detail::dummy>
+bool from_stream(const std::string &istring, T &obj) {
+    std::istringstream is;
+    is.str(istring);
+    is >> obj;
+    return !is.fail() && !is.rdbuf()->in_avail();
+}
+
+template <typename T, enable_if_t<!is_istreamable<T>::value, detail::enabler> = detail::dummy>
+bool from_stream(const std::string & /*istring*/, T & /*obj*/) {
+    return false;
+}
+
+// check to see if an object is a mutable container (fail by default)
+template <typename T, typename _ = void> struct is_mutable_container : std::false_type {};
+
+/// type trait to test if a type is a mutable container meaning it has a value_type, it has an iterator, a clear, and
+/// end methods and an insert function.  And for our purposes we exclude std::string and types that can be constructed
+/// from a std::string
+template <typename T>
+struct is_mutable_container<
+    T,
+    conditional_t<false,
+                  void_t<typename T::value_type,
+                         decltype(std::declval<T>().end()),
+                         decltype(std::declval<T>().clear()),
+                         decltype(std::declval<T>().insert(std::declval<decltype(std::declval<T>().end())>(),
+                                                           std::declval<const typename T::value_type &>()))>,
+                  void>>
+    : public conditional_t<std::is_constructible<T, std::string>::value, std::false_type, std::true_type> {};
+
+// check to see if an object is a mutable container (fail by default)
+template <typename T, typename _ = void> struct is_readable_container : std::false_type {};
+
+/// type trait to test if a type is a container meaning it has a value_type, it has an iterator, a clear, and an end
+/// methods and an insert function.  And for our purposes we exclude std::string and types that can be constructed from
+/// a std::string
+template <typename T>
+struct is_readable_container<
+    T,
+    conditional_t<false, void_t<decltype(std::declval<T>().end()), decltype(std::declval<T>().begin())>, void>>
+    : public std::true_type {};
+
+// check to see if an object is a wrapper (fail by default)
+template <typename T, typename _ = void> struct is_wrapper : std::false_type {};
+
+// check if an object is a wrapper (it has a value_type defined)
+template <typename T>
+struct is_wrapper<T, conditional_t<false, void_t<typename T::value_type>, void>> : public std::true_type {};
+
+// Check for tuple like types, as in classes with a tuple_size type trait
+template <typename S> class is_tuple_like {
+    template <typename SS>
+    // static auto test(int)
+    //     -> decltype(std::conditional<(std::tuple_size<SS>::value > 0), std::true_type, std::false_type>::type());
+    static auto test(int) -> decltype(std::tuple_size<typename std::decay<SS>::type>::value, std::true_type{});
+    template <typename> static auto test(...) -> std::false_type;
+
+  public:
+    static constexpr bool value = decltype(test<S>(0))::value;
+};
+
+/// Convert an object to a string (directly forward if this can become a string)
+template <typename T, enable_if_t<std::is_convertible<T, std::string>::value, detail::enabler> = detail::dummy>
+auto to_string(T &&value) -> decltype(std::forward<T>(value)) {
+    return std::forward<T>(value);
+}
+
+/// Construct a string from the object
+template <typename T,
+          enable_if_t<std::is_constructible<std::string, T>::value && !std::is_convertible<T, std::string>::value,
+                      detail::enabler> = detail::dummy>
+std::string to_string(const T &value) {
+    return std::string(value);  // NOLINT(google-readability-casting)
+}
+
+/// Convert an object to a string (streaming must be supported for that type)
+template <typename T,
+          enable_if_t<!std::is_convertible<std::string, T>::value && !std::is_constructible<std::string, T>::value &&
+                          is_ostreamable<T>::value,
+                      detail::enabler> = detail::dummy>
+std::string to_string(T &&value) {
+    std::stringstream stream;
+    stream << value;
+    return stream.str();
+}
+
+/// If conversion is not supported, return an empty string (streaming is not supported for that type)
+template <typename T,
+          enable_if_t<!std::is_constructible<std::string, T>::value && !is_ostreamable<T>::value &&
+                          !is_readable_container<typename std::remove_const<T>::type>::value,
+                      detail::enabler> = detail::dummy>
+std::string to_string(T &&) {
+    return {};
+}
+
+/// convert a readable container to a string
+template <typename T,
+          enable_if_t<!std::is_constructible<std::string, T>::value && !is_ostreamable<T>::value &&
+                          is_readable_container<T>::value,
+                      detail::enabler> = detail::dummy>
+std::string to_string(T &&variable) {
+    auto cval = variable.begin();
+    auto end = variable.end();
+    if(cval == end) {
+        return {"{}"};
+    }
+    std::vector<std::string> defaults;
+    while(cval != end) {
+        defaults.emplace_back(CLI::detail::to_string(*cval));
+        ++cval;
+    }
+    return {"[" + detail::join(defaults) + "]"};
+}
+
+/// special template overload
+template <typename T1,
+          typename T2,
+          typename T,
+          enable_if_t<std::is_same<T1, T2>::value, detail::enabler> = detail::dummy>
+auto checked_to_string(T &&value) -> decltype(to_string(std::forward<T>(value))) {
+    return to_string(std::forward<T>(value));
+}
+
+/// special template overload
+template <typename T1,
+          typename T2,
+          typename T,
+          enable_if_t<!std::is_same<T1, T2>::value, detail::enabler> = detail::dummy>
+std::string checked_to_string(T &&) {
+    return std::string{};
+}
+/// get a string as a convertible value for arithmetic types
+template <typename T, enable_if_t<std::is_arithmetic<T>::value, detail::enabler> = detail::dummy>
+std::string value_string(const T &value) {
+    return std::to_string(value);
+}
+/// get a string as a convertible value for enumerations
+template <typename T, enable_if_t<std::is_enum<T>::value, detail::enabler> = detail::dummy>
+std::string value_string(const T &value) {
+    return std::to_string(static_cast<typename std::underlying_type<T>::type>(value));
+}
+/// for other types just use the regular to_string function
+template <typename T,
+          enable_if_t<!std::is_enum<T>::value && !std::is_arithmetic<T>::value, detail::enabler> = detail::dummy>
+auto value_string(const T &value) -> decltype(to_string(value)) {
+    return to_string(value);
+}
+
+/// template to get the underlying value type if it exists or use a default
+template <typename T, typename def, typename Enable = void> struct wrapped_type {
+    using type = def;
+};
+
+/// Type size for regular object types that do not look like a tuple
+template <typename T, typename def> struct wrapped_type<T, def, typename std::enable_if<is_wrapper<T>::value>::type> {
+    using type = typename T::value_type;
+};
+
+/// This will only trigger for actual void type
+template <typename T, typename Enable = void> struct type_count_base {
+    static const int value{0};
+};
+
+/// Type size for regular object types that do not look like a tuple
+template <typename T>
+struct type_count_base<T,
+                       typename std::enable_if<!is_tuple_like<T>::value && !is_mutable_container<T>::value &&
+                                               !std::is_void<T>::value>::type> {
+    static constexpr int value{1};
+};
+
+/// the base tuple size
+template <typename T>
+struct type_count_base<T, typename std::enable_if<is_tuple_like<T>::value && !is_mutable_container<T>::value>::type> {
+    static constexpr int value{std::tuple_size<T>::value};
+};
+
+/// Type count base for containers is the type_count_base of the individual element
+template <typename T> struct type_count_base<T, typename std::enable_if<is_mutable_container<T>::value>::type> {
+    static constexpr int value{type_count_base<typename T::value_type>::value};
+};
+
+/// Set of overloads to get the type size of an object
+
+/// forward declare the subtype_count structure
+template <typename T> struct subtype_count;
+
+/// forward declare the subtype_count_min structure
+template <typename T> struct subtype_count_min;
+
+/// This will only trigger for actual void type
+template <typename T, typename Enable = void> struct type_count {
+    static const int value{0};
+};
+
+/// Type size for regular object types that do not look like a tuple
+template <typename T>
+struct type_count<T,
+                  typename std::enable_if<!is_wrapper<T>::value && !is_tuple_like<T>::value && !is_complex<T>::value &&
+                                          !std::is_void<T>::value>::type> {
+    static constexpr int value{1};
+};
+
+/// Type size for complex since it sometimes looks like a wrapper
+template <typename T> struct type_count<T, typename std::enable_if<is_complex<T>::value>::type> {
+    static constexpr int value{2};
+};
+
+/// Type size of types that are wrappers,except complex and tuples(which can also be wrappers sometimes)
+template <typename T> struct type_count<T, typename std::enable_if<is_mutable_container<T>::value>::type> {
+    static constexpr int value{subtype_count<typename T::value_type>::value};
+};
+
+/// Type size of types that are wrappers,except containers complex and tuples(which can also be wrappers sometimes)
+template <typename T>
+struct type_count<T,
+                  typename std::enable_if<is_wrapper<T>::value && !is_complex<T>::value && !is_tuple_like<T>::value &&
+                                          !is_mutable_container<T>::value>::type> {
+    static constexpr int value{type_count<typename T::value_type>::value};
+};
+
+/// 0 if the index > tuple size
+template <typename T, std::size_t I>
+constexpr typename std::enable_if<I == type_count_base<T>::value, int>::type tuple_type_size() {
+    return 0;
+}
+
+/// Recursively generate the tuple type name
+template <typename T, std::size_t I>
+    constexpr typename std::enable_if < I<type_count_base<T>::value, int>::type tuple_type_size() {
+    return subtype_count<typename std::tuple_element<I, T>::type>::value + tuple_type_size<T, I + 1>();
+}
+
+/// Get the type size of the sum of type sizes for all the individual tuple types
+template <typename T> struct type_count<T, typename std::enable_if<is_tuple_like<T>::value>::type> {
+    static constexpr int value{tuple_type_size<T, 0>()};
+};
+
+/// definition of subtype count
+template <typename T> struct subtype_count {
+    static constexpr int value{is_mutable_container<T>::value ? expected_max_vector_size : type_count<T>::value};
+};
+
+/// This will only trigger for actual void type
+template <typename T, typename Enable = void> struct type_count_min {
+    static const int value{0};
+};
+
+/// Type size for regular object types that do not look like a tuple
+template <typename T>
+struct type_count_min<
+    T,
+    typename std::enable_if<!is_mutable_container<T>::value && !is_tuple_like<T>::value && !is_wrapper<T>::value &&
+                            !is_complex<T>::value && !std::is_void<T>::value>::type> {
+    static constexpr int value{type_count<T>::value};
+};
+
+/// Type size for complex since it sometimes looks like a wrapper
+template <typename T> struct type_count_min<T, typename std::enable_if<is_complex<T>::value>::type> {
+    static constexpr int value{1};
+};
+
+/// Type size min of types that are wrappers,except complex and tuples(which can also be wrappers sometimes)
+template <typename T>
+struct type_count_min<
+    T,
+    typename std::enable_if<is_wrapper<T>::value && !is_complex<T>::value && !is_tuple_like<T>::value>::type> {
+    static constexpr int value{subtype_count_min<typename T::value_type>::value};
+};
+
+/// 0 if the index > tuple size
+template <typename T, std::size_t I>
+constexpr typename std::enable_if<I == type_count_base<T>::value, int>::type tuple_type_size_min() {
+    return 0;
+}
+
+/// Recursively generate the tuple type name
+template <typename T, std::size_t I>
+    constexpr typename std::enable_if < I<type_count_base<T>::value, int>::type tuple_type_size_min() {
+    return subtype_count_min<typename std::tuple_element<I, T>::type>::value + tuple_type_size_min<T, I + 1>();
+}
+
+/// Get the type size of the sum of type sizes for all the individual tuple types
+template <typename T> struct type_count_min<T, typename std::enable_if<is_tuple_like<T>::value>::type> {
+    static constexpr int value{tuple_type_size_min<T, 0>()};
+};
+
+/// definition of subtype count
+template <typename T> struct subtype_count_min {
+    static constexpr int value{is_mutable_container<T>::value
+                                   ? ((type_count<T>::value < expected_max_vector_size) ? type_count<T>::value : 0)
+                                   : type_count_min<T>::value};
+};
+
+/// This will only trigger for actual void type
+template <typename T, typename Enable = void> struct expected_count {
+    static const int value{0};
+};
+
+/// For most types the number of expected items is 1
+template <typename T>
+struct expected_count<T,
+                      typename std::enable_if<!is_mutable_container<T>::value && !is_wrapper<T>::value &&
+                                              !std::is_void<T>::value>::type> {
+    static constexpr int value{1};
+};
+/// number of expected items in a vector
+template <typename T> struct expected_count<T, typename std::enable_if<is_mutable_container<T>::value>::type> {
+    static constexpr int value{expected_max_vector_size};
+};
+
+/// number of expected items in a vector
+template <typename T>
+struct expected_count<T, typename std::enable_if<!is_mutable_container<T>::value && is_wrapper<T>::value>::type> {
+    static constexpr int value{expected_count<typename T::value_type>::value};
+};
+
+// Enumeration of the different supported categorizations of objects
+enum class object_category : int {
+    char_value = 1,
+    integral_value = 2,
+    unsigned_integral = 4,
+    enumeration = 6,
+    boolean_value = 8,
+    floating_point = 10,
+    number_constructible = 12,
+    double_constructible = 14,
+    integer_constructible = 16,
+    // string like types
+    string_assignable = 23,
+    string_constructible = 24,
+    other = 45,
+    // special wrapper or container types
+    wrapper_value = 50,
+    complex_number = 60,
+    tuple_value = 70,
+    container_value = 80,
+
+};
+
+/// Set of overloads to classify an object according to type
+
+/// some type that is not otherwise recognized
+template <typename T, typename Enable = void> struct classify_object {
+    static constexpr object_category value{object_category::other};
+};
+
+/// Signed integers
+template <typename T>
+struct classify_object<
+    T,
+    typename std::enable_if<std::is_integral<T>::value && !std::is_same<T, char>::value && std::is_signed<T>::value &&
+                            !is_bool<T>::value && !std::is_enum<T>::value>::type> {
+    static constexpr object_category value{object_category::integral_value};
+};
+
+/// Unsigned integers
+template <typename T>
+struct classify_object<T,
+                       typename std::enable_if<std::is_integral<T>::value && std::is_unsigned<T>::value &&
+                                               !std::is_same<T, char>::value && !is_bool<T>::value>::type> {
+    static constexpr object_category value{object_category::unsigned_integral};
+};
+
+/// single character values
+template <typename T>
+struct classify_object<T, typename std::enable_if<std::is_same<T, char>::value && !std::is_enum<T>::value>::type> {
+    static constexpr object_category value{object_category::char_value};
+};
+
+/// Boolean values
+template <typename T> struct classify_object<T, typename std::enable_if<is_bool<T>::value>::type> {
+    static constexpr object_category value{object_category::boolean_value};
+};
+
+/// Floats
+template <typename T> struct classify_object<T, typename std::enable_if<std::is_floating_point<T>::value>::type> {
+    static constexpr object_category value{object_category::floating_point};
+};
+
+/// String and similar direct assignment
+template <typename T>
+struct classify_object<T,
+                       typename std::enable_if<!std::is_floating_point<T>::value && !std::is_integral<T>::value &&
+                                               std::is_assignable<T &, std::string>::value>::type> {
+    static constexpr object_category value{object_category::string_assignable};
+};
+
+/// String and similar constructible and copy assignment
+template <typename T>
+struct classify_object<
+    T,
+    typename std::enable_if<!std::is_floating_point<T>::value && !std::is_integral<T>::value &&
+                            !std::is_assignable<T &, std::string>::value && (type_count<T>::value == 1) &&
+                            std::is_constructible<T, std::string>::value>::type> {
+    static constexpr object_category value{object_category::string_constructible};
+};
+
+/// Enumerations
+template <typename T> struct classify_object<T, typename std::enable_if<std::is_enum<T>::value>::type> {
+    static constexpr object_category value{object_category::enumeration};
+};
+
+template <typename T> struct classify_object<T, typename std::enable_if<is_complex<T>::value>::type> {
+    static constexpr object_category value{object_category::complex_number};
+};
+
+/// Handy helper to contain a bunch of checks that rule out many common types (integers, string like, floating point,
+/// vectors, and enumerations
+template <typename T> struct uncommon_type {
+    using type = typename std::conditional<!std::is_floating_point<T>::value && !std::is_integral<T>::value &&
+                                               !std::is_assignable<T &, std::string>::value &&
+                                               !std::is_constructible<T, std::string>::value && !is_complex<T>::value &&
+                                               !is_mutable_container<T>::value && !std::is_enum<T>::value,
+                                           std::true_type,
+                                           std::false_type>::type;
+    static constexpr bool value = type::value;
+};
+
+/// wrapper type
+template <typename T>
+struct classify_object<T,
+                       typename std::enable_if<(!is_mutable_container<T>::value && is_wrapper<T>::value &&
+                                                !is_tuple_like<T>::value && uncommon_type<T>::value)>::type> {
+    static constexpr object_category value{object_category::wrapper_value};
+};
+
+/// Assignable from double or int
+template <typename T>
+struct classify_object<T,
+                       typename std::enable_if<uncommon_type<T>::value && type_count<T>::value == 1 &&
+                                               !is_wrapper<T>::value && is_direct_constructible<T, double>::value &&
+                                               is_direct_constructible<T, int>::value>::type> {
+    static constexpr object_category value{object_category::number_constructible};
+};
+
+/// Assignable from int
+template <typename T>
+struct classify_object<T,
+                       typename std::enable_if<uncommon_type<T>::value && type_count<T>::value == 1 &&
+                                               !is_wrapper<T>::value && !is_direct_constructible<T, double>::value &&
+                                               is_direct_constructible<T, int>::value>::type> {
+    static constexpr object_category value{object_category::integer_constructible};
+};
+
+/// Assignable from double
+template <typename T>
+struct classify_object<T,
+                       typename std::enable_if<uncommon_type<T>::value && type_count<T>::value == 1 &&
+                                               !is_wrapper<T>::value && is_direct_constructible<T, double>::value &&
+                                               !is_direct_constructible<T, int>::value>::type> {
+    static constexpr object_category value{object_category::double_constructible};
+};
+
+/// Tuple type
+template <typename T>
+struct classify_object<
+    T,
+    typename std::enable_if<is_tuple_like<T>::value &&
+                            ((type_count<T>::value >= 2 && !is_wrapper<T>::value) ||
+                             (uncommon_type<T>::value && !is_direct_constructible<T, double>::value &&
+                              !is_direct_constructible<T, int>::value) ||
+                             (uncommon_type<T>::value && type_count<T>::value >= 2))>::type> {
+    static constexpr object_category value{object_category::tuple_value};
+    // the condition on this class requires it be like a tuple, but on some compilers (like Xcode) tuples can be
+    // constructed from just the first element so tuples of <string, int,int> can be constructed from a string, which
+    // could lead to issues so there are two variants of the condition, the first isolates things with a type size >=2
+    // mainly to get tuples on Xcode with the exception of wrappers, the second is the main one and just separating out
+    // those cases that are caught by other object classifications
+};
+
+/// container type
+template <typename T> struct classify_object<T, typename std::enable_if<is_mutable_container<T>::value>::type> {
+    static constexpr object_category value{object_category::container_value};
+};
+
+// Type name print
+
+/// Was going to be based on
+///  http://stackoverflow.com/questions/1055452/c-get-name-of-type-in-template
+/// But this is cleaner and works better in this case
+
+template <typename T,
+          enable_if_t<classify_object<T>::value == object_category::char_value, detail::enabler> = detail::dummy>
+constexpr const char *type_name() {
+    return "CHAR";
+}
+
+template <typename T,
+          enable_if_t<classify_object<T>::value == object_category::integral_value ||
+                          classify_object<T>::value == object_category::integer_constructible,
+                      detail::enabler> = detail::dummy>
+constexpr const char *type_name() {
+    return "INT";
+}
+
+template <typename T,
+          enable_if_t<classify_object<T>::value == object_category::unsigned_integral, detail::enabler> = detail::dummy>
+constexpr const char *type_name() {
+    return "UINT";
+}
+
+template <typename T,
+          enable_if_t<classify_object<T>::value == object_category::floating_point ||
+                          classify_object<T>::value == object_category::number_constructible ||
+                          classify_object<T>::value == object_category::double_constructible,
+                      detail::enabler> = detail::dummy>
+constexpr const char *type_name() {
+    return "FLOAT";
+}
+
+/// Print name for enumeration types
+template <typename T,
+          enable_if_t<classify_object<T>::value == object_category::enumeration, detail::enabler> = detail::dummy>
+constexpr const char *type_name() {
+    return "ENUM";
+}
+
+/// Print name for enumeration types
+template <typename T,
+          enable_if_t<classify_object<T>::value == object_category::boolean_value, detail::enabler> = detail::dummy>
+constexpr const char *type_name() {
+    return "BOOLEAN";
+}
+
+/// Print name for enumeration types
+template <typename T,
+          enable_if_t<classify_object<T>::value == object_category::complex_number, detail::enabler> = detail::dummy>
+constexpr const char *type_name() {
+    return "COMPLEX";
+}
+
+/// Print for all other types
+template <typename T,
+          enable_if_t<classify_object<T>::value >= object_category::string_assignable &&
+                          classify_object<T>::value <= object_category::other,
+                      detail::enabler> = detail::dummy>
+constexpr const char *type_name() {
+    return "TEXT";
+}
+/// typename for tuple value
+template <typename T,
+          enable_if_t<classify_object<T>::value == object_category::tuple_value && type_count_base<T>::value >= 2,
+                      detail::enabler> = detail::dummy>
+std::string type_name();  // forward declaration
+
+/// Generate type name for a wrapper or container value
+template <typename T,
+          enable_if_t<classify_object<T>::value == object_category::container_value ||
+                          classify_object<T>::value == object_category::wrapper_value,
+                      detail::enabler> = detail::dummy>
+std::string type_name();  // forward declaration
+
+/// Print name for single element tuple types
+template <typename T,
+          enable_if_t<classify_object<T>::value == object_category::tuple_value && type_count_base<T>::value == 1,
+                      detail::enabler> = detail::dummy>
+inline std::string type_name() {
+    return type_name<typename std::decay<typename std::tuple_element<0, T>::type>::type>();
+}
+
+/// Empty string if the index > tuple size
+template <typename T, std::size_t I>
+inline typename std::enable_if<I == type_count_base<T>::value, std::string>::type tuple_name() {
+    return std::string{};
+}
+
+/// Recursively generate the tuple type name
+template <typename T, std::size_t I>
+inline typename std::enable_if<(I < type_count_base<T>::value), std::string>::type tuple_name() {
+    auto str = std::string{type_name<typename std::decay<typename std::tuple_element<I, T>::type>::type>()} + ',' +
+               tuple_name<T, I + 1>();
+    if(str.back() == ',')
+        str.pop_back();
+    return str;
+}
+
+/// Print type name for tuples with 2 or more elements
+template <typename T,
+          enable_if_t<classify_object<T>::value == object_category::tuple_value && type_count_base<T>::value >= 2,
+                      detail::enabler>>
+inline std::string type_name() {
+    auto tname = std::string(1, '[') + tuple_name<T, 0>();
+    tname.push_back(']');
+    return tname;
+}
+
+/// get the type name for a type that has a value_type member
+template <typename T,
+          enable_if_t<classify_object<T>::value == object_category::container_value ||
+                          classify_object<T>::value == object_category::wrapper_value,
+                      detail::enabler>>
+inline std::string type_name() {
+    return type_name<typename T::value_type>();
+}
+
+// Lexical cast
+
+/// Convert to an unsigned integral
+template <typename T, enable_if_t<std::is_unsigned<T>::value, detail::enabler> = detail::dummy>
+bool integral_conversion(const std::string &input, T &output) noexcept {
+    if(input.empty() || input.front() == '-') {
+        return false;
+    }
+    char *val = nullptr;
+    errno = 0;
+    std::uint64_t output_ll = std::strtoull(input.c_str(), &val, 0);
+    if(errno == ERANGE) {
+        return false;
+    }
+    output = static_cast<T>(output_ll);
+    if(val == (input.c_str() + input.size()) && static_cast<std::uint64_t>(output) == output_ll) {
+        return true;
+    }
+    val = nullptr;
+    std::int64_t output_sll = std::strtoll(input.c_str(), &val, 0);
+    if(val == (input.c_str() + input.size())) {
+        output = (output_sll < 0) ? static_cast<T>(0) : static_cast<T>(output_sll);
+        return (static_cast<std::int64_t>(output) == output_sll);
+    }
+    return false;
+}
+
+/// Convert to a signed integral
+template <typename T, enable_if_t<std::is_signed<T>::value, detail::enabler> = detail::dummy>
+bool integral_conversion(const std::string &input, T &output) noexcept {
+    if(input.empty()) {
+        return false;
+    }
+    char *val = nullptr;
+    errno = 0;
+    std::int64_t output_ll = std::strtoll(input.c_str(), &val, 0);
+    if(errno == ERANGE) {
+        return false;
+    }
+    output = static_cast<T>(output_ll);
+    if(val == (input.c_str() + input.size()) && static_cast<std::int64_t>(output) == output_ll) {
+        return true;
+    }
+    if(input == "true") {
+        // this is to deal with a few oddities with flags and wrapper int types
+        output = static_cast<T>(1);
+        return true;
+    }
+    return false;
+}
+
+/// Convert a flag into an integer value  typically binary flags
+inline std::int64_t to_flag_value(std::string val) {
+    static const std::string trueString("true");
+    static const std::string falseString("false");
+    if(val == trueString) {
+        return 1;
+    }
+    if(val == falseString) {
+        return -1;
+    }
+    val = detail::to_lower(val);
+    std::int64_t ret = 0;
+    if(val.size() == 1) {
+        if(val[0] >= '1' && val[0] <= '9') {
+            return (static_cast<std::int64_t>(val[0]) - '0');
+        }
+        switch(val[0]) {
+        case '0':
+        case 'f':
+        case 'n':
+        case '-':
+            ret = -1;
+            break;
+        case 't':
+        case 'y':
+        case '+':
+            ret = 1;
+            break;
+        default:
+            throw std::invalid_argument("unrecognized character");
+        }
+        return ret;
+    }
+    if(val == trueString || val == "on" || val == "yes" || val == "enable") {
+        ret = 1;
+    } else if(val == falseString || val == "off" || val == "no" || val == "disable") {
+        ret = -1;
+    } else {
+        ret = std::stoll(val);
+    }
+    return ret;
+}
+
+/// Integer conversion
+template <typename T,
+          enable_if_t<classify_object<T>::value == object_category::integral_value ||
+                          classify_object<T>::value == object_category::unsigned_integral,
+                      detail::enabler> = detail::dummy>
+bool lexical_cast(const std::string &input, T &output) {
+    return integral_conversion(input, output);
+}
+
+/// char values
+template <typename T,
+          enable_if_t<classify_object<T>::value == object_category::char_value, detail::enabler> = detail::dummy>
+bool lexical_cast(const std::string &input, T &output) {
+    if(input.size() == 1) {
+        output = static_cast<T>(input[0]);
+        return true;
+    }
+    return integral_conversion(input, output);
+}
+
+/// Boolean values
+template <typename T,
+          enable_if_t<classify_object<T>::value == object_category::boolean_value, detail::enabler> = detail::dummy>
+bool lexical_cast(const std::string &input, T &output) {
+    try {
+        auto out = to_flag_value(input);
+        output = (out > 0);
+        return true;
+    } catch(const std::invalid_argument &) {
+        return false;
+    } catch(const std::out_of_range &) {
+        // if the number is out of the range of a 64 bit value then it is still a number and for this purpose is still
+        // valid all we care about the sign
+        output = (input[0] != '-');
+        return true;
+    }
+}
+
+/// Floats
+template <typename T,
+          enable_if_t<classify_object<T>::value == object_category::floating_point, detail::enabler> = detail::dummy>
+bool lexical_cast(const std::string &input, T &output) {
+    if(input.empty()) {
+        return false;
+    }
+    char *val = nullptr;
+    auto output_ld = std::strtold(input.c_str(), &val);
+    output = static_cast<T>(output_ld);
+    return val == (input.c_str() + input.size());
+}
+
+/// complex
+template <typename T,
+          enable_if_t<classify_object<T>::value == object_category::complex_number, detail::enabler> = detail::dummy>
+bool lexical_cast(const std::string &input, T &output) {
+    using XC = typename wrapped_type<T, double>::type;
+    XC x{0.0}, y{0.0};
+    auto str1 = input;
+    bool worked = false;
+    auto nloc = str1.find_last_of("+-");
+    if(nloc != std::string::npos && nloc > 0) {
+        worked = lexical_cast(str1.substr(0, nloc), x);
+        str1 = str1.substr(nloc);
+        if(str1.back() == 'i' || str1.back() == 'j')
+            str1.pop_back();
+        worked = worked && lexical_cast(str1, y);
+    } else {
+        if(str1.back() == 'i' || str1.back() == 'j') {
+            str1.pop_back();
+            worked = lexical_cast(str1, y);
+            x = XC{0};
+        } else {
+            worked = lexical_cast(str1, x);
+            y = XC{0};
+        }
+    }
+    if(worked) {
+        output = T{x, y};
+        return worked;
+    }
+    return from_stream(input, output);
+}
+
+/// String and similar direct assignment
+template <typename T,
+          enable_if_t<classify_object<T>::value == object_category::string_assignable, detail::enabler> = detail::dummy>
+bool lexical_cast(const std::string &input, T &output) {
+    output = input;
+    return true;
+}
+
+/// String and similar constructible and copy assignment
+template <
+    typename T,
+    enable_if_t<classify_object<T>::value == object_category::string_constructible, detail::enabler> = detail::dummy>
+bool lexical_cast(const std::string &input, T &output) {
+    output = T(input);
+    return true;
+}
+
+/// Enumerations
+template <typename T,
+          enable_if_t<classify_object<T>::value == object_category::enumeration, detail::enabler> = detail::dummy>
+bool lexical_cast(const std::string &input, T &output) {
+    typename std::underlying_type<T>::type val;
+    if(!integral_conversion(input, val)) {
+        return false;
+    }
+    output = static_cast<T>(val);
+    return true;
+}
+
+/// wrapper types
+template <typename T,
+          enable_if_t<classify_object<T>::value == object_category::wrapper_value &&
+                          std::is_assignable<T &, typename T::value_type>::value,
+                      detail::enabler> = detail::dummy>
+bool lexical_cast(const std::string &input, T &output) {
+    typename T::value_type val;
+    if(lexical_cast(input, val)) {
+        output = val;
+        return true;
+    }
+    return from_stream(input, output);
+}
+
+template <typename T,
+          enable_if_t<classify_object<T>::value == object_category::wrapper_value &&
+                          !std::is_assignable<T &, typename T::value_type>::value && std::is_assignable<T &, T>::value,
+                      detail::enabler> = detail::dummy>
+bool lexical_cast(const std::string &input, T &output) {
+    typename T::value_type val;
+    if(lexical_cast(input, val)) {
+        output = T{val};
+        return true;
+    }
+    return from_stream(input, output);
+}
+
+/// Assignable from double or int
+template <
+    typename T,
+    enable_if_t<classify_object<T>::value == object_category::number_constructible, detail::enabler> = detail::dummy>
+bool lexical_cast(const std::string &input, T &output) {
+    int val = 0;
+    if(integral_conversion(input, val)) {
+        output = T(val);
+        return true;
+    }
+
+    double dval = 0.0;
+    if(lexical_cast(input, dval)) {
+        output = T{dval};
+        return true;
+    }
+
+    return from_stream(input, output);
+}
+
+/// Assignable from int
+template <
+    typename T,
+    enable_if_t<classify_object<T>::value == object_category::integer_constructible, detail::enabler> = detail::dummy>
+bool lexical_cast(const std::string &input, T &output) {
+    int val = 0;
+    if(integral_conversion(input, val)) {
+        output = T(val);
+        return true;
+    }
+    return from_stream(input, output);
+}
+
+/// Assignable from double
+template <
+    typename T,
+    enable_if_t<classify_object<T>::value == object_category::double_constructible, detail::enabler> = detail::dummy>
+bool lexical_cast(const std::string &input, T &output) {
+    double val = 0.0;
+    if(lexical_cast(input, val)) {
+        output = T{val};
+        return true;
+    }
+    return from_stream(input, output);
+}
+
+/// Non-string convertible from an int
+template <typename T,
+          enable_if_t<classify_object<T>::value == object_category::other && std::is_assignable<T &, int>::value,
+                      detail::enabler> = detail::dummy>
+bool lexical_cast(const std::string &input, T &output) {
+    int val = 0;
+    if(integral_conversion(input, val)) {
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4800)
+#endif
+        // with Atomic<XX> this could produce a warning due to the conversion but if atomic gets here it is an old style
+        // so will most likely still work
+        output = val;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+        return true;
+    }
+    // LCOV_EXCL_START
+    // This version of cast is only used for odd cases in an older compilers the fail over
+    // from_stream is tested elsewhere an not relevant for coverage here
+    return from_stream(input, output);
+    // LCOV_EXCL_STOP
+}
+
+/// Non-string parsable by a stream
+template <typename T,
+          enable_if_t<classify_object<T>::value == object_category::other && !std::is_assignable<T &, int>::value,
+                      detail::enabler> = detail::dummy>
+bool lexical_cast(const std::string &input, T &output) {
+    static_assert(is_istreamable<T>::value,
+                  "option object type must have a lexical cast overload or streaming input operator(>>) defined, if it "
+                  "is convertible from another type use the add_option<T, XC>(...) with XC being the known type");
+    return from_stream(input, output);
+}
+
+/// Assign a value through lexical cast operations
+/// Strings can be empty so we need to do a little different
+template <typename AssignTo,
+          typename ConvertTo,
+          enable_if_t<std::is_same<AssignTo, ConvertTo>::value &&
+                          (classify_object<AssignTo>::value == object_category::string_assignable ||
+                           classify_object<AssignTo>::value == object_category::string_constructible),
+                      detail::enabler> = detail::dummy>
+bool lexical_assign(const std::string &input, AssignTo &output) {
+    return lexical_cast(input, output);
+}
+
+/// Assign a value through lexical cast operations
+template <typename AssignTo,
+          typename ConvertTo,
+          enable_if_t<std::is_same<AssignTo, ConvertTo>::value && std::is_assignable<AssignTo &, AssignTo>::value &&
+                          classify_object<AssignTo>::value != object_category::string_assignable &&
+                          classify_object<AssignTo>::value != object_category::string_constructible,
+                      detail::enabler> = detail::dummy>
+bool lexical_assign(const std::string &input, AssignTo &output) {
+    if(input.empty()) {
+        output = AssignTo{};
+        return true;
+    }
+
+    return lexical_cast(input, output);
+}
+
+/// Assign a value through lexical cast operations
+template <typename AssignTo,
+          typename ConvertTo,
+          enable_if_t<std::is_same<AssignTo, ConvertTo>::value && !std::is_assignable<AssignTo &, AssignTo>::value &&
+                          classify_object<AssignTo>::value == object_category::wrapper_value,
+                      detail::enabler> = detail::dummy>
+bool lexical_assign(const std::string &input, AssignTo &output) {
+    if(input.empty()) {
+        typename AssignTo::value_type emptyVal{};
+        output = emptyVal;
+        return true;
+    }
+    return lexical_cast(input, output);
+}
+
+/// Assign a value through lexical cast operations for int compatible values
+/// mainly for atomic operations on some compilers
+template <typename AssignTo,
+          typename ConvertTo,
+          enable_if_t<std::is_same<AssignTo, ConvertTo>::value && !std::is_assignable<AssignTo &, AssignTo>::value &&
+                          classify_object<AssignTo>::value != object_category::wrapper_value &&
+                          std::is_assignable<AssignTo &, int>::value,
+                      detail::enabler> = detail::dummy>
+bool lexical_assign(const std::string &input, AssignTo &output) {
+    if(input.empty()) {
+        output = 0;
+        return true;
+    }
+    int val = 0;
+    if(lexical_cast(input, val)) {
+        output = val;
+        return true;
+    }
+    return false;
+}
+
+/// Assign a value converted from a string in lexical cast to the output value directly
+template <typename AssignTo,
+          typename ConvertTo,
+          enable_if_t<!std::is_same<AssignTo, ConvertTo>::value && std::is_assignable<AssignTo &, ConvertTo &>::value,
+                      detail::enabler> = detail::dummy>
+bool lexical_assign(const std::string &input, AssignTo &output) {
+    ConvertTo val{};
+    bool parse_result = (!input.empty()) ? lexical_cast(input, val) : true;
+    if(parse_result) {
+        output = val;
+    }
+    return parse_result;
+}
+
+/// Assign a value from a lexical cast through constructing a value and move assigning it
+template <
+    typename AssignTo,
+    typename ConvertTo,
+    enable_if_t<!std::is_same<AssignTo, ConvertTo>::value && !std::is_assignable<AssignTo &, ConvertTo &>::value &&
+                    std::is_move_assignable<AssignTo>::value,
+                detail::enabler> = detail::dummy>
+bool lexical_assign(const std::string &input, AssignTo &output) {
+    ConvertTo val{};
+    bool parse_result = input.empty() ? true : lexical_cast(input, val);
+    if(parse_result) {
+        output = AssignTo(val);  // use () form of constructor to allow some implicit conversions
+    }
+    return parse_result;
+}
+
+/// primary lexical conversion operation, 1 string to 1 type of some kind
+template <typename AssignTo,
+          typename ConvertTo,
+          enable_if_t<classify_object<ConvertTo>::value <= object_category::other &&
+                          classify_object<AssignTo>::value <= object_category::wrapper_value,
+                      detail::enabler> = detail::dummy>
+bool lexical_conversion(const std::vector<std ::string> &strings, AssignTo &output) {
+    return lexical_assign<AssignTo, ConvertTo>(strings[0], output);
+}
+
+/// Lexical conversion if there is only one element but the conversion type is for two, then call a two element
+/// constructor
+template <typename AssignTo,
+          typename ConvertTo,
+          enable_if_t<(type_count<AssignTo>::value <= 2) && expected_count<AssignTo>::value == 1 &&
+                          is_tuple_like<ConvertTo>::value && type_count_base<ConvertTo>::value == 2,
+                      detail::enabler> = detail::dummy>
+bool lexical_conversion(const std::vector<std ::string> &strings, AssignTo &output) {
+    // the remove const is to handle pair types coming from a container
+    typename std::remove_const<typename std::tuple_element<0, ConvertTo>::type>::type v1;
+    typename std::tuple_element<1, ConvertTo>::type v2;
+    bool retval = lexical_assign<decltype(v1), decltype(v1)>(strings[0], v1);
+    if(strings.size() > 1) {
+        retval = retval && lexical_assign<decltype(v2), decltype(v2)>(strings[1], v2);
+    }
+    if(retval) {
+        output = AssignTo{v1, v2};
+    }
+    return retval;
+}
+
+/// Lexical conversion of a container types of single elements
+template <class AssignTo,
+          class ConvertTo,
+          enable_if_t<is_mutable_container<AssignTo>::value && is_mutable_container<ConvertTo>::value &&
+                          type_count<ConvertTo>::value == 1,
+                      detail::enabler> = detail::dummy>
+bool lexical_conversion(const std::vector<std ::string> &strings, AssignTo &output) {
+    output.erase(output.begin(), output.end());
+    if(strings.size() == 1 && strings[0] == "{}") {
+        return true;
+    }
+    bool skip_remaining = false;
+    if(strings.size() == 2 && strings[0] == "{}" && is_separator(strings[1])) {
+        skip_remaining = true;
+    }
+    for(const auto &elem : strings) {
+        typename AssignTo::value_type out;
+        bool retval = lexical_assign<typename AssignTo::value_type, typename ConvertTo::value_type>(elem, out);
+        if(!retval) {
+            return false;
+        }
+        output.insert(output.end(), std::move(out));
+        if(skip_remaining) {
+            break;
+        }
+    }
+    return (!output.empty());
+}
+
+/// Lexical conversion for complex types
+template <class AssignTo, class ConvertTo, enable_if_t<is_complex<ConvertTo>::value, detail::enabler> = detail::dummy>
+bool lexical_conversion(const std::vector<std::string> &strings, AssignTo &output) {
+
+    if(strings.size() >= 2 && !strings[1].empty()) {
+        using XC2 = typename wrapped_type<ConvertTo, double>::type;
+        XC2 x{0.0}, y{0.0};
+        auto str1 = strings[1];
+        if(str1.back() == 'i' || str1.back() == 'j') {
+            str1.pop_back();
+        }
+        auto worked = lexical_cast(strings[0], x) && lexical_cast(str1, y);
+        if(worked) {
+            output = ConvertTo{x, y};
+        }
+        return worked;
+    }
+    return lexical_assign<AssignTo, ConvertTo>(strings[0], output);
+}
+
+/// Conversion to a vector type using a particular single type as the conversion type
+template <class AssignTo,
+          class ConvertTo,
+          enable_if_t<is_mutable_container<AssignTo>::value && (expected_count<ConvertTo>::value == 1) &&
+                          (type_count<ConvertTo>::value == 1),
+                      detail::enabler> = detail::dummy>
+bool lexical_conversion(const std::vector<std ::string> &strings, AssignTo &output) {
+    bool retval = true;
+    output.clear();
+    output.reserve(strings.size());
+    for(const auto &elem : strings) {
+
+        output.emplace_back();
+        retval = retval && lexical_assign<typename AssignTo::value_type, ConvertTo>(elem, output.back());
+    }
+    return (!output.empty()) && retval;
+}
+
+// forward declaration
+
+/// Lexical conversion of a container types with conversion type of two elements
+template <class AssignTo,
+          class ConvertTo,
+          enable_if_t<is_mutable_container<AssignTo>::value && is_mutable_container<ConvertTo>::value &&
+                          type_count_base<ConvertTo>::value == 2,
+                      detail::enabler> = detail::dummy>
+bool lexical_conversion(std::vector<std::string> strings, AssignTo &output);
+
+/// Lexical conversion of a vector types with type_size >2 forward declaration
+template <class AssignTo,
+          class ConvertTo,
+          enable_if_t<is_mutable_container<AssignTo>::value && is_mutable_container<ConvertTo>::value &&
+                          type_count_base<ConvertTo>::value != 2 &&
+                          ((type_count<ConvertTo>::value > 2) ||
+                           (type_count<ConvertTo>::value > type_count_base<ConvertTo>::value)),
+                      detail::enabler> = detail::dummy>
+bool lexical_conversion(const std::vector<std::string> &strings, AssignTo &output);
+
+/// Conversion for tuples
+template <class AssignTo,
+          class ConvertTo,
+          enable_if_t<is_tuple_like<AssignTo>::value && is_tuple_like<ConvertTo>::value &&
+                          (type_count_base<ConvertTo>::value != type_count<ConvertTo>::value ||
+                           type_count<ConvertTo>::value > 2),
+                      detail::enabler> = detail::dummy>
+bool lexical_conversion(const std::vector<std::string> &strings, AssignTo &output);  // forward declaration
+
+/// Conversion for operations where the assigned type is some class but the conversion is a mutable container or large
+/// tuple
+template <typename AssignTo,
+          typename ConvertTo,
+          enable_if_t<!is_tuple_like<AssignTo>::value && !is_mutable_container<AssignTo>::value &&
+                          classify_object<ConvertTo>::value != object_category::wrapper_value &&
+                          (is_mutable_container<ConvertTo>::value || type_count<ConvertTo>::value > 2),
+                      detail::enabler> = detail::dummy>
+bool lexical_conversion(const std::vector<std ::string> &strings, AssignTo &output) {
+
+    if(strings.size() > 1 || (!strings.empty() && !(strings.front().empty()))) {
+        ConvertTo val;
+        auto retval = lexical_conversion<ConvertTo, ConvertTo>(strings, val);
+        output = AssignTo{val};
+        return retval;
+    }
+    output = AssignTo{};
+    return true;
+}
+
+/// function template for converting tuples if the static Index is greater than the tuple size
+template <class AssignTo, class ConvertTo, std::size_t I>
+inline typename std::enable_if<(I >= type_count_base<AssignTo>::value), bool>::type
+tuple_conversion(const std::vector<std::string> &, AssignTo &) {
+    return true;
+}
+
+/// Conversion of a tuple element where the type size ==1 and not a mutable container
+template <class AssignTo, class ConvertTo>
+inline typename std::enable_if<!is_mutable_container<ConvertTo>::value && type_count<ConvertTo>::value == 1, bool>::type
+tuple_type_conversion(std::vector<std::string> &strings, AssignTo &output) {
+    auto retval = lexical_assign<AssignTo, ConvertTo>(strings[0], output);
+    strings.erase(strings.begin());
+    return retval;
+}
+
+/// Conversion of a tuple element where the type size !=1 but the size is fixed and not a mutable container
+template <class AssignTo, class ConvertTo>
+inline typename std::enable_if<!is_mutable_container<ConvertTo>::value && (type_count<ConvertTo>::value > 1) &&
+                                   type_count<ConvertTo>::value == type_count_min<ConvertTo>::value,
+                               bool>::type
+tuple_type_conversion(std::vector<std::string> &strings, AssignTo &output) {
+    auto retval = lexical_conversion<AssignTo, ConvertTo>(strings, output);
+    strings.erase(strings.begin(), strings.begin() + type_count<ConvertTo>::value);
+    return retval;
+}
+
+/// Conversion of a tuple element where the type is a mutable container or a type with different min and max type sizes
+template <class AssignTo, class ConvertTo>
+inline typename std::enable_if<is_mutable_container<ConvertTo>::value ||
+                                   type_count<ConvertTo>::value != type_count_min<ConvertTo>::value,
+                               bool>::type
+tuple_type_conversion(std::vector<std::string> &strings, AssignTo &output) {
+
+    std::size_t index{subtype_count_min<ConvertTo>::value};
+    const std::size_t mx_count{subtype_count<ConvertTo>::value};
+    const std::size_t mx{(std::max)(mx_count, strings.size())};
+
+    while(index < mx) {
+        if(is_separator(strings[index])) {
+            break;
+        }
+        ++index;
+    }
+    bool retval = lexical_conversion<AssignTo, ConvertTo>(
+        std::vector<std::string>(strings.begin(), strings.begin() + static_cast<std::ptrdiff_t>(index)), output);
+    strings.erase(strings.begin(), strings.begin() + static_cast<std::ptrdiff_t>(index) + 1);
+    return retval;
+}
+
+/// Tuple conversion operation
+template <class AssignTo, class ConvertTo, std::size_t I>
+inline typename std::enable_if<(I < type_count_base<AssignTo>::value), bool>::type
+tuple_conversion(std::vector<std::string> strings, AssignTo &output) {
+    bool retval = true;
+    using ConvertToElement = typename std::
+        conditional<is_tuple_like<ConvertTo>::value, typename std::tuple_element<I, ConvertTo>::type, ConvertTo>::type;
+    if(!strings.empty()) {
+        retval = retval && tuple_type_conversion<typename std::tuple_element<I, AssignTo>::type, ConvertToElement>(
+                               strings, std::get<I>(output));
+    }
+    retval = retval && tuple_conversion<AssignTo, ConvertTo, I + 1>(std::move(strings), output);
+    return retval;
+}
+
+/// Lexical conversion of a container types with tuple elements of size 2
+template <class AssignTo,
+          class ConvertTo,
+          enable_if_t<is_mutable_container<AssignTo>::value && is_mutable_container<ConvertTo>::value &&
+                          type_count_base<ConvertTo>::value == 2,
+                      detail::enabler>>
+bool lexical_conversion(std::vector<std::string> strings, AssignTo &output) {
+    output.clear();
+    while(!strings.empty()) {
+
+        typename std::remove_const<typename std::tuple_element<0, typename ConvertTo::value_type>::type>::type v1;
+        typename std::tuple_element<1, typename ConvertTo::value_type>::type v2;
+        bool retval = tuple_type_conversion<decltype(v1), decltype(v1)>(strings, v1);
+        if(!strings.empty()) {
+            retval = retval && tuple_type_conversion<decltype(v2), decltype(v2)>(strings, v2);
+        }
+        if(retval) {
+            output.insert(output.end(), typename AssignTo::value_type{v1, v2});
+        } else {
+            return false;
+        }
+    }
+    return (!output.empty());
+}
+
+/// lexical conversion of tuples with type count>2 or tuples of types of some element with a type size>=2
+template <class AssignTo,
+          class ConvertTo,
+          enable_if_t<is_tuple_like<AssignTo>::value && is_tuple_like<ConvertTo>::value &&
+                          (type_count_base<ConvertTo>::value != type_count<ConvertTo>::value ||
+                           type_count<ConvertTo>::value > 2),
+                      detail::enabler>>
+bool lexical_conversion(const std::vector<std ::string> &strings, AssignTo &output) {
+    static_assert(
+        !is_tuple_like<ConvertTo>::value || type_count_base<AssignTo>::value == type_count_base<ConvertTo>::value,
+        "if the conversion type is defined as a tuple it must be the same size as the type you are converting to");
+    return tuple_conversion<AssignTo, ConvertTo, 0>(strings, output);
+}
+
+/// Lexical conversion of a vector types for everything but tuples of two elements and types of size 1
+template <class AssignTo,
+          class ConvertTo,
+          enable_if_t<is_mutable_container<AssignTo>::value && is_mutable_container<ConvertTo>::value &&
+                          type_count_base<ConvertTo>::value != 2 &&
+                          ((type_count<ConvertTo>::value > 2) ||
+                           (type_count<ConvertTo>::value > type_count_base<ConvertTo>::value)),
+                      detail::enabler>>
+bool lexical_conversion(const std::vector<std ::string> &strings, AssignTo &output) {
+    bool retval = true;
+    output.clear();
+    std::vector<std::string> temp;
+    std::size_t ii{0};
+    std::size_t icount{0};
+    std::size_t xcm{type_count<ConvertTo>::value};
+    auto ii_max = strings.size();
+    while(ii < ii_max) {
+        temp.push_back(strings[ii]);
+        ++ii;
+        ++icount;
+        if(icount == xcm || is_separator(temp.back()) || ii == ii_max) {
+            if(static_cast<int>(xcm) > type_count_min<ConvertTo>::value && is_separator(temp.back())) {
+                temp.pop_back();
+            }
+            typename AssignTo::value_type temp_out;
+            retval = retval &&
+                     lexical_conversion<typename AssignTo::value_type, typename ConvertTo::value_type>(temp, temp_out);
+            temp.clear();
+            if(!retval) {
+                return false;
+            }
+            output.insert(output.end(), std::move(temp_out));
+            icount = 0;
+        }
+    }
+    return retval;
+}
+
+/// conversion for wrapper types
+template <typename AssignTo,
+          class ConvertTo,
+          enable_if_t<classify_object<ConvertTo>::value == object_category::wrapper_value &&
+                          std::is_assignable<ConvertTo &, ConvertTo>::value,
+                      detail::enabler> = detail::dummy>
+bool lexical_conversion(const std::vector<std::string> &strings, AssignTo &output) {
+    if(strings.empty() || strings.front().empty()) {
+        output = ConvertTo{};
+        return true;
+    }
+    typename ConvertTo::value_type val;
+    if(lexical_conversion<typename ConvertTo::value_type, typename ConvertTo::value_type>(strings, val)) {
+        output = ConvertTo{val};
+        return true;
+    }
+    return false;
+}
+
+/// conversion for wrapper types
+template <typename AssignTo,
+          class ConvertTo,
+          enable_if_t<classify_object<ConvertTo>::value == object_category::wrapper_value &&
+                          !std::is_assignable<AssignTo &, ConvertTo>::value,
+                      detail::enabler> = detail::dummy>
+bool lexical_conversion(const std::vector<std::string> &strings, AssignTo &output) {
+    using ConvertType = typename ConvertTo::value_type;
+    if(strings.empty() || strings.front().empty()) {
+        output = ConvertType{};
+        return true;
+    }
+    ConvertType val;
+    if(lexical_conversion<typename ConvertTo::value_type, typename ConvertTo::value_type>(strings, val)) {
+        output = val;
+        return true;
+    }
+    return false;
+}
+
+/// Sum a vector of strings
+inline std::string sum_string_vector(const std::vector<std::string> &values) {
+    double val{0.0};
+    bool fail{false};
+    std::string output;
+    for(const auto &arg : values) {
+        double tv{0.0};
+        auto comp = lexical_cast(arg, tv);
+        if(!comp) {
+            try {
+                tv = static_cast<double>(detail::to_flag_value(arg));
+            } catch(const std::exception &) {
+                fail = true;
+                break;
+            }
+        }
+        val += tv;
+    }
+    if(fail) {
+        for(const auto &arg : values) {
+            output.append(arg);
+        }
+    } else {
+        if(val <= static_cast<double>((std::numeric_limits<std::int64_t>::min)()) ||
+           val >= static_cast<double>((std::numeric_limits<std::int64_t>::max)()) ||
+           std::ceil(val) == std::floor(val)) {
+            output = detail::value_string(static_cast<int64_t>(val));
+        } else {
+            output = detail::value_string(val);
+        }
+    }
+    return output;
+}
+
+}  // namespace detail
+// [CLI11:type_tools_hpp:end]
+}  // namespace CLI
diff --git a/contrib/CLI11/include/CLI/Validators.hpp b/contrib/CLI11/include/CLI/Validators.hpp
new file mode 100644
index 000000000..28bdcb2d8
--- /dev/null
+++ b/contrib/CLI11/include/CLI/Validators.hpp
@@ -0,0 +1,916 @@
+// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+#include "Error.hpp"
+#include "Macros.hpp"
+#include "StringTools.hpp"
+#include "TypeTools.hpp"
+
+// [CLI11:public_includes:set]
+#include <cmath>
+#include <cstdint>
+#include <functional>
+#include <iostream>
+#include <limits>
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+// [CLI11:public_includes:end]
+
+// [CLI11:validators_hpp_filesystem:verbatim]
+
+// C standard library
+// Only needed for existence checking
+#if defined CLI11_CPP17 && defined __has_include && !defined CLI11_HAS_FILESYSTEM
+#if __has_include(<filesystem>)
+// Filesystem cannot be used if targeting macOS < 10.15
+#if defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500
+#define CLI11_HAS_FILESYSTEM 0
+#elif defined(__wasi__)
+// As of wasi-sdk-14, filesystem is not implemented
+#define CLI11_HAS_FILESYSTEM 0
+#else
+#include <filesystem>
+#if defined __cpp_lib_filesystem && __cpp_lib_filesystem >= 201703
+#if defined _GLIBCXX_RELEASE && _GLIBCXX_RELEASE >= 9
+#define CLI11_HAS_FILESYSTEM 1
+#elif defined(__GLIBCXX__)
+// if we are using gcc and Version <9 default to no filesystem
+#define CLI11_HAS_FILESYSTEM 0
+#else
+#define CLI11_HAS_FILESYSTEM 1
+#endif
+#else
+#define CLI11_HAS_FILESYSTEM 0
+#endif
+#endif
+#endif
+#endif
+
+#if defined CLI11_HAS_FILESYSTEM && CLI11_HAS_FILESYSTEM > 0
+#include <filesystem>  // NOLINT(build/include)
+#else
+#include <sys/stat.h>
+#include <sys/types.h>
+#endif
+
+// [CLI11:validators_hpp_filesystem:end]
+
+namespace CLI {
+// [CLI11:validators_hpp:verbatim]
+
+class Option;
+
+/// @defgroup validator_group Validators
+
+/// @brief Some validators that are provided
+///
+/// These are simple `std::string(const std::string&)` validators that are useful. They return
+/// a string if the validation fails. A custom struct is provided, as well, with the same user
+/// semantics, but with the ability to provide a new type name.
+/// @{
+
+///
+class Validator {
+  protected:
+    /// This is the description function, if empty the description_ will be used
+    std::function<std::string()> desc_function_{[]() { return std::string{}; }};
+
+    /// This is the base function that is to be called.
+    /// Returns a string error message if validation fails.
+    std::function<std::string(std::string &)> func_{[](std::string &) { return std::string{}; }};
+    /// The name for search purposes of the Validator
+    std::string name_{};
+    /// A Validator will only apply to an indexed value (-1 is all elements)
+    int application_index_ = -1;
+    /// Enable for Validator to allow it to be disabled if need be
+    bool active_{true};
+    /// specify that a validator should not modify the input
+    bool non_modifying_{false};
+
+    Validator(std::string validator_desc, std::function<std::string(std::string &)> func)
+        : desc_function_([validator_desc]() { return validator_desc; }), func_(std::move(func)) {}
+
+  public:
+    Validator() = default;
+    /// Construct a Validator with just the description string
+    explicit Validator(std::string validator_desc) : desc_function_([validator_desc]() { return validator_desc; }) {}
+    /// Construct Validator from basic information
+    Validator(std::function<std::string(std::string &)> op, std::string validator_desc, std::string validator_name = "")
+        : desc_function_([validator_desc]() { return validator_desc; }), func_(std::move(op)),
+          name_(std::move(validator_name)) {}
+    /// Set the Validator operation function
+    Validator &operation(std::function<std::string(std::string &)> op) {
+        func_ = std::move(op);
+        return *this;
+    }
+    /// This is the required operator for a Validator - provided to help
+    /// users (CLI11 uses the member `func` directly)
+    std::string operator()(std::string &str) const;
+
+    /// This is the required operator for a Validator - provided to help
+    /// users (CLI11 uses the member `func` directly)
+    std::string operator()(const std::string &str) const {
+        std::string value = str;
+        return (active_) ? func_(value) : std::string{};
+    }
+
+    /// Specify the type string
+    Validator &description(std::string validator_desc) {
+        desc_function_ = [validator_desc]() { return validator_desc; };
+        return *this;
+    }
+    /// Specify the type string
+    CLI11_NODISCARD Validator description(std::string validator_desc) const;
+
+    /// Generate type description information for the Validator
+    CLI11_NODISCARD std::string get_description() const {
+        if(active_) {
+            return desc_function_();
+        }
+        return std::string{};
+    }
+    /// Specify the type string
+    Validator &name(std::string validator_name) {
+        name_ = std::move(validator_name);
+        return *this;
+    }
+    /// Specify the type string
+    CLI11_NODISCARD Validator name(std::string validator_name) const {
+        Validator newval(*this);
+        newval.name_ = std::move(validator_name);
+        return newval;
+    }
+    /// Get the name of the Validator
+    CLI11_NODISCARD const std::string &get_name() const { return name_; }
+    /// Specify whether the Validator is active or not
+    Validator &active(bool active_val = true) {
+        active_ = active_val;
+        return *this;
+    }
+    /// Specify whether the Validator is active or not
+    CLI11_NODISCARD Validator active(bool active_val = true) const {
+        Validator newval(*this);
+        newval.active_ = active_val;
+        return newval;
+    }
+
+    /// Specify whether the Validator can be modifying or not
+    Validator &non_modifying(bool no_modify = true) {
+        non_modifying_ = no_modify;
+        return *this;
+    }
+    /// Specify the application index of a validator
+    Validator &application_index(int app_index) {
+        application_index_ = app_index;
+        return *this;
+    }
+    /// Specify the application index of a validator
+    CLI11_NODISCARD Validator application_index(int app_index) const {
+        Validator newval(*this);
+        newval.application_index_ = app_index;
+        return newval;
+    }
+    /// Get the current value of the application index
+    CLI11_NODISCARD int get_application_index() const { return application_index_; }
+    /// Get a boolean if the validator is active
+    CLI11_NODISCARD bool get_active() const { return active_; }
+
+    /// Get a boolean if the validator is allowed to modify the input returns true if it can modify the input
+    CLI11_NODISCARD bool get_modifying() const { return !non_modifying_; }
+
+    /// Combining validators is a new validator. Type comes from left validator if function, otherwise only set if the
+    /// same.
+    Validator operator&(const Validator &other) const;
+
+    /// Combining validators is a new validator. Type comes from left validator if function, otherwise only set if the
+    /// same.
+    Validator operator|(const Validator &other) const;
+
+    /// Create a validator that fails when a given validator succeeds
+    Validator operator!() const;
+
+  private:
+    void _merge_description(const Validator &val1, const Validator &val2, const std::string &merger);
+};
+
+/// Class wrapping some of the accessors of Validator
+class CustomValidator : public Validator {
+  public:
+};
+// The implementation of the built in validators is using the Validator class;
+// the user is only expected to use the const (static) versions (since there's no setup).
+// Therefore, this is in detail.
+namespace detail {
+
+/// CLI enumeration of different file types
+enum class path_type { nonexistent, file, directory };
+
+/// get the type of the path from a file name
+CLI11_INLINE path_type check_path(const char *file) noexcept;
+
+/// Check for an existing file (returns error message if check fails)
+class ExistingFileValidator : public Validator {
+  public:
+    ExistingFileValidator();
+};
+
+/// Check for an existing directory (returns error message if check fails)
+class ExistingDirectoryValidator : public Validator {
+  public:
+    ExistingDirectoryValidator();
+};
+
+/// Check for an existing path
+class ExistingPathValidator : public Validator {
+  public:
+    ExistingPathValidator();
+};
+
+/// Check for an non-existing path
+class NonexistentPathValidator : public Validator {
+  public:
+    NonexistentPathValidator();
+};
+
+/// Validate the given string is a legal ipv4 address
+class IPV4Validator : public Validator {
+  public:
+    IPV4Validator();
+};
+
+}  // namespace detail
+
+// Static is not needed here, because global const implies static.
+
+/// Check for existing file (returns error message if check fails)
+const detail::ExistingFileValidator ExistingFile;
+
+/// Check for an existing directory (returns error message if check fails)
+const detail::ExistingDirectoryValidator ExistingDirectory;
+
+/// Check for an existing path
+const detail::ExistingPathValidator ExistingPath;
+
+/// Check for an non-existing path
+const detail::NonexistentPathValidator NonexistentPath;
+
+/// Check for an IP4 address
+const detail::IPV4Validator ValidIPV4;
+
+/// Validate the input as a particular type
+template <typename DesiredType> class TypeValidator : public Validator {
+  public:
+    explicit TypeValidator(const std::string &validator_name)
+        : Validator(validator_name, [](std::string &input_string) {
+              using CLI::detail::lexical_cast;
+              auto val = DesiredType();
+              if(!lexical_cast(input_string, val)) {
+                  return std::string("Failed parsing ") + input_string + " as a " + detail::type_name<DesiredType>();
+              }
+              return std::string();
+          }) {}
+    TypeValidator() : TypeValidator(detail::type_name<DesiredType>()) {}
+};
+
+/// Check for a number
+const TypeValidator<double> Number("NUMBER");
+
+/// Modify a path if the file is a particular default location, can be used as Check or transform
+/// with the error return optionally disabled
+class FileOnDefaultPath : public Validator {
+  public:
+    explicit FileOnDefaultPath(std::string default_path, bool enableErrorReturn = true);
+};
+
+/// Produce a range (factory). Min and max are inclusive.
+class Range : public Validator {
+  public:
+    /// This produces a range with min and max inclusive.
+    ///
+    /// Note that the constructor is templated, but the struct is not, so C++17 is not
+    /// needed to provide nice syntax for Range(a,b).
+    template <typename T>
+    Range(T min_val, T max_val, const std::string &validator_name = std::string{}) : Validator(validator_name) {
+        if(validator_name.empty()) {
+            std::stringstream out;
+            out << detail::type_name<T>() << " in [" << min_val << " - " << max_val << "]";
+            description(out.str());
+        }
+
+        func_ = [min_val, max_val](std::string &input) {
+            using CLI::detail::lexical_cast;
+            T val;
+            bool converted = lexical_cast(input, val);
+            if((!converted) || (val < min_val || val > max_val)) {
+                std::stringstream out;
+                out << "Value " << input << " not in range [";
+                out << min_val << " - " << max_val << "]";
+                return out.str();
+            }
+            return std::string{};
+        };
+    }
+
+    /// Range of one value is 0 to value
+    template <typename T>
+    explicit Range(T max_val, const std::string &validator_name = std::string{})
+        : Range(static_cast<T>(0), max_val, validator_name) {}
+};
+
+/// Check for a non negative number
+const Range NonNegativeNumber((std::numeric_limits<double>::max)(), "NONNEGATIVE");
+
+/// Check for a positive valued number (val>0.0), <double>::min  here is the smallest positive number
+const Range PositiveNumber((std::numeric_limits<double>::min)(), (std::numeric_limits<double>::max)(), "POSITIVE");
+
+/// Produce a bounded range (factory). Min and max are inclusive.
+class Bound : public Validator {
+  public:
+    /// This bounds a value with min and max inclusive.
+    ///
+    /// Note that the constructor is templated, but the struct is not, so C++17 is not
+    /// needed to provide nice syntax for Range(a,b).
+    template <typename T> Bound(T min_val, T max_val) {
+        std::stringstream out;
+        out << detail::type_name<T>() << " bounded to [" << min_val << " - " << max_val << "]";
+        description(out.str());
+
+        func_ = [min_val, max_val](std::string &input) {
+            using CLI::detail::lexical_cast;
+            T val;
+            bool converted = lexical_cast(input, val);
+            if(!converted) {
+                return std::string("Value ") + input + " could not be converted";
+            }
+            if(val < min_val)
+                input = detail::to_string(min_val);
+            else if(val > max_val)
+                input = detail::to_string(max_val);
+
+            return std::string{};
+        };
+    }
+
+    /// Range of one value is 0 to value
+    template <typename T> explicit Bound(T max_val) : Bound(static_cast<T>(0), max_val) {}
+};
+
+namespace detail {
+template <typename T,
+          enable_if_t<is_copyable_ptr<typename std::remove_reference<T>::type>::value, detail::enabler> = detail::dummy>
+auto smart_deref(T value) -> decltype(*value) {
+    return *value;
+}
+
+template <
+    typename T,
+    enable_if_t<!is_copyable_ptr<typename std::remove_reference<T>::type>::value, detail::enabler> = detail::dummy>
+typename std::remove_reference<T>::type &smart_deref(T &value) {
+    return value;
+}
+/// Generate a string representation of a set
+template <typename T> std::string generate_set(const T &set) {
+    using element_t = typename detail::element_type<T>::type;
+    using iteration_type_t = typename detail::pair_adaptor<element_t>::value_type;  // the type of the object pair
+    std::string out(1, '{');
+    out.append(detail::join(
+        detail::smart_deref(set),
+        [](const iteration_type_t &v) { return detail::pair_adaptor<element_t>::first(v); },
+        ","));
+    out.push_back('}');
+    return out;
+}
+
+/// Generate a string representation of a map
+template <typename T> std::string generate_map(const T &map, bool key_only = false) {
+    using element_t = typename detail::element_type<T>::type;
+    using iteration_type_t = typename detail::pair_adaptor<element_t>::value_type;  // the type of the object pair
+    std::string out(1, '{');
+    out.append(detail::join(
+        detail::smart_deref(map),
+        [key_only](const iteration_type_t &v) {
+            std::string res{detail::to_string(detail::pair_adaptor<element_t>::first(v))};
+
+            if(!key_only) {
+                res.append("->");
+                res += detail::to_string(detail::pair_adaptor<element_t>::second(v));
+            }
+            return res;
+        },
+        ","));
+    out.push_back('}');
+    return out;
+}
+
+template <typename C, typename V> struct has_find {
+    template <typename CC, typename VV>
+    static auto test(int) -> decltype(std::declval<CC>().find(std::declval<VV>()), std::true_type());
+    template <typename, typename> static auto test(...) -> decltype(std::false_type());
+
+    static const auto value = decltype(test<C, V>(0))::value;
+    using type = std::integral_constant<bool, value>;
+};
+
+/// A search function
+template <typename T, typename V, enable_if_t<!has_find<T, V>::value, detail::enabler> = detail::dummy>
+auto search(const T &set, const V &val) -> std::pair<bool, decltype(std::begin(detail::smart_deref(set)))> {
+    using element_t = typename detail::element_type<T>::type;
+    auto &setref = detail::smart_deref(set);
+    auto it = std::find_if(std::begin(setref), std::end(setref), [&val](decltype(*std::begin(setref)) v) {
+        return (detail::pair_adaptor<element_t>::first(v) == val);
+    });
+    return {(it != std::end(setref)), it};
+}
+
+/// A search function that uses the built in find function
+template <typename T, typename V, enable_if_t<has_find<T, V>::value, detail::enabler> = detail::dummy>
+auto search(const T &set, const V &val) -> std::pair<bool, decltype(std::begin(detail::smart_deref(set)))> {
+    auto &setref = detail::smart_deref(set);
+    auto it = setref.find(val);
+    return {(it != std::end(setref)), it};
+}
+
+/// A search function with a filter function
+template <typename T, typename V>
+auto search(const T &set, const V &val, const std::function<V(V)> &filter_function)
+    -> std::pair<bool, decltype(std::begin(detail::smart_deref(set)))> {
+    using element_t = typename detail::element_type<T>::type;
+    // do the potentially faster first search
+    auto res = search(set, val);
+    if((res.first) || (!(filter_function))) {
+        return res;
+    }
+    // if we haven't found it do the longer linear search with all the element translations
+    auto &setref = detail::smart_deref(set);
+    auto it = std::find_if(std::begin(setref), std::end(setref), [&](decltype(*std::begin(setref)) v) {
+        V a{detail::pair_adaptor<element_t>::first(v)};
+        a = filter_function(a);
+        return (a == val);
+    });
+    return {(it != std::end(setref)), it};
+}
+
+// the following suggestion was made by Nikita Ofitserov(@himikof)
+// done in templates to prevent compiler warnings on negation of unsigned numbers
+
+/// Do a check for overflow on signed numbers
+template <typename T>
+inline typename std::enable_if<std::is_signed<T>::value, T>::type overflowCheck(const T &a, const T &b) {
+    if((a > 0) == (b > 0)) {
+        return ((std::numeric_limits<T>::max)() / (std::abs)(a) < (std::abs)(b));
+    }
+    return ((std::numeric_limits<T>::min)() / (std::abs)(a) > -(std::abs)(b));
+}
+/// Do a check for overflow on unsigned numbers
+template <typename T>
+inline typename std::enable_if<!std::is_signed<T>::value, T>::type overflowCheck(const T &a, const T &b) {
+    return ((std::numeric_limits<T>::max)() / a < b);
+}
+
+/// Performs a *= b; if it doesn't cause integer overflow. Returns false otherwise.
+template <typename T> typename std::enable_if<std::is_integral<T>::value, bool>::type checked_multiply(T &a, T b) {
+    if(a == 0 || b == 0 || a == 1 || b == 1) {
+        a *= b;
+        return true;
+    }
+    if(a == (std::numeric_limits<T>::min)() || b == (std::numeric_limits<T>::min)()) {
+        return false;
+    }
+    if(overflowCheck(a, b)) {
+        return false;
+    }
+    a *= b;
+    return true;
+}
+
+/// Performs a *= b; if it doesn't equal infinity. Returns false otherwise.
+template <typename T>
+typename std::enable_if<std::is_floating_point<T>::value, bool>::type checked_multiply(T &a, T b) {
+    T c = a * b;
+    if(std::isinf(c) && !std::isinf(a) && !std::isinf(b)) {
+        return false;
+    }
+    a = c;
+    return true;
+}
+
+}  // namespace detail
+/// Verify items are in a set
+class IsMember : public Validator {
+  public:
+    using filter_fn_t = std::function<std::string(std::string)>;
+
+    /// This allows in-place construction using an initializer list
+    template <typename T, typename... Args>
+    IsMember(std::initializer_list<T> values, Args &&...args)
+        : IsMember(std::vector<T>(values), std::forward<Args>(args)...) {}
+
+    /// This checks to see if an item is in a set (empty function)
+    template <typename T> explicit IsMember(T &&set) : IsMember(std::forward<T>(set), nullptr) {}
+
+    /// This checks to see if an item is in a set: pointer or copy version. You can pass in a function that will filter
+    /// both sides of the comparison before computing the comparison.
+    template <typename T, typename F> explicit IsMember(T set, F filter_function) {
+
+        // Get the type of the contained item - requires a container have ::value_type
+        // if the type does not have first_type and second_type, these are both value_type
+        using element_t = typename detail::element_type<T>::type;             // Removes (smart) pointers if needed
+        using item_t = typename detail::pair_adaptor<element_t>::first_type;  // Is value_type if not a map
+
+        using local_item_t = typename IsMemberType<item_t>::type;  // This will convert bad types to good ones
+                                                                   // (const char * to std::string)
+
+        // Make a local copy of the filter function, using a std::function if not one already
+        std::function<local_item_t(local_item_t)> filter_fn = filter_function;
+
+        // This is the type name for help, it will take the current version of the set contents
+        desc_function_ = [set]() { return detail::generate_set(detail::smart_deref(set)); };
+
+        // This is the function that validates
+        // It stores a copy of the set pointer-like, so shared_ptr will stay alive
+        func_ = [set, filter_fn](std::string &input) {
+            using CLI::detail::lexical_cast;
+            local_item_t b;
+            if(!lexical_cast(input, b)) {
+                throw ValidationError(input);  // name is added later
+            }
+            if(filter_fn) {
+                b = filter_fn(b);
+            }
+            auto res = detail::search(set, b, filter_fn);
+            if(res.first) {
+                // Make sure the version in the input string is identical to the one in the set
+                if(filter_fn) {
+                    input = detail::value_string(detail::pair_adaptor<element_t>::first(*(res.second)));
+                }
+
+                // Return empty error string (success)
+                return std::string{};
+            }
+
+            // If you reach this point, the result was not found
+            return input + " not in " + detail::generate_set(detail::smart_deref(set));
+        };
+    }
+
+    /// You can pass in as many filter functions as you like, they nest (string only currently)
+    template <typename T, typename... Args>
+    IsMember(T &&set, filter_fn_t filter_fn_1, filter_fn_t filter_fn_2, Args &&...other)
+        : IsMember(
+              std::forward<T>(set),
+              [filter_fn_1, filter_fn_2](std::string a) { return filter_fn_2(filter_fn_1(a)); },
+              other...) {}
+};
+
+/// definition of the default transformation object
+template <typename T> using TransformPairs = std::vector<std::pair<std::string, T>>;
+
+/// Translate named items to other or a value set
+class Transformer : public Validator {
+  public:
+    using filter_fn_t = std::function<std::string(std::string)>;
+
+    /// This allows in-place construction
+    template <typename... Args>
+    Transformer(std::initializer_list<std::pair<std::string, std::string>> values, Args &&...args)
+        : Transformer(TransformPairs<std::string>(values), std::forward<Args>(args)...) {}
+
+    /// direct map of std::string to std::string
+    template <typename T> explicit Transformer(T &&mapping) : Transformer(std::forward<T>(mapping), nullptr) {}
+
+    /// This checks to see if an item is in a set: pointer or copy version. You can pass in a function that will filter
+    /// both sides of the comparison before computing the comparison.
+    template <typename T, typename F> explicit Transformer(T mapping, F filter_function) {
+
+        static_assert(detail::pair_adaptor<typename detail::element_type<T>::type>::value,
+                      "mapping must produce value pairs");
+        // Get the type of the contained item - requires a container have ::value_type
+        // if the type does not have first_type and second_type, these are both value_type
+        using element_t = typename detail::element_type<T>::type;             // Removes (smart) pointers if needed
+        using item_t = typename detail::pair_adaptor<element_t>::first_type;  // Is value_type if not a map
+        using local_item_t = typename IsMemberType<item_t>::type;             // Will convert bad types to good ones
+                                                                              // (const char * to std::string)
+
+        // Make a local copy of the filter function, using a std::function if not one already
+        std::function<local_item_t(local_item_t)> filter_fn = filter_function;
+
+        // This is the type name for help, it will take the current version of the set contents
+        desc_function_ = [mapping]() { return detail::generate_map(detail::smart_deref(mapping)); };
+
+        func_ = [mapping, filter_fn](std::string &input) {
+            using CLI::detail::lexical_cast;
+            local_item_t b;
+            if(!lexical_cast(input, b)) {
+                return std::string();
+                // there is no possible way we can match anything in the mapping if we can't convert so just return
+            }
+            if(filter_fn) {
+                b = filter_fn(b);
+            }
+            auto res = detail::search(mapping, b, filter_fn);
+            if(res.first) {
+                input = detail::value_string(detail::pair_adaptor<element_t>::second(*res.second));
+            }
+            return std::string{};
+        };
+    }
+
+    /// You can pass in as many filter functions as you like, they nest
+    template <typename T, typename... Args>
+    Transformer(T &&mapping, filter_fn_t filter_fn_1, filter_fn_t filter_fn_2, Args &&...other)
+        : Transformer(
+              std::forward<T>(mapping),
+              [filter_fn_1, filter_fn_2](std::string a) { return filter_fn_2(filter_fn_1(a)); },
+              other...) {}
+};
+
+/// translate named items to other or a value set
+class CheckedTransformer : public Validator {
+  public:
+    using filter_fn_t = std::function<std::string(std::string)>;
+
+    /// This allows in-place construction
+    template <typename... Args>
+    CheckedTransformer(std::initializer_list<std::pair<std::string, std::string>> values, Args &&...args)
+        : CheckedTransformer(TransformPairs<std::string>(values), std::forward<Args>(args)...) {}
+
+    /// direct map of std::string to std::string
+    template <typename T> explicit CheckedTransformer(T mapping) : CheckedTransformer(std::move(mapping), nullptr) {}
+
+    /// This checks to see if an item is in a set: pointer or copy version. You can pass in a function that will filter
+    /// both sides of the comparison before computing the comparison.
+    template <typename T, typename F> explicit CheckedTransformer(T mapping, F filter_function) {
+
+        static_assert(detail::pair_adaptor<typename detail::element_type<T>::type>::value,
+                      "mapping must produce value pairs");
+        // Get the type of the contained item - requires a container have ::value_type
+        // if the type does not have first_type and second_type, these are both value_type
+        using element_t = typename detail::element_type<T>::type;             // Removes (smart) pointers if needed
+        using item_t = typename detail::pair_adaptor<element_t>::first_type;  // Is value_type if not a map
+        using local_item_t = typename IsMemberType<item_t>::type;             // Will convert bad types to good ones
+                                                                              // (const char * to std::string)
+        using iteration_type_t = typename detail::pair_adaptor<element_t>::value_type;  // the type of the object pair
+
+        // Make a local copy of the filter function, using a std::function if not one already
+        std::function<local_item_t(local_item_t)> filter_fn = filter_function;
+
+        auto tfunc = [mapping]() {
+            std::string out("value in ");
+            out += detail::generate_map(detail::smart_deref(mapping)) + " OR {";
+            out += detail::join(
+                detail::smart_deref(mapping),
+                [](const iteration_type_t &v) { return detail::to_string(detail::pair_adaptor<element_t>::second(v)); },
+                ",");
+            out.push_back('}');
+            return out;
+        };
+
+        desc_function_ = tfunc;
+
+        func_ = [mapping, tfunc, filter_fn](std::string &input) {
+            using CLI::detail::lexical_cast;
+            local_item_t b;
+            bool converted = lexical_cast(input, b);
+            if(converted) {
+                if(filter_fn) {
+                    b = filter_fn(b);
+                }
+                auto res = detail::search(mapping, b, filter_fn);
+                if(res.first) {
+                    input = detail::value_string(detail::pair_adaptor<element_t>::second(*res.second));
+                    return std::string{};
+                }
+            }
+            for(const auto &v : detail::smart_deref(mapping)) {
+                auto output_string = detail::value_string(detail::pair_adaptor<element_t>::second(v));
+                if(output_string == input) {
+                    return std::string();
+                }
+            }
+
+            return "Check " + input + " " + tfunc() + " FAILED";
+        };
+    }
+
+    /// You can pass in as many filter functions as you like, they nest
+    template <typename T, typename... Args>
+    CheckedTransformer(T &&mapping, filter_fn_t filter_fn_1, filter_fn_t filter_fn_2, Args &&...other)
+        : CheckedTransformer(
+              std::forward<T>(mapping),
+              [filter_fn_1, filter_fn_2](std::string a) { return filter_fn_2(filter_fn_1(a)); },
+              other...) {}
+};
+
+/// Helper function to allow ignore_case to be passed to IsMember or Transform
+inline std::string ignore_case(std::string item) { return detail::to_lower(item); }
+
+/// Helper function to allow ignore_underscore to be passed to IsMember or Transform
+inline std::string ignore_underscore(std::string item) { return detail::remove_underscore(item); }
+
+/// Helper function to allow checks to ignore spaces to be passed to IsMember or Transform
+inline std::string ignore_space(std::string item) {
+    item.erase(std::remove(std::begin(item), std::end(item), ' '), std::end(item));
+    item.erase(std::remove(std::begin(item), std::end(item), '\t'), std::end(item));
+    return item;
+}
+
+/// Multiply a number by a factor using given mapping.
+/// Can be used to write transforms for SIZE or DURATION inputs.
+///
+/// Example:
+///   With mapping = `{"b"->1, "kb"->1024, "mb"->1024*1024}`
+///   one can recognize inputs like "100", "12kb", "100 MB",
+///   that will be automatically transformed to 100, 14448, 104857600.
+///
+/// Output number type matches the type in the provided mapping.
+/// Therefore, if it is required to interpret real inputs like "0.42 s",
+/// the mapping should be of a type <string, float> or <string, double>.
+class AsNumberWithUnit : public Validator {
+  public:
+    /// Adjust AsNumberWithUnit behavior.
+    /// CASE_SENSITIVE/CASE_INSENSITIVE controls how units are matched.
+    /// UNIT_OPTIONAL/UNIT_REQUIRED throws ValidationError
+    ///   if UNIT_REQUIRED is set and unit literal is not found.
+    enum Options {
+        CASE_SENSITIVE = 0,
+        CASE_INSENSITIVE = 1,
+        UNIT_OPTIONAL = 0,
+        UNIT_REQUIRED = 2,
+        DEFAULT = CASE_INSENSITIVE | UNIT_OPTIONAL
+    };
+
+    template <typename Number>
+    explicit AsNumberWithUnit(std::map<std::string, Number> mapping,
+                              Options opts = DEFAULT,
+                              const std::string &unit_name = "UNIT") {
+        description(generate_description<Number>(unit_name, opts));
+        validate_mapping(mapping, opts);
+
+        // transform function
+        func_ = [mapping, opts](std::string &input) -> std::string {
+            Number num{};
+
+            detail::rtrim(input);
+            if(input.empty()) {
+                throw ValidationError("Input is empty");
+            }
+
+            // Find split position between number and prefix
+            auto unit_begin = input.end();
+            while(unit_begin > input.begin() && std::isalpha(*(unit_begin - 1), std::locale())) {
+                --unit_begin;
+            }
+
+            std::string unit{unit_begin, input.end()};
+            input.resize(static_cast<std::size_t>(std::distance(input.begin(), unit_begin)));
+            detail::trim(input);
+
+            if(opts & UNIT_REQUIRED && unit.empty()) {
+                throw ValidationError("Missing mandatory unit");
+            }
+            if(opts & CASE_INSENSITIVE) {
+                unit = detail::to_lower(unit);
+            }
+            if(unit.empty()) {
+                using CLI::detail::lexical_cast;
+                if(!lexical_cast(input, num)) {
+                    throw ValidationError(std::string("Value ") + input + " could not be converted to " +
+                                          detail::type_name<Number>());
+                }
+                // No need to modify input if no unit passed
+                return {};
+            }
+
+            // find corresponding factor
+            auto it = mapping.find(unit);
+            if(it == mapping.end()) {
+                throw ValidationError(unit +
+                                      " unit not recognized. "
+                                      "Allowed values: " +
+                                      detail::generate_map(mapping, true));
+            }
+
+            if(!input.empty()) {
+                using CLI::detail::lexical_cast;
+                bool converted = lexical_cast(input, num);
+                if(!converted) {
+                    throw ValidationError(std::string("Value ") + input + " could not be converted to " +
+                                          detail::type_name<Number>());
+                }
+                // perform safe multiplication
+                bool ok = detail::checked_multiply(num, it->second);
+                if(!ok) {
+                    throw ValidationError(detail::to_string(num) + " multiplied by " + unit +
+                                          " factor would cause number overflow. Use smaller value.");
+                }
+            } else {
+                num = static_cast<Number>(it->second);
+            }
+
+            input = detail::to_string(num);
+
+            return {};
+        };
+    }
+
+  private:
+    /// Check that mapping contains valid units.
+    /// Update mapping for CASE_INSENSITIVE mode.
+    template <typename Number> static void validate_mapping(std::map<std::string, Number> &mapping, Options opts) {
+        for(auto &kv : mapping) {
+            if(kv.first.empty()) {
+                throw ValidationError("Unit must not be empty.");
+            }
+            if(!detail::isalpha(kv.first)) {
+                throw ValidationError("Unit must contain only letters.");
+            }
+        }
+
+        // make all units lowercase if CASE_INSENSITIVE
+        if(opts & CASE_INSENSITIVE) {
+            std::map<std::string, Number> lower_mapping;
+            for(auto &kv : mapping) {
+                auto s = detail::to_lower(kv.first);
+                if(lower_mapping.count(s)) {
+                    throw ValidationError(std::string("Several matching lowercase unit representations are found: ") +
+                                          s);
+                }
+                lower_mapping[detail::to_lower(kv.first)] = kv.second;
+            }
+            mapping = std::move(lower_mapping);
+        }
+    }
+
+    /// Generate description like this: NUMBER [UNIT]
+    template <typename Number> static std::string generate_description(const std::string &name, Options opts) {
+        std::stringstream out;
+        out << detail::type_name<Number>() << ' ';
+        if(opts & UNIT_REQUIRED) {
+            out << name;
+        } else {
+            out << '[' << name << ']';
+        }
+        return out.str();
+    }
+};
+
+inline AsNumberWithUnit::Options operator|(const AsNumberWithUnit::Options &a, const AsNumberWithUnit::Options &b) {
+    return static_cast<AsNumberWithUnit::Options>(static_cast<int>(a) | static_cast<int>(b));
+}
+
+/// Converts a human-readable size string (with unit literal) to uin64_t size.
+/// Example:
+///   "100" => 100
+///   "1 b" => 100
+///   "10Kb" => 10240 // you can configure this to be interpreted as kilobyte (*1000) or kibibyte (*1024)
+///   "10 KB" => 10240
+///   "10 kb" => 10240
+///   "10 kib" => 10240 // *i, *ib are always interpreted as *bibyte (*1024)
+///   "10kb" => 10240
+///   "2 MB" => 2097152
+///   "2 EiB" => 2^61 // Units up to exibyte are supported
+class AsSizeValue : public AsNumberWithUnit {
+  public:
+    using result_t = std::uint64_t;
+
+    /// If kb_is_1000 is true,
+    /// interpret 'kb', 'k' as 1000 and 'kib', 'ki' as 1024
+    /// (same applies to higher order units as well).
+    /// Otherwise, interpret all literals as factors of 1024.
+    /// The first option is formally correct, but
+    /// the second interpretation is more wide-spread
+    /// (see https://en.wikipedia.org/wiki/Binary_prefix).
+    explicit AsSizeValue(bool kb_is_1000);
+
+  private:
+    /// Get <size unit, factor> mapping
+    static std::map<std::string, result_t> init_mapping(bool kb_is_1000);
+
+    /// Cache calculated mapping
+    static std::map<std::string, result_t> get_mapping(bool kb_is_1000);
+};
+
+namespace detail {
+/// Split a string into a program name and command line arguments
+/// the string is assumed to contain a file name followed by other arguments
+/// the return value contains is a pair with the first argument containing the program name and the second
+/// everything else.
+CLI11_INLINE std::pair<std::string, std::string> split_program_name(std::string commandline);
+
+}  // namespace detail
+/// @}
+
+// [CLI11:validators_hpp:end]
+}  // namespace CLI
+
+#ifndef CLI11_COMPILE
+#include "impl/Validators_inl.hpp"
+#endif
diff --git a/contrib/CLI11/include/CLI/Version.hpp b/contrib/CLI11/include/CLI/Version.hpp
new file mode 100644
index 000000000..d5c817a9c
--- /dev/null
+++ b/contrib/CLI11/include/CLI/Version.hpp
@@ -0,0 +1,16 @@
+// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+// [CLI11:version_hpp:verbatim]
+
+#define CLI11_VERSION_MAJOR 2
+#define CLI11_VERSION_MINOR 3
+#define CLI11_VERSION_PATCH 2
+#define CLI11_VERSION "2.3.2"
+
+// [CLI11:version_hpp:end]
diff --git a/contrib/CLI11/include/CLI/impl/App_inl.hpp b/contrib/CLI11/include/CLI/impl/App_inl.hpp
new file mode 100644
index 000000000..71afaa5cb
--- /dev/null
+++ b/contrib/CLI11/include/CLI/impl/App_inl.hpp
@@ -0,0 +1,2105 @@
+// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+// This include is only needed for IDEs to discover symbols
+#include <CLI/App.hpp>
+
+// [CLI11:public_includes:set]
+#include <algorithm>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+// [CLI11:public_includes:end]
+
+namespace CLI {
+// [CLI11:app_inl_hpp:verbatim]
+
+CLI11_INLINE App::App(std::string app_description, std::string app_name, App *parent)
+    : name_(std::move(app_name)), description_(std::move(app_description)), parent_(parent) {
+    // Inherit if not from a nullptr
+    if(parent_ != nullptr) {
+        if(parent_->help_ptr_ != nullptr)
+            set_help_flag(parent_->help_ptr_->get_name(false, true), parent_->help_ptr_->get_description());
+        if(parent_->help_all_ptr_ != nullptr)
+            set_help_all_flag(parent_->help_all_ptr_->get_name(false, true), parent_->help_all_ptr_->get_description());
+
+        /// OptionDefaults
+        option_defaults_ = parent_->option_defaults_;
+
+        // INHERITABLE
+        failure_message_ = parent_->failure_message_;
+        allow_extras_ = parent_->allow_extras_;
+        allow_config_extras_ = parent_->allow_config_extras_;
+        prefix_command_ = parent_->prefix_command_;
+        immediate_callback_ = parent_->immediate_callback_;
+        ignore_case_ = parent_->ignore_case_;
+        ignore_underscore_ = parent_->ignore_underscore_;
+        fallthrough_ = parent_->fallthrough_;
+        validate_positionals_ = parent_->validate_positionals_;
+        validate_optional_arguments_ = parent_->validate_optional_arguments_;
+        configurable_ = parent_->configurable_;
+        allow_windows_style_options_ = parent_->allow_windows_style_options_;
+        group_ = parent_->group_;
+        footer_ = parent_->footer_;
+        formatter_ = parent_->formatter_;
+        config_formatter_ = parent_->config_formatter_;
+        require_subcommand_max_ = parent_->require_subcommand_max_;
+    }
+}
+
+CLI11_INLINE App *App::name(std::string app_name) {
+
+    if(parent_ != nullptr) {
+        auto oname = name_;
+        name_ = app_name;
+        const auto &res = _compare_subcommand_names(*this, *_get_fallthrough_parent());
+        if(!res.empty()) {
+            name_ = oname;
+            throw(OptionAlreadyAdded(app_name + " conflicts with existing subcommand names"));
+        }
+    } else {
+        name_ = app_name;
+    }
+    has_automatic_name_ = false;
+    return this;
+}
+
+CLI11_INLINE App *App::alias(std::string app_name) {
+    if(app_name.empty() || !detail::valid_alias_name_string(app_name)) {
+        throw IncorrectConstruction("Aliases may not be empty or contain newlines or null characters");
+    }
+    if(parent_ != nullptr) {
+        aliases_.push_back(app_name);
+        const auto &res = _compare_subcommand_names(*this, *_get_fallthrough_parent());
+        if(!res.empty()) {
+            aliases_.pop_back();
+            throw(OptionAlreadyAdded("alias already matches an existing subcommand: " + app_name));
+        }
+    } else {
+        aliases_.push_back(app_name);
+    }
+
+    return this;
+}
+
+CLI11_INLINE App *App::immediate_callback(bool immediate) {
+    immediate_callback_ = immediate;
+    if(immediate_callback_) {
+        if(final_callback_ && !(parse_complete_callback_)) {
+            std::swap(final_callback_, parse_complete_callback_);
+        }
+    } else if(!(final_callback_) && parse_complete_callback_) {
+        std::swap(final_callback_, parse_complete_callback_);
+    }
+    return this;
+}
+
+CLI11_INLINE App *App::ignore_case(bool value) {
+    if(value && !ignore_case_) {
+        ignore_case_ = true;
+        auto *p = (parent_ != nullptr) ? _get_fallthrough_parent() : this;
+        const auto &match = _compare_subcommand_names(*this, *p);
+        if(!match.empty()) {
+            ignore_case_ = false;  // we are throwing so need to be exception invariant
+            throw OptionAlreadyAdded("ignore case would cause subcommand name conflicts: " + match);
+        }
+    }
+    ignore_case_ = value;
+    return this;
+}
+
+CLI11_INLINE App *App::ignore_underscore(bool value) {
+    if(value && !ignore_underscore_) {
+        ignore_underscore_ = true;
+        auto *p = (parent_ != nullptr) ? _get_fallthrough_parent() : this;
+        const auto &match = _compare_subcommand_names(*this, *p);
+        if(!match.empty()) {
+            ignore_underscore_ = false;
+            throw OptionAlreadyAdded("ignore underscore would cause subcommand name conflicts: " + match);
+        }
+    }
+    ignore_underscore_ = value;
+    return this;
+}
+
+CLI11_INLINE Option *App::add_option(std::string option_name,
+                                     callback_t option_callback,
+                                     std::string option_description,
+                                     bool defaulted,
+                                     std::function<std::string()> func) {
+    Option myopt{option_name, option_description, option_callback, this};
+
+    if(std::find_if(std::begin(options_), std::end(options_), [&myopt](const Option_p &v) { return *v == myopt; }) ==
+       std::end(options_)) {
+        options_.emplace_back();
+        Option_p &option = options_.back();
+        option.reset(new Option(option_name, option_description, option_callback, this));
+
+        // Set the default string capture function
+        option->default_function(func);
+
+        // For compatibility with CLI11 1.7 and before, capture the default string here
+        if(defaulted)
+            option->capture_default_str();
+
+        // Transfer defaults to the new option
+        option_defaults_.copy_to(option.get());
+
+        // Don't bother to capture if we already did
+        if(!defaulted && option->get_always_capture_default())
+            option->capture_default_str();
+
+        return option.get();
+    }
+    // we know something matches now find what it is so we can produce more error information
+    for(auto &opt : options_) {
+        const auto &matchname = opt->matching_name(myopt);
+        if(!matchname.empty()) {
+            throw(OptionAlreadyAdded("added option matched existing option name: " + matchname));
+        }
+    }
+    // this line should not be reached the above loop should trigger the throw
+    throw(OptionAlreadyAdded("added option matched existing option name"));  // LCOV_EXCL_LINE
+}
+
+CLI11_INLINE Option *App::set_help_flag(std::string flag_name, const std::string &help_description) {
+    // take flag_description by const reference otherwise add_flag tries to assign to help_description
+    if(help_ptr_ != nullptr) {
+        remove_option(help_ptr_);
+        help_ptr_ = nullptr;
+    }
+
+    // Empty name will simply remove the help flag
+    if(!flag_name.empty()) {
+        help_ptr_ = add_flag(flag_name, help_description);
+        help_ptr_->configurable(false);
+    }
+
+    return help_ptr_;
+}
+
+CLI11_INLINE Option *App::set_help_all_flag(std::string help_name, const std::string &help_description) {
+    // take flag_description by const reference otherwise add_flag tries to assign to flag_description
+    if(help_all_ptr_ != nullptr) {
+        remove_option(help_all_ptr_);
+        help_all_ptr_ = nullptr;
+    }
+
+    // Empty name will simply remove the help all flag
+    if(!help_name.empty()) {
+        help_all_ptr_ = add_flag(help_name, help_description);
+        help_all_ptr_->configurable(false);
+    }
+
+    return help_all_ptr_;
+}
+
+CLI11_INLINE Option *
+App::set_version_flag(std::string flag_name, const std::string &versionString, const std::string &version_help) {
+    // take flag_description by const reference otherwise add_flag tries to assign to version_description
+    if(version_ptr_ != nullptr) {
+        remove_option(version_ptr_);
+        version_ptr_ = nullptr;
+    }
+
+    // Empty name will simply remove the version flag
+    if(!flag_name.empty()) {
+        version_ptr_ = add_flag_callback(
+            flag_name, [versionString]() { throw(CLI::CallForVersion(versionString, 0)); }, version_help);
+        version_ptr_->configurable(false);
+    }
+
+    return version_ptr_;
+}
+
+CLI11_INLINE Option *
+App::set_version_flag(std::string flag_name, std::function<std::string()> vfunc, const std::string &version_help) {
+    if(version_ptr_ != nullptr) {
+        remove_option(version_ptr_);
+        version_ptr_ = nullptr;
+    }
+
+    // Empty name will simply remove the version flag
+    if(!flag_name.empty()) {
+        version_ptr_ = add_flag_callback(
+            flag_name, [vfunc]() { throw(CLI::CallForVersion(vfunc(), 0)); }, version_help);
+        version_ptr_->configurable(false);
+    }
+
+    return version_ptr_;
+}
+
+CLI11_INLINE Option *App::_add_flag_internal(std::string flag_name, CLI::callback_t fun, std::string flag_description) {
+    Option *opt = nullptr;
+    if(detail::has_default_flag_values(flag_name)) {
+        // check for default values and if it has them
+        auto flag_defaults = detail::get_default_flag_values(flag_name);
+        detail::remove_default_flag_values(flag_name);
+        opt = add_option(std::move(flag_name), std::move(fun), std::move(flag_description), false);
+        for(const auto &fname : flag_defaults)
+            opt->fnames_.push_back(fname.first);
+        opt->default_flag_values_ = std::move(flag_defaults);
+    } else {
+        opt = add_option(std::move(flag_name), std::move(fun), std::move(flag_description), false);
+    }
+    // flags cannot have positional values
+    if(opt->get_positional()) {
+        auto pos_name = opt->get_name(true);
+        remove_option(opt);
+        throw IncorrectConstruction::PositionalFlag(pos_name);
+    }
+    opt->multi_option_policy(MultiOptionPolicy::TakeLast);
+    opt->expected(0);
+    opt->required(false);
+    return opt;
+}
+
+CLI11_INLINE Option *App::add_flag_callback(std::string flag_name,
+                                            std::function<void(void)> function,  ///< A function to call, void(void)
+                                            std::string flag_description) {
+
+    CLI::callback_t fun = [function](const CLI::results_t &res) {
+        using CLI::detail::lexical_cast;
+        bool trigger{false};
+        auto result = lexical_cast(res[0], trigger);
+        if(result && trigger) {
+            function();
+        }
+        return result;
+    };
+    return _add_flag_internal(flag_name, std::move(fun), std::move(flag_description));
+}
+
+CLI11_INLINE Option *
+App::add_flag_function(std::string flag_name,
+                       std::function<void(std::int64_t)> function,  ///< A function to call, void(int)
+                       std::string flag_description) {
+
+    CLI::callback_t fun = [function](const CLI::results_t &res) {
+        using CLI::detail::lexical_cast;
+        std::int64_t flag_count{0};
+        lexical_cast(res[0], flag_count);
+        function(flag_count);
+        return true;
+    };
+    return _add_flag_internal(flag_name, std::move(fun), std::move(flag_description))
+        ->multi_option_policy(MultiOptionPolicy::Sum);
+}
+
+CLI11_INLINE Option *App::set_config(std::string option_name,
+                                     std::string default_filename,
+                                     const std::string &help_message,
+                                     bool config_required) {
+
+    // Remove existing config if present
+    if(config_ptr_ != nullptr) {
+        remove_option(config_ptr_);
+        config_ptr_ = nullptr;  // need to remove the config_ptr completely
+    }
+
+    // Only add config if option passed
+    if(!option_name.empty()) {
+        config_ptr_ = add_option(option_name, help_message);
+        if(config_required) {
+            config_ptr_->required();
+        }
+        if(!default_filename.empty()) {
+            config_ptr_->default_str(std::move(default_filename));
+        }
+        config_ptr_->configurable(false);
+    }
+
+    return config_ptr_;
+}
+
+CLI11_INLINE bool App::remove_option(Option *opt) {
+    // Make sure no links exist
+    for(Option_p &op : options_) {
+        op->remove_needs(opt);
+        op->remove_excludes(opt);
+    }
+
+    if(help_ptr_ == opt)
+        help_ptr_ = nullptr;
+    if(help_all_ptr_ == opt)
+        help_all_ptr_ = nullptr;
+
+    auto iterator =
+        std::find_if(std::begin(options_), std::end(options_), [opt](const Option_p &v) { return v.get() == opt; });
+    if(iterator != std::end(options_)) {
+        options_.erase(iterator);
+        return true;
+    }
+    return false;
+}
+
+CLI11_INLINE App *App::add_subcommand(std::string subcommand_name, std::string subcommand_description) {
+    if(!subcommand_name.empty() && !detail::valid_name_string(subcommand_name)) {
+        if(!detail::valid_first_char(subcommand_name[0])) {
+            throw IncorrectConstruction("Subcommand name starts with invalid character, '!' and '-' are not allowed");
+        }
+        for(auto c : subcommand_name) {
+            if(!detail::valid_later_char(c)) {
+                throw IncorrectConstruction(std::string("Subcommand name contains invalid character ('") + c +
+                                            "'), all characters are allowed except"
+                                            "'=',':','{','}', and ' '");
+            }
+        }
+    }
+    CLI::App_p subcom = std::shared_ptr<App>(new App(std::move(subcommand_description), subcommand_name, this));
+    return add_subcommand(std::move(subcom));
+}
+
+CLI11_INLINE App *App::add_subcommand(CLI::App_p subcom) {
+    if(!subcom)
+        throw IncorrectConstruction("passed App is not valid");
+    auto *ckapp = (name_.empty() && parent_ != nullptr) ? _get_fallthrough_parent() : this;
+    const auto &mstrg = _compare_subcommand_names(*subcom, *ckapp);
+    if(!mstrg.empty()) {
+        throw(OptionAlreadyAdded("subcommand name or alias matches existing subcommand: " + mstrg));
+    }
+    subcom->parent_ = this;
+    subcommands_.push_back(std::move(subcom));
+    return subcommands_.back().get();
+}
+
+CLI11_INLINE bool App::remove_subcommand(App *subcom) {
+    // Make sure no links exist
+    for(App_p &sub : subcommands_) {
+        sub->remove_excludes(subcom);
+        sub->remove_needs(subcom);
+    }
+
+    auto iterator = std::find_if(
+        std::begin(subcommands_), std::end(subcommands_), [subcom](const App_p &v) { return v.get() == subcom; });
+    if(iterator != std::end(subcommands_)) {
+        subcommands_.erase(iterator);
+        return true;
+    }
+    return false;
+}
+
+CLI11_INLINE App *App::get_subcommand(const App *subcom) const {
+    if(subcom == nullptr)
+        throw OptionNotFound("nullptr passed");
+    for(const App_p &subcomptr : subcommands_)
+        if(subcomptr.get() == subcom)
+            return subcomptr.get();
+    throw OptionNotFound(subcom->get_name());
+}
+
+CLI11_NODISCARD CLI11_INLINE App *App::get_subcommand(std::string subcom) const {
+    auto *subc = _find_subcommand(subcom, false, false);
+    if(subc == nullptr)
+        throw OptionNotFound(subcom);
+    return subc;
+}
+
+CLI11_NODISCARD CLI11_INLINE App *App::get_subcommand(int index) const {
+    if(index >= 0) {
+        auto uindex = static_cast<unsigned>(index);
+        if(uindex < subcommands_.size())
+            return subcommands_[uindex].get();
+    }
+    throw OptionNotFound(std::to_string(index));
+}
+
+CLI11_INLINE CLI::App_p App::get_subcommand_ptr(App *subcom) const {
+    if(subcom == nullptr)
+        throw OptionNotFound("nullptr passed");
+    for(const App_p &subcomptr : subcommands_)
+        if(subcomptr.get() == subcom)
+            return subcomptr;
+    throw OptionNotFound(subcom->get_name());
+}
+
+CLI11_NODISCARD CLI11_INLINE CLI::App_p App::get_subcommand_ptr(std::string subcom) const {
+    for(const App_p &subcomptr : subcommands_)
+        if(subcomptr->check_name(subcom))
+            return subcomptr;
+    throw OptionNotFound(subcom);
+}
+
+CLI11_NODISCARD CLI11_INLINE CLI::App_p App::get_subcommand_ptr(int index) const {
+    if(index >= 0) {
+        auto uindex = static_cast<unsigned>(index);
+        if(uindex < subcommands_.size())
+            return subcommands_[uindex];
+    }
+    throw OptionNotFound(std::to_string(index));
+}
+
+CLI11_NODISCARD CLI11_INLINE CLI::App *App::get_option_group(std::string group_name) const {
+    for(const App_p &app : subcommands_) {
+        if(app->name_.empty() && app->group_ == group_name) {
+            return app.get();
+        }
+    }
+    throw OptionNotFound(group_name);
+}
+
+CLI11_NODISCARD CLI11_INLINE std::size_t App::count_all() const {
+    std::size_t cnt{0};
+    for(const auto &opt : options_) {
+        cnt += opt->count();
+    }
+    for(const auto &sub : subcommands_) {
+        cnt += sub->count_all();
+    }
+    if(!get_name().empty()) {  // for named subcommands add the number of times the subcommand was called
+        cnt += parsed_;
+    }
+    return cnt;
+}
+
+CLI11_INLINE void App::clear() {
+
+    parsed_ = 0;
+    pre_parse_called_ = false;
+
+    missing_.clear();
+    parsed_subcommands_.clear();
+    for(const Option_p &opt : options_) {
+        opt->clear();
+    }
+    for(const App_p &subc : subcommands_) {
+        subc->clear();
+    }
+}
+
+CLI11_INLINE void App::parse(int argc, const char *const *argv) {
+    // If the name is not set, read from command line
+    if(name_.empty() || has_automatic_name_) {
+        has_automatic_name_ = true;
+        name_ = argv[0];
+    }
+
+    std::vector<std::string> args;
+    args.reserve(static_cast<std::size_t>(argc) - 1U);
+    for(auto i = static_cast<std::size_t>(argc) - 1U; i > 0U; --i)
+        args.emplace_back(argv[i]);
+    parse(std::move(args));
+}
+
+CLI11_INLINE void App::parse(std::string commandline, bool program_name_included) {
+
+    if(program_name_included) {
+        auto nstr = detail::split_program_name(commandline);
+        if((name_.empty()) || (has_automatic_name_)) {
+            has_automatic_name_ = true;
+            name_ = nstr.first;
+        }
+        commandline = std::move(nstr.second);
+    } else {
+        detail::trim(commandline);
+    }
+    // the next section of code is to deal with quoted arguments after an '=' or ':' for windows like operations
+    if(!commandline.empty()) {
+        commandline = detail::find_and_modify(commandline, "=", detail::escape_detect);
+        if(allow_windows_style_options_)
+            commandline = detail::find_and_modify(commandline, ":", detail::escape_detect);
+    }
+
+    auto args = detail::split_up(std::move(commandline));
+    // remove all empty strings
+    args.erase(std::remove(args.begin(), args.end(), std::string{}), args.end());
+    std::reverse(args.begin(), args.end());
+
+    parse(std::move(args));
+}
+
+CLI11_INLINE void App::parse(std::vector<std::string> &args) {
+    // Clear if parsed
+    if(parsed_ > 0)
+        clear();
+
+    // parsed_ is incremented in commands/subcommands,
+    // but placed here to make sure this is cleared when
+    // running parse after an error is thrown, even by _validate or _configure.
+    parsed_ = 1;
+    _validate();
+    _configure();
+    // set the parent as nullptr as this object should be the top now
+    parent_ = nullptr;
+    parsed_ = 0;
+
+    _parse(args);
+    run_callback();
+}
+
+CLI11_INLINE void App::parse(std::vector<std::string> &&args) {
+    // Clear if parsed
+    if(parsed_ > 0)
+        clear();
+
+    // parsed_ is incremented in commands/subcommands,
+    // but placed here to make sure this is cleared when
+    // running parse after an error is thrown, even by _validate or _configure.
+    parsed_ = 1;
+    _validate();
+    _configure();
+    // set the parent as nullptr as this object should be the top now
+    parent_ = nullptr;
+    parsed_ = 0;
+
+    _parse(std::move(args));
+    run_callback();
+}
+
+CLI11_INLINE void App::parse_from_stream(std::istream &input) {
+    if(parsed_ == 0) {
+        _validate();
+        _configure();
+        // set the parent as nullptr as this object should be the top now
+    }
+
+    _parse_stream(input);
+    run_callback();
+}
+
+CLI11_INLINE int App::exit(const Error &e, std::ostream &out, std::ostream &err) const {
+
+    /// Avoid printing anything if this is a CLI::RuntimeError
+    if(e.get_name() == "RuntimeError")
+        return e.get_exit_code();
+
+    if(e.get_name() == "CallForHelp") {
+        out << help();
+        return e.get_exit_code();
+    }
+
+    if(e.get_name() == "CallForAllHelp") {
+        out << help("", AppFormatMode::All);
+        return e.get_exit_code();
+    }
+
+    if(e.get_name() == "CallForVersion") {
+        out << e.what() << std::endl;
+        return e.get_exit_code();
+    }
+
+    if(e.get_exit_code() != static_cast<int>(ExitCodes::Success)) {
+        if(failure_message_)
+            err << failure_message_(this, e) << std::flush;
+    }
+
+    return e.get_exit_code();
+}
+
+CLI11_INLINE std::vector<const App *> App::get_subcommands(const std::function<bool(const App *)> &filter) const {
+    std::vector<const App *> subcomms(subcommands_.size());
+    std::transform(
+        std::begin(subcommands_), std::end(subcommands_), std::begin(subcomms), [](const App_p &v) { return v.get(); });
+
+    if(filter) {
+        subcomms.erase(std::remove_if(std::begin(subcomms),
+                                      std::end(subcomms),
+                                      [&filter](const App *app) { return !filter(app); }),
+                       std::end(subcomms));
+    }
+
+    return subcomms;
+}
+
+CLI11_INLINE std::vector<App *> App::get_subcommands(const std::function<bool(App *)> &filter) {
+    std::vector<App *> subcomms(subcommands_.size());
+    std::transform(
+        std::begin(subcommands_), std::end(subcommands_), std::begin(subcomms), [](const App_p &v) { return v.get(); });
+
+    if(filter) {
+        subcomms.erase(
+            std::remove_if(std::begin(subcomms), std::end(subcomms), [&filter](App *app) { return !filter(app); }),
+            std::end(subcomms));
+    }
+
+    return subcomms;
+}
+
+CLI11_INLINE bool App::remove_excludes(Option *opt) {
+    auto iterator = std::find(std::begin(exclude_options_), std::end(exclude_options_), opt);
+    if(iterator == std::end(exclude_options_)) {
+        return false;
+    }
+    exclude_options_.erase(iterator);
+    return true;
+}
+
+CLI11_INLINE bool App::remove_excludes(App *app) {
+    auto iterator = std::find(std::begin(exclude_subcommands_), std::end(exclude_subcommands_), app);
+    if(iterator == std::end(exclude_subcommands_)) {
+        return false;
+    }
+    auto *other_app = *iterator;
+    exclude_subcommands_.erase(iterator);
+    other_app->remove_excludes(this);
+    return true;
+}
+
+CLI11_INLINE bool App::remove_needs(Option *opt) {
+    auto iterator = std::find(std::begin(need_options_), std::end(need_options_), opt);
+    if(iterator == std::end(need_options_)) {
+        return false;
+    }
+    need_options_.erase(iterator);
+    return true;
+}
+
+CLI11_INLINE bool App::remove_needs(App *app) {
+    auto iterator = std::find(std::begin(need_subcommands_), std::end(need_subcommands_), app);
+    if(iterator == std::end(need_subcommands_)) {
+        return false;
+    }
+    need_subcommands_.erase(iterator);
+    return true;
+}
+
+CLI11_NODISCARD CLI11_INLINE std::string App::help(std::string prev, AppFormatMode mode) const {
+    if(prev.empty())
+        prev = get_name();
+    else
+        prev += " " + get_name();
+
+    // Delegate to subcommand if needed
+    auto selected_subcommands = get_subcommands();
+    if(!selected_subcommands.empty()) {
+        return selected_subcommands.back()->help(prev, mode);
+    }
+    return formatter_->make_help(this, prev, mode);
+}
+
+CLI11_NODISCARD CLI11_INLINE std::string App::version() const {
+    std::string val;
+    if(version_ptr_ != nullptr) {
+        auto rv = version_ptr_->results();
+        version_ptr_->clear();
+        version_ptr_->add_result("true");
+        try {
+            version_ptr_->run_callback();
+        } catch(const CLI::CallForVersion &cfv) {
+            val = cfv.what();
+        }
+        version_ptr_->clear();
+        version_ptr_->add_result(rv);
+    }
+    return val;
+}
+
+CLI11_INLINE std::vector<const Option *> App::get_options(const std::function<bool(const Option *)> filter) const {
+    std::vector<const Option *> options(options_.size());
+    std::transform(
+        std::begin(options_), std::end(options_), std::begin(options), [](const Option_p &val) { return val.get(); });
+
+    if(filter) {
+        options.erase(std::remove_if(std::begin(options),
+                                     std::end(options),
+                                     [&filter](const Option *opt) { return !filter(opt); }),
+                      std::end(options));
+    }
+
+    return options;
+}
+
+CLI11_INLINE std::vector<Option *> App::get_options(const std::function<bool(Option *)> filter) {
+    std::vector<Option *> options(options_.size());
+    std::transform(
+        std::begin(options_), std::end(options_), std::begin(options), [](const Option_p &val) { return val.get(); });
+
+    if(filter) {
+        options.erase(
+            std::remove_if(std::begin(options), std::end(options), [&filter](Option *opt) { return !filter(opt); }),
+            std::end(options));
+    }
+
+    return options;
+}
+
+CLI11_INLINE Option *App::get_option_no_throw(std::string option_name) noexcept {
+    for(Option_p &opt : options_) {
+        if(opt->check_name(option_name)) {
+            return opt.get();
+        }
+    }
+    for(auto &subc : subcommands_) {
+        // also check down into nameless subcommands
+        if(subc->get_name().empty()) {
+            auto *opt = subc->get_option_no_throw(option_name);
+            if(opt != nullptr) {
+                return opt;
+            }
+        }
+    }
+    return nullptr;
+}
+
+CLI11_NODISCARD CLI11_INLINE const Option *App::get_option_no_throw(std::string option_name) const noexcept {
+    for(const Option_p &opt : options_) {
+        if(opt->check_name(option_name)) {
+            return opt.get();
+        }
+    }
+    for(const auto &subc : subcommands_) {
+        // also check down into nameless subcommands
+        if(subc->get_name().empty()) {
+            auto *opt = subc->get_option_no_throw(option_name);
+            if(opt != nullptr) {
+                return opt;
+            }
+        }
+    }
+    return nullptr;
+}
+
+CLI11_NODISCARD CLI11_INLINE std::string App::get_display_name(bool with_aliases) const {
+    if(name_.empty()) {
+        return std::string("[Option Group: ") + get_group() + "]";
+    }
+    if(aliases_.empty() || !with_aliases) {
+        return name_;
+    }
+    std::string dispname = name_;
+    for(const auto &lalias : aliases_) {
+        dispname.push_back(',');
+        dispname.push_back(' ');
+        dispname.append(lalias);
+    }
+    return dispname;
+}
+
+CLI11_NODISCARD CLI11_INLINE bool App::check_name(std::string name_to_check) const {
+    std::string local_name = name_;
+    if(ignore_underscore_) {
+        local_name = detail::remove_underscore(name_);
+        name_to_check = detail::remove_underscore(name_to_check);
+    }
+    if(ignore_case_) {
+        local_name = detail::to_lower(name_);
+        name_to_check = detail::to_lower(name_to_check);
+    }
+
+    if(local_name == name_to_check) {
+        return true;
+    }
+    for(auto les : aliases_) {  // NOLINT(performance-for-range-copy)
+        if(ignore_underscore_) {
+            les = detail::remove_underscore(les);
+        }
+        if(ignore_case_) {
+            les = detail::to_lower(les);
+        }
+        if(les == name_to_check) {
+            return true;
+        }
+    }
+    return false;
+}
+
+CLI11_NODISCARD CLI11_INLINE std::vector<std::string> App::get_groups() const {
+    std::vector<std::string> groups;
+
+    for(const Option_p &opt : options_) {
+        // Add group if it is not already in there
+        if(std::find(groups.begin(), groups.end(), opt->get_group()) == groups.end()) {
+            groups.push_back(opt->get_group());
+        }
+    }
+
+    return groups;
+}
+
+CLI11_NODISCARD CLI11_INLINE std::vector<std::string> App::remaining(bool recurse) const {
+    std::vector<std::string> miss_list;
+    for(const std::pair<detail::Classifier, std::string> &miss : missing_) {
+        miss_list.push_back(std::get<1>(miss));
+    }
+    // Get from a subcommand that may allow extras
+    if(recurse) {
+        if(!allow_extras_) {
+            for(const auto &sub : subcommands_) {
+                if(sub->name_.empty() && !sub->missing_.empty()) {
+                    for(const std::pair<detail::Classifier, std::string> &miss : sub->missing_) {
+                        miss_list.push_back(std::get<1>(miss));
+                    }
+                }
+            }
+        }
+        // Recurse into subcommands
+
+        for(const App *sub : parsed_subcommands_) {
+            std::vector<std::string> output = sub->remaining(recurse);
+            std::copy(std::begin(output), std::end(output), std::back_inserter(miss_list));
+        }
+    }
+    return miss_list;
+}
+
+CLI11_NODISCARD CLI11_INLINE std::vector<std::string> App::remaining_for_passthrough(bool recurse) const {
+    std::vector<std::string> miss_list = remaining(recurse);
+    std::reverse(std::begin(miss_list), std::end(miss_list));
+    return miss_list;
+}
+
+CLI11_NODISCARD CLI11_INLINE std::size_t App::remaining_size(bool recurse) const {
+    auto remaining_options = static_cast<std::size_t>(std::count_if(
+        std::begin(missing_), std::end(missing_), [](const std::pair<detail::Classifier, std::string> &val) {
+            return val.first != detail::Classifier::POSITIONAL_MARK;
+        }));
+
+    if(recurse) {
+        for(const App_p &sub : subcommands_) {
+            remaining_options += sub->remaining_size(recurse);
+        }
+    }
+    return remaining_options;
+}
+
+CLI11_INLINE void App::_validate() const {
+    // count the number of positional only args
+    auto pcount = std::count_if(std::begin(options_), std::end(options_), [](const Option_p &opt) {
+        return opt->get_items_expected_max() >= detail::expected_max_vector_size && !opt->nonpositional();
+    });
+    if(pcount > 1) {
+        auto pcount_req = std::count_if(std::begin(options_), std::end(options_), [](const Option_p &opt) {
+            return opt->get_items_expected_max() >= detail::expected_max_vector_size && !opt->nonpositional() &&
+                   opt->get_required();
+        });
+        if(pcount - pcount_req > 1) {
+            throw InvalidError(name_);
+        }
+    }
+
+    std::size_t nameless_subs{0};
+    for(const App_p &app : subcommands_) {
+        app->_validate();
+        if(app->get_name().empty())
+            ++nameless_subs;
+    }
+
+    if(require_option_min_ > 0) {
+        if(require_option_max_ > 0) {
+            if(require_option_max_ < require_option_min_) {
+                throw(InvalidError("Required min options greater than required max options", ExitCodes::InvalidError));
+            }
+        }
+        if(require_option_min_ > (options_.size() + nameless_subs)) {
+            throw(
+                InvalidError("Required min options greater than number of available options", ExitCodes::InvalidError));
+        }
+    }
+}
+
+CLI11_INLINE void App::_configure() {
+    if(default_startup == startup_mode::enabled) {
+        disabled_ = false;
+    } else if(default_startup == startup_mode::disabled) {
+        disabled_ = true;
+    }
+    for(const App_p &app : subcommands_) {
+        if(app->has_automatic_name_) {
+            app->name_.clear();
+        }
+        if(app->name_.empty()) {
+            app->fallthrough_ = false;  // make sure fallthrough_ is false to prevent infinite loop
+            app->prefix_command_ = false;
+        }
+        // make sure the parent is set to be this object in preparation for parse
+        app->parent_ = this;
+        app->_configure();
+    }
+}
+
+CLI11_INLINE void App::run_callback(bool final_mode, bool suppress_final_callback) {
+    pre_callback();
+    // in the main app if immediate_callback_ is set it runs the main callback before the used subcommands
+    if(!final_mode && parse_complete_callback_) {
+        parse_complete_callback_();
+    }
+    // run the callbacks for the received subcommands
+    for(App *subc : get_subcommands()) {
+        if(subc->parent_ == this) {
+            subc->run_callback(true, suppress_final_callback);
+        }
+    }
+    // now run callbacks for option_groups
+    for(auto &subc : subcommands_) {
+        if(subc->name_.empty() && subc->count_all() > 0) {
+            subc->run_callback(true, suppress_final_callback);
+        }
+    }
+
+    // finally run the main callback
+    if(final_callback_ && (parsed_ > 0) && (!suppress_final_callback)) {
+        if(!name_.empty() || count_all() > 0 || parent_ == nullptr) {
+            final_callback_();
+        }
+    }
+}
+
+CLI11_NODISCARD CLI11_INLINE bool App::_valid_subcommand(const std::string &current, bool ignore_used) const {
+    // Don't match if max has been reached - but still check parents
+    if(require_subcommand_max_ != 0 && parsed_subcommands_.size() >= require_subcommand_max_) {
+        return parent_ != nullptr && parent_->_valid_subcommand(current, ignore_used);
+    }
+    auto *com = _find_subcommand(current, true, ignore_used);
+    if(com != nullptr) {
+        return true;
+    }
+    // Check parent if exists, else return false
+    return parent_ != nullptr && parent_->_valid_subcommand(current, ignore_used);
+}
+
+CLI11_NODISCARD CLI11_INLINE detail::Classifier App::_recognize(const std::string &current,
+                                                                bool ignore_used_subcommands) const {
+    std::string dummy1, dummy2;
+
+    if(current == "--")
+        return detail::Classifier::POSITIONAL_MARK;
+    if(_valid_subcommand(current, ignore_used_subcommands))
+        return detail::Classifier::SUBCOMMAND;
+    if(detail::split_long(current, dummy1, dummy2))
+        return detail::Classifier::LONG;
+    if(detail::split_short(current, dummy1, dummy2)) {
+        if(dummy1[0] >= '0' && dummy1[0] <= '9') {
+            if(get_option_no_throw(std::string{'-', dummy1[0]}) == nullptr) {
+                return detail::Classifier::NONE;
+            }
+        }
+        return detail::Classifier::SHORT;
+    }
+    if((allow_windows_style_options_) && (detail::split_windows_style(current, dummy1, dummy2)))
+        return detail::Classifier::WINDOWS_STYLE;
+    if((current == "++") && !name_.empty() && parent_ != nullptr)
+        return detail::Classifier::SUBCOMMAND_TERMINATOR;
+    return detail::Classifier::NONE;
+}
+
+CLI11_INLINE void App::_process_config_file() {
+    if(config_ptr_ != nullptr) {
+        bool config_required = config_ptr_->get_required();
+        auto file_given = config_ptr_->count() > 0;
+        auto config_files = config_ptr_->as<std::vector<std::string>>();
+        if(config_files.empty() || config_files.front().empty()) {
+            if(config_required) {
+                throw FileError::Missing("no specified config file");
+            }
+            return;
+        }
+        for(auto rit = config_files.rbegin(); rit != config_files.rend(); ++rit) {
+            const auto &config_file = *rit;
+            auto path_result = detail::check_path(config_file.c_str());
+            if(path_result == detail::path_type::file) {
+                try {
+                    std::vector<ConfigItem> values = config_formatter_->from_file(config_file);
+                    _parse_config(values);
+                    if(!file_given) {
+                        config_ptr_->add_result(config_file);
+                    }
+                } catch(const FileError &) {
+                    if(config_required || file_given)
+                        throw;
+                }
+            } else if(config_required || file_given) {
+                throw FileError::Missing(config_file);
+            }
+        }
+    }
+}
+
+CLI11_INLINE void App::_process_env() {
+    for(const Option_p &opt : options_) {
+        if(opt->count() == 0 && !opt->envname_.empty()) {
+            char *buffer = nullptr;
+            std::string ename_string;
+
+#ifdef _MSC_VER
+            // Windows version
+            std::size_t sz = 0;
+            if(_dupenv_s(&buffer, &sz, opt->envname_.c_str()) == 0 && buffer != nullptr) {
+                ename_string = std::string(buffer);
+                free(buffer);
+            }
+#else
+            // This also works on Windows, but gives a warning
+            buffer = std::getenv(opt->envname_.c_str());
+            if(buffer != nullptr)
+                ename_string = std::string(buffer);
+#endif
+
+            if(!ename_string.empty()) {
+                opt->add_result(ename_string);
+            }
+        }
+    }
+
+    for(App_p &sub : subcommands_) {
+        if(sub->get_name().empty() || !sub->parse_complete_callback_)
+            sub->_process_env();
+    }
+}
+
+CLI11_INLINE void App::_process_callbacks() {
+
+    for(App_p &sub : subcommands_) {
+        // process the priority option_groups first
+        if(sub->get_name().empty() && sub->parse_complete_callback_) {
+            if(sub->count_all() > 0) {
+                sub->_process_callbacks();
+                sub->run_callback();
+            }
+        }
+    }
+
+    for(const Option_p &opt : options_) {
+        if((*opt) && !opt->get_callback_run()) {
+            opt->run_callback();
+        }
+    }
+    for(App_p &sub : subcommands_) {
+        if(!sub->parse_complete_callback_) {
+            sub->_process_callbacks();
+        }
+    }
+}
+
+CLI11_INLINE void App::_process_help_flags(bool trigger_help, bool trigger_all_help) const {
+    const Option *help_ptr = get_help_ptr();
+    const Option *help_all_ptr = get_help_all_ptr();
+
+    if(help_ptr != nullptr && help_ptr->count() > 0)
+        trigger_help = true;
+    if(help_all_ptr != nullptr && help_all_ptr->count() > 0)
+        trigger_all_help = true;
+
+    // If there were parsed subcommands, call those. First subcommand wins if there are multiple ones.
+    if(!parsed_subcommands_.empty()) {
+        for(const App *sub : parsed_subcommands_)
+            sub->_process_help_flags(trigger_help, trigger_all_help);
+
+        // Only the final subcommand should call for help. All help wins over help.
+    } else if(trigger_all_help) {
+        throw CallForAllHelp();
+    } else if(trigger_help) {
+        throw CallForHelp();
+    }
+}
+
+CLI11_INLINE void App::_process_requirements() {
+    // check excludes
+    bool excluded{false};
+    std::string excluder;
+    for(const auto &opt : exclude_options_) {
+        if(opt->count() > 0) {
+            excluded = true;
+            excluder = opt->get_name();
+        }
+    }
+    for(const auto &subc : exclude_subcommands_) {
+        if(subc->count_all() > 0) {
+            excluded = true;
+            excluder = subc->get_display_name();
+        }
+    }
+    if(excluded) {
+        if(count_all() > 0) {
+            throw ExcludesError(get_display_name(), excluder);
+        }
+        // if we are excluded but didn't receive anything, just return
+        return;
+    }
+
+    // check excludes
+    bool missing_needed{false};
+    std::string missing_need;
+    for(const auto &opt : need_options_) {
+        if(opt->count() == 0) {
+            missing_needed = true;
+            missing_need = opt->get_name();
+        }
+    }
+    for(const auto &subc : need_subcommands_) {
+        if(subc->count_all() == 0) {
+            missing_needed = true;
+            missing_need = subc->get_display_name();
+        }
+    }
+    if(missing_needed) {
+        if(count_all() > 0) {
+            throw RequiresError(get_display_name(), missing_need);
+        }
+        // if we missing something but didn't have any options, just return
+        return;
+    }
+
+    std::size_t used_options = 0;
+    for(const Option_p &opt : options_) {
+
+        if(opt->count() != 0) {
+            ++used_options;
+        }
+        // Required but empty
+        if(opt->get_required() && opt->count() == 0) {
+            throw RequiredError(opt->get_name());
+        }
+        // Requires
+        for(const Option *opt_req : opt->needs_)
+            if(opt->count() > 0 && opt_req->count() == 0)
+                throw RequiresError(opt->get_name(), opt_req->get_name());
+        // Excludes
+        for(const Option *opt_ex : opt->excludes_)
+            if(opt->count() > 0 && opt_ex->count() != 0)
+                throw ExcludesError(opt->get_name(), opt_ex->get_name());
+    }
+    // check for the required number of subcommands
+    if(require_subcommand_min_ > 0) {
+        auto selected_subcommands = get_subcommands();
+        if(require_subcommand_min_ > selected_subcommands.size())
+            throw RequiredError::Subcommand(require_subcommand_min_);
+    }
+
+    // Max error cannot occur, the extra subcommand will parse as an ExtrasError or a remaining item.
+
+    // run this loop to check how many unnamed subcommands were actually used since they are considered options
+    // from the perspective of an App
+    for(App_p &sub : subcommands_) {
+        if(sub->disabled_)
+            continue;
+        if(sub->name_.empty() && sub->count_all() > 0) {
+            ++used_options;
+        }
+    }
+
+    if(require_option_min_ > used_options || (require_option_max_ > 0 && require_option_max_ < used_options)) {
+        auto option_list = detail::join(options_, [this](const Option_p &ptr) {
+            if(ptr.get() == help_ptr_ || ptr.get() == help_all_ptr_) {
+                return std::string{};
+            }
+            return ptr->get_name(false, true);
+        });
+
+        auto subc_list = get_subcommands([](App *app) { return ((app->get_name().empty()) && (!app->disabled_)); });
+        if(!subc_list.empty()) {
+            option_list += "," + detail::join(subc_list, [](const App *app) { return app->get_display_name(); });
+        }
+        throw RequiredError::Option(require_option_min_, require_option_max_, used_options, option_list);
+    }
+
+    // now process the requirements for subcommands if needed
+    for(App_p &sub : subcommands_) {
+        if(sub->disabled_)
+            continue;
+        if(sub->name_.empty() && sub->required_ == false) {
+            if(sub->count_all() == 0) {
+                if(require_option_min_ > 0 && require_option_min_ <= used_options) {
+                    continue;
+                    // if we have met the requirement and there is nothing in this option group skip checking
+                    // requirements
+                }
+                if(require_option_max_ > 0 && used_options >= require_option_min_) {
+                    continue;
+                    // if we have met the requirement and there is nothing in this option group skip checking
+                    // requirements
+                }
+            }
+        }
+        if(sub->count() > 0 || sub->name_.empty()) {
+            sub->_process_requirements();
+        }
+
+        if(sub->required_ && sub->count_all() == 0) {
+            throw(CLI::RequiredError(sub->get_display_name()));
+        }
+    }
+}
+
+CLI11_INLINE void App::_process() {
+    try {
+        // the config file might generate a FileError but that should not be processed until later in the process
+        // to allow for help, version and other errors to generate first.
+        _process_config_file();
+
+        // process env shouldn't throw but no reason to process it if config generated an error
+        _process_env();
+    } catch(const CLI::FileError &) {
+        // callbacks and help_flags can generate exceptions which should take priority
+        // over the config file error if one exists.
+        _process_callbacks();
+        _process_help_flags();
+        throw;
+    }
+
+    _process_callbacks();
+    _process_help_flags();
+
+    _process_requirements();
+}
+
+CLI11_INLINE void App::_process_extras() {
+    if(!(allow_extras_ || prefix_command_)) {
+        std::size_t num_left_over = remaining_size();
+        if(num_left_over > 0) {
+            throw ExtrasError(name_, remaining(false));
+        }
+    }
+
+    for(App_p &sub : subcommands_) {
+        if(sub->count() > 0)
+            sub->_process_extras();
+    }
+}
+
+CLI11_INLINE void App::_process_extras(std::vector<std::string> &args) {
+    if(!(allow_extras_ || prefix_command_)) {
+        std::size_t num_left_over = remaining_size();
+        if(num_left_over > 0) {
+            args = remaining(false);
+            throw ExtrasError(name_, args);
+        }
+    }
+
+    for(App_p &sub : subcommands_) {
+        if(sub->count() > 0)
+            sub->_process_extras(args);
+    }
+}
+
+CLI11_INLINE void App::increment_parsed() {
+    ++parsed_;
+    for(App_p &sub : subcommands_) {
+        if(sub->get_name().empty())
+            sub->increment_parsed();
+    }
+}
+
+CLI11_INLINE void App::_parse(std::vector<std::string> &args) {
+    increment_parsed();
+    _trigger_pre_parse(args.size());
+    bool positional_only = false;
+
+    while(!args.empty()) {
+        if(!_parse_single(args, positional_only)) {
+            break;
+        }
+    }
+
+    if(parent_ == nullptr) {
+        _process();
+
+        // Throw error if any items are left over (depending on settings)
+        _process_extras(args);
+
+        // Convert missing (pairs) to extras (string only) ready for processing in another app
+        args = remaining_for_passthrough(false);
+    } else if(parse_complete_callback_) {
+        _process_env();
+        _process_callbacks();
+        _process_help_flags();
+        _process_requirements();
+        run_callback(false, true);
+    }
+}
+
+CLI11_INLINE void App::_parse(std::vector<std::string> &&args) {
+    // this can only be called by the top level in which case parent == nullptr by definition
+    // operation is simplified
+    increment_parsed();
+    _trigger_pre_parse(args.size());
+    bool positional_only = false;
+
+    while(!args.empty()) {
+        _parse_single(args, positional_only);
+    }
+    _process();
+
+    // Throw error if any items are left over (depending on settings)
+    _process_extras();
+}
+
+CLI11_INLINE void App::_parse_stream(std::istream &input) {
+    auto values = config_formatter_->from_config(input);
+    _parse_config(values);
+    increment_parsed();
+    _trigger_pre_parse(values.size());
+    _process();
+
+    // Throw error if any items are left over (depending on settings)
+    _process_extras();
+}
+
+CLI11_INLINE void App::_parse_config(const std::vector<ConfigItem> &args) {
+    for(const ConfigItem &item : args) {
+        if(!_parse_single_config(item) && allow_config_extras_ == config_extras_mode::error)
+            throw ConfigError::Extras(item.fullname());
+    }
+}
+
+CLI11_INLINE bool App::_parse_single_config(const ConfigItem &item, std::size_t level) {
+    if(level < item.parents.size()) {
+        try {
+            auto *subcom = get_subcommand(item.parents.at(level));
+            auto result = subcom->_parse_single_config(item, level + 1);
+
+            return result;
+        } catch(const OptionNotFound &) {
+            return false;
+        }
+    }
+    // check for section open
+    if(item.name == "++") {
+        if(configurable_) {
+            increment_parsed();
+            _trigger_pre_parse(2);
+            if(parent_ != nullptr) {
+                parent_->parsed_subcommands_.push_back(this);
+            }
+        }
+        return true;
+    }
+    // check for section close
+    if(item.name == "--") {
+        if(configurable_ && parse_complete_callback_) {
+            _process_callbacks();
+            _process_requirements();
+            run_callback();
+        }
+        return true;
+    }
+    Option *op = get_option_no_throw("--" + item.name);
+    if(op == nullptr) {
+        if(item.name.size() == 1) {
+            op = get_option_no_throw("-" + item.name);
+        }
+    }
+    if(op == nullptr) {
+        op = get_option_no_throw(item.name);
+    }
+    if(op == nullptr) {
+        // If the option was not present
+        if(get_allow_config_extras() == config_extras_mode::capture)
+            // Should we worry about classifying the extras properly?
+            missing_.emplace_back(detail::Classifier::NONE, item.fullname());
+        return false;
+    }
+
+    if(!op->get_configurable()) {
+        if(get_allow_config_extras() == config_extras_mode::ignore_all) {
+            return false;
+        }
+        throw ConfigError::NotConfigurable(item.fullname());
+    }
+
+    if(op->empty()) {
+
+        if(op->get_expected_min() == 0) {
+            if(item.inputs.size() <= 1) {
+                // Flag parsing
+                auto res = config_formatter_->to_flag(item);
+                bool converted{false};
+                if(op->get_disable_flag_override()) {
+
+                    try {
+                        auto val = detail::to_flag_value(res);
+                        if(val == 1) {
+                            res = op->get_flag_value(item.name, "{}");
+                            converted = true;
+                        }
+                    } catch(...) {
+                    }
+                }
+
+                if(!converted) {
+                    res = op->get_flag_value(item.name, res);
+                }
+
+                op->add_result(res);
+                return true;
+            }
+            if(static_cast<int>(item.inputs.size()) > op->get_items_expected_max()) {
+                if(op->get_items_expected_max() > 1) {
+                    throw ArgumentMismatch::AtMost(item.fullname(), op->get_items_expected_max(), item.inputs.size());
+                }
+                throw ConversionError::TooManyInputsFlag(item.fullname());
+            }
+        }
+        op->add_result(item.inputs);
+        op->run_callback();
+    }
+
+    return true;
+}
+
+CLI11_INLINE bool App::_parse_single(std::vector<std::string> &args, bool &positional_only) {
+    bool retval = true;
+    detail::Classifier classifier = positional_only ? detail::Classifier::NONE : _recognize(args.back());
+    switch(classifier) {
+    case detail::Classifier::POSITIONAL_MARK:
+        args.pop_back();
+        positional_only = true;
+        if((!_has_remaining_positionals()) && (parent_ != nullptr)) {
+            retval = false;
+        } else {
+            _move_to_missing(classifier, "--");
+        }
+        break;
+    case detail::Classifier::SUBCOMMAND_TERMINATOR:
+        // treat this like a positional mark if in the parent app
+        args.pop_back();
+        retval = false;
+        break;
+    case detail::Classifier::SUBCOMMAND:
+        retval = _parse_subcommand(args);
+        break;
+    case detail::Classifier::LONG:
+    case detail::Classifier::SHORT:
+    case detail::Classifier::WINDOWS_STYLE:
+        // If already parsed a subcommand, don't accept options_
+        _parse_arg(args, classifier);
+        break;
+    case detail::Classifier::NONE:
+        // Probably a positional or something for a parent (sub)command
+        retval = _parse_positional(args, false);
+        if(retval && positionals_at_end_) {
+            positional_only = true;
+        }
+        break;
+        // LCOV_EXCL_START
+    default:
+        throw HorribleError("unrecognized classifier (you should not see this!)");
+        // LCOV_EXCL_STOP
+    }
+    return retval;
+}
+
+CLI11_NODISCARD CLI11_INLINE std::size_t App::_count_remaining_positionals(bool required_only) const {
+    std::size_t retval = 0;
+    for(const Option_p &opt : options_) {
+        if(opt->get_positional() && (!required_only || opt->get_required())) {
+            if(opt->get_items_expected_min() > 0 && static_cast<int>(opt->count()) < opt->get_items_expected_min()) {
+                retval += static_cast<std::size_t>(opt->get_items_expected_min()) - opt->count();
+            }
+        }
+    }
+    return retval;
+}
+
+CLI11_NODISCARD CLI11_INLINE bool App::_has_remaining_positionals() const {
+    for(const Option_p &opt : options_) {
+        if(opt->get_positional() && ((static_cast<int>(opt->count()) < opt->get_items_expected_min()))) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+CLI11_INLINE bool App::_parse_positional(std::vector<std::string> &args, bool haltOnSubcommand) {
+
+    const std::string &positional = args.back();
+
+    if(positionals_at_end_) {
+        // deal with the case of required arguments at the end which should take precedence over other arguments
+        auto arg_rem = args.size();
+        auto remreq = _count_remaining_positionals(true);
+        if(arg_rem <= remreq) {
+            for(const Option_p &opt : options_) {
+                if(opt->get_positional() && opt->required_) {
+                    if(static_cast<int>(opt->count()) < opt->get_items_expected_min()) {
+                        if(validate_positionals_) {
+                            std::string pos = positional;
+                            pos = opt->_validate(pos, 0);
+                            if(!pos.empty()) {
+                                continue;
+                            }
+                        }
+
+                        parse_order_.push_back(opt.get());
+                        /// if we require a separator add it here
+                        if(opt->get_inject_separator()) {
+                            if(!opt->results().empty() && !opt->results().back().empty()) {
+                                opt->add_result(std::string{});
+                            }
+                        }
+                        if(opt->get_trigger_on_parse() &&
+                           opt->current_option_state_ == Option::option_state::callback_run) {
+                            opt->clear();
+                        }
+                        opt->add_result(positional);
+                        if(opt->get_trigger_on_parse()) {
+                            opt->run_callback();
+                        }
+                        args.pop_back();
+                        return true;
+                    }
+                }
+            }
+        }
+    }
+    for(const Option_p &opt : options_) {
+        // Eat options, one by one, until done
+        if(opt->get_positional() &&
+           (static_cast<int>(opt->count()) < opt->get_items_expected_min() || opt->get_allow_extra_args())) {
+            if(validate_positionals_) {
+                std::string pos = positional;
+                pos = opt->_validate(pos, 0);
+                if(!pos.empty()) {
+                    continue;
+                }
+            }
+            if(opt->get_inject_separator()) {
+                if(!opt->results().empty() && !opt->results().back().empty()) {
+                    opt->add_result(std::string{});
+                }
+            }
+            if(opt->get_trigger_on_parse() && opt->current_option_state_ == Option::option_state::callback_run) {
+                opt->clear();
+            }
+            opt->add_result(positional);
+            if(opt->get_trigger_on_parse()) {
+                opt->run_callback();
+            }
+            parse_order_.push_back(opt.get());
+            args.pop_back();
+            return true;
+        }
+    }
+
+    for(auto &subc : subcommands_) {
+        if((subc->name_.empty()) && (!subc->disabled_)) {
+            if(subc->_parse_positional(args, false)) {
+                if(!subc->pre_parse_called_) {
+                    subc->_trigger_pre_parse(args.size());
+                }
+                return true;
+            }
+        }
+    }
+    // let the parent deal with it if possible
+    if(parent_ != nullptr && fallthrough_)
+        return _get_fallthrough_parent()->_parse_positional(args, static_cast<bool>(parse_complete_callback_));
+
+    /// Try to find a local subcommand that is repeated
+    auto *com = _find_subcommand(args.back(), true, false);
+    if(com != nullptr && (require_subcommand_max_ == 0 || require_subcommand_max_ > parsed_subcommands_.size())) {
+        if(haltOnSubcommand) {
+            return false;
+        }
+        args.pop_back();
+        com->_parse(args);
+        return true;
+    }
+    /// now try one last gasp at subcommands that have been executed before, go to root app and try to find a
+    /// subcommand in a broader way, if one exists let the parent deal with it
+    auto *parent_app = (parent_ != nullptr) ? _get_fallthrough_parent() : this;
+    com = parent_app->_find_subcommand(args.back(), true, false);
+    if(com != nullptr && (com->parent_->require_subcommand_max_ == 0 ||
+                          com->parent_->require_subcommand_max_ > com->parent_->parsed_subcommands_.size())) {
+        return false;
+    }
+
+    if(positionals_at_end_) {
+        throw CLI::ExtrasError(name_, args);
+    }
+    /// If this is an option group don't deal with it
+    if(parent_ != nullptr && name_.empty()) {
+        return false;
+    }
+    /// We are out of other options this goes to missing
+    _move_to_missing(detail::Classifier::NONE, positional);
+    args.pop_back();
+    if(prefix_command_) {
+        while(!args.empty()) {
+            _move_to_missing(detail::Classifier::NONE, args.back());
+            args.pop_back();
+        }
+    }
+
+    return true;
+}
+
+CLI11_NODISCARD CLI11_INLINE App *
+App::_find_subcommand(const std::string &subc_name, bool ignore_disabled, bool ignore_used) const noexcept {
+    for(const App_p &com : subcommands_) {
+        if(com->disabled_ && ignore_disabled)
+            continue;
+        if(com->get_name().empty()) {
+            auto *subc = com->_find_subcommand(subc_name, ignore_disabled, ignore_used);
+            if(subc != nullptr) {
+                return subc;
+            }
+        }
+        if(com->check_name(subc_name)) {
+            if((!*com) || !ignore_used)
+                return com.get();
+        }
+    }
+    return nullptr;
+}
+
+CLI11_INLINE bool App::_parse_subcommand(std::vector<std::string> &args) {
+    if(_count_remaining_positionals(/* required */ true) > 0) {
+        _parse_positional(args, false);
+        return true;
+    }
+    auto *com = _find_subcommand(args.back(), true, true);
+    if(com != nullptr) {
+        args.pop_back();
+        if(!com->silent_) {
+            parsed_subcommands_.push_back(com);
+        }
+        com->_parse(args);
+        auto *parent_app = com->parent_;
+        while(parent_app != this) {
+            parent_app->_trigger_pre_parse(args.size());
+            if(!com->silent_) {
+                parent_app->parsed_subcommands_.push_back(com);
+            }
+            parent_app = parent_app->parent_;
+        }
+        return true;
+    }
+
+    if(parent_ == nullptr)
+        throw HorribleError("Subcommand " + args.back() + " missing");
+    return false;
+}
+
+CLI11_INLINE bool App::_parse_arg(std::vector<std::string> &args, detail::Classifier current_type) {
+
+    std::string current = args.back();
+
+    std::string arg_name;
+    std::string value;
+    std::string rest;
+
+    switch(current_type) {
+    case detail::Classifier::LONG:
+        if(!detail::split_long(current, arg_name, value))
+            throw HorribleError("Long parsed but missing (you should not see this):" + args.back());
+        break;
+    case detail::Classifier::SHORT:
+        if(!detail::split_short(current, arg_name, rest))
+            throw HorribleError("Short parsed but missing! You should not see this");
+        break;
+    case detail::Classifier::WINDOWS_STYLE:
+        if(!detail::split_windows_style(current, arg_name, value))
+            throw HorribleError("windows option parsed but missing! You should not see this");
+        break;
+    case detail::Classifier::SUBCOMMAND:
+    case detail::Classifier::SUBCOMMAND_TERMINATOR:
+    case detail::Classifier::POSITIONAL_MARK:
+    case detail::Classifier::NONE:
+    default:
+        throw HorribleError("parsing got called with invalid option! You should not see this");
+    }
+
+    auto op_ptr = std::find_if(std::begin(options_), std::end(options_), [arg_name, current_type](const Option_p &opt) {
+        if(current_type == detail::Classifier::LONG)
+            return opt->check_lname(arg_name);
+        if(current_type == detail::Classifier::SHORT)
+            return opt->check_sname(arg_name);
+        // this will only get called for detail::Classifier::WINDOWS_STYLE
+        return opt->check_lname(arg_name) || opt->check_sname(arg_name);
+    });
+
+    // Option not found
+    if(op_ptr == std::end(options_)) {
+        for(auto &subc : subcommands_) {
+            if(subc->name_.empty() && !subc->disabled_) {
+                if(subc->_parse_arg(args, current_type)) {
+                    if(!subc->pre_parse_called_) {
+                        subc->_trigger_pre_parse(args.size());
+                    }
+                    return true;
+                }
+            }
+        }
+
+        // don't capture missing if this is a nameless subcommand and nameless subcommands can't fallthrough
+        if(parent_ != nullptr && name_.empty()) {
+            return false;
+        }
+
+        // If a subcommand, try the main command
+        if(parent_ != nullptr && fallthrough_)
+            return _get_fallthrough_parent()->_parse_arg(args, current_type);
+
+        // Otherwise, add to missing
+        args.pop_back();
+        _move_to_missing(current_type, current);
+        return true;
+    }
+
+    args.pop_back();
+
+    // Get a reference to the pointer to make syntax bearable
+    Option_p &op = *op_ptr;
+    /// if we require a separator add it here
+    if(op->get_inject_separator()) {
+        if(!op->results().empty() && !op->results().back().empty()) {
+            op->add_result(std::string{});
+        }
+    }
+    if(op->get_trigger_on_parse() && op->current_option_state_ == Option::option_state::callback_run) {
+        op->clear();
+    }
+    int min_num = (std::min)(op->get_type_size_min(), op->get_items_expected_min());
+    int max_num = op->get_items_expected_max();
+    // check container like options to limit the argument size to a single type if the allow_extra_flags argument is
+    // set. 16 is somewhat arbitrary (needs to be at least 4)
+    if(max_num >= detail::expected_max_vector_size / 16 && !op->get_allow_extra_args()) {
+        auto tmax = op->get_type_size_max();
+        max_num = detail::checked_multiply(tmax, op->get_expected_min()) ? tmax : detail::expected_max_vector_size;
+    }
+    // Make sure we always eat the minimum for unlimited vectors
+    int collected = 0;     // total number of arguments collected
+    int result_count = 0;  // local variable for number of results in a single arg string
+    // deal with purely flag like things
+    if(max_num == 0) {
+        auto res = op->get_flag_value(arg_name, value);
+        op->add_result(res);
+        parse_order_.push_back(op.get());
+    } else if(!value.empty()) {  // --this=value
+        op->add_result(value, result_count);
+        parse_order_.push_back(op.get());
+        collected += result_count;
+        // -Trest
+    } else if(!rest.empty()) {
+        op->add_result(rest, result_count);
+        parse_order_.push_back(op.get());
+        rest = "";
+        collected += result_count;
+    }
+
+    // gather the minimum number of arguments
+    while(min_num > collected && !args.empty()) {
+        std::string current_ = args.back();
+        args.pop_back();
+        op->add_result(current_, result_count);
+        parse_order_.push_back(op.get());
+        collected += result_count;
+    }
+
+    if(min_num > collected) {  // if we have run out of arguments and the minimum was not met
+        throw ArgumentMismatch::TypedAtLeast(op->get_name(), min_num, op->get_type_name());
+    }
+
+    // now check for optional arguments
+    if(max_num > collected || op->get_allow_extra_args()) {  // we allow optional arguments
+        auto remreqpos = _count_remaining_positionals(true);
+        // we have met the minimum now optionally check up to the maximum
+        while((collected < max_num || op->get_allow_extra_args()) && !args.empty() &&
+              _recognize(args.back(), false) == detail::Classifier::NONE) {
+            // If any required positionals remain, don't keep eating
+            if(remreqpos >= args.size()) {
+                break;
+            }
+            if(validate_optional_arguments_) {
+                std::string arg = args.back();
+                arg = op->_validate(arg, 0);
+                if(!arg.empty()) {
+                    break;
+                }
+            }
+            op->add_result(args.back(), result_count);
+            parse_order_.push_back(op.get());
+            args.pop_back();
+            collected += result_count;
+        }
+
+        // Allow -- to end an unlimited list and "eat" it
+        if(!args.empty() && _recognize(args.back()) == detail::Classifier::POSITIONAL_MARK)
+            args.pop_back();
+        // optional flag that didn't receive anything now get the default value
+        if(min_num == 0 && max_num > 0 && collected == 0) {
+            auto res = op->get_flag_value(arg_name, std::string{});
+            op->add_result(res);
+            parse_order_.push_back(op.get());
+        }
+    }
+    // if we only partially completed a type then add an empty string if allowed for later processing
+    if(min_num > 0 && (collected % op->get_type_size_max()) != 0) {
+        if(op->get_type_size_max() != op->get_type_size_min()) {
+            op->add_result(std::string{});
+        } else {
+            throw ArgumentMismatch::PartialType(op->get_name(), op->get_type_size_min(), op->get_type_name());
+        }
+    }
+    if(op->get_trigger_on_parse()) {
+        op->run_callback();
+    }
+    if(!rest.empty()) {
+        rest = "-" + rest;
+        args.push_back(rest);
+    }
+    return true;
+}
+
+CLI11_INLINE void App::_trigger_pre_parse(std::size_t remaining_args) {
+    if(!pre_parse_called_) {
+        pre_parse_called_ = true;
+        if(pre_parse_callback_) {
+            pre_parse_callback_(remaining_args);
+        }
+    } else if(immediate_callback_) {
+        if(!name_.empty()) {
+            auto pcnt = parsed_;
+            auto extras = std::move(missing_);
+            clear();
+            parsed_ = pcnt;
+            pre_parse_called_ = true;
+            missing_ = std::move(extras);
+        }
+    }
+}
+
+CLI11_INLINE App *App::_get_fallthrough_parent() {
+    if(parent_ == nullptr) {
+        throw(HorribleError("No Valid parent"));
+    }
+    auto *fallthrough_parent = parent_;
+    while((fallthrough_parent->parent_ != nullptr) && (fallthrough_parent->get_name().empty())) {
+        fallthrough_parent = fallthrough_parent->parent_;
+    }
+    return fallthrough_parent;
+}
+
+CLI11_NODISCARD CLI11_INLINE const std::string &App::_compare_subcommand_names(const App &subcom,
+                                                                               const App &base) const {
+    static const std::string estring;
+    if(subcom.disabled_) {
+        return estring;
+    }
+    for(const auto &subc : base.subcommands_) {
+        if(subc.get() != &subcom) {
+            if(subc->disabled_) {
+                continue;
+            }
+            if(!subcom.get_name().empty()) {
+                if(subc->check_name(subcom.get_name())) {
+                    return subcom.get_name();
+                }
+            }
+            if(!subc->get_name().empty()) {
+                if(subcom.check_name(subc->get_name())) {
+                    return subc->get_name();
+                }
+            }
+            for(const auto &les : subcom.aliases_) {
+                if(subc->check_name(les)) {
+                    return les;
+                }
+            }
+            // this loop is needed in case of ignore_underscore or ignore_case on one but not the other
+            for(const auto &les : subc->aliases_) {
+                if(subcom.check_name(les)) {
+                    return les;
+                }
+            }
+            // if the subcommand is an option group we need to check deeper
+            if(subc->get_name().empty()) {
+                const auto &cmpres = _compare_subcommand_names(subcom, *subc);
+                if(!cmpres.empty()) {
+                    return cmpres;
+                }
+            }
+            // if the test subcommand is an option group we need to check deeper
+            if(subcom.get_name().empty()) {
+                const auto &cmpres = _compare_subcommand_names(*subc, subcom);
+                if(!cmpres.empty()) {
+                    return cmpres;
+                }
+            }
+        }
+    }
+    return estring;
+}
+
+CLI11_INLINE void App::_move_to_missing(detail::Classifier val_type, const std::string &val) {
+    if(allow_extras_ || subcommands_.empty()) {
+        missing_.emplace_back(val_type, val);
+        return;
+    }
+    // allow extra arguments to be places in an option group if it is allowed there
+    for(auto &subc : subcommands_) {
+        if(subc->name_.empty() && subc->allow_extras_) {
+            subc->missing_.emplace_back(val_type, val);
+            return;
+        }
+    }
+    // if we haven't found any place to put them yet put them in missing
+    missing_.emplace_back(val_type, val);
+}
+
+CLI11_INLINE void App::_move_option(Option *opt, App *app) {
+    if(opt == nullptr) {
+        throw OptionNotFound("the option is NULL");
+    }
+    // verify that the give app is actually a subcommand
+    bool found = false;
+    for(auto &subc : subcommands_) {
+        if(app == subc.get()) {
+            found = true;
+        }
+    }
+    if(!found) {
+        throw OptionNotFound("The Given app is not a subcommand");
+    }
+
+    if((help_ptr_ == opt) || (help_all_ptr_ == opt))
+        throw OptionAlreadyAdded("cannot move help options");
+
+    if(config_ptr_ == opt)
+        throw OptionAlreadyAdded("cannot move config file options");
+
+    auto iterator =
+        std::find_if(std::begin(options_), std::end(options_), [opt](const Option_p &v) { return v.get() == opt; });
+    if(iterator != std::end(options_)) {
+        const auto &opt_p = *iterator;
+        if(std::find_if(std::begin(app->options_), std::end(app->options_), [&opt_p](const Option_p &v) {
+               return (*v == *opt_p);
+           }) == std::end(app->options_)) {
+            // only erase after the insertion was successful
+            app->options_.push_back(std::move(*iterator));
+            options_.erase(iterator);
+        } else {
+            throw OptionAlreadyAdded("option was not located: " + opt->get_name());
+        }
+    } else {
+        throw OptionNotFound("could not locate the given Option");
+    }
+}
+
+CLI11_INLINE void TriggerOn(App *trigger_app, App *app_to_enable) {
+    app_to_enable->enabled_by_default(false);
+    app_to_enable->disabled_by_default();
+    trigger_app->preparse_callback([app_to_enable](std::size_t) { app_to_enable->disabled(false); });
+}
+
+CLI11_INLINE void TriggerOn(App *trigger_app, std::vector<App *> apps_to_enable) {
+    for(auto &app : apps_to_enable) {
+        app->enabled_by_default(false);
+        app->disabled_by_default();
+    }
+
+    trigger_app->preparse_callback([apps_to_enable](std::size_t) {
+        for(const auto &app : apps_to_enable) {
+            app->disabled(false);
+        }
+    });
+}
+
+CLI11_INLINE void TriggerOff(App *trigger_app, App *app_to_enable) {
+    app_to_enable->disabled_by_default(false);
+    app_to_enable->enabled_by_default();
+    trigger_app->preparse_callback([app_to_enable](std::size_t) { app_to_enable->disabled(); });
+}
+
+CLI11_INLINE void TriggerOff(App *trigger_app, std::vector<App *> apps_to_enable) {
+    for(auto &app : apps_to_enable) {
+        app->disabled_by_default(false);
+        app->enabled_by_default();
+    }
+
+    trigger_app->preparse_callback([apps_to_enable](std::size_t) {
+        for(const auto &app : apps_to_enable) {
+            app->disabled();
+        }
+    });
+}
+
+CLI11_INLINE void deprecate_option(Option *opt, const std::string &replacement) {
+    Validator deprecate_warning{[opt, replacement](std::string &) {
+                                    std::cout << opt->get_name() << " is deprecated please use '" << replacement
+                                              << "' instead\n";
+                                    return std::string();
+                                },
+                                "DEPRECATED"};
+    deprecate_warning.application_index(0);
+    opt->check(deprecate_warning);
+    if(!replacement.empty()) {
+        opt->description(opt->get_description() + " DEPRECATED: please use '" + replacement + "' instead");
+    }
+}
+
+CLI11_INLINE void retire_option(App *app, Option *opt) {
+    App temp;
+    auto *option_copy = temp.add_option(opt->get_name(false, true))
+                            ->type_size(opt->get_type_size_min(), opt->get_type_size_max())
+                            ->expected(opt->get_expected_min(), opt->get_expected_max())
+                            ->allow_extra_args(opt->get_allow_extra_args());
+
+    app->remove_option(opt);
+    auto *opt2 = app->add_option(option_copy->get_name(false, true), "option has been retired and has no effect")
+                     ->type_name("RETIRED")
+                     ->default_str("RETIRED")
+                     ->type_size(option_copy->get_type_size_min(), option_copy->get_type_size_max())
+                     ->expected(option_copy->get_expected_min(), option_copy->get_expected_max())
+                     ->allow_extra_args(option_copy->get_allow_extra_args());
+
+    Validator retired_warning{[opt2](std::string &) {
+                                  std::cout << "WARNING " << opt2->get_name() << " is retired and has no effect\n";
+                                  return std::string();
+                              },
+                              ""};
+    retired_warning.application_index(0);
+    opt2->check(retired_warning);
+}
+
+CLI11_INLINE void retire_option(App &app, Option *opt) { retire_option(&app, opt); }
+
+CLI11_INLINE void retire_option(App *app, const std::string &option_name) {
+
+    auto *opt = app->get_option_no_throw(option_name);
+    if(opt != nullptr) {
+        retire_option(app, opt);
+        return;
+    }
+    auto *opt2 = app->add_option(option_name, "option has been retired and has no effect")
+                     ->type_name("RETIRED")
+                     ->expected(0, 1)
+                     ->default_str("RETIRED");
+    Validator retired_warning{[opt2](std::string &) {
+                                  std::cout << "WARNING " << opt2->get_name() << " is retired and has no effect\n";
+                                  return std::string();
+                              },
+                              ""};
+    retired_warning.application_index(0);
+    opt2->check(retired_warning);
+}
+
+CLI11_INLINE void retire_option(App &app, const std::string &option_name) { retire_option(&app, option_name); }
+
+namespace FailureMessage {
+
+CLI11_INLINE std::string simple(const App *app, const Error &e) {
+    std::string header = std::string(e.what()) + "\n";
+    std::vector<std::string> names;
+
+    // Collect names
+    if(app->get_help_ptr() != nullptr)
+        names.push_back(app->get_help_ptr()->get_name());
+
+    if(app->get_help_all_ptr() != nullptr)
+        names.push_back(app->get_help_all_ptr()->get_name());
+
+    // If any names found, suggest those
+    if(!names.empty())
+        header += "Run with " + detail::join(names, " or ") + " for more information.\n";
+
+    return header;
+}
+
+CLI11_INLINE std::string help(const App *app, const Error &e) {
+    std::string header = std::string("ERROR: ") + e.get_name() + ": " + e.what() + "\n";
+    header += app->help();
+    return header;
+}
+
+}  // namespace FailureMessage
+
+// [CLI11:app_inl_hpp:end]
+}  // namespace CLI
diff --git a/contrib/CLI11/include/CLI/impl/Config_inl.hpp b/contrib/CLI11/include/CLI/impl/Config_inl.hpp
new file mode 100644
index 000000000..8021d5f63
--- /dev/null
+++ b/contrib/CLI11/include/CLI/impl/Config_inl.hpp
@@ -0,0 +1,395 @@
+// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+// This include is only needed for IDEs to discover symbols
+#include <CLI/Config.hpp>
+
+// [CLI11:public_includes:set]
+#include <algorithm>
+#include <string>
+#include <utility>
+#include <vector>
+// [CLI11:public_includes:end]
+
+namespace CLI {
+// [CLI11:config_inl_hpp:verbatim]
+
+namespace detail {
+
+CLI11_INLINE std::string convert_arg_for_ini(const std::string &arg, char stringQuote, char characterQuote) {
+    if(arg.empty()) {
+        return std::string(2, stringQuote);
+    }
+    // some specifically supported strings
+    if(arg == "true" || arg == "false" || arg == "nan" || arg == "inf") {
+        return arg;
+    }
+    // floating point conversion can convert some hex codes, but don't try that here
+    if(arg.compare(0, 2, "0x") != 0 && arg.compare(0, 2, "0X") != 0) {
+        using CLI::detail::lexical_cast;
+        double val = 0.0;
+        if(lexical_cast(arg, val)) {
+            return arg;
+        }
+    }
+    // just quote a single non numeric character
+    if(arg.size() == 1) {
+        return std::string(1, characterQuote) + arg + characterQuote;
+    }
+    // handle hex, binary or octal arguments
+    if(arg.front() == '0') {
+        if(arg[1] == 'x') {
+            if(std::all_of(arg.begin() + 2, arg.end(), [](char x) {
+                   return (x >= '0' && x <= '9') || (x >= 'A' && x <= 'F') || (x >= 'a' && x <= 'f');
+               })) {
+                return arg;
+            }
+        } else if(arg[1] == 'o') {
+            if(std::all_of(arg.begin() + 2, arg.end(), [](char x) { return (x >= '0' && x <= '7'); })) {
+                return arg;
+            }
+        } else if(arg[1] == 'b') {
+            if(std::all_of(arg.begin() + 2, arg.end(), [](char x) { return (x == '0' || x == '1'); })) {
+                return arg;
+            }
+        }
+    }
+    if(arg.find_first_of(stringQuote) == std::string::npos) {
+        return std::string(1, stringQuote) + arg + stringQuote;
+    }
+    return characterQuote + arg + characterQuote;
+}
+
+CLI11_INLINE std::string ini_join(const std::vector<std::string> &args,
+                                  char sepChar,
+                                  char arrayStart,
+                                  char arrayEnd,
+                                  char stringQuote,
+                                  char characterQuote) {
+    std::string joined;
+    if(args.size() > 1 && arrayStart != '\0') {
+        joined.push_back(arrayStart);
+    }
+    std::size_t start = 0;
+    for(const auto &arg : args) {
+        if(start++ > 0) {
+            joined.push_back(sepChar);
+            if(!std::isspace<char>(sepChar, std::locale())) {
+                joined.push_back(' ');
+            }
+        }
+        joined.append(convert_arg_for_ini(arg, stringQuote, characterQuote));
+    }
+    if(args.size() > 1 && arrayEnd != '\0') {
+        joined.push_back(arrayEnd);
+    }
+    return joined;
+}
+
+CLI11_INLINE std::vector<std::string>
+generate_parents(const std::string &section, std::string &name, char parentSeparator) {
+    std::vector<std::string> parents;
+    if(detail::to_lower(section) != "default") {
+        if(section.find(parentSeparator) != std::string::npos) {
+            parents = detail::split(section, parentSeparator);
+        } else {
+            parents = {section};
+        }
+    }
+    if(name.find(parentSeparator) != std::string::npos) {
+        std::vector<std::string> plist = detail::split(name, parentSeparator);
+        name = plist.back();
+        detail::remove_quotes(name);
+        plist.pop_back();
+        parents.insert(parents.end(), plist.begin(), plist.end());
+    }
+
+    // clean up quotes on the parents
+    for(auto &parent : parents) {
+        detail::remove_quotes(parent);
+    }
+    return parents;
+}
+
+CLI11_INLINE void
+checkParentSegments(std::vector<ConfigItem> &output, const std::string &currentSection, char parentSeparator) {
+
+    std::string estring;
+    auto parents = detail::generate_parents(currentSection, estring, parentSeparator);
+    if(!output.empty() && output.back().name == "--") {
+        std::size_t msize = (parents.size() > 1U) ? parents.size() : 2;
+        while(output.back().parents.size() >= msize) {
+            output.push_back(output.back());
+            output.back().parents.pop_back();
+        }
+
+        if(parents.size() > 1) {
+            std::size_t common = 0;
+            std::size_t mpair = (std::min)(output.back().parents.size(), parents.size() - 1);
+            for(std::size_t ii = 0; ii < mpair; ++ii) {
+                if(output.back().parents[ii] != parents[ii]) {
+                    break;
+                }
+                ++common;
+            }
+            if(common == mpair) {
+                output.pop_back();
+            } else {
+                while(output.back().parents.size() > common + 1) {
+                    output.push_back(output.back());
+                    output.back().parents.pop_back();
+                }
+            }
+            for(std::size_t ii = common; ii < parents.size() - 1; ++ii) {
+                output.emplace_back();
+                output.back().parents.assign(parents.begin(), parents.begin() + static_cast<std::ptrdiff_t>(ii) + 1);
+                output.back().name = "++";
+            }
+        }
+    } else if(parents.size() > 1) {
+        for(std::size_t ii = 0; ii < parents.size() - 1; ++ii) {
+            output.emplace_back();
+            output.back().parents.assign(parents.begin(), parents.begin() + static_cast<std::ptrdiff_t>(ii) + 1);
+            output.back().name = "++";
+        }
+    }
+
+    // insert a section end which is just an empty items_buffer
+    output.emplace_back();
+    output.back().parents = std::move(parents);
+    output.back().name = "++";
+}
+}  // namespace detail
+
+inline std::vector<ConfigItem> ConfigBase::from_config(std::istream &input) const {
+    std::string line;
+    std::string currentSection = "default";
+    std::string previousSection = "default";
+    std::vector<ConfigItem> output;
+    bool isDefaultArray = (arrayStart == '[' && arrayEnd == ']' && arraySeparator == ',');
+    bool isINIArray = (arrayStart == '\0' || arrayStart == ' ') && arrayStart == arrayEnd;
+    bool inSection{false};
+    char aStart = (isINIArray) ? '[' : arrayStart;
+    char aEnd = (isINIArray) ? ']' : arrayEnd;
+    char aSep = (isINIArray && arraySeparator == ' ') ? ',' : arraySeparator;
+    int currentSectionIndex{0};
+    while(getline(input, line)) {
+        std::vector<std::string> items_buffer;
+        std::string name;
+
+        detail::trim(line);
+        std::size_t len = line.length();
+        // lines have to be at least 3 characters to have any meaning to CLI just skip the rest
+        if(len < 3) {
+            continue;
+        }
+        if(line.front() == '[' && line.back() == ']') {
+            if(currentSection != "default") {
+                // insert a section end which is just an empty items_buffer
+                output.emplace_back();
+                output.back().parents = detail::generate_parents(currentSection, name, parentSeparatorChar);
+                output.back().name = "--";
+            }
+            currentSection = line.substr(1, len - 2);
+            // deal with double brackets for TOML
+            if(currentSection.size() > 1 && currentSection.front() == '[' && currentSection.back() == ']') {
+                currentSection = currentSection.substr(1, currentSection.size() - 2);
+            }
+            if(detail::to_lower(currentSection) == "default") {
+                currentSection = "default";
+            } else {
+                detail::checkParentSegments(output, currentSection, parentSeparatorChar);
+            }
+            inSection = false;
+            if(currentSection == previousSection) {
+                ++currentSectionIndex;
+            } else {
+                currentSectionIndex = 0;
+                previousSection = currentSection;
+            }
+            continue;
+        }
+
+        // comment lines
+        if(line.front() == ';' || line.front() == '#' || line.front() == commentChar) {
+            continue;
+        }
+
+        // Find = in string, split and recombine
+        auto pos = line.find(valueDelimiter);
+        if(pos != std::string::npos) {
+            name = detail::trim_copy(line.substr(0, pos));
+            std::string item = detail::trim_copy(line.substr(pos + 1));
+            auto cloc = item.find(commentChar);
+            if(cloc != std::string::npos) {
+                item.erase(cloc, std::string::npos);  // NOLINT(readability-suspicious-call-argument)
+                detail::trim(item);
+            }
+            if(item.size() > 1 && item.front() == aStart) {
+                for(std::string multiline; item.back() != aEnd && std::getline(input, multiline);) {
+                    detail::trim(multiline);
+                    item += multiline;
+                }
+                items_buffer = detail::split_up(item.substr(1, item.length() - 2), aSep);
+            } else if((isDefaultArray || isINIArray) && item.find_first_of(aSep) != std::string::npos) {
+                items_buffer = detail::split_up(item, aSep);
+            } else if((isDefaultArray || isINIArray) && item.find_first_of(' ') != std::string::npos) {
+                items_buffer = detail::split_up(item);
+            } else {
+                items_buffer = {item};
+            }
+        } else {
+            name = detail::trim_copy(line);
+            auto cloc = name.find(commentChar);
+            if(cloc != std::string::npos) {
+                name.erase(cloc, std::string::npos);  // NOLINT(readability-suspicious-call-argument)
+                detail::trim(name);
+            }
+
+            items_buffer = {"true"};
+        }
+        if(name.find(parentSeparatorChar) == std::string::npos) {
+            detail::remove_quotes(name);
+        }
+        // clean up quotes on the items
+        for(auto &it : items_buffer) {
+            detail::remove_quotes(it);
+        }
+
+        std::vector<std::string> parents = detail::generate_parents(currentSection, name, parentSeparatorChar);
+        if(parents.size() > maximumLayers) {
+            continue;
+        }
+        if(!configSection.empty() && !inSection) {
+            if(parents.empty() || parents.front() != configSection) {
+                continue;
+            }
+            if(configIndex >= 0 && currentSectionIndex != configIndex) {
+                continue;
+            }
+            parents.erase(parents.begin());
+            inSection = true;
+        }
+        if(!output.empty() && name == output.back().name && parents == output.back().parents) {
+            output.back().inputs.insert(output.back().inputs.end(), items_buffer.begin(), items_buffer.end());
+        } else {
+            output.emplace_back();
+            output.back().parents = std::move(parents);
+            output.back().name = std::move(name);
+            output.back().inputs = std::move(items_buffer);
+        }
+    }
+    if(currentSection != "default") {
+        // insert a section end which is just an empty items_buffer
+        std::string ename;
+        output.emplace_back();
+        output.back().parents = detail::generate_parents(currentSection, ename, parentSeparatorChar);
+        output.back().name = "--";
+        while(output.back().parents.size() > 1) {
+            output.push_back(output.back());
+            output.back().parents.pop_back();
+        }
+    }
+    return output;
+}
+
+CLI11_INLINE std::string
+ConfigBase::to_config(const App *app, bool default_also, bool write_description, std::string prefix) const {
+    std::stringstream out;
+    std::string commentLead;
+    commentLead.push_back(commentChar);
+    commentLead.push_back(' ');
+
+    std::vector<std::string> groups = app->get_groups();
+    bool defaultUsed = false;
+    groups.insert(groups.begin(), std::string("Options"));
+    if(write_description && (app->get_configurable() || app->get_parent() == nullptr || app->get_name().empty())) {
+        out << commentLead << detail::fix_newlines(commentLead, app->get_description()) << '\n';
+    }
+    for(auto &group : groups) {
+        if(group == "Options" || group.empty()) {
+            if(defaultUsed) {
+                continue;
+            }
+            defaultUsed = true;
+        }
+        if(write_description && group != "Options" && !group.empty()) {
+            out << '\n' << commentLead << group << " Options\n";
+        }
+        for(const Option *opt : app->get_options({})) {
+
+            // Only process options that are configurable
+            if(opt->get_configurable()) {
+                if(opt->get_group() != group) {
+                    if(!(group == "Options" && opt->get_group().empty())) {
+                        continue;
+                    }
+                }
+                std::string name = prefix + opt->get_single_name();
+                std::string value = detail::ini_join(
+                    opt->reduced_results(), arraySeparator, arrayStart, arrayEnd, stringQuote, characterQuote);
+
+                if(value.empty() && default_also) {
+                    if(!opt->get_default_str().empty()) {
+                        value = detail::convert_arg_for_ini(opt->get_default_str(), stringQuote, characterQuote);
+                    } else if(opt->get_expected_min() == 0) {
+                        value = "false";
+                    } else if(opt->get_run_callback_for_default()) {
+                        value = "\"\"";  // empty string default value
+                    }
+                }
+
+                if(!value.empty()) {
+                    if(!opt->get_fnames().empty()) {
+                        value = opt->get_flag_value(name, value);
+                    }
+                    if(write_description && opt->has_description()) {
+                        out << '\n';
+                        out << commentLead << detail::fix_newlines(commentLead, opt->get_description()) << '\n';
+                    }
+                    out << name << valueDelimiter << value << '\n';
+                }
+            }
+        }
+    }
+    auto subcommands = app->get_subcommands({});
+    for(const App *subcom : subcommands) {
+        if(subcom->get_name().empty()) {
+            if(write_description && !subcom->get_group().empty()) {
+                out << '\n' << commentLead << subcom->get_group() << " Options\n";
+            }
+            out << to_config(subcom, default_also, write_description, prefix);
+        }
+    }
+
+    for(const App *subcom : subcommands) {
+        if(!subcom->get_name().empty()) {
+            if(subcom->get_configurable() && app->got_subcommand(subcom)) {
+                if(!prefix.empty() || app->get_parent() == nullptr) {
+                    out << '[' << prefix << subcom->get_name() << "]\n";
+                } else {
+                    std::string subname = app->get_name() + parentSeparatorChar + subcom->get_name();
+                    const auto *p = app->get_parent();
+                    while(p->get_parent() != nullptr) {
+                        subname = p->get_name() + parentSeparatorChar + subname;
+                        p = p->get_parent();
+                    }
+                    out << '[' << subname << "]\n";
+                }
+                out << to_config(subcom, default_also, write_description, "");
+            } else {
+                out << to_config(
+                    subcom, default_also, write_description, prefix + subcom->get_name() + parentSeparatorChar);
+            }
+        }
+    }
+
+    return out.str();
+}
+// [CLI11:config_inl_hpp:end]
+}  // namespace CLI
diff --git a/contrib/CLI11/include/CLI/impl/Formatter_inl.hpp b/contrib/CLI11/include/CLI/impl/Formatter_inl.hpp
new file mode 100644
index 000000000..541cd347b
--- /dev/null
+++ b/contrib/CLI11/include/CLI/impl/Formatter_inl.hpp
@@ -0,0 +1,291 @@
+// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+// This include is only needed for IDEs to discover symbols
+#include <CLI/Formatter.hpp>
+
+// [CLI11:public_includes:set]
+#include <algorithm>
+#include <string>
+#include <utility>
+#include <vector>
+// [CLI11:public_includes:end]
+
+namespace CLI {
+// [CLI11:formatter_inl_hpp:verbatim]
+CLI11_INLINE std::string
+Formatter::make_group(std::string group, bool is_positional, std::vector<const Option *> opts) const {
+    std::stringstream out;
+
+    out << "\n" << group << ":\n";
+    for(const Option *opt : opts) {
+        out << make_option(opt, is_positional);
+    }
+
+    return out.str();
+}
+
+CLI11_INLINE std::string Formatter::make_positionals(const App *app) const {
+    std::vector<const Option *> opts =
+        app->get_options([](const Option *opt) { return !opt->get_group().empty() && opt->get_positional(); });
+
+    if(opts.empty())
+        return {};
+
+    return make_group(get_label("Positionals"), true, opts);
+}
+
+CLI11_INLINE std::string Formatter::make_groups(const App *app, AppFormatMode mode) const {
+    std::stringstream out;
+    std::vector<std::string> groups = app->get_groups();
+
+    // Options
+    for(const std::string &group : groups) {
+        std::vector<const Option *> opts = app->get_options([app, mode, &group](const Option *opt) {
+            return opt->get_group() == group                     // Must be in the right group
+                   && opt->nonpositional()                       // Must not be a positional
+                   && (mode != AppFormatMode::Sub                // If mode is Sub, then
+                       || (app->get_help_ptr() != opt            // Ignore help pointer
+                           && app->get_help_all_ptr() != opt));  // Ignore help all pointer
+        });
+        if(!group.empty() && !opts.empty()) {
+            out << make_group(group, false, opts);
+
+            if(group != groups.back())
+                out << "\n";
+        }
+    }
+
+    return out.str();
+}
+
+CLI11_INLINE std::string Formatter::make_description(const App *app) const {
+    std::string desc = app->get_description();
+    auto min_options = app->get_require_option_min();
+    auto max_options = app->get_require_option_max();
+    if(app->get_required()) {
+        desc += " REQUIRED ";
+    }
+    if((max_options == min_options) && (min_options > 0)) {
+        if(min_options == 1) {
+            desc += " \n[Exactly 1 of the following options is required]";
+        } else {
+            desc += " \n[Exactly " + std::to_string(min_options) + " options from the following list are required]";
+        }
+    } else if(max_options > 0) {
+        if(min_options > 0) {
+            desc += " \n[Between " + std::to_string(min_options) + " and " + std::to_string(max_options) +
+                    " of the follow options are required]";
+        } else {
+            desc += " \n[At most " + std::to_string(max_options) + " of the following options are allowed]";
+        }
+    } else if(min_options > 0) {
+        desc += " \n[At least " + std::to_string(min_options) + " of the following options are required]";
+    }
+    return (!desc.empty()) ? desc + "\n" : std::string{};
+}
+
+CLI11_INLINE std::string Formatter::make_usage(const App *app, std::string name) const {
+    std::stringstream out;
+
+    out << get_label("Usage") << ":" << (name.empty() ? "" : " ") << name;
+
+    std::vector<std::string> groups = app->get_groups();
+
+    // Print an Options badge if any options exist
+    std::vector<const Option *> non_pos_options =
+        app->get_options([](const Option *opt) { return opt->nonpositional(); });
+    if(!non_pos_options.empty())
+        out << " [" << get_label("OPTIONS") << "]";
+
+    // Positionals need to be listed here
+    std::vector<const Option *> positionals = app->get_options([](const Option *opt) { return opt->get_positional(); });
+
+    // Print out positionals if any are left
+    if(!positionals.empty()) {
+        // Convert to help names
+        std::vector<std::string> positional_names(positionals.size());
+        std::transform(positionals.begin(), positionals.end(), positional_names.begin(), [this](const Option *opt) {
+            return make_option_usage(opt);
+        });
+
+        out << " " << detail::join(positional_names, " ");
+    }
+
+    // Add a marker if subcommands are expected or optional
+    if(!app->get_subcommands(
+               [](const CLI::App *subc) { return ((!subc->get_disabled()) && (!subc->get_name().empty())); })
+            .empty()) {
+        out << " " << (app->get_require_subcommand_min() == 0 ? "[" : "")
+            << get_label(app->get_require_subcommand_max() < 2 || app->get_require_subcommand_min() > 1 ? "SUBCOMMAND"
+                                                                                                        : "SUBCOMMANDS")
+            << (app->get_require_subcommand_min() == 0 ? "]" : "");
+    }
+
+    out << std::endl;
+
+    return out.str();
+}
+
+CLI11_INLINE std::string Formatter::make_footer(const App *app) const {
+    std::string footer = app->get_footer();
+    if(footer.empty()) {
+        return std::string{};
+    }
+    return "\n" + footer + "\n";
+}
+
+CLI11_INLINE std::string Formatter::make_help(const App *app, std::string name, AppFormatMode mode) const {
+
+    // This immediately forwards to the make_expanded method. This is done this way so that subcommands can
+    // have overridden formatters
+    if(mode == AppFormatMode::Sub)
+        return make_expanded(app);
+
+    std::stringstream out;
+    if((app->get_name().empty()) && (app->get_parent() != nullptr)) {
+        if(app->get_group() != "Subcommands") {
+            out << app->get_group() << ':';
+        }
+    }
+
+    out << make_description(app);
+    out << make_usage(app, name);
+    out << make_positionals(app);
+    out << make_groups(app, mode);
+    out << make_subcommands(app, mode);
+    out << make_footer(app);
+
+    return out.str();
+}
+
+CLI11_INLINE std::string Formatter::make_subcommands(const App *app, AppFormatMode mode) const {
+    std::stringstream out;
+
+    std::vector<const App *> subcommands = app->get_subcommands({});
+
+    // Make a list in definition order of the groups seen
+    std::vector<std::string> subcmd_groups_seen;
+    for(const App *com : subcommands) {
+        if(com->get_name().empty()) {
+            if(!com->get_group().empty()) {
+                out << make_expanded(com);
+            }
+            continue;
+        }
+        std::string group_key = com->get_group();
+        if(!group_key.empty() &&
+           std::find_if(subcmd_groups_seen.begin(), subcmd_groups_seen.end(), [&group_key](std::string a) {
+               return detail::to_lower(a) == detail::to_lower(group_key);
+           }) == subcmd_groups_seen.end())
+            subcmd_groups_seen.push_back(group_key);
+    }
+
+    // For each group, filter out and print subcommands
+    for(const std::string &group : subcmd_groups_seen) {
+        out << "\n" << group << ":\n";
+        std::vector<const App *> subcommands_group = app->get_subcommands(
+            [&group](const App *sub_app) { return detail::to_lower(sub_app->get_group()) == detail::to_lower(group); });
+        for(const App *new_com : subcommands_group) {
+            if(new_com->get_name().empty())
+                continue;
+            if(mode != AppFormatMode::All) {
+                out << make_subcommand(new_com);
+            } else {
+                out << new_com->help(new_com->get_name(), AppFormatMode::Sub);
+                out << "\n";
+            }
+        }
+    }
+
+    return out.str();
+}
+
+CLI11_INLINE std::string Formatter::make_subcommand(const App *sub) const {
+    std::stringstream out;
+    detail::format_help(out, sub->get_display_name(true), sub->get_description(), column_width_);
+    return out.str();
+}
+
+CLI11_INLINE std::string Formatter::make_expanded(const App *sub) const {
+    std::stringstream out;
+    out << sub->get_display_name(true) << "\n";
+
+    out << make_description(sub);
+    if(sub->get_name().empty() && !sub->get_aliases().empty()) {
+        detail::format_aliases(out, sub->get_aliases(), column_width_ + 2);
+    }
+    out << make_positionals(sub);
+    out << make_groups(sub, AppFormatMode::Sub);
+    out << make_subcommands(sub, AppFormatMode::Sub);
+
+    // Drop blank spaces
+    std::string tmp = detail::find_and_replace(out.str(), "\n\n", "\n");
+    tmp = tmp.substr(0, tmp.size() - 1);  // Remove the final '\n'
+
+    // Indent all but the first line (the name)
+    return detail::find_and_replace(tmp, "\n", "\n  ") + "\n";
+}
+
+CLI11_INLINE std::string Formatter::make_option_name(const Option *opt, bool is_positional) const {
+    if(is_positional)
+        return opt->get_name(true, false);
+
+    return opt->get_name(false, true);
+}
+
+CLI11_INLINE std::string Formatter::make_option_opts(const Option *opt) const {
+    std::stringstream out;
+
+    if(!opt->get_option_text().empty()) {
+        out << " " << opt->get_option_text();
+    } else {
+        if(opt->get_type_size() != 0) {
+            if(!opt->get_type_name().empty())
+                out << " " << get_label(opt->get_type_name());
+            if(!opt->get_default_str().empty())
+                out << " [" << opt->get_default_str() << "] ";
+            if(opt->get_expected_max() == detail::expected_max_vector_size)
+                out << " ...";
+            else if(opt->get_expected_min() > 1)
+                out << " x " << opt->get_expected();
+
+            if(opt->get_required())
+                out << " " << get_label("REQUIRED");
+        }
+        if(!opt->get_envname().empty())
+            out << " (" << get_label("Env") << ":" << opt->get_envname() << ")";
+        if(!opt->get_needs().empty()) {
+            out << " " << get_label("Needs") << ":";
+            for(const Option *op : opt->get_needs())
+                out << " " << op->get_name();
+        }
+        if(!opt->get_excludes().empty()) {
+            out << " " << get_label("Excludes") << ":";
+            for(const Option *op : opt->get_excludes())
+                out << " " << op->get_name();
+        }
+    }
+    return out.str();
+}
+
+CLI11_INLINE std::string Formatter::make_option_desc(const Option *opt) const { return opt->get_description(); }
+
+CLI11_INLINE std::string Formatter::make_option_usage(const Option *opt) const {
+    // Note that these are positionals usages
+    std::stringstream out;
+    out << make_option_name(opt, true);
+    if(opt->get_expected_max() >= detail::expected_max_vector_size)
+        out << "...";
+    else if(opt->get_expected_max() > 1)
+        out << "(" << opt->get_expected() << "x)";
+
+    return opt->get_required() ? out.str() : "[" + out.str() + "]";
+}
+// [CLI11:formatter_inl_hpp:end]
+}  // namespace CLI
diff --git a/contrib/CLI11/include/CLI/impl/Option_inl.hpp b/contrib/CLI11/include/CLI/impl/Option_inl.hpp
new file mode 100644
index 000000000..a24df9ab2
--- /dev/null
+++ b/contrib/CLI11/include/CLI/impl/Option_inl.hpp
@@ -0,0 +1,653 @@
+// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+// This include is only needed for IDEs to discover symbols
+#include <CLI/Option.hpp>
+
+// [CLI11:public_includes:set]
+#include <algorithm>
+#include <string>
+#include <utility>
+#include <vector>
+// [CLI11:public_includes:end]
+
+namespace CLI {
+// [CLI11:option_inl_hpp:verbatim]
+
+template <typename CRTP> template <typename T> void OptionBase<CRTP>::copy_to(T *other) const {
+    other->group(group_);
+    other->required(required_);
+    other->ignore_case(ignore_case_);
+    other->ignore_underscore(ignore_underscore_);
+    other->configurable(configurable_);
+    other->disable_flag_override(disable_flag_override_);
+    other->delimiter(delimiter_);
+    other->always_capture_default(always_capture_default_);
+    other->multi_option_policy(multi_option_policy_);
+}
+
+CLI11_INLINE Option *Option::expected(int value) {
+    if(value < 0) {
+        expected_min_ = -value;
+        if(expected_max_ < expected_min_) {
+            expected_max_ = expected_min_;
+        }
+        allow_extra_args_ = true;
+        flag_like_ = false;
+    } else if(value == detail::expected_max_vector_size) {
+        expected_min_ = 1;
+        expected_max_ = detail::expected_max_vector_size;
+        allow_extra_args_ = true;
+        flag_like_ = false;
+    } else {
+        expected_min_ = value;
+        expected_max_ = value;
+        flag_like_ = (expected_min_ == 0);
+    }
+    return this;
+}
+
+CLI11_INLINE Option *Option::expected(int value_min, int value_max) {
+    if(value_min < 0) {
+        value_min = -value_min;
+    }
+
+    if(value_max < 0) {
+        value_max = detail::expected_max_vector_size;
+    }
+    if(value_max < value_min) {
+        expected_min_ = value_max;
+        expected_max_ = value_min;
+    } else {
+        expected_max_ = value_max;
+        expected_min_ = value_min;
+    }
+
+    return this;
+}
+
+CLI11_INLINE Option *Option::check(Validator validator, const std::string &validator_name) {
+    validator.non_modifying();
+    validators_.push_back(std::move(validator));
+    if(!validator_name.empty())
+        validators_.back().name(validator_name);
+    return this;
+}
+
+CLI11_INLINE Option *Option::check(std::function<std::string(const std::string &)> Validator,
+                                   std::string Validator_description,
+                                   std::string Validator_name) {
+    validators_.emplace_back(Validator, std::move(Validator_description), std::move(Validator_name));
+    validators_.back().non_modifying();
+    return this;
+}
+
+CLI11_INLINE Option *Option::transform(Validator Validator, const std::string &Validator_name) {
+    validators_.insert(validators_.begin(), std::move(Validator));
+    if(!Validator_name.empty())
+        validators_.front().name(Validator_name);
+    return this;
+}
+
+CLI11_INLINE Option *Option::transform(const std::function<std::string(std::string)> &func,
+                                       std::string transform_description,
+                                       std::string transform_name) {
+    validators_.insert(validators_.begin(),
+                       Validator(
+                           [func](std::string &val) {
+                               val = func(val);
+                               return std::string{};
+                           },
+                           std::move(transform_description),
+                           std::move(transform_name)));
+
+    return this;
+}
+
+CLI11_INLINE Option *Option::each(const std::function<void(std::string)> &func) {
+    validators_.emplace_back(
+        [func](std::string &inout) {
+            func(inout);
+            return std::string{};
+        },
+        std::string{});
+    return this;
+}
+
+CLI11_INLINE Validator *Option::get_validator(const std::string &Validator_name) {
+    for(auto &Validator : validators_) {
+        if(Validator_name == Validator.get_name()) {
+            return &Validator;
+        }
+    }
+    if((Validator_name.empty()) && (!validators_.empty())) {
+        return &(validators_.front());
+    }
+    throw OptionNotFound(std::string{"Validator "} + Validator_name + " Not Found");
+}
+
+CLI11_INLINE Validator *Option::get_validator(int index) {
+    // This is an signed int so that it is not equivalent to a pointer.
+    if(index >= 0 && index < static_cast<int>(validators_.size())) {
+        return &(validators_[static_cast<decltype(validators_)::size_type>(index)]);
+    }
+    throw OptionNotFound("Validator index is not valid");
+}
+
+CLI11_INLINE bool Option::remove_needs(Option *opt) {
+    auto iterator = std::find(std::begin(needs_), std::end(needs_), opt);
+
+    if(iterator == std::end(needs_)) {
+        return false;
+    }
+    needs_.erase(iterator);
+    return true;
+}
+
+CLI11_INLINE Option *Option::excludes(Option *opt) {
+    if(opt == this) {
+        throw(IncorrectConstruction("and option cannot exclude itself"));
+    }
+    excludes_.insert(opt);
+
+    // Help text should be symmetric - excluding a should exclude b
+    opt->excludes_.insert(this);
+
+    // Ignoring the insert return value, excluding twice is now allowed.
+    // (Mostly to allow both directions to be excluded by user, even though the library does it for you.)
+
+    return this;
+}
+
+CLI11_INLINE bool Option::remove_excludes(Option *opt) {
+    auto iterator = std::find(std::begin(excludes_), std::end(excludes_), opt);
+
+    if(iterator == std::end(excludes_)) {
+        return false;
+    }
+    excludes_.erase(iterator);
+    return true;
+}
+
+template <typename T> Option *Option::ignore_case(bool value) {
+    if(!ignore_case_ && value) {
+        ignore_case_ = value;
+        auto *parent = static_cast<T *>(parent_);
+        for(const Option_p &opt : parent->options_) {
+            if(opt.get() == this) {
+                continue;
+            }
+            const auto &omatch = opt->matching_name(*this);
+            if(!omatch.empty()) {
+                ignore_case_ = false;
+                throw OptionAlreadyAdded("adding ignore case caused a name conflict with " + omatch);
+            }
+        }
+    } else {
+        ignore_case_ = value;
+    }
+    return this;
+}
+
+template <typename T> Option *Option::ignore_underscore(bool value) {
+
+    if(!ignore_underscore_ && value) {
+        ignore_underscore_ = value;
+        auto *parent = static_cast<T *>(parent_);
+        for(const Option_p &opt : parent->options_) {
+            if(opt.get() == this) {
+                continue;
+            }
+            const auto &omatch = opt->matching_name(*this);
+            if(!omatch.empty()) {
+                ignore_underscore_ = false;
+                throw OptionAlreadyAdded("adding ignore underscore caused a name conflict with " + omatch);
+            }
+        }
+    } else {
+        ignore_underscore_ = value;
+    }
+    return this;
+}
+
+CLI11_INLINE Option *Option::multi_option_policy(MultiOptionPolicy value) {
+    if(value != multi_option_policy_) {
+        if(multi_option_policy_ == MultiOptionPolicy::Throw && expected_max_ == detail::expected_max_vector_size &&
+           expected_min_ > 1) {  // this bizarre condition is to maintain backwards compatibility
+                                 // with the previous behavior of expected_ with vectors
+            expected_max_ = expected_min_;
+        }
+        multi_option_policy_ = value;
+        current_option_state_ = option_state::parsing;
+    }
+    return this;
+}
+
+CLI11_NODISCARD CLI11_INLINE std::string Option::get_name(bool positional, bool all_options) const {
+    if(get_group().empty())
+        return {};  // Hidden
+
+    if(all_options) {
+
+        std::vector<std::string> name_list;
+
+        /// The all list will never include a positional unless asked or that's the only name.
+        if((positional && (!pname_.empty())) || (snames_.empty() && lnames_.empty())) {
+            name_list.push_back(pname_);
+        }
+        if((get_items_expected() == 0) && (!fnames_.empty())) {
+            for(const std::string &sname : snames_) {
+                name_list.push_back("-" + sname);
+                if(check_fname(sname)) {
+                    name_list.back() += "{" + get_flag_value(sname, "") + "}";
+                }
+            }
+
+            for(const std::string &lname : lnames_) {
+                name_list.push_back("--" + lname);
+                if(check_fname(lname)) {
+                    name_list.back() += "{" + get_flag_value(lname, "") + "}";
+                }
+            }
+        } else {
+            for(const std::string &sname : snames_)
+                name_list.push_back("-" + sname);
+
+            for(const std::string &lname : lnames_)
+                name_list.push_back("--" + lname);
+        }
+
+        return detail::join(name_list);
+    }
+
+    // This returns the positional name no matter what
+    if(positional)
+        return pname_;
+
+    // Prefer long name
+    if(!lnames_.empty())
+        return std::string(2, '-') + lnames_[0];
+
+    // Or short name if no long name
+    if(!snames_.empty())
+        return std::string(1, '-') + snames_[0];
+
+    // If positional is the only name, it's okay to use that
+    return pname_;
+}
+
+CLI11_INLINE void Option::run_callback() {
+    if(force_callback_ && results_.empty()) {
+        add_result(default_str_);
+    }
+    if(current_option_state_ == option_state::parsing) {
+        _validate_results(results_);
+        current_option_state_ = option_state::validated;
+    }
+
+    if(current_option_state_ < option_state::reduced) {
+        _reduce_results(proc_results_, results_);
+        current_option_state_ = option_state::reduced;
+    }
+    if(current_option_state_ >= option_state::reduced) {
+        current_option_state_ = option_state::callback_run;
+        if(!(callback_)) {
+            return;
+        }
+        const results_t &send_results = proc_results_.empty() ? results_ : proc_results_;
+        bool local_result = callback_(send_results);
+
+        if(!local_result)
+            throw ConversionError(get_name(), results_);
+    }
+}
+
+CLI11_NODISCARD CLI11_INLINE const std::string &Option::matching_name(const Option &other) const {
+    static const std::string estring;
+    for(const std::string &sname : snames_)
+        if(other.check_sname(sname))
+            return sname;
+    for(const std::string &lname : lnames_)
+        if(other.check_lname(lname))
+            return lname;
+
+    if(ignore_case_ ||
+       ignore_underscore_) {  // We need to do the inverse, in case we are ignore_case or ignore underscore
+        for(const std::string &sname : other.snames_)
+            if(check_sname(sname))
+                return sname;
+        for(const std::string &lname : other.lnames_)
+            if(check_lname(lname))
+                return lname;
+    }
+    return estring;
+}
+
+CLI11_NODISCARD CLI11_INLINE bool Option::check_name(const std::string &name) const {
+
+    if(name.length() > 2 && name[0] == '-' && name[1] == '-')
+        return check_lname(name.substr(2));
+    if(name.length() > 1 && name.front() == '-')
+        return check_sname(name.substr(1));
+    if(!pname_.empty()) {
+        std::string local_pname = pname_;
+        std::string local_name = name;
+        if(ignore_underscore_) {
+            local_pname = detail::remove_underscore(local_pname);
+            local_name = detail::remove_underscore(local_name);
+        }
+        if(ignore_case_) {
+            local_pname = detail::to_lower(local_pname);
+            local_name = detail::to_lower(local_name);
+        }
+        if(local_name == local_pname) {
+            return true;
+        }
+    }
+
+    if(!envname_.empty()) {
+        // this needs to be the original since envname_ shouldn't match on case insensitivity
+        return (name == envname_);
+    }
+    return false;
+}
+
+CLI11_NODISCARD CLI11_INLINE std::string Option::get_flag_value(const std::string &name,
+                                                                std::string input_value) const {
+    static const std::string trueString{"true"};
+    static const std::string falseString{"false"};
+    static const std::string emptyString{"{}"};
+    // check for disable flag override_
+    if(disable_flag_override_) {
+        if(!((input_value.empty()) || (input_value == emptyString))) {
+            auto default_ind = detail::find_member(name, fnames_, ignore_case_, ignore_underscore_);
+            if(default_ind >= 0) {
+                // We can static cast this to std::size_t because it is more than 0 in this block
+                if(default_flag_values_[static_cast<std::size_t>(default_ind)].second != input_value) {
+                    throw(ArgumentMismatch::FlagOverride(name));
+                }
+            } else {
+                if(input_value != trueString) {
+                    throw(ArgumentMismatch::FlagOverride(name));
+                }
+            }
+        }
+    }
+    auto ind = detail::find_member(name, fnames_, ignore_case_, ignore_underscore_);
+    if((input_value.empty()) || (input_value == emptyString)) {
+        if(flag_like_) {
+            return (ind < 0) ? trueString : default_flag_values_[static_cast<std::size_t>(ind)].second;
+        }
+        return (ind < 0) ? default_str_ : default_flag_values_[static_cast<std::size_t>(ind)].second;
+    }
+    if(ind < 0) {
+        return input_value;
+    }
+    if(default_flag_values_[static_cast<std::size_t>(ind)].second == falseString) {
+        try {
+            auto val = detail::to_flag_value(input_value);
+            return (val == 1) ? falseString : (val == (-1) ? trueString : std::to_string(-val));
+        } catch(const std::invalid_argument &) {
+            return input_value;
+        }
+    } else {
+        return input_value;
+    }
+}
+
+CLI11_INLINE Option *Option::add_result(std::string s) {
+    _add_result(std::move(s), results_);
+    current_option_state_ = option_state::parsing;
+    return this;
+}
+
+CLI11_INLINE Option *Option::add_result(std::string s, int &results_added) {
+    results_added = _add_result(std::move(s), results_);
+    current_option_state_ = option_state::parsing;
+    return this;
+}
+
+CLI11_INLINE Option *Option::add_result(std::vector<std::string> s) {
+    current_option_state_ = option_state::parsing;
+    for(auto &str : s) {
+        _add_result(std::move(str), results_);
+    }
+    return this;
+}
+
+CLI11_NODISCARD CLI11_INLINE results_t Option::reduced_results() const {
+    results_t res = proc_results_.empty() ? results_ : proc_results_;
+    if(current_option_state_ < option_state::reduced) {
+        if(current_option_state_ == option_state::parsing) {
+            res = results_;
+            _validate_results(res);
+        }
+        if(!res.empty()) {
+            results_t extra;
+            _reduce_results(extra, res);
+            if(!extra.empty()) {
+                res = std::move(extra);
+            }
+        }
+    }
+    return res;
+}
+
+CLI11_INLINE Option *Option::type_size(int option_type_size) {
+    if(option_type_size < 0) {
+        // this section is included for backwards compatibility
+        type_size_max_ = -option_type_size;
+        type_size_min_ = -option_type_size;
+        expected_max_ = detail::expected_max_vector_size;
+    } else {
+        type_size_max_ = option_type_size;
+        if(type_size_max_ < detail::expected_max_vector_size) {
+            type_size_min_ = option_type_size;
+        } else {
+            inject_separator_ = true;
+        }
+        if(type_size_max_ == 0)
+            required_ = false;
+    }
+    return this;
+}
+
+CLI11_INLINE Option *Option::type_size(int option_type_size_min, int option_type_size_max) {
+    if(option_type_size_min < 0 || option_type_size_max < 0) {
+        // this section is included for backwards compatibility
+        expected_max_ = detail::expected_max_vector_size;
+        option_type_size_min = (std::abs)(option_type_size_min);
+        option_type_size_max = (std::abs)(option_type_size_max);
+    }
+
+    if(option_type_size_min > option_type_size_max) {
+        type_size_max_ = option_type_size_min;
+        type_size_min_ = option_type_size_max;
+    } else {
+        type_size_min_ = option_type_size_min;
+        type_size_max_ = option_type_size_max;
+    }
+    if(type_size_max_ == 0) {
+        required_ = false;
+    }
+    if(type_size_max_ >= detail::expected_max_vector_size) {
+        inject_separator_ = true;
+    }
+    return this;
+}
+
+CLI11_NODISCARD CLI11_INLINE std::string Option::get_type_name() const {
+    std::string full_type_name = type_name_();
+    if(!validators_.empty()) {
+        for(const auto &Validator : validators_) {
+            std::string vtype = Validator.get_description();
+            if(!vtype.empty()) {
+                full_type_name += ":" + vtype;
+            }
+        }
+    }
+    return full_type_name;
+}
+
+CLI11_INLINE void Option::_validate_results(results_t &res) const {
+    // Run the Validators (can change the string)
+    if(!validators_.empty()) {
+        if(type_size_max_ > 1) {  // in this context index refers to the index in the type
+            int index = 0;
+            if(get_items_expected_max() < static_cast<int>(res.size()) &&
+               multi_option_policy_ == CLI::MultiOptionPolicy::TakeLast) {
+                // create a negative index for the earliest ones
+                index = get_items_expected_max() - static_cast<int>(res.size());
+            }
+
+            for(std::string &result : res) {
+                if(detail::is_separator(result) && type_size_max_ != type_size_min_ && index >= 0) {
+                    index = 0;  // reset index for variable size chunks
+                    continue;
+                }
+                auto err_msg = _validate(result, (index >= 0) ? (index % type_size_max_) : index);
+                if(!err_msg.empty())
+                    throw ValidationError(get_name(), err_msg);
+                ++index;
+            }
+        } else {
+            int index = 0;
+            if(expected_max_ < static_cast<int>(res.size()) &&
+               multi_option_policy_ == CLI::MultiOptionPolicy::TakeLast) {
+                // create a negative index for the earliest ones
+                index = expected_max_ - static_cast<int>(res.size());
+            }
+            for(std::string &result : res) {
+                auto err_msg = _validate(result, index);
+                ++index;
+                if(!err_msg.empty())
+                    throw ValidationError(get_name(), err_msg);
+            }
+        }
+    }
+}
+
+CLI11_INLINE void Option::_reduce_results(results_t &out, const results_t &original) const {
+
+    // max num items expected or length of vector, always at least 1
+    // Only valid for a trimming policy
+
+    out.clear();
+    // Operation depends on the policy setting
+    switch(multi_option_policy_) {
+    case MultiOptionPolicy::TakeAll:
+        break;
+    case MultiOptionPolicy::TakeLast: {
+        // Allow multi-option sizes (including 0)
+        std::size_t trim_size = std::min<std::size_t>(
+            static_cast<std::size_t>(std::max<int>(get_items_expected_max(), 1)), original.size());
+        if(original.size() != trim_size) {
+            out.assign(original.end() - static_cast<results_t::difference_type>(trim_size), original.end());
+        }
+    } break;
+    case MultiOptionPolicy::TakeFirst: {
+        std::size_t trim_size = std::min<std::size_t>(
+            static_cast<std::size_t>(std::max<int>(get_items_expected_max(), 1)), original.size());
+        if(original.size() != trim_size) {
+            out.assign(original.begin(), original.begin() + static_cast<results_t::difference_type>(trim_size));
+        }
+    } break;
+    case MultiOptionPolicy::Join:
+        if(results_.size() > 1) {
+            out.push_back(detail::join(original, std::string(1, (delimiter_ == '\0') ? '\n' : delimiter_)));
+        }
+        break;
+    case MultiOptionPolicy::Sum:
+        out.push_back(detail::sum_string_vector(original));
+        break;
+    case MultiOptionPolicy::Throw:
+    default: {
+        auto num_min = static_cast<std::size_t>(get_items_expected_min());
+        auto num_max = static_cast<std::size_t>(get_items_expected_max());
+        if(num_min == 0) {
+            num_min = 1;
+        }
+        if(num_max == 0) {
+            num_max = 1;
+        }
+        if(original.size() < num_min) {
+            throw ArgumentMismatch::AtLeast(get_name(), static_cast<int>(num_min), original.size());
+        }
+        if(original.size() > num_max) {
+            throw ArgumentMismatch::AtMost(get_name(), static_cast<int>(num_max), original.size());
+        }
+        break;
+    }
+    }
+    // this check is to allow an empty vector in certain circumstances but not if expected is not zero.
+    // {} is the indicator for an empty container
+    if(out.empty()) {
+        if(original.size() == 1 && original[0] == "{}" && get_items_expected_min() > 0) {
+            out.push_back("{}");
+            out.push_back("%%");
+        }
+    } else if(out.size() == 1 && out[0] == "{}" && get_items_expected_min() > 0) {
+        out.push_back("%%");
+    }
+}
+
+CLI11_INLINE std::string Option::_validate(std::string &result, int index) const {
+    std::string err_msg;
+    if(result.empty() && expected_min_ == 0) {
+        // an empty with nothing expected is allowed
+        return err_msg;
+    }
+    for(const auto &vali : validators_) {
+        auto v = vali.get_application_index();
+        if(v == -1 || v == index) {
+            try {
+                err_msg = vali(result);
+            } catch(const ValidationError &err) {
+                err_msg = err.what();
+            }
+            if(!err_msg.empty())
+                break;
+        }
+    }
+
+    return err_msg;
+}
+
+CLI11_INLINE int Option::_add_result(std::string &&result, std::vector<std::string> &res) const {
+    int result_count = 0;
+    if(allow_extra_args_ && !result.empty() && result.front() == '[' &&
+       result.back() == ']') {  // this is now a vector string likely from the default or user entry
+        result.pop_back();
+
+        for(auto &var : CLI::detail::split(result.substr(1), ',')) {
+            if(!var.empty()) {
+                result_count += _add_result(std::move(var), res);
+            }
+        }
+        return result_count;
+    }
+    if(delimiter_ == '\0') {
+        res.push_back(std::move(result));
+        ++result_count;
+    } else {
+        if((result.find_first_of(delimiter_) != std::string::npos)) {
+            for(const auto &var : CLI::detail::split(result, delimiter_)) {
+                if(!var.empty()) {
+                    res.push_back(var);
+                    ++result_count;
+                }
+            }
+        } else {
+            res.push_back(std::move(result));
+            ++result_count;
+        }
+    }
+    return result_count;
+}
+// [CLI11:option_inl_hpp:end]
+}  // namespace CLI
diff --git a/contrib/CLI11/include/CLI/impl/Split_inl.hpp b/contrib/CLI11/include/CLI/impl/Split_inl.hpp
new file mode 100644
index 000000000..bb05a8681
--- /dev/null
+++ b/contrib/CLI11/include/CLI/impl/Split_inl.hpp
@@ -0,0 +1,139 @@
+// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+// This include is only needed for IDEs to discover symbols
+#include <CLI/Split.hpp>
+
+// [CLI11:public_includes:set]
+#include <string>
+#include <tuple>
+#include <utility>
+#include <vector>
+// [CLI11:public_includes:end]
+
+#include <CLI/Error.hpp>
+#include <CLI/StringTools.hpp>
+
+namespace CLI {
+// [CLI11:split_inl_hpp:verbatim]
+
+namespace detail {
+
+CLI11_INLINE bool split_short(const std::string &current, std::string &name, std::string &rest) {
+    if(current.size() > 1 && current[0] == '-' && valid_first_char(current[1])) {
+        name = current.substr(1, 1);
+        rest = current.substr(2);
+        return true;
+    }
+    return false;
+}
+
+CLI11_INLINE bool split_long(const std::string &current, std::string &name, std::string &value) {
+    if(current.size() > 2 && current.substr(0, 2) == "--" && valid_first_char(current[2])) {
+        auto loc = current.find_first_of('=');
+        if(loc != std::string::npos) {
+            name = current.substr(2, loc - 2);
+            value = current.substr(loc + 1);
+        } else {
+            name = current.substr(2);
+            value = "";
+        }
+        return true;
+    }
+    return false;
+}
+
+CLI11_INLINE bool split_windows_style(const std::string &current, std::string &name, std::string &value) {
+    if(current.size() > 1 && current[0] == '/' && valid_first_char(current[1])) {
+        auto loc = current.find_first_of(':');
+        if(loc != std::string::npos) {
+            name = current.substr(1, loc - 1);
+            value = current.substr(loc + 1);
+        } else {
+            name = current.substr(1);
+            value = "";
+        }
+        return true;
+    }
+    return false;
+}
+
+CLI11_INLINE std::vector<std::string> split_names(std::string current) {
+    std::vector<std::string> output;
+    std::size_t val = 0;
+    while((val = current.find(',')) != std::string::npos) {
+        output.push_back(trim_copy(current.substr(0, val)));
+        current = current.substr(val + 1);
+    }
+    output.push_back(trim_copy(current));
+    return output;
+}
+
+CLI11_INLINE std::vector<std::pair<std::string, std::string>> get_default_flag_values(const std::string &str) {
+    std::vector<std::string> flags = split_names(str);
+    flags.erase(std::remove_if(flags.begin(),
+                               flags.end(),
+                               [](const std::string &name) {
+                                   return ((name.empty()) || (!(((name.find_first_of('{') != std::string::npos) &&
+                                                                 (name.back() == '}')) ||
+                                                                (name[0] == '!'))));
+                               }),
+                flags.end());
+    std::vector<std::pair<std::string, std::string>> output;
+    output.reserve(flags.size());
+    for(auto &flag : flags) {
+        auto def_start = flag.find_first_of('{');
+        std::string defval = "false";
+        if((def_start != std::string::npos) && (flag.back() == '}')) {
+            defval = flag.substr(def_start + 1);
+            defval.pop_back();
+            flag.erase(def_start, std::string::npos);  // NOLINT(readability-suspicious-call-argument)
+        }
+        flag.erase(0, flag.find_first_not_of("-!"));
+        output.emplace_back(flag, defval);
+    }
+    return output;
+}
+
+CLI11_INLINE std::tuple<std::vector<std::string>, std::vector<std::string>, std::string>
+get_names(const std::vector<std::string> &input) {
+
+    std::vector<std::string> short_names;
+    std::vector<std::string> long_names;
+    std::string pos_name;
+
+    for(std::string name : input) {
+        if(name.length() == 0) {
+            continue;
+        }
+        if(name.length() > 1 && name[0] == '-' && name[1] != '-') {
+            if(name.length() == 2 && valid_first_char(name[1]))
+                short_names.emplace_back(1, name[1]);
+            else
+                throw BadNameString::OneCharName(name);
+        } else if(name.length() > 2 && name.substr(0, 2) == "--") {
+            name = name.substr(2);
+            if(valid_name_string(name))
+                long_names.push_back(name);
+            else
+                throw BadNameString::BadLongName(name);
+        } else if(name == "-" || name == "--") {
+            throw BadNameString::DashesOnly(name);
+        } else {
+            if(pos_name.length() > 0)
+                throw BadNameString::MultiPositionalNames(name);
+            pos_name = name;
+        }
+    }
+
+    return std::make_tuple(short_names, long_names, pos_name);
+}
+
+}  // namespace detail
+// [CLI11:split_inl_hpp:end]
+}  // namespace CLI
diff --git a/contrib/CLI11/include/CLI/impl/StringTools_inl.hpp b/contrib/CLI11/include/CLI/impl/StringTools_inl.hpp
new file mode 100644
index 000000000..9b81fbde3
--- /dev/null
+++ b/contrib/CLI11/include/CLI/impl/StringTools_inl.hpp
@@ -0,0 +1,260 @@
+// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+// This include is only needed for IDEs to discover symbols
+#include <CLI/StringTools.hpp>
+
+// [CLI11:public_includes:set]
+#include <string>
+#include <vector>
+// [CLI11:public_includes:end]
+
+namespace CLI {
+// [CLI11:string_tools_inl_hpp:verbatim]
+
+namespace detail {
+CLI11_INLINE std::vector<std::string> split(const std::string &s, char delim) {
+    std::vector<std::string> elems;
+    // Check to see if empty string, give consistent result
+    if(s.empty()) {
+        elems.emplace_back();
+    } else {
+        std::stringstream ss;
+        ss.str(s);
+        std::string item;
+        while(std::getline(ss, item, delim)) {
+            elems.push_back(item);
+        }
+    }
+    return elems;
+}
+
+CLI11_INLINE std::string &ltrim(std::string &str) {
+    auto it = std::find_if(str.begin(), str.end(), [](char ch) { return !std::isspace<char>(ch, std::locale()); });
+    str.erase(str.begin(), it);
+    return str;
+}
+
+CLI11_INLINE std::string &ltrim(std::string &str, const std::string &filter) {
+    auto it = std::find_if(str.begin(), str.end(), [&filter](char ch) { return filter.find(ch) == std::string::npos; });
+    str.erase(str.begin(), it);
+    return str;
+}
+
+CLI11_INLINE std::string &rtrim(std::string &str) {
+    auto it = std::find_if(str.rbegin(), str.rend(), [](char ch) { return !std::isspace<char>(ch, std::locale()); });
+    str.erase(it.base(), str.end());
+    return str;
+}
+
+CLI11_INLINE std::string &rtrim(std::string &str, const std::string &filter) {
+    auto it =
+        std::find_if(str.rbegin(), str.rend(), [&filter](char ch) { return filter.find(ch) == std::string::npos; });
+    str.erase(it.base(), str.end());
+    return str;
+}
+
+CLI11_INLINE std::string &remove_quotes(std::string &str) {
+    if(str.length() > 1 && (str.front() == '"' || str.front() == '\'')) {
+        if(str.front() == str.back()) {
+            str.pop_back();
+            str.erase(str.begin(), str.begin() + 1);
+        }
+    }
+    return str;
+}
+
+CLI11_INLINE std::string fix_newlines(const std::string &leader, std::string input) {
+    std::string::size_type n = 0;
+    while(n != std::string::npos && n < input.size()) {
+        n = input.find('\n', n);
+        if(n != std::string::npos) {
+            input = input.substr(0, n + 1) + leader + input.substr(n + 1);
+            n += leader.size();
+        }
+    }
+    return input;
+}
+
+CLI11_INLINE std::ostream &
+format_help(std::ostream &out, std::string name, const std::string &description, std::size_t wid) {
+    name = "  " + name;
+    out << std::setw(static_cast<int>(wid)) << std::left << name;
+    if(!description.empty()) {
+        if(name.length() >= wid)
+            out << "\n" << std::setw(static_cast<int>(wid)) << "";
+        for(const char c : description) {
+            out.put(c);
+            if(c == '\n') {
+                out << std::setw(static_cast<int>(wid)) << "";
+            }
+        }
+    }
+    out << "\n";
+    return out;
+}
+
+CLI11_INLINE std::ostream &format_aliases(std::ostream &out, const std::vector<std::string> &aliases, std::size_t wid) {
+    if(!aliases.empty()) {
+        out << std::setw(static_cast<int>(wid)) << "     aliases: ";
+        bool front = true;
+        for(const auto &alias : aliases) {
+            if(!front) {
+                out << ", ";
+            } else {
+                front = false;
+            }
+            out << detail::fix_newlines("              ", alias);
+        }
+        out << "\n";
+    }
+    return out;
+}
+
+CLI11_INLINE bool valid_name_string(const std::string &str) {
+    if(str.empty() || !valid_first_char(str[0])) {
+        return false;
+    }
+    auto e = str.end();
+    for(auto c = str.begin() + 1; c != e; ++c)
+        if(!valid_later_char(*c))
+            return false;
+    return true;
+}
+
+CLI11_INLINE std::string find_and_replace(std::string str, std::string from, std::string to) {
+
+    std::size_t start_pos = 0;
+
+    while((start_pos = str.find(from, start_pos)) != std::string::npos) {
+        str.replace(start_pos, from.length(), to);
+        start_pos += to.length();
+    }
+
+    return str;
+}
+
+CLI11_INLINE void remove_default_flag_values(std::string &flags) {
+    auto loc = flags.find_first_of('{', 2);
+    while(loc != std::string::npos) {
+        auto finish = flags.find_first_of("},", loc + 1);
+        if((finish != std::string::npos) && (flags[finish] == '}')) {
+            flags.erase(flags.begin() + static_cast<std::ptrdiff_t>(loc),
+                        flags.begin() + static_cast<std::ptrdiff_t>(finish) + 1);
+        }
+        loc = flags.find_first_of('{', loc + 1);
+    }
+    flags.erase(std::remove(flags.begin(), flags.end(), '!'), flags.end());
+}
+
+CLI11_INLINE std::ptrdiff_t
+find_member(std::string name, const std::vector<std::string> names, bool ignore_case, bool ignore_underscore) {
+    auto it = std::end(names);
+    if(ignore_case) {
+        if(ignore_underscore) {
+            name = detail::to_lower(detail::remove_underscore(name));
+            it = std::find_if(std::begin(names), std::end(names), [&name](std::string local_name) {
+                return detail::to_lower(detail::remove_underscore(local_name)) == name;
+            });
+        } else {
+            name = detail::to_lower(name);
+            it = std::find_if(std::begin(names), std::end(names), [&name](std::string local_name) {
+                return detail::to_lower(local_name) == name;
+            });
+        }
+
+    } else if(ignore_underscore) {
+        name = detail::remove_underscore(name);
+        it = std::find_if(std::begin(names), std::end(names), [&name](std::string local_name) {
+            return detail::remove_underscore(local_name) == name;
+        });
+    } else {
+        it = std::find(std::begin(names), std::end(names), name);
+    }
+
+    return (it != std::end(names)) ? (it - std::begin(names)) : (-1);
+}
+
+CLI11_INLINE std::vector<std::string> split_up(std::string str, char delimiter) {
+
+    const std::string delims("\'\"`");
+    auto find_ws = [delimiter](char ch) {
+        return (delimiter == '\0') ? std::isspace<char>(ch, std::locale()) : (ch == delimiter);
+    };
+    trim(str);
+
+    std::vector<std::string> output;
+    bool embeddedQuote = false;
+    char keyChar = ' ';
+    while(!str.empty()) {
+        if(delims.find_first_of(str[0]) != std::string::npos) {
+            keyChar = str[0];
+            auto end = str.find_first_of(keyChar, 1);
+            while((end != std::string::npos) && (str[end - 1] == '\\')) {  // deal with escaped quotes
+                end = str.find_first_of(keyChar, end + 1);
+                embeddedQuote = true;
+            }
+            if(end != std::string::npos) {
+                output.push_back(str.substr(1, end - 1));
+                if(end + 2 < str.size()) {
+                    str = str.substr(end + 2);
+                } else {
+                    str.clear();
+                }
+
+            } else {
+                output.push_back(str.substr(1));
+                str = "";
+            }
+        } else {
+            auto it = std::find_if(std::begin(str), std::end(str), find_ws);
+            if(it != std::end(str)) {
+                std::string value = std::string(str.begin(), it);
+                output.push_back(value);
+                str = std::string(it + 1, str.end());
+            } else {
+                output.push_back(str);
+                str = "";
+            }
+        }
+        // transform any embedded quotes into the regular character
+        if(embeddedQuote) {
+            output.back() = find_and_replace(output.back(), std::string("\\") + keyChar, std::string(1, keyChar));
+            embeddedQuote = false;
+        }
+        trim(str);
+    }
+    return output;
+}
+
+CLI11_INLINE std::size_t escape_detect(std::string &str, std::size_t offset) {
+    auto next = str[offset + 1];
+    if((next == '\"') || (next == '\'') || (next == '`')) {
+        auto astart = str.find_last_of("-/ \"\'`", offset - 1);
+        if(astart != std::string::npos) {
+            if(str[astart] == ((str[offset] == '=') ? '-' : '/'))
+                str[offset] = ' ';  // interpret this as a space so the split_up works properly
+        }
+    }
+    return offset + 1;
+}
+
+CLI11_INLINE std::string &add_quotes_if_needed(std::string &str) {
+    if((str.front() != '"' && str.front() != '\'') || str.front() != str.back()) {
+        char quote = str.find('"') < str.find('\'') ? '\'' : '"';
+        if(str.find(' ') != std::string::npos) {
+            str.insert(0, 1, quote);
+            str.append(1, quote);
+        }
+    }
+    return str;
+}
+
+}  // namespace detail
+// [CLI11:string_tools_inl_hpp:end]
+}  // namespace CLI
diff --git a/contrib/CLI11/include/CLI/impl/Validators_inl.hpp b/contrib/CLI11/include/CLI/impl/Validators_inl.hpp
new file mode 100644
index 000000000..d6ac4fde1
--- /dev/null
+++ b/contrib/CLI11/include/CLI/impl/Validators_inl.hpp
@@ -0,0 +1,347 @@
+// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+#include <CLI/Validators.hpp>
+
+#include <CLI/Macros.hpp>
+#include <CLI/StringTools.hpp>
+#include <CLI/TypeTools.hpp>
+
+// [CLI11:public_includes:set]
+#include <map>
+#include <string>
+#include <utility>
+// [CLI11:public_includes:end]
+
+namespace CLI {
+// [CLI11:validators_inl_hpp:verbatim]
+
+CLI11_INLINE std::string Validator::operator()(std::string &str) const {
+    std::string retstring;
+    if(active_) {
+        if(non_modifying_) {
+            std::string value = str;
+            retstring = func_(value);
+        } else {
+            retstring = func_(str);
+        }
+    }
+    return retstring;
+}
+
+CLI11_NODISCARD CLI11_INLINE Validator Validator::description(std::string validator_desc) const {
+    Validator newval(*this);
+    newval.desc_function_ = [validator_desc]() { return validator_desc; };
+    return newval;
+}
+
+CLI11_INLINE Validator Validator::operator&(const Validator &other) const {
+    Validator newval;
+
+    newval._merge_description(*this, other, " AND ");
+
+    // Give references (will make a copy in lambda function)
+    const std::function<std::string(std::string & filename)> &f1 = func_;
+    const std::function<std::string(std::string & filename)> &f2 = other.func_;
+
+    newval.func_ = [f1, f2](std::string &input) {
+        std::string s1 = f1(input);
+        std::string s2 = f2(input);
+        if(!s1.empty() && !s2.empty())
+            return std::string("(") + s1 + ") AND (" + s2 + ")";
+        return s1 + s2;
+    };
+
+    newval.active_ = active_ && other.active_;
+    newval.application_index_ = application_index_;
+    return newval;
+}
+
+CLI11_INLINE Validator Validator::operator|(const Validator &other) const {
+    Validator newval;
+
+    newval._merge_description(*this, other, " OR ");
+
+    // Give references (will make a copy in lambda function)
+    const std::function<std::string(std::string &)> &f1 = func_;
+    const std::function<std::string(std::string &)> &f2 = other.func_;
+
+    newval.func_ = [f1, f2](std::string &input) {
+        std::string s1 = f1(input);
+        std::string s2 = f2(input);
+        if(s1.empty() || s2.empty())
+            return std::string();
+
+        return std::string("(") + s1 + ") OR (" + s2 + ")";
+    };
+    newval.active_ = active_ && other.active_;
+    newval.application_index_ = application_index_;
+    return newval;
+}
+
+CLI11_INLINE Validator Validator::operator!() const {
+    Validator newval;
+    const std::function<std::string()> &dfunc1 = desc_function_;
+    newval.desc_function_ = [dfunc1]() {
+        auto str = dfunc1();
+        return (!str.empty()) ? std::string("NOT ") + str : std::string{};
+    };
+    // Give references (will make a copy in lambda function)
+    const std::function<std::string(std::string & res)> &f1 = func_;
+
+    newval.func_ = [f1, dfunc1](std::string &test) -> std::string {
+        std::string s1 = f1(test);
+        if(s1.empty()) {
+            return std::string("check ") + dfunc1() + " succeeded improperly";
+        }
+        return std::string{};
+    };
+    newval.active_ = active_;
+    newval.application_index_ = application_index_;
+    return newval;
+}
+
+CLI11_INLINE void
+Validator::_merge_description(const Validator &val1, const Validator &val2, const std::string &merger) {
+
+    const std::function<std::string()> &dfunc1 = val1.desc_function_;
+    const std::function<std::string()> &dfunc2 = val2.desc_function_;
+
+    desc_function_ = [=]() {
+        std::string f1 = dfunc1();
+        std::string f2 = dfunc2();
+        if((f1.empty()) || (f2.empty())) {
+            return f1 + f2;
+        }
+        return std::string(1, '(') + f1 + ')' + merger + '(' + f2 + ')';
+    };
+}
+
+namespace detail {
+
+#if defined CLI11_HAS_FILESYSTEM && CLI11_HAS_FILESYSTEM > 0
+CLI11_INLINE path_type check_path(const char *file) noexcept {
+    std::error_code ec;
+    auto stat = std::filesystem::status(file, ec);
+    if(ec) {
+        return path_type::nonexistent;
+    }
+    switch(stat.type()) {
+    case std::filesystem::file_type::none:  // LCOV_EXCL_LINE
+    case std::filesystem::file_type::not_found:
+        return path_type::nonexistent;
+    case std::filesystem::file_type::directory:
+        return path_type::directory;
+    case std::filesystem::file_type::symlink:
+    case std::filesystem::file_type::block:
+    case std::filesystem::file_type::character:
+    case std::filesystem::file_type::fifo:
+    case std::filesystem::file_type::socket:
+    case std::filesystem::file_type::regular:
+    case std::filesystem::file_type::unknown:
+    default:
+        return path_type::file;
+    }
+}
+#else
+CLI11_INLINE path_type check_path(const char *file) noexcept {
+#if defined(_MSC_VER)
+    struct __stat64 buffer;
+    if(_stat64(file, &buffer) == 0) {
+        return ((buffer.st_mode & S_IFDIR) != 0) ? path_type::directory : path_type::file;
+    }
+#else
+    struct stat buffer;
+    if(stat(file, &buffer) == 0) {
+        return ((buffer.st_mode & S_IFDIR) != 0) ? path_type::directory : path_type::file;
+    }
+#endif
+    return path_type::nonexistent;
+}
+#endif
+
+CLI11_INLINE ExistingFileValidator::ExistingFileValidator() : Validator("FILE") {
+    func_ = [](std::string &filename) {
+        auto path_result = check_path(filename.c_str());
+        if(path_result == path_type::nonexistent) {
+            return "File does not exist: " + filename;
+        }
+        if(path_result == path_type::directory) {
+            return "File is actually a directory: " + filename;
+        }
+        return std::string();
+    };
+}
+
+CLI11_INLINE ExistingDirectoryValidator::ExistingDirectoryValidator() : Validator("DIR") {
+    func_ = [](std::string &filename) {
+        auto path_result = check_path(filename.c_str());
+        if(path_result == path_type::nonexistent) {
+            return "Directory does not exist: " + filename;
+        }
+        if(path_result == path_type::file) {
+            return "Directory is actually a file: " + filename;
+        }
+        return std::string();
+    };
+}
+
+CLI11_INLINE ExistingPathValidator::ExistingPathValidator() : Validator("PATH(existing)") {
+    func_ = [](std::string &filename) {
+        auto path_result = check_path(filename.c_str());
+        if(path_result == path_type::nonexistent) {
+            return "Path does not exist: " + filename;
+        }
+        return std::string();
+    };
+}
+
+CLI11_INLINE NonexistentPathValidator::NonexistentPathValidator() : Validator("PATH(non-existing)") {
+    func_ = [](std::string &filename) {
+        auto path_result = check_path(filename.c_str());
+        if(path_result != path_type::nonexistent) {
+            return "Path already exists: " + filename;
+        }
+        return std::string();
+    };
+}
+
+CLI11_INLINE IPV4Validator::IPV4Validator() : Validator("IPV4") {
+    func_ = [](std::string &ip_addr) {
+        auto result = CLI::detail::split(ip_addr, '.');
+        if(result.size() != 4) {
+            return std::string("Invalid IPV4 address must have four parts (") + ip_addr + ')';
+        }
+        int num = 0;
+        for(const auto &var : result) {
+            using CLI::detail::lexical_cast;
+            bool retval = lexical_cast(var, num);
+            if(!retval) {
+                return std::string("Failed parsing number (") + var + ')';
+            }
+            if(num < 0 || num > 255) {
+                return std::string("Each IP number must be between 0 and 255 ") + var;
+            }
+        }
+        return std::string();
+    };
+}
+
+}  // namespace detail
+
+CLI11_INLINE FileOnDefaultPath::FileOnDefaultPath(std::string default_path, bool enableErrorReturn)
+    : Validator("FILE") {
+    func_ = [default_path, enableErrorReturn](std::string &filename) {
+        auto path_result = detail::check_path(filename.c_str());
+        if(path_result == detail::path_type::nonexistent) {
+            std::string test_file_path = default_path;
+            if(default_path.back() != '/' && default_path.back() != '\\') {
+                // Add folder separator
+                test_file_path += '/';
+            }
+            test_file_path.append(filename);
+            path_result = detail::check_path(test_file_path.c_str());
+            if(path_result == detail::path_type::file) {
+                filename = test_file_path;
+            } else {
+                if(enableErrorReturn) {
+                    return "File does not exist: " + filename;
+                }
+            }
+        }
+        return std::string{};
+    };
+}
+
+CLI11_INLINE AsSizeValue::AsSizeValue(bool kb_is_1000) : AsNumberWithUnit(get_mapping(kb_is_1000)) {
+    if(kb_is_1000) {
+        description("SIZE [b, kb(=1000b), kib(=1024b), ...]");
+    } else {
+        description("SIZE [b, kb(=1024b), ...]");
+    }
+}
+
+CLI11_INLINE std::map<std::string, AsSizeValue::result_t> AsSizeValue::init_mapping(bool kb_is_1000) {
+    std::map<std::string, result_t> m;
+    result_t k_factor = kb_is_1000 ? 1000 : 1024;
+    result_t ki_factor = 1024;
+    result_t k = 1;
+    result_t ki = 1;
+    m["b"] = 1;
+    for(std::string p : {"k", "m", "g", "t", "p", "e"}) {
+        k *= k_factor;
+        ki *= ki_factor;
+        m[p] = k;
+        m[p + "b"] = k;
+        m[p + "i"] = ki;
+        m[p + "ib"] = ki;
+    }
+    return m;
+}
+
+CLI11_INLINE std::map<std::string, AsSizeValue::result_t> AsSizeValue::get_mapping(bool kb_is_1000) {
+    if(kb_is_1000) {
+        static auto m = init_mapping(true);
+        return m;
+    }
+    static auto m = init_mapping(false);
+    return m;
+}
+
+namespace detail {
+
+CLI11_INLINE std::pair<std::string, std::string> split_program_name(std::string commandline) {
+    // try to determine the programName
+    std::pair<std::string, std::string> vals;
+    trim(commandline);
+    auto esp = commandline.find_first_of(' ', 1);
+    while(detail::check_path(commandline.substr(0, esp).c_str()) != path_type::file) {
+        esp = commandline.find_first_of(' ', esp + 1);
+        if(esp == std::string::npos) {
+            // if we have reached the end and haven't found a valid file just assume the first argument is the
+            // program name
+            if(commandline[0] == '"' || commandline[0] == '\'' || commandline[0] == '`') {
+                bool embeddedQuote = false;
+                auto keyChar = commandline[0];
+                auto end = commandline.find_first_of(keyChar, 1);
+                while((end != std::string::npos) && (commandline[end - 1] == '\\')) {  // deal with escaped quotes
+                    end = commandline.find_first_of(keyChar, end + 1);
+                    embeddedQuote = true;
+                }
+                if(end != std::string::npos) {
+                    vals.first = commandline.substr(1, end - 1);
+                    esp = end + 1;
+                    if(embeddedQuote) {
+                        vals.first = find_and_replace(vals.first, std::string("\\") + keyChar, std::string(1, keyChar));
+                    }
+                } else {
+                    esp = commandline.find_first_of(' ', 1);
+                }
+            } else {
+                esp = commandline.find_first_of(' ', 1);
+            }
+
+            break;
+        }
+    }
+    if(vals.first.empty()) {
+        vals.first = commandline.substr(0, esp);
+        rtrim(vals.first);
+    }
+
+    // strip the program name
+    vals.second = (esp < commandline.length() - 1) ? commandline.substr(esp + 1) : std::string{};
+    ltrim(vals.second);
+    return vals;
+}
+
+}  // namespace detail
+/// @}
+
+// [CLI11:validators_inl_hpp:end]
+}  // namespace CLI
diff --git a/man/osm2pgsql-gen.md b/man/osm2pgsql-gen.md
index 3161ced34..2ccaca0cd 100644
--- a/man/osm2pgsql-gen.md
+++ b/man/osm2pgsql-gen.md
@@ -29,11 +29,7 @@ mandatory for short options too.
 # MAIN OPTIONS
 
 -a, \--append
-:   Run in append mode.
-
--c, \--create
-:   Run in create mode. This is the default if **-a, \--append** is not
-    specified.
+:   Run in append mode. The default is to run in create mode.
 
 -S, \--style=FILE
 :   The Lua config file. Same as for **osm2pgsql**. Usually not required
@@ -42,7 +38,7 @@ mandatory for short options too.
 -j, \-jobs=NUM
 :   Specifies the number of parallel threads used for certain operations.
     Setting this to the number of available CPU cores is a reasonable starting
-    point.
+    point. Minimum value and default is 1, maximum value is 256.
 
 # HELP/VERSION OPTIONS
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 976ca5341..528ff6be1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,6 +6,7 @@ add_library(osm2pgsql_lib STATIC)
 target_compile_features(osm2pgsql_lib PUBLIC cxx_std_17)
 
 target_sources(osm2pgsql_lib PRIVATE
+  command-line-app.cpp
   command-line-parser.cpp
   db-copy.cpp
   debug-output.cpp
diff --git a/src/command-line-app.cpp b/src/command-line-app.cpp
new file mode 100644
index 000000000..eb725f37b
--- /dev/null
+++ b/src/command-line-app.cpp
@@ -0,0 +1,112 @@
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+#include "command-line-app.hpp"
+
+#include "logging.hpp"
+#include "util.hpp"
+
+#include <map>
+
+command_line_app_t::command_line_app_t(std::string app_description)
+: CLI::App(std::move(app_description))
+{
+    set_help_flag(); // Disable autogenerated help option
+
+    add_flag("-h,--help", "Print this help message and exit.");
+    add_flag("-V,--version", "Show version and exit.");
+
+    init_database_options();
+    init_logging_options();
+}
+
+bool command_line_app_t::want_help() const { return count("--help"); }
+
+bool command_line_app_t::want_version() const { return count("--version"); }
+
+void command_line_app_t::init_database_options()
+{
+    add_option("-d,--database", m_database_options.db)
+        ->description("Database name or PostgreSQL conninfo string.")
+        ->type_name("DB")
+        ->group("Database options");
+
+    add_option("-U,--user", m_database_options.username)
+        ->description("Database user.")
+        ->type_name("USERNAME")
+        ->group("Database options");
+
+    add_flag_function(
+        "-W,--password",
+        [&](int64_t) { m_database_options.password = util::get_password(); })
+        ->description("Force password prompt.")
+        ->group("Database options");
+
+    add_option("-H,--host", m_database_options.host)
+        ->description(
+            "Database server hostname or unix domain socket location.")
+        ->type_name("HOST")
+        ->group("Database options");
+
+    add_option("-P,--port", m_database_options.port)
+        ->description("Database server port.")
+        ->type_name("PORT")
+        ->group("Database options");
+}
+
+void command_line_app_t::init_logging_options()
+{
+    static std::map<std::string, log_level> const log_levels_map{
+        {"debug", log_level::debug},
+        {"info", log_level::info},
+        {"warn", log_level::warn},
+        {"warning", log_level::warn},
+        {"error", log_level::error}};
+
+    add_option_function<std::string>(
+        "--log-level",
+        [](std::string const &level) {
+            get_logger().set_level(log_levels_map.find(level)->second);
+        })
+        ->description(
+            "Set log level ('debug', 'info' (default), 'warn', or 'error').")
+        ->check(CLI::IsMember(log_levels_map))
+        ->default_val("info")
+        ->run_callback_for_default()
+        ->option_text("LEVEL")
+        ->group("Logging options");
+
+    add_option_function<std::string>(
+        "--log-progress",
+        [&](std::string const &arg) {
+            if (arg == "true") {
+                get_logger().enable_progress();
+            } else if (arg == "false") {
+                get_logger().disable_progress();
+            } else if (arg == "auto") {
+                get_logger().auto_progress();
+            } else {
+                throw fmt_error("Unknown value for --log-progress option: {}",
+                                arg);
+            }
+        })
+        ->description(
+            "Log progress to console ('true', 'false', 'auto' (default)).")
+        ->option_text("PROGRESS")
+        ->group("Logging options");
+
+    add_flag_function("--log-sql", [](int64_t) { get_logger().enable_sql(); })
+        ->description("Enable logging of SQL commands for debugging.")
+        ->group("Logging options");
+
+    add_flag_function("--log-sql-data",
+                      [](int64_t) { get_logger().enable_sql_data(); })
+        ->description("Enable logging of all data added to the database.")
+        ->group("Logging options");
+}
diff --git a/src/command-line-app.hpp b/src/command-line-app.hpp
new file mode 100644
index 000000000..046e3fadb
--- /dev/null
+++ b/src/command-line-app.hpp
@@ -0,0 +1,42 @@
+#ifndef OSM2PGSQL_COMMAND_LINE_APP_HPP
+#define OSM2PGSQL_COMMAND_LINE_APP_HPP
+
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+#include "options.hpp"
+
+#include <CLI/CLI.hpp>
+
+#include <string>
+#include <utility>
+
+class command_line_app_t : public CLI::App
+{
+public:
+    explicit command_line_app_t(std::string app_description);
+
+    bool want_help() const;
+
+    bool want_version() const;
+
+    database_options_t database_options() const noexcept
+    {
+        return m_database_options;
+    }
+
+private:
+    database_options_t m_database_options;
+
+    void init_database_options();
+    void init_logging_options();
+
+}; // class App
+
+#endif // OSM2PGSQL_COMMAND_LINE_APP_HPP
diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index 6e63f5c4f..e4bb4ec00 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -9,6 +9,7 @@
 
 #include "command-line-parser.hpp"
 
+#include "command-line-app.hpp"
 #include "format.hpp"
 #include "logging.hpp"
 #include "options.hpp"
@@ -19,7 +20,7 @@
 
 #include <osmium/version.hpp>
 
-#include <getopt.h>
+#include <CLI/CLI.hpp>
 
 #ifdef HAVE_LUA
 #include <lua.hpp>
@@ -31,216 +32,6 @@
 #include <stdexcept>
 #include <thread> // for number of threads
 
-static char const *program_name(char const *name)
-{
-    char const *const slash = std::strrchr(name, '/');
-    return slash ? (slash + 1) : name;
-}
-
-namespace {
-char const *const short_options =
-    "ab:cd:KhlmMp:suvU:WH:P:i:IE:C:S:e:o:O:xkjGz:r:VF:";
-
-struct option const long_options[] = {
-    {"append", no_argument, nullptr, 'a'},
-    {"bbox", required_argument, nullptr, 'b'},
-    {"cache", required_argument, nullptr, 'C'},
-    {"cache-strategy", required_argument, nullptr, 204},
-    {"create", no_argument, nullptr, 'c'},
-    {"database", required_argument, nullptr, 'd'},
-    {"disable-parallel-indexing", no_argument, nullptr, 'I'},
-    {"drop", no_argument, nullptr, 206},
-    {"expire-bbox-size", required_argument, nullptr, 214},
-    {"expire-output", required_argument, nullptr, 'o'},
-    {"expire-tiles", required_argument, nullptr, 'e'},
-    {"extra-attributes", no_argument, nullptr, 'x'},
-    {"flat-nodes", required_argument, nullptr, 'F'},
-    {"help", no_argument, nullptr, 'h'},
-    {"host", required_argument, nullptr, 'H'},
-    {"hstore", no_argument, nullptr, 'k'},
-    {"hstore-add-index", no_argument, nullptr, 211},
-    {"hstore-all", no_argument, nullptr, 'j'},
-    {"hstore-column", required_argument, nullptr, 'z'},
-    {"hstore-match-only", no_argument, nullptr, 208},
-    {"input-reader", required_argument, nullptr, 'r'},
-    {"keep-coastlines", no_argument, nullptr, 'K'},
-    {"latlong", no_argument, nullptr, 'l'},
-    {"log-level", required_argument, nullptr, 400},
-    {"log-progress", required_argument, nullptr, 401},
-    {"log-sql", no_argument, nullptr, 402},
-    {"log-sql-data", no_argument, nullptr, 403},
-    {"merc", no_argument, nullptr, 'm'},
-    {"middle-schema", required_argument, nullptr, 215},
-    {"middle-way-node-index-id-shift", required_argument, nullptr, 300},
-    {"middle-database-format", required_argument, nullptr, 301},
-    {"middle-with-nodes", no_argument, nullptr, 302},
-    {"multi-geometry", no_argument, nullptr, 'G'},
-    {"number-processes", required_argument, nullptr, 205},
-    {"output", required_argument, nullptr, 'O'},
-    {"output-pgsql-schema", required_argument, nullptr, 216},
-    {"password", no_argument, nullptr, 'W'},
-    {"port", required_argument, nullptr, 'P'},
-    {"prefix", required_argument, nullptr, 'p'},
-    {"proj", required_argument, nullptr, 'E'},
-    {"reproject-area", no_argument, nullptr, 213},
-    {"schema", required_argument, nullptr, 218},
-    {"slim", no_argument, nullptr, 's'},
-    {"style", required_argument, nullptr, 'S'},
-    {"tablespace-index", required_argument, nullptr, 'i'},
-    {"tablespace-main-data", required_argument, nullptr, 202},
-    {"tablespace-main-index", required_argument, nullptr, 203},
-    {"tablespace-slim-data", required_argument, nullptr, 200},
-    {"tablespace-slim-index", required_argument, nullptr, 201},
-    {"tag-transform-script", required_argument, nullptr, 212},
-    {"username", required_argument, nullptr, 'U'},
-    {"verbose", no_argument, nullptr, 'v'},
-    {"version", no_argument, nullptr, 'V'},
-    {"with-forward-dependencies", required_argument, nullptr, 217},
-    {nullptr, 0, nullptr, 0}};
-
-} // anonymous namespace
-
-void long_usage(char const *arg0, bool verbose)
-{
-    char const *const name = program_name(arg0);
-
-    fmt::print(stdout, "\nUsage: {} [OPTIONS] OSM-FILE...\n", name);
-    (void)std::fputs(
-        "\nImport data from the OSM file(s) into a PostgreSQL database.\n\n\
-Full documentation is available at https://osm2pgsql.org/\n\n",
-        stdout);
-
-    (void)std::fputs("\
-Common options:\n\
-    -a|--append     Update existing osm2pgsql database with data from file.\n\
-    -c|--create     Import OSM data from file into database. This is the\n\
-                    default if --append is not specified.\n\
-    -O|--output=OUTPUT  Set output. Options are:\n\
-                    pgsql - Output to a PostGIS database (default)\n\
-                    flex - More flexible output to PostGIS database\n\
-                    gazetteer - Output to a PostGIS database for Nominatim\n\
-                                (deprecated)\n\
-                    null - No output. Used for testing.\n\
-    -S|--style=FILE  Location of the style file. Defaults to\n\
-                    '" DEFAULT_STYLE "'.\n\
-    -k|--hstore     Add tags without column to an additional hstore column.\n",
-                     stdout);
-#ifdef HAVE_LUA
-    (void)std::fputs("\
-       --tag-transform-script=SCRIPT  Specify a Lua script to handle tag\n\
-                    filtering and normalisation (pgsql output only).\n",
-                     stdout);
-#endif
-    (void)std::fputs("\
-    -s|--slim       Store temporary data in the database. This switch is\n\
-                    required if you want to update with --append later.\n\
-        --drop      Only with --slim: drop temporary tables after import\n\
-                    (no updates are possible).\n\
-    -C|--cache=SIZE  Use up to SIZE MB for caching nodes (default: 800).\n\
-    -F|--flat-nodes=FILE  Specifies the file to use to persistently store node\n\
-                    information in slim mode instead of in PostgreSQL.\n\
-                    This is a single large file (> 50GB). Only recommended\n\
-                    for full planet imports. Default is disabled.\n\
-    --schema=SCHEMA Default schema (default: 'public').\n\
-\n\
-Database options:\n\
-    -d|--database=DB  The name of the PostgreSQL database to connect to or\n\
-                    a PostgreSQL conninfo string.\n\
-    -U|--username=NAME  PostgreSQL user name.\n\
-    -W|--password   Force password prompt.\n\
-    -H|--host=HOST  Database server host name or socket location.\n\
-    -P|--port=PORT  Database server port.\n",
-                     stdout);
-
-    if (verbose) {
-        (void)std::fputs("\n\
-Logging options:\n\
-       --log-level=LEVEL  Set log level ('debug', 'info' (default), 'warn',\n\
-                    or 'error').\n\
-       --log-progress=VALUE  Enable ('true') or disable ('false') progress\n\
-                    logging. If set to 'auto' osm2pgsql will enable progress\n\
-                    logging on the console and disable it if the output is\n\
-                    redirected to a file. Default: true.\n\
-       --log-sql    Enable logging of SQL commands for debugging.\n\
-       --log-sql-data  Enable logging of all data added to the database.\n\
-    -v|--verbose    Same as '--log-level=debug'.\n\
-\n\
-Input options:\n\
-    -r|--input-reader=FORMAT  Input format ('xml', 'pbf', 'o5m', or\n\
-                    'auto' - autodetect format (default))\n\
-    -b|--bbox=MINLON,MINLAT,MAXLON,MAXLAT  Apply a bounding box filter on the\n\
-                    imported data, e.g. '--bbox -0.5,51.25,0.5,51.75'.\n\
-\n\
-Middle options:\n\
-    -i|--tablespace-index=TBLSPC  The name of the PostgreSQL tablespace where\n\
-                    all indexes will be created.\n\
-                    The following options allow more fine-grained control:\n\
-       --tablespace-slim-data=TBLSPC  Tablespace for slim mode tables.\n\
-       --tablespace-slim-index=TBLSPC  Tablespace for slim mode indexes.\n\
-                    (if unset, use db's default; -i is equivalent to setting\n\
-                    --tablespace-main-index and --tablespace-slim-index).\n\
-    -p|--prefix=PREFIX  Prefix for table names (default 'planet_osm')\n\
-       --cache-strategy=STRATEGY  Deprecated. Not used any more.\n\
-    -x|--extra-attributes  Include attributes (user name, user id, changeset\n\
-                    id, timestamp and version) for each object in the database.\n\
-       --middle-schema=SCHEMA  Schema to use for middle tables (default: setting of --schema).\n\
-       --middle-way-node-index-id-shift=SHIFT  Set ID shift for bucket index.\n\
-       --middle-database-format=FORMAT  Set middle db format (default: legacy).\n\
-       --middle-with-nodes  Store tagged nodes in db (new middle db format only).\n\
-\n\
-Pgsql output options:\n\
-    -i|--tablespace-index=TBLSPC  The name of the PostgreSQL tablespace where\n\
-                    all indexes will be created.\n\
-                    The following options allow more fine-grained control:\n\
-       --tablespace-main-data=TBLSPC  Tablespace for main tables.\n\
-       --tablespace-main-index=TBLSPC  Tablespace for main table indexes.\n\
-    -l|--latlong    Store data in degrees of latitude & longitude (WGS84).\n\
-    -m|--merc       Store data in web mercator (default).\n"
-#ifdef HAVE_GENERIC_PROJ
-                         "    -E|--proj=SRID  Use projection EPSG:SRID.\n"
-#endif
-                         "\
-    -p|--prefix=PREFIX  Prefix for table names (default 'planet_osm').\n\
-    -x|--extra-attributes  Include attributes (user name, user id, changeset\n\
-                    id, timestamp and version) for each object in the database.\n\
-       --hstore-match-only  Only keep objects that have a value in one of the\n\
-                    columns (default with --hstore is to keep all objects).\n\
-    -j|--hstore-all  Add all tags to an additional hstore (key/value) column.\n\
-    -z|--hstore-column=NAME  Add an additional hstore (key/value) column\n\
-                    containing all tags that start with the specified string,\n\
-                    eg '--hstore-column name:' will produce an extra hstore\n\
-                    column that contains all 'name:xx' tags.\n\
-       --hstore-add-index  Add index to hstore column.\n\
-    -G|--multi-geometry  Generate multi-geometry features in postgresql tables.\n\
-    -K|--keep-coastlines  Keep coastline data rather than filtering it out.\n\
-                    Default: discard objects tagged natural=coastline.\n\
-       --output-pgsql-schema=SCHEMA Schema to use for pgsql output tables\n\
-                    (default: setting of --schema).\n\
-       --reproject-area  Compute area column using web mercator coordinates.\n\
-\n\
-Expiry options:\n\
-    -e|--expire-tiles=[MIN_ZOOM-]MAX_ZOOM  Create a tile expiry list.\n\
-                    Zoom levels must be larger than 0 and smaller than 32.\n\
-    -o|--expire-output=FILENAME  Output filename for expired tiles list.\n\
-       --expire-bbox-size=SIZE  Max size for a polygon to expire the whole\n\
-                    polygon, not just the boundary.\n\
-\n\
-Advanced options:\n\
-    -I|--disable-parallel-indexing   Disable indexing all tables concurrently.\n\
-       --number-processes=NUM  Specifies the number of parallel processes used\n\
-                   for certain operations (default depends on number of CPUs).\n\
-       --with-forward-dependencies=BOOL  Propagate changes from nodes to ways\n\
-                   and node/way members to relations (Default: true).\n\
-",
-                         stdout);
-    } else {
-        fmt::print(
-            stdout,
-            "\nRun '{} --help --verbose' (-h -v) for a full list of options.\n",
-            name);
-    }
-}
-
 static bool compare_prefix(std::string const &str,
                            std::string const &prefix) noexcept
 {
@@ -283,14 +74,16 @@ std::string build_conninfo(database_options_t const &opt)
     return joiner();
 }
 
-static osmium::Box parse_bbox_param(char const *arg)
+static osmium::Box parse_bbox_param(std::string const &arg)
 {
     double minx = NAN;
     double maxx = NAN;
     double miny = NAN;
     double maxy = NAN;
 
-    int const n = sscanf(arg, "%lf,%lf,%lf,%lf", &minx, &miny, &maxx, &maxy);
+    int const n =
+        sscanf(arg.c_str(), "%lf,%lf,%lf,%lf", &minx, &miny, &maxx, &maxy);
+
     if (n != 4) {
         throw std::runtime_error{"Bounding box must be specified like: "
                                  "minlon,minlat,maxlon,maxlat."};
@@ -311,24 +104,6 @@ static osmium::Box parse_bbox_param(char const *arg)
     return osmium::Box{minx, miny, maxx, maxy};
 }
 
-static unsigned int parse_number_processes_param(char const *arg)
-{
-    int num = atoi(arg);
-    if (num < 1) {
-        log_warn("--number-processes must be at least 1. Using 1.");
-        num = 1;
-    } else if (num > 32) {
-        // The threads will open up database connections which will
-        // run out at some point. It depends on the number of tables
-        // how many connections there are. The number 32 is way beyond
-        // anything that will make sense here.
-        log_warn("--number-processes too large. Set to 32.");
-        num = 32;
-    }
-
-    return static_cast<unsigned int>(num);
-}
-
 static void parse_expire_tiles_param(char const *arg,
                                      uint32_t *expire_tiles_zoom_min,
                                      uint32_t *expire_tiles_zoom)
@@ -378,52 +153,6 @@ static void parse_expire_tiles_param(char const *arg,
                              " tile expiry must be separated by '-'."};
 }
 
-static void parse_log_level_param(char const *arg)
-{
-    if (std::strcmp(arg, "debug") == 0) {
-        get_logger().set_level(log_level::debug);
-    } else if (std::strcmp(arg, "info") == 0) {
-        get_logger().set_level(log_level::info);
-    } else if ((std::strcmp(arg, "warn") == 0) ||
-               (std::strcmp(arg, "warning") == 0)) {
-        get_logger().set_level(log_level::warn);
-    } else if (std::strcmp(arg, "error") == 0) {
-        get_logger().set_level(log_level::error);
-    } else {
-        throw fmt_error("Unknown value for --log-level option: {}", arg);
-    }
-}
-
-static void parse_log_progress_param(char const *arg)
-{
-    if (std::strcmp(arg, "true") == 0) {
-        get_logger().enable_progress();
-    } else if (std::strcmp(arg, "false") == 0) {
-        get_logger().disable_progress();
-    } else if (std::strcmp(arg, "auto") == 0) {
-        get_logger().auto_progress();
-    } else {
-        throw fmt_error("Unknown value for --log-progress option: {}", arg);
-    }
-}
-
-static bool parse_with_forward_dependencies_param(char const *arg)
-{
-    log_warn("The option --with-forward-dependencies is deprecated and will "
-             "soon be removed.");
-
-    if (std::strcmp(arg, "false") == 0) {
-        return false;
-    }
-
-    if (std::strcmp(arg, "true") == 0) {
-        return true;
-    }
-
-    throw fmt_error("Unknown value for --with-forward-dependencies option: {}",
-                    arg);
-}
-
 void print_version()
 {
     fmt::print(stderr, "Build: {}\n", get_build_type());
@@ -534,280 +263,474 @@ options_t parse_command_line(int argc, char *argv[])
         options.num_procs = 1;
     }
 
-    // If there are no command line arguments at all, show help.
-    if (argc == 1) {
+    command_line_app_t app{"osm2pgsql -- Import OpenStreetMap data into a "
+                           "PostgreSQL/PostGIS database\n"};
+    app.get_formatter()->column_width(38);
+
+    app.add_option("OSMFILE", options.input_files)
+        ->description(
+            "OSM input file(s). Read manual before using multiple files!")
+        ->type_name("");
+
+    // ----------------------------------------------------------------------
+    // Main options
+    // ----------------------------------------------------------------------
+
+    // --append
+    app.add_flag("-a,--append", options.append)
+        ->description("Update existing osm2pgsql database (needs --slim).");
+
+    // --create
+    app.add_flag("-c,--create", options.create)
+        ->description("Import OSM data from file into database. This is the "
+                      "default if --append is not used.");
+
+    // --slim
+    app.add_flag("-s,--slim", options.slim)
+        ->description("Store raw OSM data in the database."
+                      " Required if you want to update with --append later.");
+
+    // ----------------------------------------------------------------------
+    // Database options
+    // ----------------------------------------------------------------------
+
+    // --prefix
+    app.add_option_function<std::string>(
+           "-p,--prefix",
+           [&](std::string arg) {
+               options.prefix = std::move(arg);
+               options.prefix_is_set = true;
+               check_identifier(options.prefix, "--prefix parameter");
+           })
+        ->description("Prefix for table names (default: 'planet_osm').")
+        ->type_name("PREFIX")
+        ->group("Database options");
+
+    // --schema
+    app.add_option("--schema", options.dbschema)
+        ->description("Database schema (default: 'public').")
+        ->type_name("SCHEMA")
+        ->group("Database options");
+
+    // ----------------------------------------------------------------------
+    // Logging options
+    // ----------------------------------------------------------------------
+
+    // --verbose
+    bool verbose = false;
+    app.add_flag("-v,--verbose", verbose)
+        ->description("Enable debug logging.")
+        ->group("Logging options");
+
+    // ----------------------------------------------------------------------
+    // Output options
+    // ----------------------------------------------------------------------
+
+    // --output
+    app.add_option("-O,--output", options.output_backend)
+        ->description("Set output ('pgsql' (default), 'flex', 'gazetteer' "
+                      "(deprecated), 'null').")
+        ->type_name("OUTPUT")
+        ->group("Output options");
+
+    // --style
+    app.add_option("-S,--style", options.style)
+        ->description("Location of the style file. (Default: '" DEFAULT_STYLE
+                      "').")
+        ->type_name("FILE")
+        ->check(CLI::ExistingFile)
+        ->group("Output options");
+
+    // ----------------------------------------------------------------------
+    // Pgsql output options
+    // ----------------------------------------------------------------------
+
+    // --hstore
+    auto *opt_hstore =
+        app.add_flag_function(
+               "-k,--hstore",
+               [&](int64_t) { options.hstore_mode = hstore_column::norm; })
+            ->description("Add tags without column to an additional hstore "
+                          "(key/value) column.")
+            ->group("Pgsql output options");
+
+    // --hstore-add-index
+    app.add_flag("--hstore-add-index", options.enable_hstore_index)
+        ->description("Add index to hstore (key/value) column.")
+        ->group("Pgsql output options");
+
+    // --hstore-all
+    auto *const opt_hstore_all =
+        app.add_flag_function(
+               "-j,--hstore-all",
+               [&](int64_t) { options.hstore_mode = hstore_column::all; })
+            ->description(
+                "Add all tags to an additional hstore (key/value) column.")
+            ->group("Pgsql output options")
+            ->excludes(opt_hstore);
+
+    opt_hstore->excludes(opt_hstore_all);
+
+    // --hstore-column
+    app.add_option("-z,--hstore-column", options.hstore_columns)
+        ->description("Add additional hstore (key/value) column.")
+        ->type_name("NAME")
+        ->group("Pgsql output options");
+
+    // --hstore-match-only
+    app.add_flag("--hstore-match-only", options.hstore_match_only)
+        ->description("Only keep objects that have a non-NULL value in one of "
+                      "the columns.")
+        ->group("Pgsql output options");
+
+    // --keep-coastlines
+    app.add_flag("-K,--keep-coastlines", options.keep_coastlines)
+        ->description("Keep coastline data (default: discard objects tagged"
+                      " natural=coastline).")
+        ->group("Pgsql output options");
+
+    // --latlong
+    app.add_flag_function("-l,--latlong",
+                          [&](int64_t) {
+                              options.projection =
+                                  reprojection::create_projection(PROJ_LATLONG);
+                          })
+        ->description("Store data in degrees of latitude & longitude (WGS84).")
+        ->group("Pgsql output options");
+
+    // --merc
+    app.add_flag_function("-m,--merc",
+                          [&](int64_t) {
+                              options.projection =
+                                  reprojection::create_projection(
+                                      PROJ_SPHERE_MERC);
+                          })
+        ->description("Store data in Web Mercator [EPSG 3857]. This is the "
+                      "default if --latlong or --proj are not used.")
+        ->group("Pgsql output options");
+
+    // --multi-geometry
+    app.add_flag("-G,--multi-geometry", options.enable_multi)
+        ->description("Generate multi-geometry features in database tables.")
+        ->group("Pgsql output options");
+
+    // --output-pgsql-schema
+    app.add_option("--output-pgsql-schema", options.output_dbschema)
+        ->description("Database schema for pgsql output tables"
+                      " (default: setting of --schema).")
+        ->type_name("SCHEMA")
+        ->group("Pgsql output options");
+
+    // --proj
+    app.add_option_function<int>("-E,--proj",
+#ifdef HAVE_GENERIC_PROJ
+                                 [&](int arg) {
+                                     options.projection =
+                                         reprojection::create_projection(arg);
+#else
+           [&](int) {
+               throw std::runtime_error{
+                   "Generic projections not available in this build."};
+#endif
+                                 })
+#ifdef HAVE_GENERIC_PROJ
+        ->description("Use projection EPSG:SRID.")
+#else
+        ->description("Use projection EPSG:SRID (not available in this build).")
+#endif
+        ->type_name("SRID")
+        ->group("Pgsql output options");
+
+    // --reproject-area
+    app.add_flag("--reproject-area", options.reproject_area)
+        ->description("Compute area column using Web Mercator coordinates.")
+        ->group("Pgsql output options");
+
+#ifdef HAVE_LUA
+    // --tag-transform-script
+    app.add_option("--tag-transform-script", options.tag_transform_script)
+        ->description(
+            "Specify a Lua script to handle tag filtering and normalisation.")
+        ->option_text("SCRIPT")
+        ->check(CLI::ExistingFile)
+        ->group("Pgsql output options");
+#endif
+
+    // ----------------------------------------------------------------------
+    // Expire options
+    // ----------------------------------------------------------------------
+
+    // --expire-bbox-size
+    app.add_option("--expire-bbox-size", options.expire_tiles_max_bbox)
+        ->description("Max size for a polygon to expire the whole polygon, not "
+                      "just the boundary (default: 20000).")
+        ->type_name("SIZE")
+        ->group("Expire options");
+
+    // --expire-output
+    app.add_option("-o,--expire-output", options.expire_tiles_filename)
+        ->description("Output filename for expired tiles list.")
+        ->type_name("FILE")
+        ->group("Expire options");
+
+    // --expire-tiles
+    app.add_option_function<std::string>("-e,--expire-tiles",
+                                         [&](std::string const &arg) {
+                                             parse_expire_tiles_param(
+                                                 arg.c_str(),
+                                                 &options.expire_tiles_zoom_min,
+                                                 &options.expire_tiles_zoom);
+                                         })
+        ->description("Create a tile expiry list. Zoom levels must be larger "
+                      "than 0 and smaller than 32.")
+        ->type_name("[MINZOOM-]MAXZOOM")
+        ->group("Expire options");
+
+    // ----------------------------------------------------------------------
+    // Middle options
+    // ----------------------------------------------------------------------
+
+    // --cache
+    app.add_option("-C,--cache", options.cache)
+        ->description("Use up to SIZE MB for caching nodes (default: 800).")
+        ->type_name("SIZE")
+        ->group("Middle options");
+
+    // --drop
+    app.add_flag("--drop", options.droptemp)
+        ->description("Drop middle tables after import (needs --slim).")
+        ->group("Middle options");
+
+    // --extra-attributes
+    app.add_flag("-x,--extra-attributes", options.extra_attributes)
+        ->description("Include attributes (version, timestamp, changeset id,"
+                      " user id, and user name) for each OSM object.")
+        ->group("Middle options");
+
+    // --flat-nodes
+    app.add_option("-F,--flat-nodes", options.flat_node_file)
+        ->description("File for storing node locations (needs --slim,"
+                      " default: store in database).")
+        ->type_name("FILE")
+        ->group("Middle options");
+
+    // --middle-schema
+    app.add_option("--middle-schema", options.middle_dbschema)
+        ->description(
+            "Database schema for middle tables (default: setting of --schema).")
+        ->type_name("SCHEMA")
+        ->group("Middle options");
+
+    // --middle-database-format
+    app.add_option_function<std::string>(
+           "--middle-database-format",
+           [&](std::string const &arg) {
+               if (arg == "legacy") {
+                   options.middle_database_format = 1;
+               } else if (arg == "new") {
+                   options.middle_database_format = 2;
+               } else {
+                   throw std::runtime_error{
+                       "Unknown value for --middle-database-format"
+                       " (Use 'legacy' or 'new')."};
+               }
+           })
+        ->description("Set middle db format ('legacy' (default), 'new').")
+        ->type_name("FORMAT")
+        ->group("Middle options");
+
+    // --middle-with-nodes
+    app.add_flag("--middle-with-nodes", options.middle_with_nodes)
+        ->description("Store tagged nodes in db (new middle db format only).")
+        ->group("Middle options");
+
+    // ----------------------------------------------------------------------
+    // Input options
+    // ----------------------------------------------------------------------
+
+    // --bbox
+    app.add_option_function<std::string>("-b,--bbox",
+                                         [&](std::string const &arg) {
+                                             options.bbox =
+                                                 parse_bbox_param(arg);
+                                         })
+        ->description("Apply a bounding box filter on the imported data, e.g. "
+                      "'--bbox -0.5,51.25,0.5,51.75'.")
+        ->type_name("MINX,MINY,MAXX,MAXY")
+        ->group("Input options");
+
+    // --input-reader
+    app.add_option("-r,--input-reader", options.input_format)
+        ->description("Input format ('xml', 'pbf', 'o5m', 'opl',"
+                      " 'auto' - autodetect format (default)).")
+        ->type_name("FORMAT")
+        ->group("Input options");
+
+    // ----------------------------------------------------------------------
+    // Advanced options
+    // ----------------------------------------------------------------------
+
+    // --disable-parallel-indexing
+    app.add_flag_function("-I,--disable-parallel-indexing",
+                          [&](int64_t) { options.parallel_indexing = false; })
+        ->description("Disable concurrent index creation.")
+        ->group("Advanced options");
+
+    // --middle-way-node-index-id-shift
+    app.add_option("--middle-way-node-index-id-shift",
+                   options.way_node_index_id_shift)
+        ->description("Set ID shift for bucket index.")
+        ->type_name("N")
+        ->group("Advanced options");
+
+    // --number-processes
+    app.add_option("--number-processes", options.num_procs)
+        // The threads will open up database connections which will
+        // run out at some point. It depends on the number of tables
+        // how many connections there are. The number 32 is way beyond
+        // anything that will make sense here.
+        ->transform(CLI::Bound(1, 32))
+        ->description("Specifies the number of parallel processes used for "
+                      "certain operations (default: number of CPUs).")
+        ->type_name("NUM")
+        ->group("Advanced options");
+
+    // ----------------------------------------------------------------------
+    // Tablespace options
+    // ----------------------------------------------------------------------
+
+    std::string tablespace_index;
+    app.add_option("-i,--tablespace-index", tablespace_index)
+        ->description("Tablespace for indexes (sets default for "
+                      "--tablespace-(main|slim)-index).")
+        ->option_text("TBLSPC")
+        ->group("Tablespace options");
+
+    app.add_option("--tablespace-main-data", options.tblsmain_data)
+        ->description("Tablespace for main tables.")
+        ->option_text("TBLSPC")
+        ->group("Tablespace options");
+
+    app.add_option("--tablespace-main-index", options.tblsmain_index)
+        ->description("Tablespace for main indexes.")
+        ->option_text("TBLSPC")
+        ->group("Tablespace options");
+
+    app.add_option("--tablespace-slim-data", options.tblsslim_data)
+        ->description("Tablespace for slim mode tables.")
+        ->option_text("TBLSPC")
+        ->group("Tablespace options");
+
+    app.add_option("--tablespace-slim-index", options.tblsslim_index)
+        ->description("Tablespace for slim mode indexes.")
+        ->option_text("TBLSPC")
+        ->group("Tablespace options");
+
+    // ----------------------------------------------------------------------
+    // Deprecated options
+    // ----------------------------------------------------------------------
+
+    // --cache-strategy
+    app.add_option_function<std::string>(
+           "--cache-strategy",
+           [&](std::string const &) {
+               log_warn("Deprecated option --cache-strategy ignored");
+           })
+        ->description(
+            "The option has been removed and only a warning is printed.")
+        ->option_text("TYPE")
+        ->group("Deprecated options");
+
+    // --with-forward-dependencies
+    app.add_option_function<std::string>(
+           "--with-forward-dependencies",
+           [&](std::string const &arg) {
+               log_warn("The option --with-forward-dependencies is deprecated "
+                        "and will soon be removed.");
+               if (arg == "false") {
+                   options.with_forward_dependencies = false;
+                   return;
+               }
+               if (arg == "true") {
+                   options.with_forward_dependencies = true;
+                   return;
+               }
+               throw fmt_error(
+                   "Unknown value for --with-forward-dependencies option: {}",
+                   arg);
+           })
+        ->description("Propagate changes from nodes to ways and node/way "
+                      "members to relations (default: true).")
+        ->option_text("BOOL")
+        ->group("Deprecated options");
+
+    try {
+        app.parse(argc, argv);
+    } catch (...) {
+        log_info("osm2pgsql version {}", get_osm2pgsql_version());
+        throw;
+    }
+
+    if (app.want_help()) {
+        std::cout << app.help();
         options.command = command_t::help;
-        long_usage(argv[0], false);
         return options;
     }
 
-    database_options_t database_options;
-
-    bool print_help = false;
-    bool help_verbose = false; // Will be set when -v/--verbose is set
-
-    int c = 0;
-
-    //keep going while there are args left to handle
-    // note: optind would seem to need to be set to 1, but that gives valgrind
-    // errors - setting it to zero seems to work, though. see
-    // http://stackoverflow.com/questions/15179963/is-it-possible-to-repeat-getopt#15179990
-    optind = 0;
-    // NOLINTNEXTLINE(concurrency-mt-unsafe)
-    while (-1 != (c = getopt_long(argc, argv, short_options, long_options,
-                                  nullptr))) {
-
-        //handle the current arg
-        switch (c) {
-        case 'a': // --append
-            options.append = true;
-            break;
-        case 'b': // --bbox
-            options.bbox = parse_bbox_param(optarg);
-            break;
-        case 'c': // --create
-            options.create = true;
-            break;
-        case 'v': // --verbose
-            help_verbose = true;
-            get_logger().set_level(log_level::debug);
-            break;
-        case 's': // --slim
-            options.slim = true;
-            break;
-        case 'K': // --keep-coastlines
-            options.keep_coastlines = true;
-            break;
-        case 'l': // --latlong
-            options.projection = reprojection::create_projection(PROJ_LATLONG);
-            break;
-        case 'm': // --merc
-            options.projection =
-                reprojection::create_projection(PROJ_SPHERE_MERC);
-            break;
-        case 'E': // --proj
-#ifdef HAVE_GENERIC_PROJ
-            options.projection = reprojection::create_projection(atoi(optarg));
-#else
-            throw std::runtime_error{"Generic projections not available."};
-#endif
-            break;
-        case 'p': // --prefix
-            options.prefix = optarg;
-            options.prefix_is_set = true;
-            check_identifier(options.prefix, "--prefix parameter");
-            break;
-        case 'd': // --database
-            database_options.db = optarg;
-            break;
-        case 'C': // --cache
-            options.cache = atoi(optarg);
-            break;
-        case 'U': // --username
-            database_options.username = optarg;
-            break;
-        case 'W': // --password
-            options.pass_prompt = true;
-            break;
-        case 'H': // --host
-            database_options.host = optarg;
-            break;
-        case 'P': // --port
-            database_options.port = optarg;
-            break;
-        case 'S': // --style
-            options.style = optarg;
-            break;
-        case 'i': // --tablespace-index
-            options.tblsmain_index = optarg;
-            options.tblsslim_index = options.tblsmain_index;
-            break;
-        case 200: // --tablespace-slim-data
-            options.tblsslim_data = optarg;
-            break;
-        case 201: // --tablespace-slim-index
-            options.tblsslim_index = optarg;
-            break;
-        case 202: // --tablespace-main-data
-            options.tblsmain_data = optarg;
-            break;
-        case 203: // --tablespace-main-index
-            options.tblsmain_index = optarg;
-            break;
-        case 'e': // --expire-tiles
-            parse_expire_tiles_param(optarg, &options.expire_tiles_zoom_min,
-                                     &options.expire_tiles_zoom);
-            break;
-        case 'o': // --expire-output
-            options.expire_tiles_filename = optarg;
-            break;
-        case 214: // --expire-bbox-size
-            options.expire_tiles_max_bbox = atof(optarg);
-            break;
-        case 'O': // --output
-            options.output_backend = optarg;
-            break;
-        case 'x': // --extra-attributes
-            options.extra_attributes = true;
-            break;
-        case 'k': // --hstore
-            if (options.hstore_mode != hstore_column::none) {
-                throw std::runtime_error{"You can not specify both --hstore "
-                                         "(-k) and --hstore-all (-j)."};
-            }
-            options.hstore_mode = hstore_column::norm;
-            break;
-        case 208: // --hstore-match-only
-            options.hstore_match_only = true;
-            break;
-        case 'j': // --hstore-all
-            if (options.hstore_mode != hstore_column::none) {
-                throw std::runtime_error{"You can not specify both --hstore "
-                                         "(-k) and --hstore-all (-j)."};
-            }
-            options.hstore_mode = hstore_column::all;
-            break;
-        case 'z': // --hstore-column
-            options.hstore_columns.emplace_back(optarg);
-            break;
-        case 'G': // --multi-geometry
-            options.enable_multi = true;
-            break;
-        case 'r': // --input-reader
-            if (std::strcmp(optarg, "auto") != 0) {
-                options.input_format = optarg;
-            }
-            break;
-        case 'h': // --help
-            print_help = true;
-            break;
-        case 'I': // --disable-parallel-indexing
-            options.parallel_indexing = false;
-            break;
-        case 204: // -cache-strategy
-            log_warn("Deprecated option --cache-strategy ignored");
-            break;
-        case 205: // --number-processes
-            options.num_procs = parse_number_processes_param(optarg);
-            break;
-        case 206: // --drop
-            options.droptemp = true;
-            break;
-        case 'F': // --flat-nodes
-            options.flat_node_file = optarg;
-            break;
-        case 211: // --hstore-add-index
-            options.enable_hstore_index = true;
-            break;
-        case 212: // --tag-transform-script
-            options.tag_transform_script = optarg;
-            break;
-        case 213: // --reproject-area
-            options.reproject_area = true;
-            break;
-        case 'V': // --version
-            options.command = command_t::version;
-            return options;
-        case 215: // --middle-schema
-            options.middle_dbschema = optarg;
-            if (options.middle_dbschema.empty()) {
-                throw std::runtime_error{"Schema can not be empty."};
-            }
-            check_identifier(options.middle_dbschema,
-                             "--middle-schema parameter");
-            break;
-        case 216: // --output-pgsql-schema
-            options.output_dbschema = optarg;
-            if (options.output_dbschema.empty()) {
-                throw std::runtime_error{"Schema can not be empty."};
-            }
-            check_identifier(options.output_dbschema,
-                             "--output-pgsql-schema parameter");
-            break;
-        case 217: // --with-forward-dependencies=BOOL
-            options.with_forward_dependencies =
-                parse_with_forward_dependencies_param(optarg);
-            break;
-        case 218: // --schema
-            options.dbschema = optarg;
-            if (options.dbschema.empty()) {
-                throw std::runtime_error{"Schema can not be empty."};
-            }
-            check_identifier(options.dbschema, "--schema parameter");
-            break;
-        case 300: // --middle-way-node-index-id-shift
-            options.way_node_index_id_shift = atoi(optarg);
-            break;
-        case 301: // --middle-database-format
-            if (optarg == std::string{"legacy"}) {
-                options.middle_database_format = 1;
-            } else if (optarg == std::string{"new"}) {
-                options.middle_database_format = 2;
-            } else {
-                throw std::runtime_error{
-                    "Unknown value for --middle-database-format (Use 'legacy' "
-                    "or 'new')."};
-            }
-            break;
-        case 302: // --middle-with-nodes
-            options.middle_with_nodes = true;
-            break;
-        case 400: // --log-level=LEVEL
-            parse_log_level_param(optarg);
-            break;
-        case 401: // --log-progress=VALUE
-            parse_log_progress_param(optarg);
-            break;
-        case 402: // --log-sql
-            get_logger().enable_sql();
-            break;
-        case 403: // --log-sql-data
-            get_logger().enable_sql_data();
-            break;
-        case '?':
-        default:
-            throw std::runtime_error{"Usage error. Try 'osm2pgsql --help'."};
+    log_info("osm2pgsql version {}", get_osm2pgsql_version());
+
+    if (verbose) {
+        get_logger().set_level(log_level::debug);
+    }
+
+    if (app.want_version()) {
+        options.command = command_t::version;
+        return options;
+    }
+
+    if (options.input_format == "auto") {
+        options.input_format.clear();
+    }
+
+    if (!tablespace_index.empty()) {
+        if (options.tblsmain_index.empty()) {
+            options.tblsmain_index = tablespace_index;
         }
-    } //end while
+        if (options.tblsslim_index.empty()) {
+            options.tblsslim_index = tablespace_index;
+        }
+    }
+
+    if (options.dbschema.empty()) {
+        throw std::runtime_error{"Schema can not be empty."};
+    }
+    check_identifier(options.dbschema, "--schema parameter");
 
     if (options.middle_dbschema.empty()) {
         options.middle_dbschema = options.dbschema;
+    } else {
+        check_identifier(options.middle_dbschema, "--middle-schema parameter");
     }
 
     if (options.output_dbschema.empty()) {
         options.output_dbschema = options.dbschema;
+    } else {
+        check_identifier(options.output_dbschema,
+                         "--output-pgsql-schema parameter");
     }
 
-    //they were looking for usage info
-    if (print_help) {
-        options.command = command_t::help;
-        long_usage(argv[0], help_verbose);
-        return options;
-    }
-
-    //we require some input files!
-    if (optind >= argc) {
+    if (options.input_files.empty()) {
         throw std::runtime_error{
             "Missing input file(s). Try 'osm2pgsql --help'."};
     }
 
-    //get the input files
-    while (optind < argc) {
-        options.input_files.emplace_back(argv[optind]);
-        ++optind;
-    }
-
     if (!options.projection) {
         options.projection = reprojection::create_projection(PROJ_SPHERE_MERC);
     }
 
     check_options(&options);
 
-    if (options.pass_prompt) {
-        database_options.password = util::get_password();
-    }
-
-    options.conninfo = build_conninfo(database_options);
+    options.conninfo = build_conninfo(app.database_options());
 
     if (!options.slim) {
         options.middle_database_format = 0;
diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index 81324dd7e..5ce74f295 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "canvas.hpp"
+#include "command-line-app.hpp"
 #include "debug-output.hpp"
 #include "expire-output.hpp"
 #include "flex-lua-expire-output.hpp"
@@ -78,59 +79,6 @@ constexpr std::size_t const max_force_single_thread = 4;
         }                                                                      \
     }
 
-static void show_help()
-{
-    fmt::print(R"(osm2pgsql-gen [OPTIONS]
-Generalization of OSM data.
-
-This program is EXPERIMENTAL and might change without notice.
-
-Main Options:
-    -a|--append           Run in append mode
-    -c|--create           Run in create mode (default)
-    -S|--style=FILE       The Lua config file (same as for osm2pgsql)
-    -j|--jobs=NUM         Number of parallel jobs (default 1, max 256)
-       --middle-schema=SCHEMA  Database schema for middle tables (default set with --schema)
-       --schema=SCHEMA    Default database schema (default: 'public')
-
-Help/Version Options:
-    -h|--help             Print this help text and stop
-    -V|--version          Show version
-
-Logging options:
-    -l|--log-level=LEVEL  Log level (debug, info (default), warn, error)
-       --log-sql          Log SQL commands
-
-Database options:
-    -d|--database=DB    The name of the PostgreSQL database to connect to or
-                        a PostgreSQL conninfo string.
-    -U|--username=NAME  PostgreSQL user name.
-    -W|--password       Force password prompt.
-    -H|--host=HOST      Database server host name or socket location.
-    -P|--port=PORT      Database server port.
-)");
-}
-
-static char const *const short_options = "acd:hH:j:l:P:S:U:VW";
-
-static std::array<option, 20> const long_options = {
-    {{"help", no_argument, nullptr, 'h'},
-     {"version", no_argument, nullptr, 'V'},
-     {"append", no_argument, nullptr, 'a'},
-     {"create", no_argument, nullptr, 'c'},
-     {"jobs", required_argument, nullptr, 'j'},
-     {"database", required_argument, nullptr, 'd'},
-     {"user", required_argument, nullptr, 'U'},
-     {"host", required_argument, nullptr, 'H'},
-     {"port", required_argument, nullptr, 'P'},
-     {"password", no_argument, nullptr, 'W'},
-     {"log-level", required_argument, nullptr, 'l'},
-     {"style", required_argument, nullptr, 'S'},
-     {"log-sql", no_argument, nullptr, 201},
-     {"middle-schema", required_argument, nullptr, 202},
-     {"schema", required_argument, nullptr, 203},
-     {nullptr, 0, nullptr, 0}}};
-
 struct tile_extent
 {
     uint32_t xmin = 0;
@@ -660,106 +608,78 @@ void genproc_t::run()
 int main(int argc, char *argv[])
 {
     try {
-        database_options_t database_options;
         std::string dbschema{"public"};
-        std::string middle_dbschema{};
-        std::string log_level;
+        std::string middle_dbschema;
         std::string style;
         uint32_t jobs = 1;
-        bool pass_prompt = false;
         bool append = false;
 
-        int c = 0;
-        // NOLINTNEXTLINE(concurrency-mt-unsafe)
-        while (-1 != (c = getopt_long(argc, argv, short_options,
-                                      long_options.data(), nullptr))) {
-            switch (c) {
-            case 'h': // --help
-                show_help();
-                return 0;
-            case 'a': // --append
-                append = true;
-                break;
-            case 'c': // --create
-                append = false;
-                break;
-            case 'j': // --jobs
-                jobs =
-                    std::clamp(std::strtoul(optarg, nullptr, 10), 1UL, 256UL);
-                break;
-            case 'd': // --database
-                database_options.db = optarg;
-                break;
-            case 'U': // --username
-                database_options.username = optarg;
-                break;
-            case 'W': // --password
-                pass_prompt = true;
-                break;
-            case 'H': // --host
-                database_options.host = optarg;
-                break;
-            case 'P': // --port
-                database_options.port = optarg;
-                break;
-            case 'l': // --log-level
-                log_level = optarg;
-                break;
-            case 'S': // --style
-                style = optarg;
-                break;
-            case 'V': // --version
-                log_info("osm2pgsql-gen version {}", get_osm2pgsql_version());
-                return 0;
-            case 201: // --log-sql
-                get_logger().enable_sql();
-                break;
-            case 202: // --middle-schema
-                middle_dbschema = optarg;
-                if (middle_dbschema.empty()) {
-                    log_error("Schema must not be empty");
-                    return 2;
-                }
-                check_identifier(middle_dbschema, "--middle-schema");
-                break;
-            case 203: // --schema
-                dbschema = optarg;
-                if (dbschema.empty()) {
-                    log_error("Schema must not be empty");
-                    return 2;
-                }
-                check_identifier(dbschema, "--schema");
-                break;
-            default:
-                log_error("Unknown argument");
-                return 2;
-            }
+        command_line_app_t app{
+            "osm2pgsql-gen -- Generalize OpenStreetMap data\n"};
+
+        // ------------------------------------------------------------------
+        // Main options
+        // ------------------------------------------------------------------
+
+        app.add_flag("-a,--append", append)->description("Run in append mode.");
+
+        app.add_option("-S,--style", style)
+            ->description("The Lua config/style file (same as for osm2pgsql).")
+            ->type_name("FILE");
+
+        app.add_option("-j,--jobs", jobs)
+            ->check(CLI::Range(1, 256))
+            ->description("Number of parallel jobs (default: 1, max 256).")
+            ->type_name("NUM");
+
+        // ------------------------------------------------------------------
+        // Database options
+        // ------------------------------------------------------------------
+
+        app.add_option("--middle-schema", middle_dbschema)
+            ->description("Database schema for middle tables (default: setting "
+                          "of --schema).")
+            ->type_name("SCHEMA")
+            ->group("Database options");
+
+        app.add_option("--schema", dbschema)
+            ->description("Database schema (default: 'public').")
+            ->type_name("SCHEMA")
+            ->group("Database options");
+
+        try {
+            app.parse(argc, argv);
+        } catch (...) {
+            log_info("osm2pgsql-gen version {}", get_osm2pgsql_version());
+            throw;
         }
 
-        if (log_level == "debug") {
-            get_logger().set_level(log_level::debug);
-        } else if (log_level == "info" || log_level.empty()) {
-            get_logger().set_level(log_level::info);
-        } else if (log_level == "warn") {
-            get_logger().set_level(log_level::warn);
-        } else if (log_level == "error") {
-            get_logger().set_level(log_level::error);
-        } else {
-            log_error("Unknown log level: {}. "
-                      "Use 'debug', 'info', 'warn', or 'error'.",
-                      log_level);
+        if (app.want_help()) {
+            std::cout << app.help();
+            return 0;
+        }
+
+        log_info("osm2pgsql-gen version {}", get_osm2pgsql_version());
+        log_warn("This is an EXPERIMENTAL extension to osm2pgsql.");
+
+        if (app.want_version()) {
+            return 0;
+        }
+
+        if (dbschema.empty()) {
+            log_error("Schema must not be empty");
             return 2;
         }
+        check_identifier(dbschema, "--schema");
 
         if (middle_dbschema.empty()) {
             middle_dbschema = dbschema;
+        } else {
+            check_identifier(middle_dbschema, "--middle-schema");
         }
 
         util::timer_t timer_overall;
 
-        log_info("osm2pgsql-gen version {}", get_osm2pgsql_version());
-        log_warn("This is an EXPERIMENTAL extension to osm2pgsql.");
-
         if (append) {
             log_debug("Running in append mode.");
         } else {
@@ -774,10 +694,7 @@ int main(int argc, char *argv[])
                 jobs);
         }
 
-        if (pass_prompt) {
-            database_options.password = util::get_password();
-        }
-        auto const conninfo = build_conninfo(database_options);
+        auto const conninfo = build_conninfo(app.database_options());
 
         log_debug("Checking database capabilities...");
         {
diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
index 676a06186..d9787ee3a 100644
--- a/src/osm2pgsql.cpp
+++ b/src/osm2pgsql.cpp
@@ -356,8 +356,6 @@ static void set_option_defaults(options_t *options)
 int main(int argc, char *argv[])
 {
     try {
-        log_info("osm2pgsql version {}", get_osm2pgsql_version());
-
         auto options = parse_command_line(argc, argv);
 
         if (options.command == command_t::help) {
diff --git a/tests/bdd/regression/properties.feature b/tests/bdd/regression/properties.feature
index 2e25a6152..c90e60b18 100644
--- a/tests/bdd/regression/properties.feature
+++ b/tests/bdd/regression/properties.feature
@@ -79,7 +79,7 @@ Feature: Updates to the test database with properties check
             Different output specified on command line
             """
 
-    Scenario Outline: Create/append with with null output doesn't need style
+    Scenario: Create/append with with null output doesn't need style
         When running osm2pgsql null with parameters
             | --slim  |
 
@@ -87,18 +87,11 @@ Feature: Updates to the test database with properties check
         When running osm2pgsql null with parameters
             | -a      |
             | --slim  |
-            | <param> |
         Then the error output contains
             """
-            <message>
+            Using style file '' (same as on import).
             """
 
-        Examples:
-            | param    | message                                  |
-            |          | Using style file '' (same as on import). |
-            | --style= | Using style file '' (same as on import). |
-
-
     @config.have_lua
     Scenario Outline: Create/append with various style parameters with flex output
         When running osm2pgsql flex with parameters
diff --git a/tests/test-options-parse.cpp b/tests/test-options-parse.cpp
index 0f388a815..6ee96c3f3 100644
--- a/tests/test-options-parse.cpp
+++ b/tests/test-options-parse.cpp
@@ -37,7 +37,7 @@ static options_t opt(std::vector<char const *> opts)
 
 TEST_CASE("Insufficient arguments", "[NoDB]")
 {
-    std::vector<char const *> opts = {"osm2pgsql", "-a", "-c", "--slim"};
+    std::vector<char const *> opts = {"osm2pgsql", "-c", "--slim"};
 
     REQUIRE_THROWS_WITH(
         parse_command_line((int)opts.size(), (char **)opts.data()),
@@ -50,7 +50,7 @@ TEST_CASE("Incompatible arguments", "[NoDB]")
 
     bad_opt({"--drop"}, "drop only makes sense with");
 
-    bad_opt({"-j", "-k"}, "You can not specify both");
+    bad_opt({"-j", "-k"}, "--hstore excludes --hstore-all");
 
     bad_opt({"-a"}, "--append can only be used with slim mode");
 }
@@ -67,10 +67,8 @@ TEST_CASE("Middle selection", "[NoDB]")
 TEST_CASE("Lua styles", "[NoDB]")
 {
 #ifdef HAVE_LUA
-    auto options = opt({"--tag-transform-script", "non_existing.lua"});
-    export_list const exlist;
-    REQUIRE_THROWS_WITH(tagtransform_t::make_tagtransform(&options, exlist),
-                        Catch::Matchers::Contains("No such file or directory"));
+    REQUIRE_THROWS_WITH(opt({"--tag-transform-script", "non_existing.lua"}),
+                        Catch::Matchers::Contains("File does not exist"));
 #endif
 }
 
@@ -180,7 +178,7 @@ TEST_CASE("Parsing log-level", "[NoDB]")
 
 TEST_CASE("Parsing log-level fails for unknown level", "[NoDB]")
 {
-    bad_opt({"--log-level", "foo"}, "Unknown value for --log-level option: ");
+    bad_opt({"--log-level", "foo"}, "--log-level: foo not in");
 }
 
 TEST_CASE("Parsing log-progress", "[NoDB]")

From c5ea1d47da471505bc8cbe377f8893d2ef27766c Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 11 Jan 2024 14:57:24 +0100
Subject: [PATCH 057/430] Add test to make sure unset pg_result_t behaves
 sensibly

---
 tests/test-pgsql.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/test-pgsql.cpp b/tests/test-pgsql.cpp
index a38fac374..b92f61b52 100644
--- a/tests/test-pgsql.cpp
+++ b/tests/test-pgsql.cpp
@@ -135,3 +135,13 @@ TEST_CASE("create table and insert something")
     REQUIRE(result.num_tuples() == 0);
     REQUIRE(result.affected_rows() == 2);
 }
+
+TEST_CASE("empty result object should return fatal status")
+{
+    pg_result_t result;
+    REQUIRE(result.status() == PGRES_FATAL_ERROR);
+    REQUIRE_FALSE(result);
+    REQUIRE(result.num_fields() == 0);
+    REQUIRE(result.num_tuples() == 0);
+    REQUIRE(result.affected_rows() == 0);
+}

From ff91d4986908ecc221e5f41606d586a61fd046a1 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 26 Jan 2024 16:41:58 +0100
Subject: [PATCH 058/430] Update copyright date

---
 man/manpage_from_python.py                       | 2 +-
 scripts/osm2pgsql-replication                    | 2 +-
 src/command-line-app.cpp                         | 2 +-
 src/command-line-app.hpp                         | 2 +-
 src/command-line-parser.cpp                      | 2 +-
 src/command-line-parser.hpp                      | 2 +-
 src/db-copy-mgr.hpp                              | 2 +-
 src/db-copy.cpp                                  | 2 +-
 src/db-copy.hpp                                  | 2 +-
 src/debug-output.cpp                             | 2 +-
 src/debug-output.hpp                             | 2 +-
 src/dependency-manager.cpp                       | 2 +-
 src/dependency-manager.hpp                       | 2 +-
 src/domain-matcher.hpp                           | 2 +-
 src/expire-config.hpp                            | 2 +-
 src/expire-output.cpp                            | 2 +-
 src/expire-output.hpp                            | 2 +-
 src/expire-tiles.cpp                             | 2 +-
 src/expire-tiles.hpp                             | 2 +-
 src/flex-index.cpp                               | 2 +-
 src/flex-index.hpp                               | 2 +-
 src/flex-lua-expire-output.cpp                   | 2 +-
 src/flex-lua-expire-output.hpp                   | 2 +-
 src/flex-lua-geom.cpp                            | 2 +-
 src/flex-lua-geom.hpp                            | 2 +-
 src/flex-lua-index.cpp                           | 2 +-
 src/flex-lua-index.hpp                           | 2 +-
 src/flex-lua-table.cpp                           | 2 +-
 src/flex-lua-table.hpp                           | 2 +-
 src/flex-table-column.cpp                        | 2 +-
 src/flex-table-column.hpp                        | 2 +-
 src/flex-table.cpp                               | 2 +-
 src/flex-table.hpp                               | 2 +-
 src/flex-write.cpp                               | 2 +-
 src/flex-write.hpp                               | 2 +-
 src/format.hpp                                   | 2 +-
 src/gazetteer-style.cpp                          | 2 +-
 src/gazetteer-style.hpp                          | 2 +-
 src/gen/canvas.cpp                               | 2 +-
 src/gen/canvas.hpp                               | 2 +-
 src/gen/gen-base.cpp                             | 2 +-
 src/gen/gen-base.hpp                             | 2 +-
 src/gen/gen-create.cpp                           | 2 +-
 src/gen/gen-create.hpp                           | 2 +-
 src/gen/gen-discrete-isolation.cpp               | 2 +-
 src/gen/gen-discrete-isolation.hpp               | 2 +-
 src/gen/gen-rivers.cpp                           | 2 +-
 src/gen/gen-rivers.hpp                           | 2 +-
 src/gen/gen-tile-builtup.cpp                     | 2 +-
 src/gen/gen-tile-builtup.hpp                     | 2 +-
 src/gen/gen-tile-raster.cpp                      | 2 +-
 src/gen/gen-tile-raster.hpp                      | 2 +-
 src/gen/gen-tile-vector.cpp                      | 2 +-
 src/gen/gen-tile-vector.hpp                      | 2 +-
 src/gen/gen-tile.cpp                             | 2 +-
 src/gen/gen-tile.hpp                             | 2 +-
 src/gen/osm2pgsql-gen.cpp                        | 2 +-
 src/gen/params.cpp                               | 2 +-
 src/gen/params.hpp                               | 2 +-
 src/gen/raster.cpp                               | 2 +-
 src/gen/raster.hpp                               | 2 +-
 src/gen/tracer.cpp                               | 2 +-
 src/gen/tracer.hpp                               | 2 +-
 src/geom-boost-adaptor.hpp                       | 2 +-
 src/geom-box.cpp                                 | 2 +-
 src/geom-box.hpp                                 | 2 +-
 src/geom-from-osm.cpp                            | 2 +-
 src/geom-from-osm.hpp                            | 2 +-
 src/geom-functions.cpp                           | 2 +-
 src/geom-functions.hpp                           | 2 +-
 src/geom-output.hpp                              | 2 +-
 src/geom-pole-of-inaccessibility.cpp             | 2 +-
 src/geom-pole-of-inaccessibility.hpp             | 2 +-
 src/geom-transform.cpp                           | 2 +-
 src/geom-transform.hpp                           | 2 +-
 src/geom.cpp                                     | 2 +-
 src/geom.hpp                                     | 2 +-
 src/input.cpp                                    | 2 +-
 src/input.hpp                                    | 2 +-
 src/json-writer.hpp                              | 2 +-
 src/logging.cpp                                  | 2 +-
 src/logging.hpp                                  | 2 +-
 src/lua-init.hpp                                 | 2 +-
 src/lua-setup.cpp                                | 2 +-
 src/lua-setup.hpp                                | 2 +-
 src/lua-utils.cpp                                | 2 +-
 src/lua-utils.hpp                                | 2 +-
 src/middle-pgsql.cpp                             | 2 +-
 src/middle-pgsql.hpp                             | 2 +-
 src/middle-ram.cpp                               | 2 +-
 src/middle-ram.hpp                               | 2 +-
 src/middle.cpp                                   | 2 +-
 src/middle.hpp                                   | 2 +-
 src/node-locations.cpp                           | 2 +-
 src/node-locations.hpp                           | 2 +-
 src/node-persistent-cache.cpp                    | 2 +-
 src/node-persistent-cache.hpp                    | 2 +-
 src/options.hpp                                  | 2 +-
 src/ordered-index.cpp                            | 2 +-
 src/ordered-index.hpp                            | 2 +-
 src/osm2pgsql.cpp                                | 2 +-
 src/osmdata.cpp                                  | 2 +-
 src/osmdata.hpp                                  | 2 +-
 src/osmtypes.hpp                                 | 2 +-
 src/output-flex.cpp                              | 2 +-
 src/output-flex.hpp                              | 2 +-
 src/output-gazetteer.cpp                         | 2 +-
 src/output-gazetteer.hpp                         | 2 +-
 src/output-null.cpp                              | 2 +-
 src/output-null.hpp                              | 2 +-
 src/output-pgsql.cpp                             | 2 +-
 src/output-pgsql.hpp                             | 2 +-
 src/output-requirements.hpp                      | 2 +-
 src/output.cpp                                   | 2 +-
 src/output.hpp                                   | 2 +-
 src/overloaded.hpp                               | 2 +-
 src/pgsql-capabilities-int.hpp                   | 2 +-
 src/pgsql-capabilities.cpp                       | 2 +-
 src/pgsql-capabilities.hpp                       | 2 +-
 src/pgsql-helper.cpp                             | 2 +-
 src/pgsql-helper.hpp                             | 2 +-
 src/pgsql.cpp                                    | 2 +-
 src/pgsql.hpp                                    | 2 +-
 src/progress-display.cpp                         | 2 +-
 src/progress-display.hpp                         | 2 +-
 src/properties.cpp                               | 2 +-
 src/properties.hpp                               | 2 +-
 src/reprojection-generic-none.cpp                | 2 +-
 src/reprojection-generic-proj4.cpp               | 2 +-
 src/reprojection.cpp                             | 2 +-
 src/reprojection.hpp                             | 2 +-
 src/table.cpp                                    | 2 +-
 src/table.hpp                                    | 2 +-
 src/taginfo-impl.hpp                             | 2 +-
 src/taginfo.cpp                                  | 2 +-
 src/taginfo.hpp                                  | 2 +-
 src/tagtransform-c.cpp                           | 2 +-
 src/tagtransform-c.hpp                           | 2 +-
 src/tagtransform-lua.cpp                         | 2 +-
 src/tagtransform-lua.hpp                         | 2 +-
 src/tagtransform.cpp                             | 2 +-
 src/tagtransform.hpp                             | 2 +-
 src/thread-pool.cpp                              | 2 +-
 src/thread-pool.hpp                              | 2 +-
 src/tile-output.hpp                              | 2 +-
 src/tile.cpp                                     | 2 +-
 src/tile.hpp                                     | 2 +-
 src/util.cpp                                     | 2 +-
 src/util.hpp                                     | 2 +-
 src/version.cpp.in                               | 2 +-
 src/version.hpp                                  | 2 +-
 src/wildcmp.cpp                                  | 2 +-
 src/wildcmp.hpp                                  | 2 +-
 src/wkb.cpp                                      | 2 +-
 src/wkb.hpp                                      | 2 +-
 tests/bdd/environment.py                         | 2 +-
 tests/bdd/steps/geometry_factory.py              | 2 +-
 tests/bdd/steps/replication_server_mock.py       | 2 +-
 tests/bdd/steps/steps_db.py                      | 2 +-
 tests/bdd/steps/steps_execute.py                 | 2 +-
 tests/bdd/steps/steps_osm_data.py                | 2 +-
 tests/catch-main.cpp                             | 2 +-
 tests/common-buffer.hpp                          | 2 +-
 tests/common-cleanup.hpp                         | 2 +-
 tests/common-import.hpp                          | 2 +-
 tests/common-options.hpp                         | 2 +-
 tests/common-pg.hpp                              | 2 +-
 tests/test-check-input.cpp                       | 2 +-
 tests/test-db-copy-mgr.cpp                       | 2 +-
 tests/test-db-copy-thread.cpp                    | 2 +-
 tests/test-domain-matcher.cpp                    | 2 +-
 tests/test-expire-from-geometry.cpp              | 2 +-
 tests/test-expire-tiles.cpp                      | 2 +-
 tests/test-flex-indexes.cpp                      | 2 +-
 tests/test-geom-box.cpp                          | 2 +-
 tests/test-geom-collections.cpp                  | 2 +-
 tests/test-geom-linestrings.cpp                  | 2 +-
 tests/test-geom-multilinestrings.cpp             | 2 +-
 tests/test-geom-multipoints.cpp                  | 2 +-
 tests/test-geom-multipolygons.cpp                | 2 +-
 tests/test-geom-null.cpp                         | 2 +-
 tests/test-geom-output.cpp                       | 2 +-
 tests/test-geom-points.cpp                       | 2 +-
 tests/test-geom-pole-of-inaccessibility.cpp      | 2 +-
 tests/test-geom-polygons.cpp                     | 2 +-
 tests/test-geom-transform.cpp                    | 2 +-
 tests/test-json-writer.cpp                       | 2 +-
 tests/test-lua-utils.cpp                         | 2 +-
 tests/test-middle.cpp                            | 2 +-
 tests/test-node-locations.cpp                    | 2 +-
 tests/test-options-database.cpp                  | 2 +-
 tests/test-options-parse.cpp                     | 2 +-
 tests/test-options-projection.cpp                | 2 +-
 tests/test-ordered-index.cpp                     | 2 +-
 tests/test-osm-file-parsing.cpp                  | 2 +-
 tests/test-output-flex-example-configs.cpp       | 2 +-
 tests/test-output-flex-multi-input.cpp           | 2 +-
 tests/test-output-flex-nodes.cpp                 | 2 +-
 tests/test-output-flex-relation-combinations.cpp | 2 +-
 tests/test-output-flex-relations.cpp             | 2 +-
 tests/test-output-flex-schema.cpp                | 2 +-
 tests/test-output-flex-stage2.cpp                | 2 +-
 tests/test-output-flex-tablespace.cpp            | 2 +-
 tests/test-output-flex-types.cpp                 | 2 +-
 tests/test-output-flex-uni.cpp                   | 2 +-
 tests/test-output-flex-update.cpp                | 2 +-
 tests/test-output-flex-validgeom.cpp             | 2 +-
 tests/test-output-flex.cpp                       | 2 +-
 tests/test-output-gazetteer.cpp                  | 2 +-
 tests/test-output-pgsql-area.cpp                 | 2 +-
 tests/test-output-pgsql-hstore-match-only.cpp    | 2 +-
 tests/test-output-pgsql-int4.cpp                 | 2 +-
 tests/test-output-pgsql-schema.cpp               | 2 +-
 tests/test-output-pgsql-style-file.cpp           | 2 +-
 tests/test-output-pgsql-tablespace.cpp           | 2 +-
 tests/test-output-pgsql-validgeom.cpp            | 2 +-
 tests/test-output-pgsql-z_order.cpp              | 2 +-
 tests/test-output-pgsql.cpp                      | 2 +-
 tests/test-persistent-cache.cpp                  | 2 +-
 tests/test-pgsql-capabilities.cpp                | 2 +-
 tests/test-pgsql.cpp                             | 2 +-
 tests/test-properties.cpp                        | 2 +-
 tests/test-reprojection.cpp                      | 2 +-
 tests/test-taginfo.cpp                           | 2 +-
 tests/test-tile.cpp                              | 2 +-
 tests/test-util.cpp                              | 2 +-
 tests/test-wildcard-match.cpp                    | 2 +-
 tests/test-wkb.cpp                               | 2 +-
 228 files changed, 228 insertions(+), 228 deletions(-)

diff --git a/man/manpage_from_python.py b/man/manpage_from_python.py
index 293ba0e5d..ed76ed365 100644
--- a/man/manpage_from_python.py
+++ b/man/manpage_from_python.py
@@ -2,7 +2,7 @@
 #
 # This file is part of osm2pgsql (https://osm2pgsql.org/).
 #
-# Copyright (C) 2023 by the osm2pgsql developer community.
+# Copyright (C) 2006-2024 by the osm2pgsql developer community.
 # For a full list of authors see the git log.
 """ Create a man page for osm2pgsql helper scripts in python.
 """
diff --git a/scripts/osm2pgsql-replication b/scripts/osm2pgsql-replication
index 210aac84e..acc095821 100755
--- a/scripts/osm2pgsql-replication
+++ b/scripts/osm2pgsql-replication
@@ -4,7 +4,7 @@
 #
 # This file is part of osm2pgsql (https://osm2pgsql.org/).
 #
-# Copyright (C) 2006-2023 by the osm2pgsql developer community.
+# Copyright (C) 2006-2024 by the osm2pgsql developer community.
 # For a full list of authors see the git log.
 
 """
diff --git a/src/command-line-app.cpp b/src/command-line-app.cpp
index eb725f37b..e4247cc48 100644
--- a/src/command-line-app.cpp
+++ b/src/command-line-app.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/command-line-app.hpp b/src/command-line-app.hpp
index 046e3fadb..7dc5202ad 100644
--- a/src/command-line-app.hpp
+++ b/src/command-line-app.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index e4bb4ec00..f9759f0e0 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/command-line-parser.hpp b/src/command-line-parser.hpp
index af0dd64c1..b06b27d5f 100644
--- a/src/command-line-parser.hpp
+++ b/src/command-line-parser.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/db-copy-mgr.hpp b/src/db-copy-mgr.hpp
index bf2f129a3..0548b32c5 100644
--- a/src/db-copy-mgr.hpp
+++ b/src/db-copy-mgr.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/db-copy.cpp b/src/db-copy.cpp
index 73a3a23aa..d61e386b8 100644
--- a/src/db-copy.cpp
+++ b/src/db-copy.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/db-copy.hpp b/src/db-copy.hpp
index 25bc3e689..563187547 100644
--- a/src/db-copy.hpp
+++ b/src/db-copy.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/debug-output.cpp b/src/debug-output.cpp
index c1200ceda..87c7c9940 100644
--- a/src/debug-output.cpp
+++ b/src/debug-output.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/debug-output.hpp b/src/debug-output.hpp
index ab6ab96c2..e4777221e 100644
--- a/src/debug-output.hpp
+++ b/src/debug-output.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/dependency-manager.cpp b/src/dependency-manager.cpp
index 19d93fbf5..72f1fe42e 100644
--- a/src/dependency-manager.cpp
+++ b/src/dependency-manager.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/dependency-manager.hpp b/src/dependency-manager.hpp
index aaa2feea3..3afcc88c8 100644
--- a/src/dependency-manager.hpp
+++ b/src/dependency-manager.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/domain-matcher.hpp b/src/domain-matcher.hpp
index 073eeed99..e12533ce1 100644
--- a/src/domain-matcher.hpp
+++ b/src/domain-matcher.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/expire-config.hpp b/src/expire-config.hpp
index 29a110f6f..f2113fc2b 100644
--- a/src/expire-config.hpp
+++ b/src/expire-config.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/expire-output.cpp b/src/expire-output.cpp
index 6a03aac87..41b7a0c34 100644
--- a/src/expire-output.cpp
+++ b/src/expire-output.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/expire-output.hpp b/src/expire-output.hpp
index a115d01f0..8fa4d5e6a 100644
--- a/src/expire-output.hpp
+++ b/src/expire-output.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/expire-tiles.cpp b/src/expire-tiles.cpp
index 38c08f8c7..317710329 100644
--- a/src/expire-tiles.cpp
+++ b/src/expire-tiles.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/expire-tiles.hpp b/src/expire-tiles.hpp
index ceb79d1d6..396c78371 100644
--- a/src/expire-tiles.hpp
+++ b/src/expire-tiles.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-index.cpp b/src/flex-index.cpp
index 887adcf2a..99cc0b92a 100644
--- a/src/flex-index.cpp
+++ b/src/flex-index.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-index.hpp b/src/flex-index.hpp
index edbdf6c89..ba38e2c27 100644
--- a/src/flex-index.hpp
+++ b/src/flex-index.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-expire-output.cpp b/src/flex-lua-expire-output.cpp
index 7ac177b3b..cc26a2cf2 100644
--- a/src/flex-lua-expire-output.cpp
+++ b/src/flex-lua-expire-output.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-expire-output.hpp b/src/flex-lua-expire-output.hpp
index e4ed774b2..b82b0af49 100644
--- a/src/flex-lua-expire-output.hpp
+++ b/src/flex-lua-expire-output.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-geom.cpp b/src/flex-lua-geom.cpp
index 14ed5572f..0a4a5f538 100644
--- a/src/flex-lua-geom.cpp
+++ b/src/flex-lua-geom.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-geom.hpp b/src/flex-lua-geom.hpp
index b52b09ba9..5365f2bd8 100644
--- a/src/flex-lua-geom.hpp
+++ b/src/flex-lua-geom.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-index.cpp b/src/flex-lua-index.cpp
index 2993384a5..9cdcdb1c4 100644
--- a/src/flex-lua-index.cpp
+++ b/src/flex-lua-index.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-index.hpp b/src/flex-lua-index.hpp
index 1d6045d2e..593f87481 100644
--- a/src/flex-lua-index.hpp
+++ b/src/flex-lua-index.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-table.cpp b/src/flex-lua-table.cpp
index 9a8d6401d..d459e170d 100644
--- a/src/flex-lua-table.cpp
+++ b/src/flex-lua-table.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-table.hpp b/src/flex-lua-table.hpp
index 1a1d0e278..883d773c2 100644
--- a/src/flex-lua-table.hpp
+++ b/src/flex-lua-table.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-table-column.cpp b/src/flex-table-column.cpp
index c0c4b9aa5..c27b74318 100644
--- a/src/flex-table-column.cpp
+++ b/src/flex-table-column.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-table-column.hpp b/src/flex-table-column.hpp
index 8d6599fe6..c14edc320 100644
--- a/src/flex-table-column.hpp
+++ b/src/flex-table-column.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-table.cpp b/src/flex-table.cpp
index 1c8cd92c3..8a25d35a7 100644
--- a/src/flex-table.cpp
+++ b/src/flex-table.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-table.hpp b/src/flex-table.hpp
index 7ae505b29..70481db5a 100644
--- a/src/flex-table.hpp
+++ b/src/flex-table.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-write.cpp b/src/flex-write.cpp
index 5ede64d4d..c0090591d 100644
--- a/src/flex-write.cpp
+++ b/src/flex-write.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-write.hpp b/src/flex-write.hpp
index e20b2216e..fac403925 100644
--- a/src/flex-write.hpp
+++ b/src/flex-write.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/format.hpp b/src/format.hpp
index 303c8784b..3d4a25f27 100644
--- a/src/format.hpp
+++ b/src/format.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gazetteer-style.cpp b/src/gazetteer-style.cpp
index a2b126432..47bdd9e2b 100644
--- a/src/gazetteer-style.cpp
+++ b/src/gazetteer-style.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gazetteer-style.hpp b/src/gazetteer-style.hpp
index bdb085dd5..ceb5832ea 100644
--- a/src/gazetteer-style.hpp
+++ b/src/gazetteer-style.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/canvas.cpp b/src/gen/canvas.cpp
index ecb0ef156..8978c4ffc 100644
--- a/src/gen/canvas.cpp
+++ b/src/gen/canvas.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/canvas.hpp b/src/gen/canvas.hpp
index 6a6eba639..c184af827 100644
--- a/src/gen/canvas.hpp
+++ b/src/gen/canvas.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-base.cpp b/src/gen/gen-base.cpp
index eec2a9936..5e5d3ad15 100644
--- a/src/gen/gen-base.cpp
+++ b/src/gen/gen-base.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-base.hpp b/src/gen/gen-base.hpp
index e60f04b23..59579b85c 100644
--- a/src/gen/gen-base.hpp
+++ b/src/gen/gen-base.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-create.cpp b/src/gen/gen-create.cpp
index 4486338a0..dd532fec4 100644
--- a/src/gen/gen-create.cpp
+++ b/src/gen/gen-create.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-create.hpp b/src/gen/gen-create.hpp
index 54dacbef4..56a652c43 100644
--- a/src/gen/gen-create.hpp
+++ b/src/gen/gen-create.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-discrete-isolation.cpp b/src/gen/gen-discrete-isolation.cpp
index b629bd6e7..292ae6f04 100644
--- a/src/gen/gen-discrete-isolation.cpp
+++ b/src/gen/gen-discrete-isolation.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-discrete-isolation.hpp b/src/gen/gen-discrete-isolation.hpp
index 90b5ba578..3ee6824af 100644
--- a/src/gen/gen-discrete-isolation.hpp
+++ b/src/gen/gen-discrete-isolation.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-rivers.cpp b/src/gen/gen-rivers.cpp
index 096661d18..959c1d02a 100644
--- a/src/gen/gen-rivers.cpp
+++ b/src/gen/gen-rivers.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-rivers.hpp b/src/gen/gen-rivers.hpp
index f59afe72a..002d83561 100644
--- a/src/gen/gen-rivers.hpp
+++ b/src/gen/gen-rivers.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile-builtup.cpp b/src/gen/gen-tile-builtup.cpp
index 6cae4f2b4..3f84c698b 100644
--- a/src/gen/gen-tile-builtup.cpp
+++ b/src/gen/gen-tile-builtup.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile-builtup.hpp b/src/gen/gen-tile-builtup.hpp
index 4c5ff85cc..92367026b 100644
--- a/src/gen/gen-tile-builtup.hpp
+++ b/src/gen/gen-tile-builtup.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile-raster.cpp b/src/gen/gen-tile-raster.cpp
index 9ac0873ab..64dca0f09 100644
--- a/src/gen/gen-tile-raster.cpp
+++ b/src/gen/gen-tile-raster.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile-raster.hpp b/src/gen/gen-tile-raster.hpp
index 21d26b6df..e39344dac 100644
--- a/src/gen/gen-tile-raster.hpp
+++ b/src/gen/gen-tile-raster.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile-vector.cpp b/src/gen/gen-tile-vector.cpp
index cdc270a6b..205d84ff1 100644
--- a/src/gen/gen-tile-vector.cpp
+++ b/src/gen/gen-tile-vector.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile-vector.hpp b/src/gen/gen-tile-vector.hpp
index 1aa9867a1..da80ac27f 100644
--- a/src/gen/gen-tile-vector.hpp
+++ b/src/gen/gen-tile-vector.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile.cpp b/src/gen/gen-tile.cpp
index 1072b06d6..8719015d6 100644
--- a/src/gen/gen-tile.cpp
+++ b/src/gen/gen-tile.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile.hpp b/src/gen/gen-tile.hpp
index 5b211067e..fa963c448 100644
--- a/src/gen/gen-tile.hpp
+++ b/src/gen/gen-tile.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index 5ce74f295..aff975cb4 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/params.cpp b/src/gen/params.cpp
index 1990fec5c..f7dbaaf98 100644
--- a/src/gen/params.cpp
+++ b/src/gen/params.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/params.hpp b/src/gen/params.hpp
index 96db7db14..174465820 100644
--- a/src/gen/params.hpp
+++ b/src/gen/params.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/raster.cpp b/src/gen/raster.cpp
index e552c7cd2..bba2043f9 100644
--- a/src/gen/raster.cpp
+++ b/src/gen/raster.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/raster.hpp b/src/gen/raster.hpp
index 82a86ea0b..61bad677e 100644
--- a/src/gen/raster.hpp
+++ b/src/gen/raster.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/tracer.cpp b/src/gen/tracer.cpp
index c7a2c1367..588988ff6 100644
--- a/src/gen/tracer.cpp
+++ b/src/gen/tracer.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/tracer.hpp b/src/gen/tracer.hpp
index 47fc587f6..141cdea93 100644
--- a/src/gen/tracer.hpp
+++ b/src/gen/tracer.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-boost-adaptor.hpp b/src/geom-boost-adaptor.hpp
index daf4e9267..dcc45b9b0 100644
--- a/src/geom-boost-adaptor.hpp
+++ b/src/geom-boost-adaptor.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-box.cpp b/src/geom-box.cpp
index b26caff5e..a5f8217fd 100644
--- a/src/geom-box.cpp
+++ b/src/geom-box.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-box.hpp b/src/geom-box.hpp
index e81177fab..ca0d7c260 100644
--- a/src/geom-box.hpp
+++ b/src/geom-box.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-from-osm.cpp b/src/geom-from-osm.cpp
index ff4d50e8d..68e4cb078 100644
--- a/src/geom-from-osm.cpp
+++ b/src/geom-from-osm.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-from-osm.hpp b/src/geom-from-osm.hpp
index 1e3666163..7b109250a 100644
--- a/src/geom-from-osm.hpp
+++ b/src/geom-from-osm.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-functions.cpp b/src/geom-functions.cpp
index 7b74f6a23..f2e6da346 100644
--- a/src/geom-functions.cpp
+++ b/src/geom-functions.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-functions.hpp b/src/geom-functions.hpp
index 1f62bdfe8..51e122ed4 100644
--- a/src/geom-functions.hpp
+++ b/src/geom-functions.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-output.hpp b/src/geom-output.hpp
index ecaa763f8..ac54ec806 100644
--- a/src/geom-output.hpp
+++ b/src/geom-output.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-pole-of-inaccessibility.cpp b/src/geom-pole-of-inaccessibility.cpp
index c5c9c51e2..35b981eac 100644
--- a/src/geom-pole-of-inaccessibility.cpp
+++ b/src/geom-pole-of-inaccessibility.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-pole-of-inaccessibility.hpp b/src/geom-pole-of-inaccessibility.hpp
index 4af7c91e7..2e32fe953 100644
--- a/src/geom-pole-of-inaccessibility.hpp
+++ b/src/geom-pole-of-inaccessibility.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-transform.cpp b/src/geom-transform.cpp
index dab041ebb..0ee7ee57d 100644
--- a/src/geom-transform.cpp
+++ b/src/geom-transform.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-transform.hpp b/src/geom-transform.hpp
index 1914baad3..65f48dac5 100644
--- a/src/geom-transform.hpp
+++ b/src/geom-transform.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom.cpp b/src/geom.cpp
index df6612049..121089418 100644
--- a/src/geom.cpp
+++ b/src/geom.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom.hpp b/src/geom.hpp
index c704a4f8f..4c3919017 100644
--- a/src/geom.hpp
+++ b/src/geom.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/input.cpp b/src/input.cpp
index 844fbbc07..93aa5c61c 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/input.hpp b/src/input.hpp
index d23be14b9..37b841596 100644
--- a/src/input.hpp
+++ b/src/input.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/json-writer.hpp b/src/json-writer.hpp
index d64add081..df432b0c4 100644
--- a/src/json-writer.hpp
+++ b/src/json-writer.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/logging.cpp b/src/logging.cpp
index 7c890d103..85ac2095b 100644
--- a/src/logging.cpp
+++ b/src/logging.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/logging.hpp b/src/logging.hpp
index 43a85224b..2c2e51838 100644
--- a/src/logging.hpp
+++ b/src/logging.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/lua-init.hpp b/src/lua-init.hpp
index 06325fc8f..5b7576d15 100644
--- a/src/lua-init.hpp
+++ b/src/lua-init.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/lua-setup.cpp b/src/lua-setup.cpp
index ce44c87bf..bdc864787 100644
--- a/src/lua-setup.cpp
+++ b/src/lua-setup.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/lua-setup.hpp b/src/lua-setup.hpp
index 7655910f8..535054aa9 100644
--- a/src/lua-setup.hpp
+++ b/src/lua-setup.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/lua-utils.cpp b/src/lua-utils.cpp
index 9c06a7934..bbca3a4ed 100644
--- a/src/lua-utils.cpp
+++ b/src/lua-utils.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/lua-utils.hpp b/src/lua-utils.hpp
index 1e894ba5d..b6830971a 100644
--- a/src/lua-utils.hpp
+++ b/src/lua-utils.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index a673472a5..254fc096c 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/middle-pgsql.hpp b/src/middle-pgsql.hpp
index b651675a2..3f81dcd5a 100644
--- a/src/middle-pgsql.hpp
+++ b/src/middle-pgsql.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/middle-ram.cpp b/src/middle-ram.cpp
index a00339970..5a7bd64b3 100644
--- a/src/middle-ram.cpp
+++ b/src/middle-ram.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/middle-ram.hpp b/src/middle-ram.hpp
index 7f3bae5f6..19c1245ab 100644
--- a/src/middle-ram.hpp
+++ b/src/middle-ram.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/middle.cpp b/src/middle.cpp
index 4e23adc00..e2b930f8c 100644
--- a/src/middle.cpp
+++ b/src/middle.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/middle.hpp b/src/middle.hpp
index 31fc64d78..00b323a7e 100644
--- a/src/middle.hpp
+++ b/src/middle.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/node-locations.cpp b/src/node-locations.cpp
index 55ad58794..b85db687c 100644
--- a/src/node-locations.cpp
+++ b/src/node-locations.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/node-locations.hpp b/src/node-locations.hpp
index 884d3b53e..7de861fd4 100644
--- a/src/node-locations.hpp
+++ b/src/node-locations.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/node-persistent-cache.cpp b/src/node-persistent-cache.cpp
index be8fcef69..6b06b1ceb 100644
--- a/src/node-persistent-cache.cpp
+++ b/src/node-persistent-cache.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/node-persistent-cache.hpp b/src/node-persistent-cache.hpp
index 2ce50a847..3bebc4887 100644
--- a/src/node-persistent-cache.hpp
+++ b/src/node-persistent-cache.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/options.hpp b/src/options.hpp
index b9f886587..7b4c63b01 100644
--- a/src/options.hpp
+++ b/src/options.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/ordered-index.cpp b/src/ordered-index.cpp
index fa453536c..123d2ec54 100644
--- a/src/ordered-index.cpp
+++ b/src/ordered-index.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/ordered-index.hpp b/src/ordered-index.hpp
index 73fd5c2e5..d3f0ec413 100644
--- a/src/ordered-index.hpp
+++ b/src/ordered-index.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
index d9787ee3a..46e0c57d8 100644
--- a/src/osm2pgsql.cpp
+++ b/src/osm2pgsql.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/osmdata.cpp b/src/osmdata.cpp
index 01a5ef610..c7709e4b2 100644
--- a/src/osmdata.cpp
+++ b/src/osmdata.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/osmdata.hpp b/src/osmdata.hpp
index a6e1d98de..0da8d7f17 100644
--- a/src/osmdata.hpp
+++ b/src/osmdata.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/osmtypes.hpp b/src/osmtypes.hpp
index b404169ab..6eadff83b 100644
--- a/src/osmtypes.hpp
+++ b/src/osmtypes.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 735bbe81a..2d2418a4f 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index 89cced9b2..c3125125a 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output-gazetteer.cpp b/src/output-gazetteer.cpp
index 183eabfc3..044bbbdbe 100644
--- a/src/output-gazetteer.cpp
+++ b/src/output-gazetteer.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output-gazetteer.hpp b/src/output-gazetteer.hpp
index 5c56bfebe..a068984a6 100644
--- a/src/output-gazetteer.hpp
+++ b/src/output-gazetteer.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output-null.cpp b/src/output-null.cpp
index b876b3a27..5058161c6 100644
--- a/src/output-null.cpp
+++ b/src/output-null.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output-null.hpp b/src/output-null.hpp
index 48447779a..6429ac0c6 100644
--- a/src/output-null.hpp
+++ b/src/output-null.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output-pgsql.cpp b/src/output-pgsql.cpp
index 1bb5a1192..40fa608db 100644
--- a/src/output-pgsql.cpp
+++ b/src/output-pgsql.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output-pgsql.hpp b/src/output-pgsql.hpp
index c8e43234c..bd4b7a667 100644
--- a/src/output-pgsql.hpp
+++ b/src/output-pgsql.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output-requirements.hpp b/src/output-requirements.hpp
index 9deb1a099..cb4cf16d0 100644
--- a/src/output-requirements.hpp
+++ b/src/output-requirements.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output.cpp b/src/output.cpp
index a26206f7d..51a353da8 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output.hpp b/src/output.hpp
index c82a62d36..847dc3662 100644
--- a/src/output.hpp
+++ b/src/output.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/overloaded.hpp b/src/overloaded.hpp
index 813387467..dc97b692a 100644
--- a/src/overloaded.hpp
+++ b/src/overloaded.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/pgsql-capabilities-int.hpp b/src/pgsql-capabilities-int.hpp
index 667477be8..3fa906595 100644
--- a/src/pgsql-capabilities-int.hpp
+++ b/src/pgsql-capabilities-int.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/pgsql-capabilities.cpp b/src/pgsql-capabilities.cpp
index e11e016a1..8123b7478 100644
--- a/src/pgsql-capabilities.cpp
+++ b/src/pgsql-capabilities.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/pgsql-capabilities.hpp b/src/pgsql-capabilities.hpp
index ba24650f2..999400e03 100644
--- a/src/pgsql-capabilities.hpp
+++ b/src/pgsql-capabilities.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/pgsql-helper.cpp b/src/pgsql-helper.cpp
index 3875c12e8..f8d0db29d 100644
--- a/src/pgsql-helper.cpp
+++ b/src/pgsql-helper.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/pgsql-helper.hpp b/src/pgsql-helper.hpp
index 2dbda127b..52f187e14 100644
--- a/src/pgsql-helper.hpp
+++ b/src/pgsql-helper.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/pgsql.cpp b/src/pgsql.cpp
index 2a6808a42..13866bf99 100644
--- a/src/pgsql.cpp
+++ b/src/pgsql.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/pgsql.hpp b/src/pgsql.hpp
index f472eaf4d..9e653fc91 100644
--- a/src/pgsql.hpp
+++ b/src/pgsql.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/progress-display.cpp b/src/progress-display.cpp
index 2e24e903e..5fd21a290 100644
--- a/src/progress-display.cpp
+++ b/src/progress-display.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/progress-display.hpp b/src/progress-display.hpp
index f4a3917b0..4e89972d9 100644
--- a/src/progress-display.hpp
+++ b/src/progress-display.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/properties.cpp b/src/properties.cpp
index 4891f989a..aa154d859 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/properties.hpp b/src/properties.hpp
index a26afd7ef..e8324c4c8 100644
--- a/src/properties.hpp
+++ b/src/properties.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/reprojection-generic-none.cpp b/src/reprojection-generic-none.cpp
index 1b202a2c6..835af5b70 100644
--- a/src/reprojection-generic-none.cpp
+++ b/src/reprojection-generic-none.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/reprojection-generic-proj4.cpp b/src/reprojection-generic-proj4.cpp
index 329288f25..453018ccb 100644
--- a/src/reprojection-generic-proj4.cpp
+++ b/src/reprojection-generic-proj4.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/reprojection.cpp b/src/reprojection.cpp
index e3dadfe95..8d7cc6c40 100644
--- a/src/reprojection.cpp
+++ b/src/reprojection.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/reprojection.hpp b/src/reprojection.hpp
index a278de476..a457a0ebf 100644
--- a/src/reprojection.hpp
+++ b/src/reprojection.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/table.cpp b/src/table.cpp
index 759d87d28..9d148831d 100644
--- a/src/table.cpp
+++ b/src/table.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/table.hpp b/src/table.hpp
index 9bf8877ca..1b42d7abb 100644
--- a/src/table.hpp
+++ b/src/table.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/taginfo-impl.hpp b/src/taginfo-impl.hpp
index 5734b3e51..f54158404 100644
--- a/src/taginfo-impl.hpp
+++ b/src/taginfo-impl.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/taginfo.cpp b/src/taginfo.cpp
index 09f3cc991..45be7186d 100644
--- a/src/taginfo.cpp
+++ b/src/taginfo.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/taginfo.hpp b/src/taginfo.hpp
index 4ffa618c7..13f8cc105 100644
--- a/src/taginfo.hpp
+++ b/src/taginfo.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tagtransform-c.cpp b/src/tagtransform-c.cpp
index 25431a954..e606d2915 100644
--- a/src/tagtransform-c.cpp
+++ b/src/tagtransform-c.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tagtransform-c.hpp b/src/tagtransform-c.hpp
index 5d4dfa037..99195bcd2 100644
--- a/src/tagtransform-c.hpp
+++ b/src/tagtransform-c.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tagtransform-lua.cpp b/src/tagtransform-lua.cpp
index 3389dc165..95eb99715 100644
--- a/src/tagtransform-lua.cpp
+++ b/src/tagtransform-lua.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tagtransform-lua.hpp b/src/tagtransform-lua.hpp
index 6d07fe5f8..856f65270 100644
--- a/src/tagtransform-lua.hpp
+++ b/src/tagtransform-lua.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tagtransform.cpp b/src/tagtransform.cpp
index 3d41e8290..4fef20387 100644
--- a/src/tagtransform.cpp
+++ b/src/tagtransform.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tagtransform.hpp b/src/tagtransform.hpp
index d1caf79f9..381ab8a19 100644
--- a/src/tagtransform.hpp
+++ b/src/tagtransform.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/thread-pool.cpp b/src/thread-pool.cpp
index 7aacc4acf..0bfcf5bb7 100644
--- a/src/thread-pool.cpp
+++ b/src/thread-pool.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/thread-pool.hpp b/src/thread-pool.hpp
index 4d2baf0d0..7392e3670 100644
--- a/src/thread-pool.hpp
+++ b/src/thread-pool.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tile-output.hpp b/src/tile-output.hpp
index 64c7aae25..4b970e3b1 100644
--- a/src/tile-output.hpp
+++ b/src/tile-output.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tile.cpp b/src/tile.cpp
index d41fd5436..3351ed75e 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tile.hpp b/src/tile.hpp
index 7b51326f4..a6df27e47 100644
--- a/src/tile.hpp
+++ b/src/tile.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/util.cpp b/src/util.cpp
index 5672eeb55..3f3909bb5 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/util.hpp b/src/util.hpp
index 1c7b1f90a..0f951d697 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/version.cpp.in b/src/version.cpp.in
index 7661eb9b4..684565c94 100644
--- a/src/version.cpp.in
+++ b/src/version.cpp.in
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/version.hpp b/src/version.hpp
index 82f109228..4d210c7c5 100644
--- a/src/version.hpp
+++ b/src/version.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/wildcmp.cpp b/src/wildcmp.cpp
index cbe542f26..77156c299 100644
--- a/src/wildcmp.cpp
+++ b/src/wildcmp.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/wildcmp.hpp b/src/wildcmp.hpp
index 0ab9b8197..47cd95756 100644
--- a/src/wildcmp.hpp
+++ b/src/wildcmp.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/wkb.cpp b/src/wkb.cpp
index cf888d500..36963cdd4 100644
--- a/src/wkb.cpp
+++ b/src/wkb.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/wkb.hpp b/src/wkb.hpp
index c76acd6a5..923f07b88 100644
--- a/src/wkb.hpp
+++ b/src/wkb.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/bdd/environment.py b/tests/bdd/environment.py
index ff051c871..97ff17995 100644
--- a/tests/bdd/environment.py
+++ b/tests/bdd/environment.py
@@ -2,7 +2,7 @@
 #
 # This file is part of osm2pgsql (https://osm2pgsql.org/).
 #
-# Copyright (C) 2023 by the osm2pgsql developer community.
+# Copyright (C) 2006-2024 by the osm2pgsql developer community.
 # For a full list of authors see the git log.
 from contextlib import closing
 from pathlib import Path
diff --git a/tests/bdd/steps/geometry_factory.py b/tests/bdd/steps/geometry_factory.py
index be1c82bfa..d5b7d3695 100644
--- a/tests/bdd/steps/geometry_factory.py
+++ b/tests/bdd/steps/geometry_factory.py
@@ -2,7 +2,7 @@
 #
 # This file is part of osm2pgsql (https://osm2pgsql.org/).
 #
-# Copyright (C) 2023 by the osm2pgsql developer community.
+# Copyright (C) 2006-2024 by the osm2pgsql developer community.
 # For a full list of authors see the git log.
 
 class GeometryFactory:
diff --git a/tests/bdd/steps/replication_server_mock.py b/tests/bdd/steps/replication_server_mock.py
index 8fbc9ec12..5d9080824 100644
--- a/tests/bdd/steps/replication_server_mock.py
+++ b/tests/bdd/steps/replication_server_mock.py
@@ -2,7 +2,7 @@
 #
 # This file is part of osm2pgsql (https://osm2pgsql.org/).
 #
-# Copyright (C) 2023 by the osm2pgsql developer community.
+# Copyright (C) 2006-2024 by the osm2pgsql developer community.
 # For a full list of authors see the git log.
 
 
diff --git a/tests/bdd/steps/steps_db.py b/tests/bdd/steps/steps_db.py
index 94091ceb7..4da16deb6 100644
--- a/tests/bdd/steps/steps_db.py
+++ b/tests/bdd/steps/steps_db.py
@@ -2,7 +2,7 @@
 #
 # This file is part of osm2pgsql (https://osm2pgsql.org/).
 #
-# Copyright (C) 2023 by the osm2pgsql developer community.
+# Copyright (C) 2006-2024 by the osm2pgsql developer community.
 # For a full list of authors see the git log.
 """
 Steps that query the database.
diff --git a/tests/bdd/steps/steps_execute.py b/tests/bdd/steps/steps_execute.py
index 91d49327b..f04ee3efa 100644
--- a/tests/bdd/steps/steps_execute.py
+++ b/tests/bdd/steps/steps_execute.py
@@ -2,7 +2,7 @@
 #
 # This file is part of osm2pgsql (https://osm2pgsql.org/).
 #
-# Copyright (C) 2023 by the osm2pgsql developer community.
+# Copyright (C) 2006-2024 by the osm2pgsql developer community.
 # For a full list of authors see the git log.
 """
 Steps for executing osm2pgsql.
diff --git a/tests/bdd/steps/steps_osm_data.py b/tests/bdd/steps/steps_osm_data.py
index 38f1fefb6..4f46bf524 100644
--- a/tests/bdd/steps/steps_osm_data.py
+++ b/tests/bdd/steps/steps_osm_data.py
@@ -2,7 +2,7 @@
 #
 # This file is part of osm2pgsql (https://osm2pgsql.org/).
 #
-# Copyright (C) 2023 by the osm2pgsql developer community.
+# Copyright (C) 2006-2024 by the osm2pgsql developer community.
 # For a full list of authors see the git log.
 """
 Steps for creating the OSM import file.
diff --git a/tests/catch-main.cpp b/tests/catch-main.cpp
index 2813e546f..fa5651a52 100644
--- a/tests/catch-main.cpp
+++ b/tests/catch-main.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/common-buffer.hpp b/tests/common-buffer.hpp
index 7b961d14d..251d6c553 100644
--- a/tests/common-buffer.hpp
+++ b/tests/common-buffer.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/common-cleanup.hpp b/tests/common-cleanup.hpp
index 8e5cee6b1..e7ffa951f 100644
--- a/tests/common-cleanup.hpp
+++ b/tests/common-cleanup.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/common-import.hpp b/tests/common-import.hpp
index a9124f36a..35abc1651 100644
--- a/tests/common-import.hpp
+++ b/tests/common-import.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/common-options.hpp b/tests/common-options.hpp
index 05050af8d..5a4582eaa 100644
--- a/tests/common-options.hpp
+++ b/tests/common-options.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/common-pg.hpp b/tests/common-pg.hpp
index de6e4bf49..bed23944f 100644
--- a/tests/common-pg.hpp
+++ b/tests/common-pg.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-check-input.cpp b/tests/test-check-input.cpp
index 1512041aa..17a96b69b 100644
--- a/tests/test-check-input.cpp
+++ b/tests/test-check-input.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-db-copy-mgr.cpp b/tests/test-db-copy-mgr.cpp
index 3d6a37412..2aec343af 100644
--- a/tests/test-db-copy-mgr.cpp
+++ b/tests/test-db-copy-mgr.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-db-copy-thread.cpp b/tests/test-db-copy-thread.cpp
index 9d2bb259b..2932817f2 100644
--- a/tests/test-db-copy-thread.cpp
+++ b/tests/test-db-copy-thread.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-domain-matcher.cpp b/tests/test-domain-matcher.cpp
index 0ca96d2b5..dad7e5cd2 100644
--- a/tests/test-domain-matcher.cpp
+++ b/tests/test-domain-matcher.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-expire-from-geometry.cpp b/tests/test-expire-from-geometry.cpp
index 87fa917b4..695d5ee21 100644
--- a/tests/test-expire-from-geometry.cpp
+++ b/tests/test-expire-from-geometry.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-expire-tiles.cpp b/tests/test-expire-tiles.cpp
index f2ad635ec..374eaaef5 100644
--- a/tests/test-expire-tiles.cpp
+++ b/tests/test-expire-tiles.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-flex-indexes.cpp b/tests/test-flex-indexes.cpp
index cd1663da3..609452af7 100644
--- a/tests/test-flex-indexes.cpp
+++ b/tests/test-flex-indexes.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-box.cpp b/tests/test-geom-box.cpp
index a438c36e7..22e90423d 100644
--- a/tests/test-geom-box.cpp
+++ b/tests/test-geom-box.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-collections.cpp b/tests/test-geom-collections.cpp
index a4825a217..98f45a929 100644
--- a/tests/test-geom-collections.cpp
+++ b/tests/test-geom-collections.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-linestrings.cpp b/tests/test-geom-linestrings.cpp
index 4825535c5..7f52309d4 100644
--- a/tests/test-geom-linestrings.cpp
+++ b/tests/test-geom-linestrings.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-multilinestrings.cpp b/tests/test-geom-multilinestrings.cpp
index 3d560a8ac..ea4fb78e0 100644
--- a/tests/test-geom-multilinestrings.cpp
+++ b/tests/test-geom-multilinestrings.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-multipoints.cpp b/tests/test-geom-multipoints.cpp
index fa883134e..a19ae7393 100644
--- a/tests/test-geom-multipoints.cpp
+++ b/tests/test-geom-multipoints.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-multipolygons.cpp b/tests/test-geom-multipolygons.cpp
index 17624cc05..fd891e1a0 100644
--- a/tests/test-geom-multipolygons.cpp
+++ b/tests/test-geom-multipolygons.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-null.cpp b/tests/test-geom-null.cpp
index 35efb299b..7c2ab97e5 100644
--- a/tests/test-geom-null.cpp
+++ b/tests/test-geom-null.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-output.cpp b/tests/test-geom-output.cpp
index 9e149fd13..56cffc6db 100644
--- a/tests/test-geom-output.cpp
+++ b/tests/test-geom-output.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-points.cpp b/tests/test-geom-points.cpp
index 3e30a8ee9..e9f463834 100644
--- a/tests/test-geom-points.cpp
+++ b/tests/test-geom-points.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-pole-of-inaccessibility.cpp b/tests/test-geom-pole-of-inaccessibility.cpp
index d36549328..a9fcf1d75 100644
--- a/tests/test-geom-pole-of-inaccessibility.cpp
+++ b/tests/test-geom-pole-of-inaccessibility.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-polygons.cpp b/tests/test-geom-polygons.cpp
index 468ebb4c5..7df25d8d8 100644
--- a/tests/test-geom-polygons.cpp
+++ b/tests/test-geom-polygons.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-transform.cpp b/tests/test-geom-transform.cpp
index ec9a8e1ae..2dec12ecf 100644
--- a/tests/test-geom-transform.cpp
+++ b/tests/test-geom-transform.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-json-writer.cpp b/tests/test-json-writer.cpp
index ad6aa2aea..b477ed348 100644
--- a/tests/test-json-writer.cpp
+++ b/tests/test-json-writer.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-lua-utils.cpp b/tests/test-lua-utils.cpp
index b927997a1..abd11f2cd 100644
--- a/tests/test-lua-utils.cpp
+++ b/tests/test-lua-utils.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-middle.cpp b/tests/test-middle.cpp
index f6ef975eb..7438b4476 100644
--- a/tests/test-middle.cpp
+++ b/tests/test-middle.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-node-locations.cpp b/tests/test-node-locations.cpp
index ac48a2f7d..26b18522d 100644
--- a/tests/test-node-locations.cpp
+++ b/tests/test-node-locations.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-options-database.cpp b/tests/test-options-database.cpp
index 6f51dc992..6fd652adb 100644
--- a/tests/test-options-database.cpp
+++ b/tests/test-options-database.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-options-parse.cpp b/tests/test-options-parse.cpp
index 6ee96c3f3..33518890e 100644
--- a/tests/test-options-parse.cpp
+++ b/tests/test-options-parse.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-options-projection.cpp b/tests/test-options-projection.cpp
index 265770ea0..906623a48 100644
--- a/tests/test-options-projection.cpp
+++ b/tests/test-options-projection.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-ordered-index.cpp b/tests/test-ordered-index.cpp
index f6400d09e..533366df4 100644
--- a/tests/test-ordered-index.cpp
+++ b/tests/test-ordered-index.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-osm-file-parsing.cpp b/tests/test-osm-file-parsing.cpp
index 0c77c4ee2..66d11f1ba 100644
--- a/tests/test-osm-file-parsing.cpp
+++ b/tests/test-osm-file-parsing.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-example-configs.cpp b/tests/test-output-flex-example-configs.cpp
index dd2469e94..c9616e2ea 100644
--- a/tests/test-output-flex-example-configs.cpp
+++ b/tests/test-output-flex-example-configs.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-multi-input.cpp b/tests/test-output-flex-multi-input.cpp
index d51df32a0..18933f95d 100644
--- a/tests/test-output-flex-multi-input.cpp
+++ b/tests/test-output-flex-multi-input.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-nodes.cpp b/tests/test-output-flex-nodes.cpp
index 6fe4fd333..4a8e6a95c 100644
--- a/tests/test-output-flex-nodes.cpp
+++ b/tests/test-output-flex-nodes.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-relation-combinations.cpp b/tests/test-output-flex-relation-combinations.cpp
index d3f79cf9d..6917463e3 100644
--- a/tests/test-output-flex-relation-combinations.cpp
+++ b/tests/test-output-flex-relation-combinations.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-relations.cpp b/tests/test-output-flex-relations.cpp
index b2e63f830..17bf47908 100644
--- a/tests/test-output-flex-relations.cpp
+++ b/tests/test-output-flex-relations.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-schema.cpp b/tests/test-output-flex-schema.cpp
index 42b86e61f..60b2dd62a 100644
--- a/tests/test-output-flex-schema.cpp
+++ b/tests/test-output-flex-schema.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-stage2.cpp b/tests/test-output-flex-stage2.cpp
index 03d403e14..30561d4d6 100644
--- a/tests/test-output-flex-stage2.cpp
+++ b/tests/test-output-flex-stage2.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-tablespace.cpp b/tests/test-output-flex-tablespace.cpp
index 9dd410a28..848394295 100644
--- a/tests/test-output-flex-tablespace.cpp
+++ b/tests/test-output-flex-tablespace.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-types.cpp b/tests/test-output-flex-types.cpp
index 705316740..3c04d0235 100644
--- a/tests/test-output-flex-types.cpp
+++ b/tests/test-output-flex-types.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-uni.cpp b/tests/test-output-flex-uni.cpp
index 7f4eeeb8d..9f44ca3a0 100644
--- a/tests/test-output-flex-uni.cpp
+++ b/tests/test-output-flex-uni.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-update.cpp b/tests/test-output-flex-update.cpp
index a92f2646b..615a753ed 100644
--- a/tests/test-output-flex-update.cpp
+++ b/tests/test-output-flex-update.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-validgeom.cpp b/tests/test-output-flex-validgeom.cpp
index 52fcc5c22..982361b3f 100644
--- a/tests/test-output-flex-validgeom.cpp
+++ b/tests/test-output-flex-validgeom.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex.cpp b/tests/test-output-flex.cpp
index 6936b00c8..0cf424a12 100644
--- a/tests/test-output-flex.cpp
+++ b/tests/test-output-flex.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-gazetteer.cpp b/tests/test-output-gazetteer.cpp
index 96927a11b..c18ce95d9 100644
--- a/tests/test-output-gazetteer.cpp
+++ b/tests/test-output-gazetteer.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql-area.cpp b/tests/test-output-pgsql-area.cpp
index 42217ecaf..043c4fd1b 100644
--- a/tests/test-output-pgsql-area.cpp
+++ b/tests/test-output-pgsql-area.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql-hstore-match-only.cpp b/tests/test-output-pgsql-hstore-match-only.cpp
index 161b5ee0b..e188043d1 100644
--- a/tests/test-output-pgsql-hstore-match-only.cpp
+++ b/tests/test-output-pgsql-hstore-match-only.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql-int4.cpp b/tests/test-output-pgsql-int4.cpp
index 0245c529e..85ed3afe2 100644
--- a/tests/test-output-pgsql-int4.cpp
+++ b/tests/test-output-pgsql-int4.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql-schema.cpp b/tests/test-output-pgsql-schema.cpp
index d23e03a61..593a32a39 100644
--- a/tests/test-output-pgsql-schema.cpp
+++ b/tests/test-output-pgsql-schema.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql-style-file.cpp b/tests/test-output-pgsql-style-file.cpp
index a0b743060..27f1f7937 100644
--- a/tests/test-output-pgsql-style-file.cpp
+++ b/tests/test-output-pgsql-style-file.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql-tablespace.cpp b/tests/test-output-pgsql-tablespace.cpp
index 3e3bc0d4f..989bfdc80 100644
--- a/tests/test-output-pgsql-tablespace.cpp
+++ b/tests/test-output-pgsql-tablespace.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql-validgeom.cpp b/tests/test-output-pgsql-validgeom.cpp
index fdbea41c2..6512d4519 100644
--- a/tests/test-output-pgsql-validgeom.cpp
+++ b/tests/test-output-pgsql-validgeom.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql-z_order.cpp b/tests/test-output-pgsql-z_order.cpp
index 20ed4ea8d..0aaa4c7e0 100644
--- a/tests/test-output-pgsql-z_order.cpp
+++ b/tests/test-output-pgsql-z_order.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql.cpp b/tests/test-output-pgsql.cpp
index 62ae3cf49..675522326 100644
--- a/tests/test-output-pgsql.cpp
+++ b/tests/test-output-pgsql.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-persistent-cache.cpp b/tests/test-persistent-cache.cpp
index d98118f79..35a63e3e3 100644
--- a/tests/test-persistent-cache.cpp
+++ b/tests/test-persistent-cache.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-pgsql-capabilities.cpp b/tests/test-pgsql-capabilities.cpp
index 31d7786ed..3cf8448fd 100644
--- a/tests/test-pgsql-capabilities.cpp
+++ b/tests/test-pgsql-capabilities.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-pgsql.cpp b/tests/test-pgsql.cpp
index a38fac374..88eb625ba 100644
--- a/tests/test-pgsql.cpp
+++ b/tests/test-pgsql.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-properties.cpp b/tests/test-properties.cpp
index 3edc8384a..b35ccb0fa 100644
--- a/tests/test-properties.cpp
+++ b/tests/test-properties.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-reprojection.cpp b/tests/test-reprojection.cpp
index ae2016dbc..f00d38b60 100644
--- a/tests/test-reprojection.cpp
+++ b/tests/test-reprojection.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-taginfo.cpp b/tests/test-taginfo.cpp
index 44bc4a100..428d520a9 100644
--- a/tests/test-taginfo.cpp
+++ b/tests/test-taginfo.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-tile.cpp b/tests/test-tile.cpp
index f7bfb2e50..a951ff2af 100644
--- a/tests/test-tile.cpp
+++ b/tests/test-tile.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-util.cpp b/tests/test-util.cpp
index 5b3812050..ce6fb1b57 100644
--- a/tests/test-util.cpp
+++ b/tests/test-util.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-wildcard-match.cpp b/tests/test-wildcard-match.cpp
index 2b1543648..21ed7e464 100644
--- a/tests/test-wildcard-match.cpp
+++ b/tests/test-wildcard-match.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-wkb.cpp b/tests/test-wkb.cpp
index 816ad9cf5..810485a0f 100644
--- a/tests/test-wkb.cpp
+++ b/tests/test-wkb.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 

From 80f64697dc793e72fb96ef96543e71e96b5277a1 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 26 Jan 2024 17:51:28 +0100
Subject: [PATCH 059/430] Update Github actions workflow to use new versions of
 actions

---
 .github/workflows/ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6aefe0645..543afe5bb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -409,14 +409,14 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             C:/vcpkg_binary_cache
           key: vcpkg-binary-cache-${{ matrix.os }}-${{ github.run_id }}
           restore-keys: |
             vcpkg-binary-cache-${{ matrix.os }}
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             C:/postgis.zip
@@ -438,7 +438,7 @@ jobs:
         working-directory: build
         if: matrix.os == 'windows-2022'
       - name: 'Upload Artifact'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: osm2pgsql-win64
           path: c:/artifact
@@ -453,12 +453,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             C:/postgis.zip
           key: postgis-cache
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: osm2pgsql-win64
       - uses: ./.github/actions/win-postgres

From 62b6d7774d5476362007646e14cf845a8152fbad Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 26 Jan 2024 19:57:18 +0100
Subject: [PATCH 060/430] Remove info that new middle db format is experimental
 from man page

This should have been removed before version 1.10.0.
---
 man/osm2pgsql.1  | 3 +--
 man/osm2pgsql.md | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/man/osm2pgsql.1 b/man/osm2pgsql.1
index 75c10115c..c8f659241 100644
--- a/man/osm2pgsql.1
+++ b/man/osm2pgsql.1
@@ -208,8 +208,7 @@ Set the database format for the middle tables to FORMAT.
 Allowed formats are \f[B]legacy\f[R] and \f[B]new\f[R].
 The \f[B]legacy\f[R] format is the old format that will eventually be
 deprecated and removed but is currently still the default.
-The \f[B]new\f[R] format was introduced in version 1.9.0 and is still
-experimental.
+The \f[B]new\f[R] format was introduced in version 1.9.0.
 See the manual for details on these formats.
 (Only works with \f[B]--slim\f[R].
 In append mode osm2pgsql will automatically detect the database format,
diff --git a/man/osm2pgsql.md b/man/osm2pgsql.md
index 7f5a84c97..17869eb9c 100644
--- a/man/osm2pgsql.md
+++ b/man/osm2pgsql.md
@@ -181,8 +181,8 @@ mandatory for short options too.
 :   Set the database format for the middle tables to FORMAT. Allowed formats
     are **legacy** and **new**. The **legacy** format is the old format that
     will eventually be deprecated and removed but is currently still the
-    default. The **new** format was introduced in version 1.9.0 and is still
-    experimental. See the manual for details on these formats. (Only works
+    default. The **new** format was introduced in version 1.9.0.
+    See the manual for details on these formats. (Only works
     with **\--slim**. In append mode osm2pgsql will automatically detect the
     database format, so don't use this with **-a, \--append**.)
 

From e38940e43a8823768f6b8433f104908912689548 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 26 Jan 2024 17:28:03 +0100
Subject: [PATCH 061/430] Fix SQL query for updating a database

When using the new middle format and --extra-attributes the SQL query
was broken.
---
 src/middle-pgsql.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index 254fc096c..b6f367816 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -1376,7 +1376,7 @@ void middle_pgsql_t::update_users_table()
              m_users_table.name());
 
     m_db_connection.exec("PREPARE insert_user(int8, text) AS"
-                         " INSERT INTO {}\"{}\" (id, name) VALUES ($1, $2)"
+                         " INSERT INTO {}.\"{}\" (id, name) VALUES ($1, $2)"
                          " ON CONFLICT (id) DO UPDATE SET id=EXCLUDED.id",
                          m_users_table.schema(), m_users_table.name());
 

From 0d67c404f2e21eccf7c6f6373f40e8999b0ecab4 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 27 Jan 2024 09:52:54 +0100
Subject: [PATCH 062/430] Refactor: Use const ref db connection param instead
 of ptr

In low-level pgsql helper functions.
---
 src/flex-table.cpp   |  4 ++--
 src/pgsql-helper.cpp | 45 ++++++++++++++++++++++----------------------
 src/pgsql-helper.hpp |  4 ++--
 src/table.cpp        |  6 +++---
 4 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/src/flex-table.cpp b/src/flex-table.cpp
index 8a25d35a7..a903268e1 100644
--- a/src/flex-table.cpp
+++ b/src/flex-table.cpp
@@ -269,7 +269,7 @@ enable_check_trigger(pg_conn_t *db_connection, flex_table_t const &table)
     // remove last " AND "
     checks.resize(checks.size() - 5);
 
-    create_geom_check_trigger(db_connection, table.schema(), table.name(),
+    create_geom_check_trigger(*db_connection, table.schema(), table.name(),
                               checks);
 }
 
@@ -310,7 +310,7 @@ void table_connection_t::stop(bool updateable, bool append)
 
     if (table().cluster_by_geom()) {
         if (table().geom_column().needs_isvalid()) {
-            drop_geom_check_trigger(m_db_connection.get(), table().schema(),
+            drop_geom_check_trigger(*m_db_connection, table().schema(),
                                     table().name());
         }
 
diff --git a/src/pgsql-helper.cpp b/src/pgsql-helper.cpp
index f8d0db29d..8d367a6a5 100644
--- a/src/pgsql-helper.cpp
+++ b/src/pgsql-helper.cpp
@@ -25,7 +25,7 @@ idlist_t get_ids_from_result(pg_result_t const &result) {
     return ids;
 }
 
-void create_geom_check_trigger(pg_conn_t *db_connection,
+void create_geom_check_trigger(pg_conn_t const &db_connection,
                                std::string const &schema,
                                std::string const &table,
                                std::string const &condition)
@@ -33,38 +33,37 @@ void create_geom_check_trigger(pg_conn_t *db_connection,
     std::string const func_name =
         qualified_name(schema, table + "_osm2pgsql_valid");
 
-    db_connection->exec("CREATE OR REPLACE FUNCTION {}()\n"
-                        "RETURNS TRIGGER AS $$\n"
-                        "BEGIN\n"
-                        "  IF {} THEN \n"
-                        "    RETURN NEW;\n"
-                        "  END IF;\n"
-                        "  RETURN NULL;\n"
-                        "END;"
-                        "$$ LANGUAGE plpgsql",
-                        func_name, condition);
+    db_connection.exec("CREATE OR REPLACE FUNCTION {}()\n"
+                       "RETURNS TRIGGER AS $$\n"
+                       "BEGIN\n"
+                       "  IF {} THEN \n"
+                       "    RETURN NEW;\n"
+                       "  END IF;\n"
+                       "  RETURN NULL;\n"
+                       "END;"
+                       "$$ LANGUAGE plpgsql",
+                       func_name, condition);
 
-    db_connection->exec("CREATE TRIGGER \"{}\""
-                        " BEFORE INSERT OR UPDATE"
-                        " ON {}"
-                        " FOR EACH ROW EXECUTE PROCEDURE"
-                        " {}()",
-                        table + "_osm2pgsql_valid",
-                        qualified_name(schema, table), func_name);
+    db_connection.exec("CREATE TRIGGER \"{}\""
+                       " BEFORE INSERT OR UPDATE"
+                       " ON {}"
+                       " FOR EACH ROW EXECUTE PROCEDURE"
+                       " {}()",
+                       table + "_osm2pgsql_valid",
+                       qualified_name(schema, table), func_name);
 }
 
-void drop_geom_check_trigger(pg_conn_t *db_connection,
+void drop_geom_check_trigger(pg_conn_t const &db_connection,
                              std::string const &schema,
                              std::string const &table)
 {
     std::string const func_name =
         qualified_name(schema, table + "_osm2pgsql_valid");
 
-    db_connection->exec(R"(DROP TRIGGER "{}" ON {})",
-                        table + "_osm2pgsql_valid",
-                        qualified_name(schema, table));
+    db_connection.exec(R"(DROP TRIGGER "{}" ON {})", table + "_osm2pgsql_valid",
+                       qualified_name(schema, table));
 
-    db_connection->exec("DROP FUNCTION IF EXISTS {} ()", func_name);
+    db_connection.exec("DROP FUNCTION IF EXISTS {} ()", func_name);
 }
 
 void analyze_table(pg_conn_t const &db_connection, std::string const &schema,
diff --git a/src/pgsql-helper.hpp b/src/pgsql-helper.hpp
index 52f187e14..15a46785d 100644
--- a/src/pgsql-helper.hpp
+++ b/src/pgsql-helper.hpp
@@ -27,12 +27,12 @@ class pg_result_t;
  */
 idlist_t get_ids_from_result(pg_result_t const &result);
 
-void create_geom_check_trigger(pg_conn_t *db_connection,
+void create_geom_check_trigger(pg_conn_t const &db_connection,
                                std::string const &schema,
                                std::string const &table,
                                std::string const &condition);
 
-void drop_geom_check_trigger(pg_conn_t *db_connection,
+void drop_geom_check_trigger(pg_conn_t const &db_connection,
                              std::string const &schema,
                              std::string const &table);
 
diff --git a/src/table.cpp b/src/table.cpp
index 9d148831d..d8f8b446c 100644
--- a/src/table.cpp
+++ b/src/table.cpp
@@ -132,7 +132,7 @@ void table_t::start(std::string const &conninfo, std::string const &table_space)
         m_sql_conn->exec(sql);
 
         if (m_srid != "4326") {
-            create_geom_check_trigger(m_sql_conn.get(), m_target->schema(),
+            create_geom_check_trigger(*m_sql_conn, m_target->schema(),
                                       m_target->name(), "ST_IsValid(NEW.way)");
         }
     }
@@ -188,7 +188,7 @@ void table_t::stop(bool updateable, bool enable_hstore_index,
 
     if (!m_append) {
         if (m_srid != "4326") {
-            drop_geom_check_trigger(m_sql_conn.get(), m_target->schema(),
+            drop_geom_check_trigger(*m_sql_conn, m_target->schema(),
                                     m_target->name());
         }
 
@@ -237,7 +237,7 @@ void table_t::stop(bool updateable, bool enable_hstore_index,
             m_sql_conn->exec("CREATE INDEX ON {} USING BTREE (osm_id) {}",
                              qual_name, tablespace_clause(table_space_index));
             if (m_srid != "4326") {
-                create_geom_check_trigger(m_sql_conn.get(), m_target->schema(),
+                create_geom_check_trigger(*m_sql_conn, m_target->schema(),
                                           m_target->name(),
                                           "ST_IsValid(NEW.way)");
             }

From 0a9e7deeb988a083922eeab8f3813ceb40423907 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 27 Jan 2024 10:34:45 +0100
Subject: [PATCH 063/430] Refactor: Use const ref db connection param instead
 of ptr

In enable_check_trigger()
---
 src/flex-table.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/flex-table.cpp b/src/flex-table.cpp
index a903268e1..f154e02e5 100644
--- a/src/flex-table.cpp
+++ b/src/flex-table.cpp
@@ -249,8 +249,8 @@ void table_connection_t::connect(std::string const &conninfo)
     m_db_connection->exec("SET synchronous_commit = off");
 }
 
-static void
-enable_check_trigger(pg_conn_t *db_connection, flex_table_t const &table)
+static void enable_check_trigger(pg_conn_t const &db_connection,
+                                 flex_table_t const &table)
 {
     std::string checks;
 
@@ -269,7 +269,7 @@ enable_check_trigger(pg_conn_t *db_connection, flex_table_t const &table)
     // remove last " AND "
     checks.resize(checks.size() - 5);
 
-    create_geom_check_trigger(*db_connection, table.schema(), table.name(),
+    create_geom_check_trigger(db_connection, table.schema(), table.name(),
                               checks);
 }
 
@@ -291,7 +291,7 @@ void table_connection_t::start(bool append)
                                       : flex_table_t::table_type::permanent,
             table().full_name()));
 
-        enable_check_trigger(m_db_connection.get(), table());
+        enable_check_trigger(*m_db_connection, table());
     }
 
     prepare();
@@ -357,7 +357,7 @@ void table_connection_t::stop(bool updateable, bool append)
         m_id_index_created = false;
 
         if (updateable) {
-            enable_check_trigger(m_db_connection.get(), table());
+            enable_check_trigger(*m_db_connection, table());
         }
     }
 

From bcf61b6b674ea0a004a8ac68bd739f5a4244f3b7 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 28 Jan 2024 10:48:24 +0100
Subject: [PATCH 064/430] Update dependency lists for linux distros in
 README.md

Fixes #2126
---
 README.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index dd7e65303..84d91cb9b 100644
--- a/README.md
+++ b/README.md
@@ -92,9 +92,10 @@ sudo apt-get install make cmake g++ libboost-dev libboost-system-dev \
 On a Fedora system, use
 
 ```sh
-sudo dnf install cmake make gcc-c++ boost-devel expat-devel zlib-devel \
-  potrace-devel opencv-devel json-devel python3-osmium \
-  bzip2-devel postgresql-devel proj-devel proj-epsg lua-devel pandoc
+sudo dnf install cmake make gcc-c++ libtool boost-devel bzip2-devel \
+  expat-devel fmt-devel json-devel libpq-devel lua-devel zlib-devel \
+  potrace-devel opencv-devel python3-osmium \
+  postgresql-devel proj-devel proj-epsg pandoc
 ```
 
 On RedHat / CentOS first run `sudo yum install epel-release` then install
@@ -117,7 +118,7 @@ On Alpine, use
 
 ```sh
 apk --update-cache add cmake make g++ boost-dev expat-dev \
-  bzip2-dev zlib-dev libpq proj-dev lua5.3-dev postgresql-dev
+  bzip2-dev zlib-dev libpq nlohmann-json proj-dev lua5.3-dev postgresql-dev
 ```
 
 Once dependencies are installed, use CMake to build the Makefiles in a separate

From 46ef18e7d07d33111f89c21b485b0e411385247e Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 31 Jan 2024 15:29:12 +0100
Subject: [PATCH 065/430] Store db connection parameters in a their own class

The connection parameters (such as dbname, user, host, ...) are stored
in their original format and not concatenated into a conninfo string any
more. We are now using a different database connection function from
libpq that takes them in this form. This allows us to get rid of the
code that transforms those parameters into the conninfo string that
takes various forms of connection parameters into account, especially
around the URI form of the connection parameters. The libpq has this
code anyway, see also the last parameter "expand_dbname" of the
PQconnectdbParams() function
(https://www.postgresql.org/docs/current/libpq-connect.html).

This also allow us to have slightly different database connection
parameters for different database connection. This is used here to add
the connection id into the fallback_application_name parameter. This
connection id also reported when using --log-sql. This way you can
correlate the ids from the log with the information shown in
pg_stat_activity.

This commit looks large, because it changes the type std::string to
connection_parameters_t in many places. I have kept the parameter name
"conninfo" in an effort to keep the commit small, the next commit will
change that also.
---
 src/command-line-app.cpp        | 29 +++++++++----
 src/command-line-app.hpp        |  6 +--
 src/command-line-parser.cpp     | 44 +-------------------
 src/db-copy.cpp                 | 10 +++--
 src/db-copy.hpp                 |  6 +--
 src/expire-output.cpp           |  8 ++--
 src/expire-output.hpp           | 10 +++--
 src/flex-table.cpp              |  2 +-
 src/flex-table.hpp              |  2 +-
 src/gen/osm2pgsql-gen.cpp       | 24 ++++++-----
 src/middle-pgsql.cpp            |  6 ++-
 src/middle-pgsql.hpp            |  5 ++-
 src/options.hpp                 | 17 ++------
 src/osmdata.cpp                 |  2 +-
 src/osmdata.hpp                 |  3 +-
 src/output-flex.cpp             |  2 +-
 src/output-gazetteer.hpp        |  1 +
 src/pgsql-params.hpp            | 42 +++++++++++++++++++
 src/pgsql.cpp                   | 29 +++++++++++--
 src/pgsql.hpp                   |  3 +-
 src/properties.cpp              |  2 +-
 src/properties.hpp              |  8 ++--
 src/table.cpp                   |  3 +-
 src/table.hpp                   |  5 ++-
 tests/CMakeLists.txt            |  1 -
 tests/common-pg.hpp             | 19 +++++++--
 tests/test-options-database.cpp | 74 ---------------------------------
 tests/test-properties.cpp       |  2 +-
 28 files changed, 173 insertions(+), 192 deletions(-)
 create mode 100644 src/pgsql-params.hpp
 delete mode 100644 tests/test-options-database.cpp

diff --git a/src/command-line-app.cpp b/src/command-line-app.cpp
index e4247cc48..08d9161e0 100644
--- a/src/command-line-app.cpp
+++ b/src/command-line-app.cpp
@@ -32,29 +32,44 @@ bool command_line_app_t::want_version() const { return count("--version"); }
 
 void command_line_app_t::init_database_options()
 {
-    add_option("-d,--database", m_database_options.db)
+    add_option_function<std::string>("-d,--database",
+                                     [&](std::string const &value) {
+                                         m_connection_params.set("dbname",
+                                                                 value);
+                                     })
         ->description("Database name or PostgreSQL conninfo string.")
         ->type_name("DB")
         ->group("Database options");
 
-    add_option("-U,--user", m_database_options.username)
+    add_option_function<std::string>("-U,--user",
+                                     [&](std::string const &value) {
+                                         m_connection_params.set("user", value);
+                                     })
         ->description("Database user.")
         ->type_name("USERNAME")
         ->group("Database options");
 
-    add_flag_function(
-        "-W,--password",
-        [&](int64_t) { m_database_options.password = util::get_password(); })
+    add_flag_function("-W,--password",
+                      [&](int64_t) {
+                          m_connection_params.set("password",
+                                                  util::get_password());
+                      })
         ->description("Force password prompt.")
         ->group("Database options");
 
-    add_option("-H,--host", m_database_options.host)
+    add_option_function<std::string>("-H,--host",
+                                     [&](std::string const &value) {
+                                         m_connection_params.set("host", value);
+                                     })
         ->description(
             "Database server hostname or unix domain socket location.")
         ->type_name("HOST")
         ->group("Database options");
 
-    add_option("-P,--port", m_database_options.port)
+    add_option_function<std::string>("-P,--port",
+                                     [&](std::string const &value) {
+                                         m_connection_params.set("port", value);
+                                     })
         ->description("Database server port.")
         ->type_name("PORT")
         ->group("Database options");
diff --git a/src/command-line-app.hpp b/src/command-line-app.hpp
index 7dc5202ad..11a9eef08 100644
--- a/src/command-line-app.hpp
+++ b/src/command-line-app.hpp
@@ -26,13 +26,13 @@ class command_line_app_t : public CLI::App
 
     bool want_version() const;
 
-    database_options_t database_options() const noexcept
+    connection_params_t connection_params() const noexcept
     {
-        return m_database_options;
+        return m_connection_params;
     }
 
 private:
-    database_options_t m_database_options;
+    connection_params_t m_connection_params;
 
     void init_database_options();
     void init_logging_options();
diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index f9759f0e0..bc391997b 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -32,48 +32,6 @@
 #include <stdexcept>
 #include <thread> // for number of threads
 
-static bool compare_prefix(std::string const &str,
-                           std::string const &prefix) noexcept
-{
-    return std::strncmp(str.c_str(), prefix.c_str(), prefix.size()) == 0;
-}
-
-std::string build_conninfo(database_options_t const &opt)
-{
-    if (compare_prefix(opt.db, "postgresql://") ||
-        compare_prefix(opt.db, "postgres://")) {
-        return opt.db;
-    }
-
-    util::string_joiner_t joiner{' '};
-    joiner.add("fallback_application_name='osm2pgsql'");
-
-    if (std::strchr(opt.db.c_str(), '=') != nullptr) {
-        joiner.add(opt.db);
-        return joiner();
-    }
-
-    joiner.add("client_encoding='UTF8'");
-
-    if (!opt.db.empty()) {
-        joiner.add(fmt::format("dbname='{}'", opt.db));
-    }
-    if (!opt.username.empty()) {
-        joiner.add(fmt::format("user='{}'", opt.username));
-    }
-    if (!opt.password.empty()) {
-        joiner.add(fmt::format("password='{}'", opt.password));
-    }
-    if (!opt.host.empty()) {
-        joiner.add(fmt::format("host='{}'", opt.host));
-    }
-    if (!opt.port.empty()) {
-        joiner.add(fmt::format("port='{}'", opt.port));
-    }
-
-    return joiner();
-}
-
 static osmium::Box parse_bbox_param(std::string const &arg)
 {
     double minx = NAN;
@@ -730,7 +688,7 @@ options_t parse_command_line(int argc, char *argv[])
 
     check_options(&options);
 
-    options.conninfo = build_conninfo(app.database_options());
+    options.conninfo = app.connection_params();
 
     if (!options.slim) {
         options.middle_database_format = 0;
diff --git a/src/db-copy.cpp b/src/db-copy.cpp
index d61e386b8..4fd5132f8 100644
--- a/src/db-copy.cpp
+++ b/src/db-copy.cpp
@@ -81,10 +81,11 @@ void db_deleter_by_type_and_id_t::delete_rows(std::string const &table,
     conn->exec(sql.data());
 }
 
-db_copy_thread_t::db_copy_thread_t(std::string const &conninfo)
+db_copy_thread_t::db_copy_thread_t(connection_params_t const &conninfo)
 {
-    // conninfo is captured by copy here, because we don't know wether the
-    // reference will still be valid once we get around to running the thread
+    // Connection params are captured by copy here, because we don't know
+    // whether the reference will still be valid once we get around to running
+    // the thread.
     m_worker = std::thread{thread_t{conninfo, &m_shared}};
 }
 
@@ -119,7 +120,8 @@ void db_copy_thread_t::finish()
     }
 }
 
-db_copy_thread_t::thread_t::thread_t(std::string conninfo, shared *shared)
+db_copy_thread_t::thread_t::thread_t(connection_params_t conninfo,
+                                     shared *shared)
 : m_conninfo(std::move(conninfo)), m_shared(shared)
 {}
 
diff --git a/src/db-copy.hpp b/src/db-copy.hpp
index 563187547..58302c97e 100644
--- a/src/db-copy.hpp
+++ b/src/db-copy.hpp
@@ -249,7 +249,7 @@ struct db_cmd_finish_t : public db_cmd_t
 class db_copy_thread_t
 {
 public:
-    explicit db_copy_thread_t(std::string const &conninfo);
+    explicit db_copy_thread_t(connection_params_t const &conninfo);
 
     db_copy_thread_t(db_copy_thread_t const &) = delete;
     db_copy_thread_t &operator=(db_copy_thread_t const &) = delete;
@@ -290,7 +290,7 @@ class db_copy_thread_t
     class thread_t
     {
     public:
-        thread_t(std::string conninfo, shared *shared);
+        thread_t(connection_params_t conninfo, shared *shared);
 
         void operator()();
 
@@ -300,7 +300,7 @@ class db_copy_thread_t
         void finish_copy();
         void delete_rows(db_cmd_copy_t *buffer);
 
-        std::string m_conninfo;
+        connection_params_t m_conninfo;
         std::unique_ptr<pg_conn_t> m_conn;
 
         // Target for copy operation currently ongoing.
diff --git a/src/expire-output.cpp b/src/expire-output.cpp
index 41b7a0c34..911b23a0f 100644
--- a/src/expire-output.cpp
+++ b/src/expire-output.cpp
@@ -17,7 +17,7 @@
 #include <system_error>
 
 std::size_t expire_output_t::output(quadkey_list_t const &tile_list,
-                                    std::string const &conninfo) const
+                                    connection_params_t const &conninfo) const
 {
     std::size_t num = 0;
     if (!m_filename.empty()) {
@@ -51,9 +51,9 @@ std::size_t expire_output_t::output_tiles_to_file(
     return count;
 }
 
-std::size_t
-expire_output_t::output_tiles_to_table(quadkey_list_t const &tiles_at_maxzoom,
-                                       std::string const &conninfo) const
+std::size_t expire_output_t::output_tiles_to_table(
+    quadkey_list_t const &tiles_at_maxzoom,
+    connection_params_t const &conninfo) const
 {
     auto const qn = qualified_name(m_schema, m_table);
 
diff --git a/src/expire-output.hpp b/src/expire-output.hpp
index 8fa4d5e6a..28416b6dd 100644
--- a/src/expire-output.hpp
+++ b/src/expire-output.hpp
@@ -18,6 +18,7 @@
 #include <utility>
 
 class pg_conn_t;
+class connection_params_t;
 
 /**
  * Output for tile expiry.
@@ -52,7 +53,7 @@ class expire_output_t
     void set_maxzoom(uint32_t maxzoom) noexcept { m_maxzoom = maxzoom; }
 
     std::size_t output(quadkey_list_t const &tile_list,
-                       std::string const &conninfo) const;
+                       connection_params_t const &conninfo) const;
 
     /**
      * Write the list of tiles to a file.
@@ -66,10 +67,11 @@ class expire_output_t
      * Write the list of tiles to a database table.
      *
      * \param tiles_at_maxzoom The list of tiles at maximum zoom level
-     * \param conninfo database connection info
+     * \param conninfo Database connection parameters
      */
-    std::size_t output_tiles_to_table(quadkey_list_t const &tiles_at_maxzoom,
-                                      std::string const &conninfo) const;
+    std::size_t
+    output_tiles_to_table(quadkey_list_t const &tiles_at_maxzoom,
+                          connection_params_t const &conninfo) const;
 
     /**
      * Create table for tiles.
diff --git a/src/flex-table.cpp b/src/flex-table.cpp
index f154e02e5..940e9779f 100644
--- a/src/flex-table.cpp
+++ b/src/flex-table.cpp
@@ -241,7 +241,7 @@ bool flex_table_t::has_columns_with_expire() const noexcept
                        [](auto const &column) { return column.has_expire(); });
 }
 
-void table_connection_t::connect(std::string const &conninfo)
+void table_connection_t::connect(connection_params_t const &conninfo)
 {
     assert(!m_db_connection);
 
diff --git a/src/flex-table.hpp b/src/flex-table.hpp
index 70481db5a..bdfe09ccf 100644
--- a/src/flex-table.hpp
+++ b/src/flex-table.hpp
@@ -259,7 +259,7 @@ class table_connection_t
     {
     }
 
-    void connect(std::string const &conninfo);
+    void connect(connection_params_t const &conninfo);
 
     void start(bool append);
 
diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index aff975cb4..d63f9687c 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -195,8 +195,9 @@ class tile_processor_t
     std::size_t m_num_tiles;
 };
 
-void run_tile_gen(std::string const &conninfo, gen_base_t *master_generalizer,
-                  params_t params, uint32_t zoom,
+void run_tile_gen(connection_params_t const &conninfo,
+                  gen_base_t *master_generalizer, params_t params,
+                  uint32_t zoom,
                   std::vector<std::pair<uint32_t, uint32_t>> *queue,
                   std::mutex *mut, unsigned int n)
 {
@@ -231,9 +232,9 @@ void run_tile_gen(std::string const &conninfo, gen_base_t *master_generalizer,
 class genproc_t
 {
 public:
-    genproc_t(std::string const &filename, std::string conninfo,
-              std::string dbschema, bool append, bool updatable,
-              uint32_t jobs);
+    genproc_t(std::string const &filename,
+              connection_params_t conninfo, std::string dbschema,
+              bool append, bool updatable, uint32_t jobs);
 
     int app_define_table()
     {
@@ -512,7 +513,7 @@ class genproc_t
     std::vector<flex_table_t> m_tables;
     std::vector<expire_output_t> m_expire_outputs;
 
-    std::string m_conninfo;
+    connection_params_t m_conninfo;
     std::string m_dbschema;
     uint32_t m_jobs;
     bool m_append;
@@ -524,7 +525,7 @@ TRAMPOLINE(app_define_expire_output, define_expire_output)
 TRAMPOLINE(app_run_gen, run_gen)
 TRAMPOLINE(app_run_sql, run_sql)
 
-genproc_t::genproc_t(std::string const &filename, std::string conninfo,
+genproc_t::genproc_t(std::string const &filename, connection_params_t conninfo,
                      std::string dbschema, bool append, bool updatable,
                      uint32_t jobs)
 : m_conninfo(std::move(conninfo)), m_dbschema(std::move(dbschema)),
@@ -694,15 +695,15 @@ int main(int argc, char *argv[])
                 jobs);
         }
 
-        auto const conninfo = build_conninfo(app.database_options());
+        auto const connection_params = app.connection_params();
 
         log_debug("Checking database capabilities...");
         {
-            pg_conn_t const db_connection{conninfo};
+            pg_conn_t const db_connection{connection_params};
             init_database_capabilities(db_connection);
         }
 
-        properties_t properties{conninfo, middle_dbschema};
+        properties_t properties{connection_params, middle_dbschema};
         properties.load();
 
         if (style.empty()) {
@@ -719,7 +720,8 @@ int main(int argc, char *argv[])
         }
 
         bool const updatable = properties.get_bool("updatable", false);
-        genproc_t gen{style, conninfo, dbschema, append, updatable, jobs};
+        genproc_t gen{style,  connection_params, dbschema,
+                      append, updatable,         jobs};
         gen.run();
 
         osmium::MemoryUsage const mem;
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index b6f367816..bad1595b9 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -159,7 +159,8 @@ void middle_pgsql_t::table_desc::drop_table(
              util::human_readable_duration(timer.stop()));
 }
 
-void middle_pgsql_t::table_desc::build_index(std::string const &conninfo) const
+void middle_pgsql_t::table_desc::build_index(
+    connection_params_t const &conninfo) const
 {
     if (m_create_fw_dep_indexes.empty()) {
         return;
@@ -1295,7 +1296,8 @@ void middle_pgsql_t::after_relations()
 }
 
 middle_query_pgsql_t::middle_query_pgsql_t(
-    std::string const &conninfo, std::shared_ptr<node_locations_t> cache,
+    connection_params_t const &conninfo,
+    std::shared_ptr<node_locations_t> cache,
     std::shared_ptr<node_persistent_cache> persistent_cache,
     middle_pgsql_options const &options)
 : m_sql_conn(conninfo), m_cache(std::move(cache)),
diff --git a/src/middle-pgsql.hpp b/src/middle-pgsql.hpp
index 3f81dcd5a..b67183818 100644
--- a/src/middle-pgsql.hpp
+++ b/src/middle-pgsql.hpp
@@ -55,7 +55,8 @@ class middle_query_pgsql_t : public middle_query_t
 {
 public:
     middle_query_pgsql_t(
-        std::string const &conninfo, std::shared_ptr<node_locations_t> cache,
+        connection_params_t const &conninfo,
+        std::shared_ptr<node_locations_t> cache,
         std::shared_ptr<node_persistent_cache> persistent_cache,
         middle_pgsql_options const &options);
 
@@ -150,7 +151,7 @@ struct middle_pgsql_t : public middle_t
         void drop_table(pg_conn_t const &db_connection) const;
 
         ///< Open a new database connection and build index on this table.
-        void build_index(std::string const &conninfo) const;
+        void build_index(connection_params_t const &conninfo) const;
 
         std::string m_create_table;
         std::vector<std::string> m_prepare_queries;
diff --git a/src/options.hpp b/src/options.hpp
index 7b4c63b01..996e889d8 100644
--- a/src/options.hpp
+++ b/src/options.hpp
@@ -10,6 +10,8 @@
  * For a full list of authors see the git log.
  */
 
+#include "pgsql-params.hpp"
+
 #include <osmium/osm/box.hpp>
 
 #include <cstdint>
@@ -37,18 +39,6 @@ enum class hstore_column : char
     all = 2
 };
 
-/// Database connection options.
-struct database_options_t
-{
-    std::string db;
-    std::string username;
-    std::string host;
-    std::string password;
-    std::string port;
-};
-
-std::string build_conninfo(database_options_t const &opt);
-
 /**
  * Structure for storing command-line and other options
  */
@@ -56,7 +46,8 @@ struct options_t
 {
     command_t command = command_t::process;
 
-    std::string conninfo; ///< connection info for database
+    /// Parameters for initializing database connections
+    connection_params_t conninfo;
 
     std::string prefix{"planet_osm"};         ///< prefix for table names
     bool prefix_is_set = false;
diff --git a/src/osmdata.cpp b/src/osmdata.cpp
index c7709e4b2..6ddb261ef 100644
--- a/src/osmdata.cpp
+++ b/src/osmdata.cpp
@@ -171,7 +171,7 @@ namespace {
 class multithreaded_processor
 {
 public:
-    multithreaded_processor(std::string const &conninfo,
+    multithreaded_processor(connection_params_t const &conninfo,
                             std::shared_ptr<middle_t> const &mid,
                             std::shared_ptr<output_t> output,
                             std::size_t thread_count)
diff --git a/src/osmdata.hpp b/src/osmdata.hpp
index 0da8d7f17..8492ec812 100644
--- a/src/osmdata.hpp
+++ b/src/osmdata.hpp
@@ -25,6 +25,7 @@
 
 #include "dependency-manager.hpp"
 #include "osmtypes.hpp"
+#include "pgsql-params.hpp"
 
 class middle_t;
 class output_t;
@@ -79,7 +80,7 @@ class osmdata_t : public osmium::handler::Handler
     std::shared_ptr<middle_t> m_mid;
     std::shared_ptr<output_t> m_output;
 
-    std::string m_conninfo;
+    connection_params_t m_conninfo;
 
     // Bounding box for node import (or invalid Box if everything should be
     // imported).
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 2d2418a4f..1bcddcc7d 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -1231,7 +1231,7 @@ void output_flex_t::start()
 
 static void
 create_expire_tables(std::vector<expire_output_t> const &expire_outputs,
-                     std::string const &conninfo)
+                     connection_params_t const &conninfo)
 {
     if (std::all_of(expire_outputs.begin(), expire_outputs.end(),
                     [](auto const &expire_output) {
diff --git a/src/output-gazetteer.hpp b/src/output-gazetteer.hpp
index a068984a6..0f75a6a6b 100644
--- a/src/output-gazetteer.hpp
+++ b/src/output-gazetteer.hpp
@@ -16,6 +16,7 @@
 #include <osmium/memory/buffer.hpp>
 
 #include "gazetteer-style.hpp"
+#include "options.hpp"
 #include "osmtypes.hpp"
 #include "output.hpp"
 #include "reprojection.hpp"
diff --git a/src/pgsql-params.hpp b/src/pgsql-params.hpp
new file mode 100644
index 000000000..fd0230d96
--- /dev/null
+++ b/src/pgsql-params.hpp
@@ -0,0 +1,42 @@
+#ifndef OSM2PGSQL_PGSQL_PARAMS_HPP
+#define OSM2PGSQL_PGSQL_PARAMS_HPP
+
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+#include "format.hpp"
+
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+
+/**
+ * PostgreSQL connection parameters.
+ */
+class connection_params_t
+{
+public:
+    connection_params_t() { m_params["client_encoding"] = "UTF8"; }
+
+    void set(std::string const &param, std::string const &value)
+    {
+        m_params[param] = value;
+    }
+
+    auto begin() const noexcept { return m_params.begin(); }
+
+    auto end() const noexcept { return m_params.end(); }
+
+private:
+    std::map<std::string, std::string> m_params;
+
+}; // class connection_params_t
+
+#endif // OSM2PGSQL_PGSQL_PARAMS_HPP
diff --git a/src/pgsql.cpp b/src/pgsql.cpp
index 13866bf99..031caf012 100644
--- a/src/pgsql.cpp
+++ b/src/pgsql.cpp
@@ -28,13 +28,36 @@ std::size_t pg_result_t::affected_rows() const noexcept
 
 std::atomic<std::uint32_t> pg_conn_t::connection_id{0};
 
-pg_conn_t::pg_conn_t(std::string const &conninfo)
-: m_conn(PQconnectdb(conninfo.c_str())),
-  m_connection_id(connection_id.fetch_add(1))
+static PGconn *open_connection(connection_params_t const &connection_params,
+                               std::uint32_t id)
 {
+    std::vector<char const *> keywords;
+    std::vector<char const *> values;
+
+    for (auto const &[k, v] : connection_params) {
+        keywords.push_back(k.c_str());
+        values.push_back(v.c_str());
+    }
+
+    std::string const app_name{fmt::format("osm2pgsql/C{}", id)};
+    keywords.push_back("fallback_application_name");
+    values.push_back(app_name.c_str());
+
+    keywords.push_back(nullptr);
+    values.push_back(nullptr);
+
+    return PQconnectdbParams(keywords.data(), values.data(), 1);
+}
+
+pg_conn_t::pg_conn_t(connection_params_t const &conninfo)
+: m_connection_id(connection_id.fetch_add(1))
+{
+    m_conn.reset(open_connection(conninfo, m_connection_id));
+
     if (!m_conn) {
         throw std::runtime_error{"Connecting to database failed."};
     }
+
     if (PQstatus(m_conn.get()) != CONNECTION_OK) {
         throw fmt_error("Connecting to database failed: {}.", error_msg());
     }
diff --git a/src/pgsql.hpp b/src/pgsql.hpp
index 9e653fc91..38b9dd445 100644
--- a/src/pgsql.hpp
+++ b/src/pgsql.hpp
@@ -17,6 +17,7 @@
  */
 
 #include "format.hpp"
+#include "pgsql-params.hpp"
 
 #include <libpq-fe.h>
 
@@ -151,7 +152,7 @@ class binary_param : public std::string_view
 class pg_conn_t
 {
 public:
-    explicit pg_conn_t(std::string const &conninfo);
+    explicit pg_conn_t(connection_params_t const &conninfo);
 
     /**
      * Run the specified SQL command.
diff --git a/src/properties.cpp b/src/properties.cpp
index aa154d859..09fbb58af 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -19,7 +19,7 @@
 
 static constexpr char const *const properties_table = "osm2pgsql_properties";
 
-properties_t::properties_t(std::string conninfo, std::string schema)
+properties_t::properties_t(connection_params_t conninfo, std::string schema)
 : m_conninfo(std::move(conninfo)), m_schema(std::move(schema)),
   m_has_properties_table(has_table(m_schema, properties_table))
 {
diff --git a/src/properties.hpp b/src/properties.hpp
index e8324c4c8..3e2339478 100644
--- a/src/properties.hpp
+++ b/src/properties.hpp
@@ -18,6 +18,8 @@
  * configuration consistent between imports and updates.
  */
 
+#include "pgsql-params.hpp"
+
 #include <cstdint>
 #include <map>
 #include <string>
@@ -30,12 +32,12 @@ class properties_t
     /**
      * Create new properties store.
      *
-     * \param conninfo Connection info used to connect to the database.
+     * \param conninfo Parameters used to connect to the database.
      * \param schema The schema used for storing the data,
      *
      * \pre You must have called init_database_capabilities() before this.
      */
-    properties_t(std::string conninfo, std::string schema);
+    properties_t(connection_params_t conninfo, std::string schema);
 
     std::string get_string(std::string const &property,
                            std::string const &default_value) const;
@@ -95,7 +97,7 @@ class properties_t
     std::string table_name() const;
 
     std::map<std::string, std::string> m_properties;
-    std::string m_conninfo;
+    connection_params_t m_conninfo;
     std::string m_schema;
     bool m_has_properties_table;
 
diff --git a/src/table.cpp b/src/table.cpp
index d8f8b446c..9875a125f 100644
--- a/src/table.cpp
+++ b/src/table.cpp
@@ -71,7 +71,8 @@ void table_t::connect()
     m_sql_conn->exec("SET synchronous_commit = off");
 }
 
-void table_t::start(std::string const &conninfo, std::string const &table_space)
+void table_t::start(connection_params_t const &conninfo,
+                    std::string const &table_space)
 {
     if (m_sql_conn) {
         throw fmt_error("{} cannot start, its already started.",
diff --git a/src/table.hpp b/src/table.hpp
index 1b42d7abb..ca97ba073 100644
--- a/src/table.hpp
+++ b/src/table.hpp
@@ -37,7 +37,8 @@ class table_t
     table_t(table_t const &other,
             std::shared_ptr<db_copy_thread_t> const &copy_thread);
 
-    void start(std::string const &conninfo, std::string const &table_space);
+    void start(connection_params_t const &conninfo,
+               std::string const &table_space);
     void stop(bool updateable, bool enable_hstore_index,
               std::string const &table_space_index);
 
@@ -69,7 +70,7 @@ class table_t
 
     void generate_copy_column_list();
 
-    std::string m_conninfo;
+    connection_params_t m_conninfo;
     std::shared_ptr<db_target_descr_t> m_target;
     std::string m_type;
     std::unique_ptr<pg_conn_t> m_sql_conn;
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 099c34a92..5288cce41 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -59,7 +59,6 @@ set_test(test-geom-transform LABELS NoDB)
 set_test(test-json-writer LABELS NoDB)
 set_test(test-middle)
 set_test(test-node-locations LABELS NoDB)
-set_test(test-options-database LABELS NoDB)
 set_test(test-options-parse LABELS NoDB)
 set_test(test-options-projection)
 set_test(test-ordered-index LABELS NoDB)
diff --git a/tests/common-pg.hpp b/tests/common-pg.hpp
index bed23944f..6af7d58bc 100644
--- a/tests/common-pg.hpp
+++ b/tests/common-pg.hpp
@@ -37,7 +37,10 @@ namespace testing::pg {
 class conn_t : public pg_conn_t
 {
 public:
-    conn_t(std::string const &conninfo) : pg_conn_t(conninfo) {}
+    conn_t(connection_params_t const &connection_params)
+    : pg_conn_t(connection_params)
+    {
+    }
 
     std::string result_as_string(std::string const &cmd) const
     {
@@ -100,7 +103,9 @@ class tempdb_t
     tempdb_t() noexcept
     {
         try {
-            conn_t conn{"dbname=postgres"};
+            connection_params_t connection_params;
+            connection_params.set("dbname", "postgres");
+            conn_t conn{connection_params};
 
             m_db_name =
                 fmt::format("osm2pgsql-test-{}-{}", getpid(), time(nullptr));
@@ -138,7 +143,9 @@ class tempdb_t
                 return;
             }
             try {
-                conn_t conn{"dbname=postgres"};
+                connection_params_t connection_params;
+                connection_params.set("dbname", "postgres");
+                conn_t conn{connection_params};
                 conn.exec(R"(DROP DATABASE IF EXISTS "{}")", m_db_name);
             } catch (...) {
                 fprintf(stderr, "DROP DATABASE failed. Ignored.\n");
@@ -148,7 +155,11 @@ class tempdb_t
 
     conn_t connect() const { return conn_t{conninfo()}; }
 
-    std::string conninfo() const { return "dbname=" + m_db_name; }
+    connection_params_t conninfo() const {
+        connection_params_t params;
+        params.set("dbname", m_db_name);
+        return params;
+    }
 
 private:
     std::string m_db_name;
diff --git a/tests/test-options-database.cpp b/tests/test-options-database.cpp
deleted file mode 100644
index 6fd652adb..000000000
--- a/tests/test-options-database.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * SPDX-License-Identifier: GPL-2.0-or-later
- *
- * This file is part of osm2pgsql (https://osm2pgsql.org/).
- *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
- * For a full list of authors see the git log.
- */
-
-#include <catch.hpp>
-
-#include "options.hpp"
-
-/**
- * Tests that the conninfo strings are appropriately generated
- * This test is stricter than it needs to be, as it also cares about order,
- * but the current implementation always uses the same order, and attempting to
- * parse a conninfo string is complex.
- */
-TEST_CASE("Connection info parsing with dbname", "[NoDB]")
-{
-    database_options_t db;
-    CHECK(build_conninfo(db) ==
-          "fallback_application_name='osm2pgsql' client_encoding='UTF8'");
-    db.db = "foo";
-    CHECK(build_conninfo(db) == "fallback_application_name='osm2pgsql' "
-                                "client_encoding='UTF8' dbname='foo'");
-}
-
-TEST_CASE("Connection info parsing with user", "[NoDB]")
-{
-    database_options_t db;
-    db.username = "bar";
-    CHECK(build_conninfo(db) == "fallback_application_name='osm2pgsql' "
-                                "client_encoding='UTF8' user='bar'");
-}
-
-TEST_CASE("Connection info parsing with password", "[NoDB]")
-{
-    database_options_t db;
-    db.password = "bar";
-    CHECK(build_conninfo(db) == "fallback_application_name='osm2pgsql' "
-                                "client_encoding='UTF8' password='bar'");
-}
-
-TEST_CASE("Connection info parsing with host", "[NoDB]")
-{
-    database_options_t db;
-    db.host = "bar";
-    CHECK(build_conninfo(db) == "fallback_application_name='osm2pgsql' "
-                                "client_encoding='UTF8' host='bar'");
-}
-
-TEST_CASE("Connection info parsing with port", "[NoDB]")
-{
-    database_options_t db;
-    db.port = "bar";
-    CHECK(build_conninfo(db) == "fallback_application_name='osm2pgsql' "
-                                "client_encoding='UTF8' port='bar'");
-}
-
-TEST_CASE("Connection info parsing with complete info", "[NoDB]")
-{
-    database_options_t db;
-    db.db = "foo";
-    db.username = "bar";
-    db.password = "baz";
-    db.host = "bzz";
-    db.port = "123";
-    CHECK(build_conninfo(db) ==
-          "fallback_application_name='osm2pgsql' client_encoding='UTF8' "
-          "dbname='foo' "
-          "user='bar' password='baz' host='bzz' port='123'");
-}
diff --git a/tests/test-properties.cpp b/tests/test-properties.cpp
index b35ccb0fa..0d925c124 100644
--- a/tests/test-properties.cpp
+++ b/tests/test-properties.cpp
@@ -15,7 +15,7 @@
 
 TEST_CASE("Store and retrieve properties (memory only)")
 {
-    properties_t properties{"", "public"};
+    properties_t properties{connection_params_t{}, "public"};
 
     properties.set_string("foo", "firstvalue");
     properties.set_string("foo", "bar"); // overwriting is okay

From abd65546362114d99aac2ce20733a4ca2dc20b6f Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 1 Feb 2024 10:27:24 +0100
Subject: [PATCH 066/430] Rename conninfo to connection_params everywhere

This is really part of the previous commit but was factored out to keep
that one reasonably legible.
---
 src/command-line-parser.cpp   |  2 +-
 src/db-copy.cpp               | 10 +++++-----
 src/db-copy.hpp               |  6 +++---
 src/expire-output.cpp         | 11 ++++++-----
 src/expire-output.hpp         |  6 +++---
 src/flex-table.cpp            |  4 ++--
 src/flex-table.hpp            |  2 +-
 src/gen/osm2pgsql-gen.cpp     | 27 +++++++++++++++------------
 src/middle-pgsql.cpp          | 17 +++++++++--------
 src/middle-pgsql.hpp          |  4 ++--
 src/options.hpp               |  2 +-
 src/osm2pgsql.cpp             |  5 +++--
 src/osmdata.cpp               | 10 ++++++----
 src/osmdata.hpp               |  2 +-
 src/output-flex.cpp           | 17 +++++++++--------
 src/output-gazetteer.cpp      |  2 +-
 src/output-gazetteer.hpp      |  2 +-
 src/output-pgsql.cpp          |  6 ++++--
 src/pgsql.cpp                 |  4 ++--
 src/pgsql.hpp                 |  2 +-
 src/properties.cpp            | 12 +++++++-----
 src/properties.hpp            |  6 +++---
 src/table.cpp                 | 10 +++++-----
 src/table.hpp                 |  4 ++--
 tests/common-import.hpp       |  4 ++--
 tests/common-options.hpp      |  2 +-
 tests/common-pg.hpp           |  4 ++--
 tests/test-db-copy-mgr.cpp    | 16 ++++++++--------
 tests/test-db-copy-thread.cpp |  4 ++--
 tests/test-properties.cpp     | 12 ++++++------
 30 files changed, 114 insertions(+), 101 deletions(-)

diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index bc391997b..61bbc5494 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -688,7 +688,7 @@ options_t parse_command_line(int argc, char *argv[])
 
     check_options(&options);
 
-    options.conninfo = app.connection_params();
+    options.connection_params = app.connection_params();
 
     if (!options.slim) {
         options.middle_database_format = 0;
diff --git a/src/db-copy.cpp b/src/db-copy.cpp
index 4fd5132f8..3a63a8587 100644
--- a/src/db-copy.cpp
+++ b/src/db-copy.cpp
@@ -81,12 +81,12 @@ void db_deleter_by_type_and_id_t::delete_rows(std::string const &table,
     conn->exec(sql.data());
 }
 
-db_copy_thread_t::db_copy_thread_t(connection_params_t const &conninfo)
+db_copy_thread_t::db_copy_thread_t(connection_params_t const &connection_params)
 {
     // Connection params are captured by copy here, because we don't know
     // whether the reference will still be valid once we get around to running
     // the thread.
-    m_worker = std::thread{thread_t{conninfo, &m_shared}};
+    m_worker = std::thread{thread_t{connection_params, &m_shared}};
 }
 
 db_copy_thread_t::~db_copy_thread_t() { finish(); }
@@ -120,15 +120,15 @@ void db_copy_thread_t::finish()
     }
 }
 
-db_copy_thread_t::thread_t::thread_t(connection_params_t conninfo,
+db_copy_thread_t::thread_t::thread_t(connection_params_t connection_params,
                                      shared *shared)
-: m_conninfo(std::move(conninfo)), m_shared(shared)
+: m_connection_params(std::move(connection_params)), m_shared(shared)
 {}
 
 void db_copy_thread_t::thread_t::operator()()
 {
     try {
-        m_conn = std::make_unique<pg_conn_t>(m_conninfo);
+        m_conn = std::make_unique<pg_conn_t>(m_connection_params);
 
         // Let commits happen faster by delaying when they actually occur.
         m_conn->exec("SET synchronous_commit = off");
diff --git a/src/db-copy.hpp b/src/db-copy.hpp
index 58302c97e..5ab4b56fa 100644
--- a/src/db-copy.hpp
+++ b/src/db-copy.hpp
@@ -249,7 +249,7 @@ struct db_cmd_finish_t : public db_cmd_t
 class db_copy_thread_t
 {
 public:
-    explicit db_copy_thread_t(connection_params_t const &conninfo);
+    explicit db_copy_thread_t(connection_params_t const &connection_params);
 
     db_copy_thread_t(db_copy_thread_t const &) = delete;
     db_copy_thread_t &operator=(db_copy_thread_t const &) = delete;
@@ -290,7 +290,7 @@ class db_copy_thread_t
     class thread_t
     {
     public:
-        thread_t(connection_params_t conninfo, shared *shared);
+        thread_t(connection_params_t connection_params, shared *shared);
 
         void operator()();
 
@@ -300,7 +300,7 @@ class db_copy_thread_t
         void finish_copy();
         void delete_rows(db_cmd_copy_t *buffer);
 
-        connection_params_t m_conninfo;
+        connection_params_t m_connection_params;
         std::unique_ptr<pg_conn_t> m_conn;
 
         // Target for copy operation currently ongoing.
diff --git a/src/expire-output.cpp b/src/expire-output.cpp
index 911b23a0f..ddcc36931 100644
--- a/src/expire-output.cpp
+++ b/src/expire-output.cpp
@@ -16,15 +16,16 @@
 
 #include <system_error>
 
-std::size_t expire_output_t::output(quadkey_list_t const &tile_list,
-                                    connection_params_t const &conninfo) const
+std::size_t
+expire_output_t::output(quadkey_list_t const &tile_list,
+                        connection_params_t const &connection_params) const
 {
     std::size_t num = 0;
     if (!m_filename.empty()) {
         num = output_tiles_to_file(tile_list);
     }
     if (!m_table.empty()) {
-        num = output_tiles_to_table(tile_list, conninfo);
+        num = output_tiles_to_table(tile_list, connection_params);
     }
     return num;
 }
@@ -53,11 +54,11 @@ std::size_t expire_output_t::output_tiles_to_file(
 
 std::size_t expire_output_t::output_tiles_to_table(
     quadkey_list_t const &tiles_at_maxzoom,
-    connection_params_t const &conninfo) const
+    connection_params_t const &connection_params) const
 {
     auto const qn = qualified_name(m_schema, m_table);
 
-    pg_conn_t connection{conninfo};
+    pg_conn_t connection{connection_params};
 
     auto const result = connection.exec("SELECT * FROM {} LIMIT 1", qn);
 
diff --git a/src/expire-output.hpp b/src/expire-output.hpp
index 28416b6dd..fc4dba4ad 100644
--- a/src/expire-output.hpp
+++ b/src/expire-output.hpp
@@ -53,7 +53,7 @@ class expire_output_t
     void set_maxzoom(uint32_t maxzoom) noexcept { m_maxzoom = maxzoom; }
 
     std::size_t output(quadkey_list_t const &tile_list,
-                       connection_params_t const &conninfo) const;
+                       connection_params_t const &connection_params) const;
 
     /**
      * Write the list of tiles to a file.
@@ -67,11 +67,11 @@ class expire_output_t
      * Write the list of tiles to a database table.
      *
      * \param tiles_at_maxzoom The list of tiles at maximum zoom level
-     * \param conninfo Database connection parameters
+     * \param connection_params Database connection parameters
      */
     std::size_t
     output_tiles_to_table(quadkey_list_t const &tiles_at_maxzoom,
-                          connection_params_t const &conninfo) const;
+                          connection_params_t const &connection_params) const;
 
     /**
      * Create table for tiles.
diff --git a/src/flex-table.cpp b/src/flex-table.cpp
index 940e9779f..d9d0111d5 100644
--- a/src/flex-table.cpp
+++ b/src/flex-table.cpp
@@ -241,11 +241,11 @@ bool flex_table_t::has_columns_with_expire() const noexcept
                        [](auto const &column) { return column.has_expire(); });
 }
 
-void table_connection_t::connect(connection_params_t const &conninfo)
+void table_connection_t::connect(connection_params_t const &connection_params)
 {
     assert(!m_db_connection);
 
-    m_db_connection = std::make_unique<pg_conn_t>(conninfo);
+    m_db_connection = std::make_unique<pg_conn_t>(connection_params);
     m_db_connection->exec("SET synchronous_commit = off");
 }
 
diff --git a/src/flex-table.hpp b/src/flex-table.hpp
index bdfe09ccf..efbd71122 100644
--- a/src/flex-table.hpp
+++ b/src/flex-table.hpp
@@ -259,7 +259,7 @@ class table_connection_t
     {
     }
 
-    void connect(connection_params_t const &conninfo);
+    void connect(connection_params_t const &connection_params);
 
     void start(bool append);
 
diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index d63f9687c..c974c8ffd 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -195,7 +195,7 @@ class tile_processor_t
     std::size_t m_num_tiles;
 };
 
-void run_tile_gen(connection_params_t const &conninfo,
+void run_tile_gen(connection_params_t const &connection_params,
                   gen_base_t *master_generalizer, params_t params,
                   uint32_t zoom,
                   std::vector<std::pair<uint32_t, uint32_t>> *queue,
@@ -205,7 +205,7 @@ void run_tile_gen(connection_params_t const &conninfo,
 
     log_debug("Started generalizer thread for '{}'.",
               master_generalizer->strategy());
-    pg_conn_t db_connection{conninfo};
+    pg_conn_t db_connection{connection_params};
     std::string const strategy{master_generalizer->strategy()};
     auto generalizer = create_generalizer(strategy, &db_connection, &params);
 
@@ -233,7 +233,7 @@ class genproc_t
 {
 public:
     genproc_t(std::string const &filename,
-              connection_params_t conninfo, std::string dbschema,
+              connection_params_t connection_params, std::string dbschema,
               bool append, bool updatable, uint32_t jobs);
 
     int app_define_table()
@@ -286,7 +286,7 @@ class genproc_t
         write_to_debug_log(params, "Params (config):");
 
         log_debug("Connecting to database...");
-        pg_conn_t db_connection{m_conninfo};
+        pg_conn_t db_connection{m_connection_params};
 
         log_debug("Creating generalizer...");
         auto generalizer =
@@ -368,7 +368,7 @@ class genproc_t
             queries.emplace_back("COMMIT");
         }
 
-        pg_conn_t const db_connection{m_conninfo};
+        pg_conn_t const db_connection{m_connection_params};
 
         if (m_append && !if_has_rows.empty()) {
             auto const result = db_connection.exec(if_has_rows);
@@ -496,8 +496,9 @@ class genproc_t
             for (unsigned int n = 1;
                  n <= std::min(m_jobs, static_cast<uint32_t>(tile_list.size()));
                  ++n) {
-                threads.emplace_back(run_tile_gen, m_conninfo, generalizer,
-                                     params, zoom, &tile_list, &mut, n);
+                threads.emplace_back(run_tile_gen, m_connection_params,
+                                     generalizer, params, zoom, &tile_list,
+                                     &mut, n);
             }
             for (auto &t : threads) {
                 t.join();
@@ -513,7 +514,7 @@ class genproc_t
     std::vector<flex_table_t> m_tables;
     std::vector<expire_output_t> m_expire_outputs;
 
-    connection_params_t m_conninfo;
+    connection_params_t m_connection_params;
     std::string m_dbschema;
     uint32_t m_jobs;
     bool m_append;
@@ -525,11 +526,13 @@ TRAMPOLINE(app_define_expire_output, define_expire_output)
 TRAMPOLINE(app_run_gen, run_gen)
 TRAMPOLINE(app_run_sql, run_sql)
 
-genproc_t::genproc_t(std::string const &filename, connection_params_t conninfo,
+genproc_t::genproc_t(std::string const &filename,
+                     connection_params_t connection_params,
                      std::string dbschema, bool append, bool updatable,
                      uint32_t jobs)
-: m_conninfo(std::move(conninfo)), m_dbschema(std::move(dbschema)),
-  m_jobs(jobs), m_append(append), m_updatable(updatable)
+: m_connection_params(std::move(connection_params)),
+  m_dbschema(std::move(dbschema)), m_jobs(jobs), m_append(append),
+  m_updatable(updatable)
 {
     setup_lua_environment(lua_state(), filename, append);
 
@@ -589,7 +592,7 @@ void genproc_t::run()
     }
 
     if (!m_append) {
-        pg_conn_t const db_connection{m_conninfo};
+        pg_conn_t const db_connection{m_connection_params};
         for (auto const &table : m_tables) {
             if (table.id_type() == flex_table_index_type::tile &&
                 (table.always_build_id_index() || m_updatable)) {
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index bad1595b9..b7ba57b53 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -160,7 +160,7 @@ void middle_pgsql_t::table_desc::drop_table(
 }
 
 void middle_pgsql_t::table_desc::build_index(
-    connection_params_t const &conninfo) const
+    connection_params_t const &connection_params) const
 {
     if (m_create_fw_dep_indexes.empty()) {
         return;
@@ -168,7 +168,7 @@ void middle_pgsql_t::table_desc::build_index(
 
     // Use a temporary connection here because we might run in a separate
     // thread context.
-    pg_conn_t const db_connection{conninfo};
+    pg_conn_t const db_connection{connection_params};
 
     log_info("Building index on table '{}'", name());
     for (auto const &query : m_create_fw_dep_indexes) {
@@ -1296,11 +1296,11 @@ void middle_pgsql_t::after_relations()
 }
 
 middle_query_pgsql_t::middle_query_pgsql_t(
-    connection_params_t const &conninfo,
+    connection_params_t const &connection_params,
     std::shared_ptr<node_locations_t> cache,
     std::shared_ptr<node_persistent_cache> persistent_cache,
     middle_pgsql_options const &options)
-: m_sql_conn(conninfo), m_cache(std::move(cache)),
+: m_sql_conn(connection_params), m_cache(std::move(cache)),
   m_persistent_cache(std::move(persistent_cache)), m_store_options(options)
 {
     // Disable JIT and parallel workers as they are known to cause
@@ -1409,7 +1409,7 @@ void middle_pgsql_t::stop()
         // Building the indexes takes time, so do it asynchronously.
         for (auto &table : m_tables) {
             table.task_set(thread_pool().submit(
-                [&]() { table.build_index(m_options->conninfo); }));
+                [&]() { table.build_index(m_options->connection_params); }));
         }
     }
 }
@@ -1649,8 +1649,8 @@ middle_pgsql_t::middle_pgsql_t(std::shared_ptr<thread_pool_t> thread_pool,
 : middle_t(std::move(thread_pool)), m_options(options),
   m_cache(std::make_unique<node_locations_t>(
       static_cast<std::size_t>(options->cache) * 1024UL * 1024UL)),
-  m_db_connection(m_options->conninfo),
-  m_copy_thread(std::make_shared<db_copy_thread_t>(options->conninfo)),
+  m_db_connection(m_options->connection_params),
+  m_copy_thread(std::make_shared<db_copy_thread_t>(options->connection_params)),
   m_db_copy(m_copy_thread), m_append(options->append)
 {
     m_store_options.with_attributes = options->extra_attributes;
@@ -1725,7 +1725,8 @@ middle_pgsql_t::get_query_instance()
     // NOTE: this is thread safe for use in pending async processing only
     // because during that process they are only read from
     auto mid = std::make_unique<middle_query_pgsql_t>(
-        m_options->conninfo, m_cache, m_persistent_cache, m_store_options);
+        m_options->connection_params, m_cache, m_persistent_cache,
+        m_store_options);
 
     // We use a connection per table to enable the use of COPY
     for (auto &table : m_tables) {
diff --git a/src/middle-pgsql.hpp b/src/middle-pgsql.hpp
index b67183818..34403272b 100644
--- a/src/middle-pgsql.hpp
+++ b/src/middle-pgsql.hpp
@@ -55,7 +55,7 @@ class middle_query_pgsql_t : public middle_query_t
 {
 public:
     middle_query_pgsql_t(
-        connection_params_t const &conninfo,
+        connection_params_t const &connection_params,
         std::shared_ptr<node_locations_t> cache,
         std::shared_ptr<node_persistent_cache> persistent_cache,
         middle_pgsql_options const &options);
@@ -151,7 +151,7 @@ struct middle_pgsql_t : public middle_t
         void drop_table(pg_conn_t const &db_connection) const;
 
         ///< Open a new database connection and build index on this table.
-        void build_index(connection_params_t const &conninfo) const;
+        void build_index(connection_params_t const &connection_params) const;
 
         std::string m_create_table;
         std::vector<std::string> m_prepare_queries;
diff --git a/src/options.hpp b/src/options.hpp
index 996e889d8..458927d95 100644
--- a/src/options.hpp
+++ b/src/options.hpp
@@ -47,7 +47,7 @@ struct options_t
     command_t command = command_t::process;
 
     /// Parameters for initializing database connections
-    connection_params_t conninfo;
+    connection_params_t connection_params;
 
     std::string prefix{"planet_osm"};         ///< prefix for table names
     bool prefix_is_set = false;
diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
index 46e0c57d8..209c98f52 100644
--- a/src/osm2pgsql.cpp
+++ b/src/osm2pgsql.cpp
@@ -86,7 +86,7 @@ static file_info run(options_t const &options)
 
 static void check_db(options_t const &options)
 {
-    pg_conn_t const db_connection{options.conninfo};
+    pg_conn_t const db_connection{options.connection_params};
 
     init_database_capabilities(db_connection);
 
@@ -372,7 +372,8 @@ int main(int argc, char *argv[])
 
         check_db(options);
 
-        properties_t properties{options.conninfo, options.middle_dbschema};
+        properties_t properties{options.connection_params,
+                                options.middle_dbschema};
         if (options.append) {
             if (properties.load()) {
                 check_and_update_properties(&properties, &options);
diff --git a/src/osmdata.cpp b/src/osmdata.cpp
index 6ddb261ef..0779a6c8b 100644
--- a/src/osmdata.cpp
+++ b/src/osmdata.cpp
@@ -30,7 +30,7 @@ osmdata_t::osmdata_t(std::unique_ptr<dependency_manager_t> dependency_manager,
                      std::shared_ptr<middle_t> mid,
                      std::shared_ptr<output_t> output, options_t const &options)
 : m_dependency_manager(std::move(dependency_manager)), m_mid(std::move(mid)),
-  m_output(std::move(output)), m_conninfo(options.conninfo),
+  m_output(std::move(output)), m_connection_params(options.connection_params),
   m_bbox(options.bbox), m_num_procs(options.num_procs),
   m_append(options.append), m_droptemp(options.droptemp),
   m_with_extra_attrs(options.extra_attributes),
@@ -171,7 +171,7 @@ namespace {
 class multithreaded_processor
 {
 public:
-    multithreaded_processor(connection_params_t const &conninfo,
+    multithreaded_processor(connection_params_t const &connection_params,
                             std::shared_ptr<middle_t> const &mid,
                             std::shared_ptr<output_t> output,
                             std::size_t thread_count)
@@ -183,7 +183,8 @@ class multithreaded_processor
         // For each thread we create a clone of the output.
         for (std::size_t i = 0; i < thread_count; ++i) {
             auto const midq = mid->get_query_instance();
-            auto copy_thread = std::make_shared<db_copy_thread_t>(conninfo);
+            auto copy_thread =
+                std::make_shared<db_copy_thread_t>(connection_params);
             m_clones.push_back(m_output->clone(midq, copy_thread));
         }
     }
@@ -350,7 +351,8 @@ class multithreaded_processor
 
 void osmdata_t::process_dependents() const
 {
-    multithreaded_processor proc{m_conninfo, m_mid, m_output, m_num_procs};
+    multithreaded_processor proc{m_connection_params, m_mid, m_output,
+                                 m_num_procs};
 
     // stage 1b processing: process parents of changed objects
     if (m_dependency_manager->has_pending()) {
diff --git a/src/osmdata.hpp b/src/osmdata.hpp
index 8492ec812..78b6ddee1 100644
--- a/src/osmdata.hpp
+++ b/src/osmdata.hpp
@@ -80,7 +80,7 @@ class osmdata_t : public osmium::handler::Handler
     std::shared_ptr<middle_t> m_mid;
     std::shared_ptr<output_t> m_output;
 
-    connection_params_t m_conninfo;
+    connection_params_t m_connection_params;
 
     // Bounding box for node import (or invalid Box if everything should be
     // imported).
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 1bcddcc7d..7ead87e24 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -1086,8 +1086,9 @@ void output_flex_t::stop()
         if (!m_expire_tiles[i].empty()) {
             auto const &eo = (*m_expire_outputs)[i];
 
-            std::size_t const count = eo.output(m_expire_tiles[i].get_tiles(),
-                                                get_options()->conninfo);
+            std::size_t const count =
+                eo.output(m_expire_tiles[i].get_tiles(),
+                          get_options()->connection_params);
 
             log_info("Wrote {} entries to expire output [{}].", count, i);
         }
@@ -1224,14 +1225,14 @@ void output_flex_t::relation_modify(osmium::Relation const &rel)
 void output_flex_t::start()
 {
     for (auto &table : m_table_connections) {
-        table.connect(get_options()->conninfo);
+        table.connect(get_options()->connection_params);
         table.start(get_options()->append);
     }
 }
 
 static void
 create_expire_tables(std::vector<expire_output_t> const &expire_outputs,
-                     connection_params_t const &conninfo)
+                     connection_params_t const &connection_params)
 {
     if (std::all_of(expire_outputs.begin(), expire_outputs.end(),
                     [](auto const &expire_output) {
@@ -1240,7 +1241,7 @@ create_expire_tables(std::vector<expire_output_t> const &expire_outputs,
         return;
     }
 
-    pg_conn_t const connection{conninfo};
+    pg_conn_t const connection{connection_params};
     for (auto const &expire_output : expire_outputs) {
         if (!expire_output.table().empty()) {
             expire_output.create_output_table(connection);
@@ -1261,7 +1262,7 @@ output_flex_t::output_flex_t(output_flex_t const *other,
 {
     for (auto &table : *m_tables) {
         auto &tc = m_table_connections.emplace_back(&table, m_copy_thread);
-        tc.connect(get_options()->conninfo);
+        tc.connect(get_options()->connection_params);
         tc.prepare();
     }
 
@@ -1282,7 +1283,7 @@ output_flex_t::output_flex_t(std::shared_ptr<middle_query_t> const &mid,
                              std::shared_ptr<thread_pool_t> thread_pool,
                              options_t const &options)
 : output_t(mid, std::move(thread_pool), options),
-  m_copy_thread(std::make_shared<db_copy_thread_t>(options.conninfo))
+  m_copy_thread(std::make_shared<db_copy_thread_t>(options.connection_params))
 {
     init_lua(options.style);
 
@@ -1331,7 +1332,7 @@ output_flex_t::output_flex_t(std::shared_ptr<middle_query_t> const &mid,
                                     reprojection::create_projection(3857));
     }
 
-    create_expire_tables(*m_expire_outputs, get_options()->conninfo);
+    create_expire_tables(*m_expire_outputs, get_options()->connection_params);
 }
 
 /**
diff --git a/src/output-gazetteer.cpp b/src/output-gazetteer.cpp
index 044bbbdbe..da41974f5 100644
--- a/src/output-gazetteer.cpp
+++ b/src/output-gazetteer.cpp
@@ -49,7 +49,7 @@ void output_gazetteer_t::start()
     if (!get_options()->append) {
         int const srid = get_options()->projection->target_srs();
 
-        pg_conn_t const conn{get_options()->conninfo};
+        pg_conn_t const conn{get_options()->connection_params};
 
         /* Drop any existing table */
         conn.exec("DROP TABLE IF EXISTS place CASCADE");
diff --git a/src/output-gazetteer.hpp b/src/output-gazetteer.hpp
index 0f75a6a6b..6f427d6be 100644
--- a/src/output-gazetteer.hpp
+++ b/src/output-gazetteer.hpp
@@ -35,7 +35,7 @@ class output_gazetteer_t : public output_t
                        std::shared_ptr<thread_pool_t> thread_pool,
                        options_t const &options)
     : output_t(mid, std::move(thread_pool), options),
-      m_copy(std::make_shared<db_copy_thread_t>(options.conninfo)),
+      m_copy(std::make_shared<db_copy_thread_t>(options.connection_params)),
       m_proj(options.projection)
     {
         m_style.load_style(options.style);
diff --git a/src/output-pgsql.cpp b/src/output-pgsql.cpp
index 40fa608db..9f2fc621d 100644
--- a/src/output-pgsql.cpp
+++ b/src/output-pgsql.cpp
@@ -418,7 +418,8 @@ void output_pgsql_t::start()
 {
     for (auto &t : m_tables) {
         //setup the table in postgres
-        t->start(get_options()->conninfo, get_options()->tblsmain_data);
+        t->start(get_options()->connection_params,
+                 get_options()->tblsmain_data);
     }
 }
 
@@ -451,7 +452,8 @@ output_pgsql_t::output_pgsql_t(std::shared_ptr<middle_query_t> const &mid,
 
     m_tagtransform = tagtransform_t::make_tagtransform(&options, exlist);
 
-    auto copy_thread = std::make_shared<db_copy_thread_t>(options.conninfo);
+    auto copy_thread =
+        std::make_shared<db_copy_thread_t>(options.connection_params);
 
     //for each table
     for (std::size_t i = 0; i < m_tables.size(); ++i) {
diff --git a/src/pgsql.cpp b/src/pgsql.cpp
index 031caf012..617470621 100644
--- a/src/pgsql.cpp
+++ b/src/pgsql.cpp
@@ -49,10 +49,10 @@ static PGconn *open_connection(connection_params_t const &connection_params,
     return PQconnectdbParams(keywords.data(), values.data(), 1);
 }
 
-pg_conn_t::pg_conn_t(connection_params_t const &conninfo)
+pg_conn_t::pg_conn_t(connection_params_t const &connection_params)
 : m_connection_id(connection_id.fetch_add(1))
 {
-    m_conn.reset(open_connection(conninfo, m_connection_id));
+    m_conn.reset(open_connection(connection_params, m_connection_id));
 
     if (!m_conn) {
         throw std::runtime_error{"Connecting to database failed."};
diff --git a/src/pgsql.hpp b/src/pgsql.hpp
index 38b9dd445..4774602a8 100644
--- a/src/pgsql.hpp
+++ b/src/pgsql.hpp
@@ -152,7 +152,7 @@ class binary_param : public std::string_view
 class pg_conn_t
 {
 public:
-    explicit pg_conn_t(connection_params_t const &conninfo);
+    explicit pg_conn_t(connection_params_t const &connection_params);
 
     /**
      * Run the specified SQL command.
diff --git a/src/properties.cpp b/src/properties.cpp
index 09fbb58af..393b95db3 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -19,8 +19,10 @@
 
 static constexpr char const *const properties_table = "osm2pgsql_properties";
 
-properties_t::properties_t(connection_params_t conninfo, std::string schema)
-: m_conninfo(std::move(conninfo)), m_schema(std::move(schema)),
+properties_t::properties_t(connection_params_t connection_params,
+                           std::string schema)
+: m_connection_params(std::move(connection_params)),
+  m_schema(std::move(schema)),
   m_has_properties_table(has_table(m_schema, properties_table))
 {
     assert(!m_schema.empty());
@@ -90,7 +92,7 @@ void properties_t::set_string(std::string property, std::string value,
     auto const &inserted = *(r.first);
     log_debug("  Storing {}='{}'", inserted.first, inserted.second);
 
-    pg_conn_t const db_connection{m_conninfo};
+    pg_conn_t const db_connection{m_connection_params};
     db_connection.exec(
         "PREPARE set_property(text, text) AS"
         " INSERT INTO {} (property, value) VALUES ($1, $2)"
@@ -117,7 +119,7 @@ void properties_t::store()
     auto const table = table_name();
 
     log_info("Storing properties to table '{}'.", table);
-    pg_conn_t const db_connection{m_conninfo};
+    pg_conn_t const db_connection{m_connection_params};
 
     if (m_has_properties_table) {
         db_connection.exec("TRUNCATE {}", table);
@@ -151,7 +153,7 @@ bool properties_t::load()
     auto const table = table_name();
     log_info("Loading properties from table '{}'.", table);
 
-    pg_conn_t const db_connection{m_conninfo};
+    pg_conn_t const db_connection{m_connection_params};
     auto const result = db_connection.exec("SELECT * FROM {}", table);
 
     for (int i = 0; i < result.num_tuples(); ++i) {
diff --git a/src/properties.hpp b/src/properties.hpp
index 3e2339478..f8339da9f 100644
--- a/src/properties.hpp
+++ b/src/properties.hpp
@@ -32,12 +32,12 @@ class properties_t
     /**
      * Create new properties store.
      *
-     * \param conninfo Parameters used to connect to the database.
+     * \param connection_params Parameters used to connect to the database.
      * \param schema The schema used for storing the data,
      *
      * \pre You must have called init_database_capabilities() before this.
      */
-    properties_t(connection_params_t conninfo, std::string schema);
+    properties_t(connection_params_t connection_params, std::string schema);
 
     std::string get_string(std::string const &property,
                            std::string const &default_value) const;
@@ -97,7 +97,7 @@ class properties_t
     std::string table_name() const;
 
     std::map<std::string, std::string> m_properties;
-    connection_params_t m_conninfo;
+    connection_params_t m_connection_params;
     std::string m_schema;
     bool m_has_properties_table;
 
diff --git a/src/table.cpp b/src/table.cpp
index 9875a125f..f0d021180 100644
--- a/src/table.cpp
+++ b/src/table.cpp
@@ -45,8 +45,8 @@ table_t::table_t(std::string const &name, std::string type, columns_t columns,
 
 table_t::table_t(table_t const &other,
                  std::shared_ptr<db_copy_thread_t> const &copy_thread)
-: m_conninfo(other.m_conninfo), m_target(other.m_target), m_type(other.m_type),
-  m_srid(other.m_srid), m_append(other.m_append),
+: m_connection_params(other.m_connection_params), m_target(other.m_target),
+  m_type(other.m_type), m_srid(other.m_srid), m_append(other.m_append),
   m_hstore_mode(other.m_hstore_mode), m_columns(other.m_columns),
   m_hstore_columns(other.m_hstore_columns), m_table_space(other.m_table_space),
   m_copy(copy_thread)
@@ -66,12 +66,12 @@ void table_t::sync() { m_copy.sync(); }
 
 void table_t::connect()
 {
-    m_sql_conn = std::make_unique<pg_conn_t>(m_conninfo);
+    m_sql_conn = std::make_unique<pg_conn_t>(m_connection_params);
     //let commits happen faster by delaying when they actually occur
     m_sql_conn->exec("SET synchronous_commit = off");
 }
 
-void table_t::start(connection_params_t const &conninfo,
+void table_t::start(connection_params_t const &connection_params,
                     std::string const &table_space)
 {
     if (m_sql_conn) {
@@ -79,7 +79,7 @@ void table_t::start(connection_params_t const &conninfo,
                         m_target->name());
     }
 
-    m_conninfo = conninfo;
+    m_connection_params = connection_params;
     m_table_space = tablespace_clause(table_space);
 
     connect();
diff --git a/src/table.hpp b/src/table.hpp
index ca97ba073..3cfb8ab4a 100644
--- a/src/table.hpp
+++ b/src/table.hpp
@@ -37,7 +37,7 @@ class table_t
     table_t(table_t const &other,
             std::shared_ptr<db_copy_thread_t> const &copy_thread);
 
-    void start(connection_params_t const &conninfo,
+    void start(connection_params_t const &connection_params,
                std::string const &table_space);
     void stop(bool updateable, bool enable_hstore_index,
               std::string const &table_space_index);
@@ -70,7 +70,7 @@ class table_t
 
     void generate_copy_column_list();
 
-    connection_params_t m_conninfo;
+    connection_params_t m_connection_params;
     std::shared_ptr<db_target_descr_t> m_target;
     std::string m_type;
     std::unique_ptr<pg_conn_t> m_sql_conn;
diff --git a/tests/common-import.hpp b/tests/common-import.hpp
index 35abc1651..9fc7bb325 100644
--- a/tests/common-import.hpp
+++ b/tests/common-import.hpp
@@ -134,7 +134,7 @@ class import_t
                     std::initializer_list<std::string> input_data,
                     std::string const &format = "opl")
     {
-        options.conninfo = m_db.conninfo();
+        options.connection_params = m_db.connection_params();
 
         auto thread_pool = std::make_shared<thread_pool_t>(1U);
         auto middle = create_middle(thread_pool, options);
@@ -173,7 +173,7 @@ class import_t
 
     void run_file(options_t options, char const *file = nullptr)
     {
-        options.conninfo = m_db.conninfo();
+        options.connection_params = m_db.connection_params();
 
         auto thread_pool = std::make_shared<thread_pool_t>(1U);
         auto middle = std::make_shared<middle_ram_t>(thread_pool, &options);
diff --git a/tests/common-options.hpp b/tests/common-options.hpp
index 5a4582eaa..446289a62 100644
--- a/tests/common-options.hpp
+++ b/tests/common-options.hpp
@@ -44,7 +44,7 @@ class opt_t
     opt_t &slim(testing::pg::tempdb_t const &db)
     {
         m_opt.slim = true;
-        m_opt.conninfo = db.conninfo();
+        m_opt.connection_params = db.connection_params();
         return *this;
     }
 
diff --git a/tests/common-pg.hpp b/tests/common-pg.hpp
index 6af7d58bc..2113fd23f 100644
--- a/tests/common-pg.hpp
+++ b/tests/common-pg.hpp
@@ -153,9 +153,9 @@ class tempdb_t
         }
     }
 
-    conn_t connect() const { return conn_t{conninfo()}; }
+    conn_t connect() const { return conn_t{connection_params()}; }
 
-    connection_params_t conninfo() const {
+    connection_params_t connection_params() const {
         connection_params_t params;
         params.set("dbname", m_db_name);
         return params;
diff --git a/tests/test-db-copy-mgr.cpp b/tests/test-db-copy-mgr.cpp
index 2aec343af..ef9df4bfc 100644
--- a/tests/test-db-copy-mgr.cpp
+++ b/tests/test-db-copy-mgr.cpp
@@ -89,7 +89,7 @@ static void check_row(std::vector<std::string> const &row)
 
 TEST_CASE("copy_mgr_t: Insert null")
 {
-    copy_mgr_t mgr{std::make_shared<db_copy_thread_t>(db.conninfo())};
+    copy_mgr_t mgr{std::make_shared<db_copy_thread_t>(db.connection_params())};
 
     auto const t = setup_table("big int8, t text");
 
@@ -109,7 +109,7 @@ TEST_CASE("copy_mgr_t: Insert null")
 
 TEST_CASE("copy_mgr_t: Insert numbers")
 {
-    copy_mgr_t mgr{std::make_shared<db_copy_thread_t>(db.conninfo())};
+    copy_mgr_t mgr{std::make_shared<db_copy_thread_t>(db.connection_params())};
 
     auto const t = setup_table("big int8, small smallint");
 
@@ -119,7 +119,7 @@ TEST_CASE("copy_mgr_t: Insert numbers")
 
 TEST_CASE("copy_mgr_t: Insert strings")
 {
-    copy_mgr_t mgr{std::make_shared<db_copy_thread_t>(db.conninfo())};
+    copy_mgr_t mgr{std::make_shared<db_copy_thread_t>(db.connection_params())};
 
     auto const t = setup_table("s0 text, s1 varchar");
 
@@ -150,7 +150,7 @@ TEST_CASE("copy_mgr_t: Insert strings")
 
 TEST_CASE("copy_mgr_t: Insert int arrays")
 {
-    copy_mgr_t mgr{std::make_shared<db_copy_thread_t>(db.conninfo())};
+    copy_mgr_t mgr{std::make_shared<db_copy_thread_t>(db.connection_params())};
 
     auto const t = setup_table("a int[]");
 
@@ -160,7 +160,7 @@ TEST_CASE("copy_mgr_t: Insert int arrays")
 
 TEST_CASE("copy_mgr_t: Insert string arrays")
 {
-    copy_mgr_t mgr{std::make_shared<db_copy_thread_t>(db.conninfo())};
+    copy_mgr_t mgr{std::make_shared<db_copy_thread_t>(db.connection_params())};
 
     auto const t = setup_table("a text[]");
 
@@ -183,7 +183,7 @@ TEST_CASE("copy_mgr_t: Insert string arrays")
 
 TEST_CASE("copy_mgr_t: Insert hashes")
 {
-    copy_mgr_t mgr{std::make_shared<db_copy_thread_t>(db.conninfo())};
+    copy_mgr_t mgr{std::make_shared<db_copy_thread_t>(db.connection_params())};
 
     auto const t = setup_table("h hstore");
 
@@ -206,7 +206,7 @@ TEST_CASE("copy_mgr_t: Insert hashes")
 
 TEST_CASE("copy_mgr_t: Insert something and roll back")
 {
-    copy_mgr_t mgr{std::make_shared<db_copy_thread_t>(db.conninfo())};
+    copy_mgr_t mgr{std::make_shared<db_copy_thread_t>(db.connection_params())};
 
     auto const t = setup_table("t text");
 
@@ -223,7 +223,7 @@ TEST_CASE("copy_mgr_t: Insert something and roll back")
 TEST_CASE("copy_mgr_t: Insert something, insert more, roll back, insert "
           "something else")
 {
-    copy_mgr_t mgr{std::make_shared<db_copy_thread_t>(db.conninfo())};
+    copy_mgr_t mgr{std::make_shared<db_copy_thread_t>(db.connection_params())};
 
     auto const t = setup_table("t text");
 
diff --git a/tests/test-db-copy-thread.cpp b/tests/test-db-copy-thread.cpp
index 2932817f2..9cfd30c61 100644
--- a/tests/test-db-copy-thread.cpp
+++ b/tests/test-db-copy-thread.cpp
@@ -30,7 +30,7 @@ TEST_CASE("db_copy_thread_t with db_deleter_by_id_t")
     auto const table =
         std::make_shared<db_target_descr_t>("public", "test_copy_thread", "id");
 
-    db_copy_thread_t t(db.conninfo());
+    db_copy_thread_t t{db.connection_params()};
     using cmd_copy_t = db_cmd_copy_delete_t<db_deleter_by_id_t>;
     auto cmd = std::make_unique<cmd_copy_t>(table);
 
@@ -159,7 +159,7 @@ TEST_CASE("db_copy_thread_t with db_deleter_place_t")
     auto table = std::make_shared<db_target_descr_t>(
         "public", "test_copy_thread", "place_id");
 
-    db_copy_thread_t t(db.conninfo());
+    db_copy_thread_t t{db.connection_params()};
     using cmd_copy_t = db_cmd_copy_delete_t<db_deleter_place_t>;
     auto cmd = std::make_unique<cmd_copy_t>(table);
 
diff --git a/tests/test-properties.cpp b/tests/test-properties.cpp
index 0d925c124..1e1aa5b91 100644
--- a/tests/test-properties.cpp
+++ b/tests/test-properties.cpp
@@ -52,7 +52,7 @@ TEST_CASE("Store and retrieve properties (with database)")
         }
 
         {
-            properties_t properties{db.conninfo(), schema};
+            properties_t properties{db.connection_params(), schema};
 
             properties.set_string("foo", "bar");
             properties.set_string("empty", "");
@@ -77,7 +77,7 @@ TEST_CASE("Store and retrieve properties (with database)")
             REQUIRE(conn.get_count(full_table_name,
                                    "property='decide' AND value='true'") == 1);
 
-            properties_t properties{db.conninfo(), schema};
+            properties_t properties{db.connection_params(), schema};
             REQUIRE(properties.load());
 
             REQUIRE(properties.get_string("foo", "baz") == "bar");
@@ -106,7 +106,7 @@ TEST_CASE("Update existing properties in database")
     auto conn = db.connect();
 
     {
-        properties_t properties{db.conninfo(), "public"};
+        properties_t properties{db.connection_params(), "public"};
 
         properties.set_string("a", "xxx");
         properties.set_string("b", "yyy");
@@ -118,7 +118,7 @@ TEST_CASE("Update existing properties in database")
         init_database_capabilities(conn);
         REQUIRE(conn.get_count("osm2pgsql_properties") == 2);
 
-        properties_t properties{db.conninfo(), "public"};
+        properties_t properties{db.connection_params(), "public"};
         REQUIRE(properties.load());
 
         REQUIRE(properties.get_string("a", "def") == "xxx");
@@ -135,7 +135,7 @@ TEST_CASE("Update existing properties in database")
     {
         REQUIRE(conn.get_count("osm2pgsql_properties") == 2);
 
-        properties_t properties{db.conninfo(), "public"};
+        properties_t properties{db.connection_params(), "public"};
         REQUIRE(properties.load());
 
         // only "b" was updated in the database
@@ -150,6 +150,6 @@ TEST_CASE("Load returns false if there are no properties in database")
     auto conn = db.connect();
     init_database_capabilities(conn);
 
-    properties_t properties{db.conninfo(), "public"};
+    properties_t properties{db.connection_params(), "public"};
     REQUIRE_FALSE(properties.load());
 }

From 461b077f9a72c371de4a97b203ec6b1534334350 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 2 Feb 2024 12:14:16 +0100
Subject: [PATCH 067/430] Check more command line options for "compatibility"

Adds some additional checks of the command line options. Adds warnings
for
* options ignored when using "flex" output
* options ignored when using "null" output
* incompatible options setting the output projection

The function `opt->get_name(false, true)` used here returns a string
with all the (short and long) names of a command line option.
---
 src/command-line-parser.cpp | 86 +++++++++++++++++++++++++++++--------
 1 file changed, 68 insertions(+), 18 deletions(-)

diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index 61bbc5494..8a0960bea 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -128,24 +128,46 @@ void print_version()
 #endif
 }
 
-static void check_options(options_t *options)
+static void check_options_output_flex(CLI::App const &app)
 {
-    if (options->append && options->create) {
-        throw std::runtime_error{"--append and --create options can not be "
-                                 "used at the same time!"};
-    }
-
-    if (options->append && !options->slim) {
-        throw std::runtime_error{"--append can only be used with slim mode!"};
+    auto const ignored_options = app.get_options([](CLI::Option const *option) {
+        return option->get_group() == "Pgsql output options" ||
+               option->get_name() == "--tablespace-main-data" ||
+               option->get_name() == "--tablespace-main-index";
+    });
+
+    for (auto const *opt : ignored_options) {
+        if (opt->count()) {
+            log_warn("Ignoring option {} for 'flex' output",
+                     opt->get_name(false, true));
+        }
     }
+}
 
-    if (options->droptemp && !options->slim) {
-        throw std::runtime_error{"--drop only makes sense with --slim."};
+static void check_options_output_null(CLI::App const &app)
+{
+    auto const ignored_options = app.get_options([](CLI::Option const *option) {
+        return option->get_group() == "Pgsql output options" ||
+               option->get_group() == "Expire options" ||
+               option->get_name() == "--style" ||
+               option->get_name() == "--disable-parallel-indexing" ||
+               option->get_name() == "--number-processes";
+    });
+
+    for (auto const *opt : ignored_options) {
+        if (opt->count()) {
+            log_warn("Ignoring option {} for 'null' output",
+                     opt->get_name(false, true));
+        }
     }
+}
 
-    if (options->append && options->middle_database_format != 1) {
-        throw std::runtime_error{
-            "Do not use --middle-database-format with --append."};
+static void check_options_output_pgsql(CLI::App const &app, options_t *options)
+{
+    if (app.count("--latlong") + app.count("--merc") + app.count("--proj") >
+        1) {
+        throw std::runtime_error{"You can only use one of --latlong, -l, "
+                                 "--merc, -m, --proj, and -E"};
     }
 
     if (options->hstore_mode == hstore_column::none &&
@@ -162,6 +184,27 @@ static void check_options(options_t *options)
                  "ignored.");
         options->enable_hstore_index = false;
     }
+}
+
+static void check_options(options_t *options)
+{
+    if (options->append && options->create) {
+        throw std::runtime_error{"--append and --create options can not be "
+                                 "used at the same time!"};
+    }
+
+    if (options->append && !options->slim) {
+        throw std::runtime_error{"--append can only be used with slim mode!"};
+    }
+
+    if (options->droptemp && !options->slim) {
+        throw std::runtime_error{"--drop only makes sense with --slim."};
+    }
+
+    if (options->append && options->middle_database_format != 1) {
+        throw std::runtime_error{
+            "Do not use --middle-database-format with --append."};
+    }
 
     if (options->cache < 0) {
         options->cache = 0;
@@ -202,11 +245,6 @@ static void check_options(options_t *options)
                  "target SRS is not Mercator (EPSG:3857). Expire disabled!");
         options->expire_tiles_zoom = 0;
     }
-
-    if (options->output_backend == "gazetteer") {
-        log_warn(
-            "The 'gazetteer' output is deprecated and will soon be removed.");
-    }
 }
 
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
@@ -646,6 +684,18 @@ options_t parse_command_line(int argc, char *argv[])
         return options;
     }
 
+    if (options.output_backend == "flex") {
+        check_options_output_flex(app);
+    } else if (options.output_backend == "gazetteer") {
+        log_warn(
+            "The 'gazetteer' output is deprecated and will soon be removed.");
+    } else if (options.output_backend == "null") {
+        check_options_output_null(app);
+    } else if (options.output_backend == "pgsql" ||
+               options.output_backend.empty()) {
+        check_options_output_pgsql(app, &options);
+    }
+
     if (options.input_format == "auto") {
         options.input_format.clear();
     }

From 9cbc2218686de05f39f151fefbdbacb70316e426 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 2 Feb 2024 10:14:23 +0100
Subject: [PATCH 068/430] Use different application names for db connection to
 show context

Adds a "context" parameter to database connection setup describing what
this connection is for. This is something like "middle.query" or
"out.pgsql". It will be added to the application name, so querying
pg_stat_activity will show it like "osm2pgsql.middle.query/C2" etc.
---
 src/db-copy.cpp           |  2 +-
 src/expire-output.cpp     |  2 +-
 src/flex-table.cpp        |  3 ++-
 src/gen/osm2pgsql-gen.cpp | 10 +++++-----
 src/middle-pgsql.cpp      |  6 +++---
 src/osm2pgsql.cpp         |  2 +-
 src/output-flex.cpp       |  2 +-
 src/output-gazetteer.cpp  |  2 +-
 src/pgsql.cpp             | 18 ++++++++++--------
 src/pgsql.hpp             |  3 ++-
 src/properties.cpp        |  6 +++---
 src/table.cpp             |  2 +-
 tests/common-pg.hpp       |  2 +-
 13 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/src/db-copy.cpp b/src/db-copy.cpp
index 3a63a8587..2c801c0d7 100644
--- a/src/db-copy.cpp
+++ b/src/db-copy.cpp
@@ -128,7 +128,7 @@ db_copy_thread_t::thread_t::thread_t(connection_params_t connection_params,
 void db_copy_thread_t::thread_t::operator()()
 {
     try {
-        m_conn = std::make_unique<pg_conn_t>(m_connection_params);
+        m_conn = std::make_unique<pg_conn_t>(m_connection_params, "copy");
 
         // Let commits happen faster by delaying when they actually occur.
         m_conn->exec("SET synchronous_commit = off");
diff --git a/src/expire-output.cpp b/src/expire-output.cpp
index ddcc36931..cc4f90465 100644
--- a/src/expire-output.cpp
+++ b/src/expire-output.cpp
@@ -58,7 +58,7 @@ std::size_t expire_output_t::output_tiles_to_table(
 {
     auto const qn = qualified_name(m_schema, m_table);
 
-    pg_conn_t connection{connection_params};
+    pg_conn_t connection{connection_params, "expire"};
 
     auto const result = connection.exec("SELECT * FROM {} LIMIT 1", qn);
 
diff --git a/src/flex-table.cpp b/src/flex-table.cpp
index d9d0111d5..bd808da73 100644
--- a/src/flex-table.cpp
+++ b/src/flex-table.cpp
@@ -245,7 +245,8 @@ void table_connection_t::connect(connection_params_t const &connection_params)
 {
     assert(!m_db_connection);
 
-    m_db_connection = std::make_unique<pg_conn_t>(connection_params);
+    m_db_connection =
+        std::make_unique<pg_conn_t>(connection_params, "out.flex.table");
     m_db_connection->exec("SET synchronous_commit = off");
 }
 
diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index c974c8ffd..9cad4b870 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -205,7 +205,7 @@ void run_tile_gen(connection_params_t const &connection_params,
 
     log_debug("Started generalizer thread for '{}'.",
               master_generalizer->strategy());
-    pg_conn_t db_connection{connection_params};
+    pg_conn_t db_connection{connection_params, "gen.tile"};
     std::string const strategy{master_generalizer->strategy()};
     auto generalizer = create_generalizer(strategy, &db_connection, &params);
 
@@ -286,7 +286,7 @@ class genproc_t
         write_to_debug_log(params, "Params (config):");
 
         log_debug("Connecting to database...");
-        pg_conn_t db_connection{m_connection_params};
+        pg_conn_t db_connection{m_connection_params, "gen.proc"};
 
         log_debug("Creating generalizer...");
         auto generalizer =
@@ -368,7 +368,7 @@ class genproc_t
             queries.emplace_back("COMMIT");
         }
 
-        pg_conn_t const db_connection{m_connection_params};
+        pg_conn_t const db_connection{m_connection_params, "gen.sql"};
 
         if (m_append && !if_has_rows.empty()) {
             auto const result = db_connection.exec(if_has_rows);
@@ -592,7 +592,7 @@ void genproc_t::run()
     }
 
     if (!m_append) {
-        pg_conn_t const db_connection{m_connection_params};
+        pg_conn_t const db_connection{m_connection_params, "gen.index"};
         for (auto const &table : m_tables) {
             if (table.id_type() == flex_table_index_type::tile &&
                 (table.always_build_id_index() || m_updatable)) {
@@ -702,7 +702,7 @@ int main(int argc, char *argv[])
 
         log_debug("Checking database capabilities...");
         {
-            pg_conn_t const db_connection{connection_params};
+            pg_conn_t const db_connection{connection_params, "gen.check"};
             init_database_capabilities(db_connection);
         }
 
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index b7ba57b53..c95bbfca1 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -168,7 +168,7 @@ void middle_pgsql_t::table_desc::build_index(
 
     // Use a temporary connection here because we might run in a separate
     // thread context.
-    pg_conn_t const db_connection{connection_params};
+    pg_conn_t const db_connection{connection_params, "middle.index"};
 
     log_info("Building index on table '{}'", name());
     for (auto const &query : m_create_fw_dep_indexes) {
@@ -1300,7 +1300,7 @@ middle_query_pgsql_t::middle_query_pgsql_t(
     std::shared_ptr<node_locations_t> cache,
     std::shared_ptr<node_persistent_cache> persistent_cache,
     middle_pgsql_options const &options)
-: m_sql_conn(connection_params), m_cache(std::move(cache)),
+: m_sql_conn(connection_params, "middle.query"), m_cache(std::move(cache)),
   m_persistent_cache(std::move(persistent_cache)), m_store_options(options)
 {
     // Disable JIT and parallel workers as they are known to cause
@@ -1649,7 +1649,7 @@ middle_pgsql_t::middle_pgsql_t(std::shared_ptr<thread_pool_t> thread_pool,
 : middle_t(std::move(thread_pool)), m_options(options),
   m_cache(std::make_unique<node_locations_t>(
       static_cast<std::size_t>(options->cache) * 1024UL * 1024UL)),
-  m_db_connection(m_options->connection_params),
+  m_db_connection(m_options->connection_params, "middle.main"),
   m_copy_thread(std::make_shared<db_copy_thread_t>(options->connection_params)),
   m_db_copy(m_copy_thread), m_append(options->append)
 {
diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
index 209c98f52..a0139ab78 100644
--- a/src/osm2pgsql.cpp
+++ b/src/osm2pgsql.cpp
@@ -86,7 +86,7 @@ static file_info run(options_t const &options)
 
 static void check_db(options_t const &options)
 {
-    pg_conn_t const db_connection{options.connection_params};
+    pg_conn_t const db_connection{options.connection_params, "check"};
 
     init_database_capabilities(db_connection);
 
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 7ead87e24..633086222 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -1241,7 +1241,7 @@ create_expire_tables(std::vector<expire_output_t> const &expire_outputs,
         return;
     }
 
-    pg_conn_t const connection{connection_params};
+    pg_conn_t const connection{connection_params, "out.flex.expire"};
     for (auto const &expire_output : expire_outputs) {
         if (!expire_output.table().empty()) {
             expire_output.create_output_table(connection);
diff --git a/src/output-gazetteer.cpp b/src/output-gazetteer.cpp
index da41974f5..bb7ebe356 100644
--- a/src/output-gazetteer.cpp
+++ b/src/output-gazetteer.cpp
@@ -49,7 +49,7 @@ void output_gazetteer_t::start()
     if (!get_options()->append) {
         int const srid = get_options()->projection->target_srs();
 
-        pg_conn_t const conn{get_options()->connection_params};
+        pg_conn_t const conn{get_options()->connection_params, "out.gazetteer"};
 
         /* Drop any existing table */
         conn.exec("DROP TABLE IF EXISTS place CASCADE");
diff --git a/src/pgsql.cpp b/src/pgsql.cpp
index 617470621..bf2615bb0 100644
--- a/src/pgsql.cpp
+++ b/src/pgsql.cpp
@@ -29,7 +29,7 @@ std::size_t pg_result_t::affected_rows() const noexcept
 std::atomic<std::uint32_t> pg_conn_t::connection_id{0};
 
 static PGconn *open_connection(connection_params_t const &connection_params,
-                               std::uint32_t id)
+                               std::string_view context, std::uint32_t id)
 {
     std::vector<char const *> keywords;
     std::vector<char const *> values;
@@ -39,7 +39,7 @@ static PGconn *open_connection(connection_params_t const &connection_params,
         values.push_back(v.c_str());
     }
 
-    std::string const app_name{fmt::format("osm2pgsql/C{}", id)};
+    std::string const app_name{fmt::format("osm2pgsql.{}/C{}", context, id)};
     keywords.push_back("fallback_application_name");
     values.push_back(app_name.c_str());
 
@@ -49,23 +49,25 @@ static PGconn *open_connection(connection_params_t const &connection_params,
     return PQconnectdbParams(keywords.data(), values.data(), 1);
 }
 
-pg_conn_t::pg_conn_t(connection_params_t const &connection_params)
+pg_conn_t::pg_conn_t(connection_params_t const &connection_params,
+                     std::string_view context)
 : m_connection_id(connection_id.fetch_add(1))
 {
-    m_conn.reset(open_connection(connection_params, m_connection_id));
+    m_conn.reset(open_connection(connection_params, context, m_connection_id));
 
     if (!m_conn) {
-        throw std::runtime_error{"Connecting to database failed."};
+        throw fmt_error("Connecting to database failed (context={}).", context);
     }
 
     if (PQstatus(m_conn.get()) != CONNECTION_OK) {
-        throw fmt_error("Connecting to database failed: {}.", error_msg());
+        throw fmt_error("Connecting to database failed (context={}): {}.",
+                        context, error_msg());
     }
 
     if (get_logger().log_sql()) {
         auto const results = exec("SELECT pg_backend_pid()");
-        log_sql("(C{}) New database connection (backend_pid={})",
-                m_connection_id, results.get(0, 0));
+        log_sql("(C{}) New database connection (context={}, backend_pid={})",
+                m_connection_id, context, results.get(0, 0));
     }
 
     // PostgreSQL sends notices in many different contexts which aren't that
diff --git a/src/pgsql.hpp b/src/pgsql.hpp
index 4774602a8..ad3959c1b 100644
--- a/src/pgsql.hpp
+++ b/src/pgsql.hpp
@@ -152,7 +152,8 @@ class binary_param : public std::string_view
 class pg_conn_t
 {
 public:
-    explicit pg_conn_t(connection_params_t const &connection_params);
+    explicit pg_conn_t(connection_params_t const &connection_params,
+                       std::string_view context);
 
     /**
      * Run the specified SQL command.
diff --git a/src/properties.cpp b/src/properties.cpp
index 393b95db3..f443eccca 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -92,7 +92,7 @@ void properties_t::set_string(std::string property, std::string value,
     auto const &inserted = *(r.first);
     log_debug("  Storing {}='{}'", inserted.first, inserted.second);
 
-    pg_conn_t const db_connection{m_connection_params};
+    pg_conn_t const db_connection{m_connection_params, "prop.set"};
     db_connection.exec(
         "PREPARE set_property(text, text) AS"
         " INSERT INTO {} (property, value) VALUES ($1, $2)"
@@ -119,7 +119,7 @@ void properties_t::store()
     auto const table = table_name();
 
     log_info("Storing properties to table '{}'.", table);
-    pg_conn_t const db_connection{m_connection_params};
+    pg_conn_t const db_connection{m_connection_params, "prop.store"};
 
     if (m_has_properties_table) {
         db_connection.exec("TRUNCATE {}", table);
@@ -153,7 +153,7 @@ bool properties_t::load()
     auto const table = table_name();
     log_info("Loading properties from table '{}'.", table);
 
-    pg_conn_t const db_connection{m_connection_params};
+    pg_conn_t const db_connection{m_connection_params, "prop.load"};
     auto const result = db_connection.exec("SELECT * FROM {}", table);
 
     for (int i = 0; i < result.num_tuples(); ++i) {
diff --git a/src/table.cpp b/src/table.cpp
index f0d021180..db5c29c7c 100644
--- a/src/table.cpp
+++ b/src/table.cpp
@@ -66,7 +66,7 @@ void table_t::sync() { m_copy.sync(); }
 
 void table_t::connect()
 {
-    m_sql_conn = std::make_unique<pg_conn_t>(m_connection_params);
+    m_sql_conn = std::make_unique<pg_conn_t>(m_connection_params, "out.pgsql");
     //let commits happen faster by delaying when they actually occur
     m_sql_conn->exec("SET synchronous_commit = off");
 }
diff --git a/tests/common-pg.hpp b/tests/common-pg.hpp
index 2113fd23f..f62842d5f 100644
--- a/tests/common-pg.hpp
+++ b/tests/common-pg.hpp
@@ -38,7 +38,7 @@ class conn_t : public pg_conn_t
 {
 public:
     conn_t(connection_params_t const &connection_params)
-    : pg_conn_t(connection_params)
+    : pg_conn_t(connection_params, "test")
     {
     }
 

From 0ea9a422bc7becefda522236e5b46cec217820c0 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 2 Feb 2024 14:24:42 +0100
Subject: [PATCH 069/430] Pull out checking of expire options into its own
 function

---
 src/command-line-parser.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index 8a0960bea..54bbb42eb 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -225,8 +225,11 @@ static void check_options(options_t *options)
     if (!options->slim && !options->flat_node_file.empty()) {
         log_warn("Ignoring --flat-nodes/-F setting in non-slim mode");
     }
+}
 
-    // zoom level 31 is the technical limit because we use 32-bit integers for the x and y index of a tile ID
+static void check_options_expire(options_t *options) {
+    // Zoom level 31 is the technical limit because we use 32-bit integers for
+    // the x and y index of a tile ID.
     if (options->expire_tiles_zoom_min > 31) {
         options->expire_tiles_zoom_min = 31;
         log_warn("Minimum zoom level for tile expiry is too "
@@ -736,6 +739,8 @@ options_t parse_command_line(int argc, char *argv[])
         options.projection = reprojection::create_projection(PROJ_SPHERE_MERC);
     }
 
+    check_options_expire(&options);
+
     check_options(&options);
 
     options.connection_params = app.connection_params();

From d463a63fbd418c07660031230f714b4ee8a0e685 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 2 Feb 2024 14:52:58 +0100
Subject: [PATCH 070/430] Warnings for command line options only allowed in
 slim mode

---
 src/command-line-parser.cpp | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index 54bbb42eb..11b545d4b 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -27,6 +27,7 @@
 #endif
 
 #include <algorithm>
+#include <array>
 #include <cstdio>
 #include <cstring>
 #include <stdexcept>
@@ -128,6 +129,25 @@ void print_version()
 #endif
 }
 
+static void check_options_non_slim(CLI::App const &app)
+{
+    std::array<std::string, 7> const slim_options = {
+        "--flat-nodes",
+        "--middle-database-format",
+        "--middle-schema",
+        "--middle-with-nodes",
+        "--middle-way-node-index-id-shift",
+        "--tablespace-slim-data",
+        "--tablespace-slim-index"};
+
+    for (auto const &opt : slim_options) {
+        if (app.count(opt) > 0) {
+            log_warn("Ignoring option {}. Can only be used in --slim mode.",
+                     app.get_option(opt)->get_name(false, true));
+        }
+    }
+}
+
 static void check_options_output_flex(CLI::App const &app)
 {
     auto const ignored_options = app.get_options([](CLI::Option const *option) {
@@ -221,10 +241,6 @@ static void check_options(options_t *options)
                      "processing a lot.");
         }
     }
-
-    if (!options->slim && !options->flat_node_file.empty()) {
-        log_warn("Ignoring --flat-nodes/-F setting in non-slim mode");
-    }
 }
 
 static void check_options_expire(options_t *options) {
@@ -687,6 +703,10 @@ options_t parse_command_line(int argc, char *argv[])
         return options;
     }
 
+    if (!options.slim) {
+        check_options_non_slim(app);
+    }
+
     if (options.output_backend == "flex") {
         check_options_output_flex(app);
     } else if (options.output_backend == "gazetteer") {

From dac98d63e95cf65743dc8e237e5217ca4979c480 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 2 Feb 2024 10:47:07 +0100
Subject: [PATCH 071/430] Disable synchronous commit on all connections

This simplifies the code, because we don't have to decide whether to set
this or not on each connection. And it doesn't matter much when setting
this for read-only connections which don't need this.

Setting synchronous_commit = off speeds up writing to the database,
because commis are not delayed until the WAL is written to disk. It
can not lead to corruption of the database.

https://www.postgresql.org/docs/current/runtime-config-wal.html#GUC-SYNCHRONOUS-COMMIT
---
 src/db-copy.cpp    | 3 ---
 src/flex-table.cpp | 1 -
 src/pgsql.cpp      | 5 +++++
 src/table.cpp      | 2 --
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/db-copy.cpp b/src/db-copy.cpp
index 2c801c0d7..a87a78dc6 100644
--- a/src/db-copy.cpp
+++ b/src/db-copy.cpp
@@ -130,9 +130,6 @@ void db_copy_thread_t::thread_t::operator()()
     try {
         m_conn = std::make_unique<pg_conn_t>(m_connection_params, "copy");
 
-        // Let commits happen faster by delaying when they actually occur.
-        m_conn->exec("SET synchronous_commit = off");
-
         // Disable sequential scan on database tables in the copy threads.
         // The copy threads only do COPYs (which are unaffected by this
         // setting) and DELETEs which we know benefit from the index. For
diff --git a/src/flex-table.cpp b/src/flex-table.cpp
index bd808da73..36016d13f 100644
--- a/src/flex-table.cpp
+++ b/src/flex-table.cpp
@@ -247,7 +247,6 @@ void table_connection_t::connect(connection_params_t const &connection_params)
 
     m_db_connection =
         std::make_unique<pg_conn_t>(connection_params, "out.flex.table");
-    m_db_connection->exec("SET synchronous_commit = off");
 }
 
 static void enable_check_trigger(pg_conn_t const &db_connection,
diff --git a/src/pgsql.cpp b/src/pgsql.cpp
index bf2615bb0..5b1637486 100644
--- a/src/pgsql.cpp
+++ b/src/pgsql.cpp
@@ -75,6 +75,11 @@ pg_conn_t::pg_conn_t(connection_params_t const &connection_params,
     if (!get_logger().debug_enabled()) {
         exec("SET client_min_messages = WARNING");
     }
+
+    // Disable synchronous_commit on all connections. For some connections it
+    // might not matter, especially if they read only, but then it doesn't
+    // hurt either.
+    exec("SET synchronous_commit = off");
 }
 
 void pg_conn_t::close()
diff --git a/src/table.cpp b/src/table.cpp
index db5c29c7c..f8de5b091 100644
--- a/src/table.cpp
+++ b/src/table.cpp
@@ -67,8 +67,6 @@ void table_t::sync() { m_copy.sync(); }
 void table_t::connect()
 {
     m_sql_conn = std::make_unique<pg_conn_t>(m_connection_params, "out.pgsql");
-    //let commits happen faster by delaying when they actually occur
-    m_sql_conn->exec("SET synchronous_commit = off");
 }
 
 void table_t::start(connection_params_t const &connection_params,

From ac6008bdf7d25692b796a371f87e67ef3aac5b93 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 27 Jan 2024 15:40:11 +0100
Subject: [PATCH 072/430] Give flex tables a number and use it for prepared
 statements

This way prepared statements are different and we can have several of
them in the same connection. We'll use that in the future.
---
 src/flex-lua-table.cpp      |  3 ++-
 src/flex-table.cpp          | 15 +++++++++------
 src/flex-table.hpp          |  9 +++++++--
 tests/test-flex-indexes.cpp | 22 +++++++++++-----------
 4 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/flex-lua-table.cpp b/src/flex-lua-table.cpp
index d459e170d..a37d1d84e 100644
--- a/src/flex-lua-table.cpp
+++ b/src/flex-lua-table.cpp
@@ -41,7 +41,8 @@ static flex_table_t &create_flex_table(lua_State *lua_state,
         throw fmt_error("Table with name '{}' already exists.", table_name);
     }
 
-    auto &new_table = tables->emplace_back(default_schema, table_name);
+    auto &new_table =
+        tables->emplace_back(default_schema, table_name, tables->size());
 
     lua_pop(lua_state, 1); // "name"
 
diff --git a/src/flex-table.cpp b/src/flex-table.cpp
index 36016d13f..b0f31c2ed 100644
--- a/src/flex-table.cpp
+++ b/src/flex-table.cpp
@@ -167,14 +167,15 @@ std::string flex_table_t::build_sql_prepare_get_wkb() const
 
     if (has_multicolumn_id_index()) {
         return fmt::format(
-            R"(PREPARE get_wkb(char(1), bigint) AS)"
+            R"(PREPARE get_wkb_{}(char(1), bigint) AS)"
             R"( SELECT {} FROM {} WHERE "{}" = $1 AND "{}" = $2)",
-            columns, full_name(), m_columns[0].name(), m_columns[1].name());
+            m_table_num, columns, full_name(), m_columns[0].name(),
+            m_columns[1].name());
     }
 
-    return fmt::format(R"(PREPARE get_wkb(bigint) AS)"
+    return fmt::format(R"(PREPARE get_wkb_{}(bigint) AS)"
                        R"( SELECT {} FROM {} WHERE "{}" = $1)",
-                       columns, full_name(), id_column_names());
+                       m_table_num, columns, full_name(), id_column_names());
 }
 
 std::string
@@ -413,11 +414,13 @@ pg_result_t table_connection_t::get_geoms_by_id(osmium::item_type type,
 {
     assert(table().has_geom_column());
     assert(m_db_connection);
+
+    std::string const stmt = fmt::format("get_wkb_{}", table().num());
     if (table().has_multicolumn_id_index()) {
-        return m_db_connection->exec_prepared_as_binary("get_wkb",
+        return m_db_connection->exec_prepared_as_binary(stmt.c_str(),
                                                         type_to_char(type), id);
     }
-    return m_db_connection->exec_prepared_as_binary("get_wkb", id);
+    return m_db_connection->exec_prepared_as_binary(stmt.c_str(), id);
 }
 
 void table_connection_t::delete_rows_with(osmium::item_type type, osmid_t id)
diff --git a/src/flex-table.hpp b/src/flex-table.hpp
index efbd71122..bfcfd3ccc 100644
--- a/src/flex-table.hpp
+++ b/src/flex-table.hpp
@@ -59,8 +59,8 @@ class flex_table_t
         permanent
     };
 
-    flex_table_t(std::string schema, std::string name)
-    : m_schema(std::move(schema)), m_name(std::move(name))
+    flex_table_t(std::string schema, std::string name, std::size_t num)
+    : m_schema(std::move(schema)), m_name(std::move(name)), m_table_num(num)
     {
     }
 
@@ -197,6 +197,8 @@ class flex_table_t
 
     bool has_columns_with_expire() const noexcept;
 
+    std::size_t num() const noexcept { return m_table_num; }
+
 private:
     /// The schema this table is in
     std::string m_schema;
@@ -230,6 +232,9 @@ class flex_table_t
      */
     std::size_t m_geom_column = std::numeric_limits<std::size_t>::max();
 
+    /// Unique number for each table.
+    std::size_t m_table_num;
+
     /**
      * Type of id stored in this table.
      */
diff --git a/tests/test-flex-indexes.cpp b/tests/test-flex-indexes.cpp
index 609452af7..3bd401b09 100644
--- a/tests/test-flex-indexes.cpp
+++ b/tests/test-flex-indexes.cpp
@@ -48,7 +48,7 @@ TEST_CASE("check index with single column", "[NoDB]")
 {
     test_framework const tf;
 
-    flex_table_t table{"public", "test_table"};
+    flex_table_t table{"public", "test_table", 0};
     table.add_column("geom", "geometry", "");
 
     REQUIRE(table.indexes().empty());
@@ -71,7 +71,7 @@ TEST_CASE("check index with multiple columns", "[NoDB]")
 {
     test_framework const tf;
 
-    flex_table_t table{"public", "test_table"};
+    flex_table_t table{"public", "test_table", 0};
     table.add_column("a", "int", "");
     table.add_column("b", "int", "");
 
@@ -93,7 +93,7 @@ TEST_CASE("check unique index", "[NoDB]")
 {
     test_framework const tf;
 
-    flex_table_t table{"public", "test_table"};
+    flex_table_t table{"public", "test_table", 0};
     table.add_column("col", "int", "");
 
     REQUIRE(tf.run_lua(
@@ -115,7 +115,7 @@ TEST_CASE("check index with tablespace from table", "[NoDB]")
 {
     test_framework const tf;
 
-    flex_table_t table{"public", "test_table"};
+    flex_table_t table{"public", "test_table", 0};
     table.set_index_tablespace("foo");
     table.add_column("col", "int", "");
 
@@ -137,7 +137,7 @@ TEST_CASE("check index with tablespace", "[NoDB]")
 {
     test_framework const tf;
 
-    flex_table_t table{"public", "test_table"};
+    flex_table_t table{"public", "test_table", 0};
     table.add_column("col", "int", "");
 
     REQUIRE(tf.run_lua("return { method = 'btree', column = 'col', tablespace "
@@ -159,7 +159,7 @@ TEST_CASE("check index with expression and where clause", "[NoDB]")
 {
     test_framework const tf;
 
-    flex_table_t table{"public", "test_table"};
+    flex_table_t table{"public", "test_table", 0};
     table.add_column("col", "text", "");
 
     REQUIRE(tf.run_lua("return { method = 'btree', expression = 'lower(col)',"
@@ -181,7 +181,7 @@ TEST_CASE("check index with include", "[NoDB]")
 {
     test_framework const tf;
 
-    flex_table_t table{"public", "test_table"};
+    flex_table_t table{"public", "test_table", 0};
     table.add_column("col", "int", "");
     table.add_column("extra", "int", "");
 
@@ -204,7 +204,7 @@ TEST_CASE("check index with include as array", "[NoDB]")
 {
     test_framework const tf;
 
-    flex_table_t table{"public", "test_table"};
+    flex_table_t table{"public", "test_table", 0};
     table.add_column("col", "int", "");
     table.add_column("extra", "int", "");
 
@@ -227,7 +227,7 @@ TEST_CASE("check index with empty include array", "[NoDB]")
 {
     test_framework const tf;
 
-    flex_table_t table{"public", "test_table"};
+    flex_table_t table{"public", "test_table", 0};
     table.add_column("col", "int", "");
     table.add_column("extra", "int", "");
 
@@ -250,7 +250,7 @@ TEST_CASE("check multiple indexes", "[NoDB]")
 {
     test_framework const tf;
 
-    flex_table_t table{"public", "test_table"};
+    flex_table_t table{"public", "test_table", 0};
     table.add_column("a", "int", "");
     table.add_column("b", "int", "");
 
@@ -273,7 +273,7 @@ TEST_CASE("check various broken index configs", "[NoDB]")
 {
     test_framework const tf;
 
-    flex_table_t table{"public", "test_table"};
+    flex_table_t table{"public", "test_table", 0};
     table.add_column("col", "text", "");
 
     SECTION("empty index description") { REQUIRE(tf.run_lua("return {}")); }

From 974447fb4e417314177f6f7d3e58cb9833e1204c Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 27 Jan 2024 11:59:25 +0100
Subject: [PATCH 073/430] Refactor: Move storage of db connections from flex
 tables to output

Each table of the flex output kept its own database connection in the
table_connection_t class. With this change, the connection is kept
in a vector in the flex output instead.

This is a refactoring step towards using fewer database connections. As
long as each table had its own connection, we can not reduce them, but
if we keep them outside, we will be able to re-use the same connection
for different tables.
---
 src/flex-table.cpp  | 76 ++++++++++++++++++---------------------------
 src/flex-table.hpp  | 22 +++++--------
 src/output-flex.cpp | 34 ++++++++++++++------
 src/output-flex.hpp |  5 +++
 4 files changed, 67 insertions(+), 70 deletions(-)

diff --git a/src/flex-table.cpp b/src/flex-table.cpp
index b0f31c2ed..9e9676c53 100644
--- a/src/flex-table.cpp
+++ b/src/flex-table.cpp
@@ -242,14 +242,6 @@ bool flex_table_t::has_columns_with_expire() const noexcept
                        [](auto const &column) { return column.has_expire(); });
 }
 
-void table_connection_t::connect(connection_params_t const &connection_params)
-{
-    assert(!m_db_connection);
-
-    m_db_connection =
-        std::make_unique<pg_conn_t>(connection_params, "out.flex.table");
-}
-
 static void enable_check_trigger(pg_conn_t const &db_connection,
                                  flex_table_t const &table)
 {
@@ -274,50 +266,46 @@ static void enable_check_trigger(pg_conn_t const &db_connection,
                               checks);
 }
 
-void table_connection_t::start(bool append)
+void table_connection_t::start(pg_conn_t const &db_connection, bool append)
 {
-    assert(m_db_connection);
-
     if (!append) {
-        m_db_connection->exec("DROP TABLE IF EXISTS {} CASCADE",
-                              table().full_name());
+        db_connection.exec("DROP TABLE IF EXISTS {} CASCADE",
+                           table().full_name());
     }
 
     // These _tmp tables can be left behind if we run out of disk space.
-    m_db_connection->exec("DROP TABLE IF EXISTS {}", table().full_tmp_name());
+    db_connection.exec("DROP TABLE IF EXISTS {}", table().full_tmp_name());
 
     if (!append) {
-        m_db_connection->exec(table().build_sql_create_table(
+        db_connection.exec(table().build_sql_create_table(
             table().cluster_by_geom() ? flex_table_t::table_type::interim
                                       : flex_table_t::table_type::permanent,
             table().full_name()));
 
-        enable_check_trigger(*m_db_connection, table());
+        enable_check_trigger(db_connection, table());
     }
 
-    prepare();
+    prepare(db_connection);
 }
 
-void table_connection_t::stop(bool updateable, bool append)
+void table_connection_t::stop(pg_conn_t const &db_connection, bool updateable,
+                              bool append)
 {
-    assert(m_db_connection);
-
     m_copy_mgr.sync();
 
     if (append) {
-        teardown();
         return;
     }
 
     if (table().cluster_by_geom()) {
         if (table().geom_column().needs_isvalid()) {
-            drop_geom_check_trigger(*m_db_connection, table().schema(),
+            drop_geom_check_trigger(db_connection, table().schema(),
                                     table().name());
         }
 
         log_info("Clustering table '{}' by geometry...", table().name());
 
-        m_db_connection->exec(table().build_sql_create_table(
+        db_connection.exec(table().build_sql_create_table(
             flex_table_t::table_type::permanent, table().full_tmp_name()));
 
         std::string const columns = table().build_sql_column_list();
@@ -350,15 +338,15 @@ void table_connection_t::stop(bool updateable, bool append)
             sql += geom_column_name;
         }
 
-        m_db_connection->exec(sql);
+        db_connection.exec(sql);
 
-        m_db_connection->exec("DROP TABLE {}", table().full_name());
-        m_db_connection->exec(R"(ALTER TABLE {} RENAME TO "{}")",
-                              table().full_tmp_name(), table().name());
+        db_connection.exec("DROP TABLE {}", table().full_name());
+        db_connection.exec(R"(ALTER TABLE {} RENAME TO "{}")",
+                           table().full_tmp_name(), table().name());
         m_id_index_created = false;
 
         if (updateable) {
-            enable_check_trigger(*m_db_connection, table());
+            enable_check_trigger(db_connection, table());
         }
     }
 
@@ -370,57 +358,53 @@ void table_connection_t::stop(bool updateable, bool append)
                      index.columns());
             auto const sql = index.create_index(
                 qualified_name(table().schema(), table().name()));
-            m_db_connection->exec(sql);
+            db_connection.exec(sql);
         }
     }
 
     if ((table().always_build_id_index() || updateable) &&
         table().has_id_column()) {
-        create_id_index();
+        create_id_index(db_connection);
     }
 
     log_info("Analyzing table '{}'...", table().name());
-    analyze();
-
-    teardown();
+    analyze(db_connection);
 }
 
-void table_connection_t::prepare()
+void table_connection_t::prepare(pg_conn_t const &db_connection)
 {
-    assert(m_db_connection);
     if (table().has_id_column() && table().has_columns_with_expire()) {
-        m_db_connection->exec(table().build_sql_prepare_get_wkb());
+        db_connection.exec(table().build_sql_prepare_get_wkb());
     }
 }
 
-void table_connection_t::analyze()
+void table_connection_t::analyze(pg_conn_t const &db_connection)
 {
-    analyze_table(*m_db_connection, table().schema(), table().name());
+    analyze_table(db_connection, table().schema(), table().name());
 }
 
-void table_connection_t::create_id_index()
+void table_connection_t::create_id_index(pg_conn_t const &db_connection)
 {
     if (m_id_index_created) {
         log_debug("Id index on table '{}' already created.", table().name());
     } else {
         log_info("Creating id index on table '{}'...", table().name());
-        m_db_connection->exec(table().build_sql_create_id_index());
+        db_connection.exec(table().build_sql_create_id_index());
         m_id_index_created = true;
     }
 }
 
-pg_result_t table_connection_t::get_geoms_by_id(osmium::item_type type,
+pg_result_t table_connection_t::get_geoms_by_id(pg_conn_t const &db_connection,
+                                                osmium::item_type type,
                                                 osmid_t id) const
 {
     assert(table().has_geom_column());
-    assert(m_db_connection);
-
     std::string const stmt = fmt::format("get_wkb_{}", table().num());
     if (table().has_multicolumn_id_index()) {
-        return m_db_connection->exec_prepared_as_binary(stmt.c_str(),
-                                                        type_to_char(type), id);
+        return db_connection.exec_prepared_as_binary(stmt.c_str(),
+                                                     type_to_char(type), id);
     }
-    return m_db_connection->exec_prepared_as_binary(stmt.c_str(), id);
+    return db_connection.exec_prepared_as_binary(stmt.c_str(), id);
 }
 
 void table_connection_t::delete_rows_with(osmium::item_type type, osmid_t id)
diff --git a/src/flex-table.hpp b/src/flex-table.hpp
index bfcfd3ccc..cc15febff 100644
--- a/src/flex-table.hpp
+++ b/src/flex-table.hpp
@@ -260,31 +260,28 @@ class table_connection_t
       m_target(std::make_shared<db_target_descr_t>(
           table->schema(), table->name(), table->id_column_names(),
           table->build_sql_column_list())),
-      m_copy_mgr(copy_thread), m_db_connection(nullptr)
+      m_copy_mgr(copy_thread)
     {
     }
 
-    void connect(connection_params_t const &connection_params);
+    void start(pg_conn_t const &db_connection, bool append);
 
-    void start(bool append);
-
-    void stop(bool updateable, bool append);
+    void stop(pg_conn_t const &db_connection, bool updateable, bool append);
 
     flex_table_t const &table() const noexcept { return *m_table; }
 
-    void teardown() { m_db_connection.reset(); }
-
-    void prepare();
+    void prepare(pg_conn_t const &db_connection);
 
-    void analyze();
+    void analyze(pg_conn_t const &db_connection);
 
-    void create_id_index();
+    void create_id_index(pg_conn_t const &db_connection);
 
     /**
      * Get all geometries that have at least one expire config defined
      * from the database and return the result set.
      */
-    pg_result_t get_geoms_by_id(osmium::item_type type, osmid_t id) const;
+    pg_result_t get_geoms_by_id(pg_conn_t const &db_connection,
+                                osmium::item_type type, osmid_t id) const;
 
     void flush() { m_copy_mgr.flush(); }
 
@@ -332,9 +329,6 @@ class table_connection_t
      */
     db_copy_mgr_t<db_deleter_by_type_and_id_t> m_copy_mgr;
 
-    /// The connection to the database server.
-    std::unique_ptr<pg_conn_t> m_db_connection;
-
     task_result_t m_task_result;
 
     std::size_t m_count_insert = 0;
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 633086222..7b6452294 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -1075,9 +1075,12 @@ void output_flex_t::after_ways()
 void output_flex_t::stop()
 {
     for (auto &table : m_table_connections) {
-        table.task_set(thread_pool().submit([&]() {
-            table.stop(get_options()->slim && !get_options()->droptemp,
+        auto *db_connection = &m_db_connections.at(table.table().num());
+        table.task_set(thread_pool().submit([&, db_connection]() {
+            table.stop(*db_connection,
+                       get_options()->slim && !get_options()->droptemp,
                        get_options()->append);
+            db_connection->close();
         }));
     }
 
@@ -1151,13 +1154,15 @@ void output_flex_t::relation_add(osmium::Relation const &relation)
 }
 
 void output_flex_t::delete_from_table(table_connection_t *table_connection,
+                                      pg_conn_t const &db_connection,
                                       osmium::item_type type, osmid_t osm_id)
 {
     assert(table_connection);
     auto const id = table_connection->table().map_id(type, osm_id);
 
     if (table_connection->table().has_columns_with_expire()) {
-        auto const result = table_connection->get_geoms_by_id(type, id);
+        auto const result =
+            table_connection->get_geoms_by_id(db_connection, type, id);
         auto const num_tuples = result.num_tuples();
         if (num_tuples > 0) {
             int col = 0;
@@ -1180,7 +1185,8 @@ void output_flex_t::delete_from_tables(osmium::item_type type, osmid_t osm_id)
 {
     for (auto &table : m_table_connections) {
         if (table.table().matches_type(type) && table.table().has_id_column()) {
-            delete_from_table(&table, type, osm_id);
+            delete_from_table(&table, m_db_connections.at(table.table().num()),
+                              type, osm_id);
         }
     }
 }
@@ -1224,9 +1230,12 @@ void output_flex_t::relation_modify(osmium::Relation const &rel)
 
 void output_flex_t::start()
 {
+    assert(m_db_connections.empty());
+
     for (auto &table : m_table_connections) {
-        table.connect(get_options()->connection_params);
-        table.start(get_options()->append);
+        m_db_connections.emplace_back(get_options()->connection_params,
+                                      "out.flex.table");
+        table.start(m_db_connections.back(), get_options()->append);
     }
 }
 
@@ -1260,10 +1269,13 @@ output_flex_t::output_flex_t(output_flex_t const *other,
   m_process_relation(other->m_process_relation),
   m_select_relation_members(other->m_select_relation_members)
 {
+    assert(m_db_connections.empty());
+
     for (auto &table : *m_tables) {
         auto &tc = m_table_connections.emplace_back(&table, m_copy_thread);
-        tc.connect(get_options()->connection_params);
-        tc.prepare();
+        m_db_connections.emplace_back(get_options()->connection_params,
+                                      "out.flex.table");
+        tc.prepare(m_db_connections.back());
     }
 
     for (auto &expire_output : *m_expire_outputs) {
@@ -1509,8 +1521,10 @@ void output_flex_t::reprocess_marked()
         for (auto &table : m_table_connections) {
             if (table.table().matches_type(osmium::item_type::way) &&
                 table.table().has_id_column()) {
-                table.analyze();
-                table.create_id_index();
+                auto const &db_connection =
+                    m_db_connections.at(table.table().num());
+                table.analyze(db_connection);
+                table.create_id_index(db_connection);
             }
         }
 
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index c3125125a..ae812502c 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -224,7 +224,9 @@ class output_flex_t : public output_t
     void add_row(table_connection_t *table_connection, OBJECT const &object);
 
     void delete_from_table(table_connection_t *table_connection,
+                           pg_conn_t const &db_connection,
                            osmium::item_type type, osmid_t osm_id);
+
     void delete_from_tables(osmium::item_type type, osmid_t osm_id);
 
     lua_State *lua_state() noexcept { return m_lua_state.get(); }
@@ -288,6 +290,9 @@ class output_flex_t : public output_t
 
     std::vector<table_connection_t> m_table_connections;
 
+    /// The connections to the database server for each table.
+    std::vector<pg_conn_t> m_db_connections;
+
     // This is shared between all clones of the output and must only be
     // accessed while protected using the lua_mutex.
     std::shared_ptr<idset_t> m_stage2_way_ids = std::make_shared<idset_t>();

From ef8f6e50f33b35635c226816c451bfd317300902 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 4 Feb 2024 11:02:49 +0100
Subject: [PATCH 074/430] Use far fewer connections in flex output

Most operations are not run in parallel anyway, they only need a single
connection. For the parts running in parallel, we have one connection
per thread. We don't have connections for each table any more.
---
 src/output-flex.cpp | 31 +++++++++++--------------------
 src/output-flex.hpp |  4 ++--
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 7b6452294..daccd60fd 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -1075,12 +1075,12 @@ void output_flex_t::after_ways()
 void output_flex_t::stop()
 {
     for (auto &table : m_table_connections) {
-        auto *db_connection = &m_db_connections.at(table.table().num());
-        table.task_set(thread_pool().submit([&, db_connection]() {
-            table.stop(*db_connection,
+        table.task_set(thread_pool().submit([&]() {
+            pg_conn_t const db_connection{get_options()->connection_params,
+                                          "out.flex.stop"};
+            table.stop(db_connection,
                        get_options()->slim && !get_options()->droptemp,
                        get_options()->append);
-            db_connection->close();
         }));
     }
 
@@ -1185,8 +1185,7 @@ void output_flex_t::delete_from_tables(osmium::item_type type, osmid_t osm_id)
 {
     for (auto &table : m_table_connections) {
         if (table.table().matches_type(type) && table.table().has_id_column()) {
-            delete_from_table(&table, m_db_connections.at(table.table().num()),
-                              type, osm_id);
+            delete_from_table(&table, m_db_connection, type, osm_id);
         }
     }
 }
@@ -1230,12 +1229,8 @@ void output_flex_t::relation_modify(osmium::Relation const &rel)
 
 void output_flex_t::start()
 {
-    assert(m_db_connections.empty());
-
     for (auto &table : m_table_connections) {
-        m_db_connections.emplace_back(get_options()->connection_params,
-                                      "out.flex.table");
-        table.start(m_db_connections.back(), get_options()->append);
+        table.start(m_db_connection, get_options()->append);
     }
 }
 
@@ -1263,19 +1258,16 @@ output_flex_t::output_flex_t(output_flex_t const *other,
                              std::shared_ptr<db_copy_thread_t> copy_thread)
 : output_t(other, std::move(mid)), m_tables(other->m_tables),
   m_expire_outputs(other->m_expire_outputs),
+  m_db_connection(get_options()->connection_params, "out.flex.thread"),
   m_stage2_way_ids(other->m_stage2_way_ids),
   m_copy_thread(std::move(copy_thread)), m_lua_state(other->m_lua_state),
   m_process_node(other->m_process_node), m_process_way(other->m_process_way),
   m_process_relation(other->m_process_relation),
   m_select_relation_members(other->m_select_relation_members)
 {
-    assert(m_db_connections.empty());
-
     for (auto &table : *m_tables) {
         auto &tc = m_table_connections.emplace_back(&table, m_copy_thread);
-        m_db_connections.emplace_back(get_options()->connection_params,
-                                      "out.flex.table");
-        tc.prepare(m_db_connections.back());
+        tc.prepare(m_db_connection);
     }
 
     for (auto &expire_output : *m_expire_outputs) {
@@ -1295,6 +1287,7 @@ output_flex_t::output_flex_t(std::shared_ptr<middle_query_t> const &mid,
                              std::shared_ptr<thread_pool_t> thread_pool,
                              options_t const &options)
 : output_t(mid, std::move(thread_pool), options),
+  m_db_connection(get_options()->connection_params, "out.flex.main"),
   m_copy_thread(std::make_shared<db_copy_thread_t>(options.connection_params))
 {
     init_lua(options.style);
@@ -1521,10 +1514,8 @@ void output_flex_t::reprocess_marked()
         for (auto &table : m_table_connections) {
             if (table.table().matches_type(osmium::item_type::way) &&
                 table.table().has_id_column()) {
-                auto const &db_connection =
-                    m_db_connections.at(table.table().num());
-                table.analyze(db_connection);
-                table.create_id_index(db_connection);
+                table.analyze(m_db_connection);
+                table.create_id_index(m_db_connection);
             }
         }
 
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index ae812502c..b64d15e13 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -290,8 +290,8 @@ class output_flex_t : public output_t
 
     std::vector<table_connection_t> m_table_connections;
 
-    /// The connections to the database server for each table.
-    std::vector<pg_conn_t> m_db_connections;
+    /// The connection to the database server.
+    pg_conn_t m_db_connection;
 
     // This is shared between all clones of the output and must only be
     // accessed while protected using the lua_mutex.

From 3a460cda863efd965742c2dceca5a9a35bda8d83 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 26 Jan 2024 16:52:00 +0100
Subject: [PATCH 075/430] Switch middle database default format to "new"

---
 man/osm2pgsql.md                        | 11 +++--
 src/command-line-parser.cpp             | 55 +++++++++++++------------
 src/options.hpp                         |  9 +++-
 tests/bdd/command-line/invalid.feature  |  2 +-
 tests/bdd/regression/timestamps.feature | 12 +++---
 tests/common-options.hpp                |  2 +
 tests/test-middle.cpp                   | 38 ++++++++---------
 7 files changed, 69 insertions(+), 60 deletions(-)

diff --git a/man/osm2pgsql.md b/man/osm2pgsql.md
index 17869eb9c..d7e170407 100644
--- a/man/osm2pgsql.md
+++ b/man/osm2pgsql.md
@@ -179,12 +179,11 @@ mandatory for short options too.
 
 \--middle-database-format=FORMAT
 :   Set the database format for the middle tables to FORMAT. Allowed formats
-    are **legacy** and **new**. The **legacy** format is the old format that
-    will eventually be deprecated and removed but is currently still the
-    default. The **new** format was introduced in version 1.9.0.
-    See the manual for details on these formats. (Only works
-    with **\--slim**. In append mode osm2pgsql will automatically detect the
-    database format, so don't use this with **-a, \--append**.)
+    are **new** (default) and **legacy** . The **legacy** format is deprecated
+    and will be removed in version 2.0.0. See the manual for details on these
+    formats. (Only works with **\--slim**. In append mode osm2pgsql will
+    automatically detect the database format, so don't use this with
+    **-a, \--append**.)
 
 \--middle-with-nodes
 :   Used together with the **new** middle database format when a flat nodes
diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index 11b545d4b..aeaaa6360 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -221,11 +221,6 @@ static void check_options(options_t *options)
         throw std::runtime_error{"--drop only makes sense with --slim."};
     }
 
-    if (options->append && options->middle_database_format != 1) {
-        throw std::runtime_error{
-            "Do not use --middle-database-format with --append."};
-    }
-
     if (options->cache < 0) {
         options->cache = 0;
         log_warn("RAM cache cannot be negative. Using 0 instead.");
@@ -536,21 +531,10 @@ options_t parse_command_line(int argc, char *argv[])
         ->type_name("SCHEMA")
         ->group("Middle options");
 
+    std::string middle_database_format_raw;
     // --middle-database-format
-    app.add_option_function<std::string>(
-           "--middle-database-format",
-           [&](std::string const &arg) {
-               if (arg == "legacy") {
-                   options.middle_database_format = 1;
-               } else if (arg == "new") {
-                   options.middle_database_format = 2;
-               } else {
-                   throw std::runtime_error{
-                       "Unknown value for --middle-database-format"
-                       " (Use 'legacy' or 'new')."};
-               }
-           })
-        ->description("Set middle db format ('legacy' (default), 'new').")
+    app.add_option("--middle-database-format", middle_database_format_raw)
+        ->description("Set middle db format ('legacy', 'new' (default)).")
         ->type_name("FORMAT")
         ->group("Middle options");
 
@@ -703,7 +687,32 @@ options_t parse_command_line(int argc, char *argv[])
         return options;
     }
 
-    if (!options.slim) {
+    check_options(&options);
+
+    if (options.slim) { // slim mode, use database middle
+        if (middle_database_format_raw.empty()) {
+            // Database format not set on the command line, use defaults. For
+            // append mode we keep old default for backwards compatibility, for
+            // create mode the new format is the default. (These will possibly
+            // be overwritten later by properties setting if it exists.)
+            options.middle_database_format = options.append ? 1 : 2;
+        } else if (options.append) {
+            // Database format set on command line in append mode.
+            throw std::runtime_error{
+                "Do not use --middle-database-format with --append."};
+        } else {
+            // Database format set on the command line in create mode.
+            if (middle_database_format_raw == "legacy") {
+                options.middle_database_format = 1;
+            } else if (middle_database_format_raw == "new") {
+                options.middle_database_format = 2;
+            } else {
+                throw std::runtime_error{
+                    "Unknown value for --middle-database-format"
+                    " (Use 'legacy' or 'new')."};
+            }
+        }
+    } else { // non-slim mode, use ram middle
         check_options_non_slim(app);
     }
 
@@ -761,13 +770,7 @@ options_t parse_command_line(int argc, char *argv[])
 
     check_options_expire(&options);
 
-    check_options(&options);
-
     options.connection_params = app.connection_params();
 
-    if (!options.slim) {
-        options.middle_database_format = 0;
-    }
-
     return options;
 }
diff --git a/src/options.hpp b/src/options.hpp
index 458927d95..4ec554266 100644
--- a/src/options.hpp
+++ b/src/options.hpp
@@ -115,8 +115,13 @@ struct options_t
      */
     uint8_t way_node_index_id_shift = 5;
 
-    /// Database format (0=unknown/no database middle, 1=legacy, 2=new)
-    uint8_t middle_database_format = 1;
+    /**
+     * Middle database format:
+     * 0 = non-slim mode, no database middle (ram middle)
+     * 1 = slim mode, legacy database format
+     * 2 = slim mode, new database format
+     */
+    uint8_t middle_database_format = 0;
 
     /**
      * Should nodes (with tags) be stored in the middle? If no flat node file
diff --git a/tests/bdd/command-line/invalid.feature b/tests/bdd/command-line/invalid.feature
index 012fdb503..49ab7455a 100644
--- a/tests/bdd/command-line/invalid.feature
+++ b/tests/bdd/command-line/invalid.feature
@@ -24,7 +24,7 @@ Feature: Errors for invalid command line parameter combinations
 
     Scenario: append and middle-database-format cannot be used together
         Then running osm2pgsql pgsql with parameters fails
-            | -a | --slim | --middle-database-format=new |
+            | -a | --slim | --middle-database-format=legacy |
         And the error output contains
             """
             Do not use --middle-database-format with --append.
diff --git a/tests/bdd/regression/timestamps.feature b/tests/bdd/regression/timestamps.feature
index 56edb1631..fca9e776b 100644
--- a/tests/bdd/regression/timestamps.feature
+++ b/tests/bdd/regression/timestamps.feature
@@ -55,7 +55,7 @@ Feature: Timestamps in properties table should reflect timestamps in input file
         And table osm2pgsql_properties contains
             | property          | value                |
             | attributes        | false                |
-            | db_format         | 1                    |
+            | db_format         | 2                    |
             | flat_node_file    |                      |
             | prefix            | planet_osm           |
             | updatable         | true                 |
@@ -76,7 +76,7 @@ Feature: Timestamps in properties table should reflect timestamps in input file
         And table osm2pgsql_properties contains
             | property          | value                |
             | attributes        | false                |
-            | db_format         | 1                    |
+            | db_format         | 2                    |
             | flat_node_file    |                      |
             | prefix            | planet_osm           |
             | updatable         | true                 |
@@ -99,7 +99,7 @@ Feature: Timestamps in properties table should reflect timestamps in input file
         And table osm2pgsql_properties contains
             | property          | value                |
             | attributes        | false                |
-            | db_format         | 1                    |
+            | db_format         | 2                    |
             | flat_node_file    |                      |
             | prefix            | planet_osm           |
             | updatable         | true                 |
@@ -120,7 +120,7 @@ Feature: Timestamps in properties table should reflect timestamps in input file
         And table osm2pgsql_properties contains
             | property          | value                |
             | attributes        | false                |
-            | db_format         | 1                    |
+            | db_format         | 2                    |
             | flat_node_file    |                      |
             | prefix            | planet_osm           |
             | updatable         | true                 |
@@ -143,7 +143,7 @@ Feature: Timestamps in properties table should reflect timestamps in input file
         And table osm2pgsql_properties contains
             | property          | value                |
             | attributes        | false                |
-            | db_format         | 1                    |
+            | db_format         | 2                    |
             | flat_node_file    |                      |
             | prefix            | planet_osm           |
             | updatable         | true                 |
@@ -162,7 +162,7 @@ Feature: Timestamps in properties table should reflect timestamps in input file
         And table osm2pgsql_properties contains
             | property          | value                |
             | attributes        | false                |
-            | db_format         | 1                    |
+            | db_format         | 2                    |
             | flat_node_file    |                      |
             | prefix            | planet_osm           |
             | updatable         | true                 |
diff --git a/tests/common-options.hpp b/tests/common-options.hpp
index 446289a62..ac9691ecb 100644
--- a/tests/common-options.hpp
+++ b/tests/common-options.hpp
@@ -38,12 +38,14 @@ class opt_t
     opt_t &slim()
     {
         m_opt.slim = true;
+        m_opt.middle_database_format = 2;
         return *this;
     }
 
     opt_t &slim(testing::pg::tempdb_t const &db)
     {
         m_opt.slim = true;
+        m_opt.middle_database_format = 2;
         m_opt.connection_params = db.connection_params();
         return *this;
     }
diff --git a/tests/test-middle.cpp b/tests/test-middle.cpp
index 7438b4476..9f36536fb 100644
--- a/tests/test-middle.cpp
+++ b/tests/test-middle.cpp
@@ -83,22 +83,22 @@ struct options_flat_node_cache
     }
 };
 
-struct options_slim_new_format
+struct options_slim_legacy_format
 {
     static options_t options(testing::pg::tempdb_t const &tmpdb)
     {
         options_t o = testing::opt_t().slim(tmpdb);
-        o.middle_database_format = 2;
+        o.middle_database_format = 1;
         return o;
     }
 };
 
-struct options_slim_new_format_with_flatnodes
+struct options_slim_legacy_format_with_flatnodes
 {
     static options_t options(testing::pg::tempdb_t const &tmpdb)
     {
         options_t o = testing::opt_t().slim(tmpdb).flatnodes();
-        o.middle_database_format = 2;
+        o.middle_database_format = 1;
         return o;
     }
 };
@@ -112,7 +112,7 @@ struct options_ram_optimized
 };
 
 TEMPLATE_TEST_CASE("middle import", "", options_slim_default,
-                   options_slim_new_format, options_slim_with_lc_prefix,
+                   options_slim_legacy_format, options_slim_with_lc_prefix,
                    options_slim_with_uc_prefix, options_slim_with_schema,
                    options_ram_optimized)
 {
@@ -367,9 +367,9 @@ static bool no_node(std::shared_ptr<middle_pgsql_t> const &mid, osmid_t id)
 }
 
 TEMPLATE_TEST_CASE("middle: add, delete and update node", "",
-                   options_slim_default, options_slim_new_format,
+                   options_slim_default, options_slim_legacy_format,
                    options_flat_node_cache,
-                   options_slim_new_format_with_flatnodes)
+                   options_slim_legacy_format_with_flatnodes)
 {
     auto thread_pool = std::make_shared<thread_pool_t>(1U);
 
@@ -586,9 +586,9 @@ static bool no_way(std::shared_ptr<middle_pgsql_t> const &mid, osmid_t id)
 }
 
 TEMPLATE_TEST_CASE("middle: add, delete and update way", "",
-                   options_slim_default, options_slim_new_format,
+                   options_slim_default, options_slim_legacy_format,
                    options_flat_node_cache,
-                   options_slim_new_format_with_flatnodes)
+                   options_slim_legacy_format_with_flatnodes)
 {
     auto thread_pool = std::make_shared<thread_pool_t>(1U);
 
@@ -739,8 +739,8 @@ TEMPLATE_TEST_CASE("middle: add, delete and update way", "",
 }
 
 TEMPLATE_TEST_CASE("middle: add way with attributes", "", options_slim_default,
-                   options_slim_new_format, options_flat_node_cache,
-                   options_slim_new_format_with_flatnodes)
+                   options_slim_legacy_format, options_flat_node_cache,
+                   options_slim_legacy_format_with_flatnodes)
 {
     auto thread_pool = std::make_shared<thread_pool_t>(1U);
 
@@ -840,9 +840,9 @@ static bool no_relation(std::shared_ptr<middle_pgsql_t> const &mid, osmid_t id)
 }
 
 TEMPLATE_TEST_CASE("middle: add, delete and update relation", "",
-                   options_slim_default, options_slim_new_format,
+                   options_slim_default, options_slim_legacy_format,
                    options_flat_node_cache,
-                   options_slim_new_format_with_flatnodes)
+                   options_slim_legacy_format_with_flatnodes)
 {
     auto thread_pool = std::make_shared<thread_pool_t>(1U);
 
@@ -993,9 +993,9 @@ TEMPLATE_TEST_CASE("middle: add, delete and update relation", "",
 }
 
 TEMPLATE_TEST_CASE("middle: add relation with attributes", "",
-                   options_slim_default, options_slim_new_format,
+                   options_slim_default, options_slim_legacy_format,
                    options_flat_node_cache,
-                   options_slim_new_format_with_flatnodes)
+                   options_slim_legacy_format_with_flatnodes)
 {
     auto thread_pool = std::make_shared<thread_pool_t>(1U);
 
@@ -1042,8 +1042,8 @@ TEMPLATE_TEST_CASE("middle: add relation with attributes", "",
 }
 
 TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
-                   options_slim_new_format, options_flat_node_cache,
-                   options_slim_new_format_with_flatnodes)
+                   options_slim_legacy_format, options_flat_node_cache,
+                   options_slim_legacy_format_with_flatnodes)
 {
     auto thread_pool = std::make_shared<thread_pool_t>(1U);
 
@@ -1198,8 +1198,8 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
 }
 
 TEMPLATE_TEST_CASE("middle: change nodes in relation", "", options_slim_default,
-                   options_slim_new_format, options_flat_node_cache,
-                   options_slim_new_format_with_flatnodes)
+                   options_slim_legacy_format, options_flat_node_cache,
+                   options_slim_legacy_format_with_flatnodes)
 {
     auto thread_pool = std::make_shared<thread_pool_t>(1U);
 

From 6592188807f709a2a6855f3e9dc70fd8821532b9 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 9 Feb 2024 11:58:38 +0100
Subject: [PATCH 076/430] Mark command line option -i, --tablespace-index as
 deprecated

Fixes #2133
---
 man/osm2pgsql.1             | 6 ++++++
 man/osm2pgsql.md            | 7 +++++--
 src/command-line-parser.cpp | 3 +++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/man/osm2pgsql.1 b/man/osm2pgsql.1
index c8f659241..61d5b80b5 100644
--- a/man/osm2pgsql.1
+++ b/man/osm2pgsql.1
@@ -115,6 +115,9 @@ Example: \f[B]--bbox\f[R] \f[B]-0.5,51.25,0.5,51.75\f[R]
 -i, --tablespace-index=TABLESPC
 Store all indexes in the PostgreSQL tablespace \f[V]TABLESPC\f[R].
 This option also affects the tables created by the pgsql output.
+This option is deprecated.
+Use the --tablespace-slim-index and/or --tablespace-main-index options
+instead.
 .TP
 --tablespace-slim-data=TABLESPC
 Store the slim mode tables in the given tablespace.
@@ -245,6 +248,9 @@ no default.)
 -i, --tablespace-index=TABLESPC
 Store all indexes in the PostgreSQL tablespace \f[V]TABLESPC\f[R].
 This option also affects the middle tables.
+This option is deprecated.
+Use the --tablespace-slim-index and/or --tablespace-main-index options
+instead.
 .TP
 --tablespace-main-data=TABLESPC
 Store the data tables in the PostgreSQL tablespace \f[V]TABLESPC\f[R].
diff --git a/man/osm2pgsql.md b/man/osm2pgsql.md
index 17869eb9c..f22ebea00 100644
--- a/man/osm2pgsql.md
+++ b/man/osm2pgsql.md
@@ -111,7 +111,9 @@ mandatory for short options too.
 
 -i, \--tablespace-index=TABLESPC
 :   Store all indexes in the PostgreSQL tablespace `TABLESPC`. This option
-    also affects the tables created by the pgsql output.
+    also affects the tables created by the pgsql output. This option is
+    deprecated. Use the \--tablespace-slim-index and/or \--tablespace-main-index
+    options instead.
 
 \--tablespace-slim-data=TABLESPC
 :   Store the slim mode tables in the given tablespace.
@@ -211,7 +213,8 @@ mandatory for short options too.
 
 -i, \--tablespace-index=TABLESPC
 :   Store all indexes in the PostgreSQL tablespace `TABLESPC`. This option
-    also affects the middle tables.
+    also affects the middle tables. This option is deprecated. Use the
+    \--tablespace-slim-index and/or \--tablespace-main-index options instead.
 
 \--tablespace-main-data=TABLESPC
 :   Store the data tables in the PostgreSQL tablespace `TABLESPC`.
diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index 11b545d4b..1565a41fa 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -724,6 +724,9 @@ options_t parse_command_line(int argc, char *argv[])
     }
 
     if (!tablespace_index.empty()) {
+        log_warn(
+            "The option -i, --tablespace-index is deprecated. Use "
+            "--tablespace-slim-index and/or --tablespace-main-index instead.");
         if (options.tblsmain_index.empty()) {
             options.tblsmain_index = tablespace_index;
         }

From fb4baa8f5740bf046bdef2428f7798e335a4a7aa Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 12 Feb 2024 09:05:54 +0100
Subject: [PATCH 077/430] Mark --with-forward-dependencies as deprecated in man
 page

The option was deprecated before, but I neglected to update the man
page.
---
 man/osm2pgsql.1  | 8 ++++----
 man/osm2pgsql.md | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/man/osm2pgsql.1 b/man/osm2pgsql.1
index 61d5b80b5..d2ec93c12 100644
--- a/man/osm2pgsql.1
+++ b/man/osm2pgsql.1
@@ -208,10 +208,9 @@ See documentation for details.
 .TP
 --middle-database-format=FORMAT
 Set the database format for the middle tables to FORMAT.
-Allowed formats are \f[B]legacy\f[R] and \f[B]new\f[R].
-The \f[B]legacy\f[R] format is the old format that will eventually be
-deprecated and removed but is currently still the default.
-The \f[B]new\f[R] format was introduced in version 1.9.0.
+Allowed formats are \f[B]new\f[R] (default) and \f[B]legacy\f[R] .
+The \f[B]legacy\f[R] format is deprecated and will be removed in version
+2.0.0.
 See the manual for details on these formats.
 (Only works with \f[B]--slim\f[R].
 In append mode osm2pgsql will automatically detect the database format,
@@ -351,6 +350,7 @@ Specifies the number of parallel threads used for certain operations.
 --with-forward-dependencies=BOOL
 Propagate changes from nodes to ways and node/way members to relations
 (Default: \f[V]true\f[R]).
+This option is deprecated.
 .SH SEE ALSO
 .IP \[bu] 2
 osm2pgsql website (https://osm2pgsql.org)
diff --git a/man/osm2pgsql.md b/man/osm2pgsql.md
index b9cedd304..abe510b2a 100644
--- a/man/osm2pgsql.md
+++ b/man/osm2pgsql.md
@@ -309,7 +309,7 @@ mandatory for short options too.
 
 \--with-forward-dependencies=BOOL
 :   Propagate changes from nodes to ways and node/way members to relations
-    (Default: `true`).
+    (Default: `true`). This option is deprecated.
 
 # SEE ALSO
 

From 8303d0b8236f19905ba422216f6689a86dab31e8 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 12 Feb 2024 10:35:47 +0100
Subject: [PATCH 078/430] Update included fmt library to version 10.2.1

---
 contrib/fmt/README.contrib           |   2 +-
 contrib/fmt/README.md                | 490 ++++++++++++++++++++++++
 contrib/fmt/README.rst               | 542 ---------------------------
 contrib/fmt/include/fmt/args.h       |  11 +-
 contrib/fmt/include/fmt/chrono.h     | 272 ++++++++------
 contrib/fmt/include/fmt/color.h      |  77 ++--
 contrib/fmt/include/fmt/compile.h    |  17 +-
 contrib/fmt/include/fmt/core.h       | 123 ++++--
 contrib/fmt/include/fmt/format-inl.h | 158 ++++----
 contrib/fmt/include/fmt/format.h     | 536 ++++++++++++++------------
 contrib/fmt/include/fmt/os.h         |  44 ++-
 contrib/fmt/include/fmt/ostream.h    |  92 +++--
 contrib/fmt/include/fmt/printf.h     |  12 +-
 contrib/fmt/include/fmt/ranges.h     |  33 +-
 contrib/fmt/include/fmt/std.h        | 175 +++++++--
 contrib/fmt/include/fmt/xchar.h      |  17 +-
 16 files changed, 1420 insertions(+), 1181 deletions(-)
 create mode 100644 contrib/fmt/README.md
 delete mode 100644 contrib/fmt/README.rst

diff --git a/contrib/fmt/README.contrib b/contrib/fmt/README.contrib
index 326599199..5284da3cf 100644
--- a/contrib/fmt/README.contrib
+++ b/contrib/fmt/README.contrib
@@ -1,2 +1,2 @@
 Source: https://github.com/fmtlib/fmt
-Revision: v10.1.0
+Revision: v10.2.1
diff --git a/contrib/fmt/README.md b/contrib/fmt/README.md
new file mode 100644
index 000000000..dcfb16ec2
--- /dev/null
+++ b/contrib/fmt/README.md
@@ -0,0 +1,490 @@
+<img src="https://user-images.githubusercontent.com/576385/156254208-f5b743a9-88cf-439d-b0c0-923d53e8d551.png" alt="{fmt}" width="25%"/>
+
+[![image](https://github.com/fmtlib/fmt/workflows/linux/badge.svg)](https://github.com/fmtlib/fmt/actions?query=workflow%3Alinux)
+[![image](https://github.com/fmtlib/fmt/workflows/macos/badge.svg)](https://github.com/fmtlib/fmt/actions?query=workflow%3Amacos)
+[![image](https://github.com/fmtlib/fmt/workflows/windows/badge.svg)](https://github.com/fmtlib/fmt/actions?query=workflow%3Awindows)
+[![fmt is continuously fuzzed at oss-fuzz](https://oss-fuzz-build-logs.storage.googleapis.com/badges/fmt.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?\%0Acolspec=ID%20Type%20Component%20Status%20Proj%20Reported%20Owner%20\%0ASummary&q=proj%3Dfmt&can=1)
+[![Ask questions at StackOverflow with the tag fmt](https://img.shields.io/badge/stackoverflow-fmt-blue.svg)](https://stackoverflow.com/questions/tagged/fmt)
+[![image](https://api.securityscorecards.dev/projects/github.com/fmtlib/fmt/badge)](https://securityscorecards.dev/viewer/?uri=github.com/fmtlib/fmt)
+
+**{fmt}** is an open-source formatting library providing a fast and safe
+alternative to C stdio and C++ iostreams.
+
+If you like this project, please consider donating to one of the funds
+that help victims of the war in Ukraine: <https://www.stopputin.net/>.
+
+[Documentation](https://fmt.dev)
+
+[Cheat Sheets](https://hackingcpp.com/cpp/libs/fmt.html)
+
+Q&A: ask questions on [StackOverflow with the tag
+fmt](https://stackoverflow.com/questions/tagged/fmt).
+
+Try {fmt} in [Compiler Explorer](https://godbolt.org/z/Eq5763).
+
+# Features
+
+- Simple [format API](https://fmt.dev/latest/api.html) with positional
+  arguments for localization
+- Implementation of [C++20
+  std::format](https://en.cppreference.com/w/cpp/utility/format) and
+  [C++23 std::print](https://en.cppreference.com/w/cpp/io/print)
+- [Format string syntax](https://fmt.dev/latest/syntax.html) similar
+  to Python\'s
+  [format](https://docs.python.org/3/library/stdtypes.html#str.format)
+- Fast IEEE 754 floating-point formatter with correct rounding,
+  shortness and round-trip guarantees using the
+  [Dragonbox](https://github.com/jk-jeon/dragonbox) algorithm
+- Portable Unicode support
+- Safe [printf
+  implementation](https://fmt.dev/latest/api.html#printf-formatting)
+  including the POSIX extension for positional arguments
+- Extensibility: [support for user-defined
+  types](https://fmt.dev/latest/api.html#formatting-user-defined-types)
+- High performance: faster than common standard library
+  implementations of `(s)printf`, iostreams, `to_string` and
+  `to_chars`, see [Speed tests](#speed-tests) and [Converting a
+  hundred million integers to strings per
+  second](http://www.zverovich.net/2020/06/13/fast-int-to-string-revisited.html)
+- Small code size both in terms of source code with the minimum
+  configuration consisting of just three files, `core.h`, `format.h`
+  and `format-inl.h`, and compiled code; see [Compile time and code
+  bloat](#compile-time-and-code-bloat)
+- Reliability: the library has an extensive set of
+  [tests](https://github.com/fmtlib/fmt/tree/master/test) and is
+  [continuously fuzzed](https://bugs.chromium.org/p/oss-fuzz/issues/list?colspec=ID%20Type%20Component%20Status%20Proj%20Reported%20Owner%20Summary&q=proj%3Dfmt&can=1)
+- Safety: the library is fully type-safe, errors in format strings can
+  be reported at compile time, automatic memory management prevents
+  buffer overflow errors
+- Ease of use: small self-contained code base, no external
+  dependencies, permissive MIT
+  [license](https://github.com/fmtlib/fmt/blob/master/LICENSE.rst)
+- [Portability](https://fmt.dev/latest/index.html#portability) with
+  consistent output across platforms and support for older compilers
+- Clean warning-free codebase even on high warning levels such as
+  `-Wall -Wextra -pedantic`
+- Locale independence by default
+- Optional header-only configuration enabled with the
+  `FMT_HEADER_ONLY` macro
+
+See the [documentation](https://fmt.dev) for more details.
+
+# Examples
+
+**Print to stdout** ([run](https://godbolt.org/z/Tevcjh))
+
+``` c++
+#include <fmt/core.h>
+
+int main() {
+  fmt::print("Hello, world!\n");
+}
+```
+
+**Format a string** ([run](https://godbolt.org/z/oK8h33))
+
+``` c++
+std::string s = fmt::format("The answer is {}.", 42);
+// s == "The answer is 42."
+```
+
+**Format a string using positional arguments**
+([run](https://godbolt.org/z/Yn7Txe))
+
+``` c++
+std::string s = fmt::format("I'd rather be {1} than {0}.", "right", "happy");
+// s == "I'd rather be happy than right."
+```
+
+**Print dates and times** ([run](https://godbolt.org/z/c31ExdY3W))
+
+``` c++
+#include <fmt/chrono.h>
+
+int main() {
+  auto now = std::chrono::system_clock::now();
+  fmt::print("Date and time: {}\n", now);
+  fmt::print("Time: {:%H:%M}\n", now);
+}
+```
+
+Output:
+
+    Date and time: 2023-12-26 19:10:31.557195597
+    Time: 19:10
+
+**Print a container** ([run](https://godbolt.org/z/MxM1YqjE7))
+
+``` c++
+#include <vector>
+#include <fmt/ranges.h>
+
+int main() {
+  std::vector<int> v = {1, 2, 3};
+  fmt::print("{}\n", v);
+}
+```
+
+Output:
+
+    [1, 2, 3]
+
+**Check a format string at compile time**
+
+``` c++
+std::string s = fmt::format("{:d}", "I am not a number");
+```
+
+This gives a compile-time error in C++20 because `d` is an invalid
+format specifier for a string.
+
+**Write a file from a single thread**
+
+``` c++
+#include <fmt/os.h>
+
+int main() {
+  auto out = fmt::output_file("guide.txt");
+  out.print("Don't {}", "Panic");
+}
+```
+
+This can be [5 to 9 times faster than
+fprintf](http://www.zverovich.net/2020/08/04/optimal-file-buffer-size.html).
+
+**Print with colors and text styles**
+
+``` c++
+#include <fmt/color.h>
+
+int main() {
+  fmt::print(fg(fmt::color::crimson) | fmt::emphasis::bold,
+             "Hello, {}!\n", "world");
+  fmt::print(fg(fmt::color::floral_white) | bg(fmt::color::slate_gray) |
+             fmt::emphasis::underline, "Olá, {}!\n", "Mundo");
+  fmt::print(fg(fmt::color::steel_blue) | fmt::emphasis::italic,
+             "你好{}！\n", "世界");
+}
+```
+
+Output on a modern terminal with Unicode support:
+
+![image](https://github.com/fmtlib/fmt/assets/%0A576385/2a93c904-d6fa-4aa6-b453-2618e1c327d7)
+
+# Benchmarks
+
+## Speed tests
+
+| Library           | Method        | Run Time, s |
+|-------------------|---------------|-------------|
+| libc              | printf        |   0.91      |
+| libc++            | std::ostream  |   2.49      |
+| {fmt} 9.1         | fmt::print    |   0.74      |
+| Boost Format 1.80 | boost::format |   6.26      |
+| Folly Format      | folly::format |   1.87      |
+
+{fmt} is the fastest of the benchmarked methods, \~20% faster than
+`printf`.
+
+The above results were generated by building `tinyformat_test.cpp` on
+macOS 12.6.1 with `clang++ -O3 -DNDEBUG -DSPEED_TEST -DHAVE_FORMAT`, and
+taking the best of three runs. In the test, the format string
+`"%0.10f:%04d:%+g:%s:%p:%c:%%\n"` or equivalent is filled 2,000,000
+times with output sent to `/dev/null`; for further details refer to the
+[source](https://github.com/fmtlib/format-benchmark/blob/master/src/tinyformat-test.cc).
+
+{fmt} is up to 20-30x faster than `std::ostringstream` and `sprintf` on
+IEEE754 `float` and `double` formatting
+([dtoa-benchmark](https://github.com/fmtlib/dtoa-benchmark)) and faster
+than [double-conversion](https://github.com/google/double-conversion)
+and [ryu](https://github.com/ulfjack/ryu):
+
+[![image](https://user-images.githubusercontent.com/576385/95684665-11719600-0ba8-11eb-8e5b-972ff4e49428.png)](https://fmt.dev/unknown_mac64_clang12.0.html)
+
+## Compile time and code bloat
+
+The script
+[bloat-test.py](https://github.com/fmtlib/format-benchmark/blob/master/bloat-test.py)
+from [format-benchmark](https://github.com/fmtlib/format-benchmark)
+tests compile time and code bloat for nontrivial projects. It generates
+100 translation units and uses `printf()` or its alternative five times
+in each to simulate a medium-sized project. The resulting executable
+size and compile time (Apple LLVM version 8.1.0 (clang-802.0.42), macOS
+Sierra, best of three) is shown in the following tables.
+
+**Optimized build (-O3)**
+
+| Method        | Compile Time, s | Executable size, KiB | Stripped size, KiB |
+|---------------|-----------------|----------------------|--------------------|
+| printf        |   2.6           |   29                 |   26               |
+| printf+string |   16.4          |   29                 |   26               |
+| iostreams     |   31.1          |   59                 |   55               |
+| {fmt}         |   19.0          |   37                 |   34               |
+| Boost Format  |   91.9          |   226                |   203              |
+| Folly Format  |   115.7         |   101                |   88               |
+
+As you can see, {fmt} has 60% less overhead in terms of resulting binary
+code size compared to iostreams and comes pretty close to `printf`.
+Boost Format and Folly Format have the largest overheads.
+
+`printf+string` is the same as `printf` but with an extra `<string>`
+include to measure the overhead of the latter.
+
+**Non-optimized build**
+
+| Method        | Compile Time, s | Executable size, KiB | Stripped size, KiB |
+|---------------|-----------------|----------------------|--------------------|
+| printf        |   2.2           |   33                 |   30               |
+| printf+string |   16.0          |   33                 |   30               |
+| iostreams     |   28.3          |   56                 |   52               |
+| {fmt}         |   18.2          |   59                 |   50               |
+| Boost Format  |   54.1          |   365                |   303              |
+| Folly Format  |   79.9          |   445                |   430              |
+
+`libc`, `lib(std)c++`, and `libfmt` are all linked as shared libraries
+to compare formatting function overhead only. Boost Format is a
+header-only library so it doesn\'t provide any linkage options.
+
+## Running the tests
+
+Please refer to [Building the
+library](https://fmt.dev/latest/usage.html#building-the-library) for
+instructions on how to build the library and run the unit tests.
+
+Benchmarks reside in a separate repository,
+[format-benchmarks](https://github.com/fmtlib/format-benchmark), so to
+run the benchmarks you first need to clone this repository and generate
+Makefiles with CMake:
+
+    $ git clone --recursive https://github.com/fmtlib/format-benchmark.git
+    $ cd format-benchmark
+    $ cmake .
+
+Then you can run the speed test:
+
+    $ make speed-test
+
+or the bloat test:
+
+    $ make bloat-test
+
+# Migrating code
+
+[clang-tidy](https://clang.llvm.org/extra/clang-tidy/) v17 (not yet
+released) provides the
+[modernize-use-std-print](https://clang.llvm.org/extra/clang-tidy/checks/modernize/use-std-print.html)
+check that is capable of converting occurrences of `printf` and
+`fprintf` to `fmt::print` if configured to do so. (By default it
+converts to `std::print`.)
+
+# Notable projects using this library
+
+- [0 A.D.](https://play0ad.com/): a free, open-source, cross-platform
+  real-time strategy game
+- [AMPL/MP](https://github.com/ampl/mp): an open-source library for
+  mathematical programming
+- [Apple's FoundationDB](https://github.com/apple/foundationdb): an open-source,
+  distributed, transactional key-value store
+- [Aseprite](https://github.com/aseprite/aseprite): animated sprite
+  editor & pixel art tool
+- [AvioBook](https://www.aviobook.aero/en): a comprehensive aircraft
+  operations suite
+- [Blizzard Battle.net](https://battle.net/): an online gaming
+  platform
+- [Celestia](https://celestia.space/): real-time 3D visualization of
+  space
+- [Ceph](https://ceph.com/): a scalable distributed storage system
+- [ccache](https://ccache.dev/): a compiler cache
+- [ClickHouse](https://github.com/ClickHouse/ClickHouse): an
+  analytical database management system
+- [Contour](https://github.com/contour-terminal/contour/): a modern
+  terminal emulator
+- [CUAUV](https://cuauv.org/): Cornell University\'s autonomous
+  underwater vehicle
+- [Drake](https://drake.mit.edu/): a planning, control, and analysis
+  toolbox for nonlinear dynamical systems (MIT)
+- [Envoy](https://lyft.github.io/envoy/): C++ L7 proxy and
+  communication bus (Lyft)
+- [FiveM](https://fivem.net/): a modification framework for GTA V
+- [fmtlog](https://github.com/MengRao/fmtlog): a performant
+  fmtlib-style logging library with latency in nanoseconds
+- [Folly](https://github.com/facebook/folly): Facebook open-source
+  library
+- [GemRB](https://gemrb.org/): a portable open-source implementation
+  of Bioware's Infinity Engine
+- [Grand Mountain
+  Adventure](https://store.steampowered.com/app/1247360/Grand_Mountain_Adventure/):
+  a beautiful open-world ski & snowboarding game
+- [HarpyWar/pvpgn](https://github.com/pvpgn/pvpgn-server): Player vs
+  Player Gaming Network with tweaks
+- [KBEngine](https://github.com/kbengine/kbengine): an open-source
+  MMOG server engine
+- [Keypirinha](https://keypirinha.com/): a semantic launcher for
+  Windows
+- [Kodi](https://kodi.tv/) (formerly xbmc): home theater software
+- [Knuth](https://kth.cash/): high-performance Bitcoin full-node
+- [libunicode](https://github.com/contour-terminal/libunicode/): a
+  modern C++17 Unicode library
+- [MariaDB](https://mariadb.org/): relational database management
+  system
+- [Microsoft Verona](https://github.com/microsoft/verona): research
+  programming language for concurrent ownership
+- [MongoDB](https://mongodb.com/): distributed document database
+- [MongoDB Smasher](https://github.com/duckie/mongo_smasher): a small
+  tool to generate randomized datasets
+- [OpenSpace](https://openspaceproject.com/): an open-source
+  astrovisualization framework
+- [PenUltima Online (POL)](https://www.polserver.com/): an MMO server,
+  compatible with most Ultima Online clients
+- [PyTorch](https://github.com/pytorch/pytorch): an open-source
+  machine learning library
+- [quasardb](https://www.quasardb.net/): a distributed,
+  high-performance, associative database
+- [Quill](https://github.com/odygrd/quill): asynchronous low-latency
+  logging library
+- [QKW](https://github.com/ravijanjam/qkw): generalizing aliasing to
+  simplify navigation, and executing complex multi-line terminal
+  command sequences
+- [redis-cerberus](https://github.com/HunanTV/redis-cerberus): a Redis
+  cluster proxy
+- [redpanda](https://vectorized.io/redpanda): a 10x faster Kafka®
+  replacement for mission-critical systems written in C++
+- [rpclib](http://rpclib.net/): a modern C++ msgpack-RPC server and
+  client library
+- [Salesforce Analytics
+  Cloud](https://www.salesforce.com/analytics-cloud/overview/):
+  business intelligence software
+- [Scylla](https://www.scylladb.com/): a Cassandra-compatible NoSQL
+  data store that can handle 1 million transactions per second on a
+  single server
+- [Seastar](http://www.seastar-project.org/): an advanced, open-source
+  C++ framework for high-performance server applications on modern
+  hardware
+- [spdlog](https://github.com/gabime/spdlog): super fast C++ logging
+  library
+- [Stellar](https://www.stellar.org/): financial platform
+- [Touch Surgery](https://www.touchsurgery.com/): surgery simulator
+- [TrinityCore](https://github.com/TrinityCore/TrinityCore):
+  open-source MMORPG framework
+- [🐙 userver framework](https://userver.tech/): open-source
+  asynchronous framework with a rich set of abstractions and database
+  drivers
+- [Windows Terminal](https://github.com/microsoft/terminal): the new
+  Windows terminal
+
+[More\...](https://github.com/search?q=fmtlib&type=Code)
+
+If you are aware of other projects using this library, please let me
+know by [email](mailto:victor.zverovich@gmail.com) or by submitting an
+[issue](https://github.com/fmtlib/fmt/issues).
+
+# Motivation
+
+So why yet another formatting library?
+
+There are plenty of methods for doing this task, from standard ones like
+the printf family of function and iostreams to Boost Format and
+FastFormat libraries. The reason for creating a new library is that
+every existing solution that I found either had serious issues or
+didn\'t provide all the features I needed.
+
+## printf
+
+The good thing about `printf` is that it is pretty fast and readily
+available being a part of the C standard library. The main drawback is
+that it doesn\'t support user-defined types. `printf` also has safety
+issues although they are somewhat mitigated with [\_\_attribute\_\_
+((format (printf,
+\...))](https://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html) in
+GCC. There is a POSIX extension that adds positional arguments required
+for
+[i18n](https://en.wikipedia.org/wiki/Internationalization_and_localization)
+to `printf` but it is not a part of C99 and may not be available on some
+platforms.
+
+## iostreams
+
+The main issue with iostreams is best illustrated with an example:
+
+``` c++
+std::cout << std::setprecision(2) << std::fixed << 1.23456 << "\n";
+```
+
+which is a lot of typing compared to printf:
+
+``` c++
+printf("%.2f\n", 1.23456);
+```
+
+Matthew Wilson, the author of FastFormat, called this \"chevron hell\".
+iostreams don\'t support positional arguments by design.
+
+The good part is that iostreams support user-defined types and are safe
+although error handling is awkward.
+
+## Boost Format
+
+This is a very powerful library that supports both `printf`-like format
+strings and positional arguments. Its main drawback is performance.
+According to various benchmarks, it is much slower than other methods
+considered here. Boost Format also has excessive build times and severe
+code bloat issues (see [Benchmarks](#benchmarks)).
+
+## FastFormat
+
+This is an interesting library that is fast, safe, and has positional
+arguments. However, it has significant limitations, citing its author:
+
+> Three features that have no hope of being accommodated within the
+> current design are:
+>
+> - Leading zeros (or any other non-space padding)
+> - Octal/hexadecimal encoding
+> - Runtime width/alignment specification
+
+It is also quite big and has a heavy dependency, STLSoft, which might be
+too restrictive for using it in some projects.
+
+## Boost Spirit.Karma
+
+This is not a formatting library but I decided to include it here for
+completeness. As iostreams, it suffers from the problem of mixing
+verbatim text with arguments. The library is pretty fast, but slower on
+integer formatting than `fmt::format_to` with format string compilation
+on Karma\'s own benchmark, see [Converting a hundred million integers to
+strings per
+second](http://www.zverovich.net/2020/06/13/fast-int-to-string-revisited.html).
+
+# License
+
+{fmt} is distributed under the MIT
+[license](https://github.com/fmtlib/fmt/blob/master/LICENSE).
+
+# Documentation License
+
+The [Format String Syntax](https://fmt.dev/latest/syntax.html) section
+in the documentation is based on the one from Python [string module
+documentation](https://docs.python.org/3/library/string.html#module-string).
+For this reason, the documentation is distributed under the Python
+Software Foundation license available in
+[doc/python-license.txt](https://raw.github.com/fmtlib/fmt/master/doc/python-license.txt).
+It only applies if you distribute the documentation of {fmt}.
+
+# Maintainers
+
+The {fmt} library is maintained by Victor Zverovich
+([vitaut](https://github.com/vitaut)) with contributions from many other
+people. See
+[Contributors](https://github.com/fmtlib/fmt/graphs/contributors) and
+[Releases](https://github.com/fmtlib/fmt/releases) for some of the
+names. Let us know if your contribution is not listed or mentioned
+incorrectly and we\'ll make it right.
+
+# Security Policy
+
+To report a security issue, please disclose it at [security
+advisory](https://github.com/fmtlib/fmt/security/advisories/new).
+
+This project is maintained by a team of volunteers on a
+reasonable-effort basis. As such, please give us at least 90 days to
+work on a fix before public exposure.
diff --git a/contrib/fmt/README.rst b/contrib/fmt/README.rst
deleted file mode 100644
index f51fefab7..000000000
--- a/contrib/fmt/README.rst
+++ /dev/null
@@ -1,542 +0,0 @@
-.. image:: https://user-images.githubusercontent.com/
-           576385/156254208-f5b743a9-88cf-439d-b0c0-923d53e8d551.png
-   :width: 25%
-   :alt: {fmt}
-
-.. image:: https://github.com/fmtlib/fmt/workflows/linux/badge.svg
-   :target: https://github.com/fmtlib/fmt/actions?query=workflow%3Alinux
-
-.. image:: https://github.com/fmtlib/fmt/workflows/macos/badge.svg
-   :target: https://github.com/fmtlib/fmt/actions?query=workflow%3Amacos
-
-.. image:: https://github.com/fmtlib/fmt/workflows/windows/badge.svg
-   :target: https://github.com/fmtlib/fmt/actions?query=workflow%3Awindows
-
-.. image:: https://oss-fuzz-build-logs.storage.googleapis.com/badges/fmt.svg
-   :alt: fmt is continuously fuzzed at oss-fuzz
-   :target: https://bugs.chromium.org/p/oss-fuzz/issues/list?\
-            colspec=ID%20Type%20Component%20Status%20Proj%20Reported%20Owner%20\
-            Summary&q=proj%3Dfmt&can=1
-
-.. image:: https://img.shields.io/badge/stackoverflow-fmt-blue.svg
-   :alt: Ask questions at StackOverflow with the tag fmt
-   :target: https://stackoverflow.com/questions/tagged/fmt
-
-**{fmt}** is an open-source formatting library providing a fast and safe
-alternative to C stdio and C++ iostreams.
-
-If you like this project, please consider donating to one of the funds that
-help victims of the war in Ukraine: https://www.stopputin.net/.
-
-`Documentation <https://fmt.dev>`__
-
-`Cheat Sheets <https://hackingcpp.com/cpp/libs/fmt.html>`__
-
-Q&A: ask questions on `StackOverflow with the tag fmt
-<https://stackoverflow.com/questions/tagged/fmt>`_.
-
-Try {fmt} in `Compiler Explorer <https://godbolt.org/z/Eq5763>`_.
-
-Features
---------
-
-* Simple `format API <https://fmt.dev/latest/api.html>`_ with positional arguments
-  for localization
-* Implementation of `C++20 std::format
-  <https://en.cppreference.com/w/cpp/utility/format>`__
-* `Format string syntax <https://fmt.dev/latest/syntax.html>`_ similar to Python's
-  `format <https://docs.python.org/3/library/stdtypes.html#str.format>`_
-* Fast IEEE 754 floating-point formatter with correct rounding, shortness and
-  round-trip guarantees using the `Dragonbox <https://github.com/jk-jeon/dragonbox>`_
-  algorithm
-* Portable Unicode support
-* Safe `printf implementation
-  <https://fmt.dev/latest/api.html#printf-formatting>`_ including the POSIX
-  extension for positional arguments
-* Extensibility: `support for user-defined types
-  <https://fmt.dev/latest/api.html#formatting-user-defined-types>`_
-* High performance: faster than common standard library implementations of
-  ``(s)printf``, iostreams, ``to_string`` and ``to_chars``, see `Speed tests`_
-  and `Converting a hundred million integers to strings per second
-  <http://www.zverovich.net/2020/06/13/fast-int-to-string-revisited.html>`_
-* Small code size both in terms of source code with the minimum configuration
-  consisting of just three files, ``core.h``, ``format.h`` and ``format-inl.h``,
-  and compiled code; see `Compile time and code bloat`_
-* Reliability: the library has an extensive set of `tests
-  <https://github.com/fmtlib/fmt/tree/master/test>`_ and is `continuously fuzzed
-  <https://bugs.chromium.org/p/oss-fuzz/issues/list?colspec=ID%20Type%20
-  Component%20Status%20Proj%20Reported%20Owner%20Summary&q=proj%3Dfmt&can=1>`_
-* Safety: the library is fully type-safe, errors in format strings can be
-  reported at compile time, automatic memory management prevents buffer overflow
-  errors
-* Ease of use: small self-contained code base, no external dependencies,
-  permissive MIT `license
-  <https://github.com/fmtlib/fmt/blob/master/LICENSE.rst>`_
-* `Portability <https://fmt.dev/latest/index.html#portability>`_ with
-  consistent output across platforms and support for older compilers
-* Clean warning-free codebase even on high warning levels such as
-  ``-Wall -Wextra -pedantic``
-* Locale independence by default
-* Optional header-only configuration enabled with the ``FMT_HEADER_ONLY`` macro
-
-See the `documentation <https://fmt.dev>`_ for more details.
-
-Examples
---------
-
-**Print to stdout** (`run <https://godbolt.org/z/Tevcjh>`_)
-
-.. code:: c++
-
-    #include <fmt/core.h>
-    
-    int main() {
-      fmt::print("Hello, world!\n");
-    }
-
-**Format a string** (`run <https://godbolt.org/z/oK8h33>`_)
-
-.. code:: c++
-
-    std::string s = fmt::format("The answer is {}.", 42);
-    // s == "The answer is 42."
-
-**Format a string using positional arguments** (`run <https://godbolt.org/z/Yn7Txe>`_)
-
-.. code:: c++
-
-    std::string s = fmt::format("I'd rather be {1} than {0}.", "right", "happy");
-    // s == "I'd rather be happy than right."
-
-**Print chrono durations** (`run <https://godbolt.org/z/K8s4Mc>`_)
-
-.. code:: c++
-
-    #include <fmt/chrono.h>
-
-    int main() {
-      using namespace std::literals::chrono_literals;
-      fmt::print("Default format: {} {}\n", 42s, 100ms);
-      fmt::print("strftime-like format: {:%H:%M:%S}\n", 3h + 15min + 30s);
-    }
-
-Output::
-
-    Default format: 42s 100ms
-    strftime-like format: 03:15:30
-
-**Print a container** (`run <https://godbolt.org/z/MxM1YqjE7>`_)
-
-.. code:: c++
-
-    #include <vector>
-    #include <fmt/ranges.h>
-
-    int main() {
-      std::vector<int> v = {1, 2, 3};
-      fmt::print("{}\n", v);
-    }
-
-Output::
-
-    [1, 2, 3]
-
-**Check a format string at compile time**
-
-.. code:: c++
-
-    std::string s = fmt::format("{:d}", "I am not a number");
-
-This gives a compile-time error in C++20 because ``d`` is an invalid format
-specifier for a string.
-
-**Write a file from a single thread**
-
-.. code:: c++
-
-    #include <fmt/os.h>
-
-    int main() {
-      auto out = fmt::output_file("guide.txt");
-      out.print("Don't {}", "Panic");
-    }
-
-This can be `5 to 9 times faster than fprintf
-<http://www.zverovich.net/2020/08/04/optimal-file-buffer-size.html>`_.
-
-**Print with colors and text styles**
-
-.. code:: c++
-
-    #include <fmt/color.h>
-
-    int main() {
-      fmt::print(fg(fmt::color::crimson) | fmt::emphasis::bold,
-                 "Hello, {}!\n", "world");
-      fmt::print(fg(fmt::color::floral_white) | bg(fmt::color::slate_gray) |
-                 fmt::emphasis::underline, "Hello, {}!\n", "мир");
-      fmt::print(fg(fmt::color::steel_blue) | fmt::emphasis::italic,
-                 "Hello, {}!\n", "世界");
-    }
-
-Output on a modern terminal:
-
-.. image:: https://user-images.githubusercontent.com/
-           576385/88485597-d312f600-cf2b-11ea-9cbe-61f535a86e28.png
-
-Benchmarks
-----------
-
-Speed tests
-~~~~~~~~~~~
-
-================= ============= ===========
-Library           Method        Run Time, s
-================= ============= ===========
-libc              printf          0.91
-libc++            std::ostream    2.49
-{fmt} 9.1         fmt::print      0.74
-Boost Format 1.80 boost::format   6.26
-Folly Format      folly::format   1.87
-================= ============= ===========
-
-{fmt} is the fastest of the benchmarked methods, ~20% faster than ``printf``.
-
-The above results were generated by building ``tinyformat_test.cpp`` on macOS
-12.6.1 with ``clang++ -O3 -DNDEBUG -DSPEED_TEST -DHAVE_FORMAT``, and taking the
-best of three runs. In the test, the format string ``"%0.10f:%04d:%+g:%s:%p:%c:%%\n"``
-or equivalent is filled 2,000,000 times with output sent to ``/dev/null``; for
-further details refer to the `source
-<https://github.com/fmtlib/format-benchmark/blob/master/src/tinyformat-test.cc>`_.
-
-{fmt} is up to 20-30x faster than ``std::ostringstream`` and ``sprintf`` on
-IEEE754 ``float`` and ``double`` formatting (`dtoa-benchmark <https://github.com/fmtlib/dtoa-benchmark>`_)
-and faster than `double-conversion <https://github.com/google/double-conversion>`_ and
-`ryu <https://github.com/ulfjack/ryu>`_:
-
-.. image:: https://user-images.githubusercontent.com/576385/
-           95684665-11719600-0ba8-11eb-8e5b-972ff4e49428.png
-   :target: https://fmt.dev/unknown_mac64_clang12.0.html
-
-Compile time and code bloat
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The script `bloat-test.py
-<https://github.com/fmtlib/format-benchmark/blob/master/bloat-test.py>`_
-from `format-benchmark <https://github.com/fmtlib/format-benchmark>`_
-tests compile time and code bloat for nontrivial projects.
-It generates 100 translation units and uses ``printf()`` or its alternative
-five times in each to simulate a medium-sized project.  The resulting
-executable size and compile time (Apple LLVM version 8.1.0 (clang-802.0.42),
-macOS Sierra, best of three) is shown in the following tables.
-
-**Optimized build (-O3)**
-
-============= =============== ==================== ==================
-Method        Compile Time, s Executable size, KiB Stripped size, KiB
-============= =============== ==================== ==================
-printf                    2.6                   29                 26
-printf+string            16.4                   29                 26
-iostreams                31.1                   59                 55
-{fmt}                    19.0                   37                 34
-Boost Format             91.9                  226                203
-Folly Format            115.7                  101                 88
-============= =============== ==================== ==================
-
-As you can see, {fmt} has 60% less overhead in terms of resulting binary code
-size compared to iostreams and comes pretty close to ``printf``. Boost Format
-and Folly Format have the largest overheads.
-
-``printf+string`` is the same as ``printf`` but with an extra ``<string>``
-include to measure the overhead of the latter.
-
-**Non-optimized build**
-
-============= =============== ==================== ==================
-Method        Compile Time, s Executable size, KiB Stripped size, KiB
-============= =============== ==================== ==================
-printf                    2.2                   33                 30
-printf+string            16.0                   33                 30
-iostreams                28.3                   56                 52
-{fmt}                    18.2                   59                 50
-Boost Format             54.1                  365                303
-Folly Format             79.9                  445                430
-============= =============== ==================== ==================
-
-``libc``, ``lib(std)c++``, and ``libfmt`` are all linked as shared libraries to
-compare formatting function overhead only. Boost Format is a
-header-only library so it doesn't provide any linkage options.
-
-Running the tests
-~~~~~~~~~~~~~~~~~
-
-Please refer to `Building the library`__ for instructions on how to build
-the library and run the unit tests.
-
-__ https://fmt.dev/latest/usage.html#building-the-library
-
-Benchmarks reside in a separate repository,
-`format-benchmarks <https://github.com/fmtlib/format-benchmark>`_,
-so to run the benchmarks you first need to clone this repository and
-generate Makefiles with CMake::
-
-    $ git clone --recursive https://github.com/fmtlib/format-benchmark.git
-    $ cd format-benchmark
-    $ cmake .
-
-Then you can run the speed test::
-
-    $ make speed-test
-
-or the bloat test::
-
-    $ make bloat-test
-    
-Migrating code
---------------
-
-`clang-tidy <https://clang.llvm.org/extra/clang-tidy/>`_ v17 (not yet
-released) provides the `modernize-use-std-print
-<https://clang.llvm.org/extra/clang-tidy/checks/modernize/use-std-print.html>`_
-check that is capable of converting occurrences of ``printf`` and
-``fprintf`` to ``fmt::print`` if configured to do so. (By default it
-converts to ``std::print``.)
-
-Projects using this library
----------------------------
-
-* `0 A.D. <https://play0ad.com/>`_: a free, open-source, cross-platform
-  real-time strategy game
-
-* `AMPL/MP <https://github.com/ampl/mp>`_:
-  an open-source library for mathematical programming
-
-* `Aseprite <https://github.com/aseprite/aseprite>`_:
-  animated sprite editor & pixel art tool 
-
-* `AvioBook <https://www.aviobook.aero/en>`_: a comprehensive aircraft
-  operations suite
-  
-* `Blizzard Battle.net <https://battle.net/>`_: an online gaming platform
-  
-* `Celestia <https://celestia.space/>`_: real-time 3D visualization of space
-
-* `Ceph <https://ceph.com/>`_: a scalable distributed storage system
-
-* `ccache <https://ccache.dev/>`_: a compiler cache
-
-* `ClickHouse <https://github.com/ClickHouse/ClickHouse>`_: an analytical database
-  management system
-  
-* `Contour <https://github.com/contour-terminal/contour/>`_: a modern terminal emulator
-
-* `CUAUV <https://cuauv.org/>`_: Cornell University's autonomous underwater
-  vehicle
-
-* `Drake <https://drake.mit.edu/>`_: a planning, control, and analysis toolbox
-  for nonlinear dynamical systems (MIT)
-
-* `Envoy <https://lyft.github.io/envoy/>`_: C++ L7 proxy and communication bus
-  (Lyft)
-
-* `FiveM <https://fivem.net/>`_: a modification framework for GTA V
-
-* `fmtlog <https://github.com/MengRao/fmtlog>`_: a performant fmtlib-style
-  logging library with latency in nanoseconds
-
-* `Folly <https://github.com/facebook/folly>`_: Facebook open-source library
-
-* `GemRB <https://gemrb.org/>`_: a portable open-source implementation of
-  Bioware’s Infinity Engine
-
-* `Grand Mountain Adventure
-  <https://store.steampowered.com/app/1247360/Grand_Mountain_Adventure/>`_:
-  a beautiful open-world ski & snowboarding game
-
-* `HarpyWar/pvpgn <https://github.com/pvpgn/pvpgn-server>`_:
-  Player vs Player Gaming Network with tweaks
-
-* `KBEngine <https://github.com/kbengine/kbengine>`_: an open-source MMOG server
-  engine
-
-* `Keypirinha <https://keypirinha.com/>`_: a semantic launcher for Windows
-
-* `Kodi <https://kodi.tv/>`_ (formerly xbmc): home theater software
-
-* `Knuth <https://kth.cash/>`_: high-performance Bitcoin full-node
-
-* `libunicode <https://github.com/contour-terminal/libunicode/>`_: a modern C++17 Unicode library
-
-* `MariaDB <https://mariadb.org/>`_: relational database management system
-
-* `Microsoft Verona <https://github.com/microsoft/verona>`_:
-  research programming language for concurrent ownership
-
-* `MongoDB <https://mongodb.com/>`_: distributed document database
-
-* `MongoDB Smasher <https://github.com/duckie/mongo_smasher>`_: a small tool to
-  generate randomized datasets
-
-* `OpenSpace <https://openspaceproject.com/>`_: an open-source
-  astrovisualization framework
-
-* `PenUltima Online (POL) <https://www.polserver.com/>`_:
-  an MMO server, compatible with most Ultima Online clients
-
-* `PyTorch <https://github.com/pytorch/pytorch>`_: an open-source machine
-  learning library
-
-* `quasardb <https://www.quasardb.net/>`_: a distributed, high-performance,
-  associative database
-  
-* `Quill <https://github.com/odygrd/quill>`_: asynchronous low-latency logging library
-
-* `QKW <https://github.com/ravijanjam/qkw>`_: generalizing aliasing to simplify
-  navigation, and executing complex multi-line terminal command sequences
-
-* `redis-cerberus <https://github.com/HunanTV/redis-cerberus>`_: a Redis cluster
-  proxy
-
-* `redpanda <https://vectorized.io/redpanda>`_: a 10x faster Kafka® replacement
-  for mission-critical systems written in C++
-
-* `rpclib <http://rpclib.net/>`_: a modern C++ msgpack-RPC server and client
-  library
-
-* `Salesforce Analytics Cloud
-  <https://www.salesforce.com/analytics-cloud/overview/>`_:
-  business intelligence software
-
-* `Scylla <https://www.scylladb.com/>`_: a Cassandra-compatible NoSQL data store
-  that can handle 1 million transactions per second on a single server
-
-* `Seastar <http://www.seastar-project.org/>`_: an advanced, open-source C++
-  framework for high-performance server applications on modern hardware
-
-* `spdlog <https://github.com/gabime/spdlog>`_: super fast C++ logging library
-
-* `Stellar <https://www.stellar.org/>`_: financial platform
-
-* `Touch Surgery <https://www.touchsurgery.com/>`_: surgery simulator
-
-* `TrinityCore <https://github.com/TrinityCore/TrinityCore>`_: open-source
-  MMORPG framework
-
-* `🐙 userver framework <https://userver.tech/>`_: open-source asynchronous
-  framework with a rich set of abstractions and database drivers
-
-* `Windows Terminal <https://github.com/microsoft/terminal>`_: the new Windows
-  terminal
-
-`More... <https://github.com/search?q=fmtlib&type=Code>`_
-
-If you are aware of other projects using this library, please let me know
-by `email <mailto:victor.zverovich@gmail.com>`_ or by submitting an
-`issue <https://github.com/fmtlib/fmt/issues>`_.
-
-Motivation
-----------
-
-So why yet another formatting library?
-
-There are plenty of methods for doing this task, from standard ones like
-the printf family of function and iostreams to Boost Format and FastFormat
-libraries. The reason for creating a new library is that every existing
-solution that I found either had serious issues or didn't provide
-all the features I needed.
-
-printf
-~~~~~~
-
-The good thing about ``printf`` is that it is pretty fast and readily available
-being a part of the C standard library. The main drawback is that it
-doesn't support user-defined types. ``printf`` also has safety issues although
-they are somewhat mitigated with `__attribute__ ((format (printf, ...))
-<https://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html>`_ in GCC.
-There is a POSIX extension that adds positional arguments required for
-`i18n <https://en.wikipedia.org/wiki/Internationalization_and_localization>`_
-to ``printf`` but it is not a part of C99 and may not be available on some
-platforms.
-
-iostreams
-~~~~~~~~~
-
-The main issue with iostreams is best illustrated with an example:
-
-.. code:: c++
-
-    std::cout << std::setprecision(2) << std::fixed << 1.23456 << "\n";
-
-which is a lot of typing compared to printf:
-
-.. code:: c++
-
-    printf("%.2f\n", 1.23456);
-
-Matthew Wilson, the author of FastFormat, called this "chevron hell". iostreams
-don't support positional arguments by design.
-
-The good part is that iostreams support user-defined types and are safe although
-error handling is awkward.
-
-Boost Format
-~~~~~~~~~~~~
-
-This is a very powerful library that supports both ``printf``-like format
-strings and positional arguments. Its main drawback is performance. According to
-various benchmarks, it is much slower than other methods considered here. Boost
-Format also has excessive build times and severe code bloat issues (see
-`Benchmarks`_).
-
-FastFormat
-~~~~~~~~~~
-
-This is an interesting library that is fast, safe, and has positional arguments.
-However, it has significant limitations, citing its author:
-
-    Three features that have no hope of being accommodated within the
-    current design are:
-
-    * Leading zeros (or any other non-space padding)
-    * Octal/hexadecimal encoding
-    * Runtime width/alignment specification
-
-It is also quite big and has a heavy dependency, STLSoft, which might be too
-restrictive for using it in some projects.
-
-Boost Spirit.Karma
-~~~~~~~~~~~~~~~~~~
-
-This is not a formatting library but I decided to include it here for
-completeness. As iostreams, it suffers from the problem of mixing verbatim text
-with arguments. The library is pretty fast, but slower on integer formatting
-than ``fmt::format_to`` with format string compilation on Karma's own benchmark,
-see `Converting a hundred million integers to strings per second
-<http://www.zverovich.net/2020/06/13/fast-int-to-string-revisited.html>`_.
-
-License
--------
-
-{fmt} is distributed under the MIT `license
-<https://github.com/fmtlib/fmt/blob/master/LICENSE.rst>`_.
-
-Documentation License
----------------------
-
-The `Format String Syntax <https://fmt.dev/latest/syntax.html>`_
-section in the documentation is based on the one from Python `string module
-documentation <https://docs.python.org/3/library/string.html#module-string>`_.
-For this reason, the documentation is distributed under the Python Software
-Foundation license available in `doc/python-license.txt
-<https://raw.github.com/fmtlib/fmt/master/doc/python-license.txt>`_.
-It only applies if you distribute the documentation of {fmt}.
-
-Maintainers
------------
-
-The {fmt} library is maintained by Victor Zverovich (`vitaut
-<https://github.com/vitaut>`_) with contributions from many other people.
-See `Contributors <https://github.com/fmtlib/fmt/graphs/contributors>`_ and
-`Releases <https://github.com/fmtlib/fmt/releases>`_ for some of the names.
-Let us know if your contribution is not listed or mentioned incorrectly and
-we'll make it right.
diff --git a/contrib/fmt/include/fmt/args.h b/contrib/fmt/include/fmt/args.h
index 2d684e7cc..ad1654bbb 100644
--- a/contrib/fmt/include/fmt/args.h
+++ b/contrib/fmt/include/fmt/args.h
@@ -22,8 +22,9 @@ template <typename T> struct is_reference_wrapper : std::false_type {};
 template <typename T>
 struct is_reference_wrapper<std::reference_wrapper<T>> : std::true_type {};
 
-template <typename T> const T& unwrap(const T& v) { return v; }
-template <typename T> const T& unwrap(const std::reference_wrapper<T>& v) {
+template <typename T> auto unwrap(const T& v) -> const T& { return v; }
+template <typename T>
+auto unwrap(const std::reference_wrapper<T>& v) -> const T& {
   return static_cast<const T&>(v);
 }
 
@@ -50,7 +51,7 @@ class dynamic_arg_list {
   std::unique_ptr<node<>> head_;
 
  public:
-  template <typename T, typename Arg> const T& push(const Arg& arg) {
+  template <typename T, typename Arg> auto push(const Arg& arg) -> const T& {
     auto new_node = std::unique_ptr<typed_node<T>>(new typed_node<T>(arg));
     auto& value = new_node->value;
     new_node->next = std::move(head_);
@@ -110,14 +111,14 @@ class dynamic_format_arg_store
 
   friend class basic_format_args<Context>;
 
-  unsigned long long get_types() const {
+  auto get_types() const -> unsigned long long {
     return detail::is_unpacked_bit | data_.size() |
            (named_info_.empty()
                 ? 0ULL
                 : static_cast<unsigned long long>(detail::has_named_args_bit));
   }
 
-  const basic_format_arg<Context>* data() const {
+  auto data() const -> const basic_format_arg<Context>* {
     return named_info_.empty() ? data_.data() : data_.data() + 1;
   }
 
diff --git a/contrib/fmt/include/fmt/chrono.h b/contrib/fmt/include/fmt/chrono.h
index ff3e1445b..9d54574e1 100644
--- a/contrib/fmt/include/fmt/chrono.h
+++ b/contrib/fmt/include/fmt/chrono.h
@@ -18,7 +18,7 @@
 #include <ostream>
 #include <type_traits>
 
-#include "format.h"
+#include "ostream.h"  // formatbuf
 
 FMT_BEGIN_NAMESPACE
 
@@ -72,7 +72,8 @@ template <typename To, typename From,
           FMT_ENABLE_IF(!std::is_same<From, To>::value &&
                         std::numeric_limits<From>::is_signed ==
                             std::numeric_limits<To>::is_signed)>
-FMT_CONSTEXPR To lossless_integral_conversion(const From from, int& ec) {
+FMT_CONSTEXPR auto lossless_integral_conversion(const From from, int& ec)
+    -> To {
   ec = 0;
   using F = std::numeric_limits<From>;
   using T = std::numeric_limits<To>;
@@ -101,7 +102,8 @@ template <typename To, typename From,
           FMT_ENABLE_IF(!std::is_same<From, To>::value &&
                         std::numeric_limits<From>::is_signed !=
                             std::numeric_limits<To>::is_signed)>
-FMT_CONSTEXPR To lossless_integral_conversion(const From from, int& ec) {
+FMT_CONSTEXPR auto lossless_integral_conversion(const From from, int& ec)
+    -> To {
   ec = 0;
   using F = std::numeric_limits<From>;
   using T = std::numeric_limits<To>;
@@ -133,7 +135,8 @@ FMT_CONSTEXPR To lossless_integral_conversion(const From from, int& ec) {
 
 template <typename To, typename From,
           FMT_ENABLE_IF(std::is_same<From, To>::value)>
-FMT_CONSTEXPR To lossless_integral_conversion(const From from, int& ec) {
+FMT_CONSTEXPR auto lossless_integral_conversion(const From from, int& ec)
+    -> To {
   ec = 0;
   return from;
 }  // function
@@ -154,7 +157,7 @@ FMT_CONSTEXPR To lossless_integral_conversion(const From from, int& ec) {
 // clang-format on
 template <typename To, typename From,
           FMT_ENABLE_IF(!std::is_same<From, To>::value)>
-FMT_CONSTEXPR To safe_float_conversion(const From from, int& ec) {
+FMT_CONSTEXPR auto safe_float_conversion(const From from, int& ec) -> To {
   ec = 0;
   using T = std::numeric_limits<To>;
   static_assert(std::is_floating_point<From>::value, "From must be floating");
@@ -176,7 +179,7 @@ FMT_CONSTEXPR To safe_float_conversion(const From from, int& ec) {
 
 template <typename To, typename From,
           FMT_ENABLE_IF(std::is_same<From, To>::value)>
-FMT_CONSTEXPR To safe_float_conversion(const From from, int& ec) {
+FMT_CONSTEXPR auto safe_float_conversion(const From from, int& ec) -> To {
   ec = 0;
   static_assert(std::is_floating_point<From>::value, "From must be floating");
   return from;
@@ -188,8 +191,8 @@ FMT_CONSTEXPR To safe_float_conversion(const From from, int& ec) {
 template <typename To, typename FromRep, typename FromPeriod,
           FMT_ENABLE_IF(std::is_integral<FromRep>::value),
           FMT_ENABLE_IF(std::is_integral<typename To::rep>::value)>
-To safe_duration_cast(std::chrono::duration<FromRep, FromPeriod> from,
-                      int& ec) {
+auto safe_duration_cast(std::chrono::duration<FromRep, FromPeriod> from,
+                        int& ec) -> To {
   using From = std::chrono::duration<FromRep, FromPeriod>;
   ec = 0;
   // the basic idea is that we need to convert from count() in the from type
@@ -240,8 +243,8 @@ To safe_duration_cast(std::chrono::duration<FromRep, FromPeriod> from,
 template <typename To, typename FromRep, typename FromPeriod,
           FMT_ENABLE_IF(std::is_floating_point<FromRep>::value),
           FMT_ENABLE_IF(std::is_floating_point<typename To::rep>::value)>
-To safe_duration_cast(std::chrono::duration<FromRep, FromPeriod> from,
-                      int& ec) {
+auto safe_duration_cast(std::chrono::duration<FromRep, FromPeriod> from,
+                        int& ec) -> To {
   using From = std::chrono::duration<FromRep, FromPeriod>;
   ec = 0;
   if (std::isnan(from.count())) {
@@ -321,12 +324,12 @@ To safe_duration_cast(std::chrono::duration<FromRep, FromPeriod> from,
 
 namespace detail {
 template <typename T = void> struct null {};
-inline null<> localtime_r FMT_NOMACRO(...) { return null<>(); }
-inline null<> localtime_s(...) { return null<>(); }
-inline null<> gmtime_r(...) { return null<>(); }
-inline null<> gmtime_s(...) { return null<>(); }
+inline auto localtime_r FMT_NOMACRO(...) -> null<> { return null<>(); }
+inline auto localtime_s(...) -> null<> { return null<>(); }
+inline auto gmtime_r(...) -> null<> { return null<>(); }
+inline auto gmtime_s(...) -> null<> { return null<>(); }
 
-inline const std::locale& get_classic_locale() {
+inline auto get_classic_locale() -> const std::locale& {
   static const auto& locale = std::locale::classic();
   return locale;
 }
@@ -336,8 +339,6 @@ template <typename CodeUnit> struct codecvt_result {
   CodeUnit buf[max_size];
   CodeUnit* end;
 };
-template <typename CodeUnit>
-constexpr const size_t codecvt_result<CodeUnit>::max_size;
 
 template <typename CodeUnit>
 void write_codecvt(codecvt_result<CodeUnit>& out, string_view in_buf,
@@ -408,8 +409,7 @@ inline void do_write(buffer<Char>& buf, const std::tm& time,
   auto&& format_buf = formatbuf<std::basic_streambuf<Char>>(buf);
   auto&& os = std::basic_ostream<Char>(&format_buf);
   os.imbue(loc);
-  using iterator = std::ostreambuf_iterator<Char>;
-  const auto& facet = std::use_facet<std::time_put<Char, iterator>>(loc);
+  const auto& facet = std::use_facet<std::time_put<Char>>(loc);
   auto end = facet.put(os, os, Char(' '), &time, format, modifier);
   if (end.failed()) FMT_THROW(format_error("failed to format time"));
 }
@@ -432,6 +432,51 @@ auto write(OutputIt out, const std::tm& time, const std::locale& loc,
   return write_encoded_tm_str(out, string_view(buf.data(), buf.size()), loc);
 }
 
+template <typename Rep1, typename Rep2>
+struct is_same_arithmetic_type
+    : public std::integral_constant<bool,
+                                    (std::is_integral<Rep1>::value &&
+                                     std::is_integral<Rep2>::value) ||
+                                        (std::is_floating_point<Rep1>::value &&
+                                         std::is_floating_point<Rep2>::value)> {
+};
+
+template <
+    typename To, typename FromRep, typename FromPeriod,
+    FMT_ENABLE_IF(is_same_arithmetic_type<FromRep, typename To::rep>::value)>
+auto fmt_duration_cast(std::chrono::duration<FromRep, FromPeriod> from) -> To {
+#if FMT_SAFE_DURATION_CAST
+  // Throwing version of safe_duration_cast is only available for
+  // integer to integer or float to float casts.
+  int ec;
+  To to = safe_duration_cast::safe_duration_cast<To>(from, ec);
+  if (ec) FMT_THROW(format_error("cannot format duration"));
+  return to;
+#else
+  // Standard duration cast, may overflow.
+  return std::chrono::duration_cast<To>(from);
+#endif
+}
+
+template <
+    typename To, typename FromRep, typename FromPeriod,
+    FMT_ENABLE_IF(!is_same_arithmetic_type<FromRep, typename To::rep>::value)>
+auto fmt_duration_cast(std::chrono::duration<FromRep, FromPeriod> from) -> To {
+  // Mixed integer <-> float cast is not supported by safe_duration_cast.
+  return std::chrono::duration_cast<To>(from);
+}
+
+template <typename Duration>
+auto to_time_t(
+    std::chrono::time_point<std::chrono::system_clock, Duration> time_point)
+    -> std::time_t {
+  // Cannot use std::chrono::system_clock::to_time_t since this would first
+  // require a cast to std::chrono::system_clock::time_point, which could
+  // overflow.
+  return fmt_duration_cast<std::chrono::duration<std::time_t>>(
+             time_point.time_since_epoch())
+      .count();
+}
 }  // namespace detail
 
 FMT_BEGIN_EXPORT
@@ -441,29 +486,29 @@ FMT_BEGIN_EXPORT
   expressed in local time. Unlike ``std::localtime``, this function is
   thread-safe on most platforms.
  */
-inline std::tm localtime(std::time_t time) {
+inline auto localtime(std::time_t time) -> std::tm {
   struct dispatcher {
     std::time_t time_;
     std::tm tm_;
 
     dispatcher(std::time_t t) : time_(t) {}
 
-    bool run() {
+    auto run() -> bool {
       using namespace fmt::detail;
       return handle(localtime_r(&time_, &tm_));
     }
 
-    bool handle(std::tm* tm) { return tm != nullptr; }
+    auto handle(std::tm* tm) -> bool { return tm != nullptr; }
 
-    bool handle(detail::null<>) {
+    auto handle(detail::null<>) -> bool {
       using namespace fmt::detail;
       return fallback(localtime_s(&tm_, &time_));
     }
 
-    bool fallback(int res) { return res == 0; }
+    auto fallback(int res) -> bool { return res == 0; }
 
 #if !FMT_MSC_VERSION
-    bool fallback(detail::null<>) {
+    auto fallback(detail::null<>) -> bool {
       using namespace fmt::detail;
       std::tm* tm = std::localtime(&time_);
       if (tm) tm_ = *tm;
@@ -480,8 +525,8 @@ inline std::tm localtime(std::time_t time) {
 #if FMT_USE_LOCAL_TIME
 template <typename Duration>
 inline auto localtime(std::chrono::local_time<Duration> time) -> std::tm {
-  return localtime(std::chrono::system_clock::to_time_t(
-      std::chrono::current_zone()->to_sys(time)));
+  return localtime(
+      detail::to_time_t(std::chrono::current_zone()->to_sys(time)));
 }
 #endif
 
@@ -490,29 +535,29 @@ inline auto localtime(std::chrono::local_time<Duration> time) -> std::tm {
   expressed in Coordinated Universal Time (UTC). Unlike ``std::gmtime``, this
   function is thread-safe on most platforms.
  */
-inline std::tm gmtime(std::time_t time) {
+inline auto gmtime(std::time_t time) -> std::tm {
   struct dispatcher {
     std::time_t time_;
     std::tm tm_;
 
     dispatcher(std::time_t t) : time_(t) {}
 
-    bool run() {
+    auto run() -> bool {
       using namespace fmt::detail;
       return handle(gmtime_r(&time_, &tm_));
     }
 
-    bool handle(std::tm* tm) { return tm != nullptr; }
+    auto handle(std::tm* tm) -> bool { return tm != nullptr; }
 
-    bool handle(detail::null<>) {
+    auto handle(detail::null<>) -> bool {
       using namespace fmt::detail;
       return fallback(gmtime_s(&tm_, &time_));
     }
 
-    bool fallback(int res) { return res == 0; }
+    auto fallback(int res) -> bool { return res == 0; }
 
 #if !FMT_MSC_VERSION
-    bool fallback(detail::null<>) {
+    auto fallback(detail::null<>) -> bool {
       std::tm* tm = std::gmtime(&time_);
       if (tm) tm_ = *tm;
       return tm != nullptr;
@@ -525,9 +570,11 @@ inline std::tm gmtime(std::time_t time) {
   return gt.tm_;
 }
 
-inline std::tm gmtime(
-    std::chrono::time_point<std::chrono::system_clock> time_point) {
-  return gmtime(std::chrono::system_clock::to_time_t(time_point));
+template <typename Duration>
+inline auto gmtime(
+    std::chrono::time_point<std::chrono::system_clock, Duration> time_point)
+    -> std::tm {
+  return gmtime(detail::to_time_t(time_point));
 }
 
 namespace detail {
@@ -566,7 +613,8 @@ inline void write_digit2_separated(char* buf, unsigned a, unsigned b,
   }
 }
 
-template <typename Period> FMT_CONSTEXPR inline const char* get_units() {
+template <typename Period>
+FMT_CONSTEXPR inline auto get_units() -> const char* {
   if (std::is_same<Period, std::atto>::value) return "as";
   if (std::is_same<Period, std::femto>::value) return "fs";
   if (std::is_same<Period, std::pico>::value) return "ps";
@@ -584,8 +632,9 @@ template <typename Period> FMT_CONSTEXPR inline const char* get_units() {
   if (std::is_same<Period, std::tera>::value) return "Ts";
   if (std::is_same<Period, std::peta>::value) return "Ps";
   if (std::is_same<Period, std::exa>::value) return "Es";
-  if (std::is_same<Period, std::ratio<60>>::value) return "m";
+  if (std::is_same<Period, std::ratio<60>>::value) return "min";
   if (std::is_same<Period, std::ratio<3600>>::value) return "h";
+  if (std::is_same<Period, std::ratio<86400>>::value) return "d";
   return nullptr;
 }
 
@@ -621,9 +670,8 @@ auto write_padding(OutputIt out, pad_type pad) -> OutputIt {
 
 // Parses a put_time-like format string and invokes handler actions.
 template <typename Char, typename Handler>
-FMT_CONSTEXPR const Char* parse_chrono_format(const Char* begin,
-                                              const Char* end,
-                                              Handler&& handler) {
+FMT_CONSTEXPR auto parse_chrono_format(const Char* begin, const Char* end,
+                                       Handler&& handler) -> const Char* {
   if (begin == end || *begin == '}') return begin;
   if (*begin != '%') FMT_THROW(format_error("invalid format"));
   auto ptr = begin;
@@ -954,25 +1002,25 @@ struct tm_format_checker : null_chrono_spec_handler<tm_format_checker> {
   FMT_CONSTEXPR void on_tz_name() {}
 };
 
-inline const char* tm_wday_full_name(int wday) {
+inline auto tm_wday_full_name(int wday) -> const char* {
   static constexpr const char* full_name_list[] = {
       "Sunday",   "Monday", "Tuesday", "Wednesday",
       "Thursday", "Friday", "Saturday"};
   return wday >= 0 && wday <= 6 ? full_name_list[wday] : "?";
 }
-inline const char* tm_wday_short_name(int wday) {
+inline auto tm_wday_short_name(int wday) -> const char* {
   static constexpr const char* short_name_list[] = {"Sun", "Mon", "Tue", "Wed",
                                                     "Thu", "Fri", "Sat"};
   return wday >= 0 && wday <= 6 ? short_name_list[wday] : "???";
 }
 
-inline const char* tm_mon_full_name(int mon) {
+inline auto tm_mon_full_name(int mon) -> const char* {
   static constexpr const char* full_name_list[] = {
       "January", "February", "March",     "April",   "May",      "June",
       "July",    "August",   "September", "October", "November", "December"};
   return mon >= 0 && mon <= 11 ? full_name_list[mon] : "?";
 }
-inline const char* tm_mon_short_name(int mon) {
+inline auto tm_mon_short_name(int mon) -> const char* {
   static constexpr const char* short_name_list[] = {
       "Jan", "Feb", "Mar", "Apr", "May", "Jun",
       "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
@@ -1004,21 +1052,21 @@ inline void tzset_once() {
 
 // Converts value to Int and checks that it's in the range [0, upper).
 template <typename T, typename Int, FMT_ENABLE_IF(std::is_integral<T>::value)>
-inline Int to_nonnegative_int(T value, Int upper) {
-  FMT_ASSERT(std::is_unsigned<Int>::value ||
-                 (value >= 0 && to_unsigned(value) <= to_unsigned(upper)),
-             "invalid value");
-  (void)upper;
+inline auto to_nonnegative_int(T value, Int upper) -> Int {
+  if (!std::is_unsigned<Int>::value &&
+      (value < 0 || to_unsigned(value) > to_unsigned(upper))) {
+    FMT_THROW(fmt::format_error("chrono value is out of range"));
+  }
   return static_cast<Int>(value);
 }
 template <typename T, typename Int, FMT_ENABLE_IF(!std::is_integral<T>::value)>
-inline Int to_nonnegative_int(T value, Int upper) {
+inline auto to_nonnegative_int(T value, Int upper) -> Int {
   if (value < 0 || value > static_cast<T>(upper))
     FMT_THROW(format_error("invalid value"));
   return static_cast<Int>(value);
 }
 
-constexpr long long pow10(std::uint32_t n) {
+constexpr auto pow10(std::uint32_t n) -> long long {
   return n == 0 ? 1 : 10 * pow10(n - 1);
 }
 
@@ -1052,13 +1100,12 @@ void write_fractional_seconds(OutputIt& out, Duration d, int precision = -1) {
                                 std::chrono::seconds::rep>::type,
       std::ratio<1, detail::pow10(num_fractional_digits)>>;
 
-  const auto fractional =
-      d - std::chrono::duration_cast<std::chrono::seconds>(d);
+  const auto fractional = d - fmt_duration_cast<std::chrono::seconds>(d);
   const auto subseconds =
       std::chrono::treat_as_floating_point<
           typename subsecond_precision::rep>::value
           ? fractional.count()
-          : std::chrono::duration_cast<subsecond_precision>(fractional).count();
+          : fmt_duration_cast<subsecond_precision>(fractional).count();
   auto n = static_cast<uint32_or_64_or_128_t<long long>>(subseconds);
   const int num_digits = detail::count_digits(n);
 
@@ -1109,11 +1156,11 @@ void write_floating_seconds(memory_buffer& buf, Duration duration,
       num_fractional_digits = 6;
   }
 
-  format_to(std::back_inserter(buf), FMT_STRING("{:.{}f}"),
-            std::fmod(val * static_cast<rep>(Duration::period::num) /
-                          static_cast<rep>(Duration::period::den),
-                      static_cast<rep>(60)),
-            num_fractional_digits);
+  fmt::format_to(std::back_inserter(buf), FMT_STRING("{:.{}f}"),
+                 std::fmod(val * static_cast<rep>(Duration::period::num) /
+                               static_cast<rep>(Duration::period::den),
+                           static_cast<rep>(60)),
+                 num_fractional_digits);
 }
 
 template <typename OutputIt, typename Char,
@@ -1174,8 +1221,7 @@ class tm_writer {
     return static_cast<int>(l);
   }
 
-  // Algorithm:
-  // https://en.wikipedia.org/wiki/ISO_week_date#Calculating_the_week_number_from_a_month_and_day_of_the_month_or_ordinal_date
+  // Algorithm: https://en.wikipedia.org/wiki/ISO_week_date.
   auto iso_year_weeks(long long curr_year) const noexcept -> int {
     const auto prev_year = curr_year - 1;
     const auto curr_p =
@@ -1315,7 +1361,7 @@ class tm_writer {
         subsecs_(subsecs),
         tm_(tm) {}
 
-  OutputIt out() const { return out_; }
+  auto out() const -> OutputIt { return out_; }
 
   FMT_CONSTEXPR void on_text(const Char* begin, const Char* end) {
     out_ = copy_str<Char>(begin, end, out_);
@@ -1579,6 +1625,7 @@ struct chrono_format_checker : null_chrono_spec_handler<chrono_format_checker> {
 
   template <typename Char>
   FMT_CONSTEXPR void on_text(const Char*, const Char*) {}
+  FMT_CONSTEXPR void on_day_of_year() {}
   FMT_CONSTEXPR void on_24_hour(numeric_system, pad_type) {}
   FMT_CONSTEXPR void on_12_hour(numeric_system, pad_type) {}
   FMT_CONSTEXPR void on_minute(numeric_system, pad_type) {}
@@ -1597,16 +1644,16 @@ struct chrono_format_checker : null_chrono_spec_handler<chrono_format_checker> {
 
 template <typename T,
           FMT_ENABLE_IF(std::is_integral<T>::value&& has_isfinite<T>::value)>
-inline bool isfinite(T) {
+inline auto isfinite(T) -> bool {
   return true;
 }
 
 template <typename T, FMT_ENABLE_IF(std::is_integral<T>::value)>
-inline T mod(T x, int y) {
+inline auto mod(T x, int y) -> T {
   return x % static_cast<T>(y);
 }
 template <typename T, FMT_ENABLE_IF(std::is_floating_point<T>::value)>
-inline T mod(T x, int y) {
+inline auto mod(T x, int y) -> T {
   return std::fmod(x, static_cast<T>(y));
 }
 
@@ -1621,49 +1668,38 @@ template <typename T> struct make_unsigned_or_unchanged<T, true> {
   using type = typename std::make_unsigned<T>::type;
 };
 
-#if FMT_SAFE_DURATION_CAST
-// throwing version of safe_duration_cast
-template <typename To, typename FromRep, typename FromPeriod>
-To fmt_safe_duration_cast(std::chrono::duration<FromRep, FromPeriod> from) {
-  int ec;
-  To to = safe_duration_cast::safe_duration_cast<To>(from, ec);
-  if (ec) FMT_THROW(format_error("cannot format duration"));
-  return to;
-}
-#endif
-
 template <typename Rep, typename Period,
           FMT_ENABLE_IF(std::is_integral<Rep>::value)>
-inline std::chrono::duration<Rep, std::milli> get_milliseconds(
-    std::chrono::duration<Rep, Period> d) {
+inline auto get_milliseconds(std::chrono::duration<Rep, Period> d)
+    -> std::chrono::duration<Rep, std::milli> {
   // this may overflow and/or the result may not fit in the
   // target type.
 #if FMT_SAFE_DURATION_CAST
   using CommonSecondsType =
       typename std::common_type<decltype(d), std::chrono::seconds>::type;
-  const auto d_as_common = fmt_safe_duration_cast<CommonSecondsType>(d);
+  const auto d_as_common = fmt_duration_cast<CommonSecondsType>(d);
   const auto d_as_whole_seconds =
-      fmt_safe_duration_cast<std::chrono::seconds>(d_as_common);
+      fmt_duration_cast<std::chrono::seconds>(d_as_common);
   // this conversion should be nonproblematic
   const auto diff = d_as_common - d_as_whole_seconds;
   const auto ms =
-      fmt_safe_duration_cast<std::chrono::duration<Rep, std::milli>>(diff);
+      fmt_duration_cast<std::chrono::duration<Rep, std::milli>>(diff);
   return ms;
 #else
-  auto s = std::chrono::duration_cast<std::chrono::seconds>(d);
-  return std::chrono::duration_cast<std::chrono::milliseconds>(d - s);
+  auto s = fmt_duration_cast<std::chrono::seconds>(d);
+  return fmt_duration_cast<std::chrono::milliseconds>(d - s);
 #endif
 }
 
 template <typename Char, typename Rep, typename OutputIt,
           FMT_ENABLE_IF(std::is_integral<Rep>::value)>
-OutputIt format_duration_value(OutputIt out, Rep val, int) {
+auto format_duration_value(OutputIt out, Rep val, int) -> OutputIt {
   return write<Char>(out, val);
 }
 
 template <typename Char, typename Rep, typename OutputIt,
           FMT_ENABLE_IF(std::is_floating_point<Rep>::value)>
-OutputIt format_duration_value(OutputIt out, Rep val, int precision) {
+auto format_duration_value(OutputIt out, Rep val, int precision) -> OutputIt {
   auto specs = format_specs<Char>();
   specs.precision = precision;
   specs.type = precision >= 0 ? presentation_type::fixed_lower
@@ -1672,12 +1708,12 @@ OutputIt format_duration_value(OutputIt out, Rep val, int precision) {
 }
 
 template <typename Char, typename OutputIt>
-OutputIt copy_unit(string_view unit, OutputIt out, Char) {
+auto copy_unit(string_view unit, OutputIt out, Char) -> OutputIt {
   return std::copy(unit.begin(), unit.end(), out);
 }
 
 template <typename OutputIt>
-OutputIt copy_unit(string_view unit, OutputIt out, wchar_t) {
+auto copy_unit(string_view unit, OutputIt out, wchar_t) -> OutputIt {
   // This works when wchar_t is UTF-32 because units only contain characters
   // that have the same representation in UTF-16 and UTF-32.
   utf8_to_utf16 u(unit);
@@ -1685,7 +1721,7 @@ OutputIt copy_unit(string_view unit, OutputIt out, wchar_t) {
 }
 
 template <typename Char, typename Period, typename OutputIt>
-OutputIt format_duration_unit(OutputIt out) {
+auto format_duration_unit(OutputIt out) -> OutputIt {
   if (const char* unit = get_units<Period>())
     return copy_unit(string_view(unit), out, Char());
   *out++ = '[';
@@ -1752,18 +1788,12 @@ struct chrono_formatter {
 
     // this may overflow and/or the result may not fit in the
     // target type.
-#if FMT_SAFE_DURATION_CAST
     // might need checked conversion (rep!=Rep)
-    auto tmpval = std::chrono::duration<rep, Period>(val);
-    s = fmt_safe_duration_cast<seconds>(tmpval);
-#else
-    s = std::chrono::duration_cast<seconds>(
-        std::chrono::duration<rep, Period>(val));
-#endif
+    s = fmt_duration_cast<seconds>(std::chrono::duration<rep, Period>(val));
   }
 
   // returns true if nan or inf, writes to out.
-  bool handle_nan_inf() {
+  auto handle_nan_inf() -> bool {
     if (isfinite(val)) {
       return false;
     }
@@ -1780,17 +1810,22 @@ struct chrono_formatter {
     return true;
   }
 
-  Rep hour() const { return static_cast<Rep>(mod((s.count() / 3600), 24)); }
+  auto days() const -> Rep { return static_cast<Rep>(s.count() / 86400); }
+  auto hour() const -> Rep {
+    return static_cast<Rep>(mod((s.count() / 3600), 24));
+  }
 
-  Rep hour12() const {
+  auto hour12() const -> Rep {
     Rep hour = static_cast<Rep>(mod((s.count() / 3600), 12));
     return hour <= 0 ? 12 : hour;
   }
 
-  Rep minute() const { return static_cast<Rep>(mod((s.count() / 60), 60)); }
-  Rep second() const { return static_cast<Rep>(mod(s.count(), 60)); }
+  auto minute() const -> Rep {
+    return static_cast<Rep>(mod((s.count() / 60), 60));
+  }
+  auto second() const -> Rep { return static_cast<Rep>(mod(s.count(), 60)); }
 
-  std::tm time() const {
+  auto time() const -> std::tm {
     auto time = std::tm();
     time.tm_hour = to_nonnegative_int(hour(), 24);
     time.tm_min = to_nonnegative_int(minute(), 60);
@@ -1858,10 +1893,14 @@ struct chrono_formatter {
   void on_dec0_week_of_year(numeric_system) {}
   void on_dec1_week_of_year(numeric_system) {}
   void on_iso_week_of_year(numeric_system) {}
-  void on_day_of_year() {}
   void on_day_of_month(numeric_system) {}
   void on_day_of_month_space(numeric_system) {}
 
+  void on_day_of_year() {
+    if (handle_nan_inf()) return;
+    write(days(), 0);
+  }
+
   void on_24_hour(numeric_system ns, pad_type pad) {
     if (handle_nan_inf()) return;
 
@@ -1968,7 +2007,7 @@ class weekday {
   weekday() = default;
   explicit constexpr weekday(unsigned wd) noexcept
       : value(static_cast<unsigned char>(wd != 7 ? wd : 0)) {}
-  constexpr unsigned c_encoding() const noexcept { return value; }
+  constexpr auto c_encoding() const noexcept -> unsigned { return value; }
 };
 
 class year_month_day {};
@@ -2083,25 +2122,22 @@ struct formatter<std::chrono::time_point<std::chrono::system_clock, Duration>,
             period::num != 1 || period::den != 1 ||
             std::is_floating_point<typename Duration::rep>::value)) {
       const auto epoch = val.time_since_epoch();
-      auto subsecs = std::chrono::duration_cast<Duration>(
-          epoch - std::chrono::duration_cast<std::chrono::seconds>(epoch));
+      auto subsecs = detail::fmt_duration_cast<Duration>(
+          epoch - detail::fmt_duration_cast<std::chrono::seconds>(epoch));
 
       if (subsecs.count() < 0) {
         auto second =
-            std::chrono::duration_cast<Duration>(std::chrono::seconds(1));
+            detail::fmt_duration_cast<Duration>(std::chrono::seconds(1));
         if (epoch.count() < ((Duration::min)() + second).count())
           FMT_THROW(format_error("duration is too small"));
         subsecs += second;
         val -= second;
       }
 
-      return formatter<std::tm, Char>::do_format(
-          gmtime(std::chrono::time_point_cast<std::chrono::seconds>(val)), ctx,
-          &subsecs);
+      return formatter<std::tm, Char>::do_format(gmtime(val), ctx, &subsecs);
     }
 
-    return formatter<std::tm, Char>::format(
-        gmtime(std::chrono::time_point_cast<std::chrono::seconds>(val)), ctx);
+    return formatter<std::tm, Char>::format(gmtime(val), ctx);
   }
 };
 
@@ -2120,17 +2156,13 @@ struct formatter<std::chrono::local_time<Duration>, Char>
     if (period::num != 1 || period::den != 1 ||
         std::is_floating_point<typename Duration::rep>::value) {
       const auto epoch = val.time_since_epoch();
-      const auto subsecs = std::chrono::duration_cast<Duration>(
-          epoch - std::chrono::duration_cast<std::chrono::seconds>(epoch));
+      const auto subsecs = detail::fmt_duration_cast<Duration>(
+          epoch - detail::fmt_duration_cast<std::chrono::seconds>(epoch));
 
-      return formatter<std::tm, Char>::do_format(
-          localtime(std::chrono::time_point_cast<std::chrono::seconds>(val)),
-          ctx, &subsecs);
+      return formatter<std::tm, Char>::do_format(localtime(val), ctx, &subsecs);
     }
 
-    return formatter<std::tm, Char>::format(
-        localtime(std::chrono::time_point_cast<std::chrono::seconds>(val)),
-        ctx);
+    return formatter<std::tm, Char>::format(localtime(val), ctx);
   }
 };
 #endif
diff --git a/contrib/fmt/include/fmt/color.h b/contrib/fmt/include/fmt/color.h
index 8697e1ca0..367849a86 100644
--- a/contrib/fmt/include/fmt/color.h
+++ b/contrib/fmt/include/fmt/color.h
@@ -233,7 +233,7 @@ class text_style {
   FMT_CONSTEXPR text_style(emphasis em = emphasis()) noexcept
       : set_foreground_color(), set_background_color(), ems(em) {}
 
-  FMT_CONSTEXPR text_style& operator|=(const text_style& rhs) {
+  FMT_CONSTEXPR auto operator|=(const text_style& rhs) -> text_style& {
     if (!set_foreground_color) {
       set_foreground_color = rhs.set_foreground_color;
       foreground_color = rhs.foreground_color;
@@ -257,29 +257,29 @@ class text_style {
     return *this;
   }
 
-  friend FMT_CONSTEXPR text_style operator|(text_style lhs,
-                                            const text_style& rhs) {
+  friend FMT_CONSTEXPR auto operator|(text_style lhs, const text_style& rhs)
+      -> text_style {
     return lhs |= rhs;
   }
 
-  FMT_CONSTEXPR bool has_foreground() const noexcept {
+  FMT_CONSTEXPR auto has_foreground() const noexcept -> bool {
     return set_foreground_color;
   }
-  FMT_CONSTEXPR bool has_background() const noexcept {
+  FMT_CONSTEXPR auto has_background() const noexcept -> bool {
     return set_background_color;
   }
-  FMT_CONSTEXPR bool has_emphasis() const noexcept {
+  FMT_CONSTEXPR auto has_emphasis() const noexcept -> bool {
     return static_cast<uint8_t>(ems) != 0;
   }
-  FMT_CONSTEXPR detail::color_type get_foreground() const noexcept {
+  FMT_CONSTEXPR auto get_foreground() const noexcept -> detail::color_type {
     FMT_ASSERT(has_foreground(), "no foreground specified for this style");
     return foreground_color;
   }
-  FMT_CONSTEXPR detail::color_type get_background() const noexcept {
+  FMT_CONSTEXPR auto get_background() const noexcept -> detail::color_type {
     FMT_ASSERT(has_background(), "no background specified for this style");
     return background_color;
   }
-  FMT_CONSTEXPR emphasis get_emphasis() const noexcept {
+  FMT_CONSTEXPR auto get_emphasis() const noexcept -> emphasis {
     FMT_ASSERT(has_emphasis(), "no emphasis specified for this style");
     return ems;
   }
@@ -297,9 +297,11 @@ class text_style {
     }
   }
 
-  friend FMT_CONSTEXPR text_style fg(detail::color_type foreground) noexcept;
+  friend FMT_CONSTEXPR auto fg(detail::color_type foreground) noexcept
+      -> text_style;
 
-  friend FMT_CONSTEXPR text_style bg(detail::color_type background) noexcept;
+  friend FMT_CONSTEXPR auto bg(detail::color_type background) noexcept
+      -> text_style;
 
   detail::color_type foreground_color;
   detail::color_type background_color;
@@ -309,16 +311,19 @@ class text_style {
 };
 
 /** Creates a text style from the foreground (text) color. */
-FMT_CONSTEXPR inline text_style fg(detail::color_type foreground) noexcept {
+FMT_CONSTEXPR inline auto fg(detail::color_type foreground) noexcept
+    -> text_style {
   return text_style(true, foreground);
 }
 
 /** Creates a text style from the background color. */
-FMT_CONSTEXPR inline text_style bg(detail::color_type background) noexcept {
+FMT_CONSTEXPR inline auto bg(detail::color_type background) noexcept
+    -> text_style {
   return text_style(false, background);
 }
 
-FMT_CONSTEXPR inline text_style operator|(emphasis lhs, emphasis rhs) noexcept {
+FMT_CONSTEXPR inline auto operator|(emphasis lhs, emphasis rhs) noexcept
+    -> text_style {
   return text_style(lhs) | rhs;
 }
 
@@ -384,8 +389,8 @@ template <typename Char> struct ansi_color_escape {
   }
   FMT_CONSTEXPR operator const Char*() const noexcept { return buffer; }
 
-  FMT_CONSTEXPR const Char* begin() const noexcept { return buffer; }
-  FMT_CONSTEXPR_CHAR_TRAITS const Char* end() const noexcept {
+  FMT_CONSTEXPR auto begin() const noexcept -> const Char* { return buffer; }
+  FMT_CONSTEXPR_CHAR_TRAITS auto end() const noexcept -> const Char* {
     return buffer + std::char_traits<Char>::length(buffer);
   }
 
@@ -400,25 +405,27 @@ template <typename Char> struct ansi_color_escape {
     out[2] = static_cast<Char>('0' + c % 10);
     out[3] = static_cast<Char>(delimiter);
   }
-  static FMT_CONSTEXPR bool has_emphasis(emphasis em, emphasis mask) noexcept {
+  static FMT_CONSTEXPR auto has_emphasis(emphasis em, emphasis mask) noexcept
+      -> bool {
     return static_cast<uint8_t>(em) & static_cast<uint8_t>(mask);
   }
 };
 
 template <typename Char>
-FMT_CONSTEXPR ansi_color_escape<Char> make_foreground_color(
-    detail::color_type foreground) noexcept {
+FMT_CONSTEXPR auto make_foreground_color(detail::color_type foreground) noexcept
+    -> ansi_color_escape<Char> {
   return ansi_color_escape<Char>(foreground, "\x1b[38;2;");
 }
 
 template <typename Char>
-FMT_CONSTEXPR ansi_color_escape<Char> make_background_color(
-    detail::color_type background) noexcept {
+FMT_CONSTEXPR auto make_background_color(detail::color_type background) noexcept
+    -> ansi_color_escape<Char> {
   return ansi_color_escape<Char>(background, "\x1b[48;2;");
 }
 
 template <typename Char>
-FMT_CONSTEXPR ansi_color_escape<Char> make_emphasis(emphasis em) noexcept {
+FMT_CONSTEXPR auto make_emphasis(emphasis em) noexcept
+    -> ansi_color_escape<Char> {
   return ansi_color_escape<Char>(em);
 }
 
@@ -427,9 +434,10 @@ template <typename Char> inline void reset_color(buffer<Char>& buffer) {
   buffer.append(reset_color.begin(), reset_color.end());
 }
 
-template <typename T> struct styled_arg {
+template <typename T> struct styled_arg : detail::view {
   const T& value;
   text_style style;
+  styled_arg(const T& v, text_style s) : value(v), style(s) {}
 };
 
 template <typename Char>
@@ -510,9 +518,10 @@ void print(const text_style& ts, const S& format_str, const Args&... args) {
 }
 
 template <typename S, typename Char = char_t<S>>
-inline std::basic_string<Char> vformat(
+inline auto vformat(
     const text_style& ts, const S& format_str,
-    basic_format_args<buffer_context<type_identity_t<Char>>> args) {
+    basic_format_args<buffer_context<type_identity_t<Char>>> args)
+    -> std::basic_string<Char> {
   basic_memory_buffer<Char> buf;
   detail::vformat_to(buf, ts, detail::to_string_view(format_str), args);
   return fmt::to_string(buf);
@@ -531,8 +540,8 @@ inline std::basic_string<Char> vformat(
   \endrst
 */
 template <typename S, typename... Args, typename Char = char_t<S>>
-inline std::basic_string<Char> format(const text_style& ts, const S& format_str,
-                                      const Args&... args) {
+inline auto format(const text_style& ts, const S& format_str,
+                   const Args&... args) -> std::basic_string<Char> {
   return fmt::vformat(ts, detail::to_string_view(format_str),
                       fmt::make_format_args<buffer_context<Char>>(args...));
 }
@@ -542,9 +551,10 @@ inline std::basic_string<Char> format(const text_style& ts, const S& format_str,
  */
 template <typename OutputIt, typename Char,
           FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value)>
-OutputIt vformat_to(
-    OutputIt out, const text_style& ts, basic_string_view<Char> format_str,
-    basic_format_args<buffer_context<type_identity_t<Char>>> args) {
+auto vformat_to(OutputIt out, const text_style& ts,
+                basic_string_view<Char> format_str,
+                basic_format_args<buffer_context<type_identity_t<Char>>> args)
+    -> OutputIt {
   auto&& buf = detail::get_buffer<Char>(out);
   detail::vformat_to(buf, ts, format_str, args);
   return detail::get_iterator(buf, out);
@@ -562,9 +572,10 @@ OutputIt vformat_to(
                    fmt::emphasis::bold | fg(fmt::color::red), "{}", 42);
   \endrst
 */
-template <typename OutputIt, typename S, typename... Args,
-          bool enable = detail::is_output_iterator<OutputIt, char_t<S>>::value&&
-              detail::is_string<S>::value>
+template <
+    typename OutputIt, typename S, typename... Args,
+    bool enable = detail::is_output_iterator<OutputIt, char_t<S>>::value &&
+                  detail::is_string<S>::value>
 inline auto format_to(OutputIt out, const text_style& ts, const S& format_str,
                       Args&&... args) ->
     typename std::enable_if<enable, OutputIt>::type {
diff --git a/contrib/fmt/include/fmt/compile.h b/contrib/fmt/include/fmt/compile.h
index a4c7e4956..3b3f166e0 100644
--- a/contrib/fmt/include/fmt/compile.h
+++ b/contrib/fmt/include/fmt/compile.h
@@ -14,8 +14,8 @@ FMT_BEGIN_NAMESPACE
 namespace detail {
 
 template <typename Char, typename InputIt>
-FMT_CONSTEXPR inline counting_iterator copy_str(InputIt begin, InputIt end,
-                                                counting_iterator it) {
+FMT_CONSTEXPR inline auto copy_str(InputIt begin, InputIt end,
+                                   counting_iterator it) -> counting_iterator {
   return it + (end - begin);
 }
 
@@ -57,7 +57,7 @@ struct udl_compiled_string : compiled_string {
 #endif
 
 template <typename T, typename... Tail>
-const T& first(const T& value, const Tail&...) {
+auto first(const T& value, const Tail&...) -> const T& {
   return value;
 }
 
@@ -488,18 +488,19 @@ FMT_CONSTEXPR OutputIt format_to(OutputIt out, const S&, Args&&... args) {
 
 template <typename OutputIt, typename S, typename... Args,
           FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
-format_to_n_result<OutputIt> format_to_n(OutputIt out, size_t n,
-                                         const S& format_str, Args&&... args) {
+auto format_to_n(OutputIt out, size_t n, const S& format_str, Args&&... args)
+    -> format_to_n_result<OutputIt> {
   using traits = detail::fixed_buffer_traits;
   auto buf = detail::iterator_buffer<OutputIt, char, traits>(out, n);
-  format_to(std::back_inserter(buf), format_str, std::forward<Args>(args)...);
+  fmt::format_to(std::back_inserter(buf), format_str,
+                 std::forward<Args>(args)...);
   return {buf.out(), buf.count()};
 }
 
 template <typename S, typename... Args,
           FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
-FMT_CONSTEXPR20 size_t formatted_size(const S& format_str,
-                                      const Args&... args) {
+FMT_CONSTEXPR20 auto formatted_size(const S& format_str, const Args&... args)
+    -> size_t {
   return fmt::format_to(detail::counting_iterator(), format_str, args...)
       .count();
 }
diff --git a/contrib/fmt/include/fmt/core.h b/contrib/fmt/include/fmt/core.h
index bfdca5f11..b51c1406a 100644
--- a/contrib/fmt/include/fmt/core.h
+++ b/contrib/fmt/include/fmt/core.h
@@ -18,7 +18,7 @@
 #include <type_traits>
 
 // The fmt library version in the form major * 10000 + minor * 100 + patch.
-#define FMT_VERSION 100100
+#define FMT_VERSION 100201
 
 #if defined(__clang__) && !defined(__ibmxl__)
 #  define FMT_CLANG_VERSION (__clang_major__ * 100 + __clang_minor__)
@@ -105,9 +105,12 @@
 #  define FMT_CONSTEXPR
 #endif
 
-#if ((FMT_CPLUSPLUS >= 202002L) &&                            \
-     (!defined(_GLIBCXX_RELEASE) || _GLIBCXX_RELEASE > 9)) || \
-    (FMT_CPLUSPLUS >= 201709L && FMT_GCC_VERSION >= 1002)
+#if (FMT_CPLUSPLUS >= 202002L ||                                \
+     (FMT_CPLUSPLUS >= 201709L && FMT_GCC_VERSION >= 1002)) &&  \
+    ((!defined(_GLIBCXX_RELEASE) || _GLIBCXX_RELEASE >= 10) &&  \
+     (!defined(_LIBCPP_VERSION) || _LIBCPP_VERSION >= 10000) && \
+     (!FMT_MSC_VERSION || FMT_MSC_VERSION >= 1928)) &&          \
+    defined(__cpp_lib_is_constant_evaluated)
 #  define FMT_CONSTEXPR20 constexpr
 #else
 #  define FMT_CONSTEXPR20
@@ -185,18 +188,20 @@
 #  define FMT_END_EXPORT
 #endif
 
+#if FMT_GCC_VERSION || FMT_CLANG_VERSION
+#  define FMT_VISIBILITY(value) __attribute__((visibility(value)))
+#else
+#  define FMT_VISIBILITY(value)
+#endif
+
 #if !defined(FMT_HEADER_ONLY) && defined(_WIN32)
-#  ifdef FMT_LIB_EXPORT
+#  if defined(FMT_LIB_EXPORT)
 #    define FMT_API __declspec(dllexport)
 #  elif defined(FMT_SHARED)
 #    define FMT_API __declspec(dllimport)
 #  endif
-#else
-#  if defined(FMT_LIB_EXPORT) || defined(FMT_SHARED)
-#    if defined(__GNUC__) || defined(__clang__)
-#      define FMT_API __attribute__((visibility("default")))
-#    endif
-#  endif
+#elif defined(FMT_LIB_EXPORT) || defined(FMT_SHARED)
+#  define FMT_API FMT_VISIBILITY("default")
 #endif
 #ifndef FMT_API
 #  define FMT_API
@@ -222,8 +227,9 @@
         __apple_build_version__ >= 14000029L) &&                 \
        FMT_CPLUSPLUS >= 202002L) ||                              \
       (defined(__cpp_consteval) &&                               \
-       (!FMT_MSC_VERSION || _MSC_FULL_VER >= 193030704))
-// consteval is broken in MSVC before VS2022 and Apple clang before 14.
+       (!FMT_MSC_VERSION || FMT_MSC_VERSION >= 1929))
+// consteval is broken in MSVC before VS2019 version 16.10 and Apple clang
+// before 14.
 #    define FMT_CONSTEVAL consteval
 #    define FMT_HAS_CONSTEVAL
 #  else
@@ -242,6 +248,15 @@
 #  endif
 #endif
 
+// GCC < 5 requires this-> in decltype
+#ifndef FMT_DECLTYPE_THIS
+#  if FMT_GCC_VERSION && FMT_GCC_VERSION < 500
+#    define FMT_DECLTYPE_THIS this->
+#  else
+#    define FMT_DECLTYPE_THIS
+#  endif
+#endif
+
 // Enable minimal optimizations for more compact code in debug mode.
 FMT_GCC_PRAGMA("GCC push_options")
 #if !defined(__OPTIMIZE__) && !defined(__NVCOMPILER) && !defined(__LCC__) && \
@@ -263,7 +278,9 @@ template <typename T>
 using remove_const_t = typename std::remove_const<T>::type;
 template <typename T>
 using remove_cvref_t = typename std::remove_cv<remove_reference_t<T>>::type;
-template <typename T> struct type_identity { using type = T; };
+template <typename T> struct type_identity {
+  using type = T;
+};
 template <typename T> using type_identity_t = typename type_identity<T>::type;
 template <typename T>
 using underlying_t = typename std::underlying_type<T>::type;
@@ -454,15 +471,15 @@ template <typename Char> class basic_string_view {
     size_ -= n;
   }
 
-  FMT_CONSTEXPR_CHAR_TRAITS bool starts_with(
-      basic_string_view<Char> sv) const noexcept {
+  FMT_CONSTEXPR_CHAR_TRAITS auto starts_with(
+      basic_string_view<Char> sv) const noexcept -> bool {
     return size_ >= sv.size_ &&
            std::char_traits<Char>::compare(data_, sv.data_, sv.size_) == 0;
   }
-  FMT_CONSTEXPR_CHAR_TRAITS bool starts_with(Char c) const noexcept {
+  FMT_CONSTEXPR_CHAR_TRAITS auto starts_with(Char c) const noexcept -> bool {
     return size_ >= 1 && std::char_traits<Char>::eq(*data_, c);
   }
-  FMT_CONSTEXPR_CHAR_TRAITS bool starts_with(const Char* s) const {
+  FMT_CONSTEXPR_CHAR_TRAITS auto starts_with(const Char* s) const -> bool {
     return starts_with(basic_string_view<Char>(s));
   }
 
@@ -600,10 +617,10 @@ FMT_TYPE_CONSTANT(const Char*, cstring_type);
 FMT_TYPE_CONSTANT(basic_string_view<Char>, string_type);
 FMT_TYPE_CONSTANT(const void*, pointer_type);
 
-constexpr bool is_integral_type(type t) {
+constexpr auto is_integral_type(type t) -> bool {
   return t > type::none_type && t <= type::last_integer_type;
 }
-constexpr bool is_arithmetic_type(type t) {
+constexpr auto is_arithmetic_type(type t) -> bool {
   return t > type::none_type && t <= type::last_numeric_type;
 }
 
@@ -627,6 +644,7 @@ enum {
   pointer_set = set(type::pointer_type)
 };
 
+// DEPRECATED!
 FMT_NORETURN FMT_API void throw_format_error(const char* message);
 
 struct error_handler {
@@ -804,7 +822,7 @@ template <typename T> class buffer {
  protected:
   // Don't initialize ptr_ since it is not accessed to save a few cycles.
   FMT_MSC_WARNING(suppress : 26495)
-  buffer(size_t sz) noexcept : size_(sz), capacity_(sz) {}
+  FMT_CONSTEXPR buffer(size_t sz) noexcept : size_(sz), capacity_(sz) {}
 
   FMT_CONSTEXPR20 buffer(T* p = nullptr, size_t sz = 0, size_t cap = 0) noexcept
       : ptr_(p), size_(sz), capacity_(cap) {}
@@ -819,6 +837,7 @@ template <typename T> class buffer {
   }
 
   /** Increases the buffer capacity to hold at least *capacity* elements. */
+  // DEPRECATED!
   virtual FMT_CONSTEXPR20 void grow(size_t capacity) = 0;
 
  public:
@@ -1305,6 +1324,7 @@ template <typename Context> class value {
     parse_ctx.advance_to(f.parse(parse_ctx));
     using qualified_type =
         conditional_t<has_const_formatter<T, Context>(), const T, T>;
+    // Calling format through a mutable reference is deprecated.
     ctx.advance_to(f.format(*static_cast<qualified_type*>(arg), ctx));
   }
 };
@@ -1318,7 +1338,7 @@ using ulong_type = conditional_t<long_short, unsigned, unsigned long long>;
 template <typename T> struct format_as_result {
   template <typename U,
             FMT_ENABLE_IF(std::is_enum<U>::value || std::is_class<U>::value)>
-  static auto map(U*) -> decltype(format_as(std::declval<U>()));
+  static auto map(U*) -> remove_cvref_t<decltype(format_as(std::declval<U>()))>;
   static auto map(...) -> void;
 
   using type = decltype(map(static_cast<T*>(nullptr)));
@@ -1420,9 +1440,8 @@ template <typename Context> struct arg_mapper {
       FMT_ENABLE_IF(
           std::is_pointer<T>::value || std::is_member_pointer<T>::value ||
           std::is_function<typename std::remove_pointer<T>::type>::value ||
-          (std::is_convertible<const T&, const void*>::value &&
-           !std::is_convertible<const T&, const char_type*>::value &&
-           !has_formatter<T, Context>::value))>
+          (std::is_array<T>::value &&
+           !std::is_convertible<T, const char_type*>::value))>
   FMT_CONSTEXPR auto map(const T&) -> unformattable_pointer {
     return {};
   }
@@ -1436,7 +1455,8 @@ template <typename Context> struct arg_mapper {
   // Only map owning types because mapping views can be unsafe.
   template <typename T, typename U = format_as_t<T>,
             FMT_ENABLE_IF(std::is_arithmetic<U>::value)>
-  FMT_CONSTEXPR FMT_INLINE auto map(const T& val) -> decltype(this->map(U())) {
+  FMT_CONSTEXPR FMT_INLINE auto map(const T& val)
+      -> decltype(FMT_DECLTYPE_THIS map(U())) {
     return map(format_as(val));
   }
 
@@ -1460,13 +1480,14 @@ template <typename Context> struct arg_mapper {
                           !is_string<U>::value && !is_char<U>::value &&
                           !is_named_arg<U>::value &&
                           !std::is_arithmetic<format_as_t<U>>::value)>
-  FMT_CONSTEXPR FMT_INLINE auto map(T& val) -> decltype(this->do_map(val)) {
+  FMT_CONSTEXPR FMT_INLINE auto map(T& val)
+      -> decltype(FMT_DECLTYPE_THIS do_map(val)) {
     return do_map(val);
   }
 
   template <typename T, FMT_ENABLE_IF(is_named_arg<T>::value)>
   FMT_CONSTEXPR FMT_INLINE auto map(const T& named_arg)
-      -> decltype(this->map(named_arg.value)) {
+      -> decltype(FMT_DECLTYPE_THIS map(named_arg.value)) {
     return map(named_arg.value);
   }
 
@@ -1505,7 +1526,9 @@ FMT_CONSTEXPR auto copy_str(R&& rng, OutputIt out) -> OutputIt {
 
 #if FMT_GCC_VERSION && FMT_GCC_VERSION < 500
 // A workaround for gcc 4.8 to make void_t work in a SFINAE context.
-template <typename...> struct void_t_impl { using type = void; };
+template <typename...> struct void_t_impl {
+  using type = void;
+};
 template <typename... T> using void_t = typename void_t_impl<T...>::type;
 #else
 template <typename...> using void_t = void;
@@ -1599,8 +1622,8 @@ FMT_CONSTEXPR inline auto make_arg(T& val) -> basic_format_arg<Context> {
 }  // namespace detail
 FMT_BEGIN_EXPORT
 
-// A formatting argument. It is a trivially copyable/constructible type to
-// allow storage in basic_memory_buffer.
+// A formatting argument. Context is a template parameter for the compiled API
+// where output can be unbuffered.
 template <typename Context> class basic_format_arg {
  private:
   detail::value<Context> value_;
@@ -1652,6 +1675,15 @@ template <typename Context> class basic_format_arg {
   auto is_arithmetic() const -> bool {
     return detail::is_arithmetic_type(type_);
   }
+
+  FMT_INLINE auto format_custom(const char_type* parse_begin,
+                                typename Context::parse_context_type& parse_ctx,
+                                Context& ctx) -> bool {
+    if (type_ != detail::type::custom_type) return false;
+    parse_ctx.advance_to(parse_begin);
+    value_.custom.format(value_.custom.value, parse_ctx, ctx);
+    return true;
+  }
 };
 
 /**
@@ -1662,7 +1694,6 @@ template <typename Context> class basic_format_arg {
   \endrst
  */
 // DEPRECATED!
-FMT_EXPORT
 template <typename Visitor, typename Context>
 FMT_CONSTEXPR FMT_INLINE auto visit_format_arg(
     Visitor&& vis, const basic_format_arg<Context>& arg) -> decltype(vis(0)) {
@@ -1741,6 +1772,7 @@ template <typename OutputIt, typename Char> class basic_format_context {
   }
   auto args() const -> const format_args& { return args_; }
 
+  // DEPRECATED!
   FMT_CONSTEXPR auto error_handler() -> detail::error_handler { return {}; }
   void on_error(const char* message) { error_handler().on_error(message); }
 
@@ -2302,9 +2334,12 @@ FMT_CONSTEXPR FMT_INLINE auto parse_format_specs(
     dynamic_format_specs<Char>& specs;
     type arg_type;
 
-    FMT_CONSTEXPR auto operator()(pres type, int set) -> const Char* {
-      if (!in(arg_type, set)) throw_format_error("invalid format specifier");
-      specs.type = type;
+    FMT_CONSTEXPR auto operator()(pres pres_type, int set) -> const Char* {
+      if (!in(arg_type, set)) {
+        if (arg_type == type::none_type) return begin;
+        throw_format_error("invalid format specifier");
+      }
+      specs.type = pres_type;
       return begin + 1;
     }
   } parse_presentation_type{begin, specs, arg_type};
@@ -2321,6 +2356,7 @@ FMT_CONSTEXPR FMT_INLINE auto parse_format_specs(
     case '+':
     case '-':
     case ' ':
+      if (arg_type == type::none_type) return begin;
       enter_state(state::sign, in(arg_type, sint_set | float_set));
       switch (c) {
       case '+':
@@ -2336,14 +2372,17 @@ FMT_CONSTEXPR FMT_INLINE auto parse_format_specs(
       ++begin;
       break;
     case '#':
+      if (arg_type == type::none_type) return begin;
       enter_state(state::hash, is_arithmetic_type(arg_type));
       specs.alt = true;
       ++begin;
       break;
     case '0':
       enter_state(state::zero);
-      if (!is_arithmetic_type(arg_type))
+      if (!is_arithmetic_type(arg_type)) {
+        if (arg_type == type::none_type) return begin;
         throw_format_error("format specifier requires numeric argument");
+      }
       if (specs.align == align::none) {
         // Ignore 0 if align is specified for compatibility with std::format.
         specs.align = align::numeric;
@@ -2365,12 +2404,14 @@ FMT_CONSTEXPR FMT_INLINE auto parse_format_specs(
       begin = parse_dynamic_spec(begin, end, specs.width, specs.width_ref, ctx);
       break;
     case '.':
+      if (arg_type == type::none_type) return begin;
       enter_state(state::precision,
                   in(arg_type, float_set | string_set | cstring_set));
       begin = parse_precision(begin, end, specs.precision, specs.precision_ref,
                               ctx);
       break;
     case 'L':
+      if (arg_type == type::none_type) return begin;
       enter_state(state::locale, is_arithmetic_type(arg_type));
       specs.localized = true;
       ++begin;
@@ -2404,6 +2445,8 @@ FMT_CONSTEXPR FMT_INLINE auto parse_format_specs(
     case 'G':
       return parse_presentation_type(pres::general_upper, float_set);
     case 'c':
+      if (arg_type == type::bool_type)
+        throw_format_error("invalid format specifier");
       return parse_presentation_type(pres::chr, integral_set);
     case 's':
       return parse_presentation_type(pres::string,
@@ -2543,8 +2586,8 @@ FMT_CONSTEXPR auto parse_format_specs(ParseContext& ctx)
       decltype(arg_mapper<context>().map(std::declval<const T&>())),
       typename strip_named_arg<T>::type>;
 #if defined(__cpp_if_constexpr)
-  if constexpr (std::is_default_constructible_v<
-                    formatter<mapped_type, char_type>>) {
+  if constexpr (std::is_default_constructible<
+                    formatter<mapped_type, char_type>>::value) {
     return formatter<mapped_type, char_type>().parse(ctx);
   } else {
     type_is_unformattable_for<T, char_type> _;
@@ -2669,7 +2712,9 @@ template <typename Char = char> struct vformat_args {
   using type = basic_format_args<
       basic_format_context<std::back_insert_iterator<buffer<Char>>, Char>>;
 };
-template <> struct vformat_args<char> { using type = format_args; };
+template <> struct vformat_args<char> {
+  using type = format_args;
+};
 
 // Use vformat_args and avoid type_identity to keep symbols short.
 template <typename Char>
diff --git a/contrib/fmt/include/fmt/format-inl.h b/contrib/fmt/include/fmt/format-inl.h
index dac2d437a..efac5d1f8 100644
--- a/contrib/fmt/include/fmt/format-inl.h
+++ b/contrib/fmt/include/fmt/format-inl.h
@@ -18,7 +18,7 @@
 #  include <locale>
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(FMT_WINDOWS_NO_WCHAR)
 #  include <io.h>  // _isatty
 #endif
 
@@ -58,8 +58,8 @@ FMT_FUNC void format_error_code(detail::buffer<char>& out, int error_code,
   error_code_size += detail::to_unsigned(detail::count_digits(abs_value));
   auto it = buffer_appender<char>(out);
   if (message.size() <= inline_buffer_size - error_code_size)
-    format_to(it, FMT_STRING("{}{}"), message, SEP);
-  format_to(it, FMT_STRING("{}{}"), ERROR_STR, error_code);
+    fmt::format_to(it, FMT_STRING("{}{}"), message, SEP);
+  fmt::format_to(it, FMT_STRING("{}{}"), ERROR_STR, error_code);
   FMT_ASSERT(out.size() <= inline_buffer_size, "");
 }
 
@@ -73,9 +73,8 @@ FMT_FUNC void report_error(format_func func, int error_code,
 }
 
 // A wrapper around fwrite that throws on error.
-inline void fwrite_fully(const void* ptr, size_t size, size_t count,
-                         FILE* stream) {
-  size_t written = std::fwrite(ptr, size, count, stream);
+inline void fwrite_fully(const void* ptr, size_t count, FILE* stream) {
+  size_t written = std::fwrite(ptr, 1, count, stream);
   if (written < count)
     FMT_THROW(system_error(errno, FMT_STRING("cannot write to file")));
 }
@@ -86,7 +85,7 @@ locale_ref::locale_ref(const Locale& loc) : locale_(&loc) {
   static_assert(std::is_same<Locale, std::locale>::value, "");
 }
 
-template <typename Locale> Locale locale_ref::get() const {
+template <typename Locale> auto locale_ref::get() const -> Locale {
   static_assert(std::is_same<Locale, std::locale>::value, "");
   return locale_ ? *static_cast<const std::locale*>(locale_) : std::locale();
 }
@@ -98,7 +97,8 @@ FMT_FUNC auto thousands_sep_impl(locale_ref loc) -> thousands_sep_result<Char> {
   auto thousands_sep = grouping.empty() ? Char() : facet.thousands_sep();
   return {std::move(grouping), thousands_sep};
 }
-template <typename Char> FMT_FUNC Char decimal_point_impl(locale_ref loc) {
+template <typename Char>
+FMT_FUNC auto decimal_point_impl(locale_ref loc) -> Char {
   return std::use_facet<std::numpunct<Char>>(loc.get<std::locale>())
       .decimal_point();
 }
@@ -144,24 +144,25 @@ FMT_API FMT_FUNC auto format_facet<std::locale>::do_put(
 }
 #endif
 
-FMT_FUNC std::system_error vsystem_error(int error_code, string_view fmt,
-                                         format_args args) {
+FMT_FUNC auto vsystem_error(int error_code, string_view fmt, format_args args)
+    -> std::system_error {
   auto ec = std::error_code(error_code, std::generic_category());
   return std::system_error(ec, vformat(fmt, args));
 }
 
 namespace detail {
 
-template <typename F> inline bool operator==(basic_fp<F> x, basic_fp<F> y) {
+template <typename F>
+inline auto operator==(basic_fp<F> x, basic_fp<F> y) -> bool {
   return x.f == y.f && x.e == y.e;
 }
 
 // Compilers should be able to optimize this into the ror instruction.
-FMT_CONSTEXPR inline uint32_t rotr(uint32_t n, uint32_t r) noexcept {
+FMT_CONSTEXPR inline auto rotr(uint32_t n, uint32_t r) noexcept -> uint32_t {
   r &= 31;
   return (n >> r) | (n << (32 - r));
 }
-FMT_CONSTEXPR inline uint64_t rotr(uint64_t n, uint32_t r) noexcept {
+FMT_CONSTEXPR inline auto rotr(uint64_t n, uint32_t r) noexcept -> uint64_t {
   r &= 63;
   return (n >> r) | (n << (64 - r));
 }
@@ -170,14 +171,14 @@ FMT_CONSTEXPR inline uint64_t rotr(uint64_t n, uint32_t r) noexcept {
 namespace dragonbox {
 // Computes upper 64 bits of multiplication of a 32-bit unsigned integer and a
 // 64-bit unsigned integer.
-inline uint64_t umul96_upper64(uint32_t x, uint64_t y) noexcept {
+inline auto umul96_upper64(uint32_t x, uint64_t y) noexcept -> uint64_t {
   return umul128_upper64(static_cast<uint64_t>(x) << 32, y);
 }
 
 // Computes lower 128 bits of multiplication of a 64-bit unsigned integer and a
 // 128-bit unsigned integer.
-inline uint128_fallback umul192_lower128(uint64_t x,
-                                         uint128_fallback y) noexcept {
+inline auto umul192_lower128(uint64_t x, uint128_fallback y) noexcept
+    -> uint128_fallback {
   uint64_t high = x * y.high();
   uint128_fallback high_low = umul128(x, y.low());
   return {high + high_low.high(), high_low.low()};
@@ -185,12 +186,12 @@ inline uint128_fallback umul192_lower128(uint64_t x,
 
 // Computes lower 64 bits of multiplication of a 32-bit unsigned integer and a
 // 64-bit unsigned integer.
-inline uint64_t umul96_lower64(uint32_t x, uint64_t y) noexcept {
+inline auto umul96_lower64(uint32_t x, uint64_t y) noexcept -> uint64_t {
   return x * y;
 }
 
 // Various fast log computations.
-inline int floor_log10_pow2_minus_log10_4_over_3(int e) noexcept {
+inline auto floor_log10_pow2_minus_log10_4_over_3(int e) noexcept -> int {
   FMT_ASSERT(e <= 2936 && e >= -2985, "too large exponent");
   return (e * 631305 - 261663) >> 21;
 }
@@ -204,7 +205,7 @@ FMT_INLINE_VARIABLE constexpr struct {
 // divisible by pow(10, N).
 // Precondition: n <= pow(10, N + 1).
 template <int N>
-bool check_divisibility_and_divide_by_pow10(uint32_t& n) noexcept {
+auto check_divisibility_and_divide_by_pow10(uint32_t& n) noexcept -> bool {
   // The numbers below are chosen such that:
   //   1. floor(n/d) = floor(nm / 2^k) where d=10 or d=100,
   //   2. nm mod 2^k < m if and only if n is divisible by d,
@@ -229,7 +230,7 @@ bool check_divisibility_and_divide_by_pow10(uint32_t& n) noexcept {
 
 // Computes floor(n / pow(10, N)) for small n and N.
 // Precondition: n <= pow(10, N + 1).
-template <int N> uint32_t small_division_by_pow10(uint32_t n) noexcept {
+template <int N> auto small_division_by_pow10(uint32_t n) noexcept -> uint32_t {
   constexpr auto info = div_small_pow10_infos[N - 1];
   FMT_ASSERT(n <= info.divisor * 10, "n is too large");
   constexpr uint32_t magic_number =
@@ -238,12 +239,12 @@ template <int N> uint32_t small_division_by_pow10(uint32_t n) noexcept {
 }
 
 // Computes floor(n / 10^(kappa + 1)) (float)
-inline uint32_t divide_by_10_to_kappa_plus_1(uint32_t n) noexcept {
+inline auto divide_by_10_to_kappa_plus_1(uint32_t n) noexcept -> uint32_t {
   // 1374389535 = ceil(2^37/100)
   return static_cast<uint32_t>((static_cast<uint64_t>(n) * 1374389535) >> 37);
 }
 // Computes floor(n / 10^(kappa + 1)) (double)
-inline uint64_t divide_by_10_to_kappa_plus_1(uint64_t n) noexcept {
+inline auto divide_by_10_to_kappa_plus_1(uint64_t n) noexcept -> uint64_t {
   // 2361183241434822607 = ceil(2^(64+7)/1000)
   return umul128_upper64(n, 2361183241434822607ull) >> 7;
 }
@@ -255,7 +256,7 @@ template <> struct cache_accessor<float> {
   using carrier_uint = float_info<float>::carrier_uint;
   using cache_entry_type = uint64_t;
 
-  static uint64_t get_cached_power(int k) noexcept {
+  static auto get_cached_power(int k) noexcept -> uint64_t {
     FMT_ASSERT(k >= float_info<float>::min_k && k <= float_info<float>::max_k,
                "k is out of range");
     static constexpr const uint64_t pow10_significands[] = {
@@ -297,20 +298,23 @@ template <> struct cache_accessor<float> {
     bool is_integer;
   };
 
-  static compute_mul_result compute_mul(
-      carrier_uint u, const cache_entry_type& cache) noexcept {
+  static auto compute_mul(carrier_uint u,
+                          const cache_entry_type& cache) noexcept
+      -> compute_mul_result {
     auto r = umul96_upper64(u, cache);
     return {static_cast<carrier_uint>(r >> 32),
             static_cast<carrier_uint>(r) == 0};
   }
 
-  static uint32_t compute_delta(const cache_entry_type& cache,
-                                int beta) noexcept {
+  static auto compute_delta(const cache_entry_type& cache, int beta) noexcept
+      -> uint32_t {
     return static_cast<uint32_t>(cache >> (64 - 1 - beta));
   }
 
-  static compute_mul_parity_result compute_mul_parity(
-      carrier_uint two_f, const cache_entry_type& cache, int beta) noexcept {
+  static auto compute_mul_parity(carrier_uint two_f,
+                                 const cache_entry_type& cache,
+                                 int beta) noexcept
+      -> compute_mul_parity_result {
     FMT_ASSERT(beta >= 1, "");
     FMT_ASSERT(beta < 64, "");
 
@@ -319,22 +323,22 @@ template <> struct cache_accessor<float> {
             static_cast<uint32_t>(r >> (32 - beta)) == 0};
   }
 
-  static carrier_uint compute_left_endpoint_for_shorter_interval_case(
-      const cache_entry_type& cache, int beta) noexcept {
+  static auto compute_left_endpoint_for_shorter_interval_case(
+      const cache_entry_type& cache, int beta) noexcept -> carrier_uint {
     return static_cast<carrier_uint>(
         (cache - (cache >> (num_significand_bits<float>() + 2))) >>
         (64 - num_significand_bits<float>() - 1 - beta));
   }
 
-  static carrier_uint compute_right_endpoint_for_shorter_interval_case(
-      const cache_entry_type& cache, int beta) noexcept {
+  static auto compute_right_endpoint_for_shorter_interval_case(
+      const cache_entry_type& cache, int beta) noexcept -> carrier_uint {
     return static_cast<carrier_uint>(
         (cache + (cache >> (num_significand_bits<float>() + 1))) >>
         (64 - num_significand_bits<float>() - 1 - beta));
   }
 
-  static carrier_uint compute_round_up_for_shorter_interval_case(
-      const cache_entry_type& cache, int beta) noexcept {
+  static auto compute_round_up_for_shorter_interval_case(
+      const cache_entry_type& cache, int beta) noexcept -> carrier_uint {
     return (static_cast<carrier_uint>(
                 cache >> (64 - num_significand_bits<float>() - 2 - beta)) +
             1) /
@@ -346,7 +350,7 @@ template <> struct cache_accessor<double> {
   using carrier_uint = float_info<double>::carrier_uint;
   using cache_entry_type = uint128_fallback;
 
-  static uint128_fallback get_cached_power(int k) noexcept {
+  static auto get_cached_power(int k) noexcept -> uint128_fallback {
     FMT_ASSERT(k >= float_info<double>::min_k && k <= float_info<double>::max_k,
                "k is out of range");
 
@@ -985,8 +989,7 @@ template <> struct cache_accessor<double> {
       {0xe0accfa875af45a7, 0x93eb1b80a33b8606},
       {0x8c6c01c9498d8b88, 0xbc72f130660533c4},
       {0xaf87023b9bf0ee6a, 0xeb8fad7c7f8680b5},
-      { 0xdb68c2ca82ed2a05,
-        0xa67398db9f6820e2 }
+      {0xdb68c2ca82ed2a05, 0xa67398db9f6820e2},
 #else
       {0xff77b1fcbebcdc4f, 0x25e8e89c13bb0f7b},
       {0xce5d73ff402d98e3, 0xfb0a3d212dc81290},
@@ -1071,19 +1074,22 @@ template <> struct cache_accessor<double> {
     bool is_integer;
   };
 
-  static compute_mul_result compute_mul(
-      carrier_uint u, const cache_entry_type& cache) noexcept {
+  static auto compute_mul(carrier_uint u,
+                          const cache_entry_type& cache) noexcept
+      -> compute_mul_result {
     auto r = umul192_upper128(u, cache);
     return {r.high(), r.low() == 0};
   }
 
-  static uint32_t compute_delta(cache_entry_type const& cache,
-                                int beta) noexcept {
+  static auto compute_delta(cache_entry_type const& cache, int beta) noexcept
+      -> uint32_t {
     return static_cast<uint32_t>(cache.high() >> (64 - 1 - beta));
   }
 
-  static compute_mul_parity_result compute_mul_parity(
-      carrier_uint two_f, const cache_entry_type& cache, int beta) noexcept {
+  static auto compute_mul_parity(carrier_uint two_f,
+                                 const cache_entry_type& cache,
+                                 int beta) noexcept
+      -> compute_mul_parity_result {
     FMT_ASSERT(beta >= 1, "");
     FMT_ASSERT(beta < 64, "");
 
@@ -1092,35 +1098,35 @@ template <> struct cache_accessor<double> {
             ((r.high() << beta) | (r.low() >> (64 - beta))) == 0};
   }
 
-  static carrier_uint compute_left_endpoint_for_shorter_interval_case(
-      const cache_entry_type& cache, int beta) noexcept {
+  static auto compute_left_endpoint_for_shorter_interval_case(
+      const cache_entry_type& cache, int beta) noexcept -> carrier_uint {
     return (cache.high() -
             (cache.high() >> (num_significand_bits<double>() + 2))) >>
            (64 - num_significand_bits<double>() - 1 - beta);
   }
 
-  static carrier_uint compute_right_endpoint_for_shorter_interval_case(
-      const cache_entry_type& cache, int beta) noexcept {
+  static auto compute_right_endpoint_for_shorter_interval_case(
+      const cache_entry_type& cache, int beta) noexcept -> carrier_uint {
     return (cache.high() +
             (cache.high() >> (num_significand_bits<double>() + 1))) >>
            (64 - num_significand_bits<double>() - 1 - beta);
   }
 
-  static carrier_uint compute_round_up_for_shorter_interval_case(
-      const cache_entry_type& cache, int beta) noexcept {
+  static auto compute_round_up_for_shorter_interval_case(
+      const cache_entry_type& cache, int beta) noexcept -> carrier_uint {
     return ((cache.high() >> (64 - num_significand_bits<double>() - 2 - beta)) +
             1) /
            2;
   }
 };
 
-FMT_FUNC uint128_fallback get_cached_power(int k) noexcept {
+FMT_FUNC auto get_cached_power(int k) noexcept -> uint128_fallback {
   return cache_accessor<double>::get_cached_power(k);
 }
 
 // Various integer checks
 template <typename T>
-bool is_left_endpoint_integer_shorter_interval(int exponent) noexcept {
+auto is_left_endpoint_integer_shorter_interval(int exponent) noexcept -> bool {
   const int case_shorter_interval_left_endpoint_lower_threshold = 2;
   const int case_shorter_interval_left_endpoint_upper_threshold = 3;
   return exponent >= case_shorter_interval_left_endpoint_lower_threshold &&
@@ -1132,7 +1138,7 @@ FMT_INLINE int remove_trailing_zeros(uint32_t& n, int s = 0) noexcept {
   FMT_ASSERT(n != 0, "");
   // Modular inverse of 5 (mod 2^32): (mod_inv_5 * 5) mod 2^32 = 1.
   constexpr uint32_t mod_inv_5 = 0xcccccccd;
-  constexpr uint32_t mod_inv_25 = 0xc28f5c29; // = mod_inv_5 * mod_inv_5
+  constexpr uint32_t mod_inv_25 = 0xc28f5c29;  // = mod_inv_5 * mod_inv_5
 
   while (true) {
     auto q = rotr(n * mod_inv_25, 2);
@@ -1168,7 +1174,7 @@ FMT_INLINE int remove_trailing_zeros(uint64_t& n) noexcept {
 
   // If n is not divisible by 10^8, work with n itself.
   constexpr uint64_t mod_inv_5 = 0xcccccccccccccccd;
-  constexpr uint64_t mod_inv_25 = 0x8f5c28f5c28f5c29; // = mod_inv_5 * mod_inv_5
+  constexpr uint64_t mod_inv_25 = 0x8f5c28f5c28f5c29;  // mod_inv_5 * mod_inv_5
 
   int s = 0;
   while (true) {
@@ -1234,7 +1240,7 @@ FMT_INLINE decimal_fp<T> shorter_interval_case(int exponent) noexcept {
   return ret_value;
 }
 
-template <typename T> decimal_fp<T> to_decimal(T x) noexcept {
+template <typename T> auto to_decimal(T x) noexcept -> decimal_fp<T> {
   // Step 1: integer promotion & Schubfach multiplier calculation.
 
   using carrier_uint = typename float_info<T>::carrier_uint;
@@ -1373,15 +1379,15 @@ template <> struct formatter<detail::bigint> {
     for (auto i = n.bigits_.size(); i > 0; --i) {
       auto value = n.bigits_[i - 1u];
       if (first) {
-        out = format_to(out, FMT_STRING("{:x}"), value);
+        out = fmt::format_to(out, FMT_STRING("{:x}"), value);
         first = false;
         continue;
       }
-      out = format_to(out, FMT_STRING("{:08x}"), value);
+      out = fmt::format_to(out, FMT_STRING("{:08x}"), value);
     }
     if (n.exp_ > 0)
-      out = format_to(out, FMT_STRING("p{}"),
-                      n.exp_ * detail::bigint::bigit_bits);
+      out = fmt::format_to(out, FMT_STRING("p{}"),
+                           n.exp_ * detail::bigint::bigit_bits);
     return out;
   }
 };
@@ -1417,7 +1423,7 @@ FMT_FUNC void report_system_error(int error_code,
   report_error(format_system_error, error_code, message);
 }
 
-FMT_FUNC std::string vformat(string_view fmt, format_args args) {
+FMT_FUNC auto vformat(string_view fmt, format_args args) -> std::string {
   // Don't optimize the "{}" case to keep the binary size small and because it
   // can be better optimized in fmt::format anyway.
   auto buffer = memory_buffer();
@@ -1426,33 +1432,43 @@ FMT_FUNC std::string vformat(string_view fmt, format_args args) {
 }
 
 namespace detail {
-#ifndef _WIN32
-FMT_FUNC bool write_console(std::FILE*, string_view) { return false; }
+#if !defined(_WIN32) || defined(FMT_WINDOWS_NO_WCHAR)
+FMT_FUNC auto write_console(int, string_view) -> bool { return false; }
+FMT_FUNC auto write_console(std::FILE*, string_view) -> bool { return false; }
 #else
 using dword = conditional_t<sizeof(long) == 4, unsigned long, unsigned>;
 extern "C" __declspec(dllimport) int __stdcall WriteConsoleW(  //
     void*, const void*, dword, dword*, void*);
 
-FMT_FUNC bool write_console(std::FILE* f, string_view text) {
-  auto fd = _fileno(f);
-  if (!_isatty(fd)) return false;
+FMT_FUNC bool write_console(int fd, string_view text) {
   auto u16 = utf8_to_utf16(text);
-  auto written = dword();
   return WriteConsoleW(reinterpret_cast<void*>(_get_osfhandle(fd)), u16.c_str(),
-                       static_cast<uint32_t>(u16.size()), &written, nullptr) != 0;
+                       static_cast<dword>(u16.size()), nullptr, nullptr) != 0;
 }
 
+FMT_FUNC auto write_console(std::FILE* f, string_view text) -> bool {
+  return write_console(_fileno(f), text);
+}
+#endif
+
+#ifdef _WIN32
 // Print assuming legacy (non-Unicode) encoding.
 FMT_FUNC void vprint_mojibake(std::FILE* f, string_view fmt, format_args args) {
   auto buffer = memory_buffer();
-  detail::vformat_to(buffer, fmt,
-                     basic_format_args<buffer_context<char>>(args));
-  fwrite_fully(buffer.data(), 1, buffer.size(), f);
+  detail::vformat_to(buffer, fmt, args);
+  fwrite_fully(buffer.data(), buffer.size(), f);
 }
 #endif
 
 FMT_FUNC void print(std::FILE* f, string_view text) {
-  if (!write_console(f, text)) fwrite_fully(text.data(), 1, text.size(), f);
+#ifdef _WIN32
+  int fd = _fileno(f);
+  if (_isatty(fd)) {
+    std::fflush(f);
+    if (write_console(fd, text)) return;
+  }
+#endif
+  fwrite_fully(text.data(), text.size(), f);
 }
 }  // namespace detail
 
diff --git a/contrib/fmt/include/fmt/format.h b/contrib/fmt/include/fmt/format.h
index e5bd8b110..7637c8a0d 100644
--- a/contrib/fmt/include/fmt/format.h
+++ b/contrib/fmt/include/fmt/format.h
@@ -43,7 +43,7 @@
 #include <system_error>      // std::system_error
 
 #ifdef __cpp_lib_bit_cast
-#  include <bit>  // std::bitcast
+#  include <bit>  // std::bit_cast
 #endif
 
 #include "core.h"
@@ -83,7 +83,8 @@
 #  if FMT_CPLUSPLUS >= 202002L
 #    if FMT_HAS_CPP_ATTRIBUTE(no_unique_address)
 #      define FMT_NO_UNIQUE_ADDRESS [[no_unique_address]]
-#    elif FMT_MSC_VERSION >= 1929  // VS2019 v16.10 and later
+// VS2019 v16.10 and later except clang-cl (https://reviews.llvm.org/D110485)
+#    elif (FMT_MSC_VERSION >= 1929) && !FMT_CLANG_VERSION
 #      define FMT_NO_UNIQUE_ADDRESS [[msvc::no_unique_address]]
 #    endif
 #  endif
@@ -92,10 +93,11 @@
 #  define FMT_NO_UNIQUE_ADDRESS
 #endif
 
-#if FMT_GCC_VERSION || defined(__clang__)
-#  define FMT_VISIBILITY(value) __attribute__((visibility(value)))
+// Visibility when compiled as a shared library/object.
+#if defined(FMT_LIB_EXPORT) || defined(FMT_SHARED)
+#  define FMT_SO_VISIBILITY(value) FMT_VISIBILITY(value)
 #else
-#  define FMT_VISIBILITY(value)
+#  define FMT_SO_VISIBILITY(value)
 #endif
 
 #ifdef __has_builtin
@@ -151,7 +153,10 @@ FMT_END_NAMESPACE
 
 #ifndef FMT_USE_USER_DEFINED_LITERALS
 // EDG based compilers (Intel, NVIDIA, Elbrus, etc), GCC and MSVC support UDLs.
-#  if (FMT_HAS_FEATURE(cxx_user_literals) || FMT_GCC_VERSION >= 407 || \
+//
+// GCC before 4.9 requires a space in `operator"" _a` which is invalid in later
+// compiler versions.
+#  if (FMT_HAS_FEATURE(cxx_user_literals) || FMT_GCC_VERSION >= 409 || \
        FMT_MSC_VERSION >= 1900) &&                                     \
       (!defined(__EDG_VERSION__) || __EDG_VERSION__ >= /* UDL feature */ 480)
 #    define FMT_USE_USER_DEFINED_LITERALS 1
@@ -272,19 +277,6 @@ FMT_END_NAMESPACE
 #endif
 
 FMT_BEGIN_NAMESPACE
-
-template <typename...> struct disjunction : std::false_type {};
-template <typename P> struct disjunction<P> : P {};
-template <typename P1, typename... Pn>
-struct disjunction<P1, Pn...>
-    : conditional_t<bool(P1::value), P1, disjunction<Pn...>> {};
-
-template <typename...> struct conjunction : std::true_type {};
-template <typename P> struct conjunction<P> : P {};
-template <typename P1, typename... Pn>
-struct conjunction<P1, Pn...>
-    : conditional_t<bool(P1::value), conjunction<Pn...>, P1> {};
-
 namespace detail {
 
 FMT_CONSTEXPR inline void abort_fuzzing_if(bool condition) {
@@ -306,37 +298,6 @@ template <typename CharT, CharT... C>
 constexpr CharT string_literal<CharT, C...>::value[sizeof...(C)];
 #endif
 
-template <typename Streambuf> class formatbuf : public Streambuf {
- private:
-  using char_type = typename Streambuf::char_type;
-  using streamsize = decltype(std::declval<Streambuf>().sputn(nullptr, 0));
-  using int_type = typename Streambuf::int_type;
-  using traits_type = typename Streambuf::traits_type;
-
-  buffer<char_type>& buffer_;
-
- public:
-  explicit formatbuf(buffer<char_type>& buf) : buffer_(buf) {}
-
- protected:
-  // The put area is always empty. This makes the implementation simpler and has
-  // the advantage that the streambuf and the buffer are always in sync and
-  // sputc never writes into uninitialized memory. A disadvantage is that each
-  // call to sputc always results in a (virtual) call to overflow. There is no
-  // disadvantage here for sputn since this always results in a call to xsputn.
-
-  auto overflow(int_type ch) -> int_type override {
-    if (!traits_type::eq_int_type(ch, traits_type::eof()))
-      buffer_.push_back(static_cast<char_type>(ch));
-    return ch;
-  }
-
-  auto xsputn(const char_type* s, streamsize count) -> streamsize override {
-    buffer_.append(s, s + count);
-    return count;
-  }
-};
-
 // Implementation of std::bit_cast for pre-C++20.
 template <typename To, typename From, FMT_ENABLE_IF(sizeof(To) == sizeof(From))>
 FMT_CONSTEXPR20 auto bit_cast(const From& from) -> To {
@@ -368,14 +329,12 @@ class uint128_fallback {
  private:
   uint64_t lo_, hi_;
 
-  friend uint128_fallback umul128(uint64_t x, uint64_t y) noexcept;
-
  public:
   constexpr uint128_fallback(uint64_t hi, uint64_t lo) : lo_(lo), hi_(hi) {}
   constexpr uint128_fallback(uint64_t value = 0) : lo_(value), hi_(0) {}
 
-  constexpr uint64_t high() const noexcept { return hi_; }
-  constexpr uint64_t low() const noexcept { return lo_; }
+  constexpr auto high() const noexcept -> uint64_t { return hi_; }
+  constexpr auto low() const noexcept -> uint64_t { return lo_; }
 
   template <typename T, FMT_ENABLE_IF(std::is_integral<T>::value)>
   constexpr explicit operator T() const {
@@ -451,7 +410,7 @@ class uint128_fallback {
     hi_ &= n.hi_;
   }
 
-  FMT_CONSTEXPR20 uint128_fallback& operator+=(uint64_t n) noexcept {
+  FMT_CONSTEXPR20 auto operator+=(uint64_t n) noexcept -> uint128_fallback& {
     if (is_constant_evaluated()) {
       lo_ += n;
       hi_ += (lo_ < n ? 1 : 0);
@@ -741,7 +700,7 @@ inline auto compute_width(basic_string_view<Char> s) -> size_t {
 }
 
 // Computes approximate display width of a UTF-8 string.
-FMT_CONSTEXPR inline size_t compute_width(string_view s) {
+FMT_CONSTEXPR inline auto compute_width(string_view s) -> size_t {
   size_t num_code_points = 0;
   // It is not a lambda for compatibility with C++14.
   struct count_code_points {
@@ -788,12 +747,17 @@ inline auto code_point_index(basic_string_view<Char> s, size_t n) -> size_t {
 
 // Calculates the index of the nth code point in a UTF-8 string.
 inline auto code_point_index(string_view s, size_t n) -> size_t {
-  const char* data = s.data();
-  size_t num_code_points = 0;
-  for (size_t i = 0, size = s.size(); i != size; ++i) {
-    if ((data[i] & 0xc0) != 0x80 && ++num_code_points > n) return i;
-  }
-  return s.size();
+  size_t result = s.size();
+  const char* begin = s.begin();
+  for_each_codepoint(s, [begin, &n, &result](uint32_t, string_view sv) {
+    if (n != 0) {
+      --n;
+      return true;
+    }
+    result = to_unsigned(sv.begin() - begin);
+    return false;
+  });
+  return result;
 }
 
 inline auto code_point_index(basic_string_view<char8_type> s, size_t n)
@@ -903,7 +867,7 @@ enum { inline_buffer_size = 500 };
   **Example**::
 
      auto out = fmt::memory_buffer();
-     format_to(std::back_inserter(out), "The answer is {}.", 42);
+     fmt::format_to(std::back_inserter(out), "The answer is {}.", 42);
 
   This will append the following output to the ``out`` object:
 
@@ -1019,7 +983,6 @@ class basic_memory_buffer final : public detail::buffer<T> {
   /** Increases the buffer capacity to *new_capacity*. */
   void reserve(size_t new_capacity) { this->try_reserve(new_capacity); }
 
-  // Directly append data into the buffer
   using detail::buffer<T>::append;
   template <typename ContiguousRange>
   void append(const ContiguousRange& range) {
@@ -1035,9 +998,11 @@ struct is_contiguous<basic_memory_buffer<T, SIZE, Allocator>> : std::true_type {
 
 FMT_END_EXPORT
 namespace detail {
-FMT_API bool write_console(std::FILE* f, string_view text);
+FMT_API auto write_console(int fd, string_view text) -> bool;
+FMT_API auto write_console(std::FILE* f, string_view text) -> bool;
 FMT_API void print(std::FILE*, string_view);
 }  // namespace detail
+
 FMT_BEGIN_EXPORT
 
 // Suppress a misleading warning in older versions of clang.
@@ -1046,7 +1011,7 @@ FMT_BEGIN_EXPORT
 #endif
 
 /** An error reported from a formatting function. */
-class FMT_VISIBILITY("default") format_error : public std::runtime_error {
+class FMT_SO_VISIBILITY("default") format_error : public std::runtime_error {
  public:
   using std::runtime_error::runtime_error;
 };
@@ -1153,13 +1118,13 @@ using uint32_or_64_or_128_t =
 template <typename T>
 using uint64_or_128_t = conditional_t<num_bits<T>() <= 64, uint64_t, uint128_t>;
 
-#define FMT_POWERS_OF_10(factor)                                             \
-  factor * 10, (factor)*100, (factor)*1000, (factor)*10000, (factor)*100000, \
-      (factor)*1000000, (factor)*10000000, (factor)*100000000,               \
-      (factor)*1000000000
+#define FMT_POWERS_OF_10(factor)                                  \
+  factor * 10, (factor) * 100, (factor) * 1000, (factor) * 10000, \
+      (factor) * 100000, (factor) * 1000000, (factor) * 10000000, \
+      (factor) * 100000000, (factor) * 1000000000
 
 // Converts value in the range [0, 100) to a string.
-constexpr const char* digits2(size_t value) {
+constexpr auto digits2(size_t value) -> const char* {
   // GCC generates slightly better code when value is pointer-size.
   return &"0001020304050607080910111213141516171819"
          "2021222324252627282930313233343536373839"
@@ -1169,7 +1134,7 @@ constexpr const char* digits2(size_t value) {
 }
 
 // Sign is a template parameter to workaround a bug in gcc 4.8.
-template <typename Char, typename Sign> constexpr Char sign(Sign s) {
+template <typename Char, typename Sign> constexpr auto sign(Sign s) -> Char {
 #if !FMT_GCC_VERSION || FMT_GCC_VERSION >= 604
   static_assert(std::is_same<Sign, sign_t>::value, "");
 #endif
@@ -1387,14 +1352,14 @@ FMT_CONSTEXPR auto format_uint(Char* buffer, UInt value, int num_digits,
 }
 
 template <unsigned BASE_BITS, typename Char, typename It, typename UInt>
-inline auto format_uint(It out, UInt value, int num_digits, bool upper = false)
-    -> It {
+FMT_CONSTEXPR inline auto format_uint(It out, UInt value, int num_digits,
+                                      bool upper = false) -> It {
   if (auto ptr = to_pointer<Char>(out, to_unsigned(num_digits))) {
     format_uint<BASE_BITS>(ptr, value, num_digits, upper);
     return out;
   }
   // Buffer should be large enough to hold all digits (digits / BASE_BITS + 1).
-  char buffer[num_bits<UInt>() / BASE_BITS + 1];
+  char buffer[num_bits<UInt>() / BASE_BITS + 1] = {};
   format_uint<BASE_BITS>(buffer, value, num_digits, upper);
   return detail::copy_str_noinline<Char>(buffer, buffer + num_digits, out);
 }
@@ -1430,22 +1395,23 @@ template <typename WChar, typename Buffer = memory_buffer> class to_utf8 {
                                                       : "invalid utf32"));
   }
   operator string_view() const { return string_view(&buffer_[0], size()); }
-  size_t size() const { return buffer_.size() - 1; }
-  const char* c_str() const { return &buffer_[0]; }
-  std::string str() const { return std::string(&buffer_[0], size()); }
+  auto size() const -> size_t { return buffer_.size() - 1; }
+  auto c_str() const -> const char* { return &buffer_[0]; }
+  auto str() const -> std::string { return std::string(&buffer_[0], size()); }
 
   // Performs conversion returning a bool instead of throwing exception on
   // conversion error. This method may still throw in case of memory allocation
   // error.
-  bool convert(basic_string_view<WChar> s,
-               to_utf8_error_policy policy = to_utf8_error_policy::abort) {
+  auto convert(basic_string_view<WChar> s,
+               to_utf8_error_policy policy = to_utf8_error_policy::abort)
+      -> bool {
     if (!convert(buffer_, s, policy)) return false;
     buffer_.push_back(0);
     return true;
   }
-  static bool convert(
-      Buffer& buf, basic_string_view<WChar> s,
-      to_utf8_error_policy policy = to_utf8_error_policy::abort) {
+  static auto convert(Buffer& buf, basic_string_view<WChar> s,
+                      to_utf8_error_policy policy = to_utf8_error_policy::abort)
+      -> bool {
     for (auto p = s.begin(); p != s.end(); ++p) {
       uint32_t c = static_cast<uint32_t>(*p);
       if (sizeof(WChar) == 2 && c >= 0xd800 && c <= 0xdfff) {
@@ -1453,7 +1419,7 @@ template <typename WChar, typename Buffer = memory_buffer> class to_utf8 {
         ++p;
         if (p == s.end() || (c & 0xfc00) != 0xd800 || (*p & 0xfc00) != 0xdc00) {
           if (policy == to_utf8_error_policy::abort) return false;
-          buf.append(string_view("�"));
+          buf.append(string_view("\xEF\xBF\xBD"));
           --p;
         } else {
           c = (c << 10) + static_cast<uint32_t>(*p) - 0x35fdc00;
@@ -1481,14 +1447,14 @@ template <typename WChar, typename Buffer = memory_buffer> class to_utf8 {
 };
 
 // Computes 128-bit result of multiplication of two 64-bit unsigned integers.
-inline uint128_fallback umul128(uint64_t x, uint64_t y) noexcept {
+inline auto umul128(uint64_t x, uint64_t y) noexcept -> uint128_fallback {
 #if FMT_USE_INT128
   auto p = static_cast<uint128_opt>(x) * static_cast<uint128_opt>(y);
   return {static_cast<uint64_t>(p >> 64), static_cast<uint64_t>(p)};
 #elif defined(_MSC_VER) && defined(_M_X64)
-  auto result = uint128_fallback();
-  result.lo_ = _umul128(x, y, &result.hi_);
-  return result;
+  auto hi = uint64_t();
+  auto lo = _umul128(x, y, &hi);
+  return {hi, lo};
 #else
   const uint64_t mask = static_cast<uint64_t>(max_value<uint32_t>());
 
@@ -1512,19 +1478,19 @@ inline uint128_fallback umul128(uint64_t x, uint64_t y) noexcept {
 namespace dragonbox {
 // Computes floor(log10(pow(2, e))) for e in [-2620, 2620] using the method from
 // https://fmt.dev/papers/Dragonbox.pdf#page=28, section 6.1.
-inline int floor_log10_pow2(int e) noexcept {
+inline auto floor_log10_pow2(int e) noexcept -> int {
   FMT_ASSERT(e <= 2620 && e >= -2620, "too large exponent");
   static_assert((-1 >> 1) == -1, "right shift is not arithmetic");
   return (e * 315653) >> 20;
 }
 
-inline int floor_log2_pow10(int e) noexcept {
+inline auto floor_log2_pow10(int e) noexcept -> int {
   FMT_ASSERT(e <= 1233 && e >= -1233, "too large exponent");
   return (e * 1741647) >> 19;
 }
 
 // Computes upper 64 bits of multiplication of two 64-bit unsigned integers.
-inline uint64_t umul128_upper64(uint64_t x, uint64_t y) noexcept {
+inline auto umul128_upper64(uint64_t x, uint64_t y) noexcept -> uint64_t {
 #if FMT_USE_INT128
   auto p = static_cast<uint128_opt>(x) * static_cast<uint128_opt>(y);
   return static_cast<uint64_t>(p >> 64);
@@ -1537,14 +1503,14 @@ inline uint64_t umul128_upper64(uint64_t x, uint64_t y) noexcept {
 
 // Computes upper 128 bits of multiplication of a 64-bit unsigned integer and a
 // 128-bit unsigned integer.
-inline uint128_fallback umul192_upper128(uint64_t x,
-                                         uint128_fallback y) noexcept {
+inline auto umul192_upper128(uint64_t x, uint128_fallback y) noexcept
+    -> uint128_fallback {
   uint128_fallback r = umul128(x, y.high());
   r += umul128_upper64(x, y.low());
   return r;
 }
 
-FMT_API uint128_fallback get_cached_power(int k) noexcept;
+FMT_API auto get_cached_power(int k) noexcept -> uint128_fallback;
 
 // Type-specific information that Dragonbox uses.
 template <typename T, typename Enable = void> struct float_info;
@@ -1598,14 +1564,14 @@ template <typename T> FMT_API auto to_decimal(T x) noexcept -> decimal_fp<T>;
 }  // namespace dragonbox
 
 // Returns true iff Float has the implicit bit which is not stored.
-template <typename Float> constexpr bool has_implicit_bit() {
+template <typename Float> constexpr auto has_implicit_bit() -> bool {
   // An 80-bit FP number has a 64-bit significand an no implicit bit.
   return std::numeric_limits<Float>::digits != 64;
 }
 
 // Returns the number of significand bits stored in Float. The implicit bit is
 // not counted since it is not stored.
-template <typename Float> constexpr int num_significand_bits() {
+template <typename Float> constexpr auto num_significand_bits() -> int {
   // std::numeric_limits may not support __float128.
   return is_float128<Float>() ? 112
                               : (std::numeric_limits<Float>::digits -
@@ -1698,7 +1664,7 @@ using fp = basic_fp<unsigned long long>;
 
 // Normalizes the value converted from double and multiplied by (1 << SHIFT).
 template <int SHIFT = 0, typename F>
-FMT_CONSTEXPR basic_fp<F> normalize(basic_fp<F> value) {
+FMT_CONSTEXPR auto normalize(basic_fp<F> value) -> basic_fp<F> {
   // Handle subnormals.
   const auto implicit_bit = F(1) << num_significand_bits<double>();
   const auto shifted_implicit_bit = implicit_bit << SHIFT;
@@ -1715,7 +1681,7 @@ FMT_CONSTEXPR basic_fp<F> normalize(basic_fp<F> value) {
 }
 
 // Computes lhs * rhs / pow(2, 64) rounded to nearest with half-up tie breaking.
-FMT_CONSTEXPR inline uint64_t multiply(uint64_t lhs, uint64_t rhs) {
+FMT_CONSTEXPR inline auto multiply(uint64_t lhs, uint64_t rhs) -> uint64_t {
 #if FMT_USE_INT128
   auto product = static_cast<__uint128_t>(lhs) * rhs;
   auto f = static_cast<uint64_t>(product >> 64);
@@ -1732,33 +1698,10 @@ FMT_CONSTEXPR inline uint64_t multiply(uint64_t lhs, uint64_t rhs) {
 #endif
 }
 
-FMT_CONSTEXPR inline fp operator*(fp x, fp y) {
+FMT_CONSTEXPR inline auto operator*(fp x, fp y) -> fp {
   return {multiply(x.f, y.f), x.e + y.e + 64};
 }
 
-template <typename T = void> struct basic_data {
-  // For checking rounding thresholds.
-  // The kth entry is chosen to be the smallest integer such that the
-  // upper 32-bits of 10^(k+1) times it is strictly bigger than 5 * 10^k.
-  static constexpr uint32_t fractional_part_rounding_thresholds[8] = {
-      2576980378U,  // ceil(2^31 + 2^32/10^1)
-      2190433321U,  // ceil(2^31 + 2^32/10^2)
-      2151778616U,  // ceil(2^31 + 2^32/10^3)
-      2147913145U,  // ceil(2^31 + 2^32/10^4)
-      2147526598U,  // ceil(2^31 + 2^32/10^5)
-      2147487943U,  // ceil(2^31 + 2^32/10^6)
-      2147484078U,  // ceil(2^31 + 2^32/10^7)
-      2147483691U   // ceil(2^31 + 2^32/10^8)
-  };
-};
-// This is a struct rather than an alias to avoid shadowing warnings in gcc.
-struct data : basic_data<> {};
-
-#if FMT_CPLUSPLUS < 201703L
-template <typename T>
-constexpr uint32_t basic_data<T>::fractional_part_rounding_thresholds[];
-#endif
-
 template <typename T, bool doublish = num_bits<T>() == num_bits<double>()>
 using convert_float_result =
     conditional_t<std::is_same<T, float>::value || doublish, double, T>;
@@ -1977,11 +1920,13 @@ auto write_escaped_string(OutputIt out, basic_string_view<Char> str)
 
 template <typename Char, typename OutputIt>
 auto write_escaped_char(OutputIt out, Char v) -> OutputIt {
+  Char v_array[1] = {v};
   *out++ = static_cast<Char>('\'');
   if ((needs_escape(static_cast<uint32_t>(v)) && v != static_cast<Char>('"')) ||
       v == static_cast<Char>('\'')) {
-    out = write_escaped_cp(
-        out, find_escape_result<Char>{&v, &v + 1, static_cast<uint32_t>(v)});
+    out = write_escaped_cp(out,
+                           find_escape_result<Char>{v_array, v_array + 1,
+                                                    static_cast<uint32_t>(v)});
   } else {
     *out++ = v;
   }
@@ -2070,10 +2015,10 @@ template <typename Char> class digit_grouping {
     std::string::const_iterator group;
     int pos;
   };
-  next_state initial_state() const { return {grouping_.begin(), 0}; }
+  auto initial_state() const -> next_state { return {grouping_.begin(), 0}; }
 
   // Returns the next digit group separator position.
-  int next(next_state& state) const {
+  auto next(next_state& state) const -> int {
     if (thousands_sep_.empty()) return max_value<int>();
     if (state.group == grouping_.end()) return state.pos += grouping_.back();
     if (*state.group <= 0 || *state.group == max_value<char>())
@@ -2092,9 +2037,9 @@ template <typename Char> class digit_grouping {
   digit_grouping(std::string grouping, std::basic_string<Char> sep)
       : grouping_(std::move(grouping)), thousands_sep_(std::move(sep)) {}
 
-  bool has_separator() const { return !thousands_sep_.empty(); }
+  auto has_separator() const -> bool { return !thousands_sep_.empty(); }
 
-  int count_separators(int num_digits) const {
+  auto count_separators(int num_digits) const -> int {
     int count = 0;
     auto state = initial_state();
     while (num_digits > next(state)) ++count;
@@ -2103,7 +2048,7 @@ template <typename Char> class digit_grouping {
 
   // Applies grouping to digits and write the output to out.
   template <typename Out, typename C>
-  Out apply(Out out, basic_string_view<C> digits) const {
+  auto apply(Out out, basic_string_view<C> digits) const -> Out {
     auto num_digits = static_cast<int>(digits.size());
     auto separators = basic_memory_buffer<int>();
     separators.push_back(0);
@@ -2126,24 +2071,66 @@ template <typename Char> class digit_grouping {
   }
 };
 
+FMT_CONSTEXPR inline void prefix_append(unsigned& prefix, unsigned value) {
+  prefix |= prefix != 0 ? value << 8 : value;
+  prefix += (1u + (value > 0xff ? 1 : 0)) << 24;
+}
+
 // Writes a decimal integer with digit grouping.
 template <typename OutputIt, typename UInt, typename Char>
 auto write_int(OutputIt out, UInt value, unsigned prefix,
                const format_specs<Char>& specs,
                const digit_grouping<Char>& grouping) -> OutputIt {
   static_assert(std::is_same<uint64_or_128_t<UInt>, UInt>::value, "");
-  int num_digits = count_digits(value);
-  char digits[40];
-  format_decimal(digits, value, num_digits);
-  unsigned size = to_unsigned((prefix != 0 ? 1 : 0) + num_digits +
-                              grouping.count_separators(num_digits));
+  int num_digits = 0;
+  auto buffer = memory_buffer();
+  switch (specs.type) {
+  case presentation_type::none:
+  case presentation_type::dec: {
+    num_digits = count_digits(value);
+    format_decimal<char>(appender(buffer), value, num_digits);
+    break;
+  }
+  case presentation_type::hex_lower:
+  case presentation_type::hex_upper: {
+    bool upper = specs.type == presentation_type::hex_upper;
+    if (specs.alt)
+      prefix_append(prefix, unsigned(upper ? 'X' : 'x') << 8 | '0');
+    num_digits = count_digits<4>(value);
+    format_uint<4, char>(appender(buffer), value, num_digits, upper);
+    break;
+  }
+  case presentation_type::bin_lower:
+  case presentation_type::bin_upper: {
+    bool upper = specs.type == presentation_type::bin_upper;
+    if (specs.alt)
+      prefix_append(prefix, unsigned(upper ? 'B' : 'b') << 8 | '0');
+    num_digits = count_digits<1>(value);
+    format_uint<1, char>(appender(buffer), value, num_digits);
+    break;
+  }
+  case presentation_type::oct: {
+    num_digits = count_digits<3>(value);
+    // Octal prefix '0' is counted as a digit, so only add it if precision
+    // is not greater than the number of digits.
+    if (specs.alt && specs.precision <= num_digits && value != 0)
+      prefix_append(prefix, '0');
+    format_uint<3, char>(appender(buffer), value, num_digits);
+    break;
+  }
+  case presentation_type::chr:
+    return write_char(out, static_cast<Char>(value), specs);
+  default:
+    throw_format_error("invalid format specifier");
+  }
+
+  unsigned size = (prefix != 0 ? prefix >> 24 : 0) + to_unsigned(num_digits) +
+                  to_unsigned(grouping.count_separators(num_digits));
   return write_padded<align::right>(
       out, specs, size, size, [&](reserve_iterator<OutputIt> it) {
-        if (prefix != 0) {
-          char sign = static_cast<char>(prefix);
-          *it++ = static_cast<Char>(sign);
-        }
-        return grouping.apply(it, string_view(digits, to_unsigned(num_digits)));
+        for (unsigned p = prefix & 0xffffff; p != 0; p >>= 8)
+          *it++ = static_cast<Char>(p & 0xff);
+        return grouping.apply(it, string_view(buffer.data(), buffer.size()));
       });
 }
 
@@ -2156,11 +2143,6 @@ inline auto write_loc(OutputIt, loc_value, const format_specs<Char>&,
   return false;
 }
 
-FMT_CONSTEXPR inline void prefix_append(unsigned& prefix, unsigned value) {
-  prefix |= prefix != 0 ? value << 8 : value;
-  prefix += (1u + (value > 0xff ? 1 : 0)) << 24;
-}
-
 template <typename UInt> struct write_int_arg {
   UInt abs_value;
   unsigned prefix;
@@ -2307,25 +2289,25 @@ class counting_iterator {
 
   FMT_CONSTEXPR counting_iterator() : count_(0) {}
 
-  FMT_CONSTEXPR size_t count() const { return count_; }
+  FMT_CONSTEXPR auto count() const -> size_t { return count_; }
 
-  FMT_CONSTEXPR counting_iterator& operator++() {
+  FMT_CONSTEXPR auto operator++() -> counting_iterator& {
     ++count_;
     return *this;
   }
-  FMT_CONSTEXPR counting_iterator operator++(int) {
+  FMT_CONSTEXPR auto operator++(int) -> counting_iterator {
     auto it = *this;
     ++*this;
     return it;
   }
 
-  FMT_CONSTEXPR friend counting_iterator operator+(counting_iterator it,
-                                                   difference_type n) {
+  FMT_CONSTEXPR friend auto operator+(counting_iterator it, difference_type n)
+      -> counting_iterator {
     it.count_ += static_cast<size_t>(n);
     return it;
   }
 
-  FMT_CONSTEXPR value_type operator*() const { return {}; }
+  FMT_CONSTEXPR auto operator*() const -> value_type { return {}; }
 };
 
 template <typename Char, typename OutputIt>
@@ -2360,9 +2342,10 @@ template <typename Char, typename OutputIt>
 FMT_CONSTEXPR auto write(OutputIt out, const Char* s,
                          const format_specs<Char>& specs, locale_ref)
     -> OutputIt {
-  return specs.type != presentation_type::pointer
-             ? write(out, basic_string_view<Char>(s), specs, {})
-             : write_ptr<Char>(out, bit_cast<uintptr_t>(s), &specs);
+  if (specs.type == presentation_type::pointer)
+    return write_ptr<Char>(out, bit_cast<uintptr_t>(s), &specs);
+  if (!s) throw_format_error("string pointer is null");
+  return write(out, basic_string_view<Char>(s), specs, {});
 }
 
 template <typename Char, typename OutputIt, typename T,
@@ -2448,9 +2431,8 @@ struct float_specs {
   bool showpoint : 1;
 };
 
-template <typename ErrorHandler = error_handler, typename Char>
-FMT_CONSTEXPR auto parse_float_type_spec(const format_specs<Char>& specs,
-                                         ErrorHandler&& eh = {})
+template <typename Char>
+FMT_CONSTEXPR auto parse_float_type_spec(const format_specs<Char>& specs)
     -> float_specs {
   auto result = float_specs();
   result.showpoint = specs.alt;
@@ -2486,7 +2468,7 @@ FMT_CONSTEXPR auto parse_float_type_spec(const format_specs<Char>& specs,
     result.format = float_format::hex;
     break;
   default:
-    eh.on_error("invalid format specifier");
+    throw_format_error("invalid format specifier");
     break;
   }
   return result;
@@ -2725,12 +2707,12 @@ template <typename Char> class fallback_digit_grouping {
  public:
   constexpr fallback_digit_grouping(locale_ref, bool) {}
 
-  constexpr bool has_separator() const { return false; }
+  constexpr auto has_separator() const -> bool { return false; }
 
-  constexpr int count_separators(int) const { return 0; }
+  constexpr auto count_separators(int) const -> int { return 0; }
 
   template <typename Out, typename C>
-  constexpr Out apply(Out out, basic_string_view<C>) const {
+  constexpr auto apply(Out out, basic_string_view<C>) const -> Out {
     return out;
   }
 };
@@ -2749,7 +2731,7 @@ FMT_CONSTEXPR20 auto write_float(OutputIt out, const DecimalFP& f,
   }
 }
 
-template <typename T> constexpr bool isnan(T value) {
+template <typename T> constexpr auto isnan(T value) -> bool {
   return !(value >= value);  // std::isnan doesn't support __float128.
 }
 
@@ -2762,14 +2744,14 @@ struct has_isfinite<T, enable_if_t<sizeof(std::isfinite(T())) != 0>>
 
 template <typename T, FMT_ENABLE_IF(std::is_floating_point<T>::value&&
                                         has_isfinite<T>::value)>
-FMT_CONSTEXPR20 bool isfinite(T value) {
+FMT_CONSTEXPR20 auto isfinite(T value) -> bool {
   constexpr T inf = T(std::numeric_limits<double>::infinity());
   if (is_constant_evaluated())
     return !detail::isnan(value) && value < inf && value > -inf;
   return std::isfinite(value);
 }
 template <typename T, FMT_ENABLE_IF(!has_isfinite<T>::value)>
-FMT_CONSTEXPR bool isfinite(T value) {
+FMT_CONSTEXPR auto isfinite(T value) -> bool {
   T inf = T(std::numeric_limits<double>::infinity());
   // std::isfinite doesn't support __float128.
   return !detail::isnan(value) && value < inf && value > -inf;
@@ -2806,10 +2788,10 @@ class bigint {
   basic_memory_buffer<bigit, bigits_capacity> bigits_;
   int exp_;
 
-  FMT_CONSTEXPR20 bigit operator[](int index) const {
+  FMT_CONSTEXPR20 auto operator[](int index) const -> bigit {
     return bigits_[to_unsigned(index)];
   }
-  FMT_CONSTEXPR20 bigit& operator[](int index) {
+  FMT_CONSTEXPR20 auto operator[](int index) -> bigit& {
     return bigits_[to_unsigned(index)];
   }
 
@@ -2905,11 +2887,11 @@ class bigint {
     assign(uint64_or_128_t<Int>(n));
   }
 
-  FMT_CONSTEXPR20 int num_bigits() const {
+  FMT_CONSTEXPR20 auto num_bigits() const -> int {
     return static_cast<int>(bigits_.size()) + exp_;
   }
 
-  FMT_NOINLINE FMT_CONSTEXPR20 bigint& operator<<=(int shift) {
+  FMT_NOINLINE FMT_CONSTEXPR20 auto operator<<=(int shift) -> bigint& {
     FMT_ASSERT(shift >= 0, "");
     exp_ += shift / bigit_bits;
     shift %= bigit_bits;
@@ -2924,13 +2906,15 @@ class bigint {
     return *this;
   }
 
-  template <typename Int> FMT_CONSTEXPR20 bigint& operator*=(Int value) {
+  template <typename Int>
+  FMT_CONSTEXPR20 auto operator*=(Int value) -> bigint& {
     FMT_ASSERT(value > 0, "");
     multiply(uint32_or_64_or_128_t<Int>(value));
     return *this;
   }
 
-  friend FMT_CONSTEXPR20 int compare(const bigint& lhs, const bigint& rhs) {
+  friend FMT_CONSTEXPR20 auto compare(const bigint& lhs, const bigint& rhs)
+      -> int {
     int num_lhs_bigits = lhs.num_bigits(), num_rhs_bigits = rhs.num_bigits();
     if (num_lhs_bigits != num_rhs_bigits)
       return num_lhs_bigits > num_rhs_bigits ? 1 : -1;
@@ -2947,8 +2931,9 @@ class bigint {
   }
 
   // Returns compare(lhs1 + lhs2, rhs).
-  friend FMT_CONSTEXPR20 int add_compare(const bigint& lhs1, const bigint& lhs2,
-                                         const bigint& rhs) {
+  friend FMT_CONSTEXPR20 auto add_compare(const bigint& lhs1,
+                                          const bigint& lhs2, const bigint& rhs)
+      -> int {
     auto minimum = [](int a, int b) { return a < b ? a : b; };
     auto maximum = [](int a, int b) { return a > b ? a : b; };
     int max_lhs_bigits = maximum(lhs1.num_bigits(), lhs2.num_bigits());
@@ -3029,13 +3014,13 @@ class bigint {
     bigits_.resize(to_unsigned(num_bigits + exp_difference));
     for (int i = num_bigits - 1, j = i + exp_difference; i >= 0; --i, --j)
       bigits_[j] = bigits_[i];
-    std::uninitialized_fill_n(bigits_.data(), exp_difference, 0);
+    std::uninitialized_fill_n(bigits_.data(), exp_difference, 0u);
     exp_ -= exp_difference;
   }
 
   // Divides this bignum by divisor, assigning the remainder to this and
   // returning the quotient.
-  FMT_CONSTEXPR20 int divmod_assign(const bigint& divisor) {
+  FMT_CONSTEXPR20 auto divmod_assign(const bigint& divisor) -> int {
     FMT_ASSERT(this != &divisor, "");
     if (compare(*this, divisor) < 0) return 0;
     FMT_ASSERT(divisor.bigits_[divisor.bigits_.size() - 1u] != 0, "");
@@ -3178,8 +3163,10 @@ FMT_CONSTEXPR20 inline void format_dragon(basic_fp<uint128_t> value,
       }
       if (buf[0] == overflow) {
         buf[0] = '1';
-        if ((flags & dragon::fixed) != 0) buf.push_back('0');
-        else ++exp10;
+        if ((flags & dragon::fixed) != 0)
+          buf.push_back('0');
+        else
+          ++exp10;
       }
       return;
     }
@@ -3276,6 +3263,17 @@ FMT_CONSTEXPR20 void format_hexfloat(Float value, int precision,
   format_hexfloat(static_cast<double>(value), precision, specs, buf);
 }
 
+constexpr auto fractional_part_rounding_thresholds(int index) -> uint32_t {
+  // For checking rounding thresholds.
+  // The kth entry is chosen to be the smallest integer such that the
+  // upper 32-bits of 10^(k+1) times it is strictly bigger than 5 * 10^k.
+  // It is equal to ceil(2^31 + 2^32/10^(k + 1)).
+  // These are stored in a string literal because we cannot have static arrays
+  // in constexpr functions and non-static ones are poorly optimized.
+  return U"\x9999999a\x828f5c29\x80418938\x80068db9\x8000a7c6\x800010c7"
+         U"\x800001ae\x8000002b"[index];
+}
+
 template <typename Float>
 FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
                                   buffer<char>& buf) -> int {
@@ -3480,12 +3478,12 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
           //    fractional part is strictly larger than 1/2.
           if (precision < 9) {
             uint32_t fractional_part = static_cast<uint32_t>(prod);
-            should_round_up = fractional_part >=
-                                  data::fractional_part_rounding_thresholds
-                                      [8 - number_of_digits_to_print] ||
-                              ((fractional_part >> 31) &
-                               ((digits & 1) | (second_third_subsegments != 0) |
-                                has_more_segments)) != 0;
+            should_round_up =
+                fractional_part >= fractional_part_rounding_thresholds(
+                                       8 - number_of_digits_to_print) ||
+                ((fractional_part >> 31) &
+                 ((digits & 1) | (second_third_subsegments != 0) |
+                  has_more_segments)) != 0;
           }
           // Rounding at the subsegment boundary.
           // In this case, the fractional part is at least 1/2 if and only if
@@ -3520,12 +3518,12 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
             // of 19 digits, so in this case the third segment should be
             // consisting of a genuine digit from the input.
             uint32_t fractional_part = static_cast<uint32_t>(prod);
-            should_round_up = fractional_part >=
-                                  data::fractional_part_rounding_thresholds
-                                      [8 - number_of_digits_to_print] ||
-                              ((fractional_part >> 31) &
-                               ((digits & 1) | (third_subsegment != 0) |
-                                has_more_segments)) != 0;
+            should_round_up =
+                fractional_part >= fractional_part_rounding_thresholds(
+                                       8 - number_of_digits_to_print) ||
+                ((fractional_part >> 31) &
+                 ((digits & 1) | (third_subsegment != 0) |
+                  has_more_segments)) != 0;
           }
           // Rounding at the subsegment boundary.
           else {
@@ -3757,8 +3755,11 @@ template <typename Char, typename OutputIt, typename T,
 FMT_CONSTEXPR auto write(OutputIt out, const T& value)
     -> enable_if_t<mapped_type_constant<T, Context>::value == type::custom_type,
                    OutputIt> {
+  auto formatter = typename Context::template formatter_type<T>();
+  auto parse_ctx = typename Context::parse_context_type({});
+  formatter.parse(parse_ctx);
   auto ctx = Context(out, {}, {});
-  return typename Context::template formatter_type<T>().format(value, ctx);
+  return formatter.format(value, ctx);
 }
 
 // An argument visitor that formats the argument and writes it via the output
@@ -3801,62 +3802,39 @@ template <typename Char> struct arg_formatter {
   }
 };
 
-template <typename Char> struct custom_formatter {
-  basic_format_parse_context<Char>& parse_ctx;
-  buffer_context<Char>& ctx;
-
-  void operator()(
-      typename basic_format_arg<buffer_context<Char>>::handle h) const {
-    h.format(parse_ctx, ctx);
-  }
-  template <typename T> void operator()(T) const {}
-};
-
-template <typename ErrorHandler> class width_checker {
- public:
-  explicit FMT_CONSTEXPR width_checker(ErrorHandler& eh) : handler_(eh) {}
-
+struct width_checker {
   template <typename T, FMT_ENABLE_IF(is_integer<T>::value)>
   FMT_CONSTEXPR auto operator()(T value) -> unsigned long long {
-    if (is_negative(value)) handler_.on_error("negative width");
+    if (is_negative(value)) throw_format_error("negative width");
     return static_cast<unsigned long long>(value);
   }
 
   template <typename T, FMT_ENABLE_IF(!is_integer<T>::value)>
   FMT_CONSTEXPR auto operator()(T) -> unsigned long long {
-    handler_.on_error("width is not integer");
+    throw_format_error("width is not integer");
     return 0;
   }
-
- private:
-  ErrorHandler& handler_;
 };
 
-template <typename ErrorHandler> class precision_checker {
- public:
-  explicit FMT_CONSTEXPR precision_checker(ErrorHandler& eh) : handler_(eh) {}
-
+struct precision_checker {
   template <typename T, FMT_ENABLE_IF(is_integer<T>::value)>
   FMT_CONSTEXPR auto operator()(T value) -> unsigned long long {
-    if (is_negative(value)) handler_.on_error("negative precision");
+    if (is_negative(value)) throw_format_error("negative precision");
     return static_cast<unsigned long long>(value);
   }
 
   template <typename T, FMT_ENABLE_IF(!is_integer<T>::value)>
   FMT_CONSTEXPR auto operator()(T) -> unsigned long long {
-    handler_.on_error("precision is not integer");
+    throw_format_error("precision is not integer");
     return 0;
   }
-
- private:
-  ErrorHandler& handler_;
 };
 
-template <template <typename> class Handler, typename FormatArg,
-          typename ErrorHandler>
-FMT_CONSTEXPR auto get_dynamic_spec(FormatArg arg, ErrorHandler eh) -> int {
-  unsigned long long value = visit_format_arg(Handler<ErrorHandler>(eh), arg);
-  if (value > to_unsigned(max_value<int>())) eh.on_error("number is too big");
+template <typename Handler, typename FormatArg>
+FMT_CONSTEXPR auto get_dynamic_spec(FormatArg arg) -> int {
+  unsigned long long value = visit_format_arg(Handler(), arg);
+  if (value > to_unsigned(max_value<int>()))
+    throw_format_error("number is too big");
   return static_cast<int>(value);
 }
 
@@ -3867,7 +3845,7 @@ FMT_CONSTEXPR auto get_arg(Context& ctx, ID id) -> decltype(ctx.arg(id)) {
   return arg;
 }
 
-template <template <typename> class Handler, typename Context>
+template <typename Handler, typename Context>
 FMT_CONSTEXPR void handle_dynamic_spec(int& value,
                                        arg_ref<typename Context::char_type> ref,
                                        Context& ctx) {
@@ -3875,12 +3853,10 @@ FMT_CONSTEXPR void handle_dynamic_spec(int& value,
   case arg_id_kind::none:
     break;
   case arg_id_kind::index:
-    value = detail::get_dynamic_spec<Handler>(get_arg(ctx, ref.val.index),
-                                              ctx.error_handler());
+    value = detail::get_dynamic_spec<Handler>(get_arg(ctx, ref.val.index));
     break;
   case arg_id_kind::name:
-    value = detail::get_dynamic_spec<Handler>(get_arg(ctx, ref.val.name),
-                                              ctx.error_handler());
+    value = detail::get_dynamic_spec<Handler>(get_arg(ctx, ref.val.name));
     break;
   }
 }
@@ -4052,12 +4028,10 @@ class format_int {
 
 template <typename T, typename Char>
 struct formatter<T, Char, enable_if_t<detail::has_format_as<T>::value>>
-    : private formatter<detail::format_as_t<T>, Char> {
-  using base = formatter<detail::format_as_t<T>, Char>;
-  using base::parse;
-
+    : formatter<detail::format_as_t<T>, Char> {
   template <typename FormatContext>
   auto format(const T& value, FormatContext& ctx) const -> decltype(ctx.out()) {
+    using base = formatter<detail::format_as_t<T>, Char>;
     return base::format(format_as(value), ctx);
   }
 };
@@ -4198,6 +4172,59 @@ template <typename T> struct formatter<group_digits_view<T>> : formatter<T> {
   }
 };
 
+template <typename T> struct nested_view {
+  const formatter<T>* fmt;
+  const T* value;
+};
+
+template <typename T> struct formatter<nested_view<T>> {
+  FMT_CONSTEXPR auto parse(format_parse_context& ctx) -> const char* {
+    return ctx.begin();
+  }
+  auto format(nested_view<T> view, format_context& ctx) const
+      -> decltype(ctx.out()) {
+    return view.fmt->format(*view.value, ctx);
+  }
+};
+
+template <typename T> struct nested_formatter {
+ private:
+  int width_;
+  detail::fill_t<char> fill_;
+  align_t align_ : 4;
+  formatter<T> formatter_;
+
+ public:
+  constexpr nested_formatter() : width_(0), align_(align_t::none) {}
+
+  FMT_CONSTEXPR auto parse(format_parse_context& ctx) -> const char* {
+    auto specs = detail::dynamic_format_specs<char>();
+    auto it = parse_format_specs(ctx.begin(), ctx.end(), specs, ctx,
+                                 detail::type::none_type);
+    width_ = specs.width;
+    fill_ = specs.fill;
+    align_ = specs.align;
+    ctx.advance_to(it);
+    return formatter_.parse(ctx);
+  }
+
+  template <typename F>
+  auto write_padded(format_context& ctx, F write) const -> decltype(ctx.out()) {
+    if (width_ == 0) return write(ctx.out());
+    auto buf = memory_buffer();
+    write(std::back_inserter(buf));
+    auto specs = format_specs<>();
+    specs.width = width_;
+    specs.fill = fill_;
+    specs.align = align_;
+    return detail::write(ctx.out(), string_view(buf.data(), buf.size()), specs);
+  }
+
+  auto nested(const T& value) const -> nested_view<T> {
+    return nested_view<T>{&formatter_, &value};
+  }
+};
+
 // DEPRECATED! join_view will be moved to ranges.h.
 template <typename It, typename Sentinel, typename Char = char>
 struct join_view : detail::view {
@@ -4287,7 +4314,8 @@ auto join(Range&& range, string_view sep)
     std::string answer = fmt::to_string(42);
   \endrst
  */
-template <typename T, FMT_ENABLE_IF(!std::is_integral<T>::value)>
+template <typename T, FMT_ENABLE_IF(!std::is_integral<T>::value &&
+                                    !detail::has_format_as<T>::value)>
 inline auto to_string(const T& value) -> std::string {
   auto buffer = memory_buffer();
   detail::write<char>(appender(buffer), value);
@@ -4312,6 +4340,14 @@ FMT_NODISCARD auto to_string(const basic_memory_buffer<Char, SIZE>& buf)
   return std::basic_string<Char>(buf.data(), size);
 }
 
+template <typename T, FMT_ENABLE_IF(!std::is_integral<T>::value &&
+                                    detail::has_format_as<T>::value)>
+inline auto to_string(const T& value) -> std::string {
+  return to_string(format_as(value));
+}
+
+FMT_END_EXPORT
+
 namespace detail {
 
 template <typename Char>
@@ -4320,7 +4356,7 @@ void vformat_to(buffer<Char>& buf, basic_string_view<Char> fmt,
   auto out = buffer_appender<Char>(buf);
   if (fmt.size() == 2 && equal2(fmt.data(), "{}")) {
     auto arg = args.get(0);
-    if (!arg) error_handler().on_error("argument not found");
+    if (!arg) throw_format_error("argument not found");
     visit_format_arg(default_arg_formatter<Char>{out, args, loc}, arg);
     return;
   }
@@ -4347,7 +4383,7 @@ void vformat_to(buffer<Char>& buf, basic_string_view<Char> fmt,
     }
     FMT_CONSTEXPR auto on_arg_id(basic_string_view<Char> id) -> int {
       int arg_id = context.arg_id(id);
-      if (arg_id < 0) on_error("argument not found");
+      if (arg_id < 0) throw_format_error("argument not found");
       return arg_id;
     }
 
@@ -4362,11 +4398,9 @@ void vformat_to(buffer<Char>& buf, basic_string_view<Char> fmt,
     auto on_format_specs(int id, const Char* begin, const Char* end)
         -> const Char* {
       auto arg = get_arg(context, id);
-      if (arg.type() == type::custom_type) {
-        parse_context.advance_to(begin);
-        visit_format_arg(custom_formatter<Char>{parse_context, context}, arg);
+      // Not using a visitor for custom types gives better codegen.
+      if (arg.format_custom(begin, parse_context, context))
         return parse_context.begin();
-      }
       auto specs = detail::dynamic_format_specs<Char>();
       begin = parse_format_specs(begin, end, specs, parse_context, arg.type());
       detail::handle_dynamic_spec<detail::width_checker>(
@@ -4374,7 +4408,7 @@ void vformat_to(buffer<Char>& buf, basic_string_view<Char> fmt,
       detail::handle_dynamic_spec<detail::precision_checker>(
           specs.precision, specs.precision_ref, context);
       if (begin == end || *begin != '}')
-        on_error("missing '}' in format string");
+        throw_format_error("missing '}' in format string");
       auto f = arg_formatter<Char>{context.out(), specs, context.locale()};
       context.advance_to(visit_format_arg(f, arg));
       return begin;
@@ -4383,6 +4417,8 @@ void vformat_to(buffer<Char>& buf, basic_string_view<Char> fmt,
   detail::parse_format_string<false>(fmt, format_handler(out, fmt, args, loc));
 }
 
+FMT_BEGIN_EXPORT
+
 #ifndef FMT_HEADER_ONLY
 extern template FMT_API void vformat_to(buffer<char>&, string_view,
                                         typename vformat_args<>::type,
@@ -4415,7 +4451,7 @@ template <detail_exported::fixed_string Str> constexpr auto operator""_a() {
   return detail::udl_arg<char_t, sizeof(Str.data) / sizeof(char_t), Str>();
 }
 #  else
-constexpr auto operator"" _a(const char* s, size_t) -> detail::udl_arg<char> {
+constexpr auto operator""_a(const char* s, size_t) -> detail::udl_arg<char> {
   return {s};
 }
 #  endif
@@ -4475,16 +4511,16 @@ formatter<T, Char,
                       detail::type::custom_type>>::format(const T& val,
                                                           FormatContext& ctx)
     const -> decltype(ctx.out()) {
-  if (specs_.width_ref.kind != detail::arg_id_kind::none ||
-      specs_.precision_ref.kind != detail::arg_id_kind::none) {
-    auto specs = specs_;
-    detail::handle_dynamic_spec<detail::width_checker>(specs.width,
-                                                       specs.width_ref, ctx);
-    detail::handle_dynamic_spec<detail::precision_checker>(
-        specs.precision, specs.precision_ref, ctx);
-    return detail::write<Char>(ctx.out(), val, specs, ctx.locale());
-  }
-  return detail::write<Char>(ctx.out(), val, specs_, ctx.locale());
+  if (specs_.width_ref.kind == detail::arg_id_kind::none &&
+      specs_.precision_ref.kind == detail::arg_id_kind::none) {
+    return detail::write<Char>(ctx.out(), val, specs_, ctx.locale());
+  }
+  auto specs = specs_;
+  detail::handle_dynamic_spec<detail::width_checker>(specs.width,
+                                                     specs.width_ref, ctx);
+  detail::handle_dynamic_spec<detail::precision_checker>(
+      specs.precision, specs.precision_ref, ctx);
+  return detail::write<Char>(ctx.out(), val, specs, ctx.locale());
 }
 
 FMT_END_NAMESPACE
diff --git a/contrib/fmt/include/fmt/os.h b/contrib/fmt/include/fmt/os.h
index 2126424d3..3c7b3ccb4 100644
--- a/contrib/fmt/include/fmt/os.h
+++ b/contrib/fmt/include/fmt/os.h
@@ -13,12 +13,14 @@
 #include <cstdio>
 #include <system_error>  // std::system_error
 
+#include "format.h"
+
 #if defined __APPLE__ || defined(__FreeBSD__)
-#  include <xlocale.h>  // for LC_NUMERIC_MASK on OS X
+#  if FMT_HAS_INCLUDE(<xlocale.h>)
+#    include <xlocale.h>  // for LC_NUMERIC_MASK on OS X
+#  endif
 #endif
 
-#include "format.h"
-
 #ifndef FMT_USE_FCNTL
 // UWP doesn't provide _pipe.
 #  if FMT_HAS_INCLUDE("winapifamily.h")
@@ -46,6 +48,7 @@
 
 // Calls to system functions are wrapped in FMT_SYSTEM for testability.
 #ifdef FMT_SYSTEM
+#  define FMT_HAS_SYSTEM
 #  define FMT_POSIX_CALL(call) FMT_SYSTEM(call)
 #else
 #  define FMT_SYSTEM(call) ::call
@@ -114,7 +117,7 @@ template <typename Char> class basic_cstring_view {
   basic_cstring_view(const std::basic_string<Char>& s) : data_(s.c_str()) {}
 
   /** Returns the pointer to a C string. */
-  const Char* c_str() const { return data_; }
+  auto c_str() const -> const Char* { return data_; }
 };
 
 using cstring_view = basic_cstring_view<char>;
@@ -169,7 +172,7 @@ std::system_error windows_error(int error_code, string_view message,
 // Can be used to report errors from destructors.
 FMT_API void report_windows_error(int error_code, const char* message) noexcept;
 #else
-inline const std::error_category& system_category() noexcept {
+inline auto system_category() noexcept -> const std::error_category& {
   return std::system_category();
 }
 #endif  // _WIN32
@@ -206,7 +209,7 @@ class buffered_file {
     other.file_ = nullptr;
   }
 
-  buffered_file& operator=(buffered_file&& other) {
+  auto operator=(buffered_file&& other) -> buffered_file& {
     close();
     file_ = other.file_;
     other.file_ = nullptr;
@@ -220,9 +223,9 @@ class buffered_file {
   FMT_API void close();
 
   // Returns the pointer to a FILE object representing this file.
-  FILE* get() const noexcept { return file_; }
+  auto get() const noexcept -> FILE* { return file_; }
 
-  FMT_API int descriptor() const;
+  FMT_API auto descriptor() const -> int;
 
   void vprint(string_view format_str, format_args args) {
     fmt::vprint(file_, format_str, args);
@@ -272,7 +275,7 @@ class FMT_API file {
   file(file&& other) noexcept : fd_(other.fd_) { other.fd_ = -1; }
 
   // Move assignment is not noexcept because close may throw.
-  file& operator=(file&& other) {
+  auto operator=(file&& other) -> file& {
     close();
     fd_ = other.fd_;
     other.fd_ = -1;
@@ -283,24 +286,24 @@ class FMT_API file {
   ~file() noexcept;
 
   // Returns the file descriptor.
-  int descriptor() const noexcept { return fd_; }
+  auto descriptor() const noexcept -> int { return fd_; }
 
   // Closes the file.
   void close();
 
   // Returns the file size. The size has signed type for consistency with
   // stat::st_size.
-  long long size() const;
+  auto size() const -> long long;
 
   // Attempts to read count bytes from the file into the specified buffer.
-  size_t read(void* buffer, size_t count);
+  auto read(void* buffer, size_t count) -> size_t;
 
   // Attempts to write count bytes from the specified buffer to the file.
-  size_t write(const void* buffer, size_t count);
+  auto write(const void* buffer, size_t count) -> size_t;
 
   // Duplicates a file descriptor with the dup function and returns
   // the duplicate as a file object.
-  static file dup(int fd);
+  static auto dup(int fd) -> file;
 
   // Makes fd be the copy of this file descriptor, closing fd first if
   // necessary.
@@ -312,11 +315,12 @@ class FMT_API file {
 
   // Creates a pipe setting up read_end and write_end file objects for reading
   // and writing respectively.
+  // DEPRECATED! Taking files as out parameters is deprecated.
   static void pipe(file& read_end, file& write_end);
 
   // Creates a buffered_file object associated with this file and detaches
   // this file object from the file.
-  buffered_file fdopen(const char* mode);
+  auto fdopen(const char* mode) -> buffered_file;
 
 #  if defined(_WIN32) && !defined(__MINGW32__)
   // Opens a file and constructs a file object representing this file by
@@ -326,14 +330,14 @@ class FMT_API file {
 };
 
 // Returns the memory page size.
-long getpagesize();
+auto getpagesize() -> long;
 
 namespace detail {
 
 struct buffer_size {
   buffer_size() = default;
   size_t value = 0;
-  buffer_size operator=(size_t val) const {
+  auto operator=(size_t val) const -> buffer_size {
     auto bs = buffer_size();
     bs.value = val;
     return bs;
@@ -410,7 +414,7 @@ class FMT_API ostream {
   void flush() { buffer_.flush(); }
 
   template <typename... T>
-  friend ostream output_file(cstring_view path, T... params);
+  friend auto output_file(cstring_view path, T... params) -> ostream;
 
   void close() { buffer_.close(); }
 
@@ -419,7 +423,7 @@ class FMT_API ostream {
     output to the file.
    */
   template <typename... T> void print(format_string<T...> fmt, T&&... args) {
-    vformat_to(detail::buffer_appender<char>(buffer_), fmt,
+    vformat_to(std::back_inserter(buffer_), fmt,
                fmt::make_format_args(args...));
   }
 };
@@ -440,7 +444,7 @@ class FMT_API ostream {
   \endrst
  */
 template <typename... T>
-inline ostream output_file(cstring_view path, T... params) {
+inline auto output_file(cstring_view path, T... params) -> ostream {
   return {path, detail::ostream_params(params...)};
 }
 #endif  // FMT_USE_FCNTL
diff --git a/contrib/fmt/include/fmt/ostream.h b/contrib/fmt/include/fmt/ostream.h
index a112fe7ba..26fb3b5ac 100644
--- a/contrib/fmt/include/fmt/ostream.h
+++ b/contrib/fmt/include/fmt/ostream.h
@@ -10,19 +10,50 @@
 
 #include <fstream>  // std::filebuf
 
-#if defined(_WIN32) && defined(__GLIBCXX__)
-#  include <ext/stdio_filebuf.h>
-#  include <ext/stdio_sync_filebuf.h>
-#elif defined(_WIN32) && defined(_LIBCPP_VERSION)
-#  include <__std_stream>
+#ifdef _WIN32
+#  ifdef __GLIBCXX__
+#    include <ext/stdio_filebuf.h>
+#    include <ext/stdio_sync_filebuf.h>
+#  endif
+#  include <io.h>
 #endif
 
 #include "format.h"
 
 FMT_BEGIN_NAMESPACE
-
 namespace detail {
 
+template <typename Streambuf> class formatbuf : public Streambuf {
+ private:
+  using char_type = typename Streambuf::char_type;
+  using streamsize = decltype(std::declval<Streambuf>().sputn(nullptr, 0));
+  using int_type = typename Streambuf::int_type;
+  using traits_type = typename Streambuf::traits_type;
+
+  buffer<char_type>& buffer_;
+
+ public:
+  explicit formatbuf(buffer<char_type>& buf) : buffer_(buf) {}
+
+ protected:
+  // The put area is always empty. This makes the implementation simpler and has
+  // the advantage that the streambuf and the buffer are always in sync and
+  // sputc never writes into uninitialized memory. A disadvantage is that each
+  // call to sputc always results in a (virtual) call to overflow. There is no
+  // disadvantage here for sputn since this always results in a call to xsputn.
+
+  auto overflow(int_type ch) -> int_type override {
+    if (!traits_type::eq_int_type(ch, traits_type::eof()))
+      buffer_.push_back(static_cast<char_type>(ch));
+    return ch;
+  }
+
+  auto xsputn(const char_type* s, streamsize count) -> streamsize override {
+    buffer_.append(s, s + count);
+    return count;
+  }
+};
+
 // Generate a unique explicit instantion in every translation unit using a tag
 // type in an anonymous namespace.
 namespace {
@@ -37,36 +68,40 @@ class file_access {
 template class file_access<file_access_tag, std::filebuf,
                            &std::filebuf::_Myfile>;
 auto get_file(std::filebuf&) -> FILE*;
-#elif defined(_WIN32) && defined(_LIBCPP_VERSION)
-template class file_access<file_access_tag, std::__stdoutbuf<char>,
-                           &std::__stdoutbuf<char>::__file_>;
-auto get_file(std::__stdoutbuf<char>&) -> FILE*;
 #endif
 
-inline bool write_ostream_unicode(std::ostream& os, fmt::string_view data) {
+inline auto write_ostream_unicode(std::ostream& os, fmt::string_view data)
+    -> bool {
+  FILE* f = nullptr;
 #if FMT_MSC_VERSION
   if (auto* buf = dynamic_cast<std::filebuf*>(os.rdbuf()))
-    if (FILE* f = get_file(*buf)) return write_console(f, data);
+    f = get_file(*buf);
+  else
+    return false;
 #elif defined(_WIN32) && defined(__GLIBCXX__)
   auto* rdbuf = os.rdbuf();
-  FILE* c_file;
   if (auto* sfbuf = dynamic_cast<__gnu_cxx::stdio_sync_filebuf<char>*>(rdbuf))
-    c_file = sfbuf->file();
+    f = sfbuf->file();
   else if (auto* fbuf = dynamic_cast<__gnu_cxx::stdio_filebuf<char>*>(rdbuf))
-    c_file = fbuf->file();
+    f = fbuf->file();
   else
     return false;
-  if (c_file) return write_console(c_file, data);
-#elif defined(_WIN32) && defined(_LIBCPP_VERSION)
-  if (auto* buf = dynamic_cast<std::__stdoutbuf<char>*>(os.rdbuf()))
-    if (FILE* f = get_file(*buf)) return write_console(f, data);
 #else
-  ignore_unused(os, data);
+  ignore_unused(os, data, f);
+#endif
+#ifdef _WIN32
+  if (f) {
+    int fd = _fileno(f);
+    if (_isatty(fd)) {
+      os.flush();
+      return write_console(fd, data);
+    }
+  }
 #endif
   return false;
 }
-inline bool write_ostream_unicode(std::wostream&,
-                                  fmt::basic_string_view<wchar_t>) {
+inline auto write_ostream_unicode(std::wostream&,
+                                  fmt::basic_string_view<wchar_t>) -> bool {
   return false;
 }
 
@@ -87,18 +122,19 @@ void write_buffer(std::basic_ostream<Char>& os, buffer<Char>& buf) {
 }
 
 template <typename Char, typename T>
-void format_value(buffer<Char>& buf, const T& value,
-                  locale_ref loc = locale_ref()) {
+void format_value(buffer<Char>& buf, const T& value) {
   auto&& format_buf = formatbuf<std::basic_streambuf<Char>>(buf);
   auto&& output = std::basic_ostream<Char>(&format_buf);
 #if !defined(FMT_STATIC_THOUSANDS_SEPARATOR)
-  if (loc) output.imbue(loc.get<std::locale>());
+  output.imbue(std::locale::classic());  // The default is always unlocalized.
 #endif
   output << value;
   output.exceptions(std::ios_base::failbit | std::ios_base::badbit);
 }
 
-template <typename T> struct streamed_view { const T& value; };
+template <typename T> struct streamed_view {
+  const T& value;
+};
 
 }  // namespace detail
 
@@ -111,7 +147,7 @@ struct basic_ostream_formatter : formatter<basic_string_view<Char>, Char> {
   auto format(const T& value, basic_format_context<OutputIt, Char>& ctx) const
       -> OutputIt {
     auto buffer = basic_memory_buffer<Char>();
-    detail::format_value(buffer, value, ctx.locale());
+    detail::format_value(buffer, value);
     return formatter<basic_string_view<Char>, Char>::format(
         {buffer.data(), buffer.size()}, ctx);
   }
@@ -140,7 +176,7 @@ struct formatter<detail::streamed_view<T>, Char>
   \endrst
  */
 template <typename T>
-auto streamed(const T& value) -> detail::streamed_view<T> {
+constexpr auto streamed(const T& value) -> detail::streamed_view<T> {
   return {value};
 }
 
diff --git a/contrib/fmt/include/fmt/printf.h b/contrib/fmt/include/fmt/printf.h
index adef6adf8..07e81577c 100644
--- a/contrib/fmt/include/fmt/printf.h
+++ b/contrib/fmt/include/fmt/printf.h
@@ -16,13 +16,19 @@
 FMT_BEGIN_NAMESPACE
 FMT_BEGIN_EXPORT
 
-template <typename T> struct printf_formatter { printf_formatter() = delete; };
+template <typename T> struct printf_formatter {
+  printf_formatter() = delete;
+};
 
 template <typename Char> class basic_printf_context {
  private:
   detail::buffer_appender<Char> out_;
   basic_format_args<basic_printf_context> args_;
 
+  static_assert(std::is_same<Char, char>::value ||
+                    std::is_same<Char, wchar_t>::value,
+                "Unsupported code unit type.");
+
  public:
   using char_type = Char;
   using parse_context_type = basic_format_parse_context<Char>;
@@ -102,7 +108,9 @@ struct is_zero_int {
 
 template <typename T> struct make_unsigned_or_bool : std::make_unsigned<T> {};
 
-template <> struct make_unsigned_or_bool<bool> { using type = bool; };
+template <> struct make_unsigned_or_bool<bool> {
+  using type = bool;
+};
 
 template <typename T, typename Context> class arg_converter {
  private:
diff --git a/contrib/fmt/include/fmt/ranges.h b/contrib/fmt/include/fmt/ranges.h
index 65beba5bf..3638fffb8 100644
--- a/contrib/fmt/include/fmt/ranges.h
+++ b/contrib/fmt/include/fmt/ranges.h
@@ -1,13 +1,9 @@
-// Formatting library for C++ - experimental range support
+// Formatting library for C++ - range and tuple support
 //
-// Copyright (c) 2012 - present, Victor Zverovich
+// Copyright (c) 2012 - present, Victor Zverovich and {fmt} contributors
 // All rights reserved.
 //
 // For the license information refer to format.h.
-//
-// Copyright (c) 2018 - present, Remotion (Igor Schulz)
-// All Rights Reserved
-// {fmt} support for ranges, containers and types tuple interface.
 
 #ifndef FMT_RANGES_H_
 #define FMT_RANGES_H_
@@ -187,7 +183,7 @@ template <size_t N> using make_index_sequence = std::make_index_sequence<N>;
 template <typename T, T... N> struct integer_sequence {
   using value_type = T;
 
-  static FMT_CONSTEXPR size_t size() { return sizeof...(N); }
+  static FMT_CONSTEXPR auto size() -> size_t { return sizeof...(N); }
 };
 
 template <size_t... N> using index_sequence = integer_sequence<size_t, N...>;
@@ -211,15 +207,15 @@ class is_tuple_formattable_ {
 };
 template <typename T, typename C> class is_tuple_formattable_<T, C, true> {
   template <std::size_t... Is>
-  static std::true_type check2(index_sequence<Is...>,
-                               integer_sequence<bool, (Is == Is)...>);
-  static std::false_type check2(...);
+  static auto check2(index_sequence<Is...>,
+                     integer_sequence<bool, (Is == Is)...>) -> std::true_type;
+  static auto check2(...) -> std::false_type;
   template <std::size_t... Is>
-  static decltype(check2(
+  static auto check(index_sequence<Is...>) -> decltype(check2(
       index_sequence<Is...>{},
-      integer_sequence<
-          bool, (is_formattable<typename std::tuple_element<Is, T>::type,
-                                C>::value)...>{})) check(index_sequence<Is...>);
+      integer_sequence<bool,
+                       (is_formattable<typename std::tuple_element<Is, T>::type,
+                                       C>::value)...>{}));
 
  public:
   static constexpr const bool value =
@@ -421,6 +417,12 @@ struct is_formattable_delayed
 #endif
 }  // namespace detail
 
+template <typename...> struct conjunction : std::true_type {};
+template <typename P> struct conjunction<P> : P {};
+template <typename P1, typename... Pn>
+struct conjunction<P1, Pn...>
+    : conditional_t<bool(P1::value), conjunction<Pn...>, P1> {};
+
 template <typename T, typename Char, typename Enable = void>
 struct range_formatter;
 
@@ -486,7 +488,8 @@ struct range_formatter<
     for (; it != end; ++it) {
       if (i > 0) out = detail::copy_str<Char>(separator_, out);
       ctx.advance_to(out);
-      out = underlying_.format(mapper.map(*it), ctx);
+      auto&& item = *it;
+      out = underlying_.format(mapper.map(item), ctx);
       ++i;
     }
     out = detail::copy_str<Char>(closing_bracket_, out);
diff --git a/contrib/fmt/include/fmt/std.h b/contrib/fmt/include/fmt/std.h
index b0e78e10d..7cff11592 100644
--- a/contrib/fmt/include/fmt/std.h
+++ b/contrib/fmt/include/fmt/std.h
@@ -8,6 +8,7 @@
 #ifndef FMT_STD_H_
 #define FMT_STD_H_
 
+#include <atomic>
 #include <bitset>
 #include <cstdlib>
 #include <exception>
@@ -37,6 +38,10 @@
 #  endif
 #endif
 
+#if FMT_CPLUSPLUS > 201703L && FMT_HAS_INCLUDE(<source_location>)
+#  include <source_location>
+#endif
+
 // GCC 4 does not support FMT_HAS_INCLUDE.
 #if FMT_HAS_INCLUDE(<cxxabi.h>) || defined(__GLIBCXX__)
 #  include <cxxabi.h>
@@ -58,43 +63,53 @@
 #  endif
 #endif
 
-#ifdef __cpp_lib_filesystem
+// For older Xcode versions, __cpp_lib_xxx flags are inaccurately defined.
+#ifndef FMT_CPP_LIB_FILESYSTEM
+#  ifdef __cpp_lib_filesystem
+#    define FMT_CPP_LIB_FILESYSTEM __cpp_lib_filesystem
+#  else
+#    define FMT_CPP_LIB_FILESYSTEM 0
+#  endif
+#endif
+
+#ifndef FMT_CPP_LIB_VARIANT
+#  ifdef __cpp_lib_variant
+#    define FMT_CPP_LIB_VARIANT __cpp_lib_variant
+#  else
+#    define FMT_CPP_LIB_VARIANT 0
+#  endif
+#endif
+
+#if FMT_CPP_LIB_FILESYSTEM
 FMT_BEGIN_NAMESPACE
 
 namespace detail {
 
-template <typename Char> auto get_path_string(const std::filesystem::path& p) {
-  return p.string<Char>();
+template <typename Char, typename PathChar>
+auto get_path_string(const std::filesystem::path& p,
+                     const std::basic_string<PathChar>& native) {
+  if constexpr (std::is_same_v<Char, char> && std::is_same_v<PathChar, wchar_t>)
+    return to_utf8<wchar_t>(native, to_utf8_error_policy::replace);
+  else
+    return p.string<Char>();
 }
 
-template <typename Char>
+template <typename Char, typename PathChar>
 void write_escaped_path(basic_memory_buffer<Char>& quoted,
-                        const std::filesystem::path& p) {
-  write_escaped_string<Char>(std::back_inserter(quoted), p.string<Char>());
-}
-
-#  ifdef _WIN32
-template <>
-inline auto get_path_string<char>(const std::filesystem::path& p) {
-  return to_utf8<wchar_t>(p.native(), to_utf8_error_policy::replace);
-}
-
-template <>
-inline void write_escaped_path<char>(memory_buffer& quoted,
-                                     const std::filesystem::path& p) {
-  auto buf = basic_memory_buffer<wchar_t>();
-  write_escaped_string<wchar_t>(std::back_inserter(buf), p.native());
-  bool valid = to_utf8<wchar_t>::convert(quoted, {buf.data(), buf.size()});
-  FMT_ASSERT(valid, "invalid utf16");
-}
-#  endif  // _WIN32
-
-template <>
-inline void write_escaped_path<std::filesystem::path::value_type>(
-    basic_memory_buffer<std::filesystem::path::value_type>& quoted,
-    const std::filesystem::path& p) {
-  write_escaped_string<std::filesystem::path::value_type>(
-      std::back_inserter(quoted), p.native());
+                        const std::filesystem::path& p,
+                        const std::basic_string<PathChar>& native) {
+  if constexpr (std::is_same_v<Char, char> &&
+                std::is_same_v<PathChar, wchar_t>) {
+    auto buf = basic_memory_buffer<wchar_t>();
+    write_escaped_string<wchar_t>(std::back_inserter(buf), native);
+    bool valid = to_utf8<wchar_t>::convert(quoted, {buf.data(), buf.size()});
+    FMT_ASSERT(valid, "invalid utf16");
+  } else if constexpr (std::is_same_v<Char, PathChar>) {
+    write_escaped_string<std::filesystem::path::value_type>(
+        std::back_inserter(quoted), native);
+  } else {
+    write_escaped_string<Char>(std::back_inserter(quoted), p.string<Char>());
+  }
 }
 
 }  // namespace detail
@@ -105,6 +120,7 @@ template <typename Char> struct formatter<std::filesystem::path, Char> {
   format_specs<Char> specs_;
   detail::arg_ref<Char> width_ref_;
   bool debug_ = false;
+  char path_type_ = 0;
 
  public:
   FMT_CONSTEXPR void set_debug_format(bool set = true) { debug_ = set; }
@@ -121,29 +137,62 @@ template <typename Char> struct formatter<std::filesystem::path, Char> {
       debug_ = true;
       ++it;
     }
+    if (it != end && (*it == 'g')) path_type_ = *it++;
     return it;
   }
 
   template <typename FormatContext>
   auto format(const std::filesystem::path& p, FormatContext& ctx) const {
     auto specs = specs_;
+#  ifdef _WIN32
+    auto path_string = !path_type_ ? p.native() : p.generic_wstring();
+#  else
+    auto path_string = !path_type_ ? p.native() : p.generic_string();
+#  endif
+
     detail::handle_dynamic_spec<detail::width_checker>(specs.width, width_ref_,
                                                        ctx);
     if (!debug_) {
-      auto s = detail::get_path_string<Char>(p);
+      auto s = detail::get_path_string<Char>(p, path_string);
       return detail::write(ctx.out(), basic_string_view<Char>(s), specs);
     }
     auto quoted = basic_memory_buffer<Char>();
-    detail::write_escaped_path(quoted, p);
+    detail::write_escaped_path(quoted, p, path_string);
     return detail::write(ctx.out(),
                          basic_string_view<Char>(quoted.data(), quoted.size()),
                          specs);
   }
 };
 FMT_END_NAMESPACE
-#endif
+#endif  // FMT_CPP_LIB_FILESYSTEM
 
 FMT_BEGIN_NAMESPACE
+FMT_EXPORT
+template <std::size_t N, typename Char>
+struct formatter<std::bitset<N>, Char> : nested_formatter<string_view> {
+ private:
+  // Functor because C++11 doesn't support generic lambdas.
+  struct writer {
+    const std::bitset<N>& bs;
+
+    template <typename OutputIt>
+    FMT_CONSTEXPR auto operator()(OutputIt out) -> OutputIt {
+      for (auto pos = N; pos > 0; --pos) {
+        out = detail::write<Char>(out, bs[pos - 1] ? Char('1') : Char('0'));
+      }
+
+      return out;
+    }
+  };
+
+ public:
+  template <typename FormatContext>
+  auto format(const std::bitset<N>& bs, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    return write_padded(ctx, writer{bs});
+  }
+};
+
 FMT_EXPORT
 template <typename Char>
 struct formatter<std::thread::id, Char> : basic_ostream_formatter<Char> {};
@@ -179,7 +228,7 @@ struct formatter<std::optional<T>, Char,
   }
 
   template <typename FormatContext>
-  auto format(std::optional<T> const& opt, FormatContext& ctx) const
+  auto format(const std::optional<T>& opt, FormatContext& ctx) const
       -> decltype(ctx.out()) {
     if (!opt) return detail::write<Char>(ctx.out(), none);
 
@@ -193,7 +242,32 @@ struct formatter<std::optional<T>, Char,
 FMT_END_NAMESPACE
 #endif  // __cpp_lib_optional
 
-#ifdef __cpp_lib_variant
+#ifdef __cpp_lib_source_location
+FMT_BEGIN_NAMESPACE
+FMT_EXPORT
+template <> struct formatter<std::source_location> {
+  template <typename ParseContext> FMT_CONSTEXPR auto parse(ParseContext& ctx) {
+    return ctx.begin();
+  }
+
+  template <typename FormatContext>
+  auto format(const std::source_location& loc, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    auto out = ctx.out();
+    out = detail::write(out, loc.file_name());
+    out = detail::write(out, ':');
+    out = detail::write<char>(out, loc.line());
+    out = detail::write(out, ':');
+    out = detail::write<char>(out, loc.column());
+    out = detail::write(out, ": ");
+    out = detail::write(out, loc.function_name());
+    return out;
+  }
+};
+FMT_END_NAMESPACE
+#endif
+
+#if FMT_CPP_LIB_VARIANT
 FMT_BEGIN_NAMESPACE
 namespace detail {
 
@@ -284,7 +358,7 @@ struct formatter<
   }
 };
 FMT_END_NAMESPACE
-#endif  // __cpp_lib_variant
+#endif  // FMT_CPP_LIB_VARIANT
 
 FMT_BEGIN_NAMESPACE
 FMT_EXPORT
@@ -308,7 +382,7 @@ template <typename Char> struct formatter<std::error_code, Char> {
 FMT_EXPORT
 template <typename T, typename Char>
 struct formatter<
-    T, Char,
+    T, Char,  // DEPRECATED! Mixing code unit types.
     typename std::enable_if<std::is_base_of<std::exception, T>::value>::type> {
  private:
   bool with_typename_ = false;
@@ -339,7 +413,7 @@ struct formatter<
 #  ifdef FMT_HAS_ABI_CXA_DEMANGLE
     int status = 0;
     std::size_t size = 0;
-    std::unique_ptr<char, decltype(&std::free)> demangled_name_ptr(
+    std::unique_ptr<char, void (*)(void*)> demangled_name_ptr(
         abi::__cxa_demangle(ti.name(), nullptr, &size, &status), &std::free);
 
     string_view demangled_name_view;
@@ -435,6 +509,29 @@ struct formatter<BitRef, Char,
   }
 };
 
-FMT_END_NAMESPACE
+FMT_EXPORT
+template <typename T, typename Char>
+struct formatter<std::atomic<T>, Char,
+                 enable_if_t<is_formattable<T, Char>::value>>
+    : formatter<T, Char> {
+  template <typename FormatContext>
+  auto format(const std::atomic<T>& v, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    return formatter<T, Char>::format(v.load(), ctx);
+  }
+};
 
+#ifdef __cpp_lib_atomic_flag_test
+FMT_EXPORT
+template <typename Char>
+struct formatter<std::atomic_flag, Char> : formatter<bool, Char> {
+  template <typename FormatContext>
+  auto format(const std::atomic_flag& v, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    return formatter<bool, Char>::format(v.test(), ctx);
+  }
+};
+#endif  // __cpp_lib_atomic_flag_test
+
+FMT_END_NAMESPACE
 #endif  // FMT_STD_H_
diff --git a/contrib/fmt/include/fmt/xchar.h b/contrib/fmt/include/fmt/xchar.h
index 625ec3692..f609c5c41 100644
--- a/contrib/fmt/include/fmt/xchar.h
+++ b/contrib/fmt/include/fmt/xchar.h
@@ -63,14 +63,15 @@ template <> struct is_char<char16_t> : std::true_type {};
 template <> struct is_char<char32_t> : std::true_type {};
 
 template <typename... T>
-constexpr format_arg_store<wformat_context, T...> make_wformat_args(
-    const T&... args) {
+constexpr auto make_wformat_args(const T&... args)
+    -> format_arg_store<wformat_context, T...> {
   return {args...};
 }
 
 inline namespace literals {
 #if FMT_USE_USER_DEFINED_LITERALS && !FMT_USE_NONTYPE_TEMPLATE_ARGS
-constexpr detail::udl_arg<wchar_t> operator"" _a(const wchar_t* s, size_t) {
+constexpr auto operator""_a(const wchar_t* s, size_t)
+    -> detail::udl_arg<wchar_t> {
   return {s};
 }
 #endif
@@ -172,11 +173,11 @@ inline auto vformat_to(
   return detail::get_iterator(buf, out);
 }
 
-template <
-    typename OutputIt, typename Locale, typename S, typename... T,
-    typename Char = char_t<S>,
-    bool enable = detail::is_output_iterator<OutputIt, Char>::value&&
-        detail::is_locale<Locale>::value&& detail::is_exotic_char<Char>::value>
+template <typename OutputIt, typename Locale, typename S, typename... T,
+          typename Char = char_t<S>,
+          bool enable = detail::is_output_iterator<OutputIt, Char>::value &&
+                        detail::is_locale<Locale>::value &&
+                        detail::is_exotic_char<Char>::value>
 inline auto format_to(OutputIt out, const Locale& loc, const S& format_str,
                       T&&... args) ->
     typename std::enable_if<enable, OutputIt>::type {

From 9bcc1399c249e68231b52727dbe7ca2bc55113d1 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 12 Feb 2024 10:58:19 +0100
Subject: [PATCH 079/430] Update included CLI11 library to version 2.4.1

---
 contrib/CLI11/README.contrib                  |   2 +-
 contrib/CLI11/README.md                       | 298 +++++++------
 contrib/CLI11/include/CLI/App.hpp             |  50 ++-
 contrib/CLI11/include/CLI/Argv.hpp            |  29 ++
 contrib/CLI11/include/CLI/CLI.hpp             |   6 +-
 contrib/CLI11/include/CLI/Config.hpp          |  13 +-
 contrib/CLI11/include/CLI/ConfigFwd.hpp       |  14 +-
 contrib/CLI11/include/CLI/Encoding.hpp        |  54 +++
 contrib/CLI11/include/CLI/Error.hpp           |   8 +-
 contrib/CLI11/include/CLI/Formatter.hpp       |   2 +-
 contrib/CLI11/include/CLI/FormatterFwd.hpp    |   2 +-
 contrib/CLI11/include/CLI/Macros.hpp          |  58 ++-
 contrib/CLI11/include/CLI/Option.hpp          |  17 +-
 contrib/CLI11/include/CLI/Split.hpp           |   2 +-
 contrib/CLI11/include/CLI/StringTools.hpp     |  49 ++-
 contrib/CLI11/include/CLI/Timer.hpp           |   4 +-
 contrib/CLI11/include/CLI/TypeTools.hpp       | 244 +++++++---
 contrib/CLI11/include/CLI/Validators.hpp      |  38 +-
 contrib/CLI11/include/CLI/Version.hpp         |   8 +-
 contrib/CLI11/include/CLI/impl/App_inl.hpp    | 415 +++++++++++++-----
 contrib/CLI11/include/CLI/impl/Argv_inl.hpp   |  88 ++++
 contrib/CLI11/include/CLI/impl/Config_inl.hpp | 322 +++++++++++---
 .../CLI11/include/CLI/impl/Encoding_inl.hpp   | 154 +++++++
 .../CLI11/include/CLI/impl/Formatter_inl.hpp  |  16 +-
 contrib/CLI11/include/CLI/impl/Option_inl.hpp |  67 ++-
 contrib/CLI11/include/CLI/impl/Split_inl.hpp  |  16 +-
 .../include/CLI/impl/StringTools_inl.hpp      | 377 ++++++++++++++--
 .../CLI11/include/CLI/impl/Validators_inl.hpp |  28 +-
 28 files changed, 1890 insertions(+), 491 deletions(-)
 create mode 100644 contrib/CLI11/include/CLI/Argv.hpp
 create mode 100644 contrib/CLI11/include/CLI/Encoding.hpp
 create mode 100644 contrib/CLI11/include/CLI/impl/Argv_inl.hpp
 create mode 100644 contrib/CLI11/include/CLI/impl/Encoding_inl.hpp

diff --git a/contrib/CLI11/README.contrib b/contrib/CLI11/README.contrib
index c0e274270..04e057e2d 100644
--- a/contrib/CLI11/README.contrib
+++ b/contrib/CLI11/README.contrib
@@ -1,2 +1,2 @@
 Source: https://github.com/CLIUtils/CLI11
-Revision: v2.3.2
+Revision: v2.4.1
diff --git a/contrib/CLI11/README.md b/contrib/CLI11/README.md
index 3127be8a3..7a26fb251 100644
--- a/contrib/CLI11/README.md
+++ b/contrib/CLI11/README.md
@@ -4,7 +4,6 @@
 
 [![Build Status Azure][azure-badge]][azure]
 [![Actions Status][actions-badge]][actions-link]
-[![Build Status AppVeyor][appveyor-badge]][appveyor]
 [![Code Coverage][codecov-badge]][codecov]
 [![Codacy Badge][codacy-badge]][codacy-link]
 [![License: BSD][license-badge]](./LICENSE) [![DOI][doi-badge]][doi-link]
@@ -14,7 +13,7 @@
 [![Latest release][repology-badge]][repology]
 [![Conan.io][conan-badge]][conan-link]
 [![Conda Version][conda-badge]][conda-link]
-[![Try CLI11 2.1 online][wandbox-badge]][wandbox-link]
+[![Try CLI11 2.4 online][wandbox-badge]][wandbox-link]
 
 [What's new](./CHANGELOG.md) • [Documentation][gitbook] • [API
 Reference][api-docs]
@@ -52,7 +51,6 @@ set with a simple and intuitive interface.
     - [Formatting](#formatting)
     - [Subclassing](#subclassing)
     - [How it works](#how-it-works)
-      - [Example](#example-1)
     - [Unicode support](#unicode-support)
       - [Note on using Unicode paths](#note-on-using-unicode-paths)
     - [Utilities](#utilities)
@@ -207,8 +205,8 @@ int main(int argc, char** argv) {
 }
 ```
 
-For more information about 🚧`ensure_utf8` the section on
-[Unicode support](#unicode-support) below. The 🚧`ensure_utf8` function is only
+For more information about 🆕`ensure_utf8` the section on
+[Unicode support](#unicode-support) below. The 🆕`ensure_utf8` function is only
 available in main currently and not in a release.
 
 <details><summary>Note: If you don't like macros, this is what that macro expands to: (click to expand)</summary><p>
@@ -417,7 +415,7 @@ Before parsing, you can set the following options:
   option. Options can be removed from the excludes list with
   `->remove_excludes(opt)`
 - `->envname(name)`: Gets the value from the environment if present and not
-  passed on the command line. 🚧 The value must also pass any validators to be
+  passed on the command line. 🆕 The value must also pass any validators to be
   used.
 - `->group(name)`: The help group to put the option in. No effect for positional
   options. Defaults to `"Options"`. Options given an empty string will not show
@@ -452,8 +450,8 @@ Before parsing, you can set the following options:
   This equivalent to calling `->delimiter(delim)` and `->join()`. Valid values
   are `CLI::MultiOptionPolicy::Throw`, `CLI::MultiOptionPolicy::Throw`,
   `CLI::MultiOptionPolicy::TakeLast`, `CLI::MultiOptionPolicy::TakeFirst`,
-  `CLI::MultiOptionPolicy::Join`, `CLI::MultiOptionPolicy::TakeAll`, and
-  `CLI::MultiOptionPolicy::Sum` 🆕.
+  `CLI::MultiOptionPolicy::Join`, `CLI::MultiOptionPolicy::TakeAll`,
+  `CLI::MultiOptionPolicy::Sum`, and `CLI::MultiOptionPolicy::Reverse` 🆕.
 - `->check(std::string(const std::string &), validator_name="",validator_description="")`:
   Define a check function. The function should return a non empty string with
   the error message if the check fails
@@ -695,7 +693,7 @@ NOTES: If the container used in `IsMember`, `Transformer`, or
 fast search is performed first, and if that fails a linear search with the
 filters on the key values is performed.
 
-- `CLI::FileOnDefaultPath(default_path)`: 🆕 can be used to check for files in a
+- `CLI::FileOnDefaultPath(default_path)`: can be used to check for files in a
   default path. If used as a transform it will first check that a file exists,
   if it does nothing further is done, if it does not it tries to add a default
   Path to the file and search there again. If the file does not exist an error
@@ -703,6 +701,17 @@ filters on the key values is performed.
   `CLI::FileOnDefaultPath(default_path, false)`. This allows multiple paths to
   be chained using multiple transform calls.
 
+- `CLI::EscapedString`: 🆕 can be used to process an escaped string. The
+  processing is equivalent to that used for TOML config files, see
+  [TOML strings](https://toml.io/en/v1.0.0#string). With 2 notable exceptions.
+  \` can also be used as a literal string notation, and it also allows binary
+  string notation see
+  [binary strings](https://cliutils.github.io/CLI11/book/chapters/config.html).
+  The escaped string processing will remove outer quotes if present, `"` will
+  indicate a string with potential escape sequences, `'` and \` will indicate a
+  literal string and the quotes removed but no escape sequences will be
+  processed. This is the same escape processing as used in config files.
+
 ##### Validator operations
 
 Validators are copyable and have a few operations that can be performed on them
@@ -864,7 +873,7 @@ nameless subcommands are allowed. Callbacks for nameless subcommands are only
 triggered if any options from the subcommand were parsed. Subcommand names given
 through the `add_subcommand` method have the same restrictions as option names.
 
-🚧 Options or flags in a subcommand may be directly specified using dot notation
+🆕 Options or flags in a subcommand may be directly specified using dot notation
 
 - `--subcommand.long=val` (long subcommand option)
 - `--subcommand.long val` (long subcommand option)
@@ -874,9 +883,11 @@ through the `add_subcommand` method have the same restrictions as option names.
 - `--subcommand1.subsub.f val` (short form nested subcommand option)
 
 The use of dot notation in this form is equivalent `--subcommand.long <args>` =>
-`subcommand --long <args> ++`. Nested subcommands also work `"sub1.subsub"`
-would trigger the subsub subcommand in `sub1`. This is equivalent to "sub1
-subsub"
+`subcommand --long <args> ++`. Nested subcommands also work `sub1.subsub` would
+trigger the subsub subcommand in `sub1`. This is equivalent to "sub1 subsub".
+Quotes around the subcommand names are permitted 🆕 following the TOML standard
+for such specification. This includes allowing escape sequences. For example
+`"subcommand".'f'` or `"subcommand.with.dots".arg1 = value`.
 
 #### Subcommand options
 
@@ -914,9 +925,9 @@ option_groups. These are:
   before matching. Validation is specified through `transform`, `check`, and
   `each` for an option. If an argument fails validation it is not an error and
   matching proceeds to the next available positional or extra arguments.
-- `.validate_optional_arguments()`:🆕 Specify that optional arguments should
-  pass validation before being assigned to an option. Validation is specified
-  through `transform`, `check`, and `each` for an option. If an argument fails
+- `.validate_optional_arguments()`: Specify that optional arguments should pass
+  validation before being assigned to an option. Validation is specified through
+  `transform`, `check`, and `each` for an option. If an argument fails
   validation it is not an error and matching proceeds to the next available
   positional subcommand or extra arguments.
 - `.excludes(option_or_subcommand)`: If given an option pointer or pointer to
@@ -1002,10 +1013,10 @@ option_groups. These are:
 - `.prefix_command()`: Like `allow_extras`, but stop immediately on the first
   unrecognized item. It is ideal for allowing your app or subcommand to be a
   "prefix" to calling another app.
-- `.usage(message)`: Replace text to appear at the start of the help string
+- `.usage(message)`: 🆕 Replace text to appear at the start of the help string
   after description.
-- `.usage(std::string())`: Set a callback to generate a string that will appear
-  at the start of the help string after description.
+- `.usage(std::string())`: 🆕 Set a callback to generate a string that will
+  appear at the start of the help string after description.
 - `.footer(message)`: Set text to appear at the bottom of the help string.
 - `.footer(std::string())`: Set a callback to generate a string that will appear
   at the end of the help string.
@@ -1026,9 +1037,11 @@ option_groups. These are:
   command line for a flag. The operation will throw an exception if the option
   name is not valid.
 
-> Note: if you have a fixed number of required positional options, that will
-> match before subcommand names. `{}` is an empty filter function, and any
-> positional argument will match before repeated subcommand names.
+> [!NOTE]
+>
+> If you have a fixed number of required positional options, that will match
+> before subcommand names. `{}` is an empty filter function, and any positional
+> argument will match before repeated subcommand names.
 
 #### Callbacks
 
@@ -1208,18 +1221,22 @@ option (like `set_help_flag`). Setting a configuration option is special. If it
 is present, it will be read along with the normal command line arguments. The
 file will be read if it exists, and does not throw an error unless `required` is
 `true`. Configuration files are in [TOML][] format by default, though the
-default reader can also accept files in INI format as well. It should be noted
-that CLI11 does not contain a full TOML parser but can read strings from most
-TOML file and run them through the CLI11 parser. Other formats can be added by
-an adept user, some variations are available through customization points in the
-default formatter. An example of a TOML file:
+default reader can also accept files in INI format as well. The config reader
+can read most aspects of TOML files including strings both literal 🆕 and with
+potential escape sequences 🆕, digit separators 🆕, and multi-line strings 🆕,
+and run them through the CLI11 parser. Other formats can be added by an adept
+user, some variations are available through customization points in the default
+formatter. An example of a TOML file:
 
 ```toml
 # Comments are supported, using a #
 # The default section is [default], case insensitive
 
 value = 1
+value2 = 123_456 # a string with separators
 str = "A string"
+str2 = "A string\nwith new lines"
+str3 = 'A literal "string"'
 vector = [1,2,3]
 str_vector = ["one","two","and three"]
 
@@ -1227,6 +1244,7 @@ str_vector = ["one","two","and three"]
 [subcommand]
 in_subcommand = Wow
 sub.subcommand = true
+"sub"."subcommand2" = "string_value"
 ```
 
 or equivalently in INI format
@@ -1278,9 +1296,9 @@ boolean values are not quoted.
 
 For options or flags which allow 0 arguments to be passed using an empty string
 in the config file, `{}`, or `[]` will convert the result to the default value
-specified via `default_str` or `default_val` on the option 🆕. If no user
-specified default is given the result is an empty string or the converted value
-of an empty string.
+specified via `default_str` or `default_val` on the option. If no user specified
+default is given the result is an empty string or the converted value of an
+empty string.
 
 NOTE: Transforms and checks can be used with the option pointer returned from
 set_config like any other option to validate the input if needed. It can also be
@@ -1408,71 +1426,46 @@ CLI11 supports Unicode and wide strings as defined in the
 
 When using the command line on Windows with unicode arguments, your `main`
 function may already receive broken Unicode. Parsing `argv` at that point will
-not give you a correct string. To fix this, you have three good options and two
-bad ones:
-
-1. Replace `argv` with `app.ensure_utf8(argv)` before any arguments are parsed.
-   `ensure_utf8` will do nothing on systems where `argv` is already in UTF-8
-   (Such as Linux or macOS) and return `argv` unmodified. On Windows, it will
-   discard `argv` and replace it with a correctly decoded array or arguments
-   from win32 API.
-
-   ```cpp
-   int main(int argc, char** argv) {
-       CLI::App app;
-       argv = app.ensure_utf8(argv);  // new argv memory is held by app
-       // ...
-       CLI11_PARSE(app, argc, argv);
-   }
-   ```
-
-2. If you pass unmodified command-line arguments to CLI11, call `app.parse()`
-   instead of `app.parse(argc, argv)` (or `CLI11_PARSE(app)` instead of
-   `CLI11_PARSE(app, argc, argv)`). The library will find correct arguments by
-   itself.
-
-   Note: this approach may not work on weird OS configurations, such as when the
-   `/proc` dir is missing on Linux systems (see also
-   [#845](https://github.com/CLIUtils/CLI11/issues/845)).
-
-   ```cpp
-   int main() {
-       CLI::App app;
-       // ...
-       CLI11_PARSE(app);
-   }
-   ```
-
-3. Get correct arguments with which the program was originally executed using
-   provided functions: `CLI::argc()` and `CLI::argv()`. These three methods are
-   the only cross-platform ways of handling unicode correctly.
-
-   ```cpp
-   int main() {
-       CLI::App app;
-       // ...
-       CLI11_PARSE(app, CLI::argc(), CLI::argv());
-   }
-   ```
-
-<details><summary>Bad options (click to expand)</summary><p>
-
-4. Use the Windows-only non-standard `wmain` function, which accepts
-   `wchar_t *argv[]` instead of `char* argv[]`. Parsing this will allow CLI to
-   convert wide strings to UTF-8 without losing information.
-
-   ```cpp
-   int wmain(int argc, wchar_t *argv[]) {
-       CLI::App app;
-       // ...
-       CLI11_PARSE(app, argc, argv);
-   }
-   ```
-
-5. Retrieve arguments yourself by using Windows APIs like
-   [`CommandLineToArgvW`](https://learn.microsoft.com/en-us/windows/win32/api/shellapi/nf-shellapi-commandlinetoargvw)
-   and pass them to CLI. This is what the library is doing under the hood in
-   `CLI::argv()`.
+not give you a correct string. To fix this, you have three options; the first is
+recommended for cross-platform support:
+
+1\. Replace `argv` with `app.ensure_utf8(argv)` before any arguments are parsed.
+`ensure_utf8` will do nothing on systems where `argv` is already in UTF-8 (Such
+as Linux or macOS) and return `argv` unmodified. On Windows, it will discard
+`argv` and replace it with a correctly decoded array or arguments from win32
+API.
+
+```cpp
+int main(int argc, char** argv) {
+    CLI::App app;
+    argv = app.ensure_utf8(argv);  // new argv memory is held by app
+    // ...
+    CLI11_PARSE(app, argc, argv);
+}
+```
+
+Be sure you do not modify `argv` before this function call, as the correct
+values will be reconstructed using Windows APIs and produced by this call. It
+has no effect on other platforms and just passes through `argv`.
+
+<details><summary>Other options (click to expand)</summary><p>
+
+2\. Use the Windows-only non-standard `wmain` function, which accepts
+`wchar_t *argv[]` instead of `char* argv[]`. Parsing this will allow CLI to
+convert wide strings to UTF-8 without losing information.
+
+```cpp
+int wmain(int argc, wchar_t *argv[]) {
+    CLI::App app;
+    // ...
+    CLI11_PARSE(app, argc, argv);
+}
+```
+
+3\. Retrieve arguments yourself by using Windows APIs like
+[`CommandLineToArgvW`](https://learn.microsoft.com/en-us/windows/win32/api/shellapi/nf-shellapi-commandlinetoargvw)
+and pass them to CLI. This is what the library is doing under the hood in
+`ensure_utf8`.
 
 </p></details>
 </br>
@@ -1580,6 +1573,9 @@ GitBook][gitbook].
 Several short examples of different features are included in the repository. A
 brief description of each is included here
 
+- [arg_capture](https://github.com/CLIUtils/CLI11/blob/main/examples/arg_capture.cpp):
+  Example of capturing all remaining arguments after a specific option, using
+  subcommand and prefix_command() with an alias.
 - [callback_passthrough](https://github.com/CLIUtils/CLI11/blob/main/examples/callback_passthrough.cpp):
   Example of directly passing remaining arguments through to a callback function
   which generates a CLI11 application based on existing arguments.
@@ -1661,71 +1657,100 @@ thanks to all the contributors
 <table>
   <tbody>
     <tr>
-      <td align="center" valign="top" width="14.28%"><a href="http://iscinumpy.gitlab.io"><img src="https://avatars1.githubusercontent.com/u/4616906?v=4?s=100" width="100px;" alt="Henry Schreiner"/><br /><sub><b>Henry Schreiner</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Ahenryiii" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=henryiii" title="Documentation">📖</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=henryiii" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/phlptp"><img src="https://avatars0.githubusercontent.com/u/20667153?v=4?s=100" width="100px;" alt="Philip Top"/><br /><sub><b>Philip Top</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Aphlptp" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=phlptp" title="Documentation">📖</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=phlptp" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://profiles.sussex.ac.uk/p281168-alex-dewar/publications"><img src="https://avatars.githubusercontent.com/u/23149834?v=4?s=100" width="100px;" alt="Alex Dewar"/><br /><sub><b>Alex Dewar</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=alexdewar" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/andrew-hardin"><img src="https://avatars0.githubusercontent.com/u/16496326?v=4?s=100" width="100px;" alt="Andrew Hardin"/><br /><sub><b>Andrew Hardin</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=andrew-hardin" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/andreasxp"><img src="https://avatars.githubusercontent.com/u/28830446?v=4?s=100" width="100px;" alt="Andrey Zhukov"/><br /><sub><b>Andrey Zhukov</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=andreasxp" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/SX91"><img src="https://avatars2.githubusercontent.com/u/754754?v=4?s=100" width="100px;" alt="Anton"/><br /><sub><b>Anton</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=SX91" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/trokhymchuk"><img src="https://avatars.githubusercontent.com/u/66204814?v=4?s=100" width="100px;" alt="Artem Trokhymchuk "/><br /><sub><b>Artem Trokhymchuk </b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=trokhymchuk" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/BenjaminBeichler"><img src="https://avatars.githubusercontent.com/u/1441492?v=4?s=100" width="100px;" alt="Benjamin Beichler"/><br /><sub><b>Benjamin Beichler</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=BenjaminBeichler" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/cbachhuber/"><img src="https://avatars0.githubusercontent.com/u/27212661?v=4?s=100" width="100px;" alt="Christoph Bachhuber"/><br /><sub><b>Christoph Bachhuber</b></sub></a><br /><a href="#example-cbachhuber" title="Examples">💡</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=cbachhuber" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://lambdafu.net/"><img src="https://avatars1.githubusercontent.com/u/1138455?v=4?s=100" width="100px;" alt="Marcus Brinkmann"/><br /><sub><b>Marcus Brinkmann</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Alambdafu" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=lambdafu" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/SkyToGround"><img src="https://avatars1.githubusercontent.com/u/58835?v=4?s=100" width="100px;" alt="Jonas Nilsson"/><br /><sub><b>Jonas Nilsson</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3ASkyToGround" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=SkyToGround" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dvj"><img src="https://avatars2.githubusercontent.com/u/77217?v=4?s=100" width="100px;" alt="Doug Johnston"/><br /><sub><b>Doug Johnston</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Advj" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=dvj" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://lucas-czech.de"><img src="https://avatars0.githubusercontent.com/u/4741887?v=4?s=100" width="100px;" alt="Lucas Czech"/><br /><sub><b>Lucas Czech</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Alczech" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=lczech" title="Code">💻</a></td>
     </tr>
     <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/rafiw"><img src="https://avatars3.githubusercontent.com/u/3034707?v=4?s=100" width="100px;" alt="Rafi Wiener"/><br /><sub><b>Rafi Wiener</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Arafiw" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=rafiw" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dfleury2"><img src="https://avatars1.githubusercontent.com/u/4805384?v=4?s=100" width="100px;" alt="D. Fleury"/><br /><sub><b>D. Fleury</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=dfleury2" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dbarowy"><img src="https://avatars3.githubusercontent.com/u/573142?v=4?s=100" width="100px;" alt="Dan Barowy"/><br /><sub><b>Dan Barowy</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=dbarowy" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/mensinda"><img src="https://avatars3.githubusercontent.com/u/3407462?v=4?s=100" width="100px;" alt="Daniel Mensinger"/><br /><sub><b>Daniel Mensinger</b></sub></a><br /><a href="#platform-mensinda" title="Packaging/porting to new platform">📦</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jbriales"><img src="https://avatars1.githubusercontent.com/u/6850478?v=4?s=100" width="100px;" alt="Jesus Briales"/><br /><sub><b>Jesus Briales</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=jbriales" title="Code">💻</a> <a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Ajbriales" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://seanfisk.com/"><img src="https://avatars0.githubusercontent.com/u/410322?v=4?s=100" width="100px;" alt="Sean Fisk"/><br /><sub><b>Sean Fisk</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Aseanfisk" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=seanfisk" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/fpeng1985"><img src="https://avatars1.githubusercontent.com/u/87981?v=4?s=100" width="100px;" alt="fpeng1985"/><br /><sub><b>fpeng1985</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=fpeng1985" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/almikhayl"><img src="https://avatars2.githubusercontent.com/u/6747040?v=4?s=100" width="100px;" alt="almikhayl"/><br /><sub><b>almikhayl</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=almikhayl" title="Code">💻</a> <a href="#platform-almikhayl" title="Packaging/porting to new platform">📦</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/andrew-hardin"><img src="https://avatars0.githubusercontent.com/u/16496326?v=4?s=100" width="100px;" alt="Andrew Hardin"/><br /><sub><b>Andrew Hardin</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=andrew-hardin" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/DarkWingMcQuack"><img src="https://avatars.githubusercontent.com/u/38857302?v=4?s=100" width="100px;" alt="DarkWingMcQuack"/><br /><sub><b>DarkWingMcQuack</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=DarkWingMcQuack" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ZeeD26"><img src="https://avatars2.githubusercontent.com/u/2487468?v=4?s=100" width="100px;" alt="Dominik Steinberger"/><br /><sub><b>Dominik Steinberger</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=ZeeD26" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dvj"><img src="https://avatars2.githubusercontent.com/u/77217?v=4?s=100" width="100px;" alt="Doug Johnston"/><br /><sub><b>Doug Johnston</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Advj" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=dvj" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/eli-schwartz"><img src="https://avatars.githubusercontent.com/u/6551424?v=4?s=100" width="100px;" alt="Eli Schwartz"/><br /><sub><b>Eli Schwartz</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=eli-schwartz" title="Code">💻</a></td>
     </tr>
     <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/SX91"><img src="https://avatars2.githubusercontent.com/u/754754?v=4?s=100" width="100px;" alt="Anton"/><br /><sub><b>Anton</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=SX91" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/helmesjo"><img src="https://avatars0.githubusercontent.com/u/2501070?v=4?s=100" width="100px;" alt="Fred Helmesjö"/><br /><sub><b>Fred Helmesjö</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Ahelmesjo" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=helmesjo" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://iscinumpy.gitlab.io"><img src="https://avatars1.githubusercontent.com/u/4616906?v=4?s=100" width="100px;" alt="Henry Schreiner"/><br /><sub><b>Henry Schreiner</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Ahenryiii" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=henryiii" title="Documentation">📖</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=henryiii" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://izzys.casa"><img src="https://avatars0.githubusercontent.com/u/63051?v=4?s=100" width="100px;" alt="Isabella Muerte"/><br /><sub><b>Isabella Muerte</b></sub></a><br /><a href="#platform-slurps-mad-rips" title="Packaging/porting to new platform">📦</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://izzys.casa/"><img src="https://avatars.githubusercontent.com/u/63051?v=4?s=100" width="100px;" alt="Izzy Muerte"/><br /><sub><b>Izzy Muerte</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=bruxisma" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jakoblover"><img src="https://avatars0.githubusercontent.com/u/14160441?v=4?s=100" width="100px;" alt="Jakob Lover"/><br /><sub><b>Jakob Lover</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=jakoblover" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jgerityneurala"><img src="https://avatars2.githubusercontent.com/u/57360646?v=4?s=100" width="100px;" alt="James Gerity"/><br /><sub><b>James Gerity</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=jgerityneurala" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jbriales"><img src="https://avatars1.githubusercontent.com/u/6850478?v=4?s=100" width="100px;" alt="Jesus Briales"/><br /><sub><b>Jesus Briales</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=jbriales" title="Code">💻</a> <a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Ajbriales" title="Bug reports">🐛</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/SkyToGround"><img src="https://avatars1.githubusercontent.com/u/58835?v=4?s=100" width="100px;" alt="Jonas Nilsson"/><br /><sub><b>Jonas Nilsson</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3ASkyToGround" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=SkyToGround" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/j-rivero"><img src="https://avatars.githubusercontent.com/u/2098802?v=4?s=100" width="100px;" alt="Jose Luis Rivero"/><br /><sub><b>Jose Luis Rivero</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=j-rivero" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jsoref"><img src="https://avatars0.githubusercontent.com/u/2119212?v=4?s=100" width="100px;" alt="Josh Soref"/><br /><sub><b>Josh Soref</b></sub></a><br /><a href="#tool-jsoref" title="Tools">🔧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/KOLANICH"><img src="https://avatars1.githubusercontent.com/u/240344?v=4?s=100" width="100px;" alt="KOLANICH"/><br /><sub><b>KOLANICH</b></sub></a><br /><a href="#platform-KOLANICH" title="Packaging/porting to new platform">📦</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/skannan89"><img src="https://avatars0.githubusercontent.com/u/11918764?v=4?s=100" width="100px;" alt="Kannan"/><br /><sub><b>Kannan</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Askannan89" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=skannan89" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://himvis.com"><img src="https://avatars3.githubusercontent.com/u/465279?v=4?s=100" width="100px;" alt="Khem Raj"/><br /><sub><b>Khem Raj</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=kraj" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/looopTools"><img src="https://avatars.githubusercontent.com/u/1943536?v=4?s=100" width="100px;" alt="Lars Nielsen"/><br /><sub><b>Lars Nielsen</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=looopTools" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="http://lucas-czech.de"><img src="https://avatars0.githubusercontent.com/u/4741887?v=4?s=100" width="100px;" alt="Lucas Czech"/><br /><sub><b>Lucas Czech</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Alczech" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=lczech" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://www.mogigoma.com/"><img src="https://avatars2.githubusercontent.com/u/130862?v=4?s=100" width="100px;" alt="Mak Kolybabi"/><br /><sub><b>Mak Kolybabi</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=mogigoma" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/cetius"><img src="https://avatars.githubusercontent.com/u/6552472?v=4?s=100" width="100px;" alt="Marcin Ropa"/><br /><sub><b>Marcin Ropa</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=cetius" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://lambdafu.net/"><img src="https://avatars1.githubusercontent.com/u/1138455?v=4?s=100" width="100px;" alt="Marcus Brinkmann"/><br /><sub><b>Marcus Brinkmann</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Alambdafu" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=lambdafu" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://msoeken.github.io"><img src="https://avatars0.githubusercontent.com/u/1998245?v=4?s=100" width="100px;" alt="Mathias Soeken"/><br /><sub><b>Mathias Soeken</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=msoeken" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/nathanhourt"><img src="https://avatars2.githubusercontent.com/u/271977?v=4?s=100" width="100px;" alt="Nathan Hourt"/><br /><sub><b>Nathan Hourt</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Anathanhourt" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=nathanhourt" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.mmmccormick.com/"><img src="https://avatars.githubusercontent.com/u/25432?v=4?s=100" width="100px;" alt="Matt McCormick"/><br /><sub><b>Matt McCormick</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=thewtex" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/AnticliMaxtic"><img src="https://avatars.githubusercontent.com/u/43995389?v=4?s=100" width="100px;" alt="Max"/><br /><sub><b>Max</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=AnticliMaxtic" title="Code">💻</a></td>
     </tr>
     <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://mbh.sh"><img src="https://avatars3.githubusercontent.com/u/20403931?v=4?s=100" width="100px;" alt="Michael Hall"/><br /><sub><b>Michael Hall</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=mbhall88" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/nathanhourt"><img src="https://avatars2.githubusercontent.com/u/271977?v=4?s=100" width="100px;" alt="Nathan Hourt"/><br /><sub><b>Nathan Hourt</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Anathanhourt" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=nathanhourt" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/nathanielhourt"><img src="https://avatars.githubusercontent.com/u/271977?v=4?s=100" width="100px;" alt="Nathaniel Hourt"/><br /><sub><b>Nathaniel Hourt</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=nathanielhourt" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/paddy-hack"><img src="https://avatars.githubusercontent.com/u/6804372?v=4?s=100" width="100px;" alt="Olaf Meeuwissen"/><br /><sub><b>Olaf Meeuwissen</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=paddy-hack" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://ondrejcertik.com/"><img src="https://avatars3.githubusercontent.com/u/20568?v=4?s=100" width="100px;" alt="Ondřej Čertík"/><br /><sub><b>Ondřej Čertík</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Acertik" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/pleroux0"><img src="https://avatars2.githubusercontent.com/u/39619854?v=4?s=100" width="100px;" alt="Paul le Roux"/><br /><sub><b>Paul le Roux</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=pleroux0" title="Code">💻</a> <a href="#platform-pleroux0" title="Packaging/porting to new platform">📦</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/chfast"><img src="https://avatars1.githubusercontent.com/u/573380?v=4?s=100" width="100px;" alt="Paweł Bylica"/><br /><sub><b>Paweł Bylica</b></sub></a><br /><a href="#platform-chfast" title="Packaging/porting to new platform">📦</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/PeteAudinate"><img src="https://avatars.githubusercontent.com/u/99274874?v=4?s=100" width="100px;" alt="PeteAudinate"/><br /><sub><b>PeteAudinate</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=PeteAudinate" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/peterazmanov"><img src="https://avatars0.githubusercontent.com/u/15322318?v=4?s=100" width="100px;" alt="Peter Azmanov"/><br /><sub><b>Peter Azmanov</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=peterazmanov" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/peterh"><img src="https://avatars.githubusercontent.com/u/79339?v=4?s=100" width="100px;" alt="Peter Harris"/><br /><sub><b>Peter Harris</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=peterh" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://ptheywood.uk/"><img src="https://avatars.githubusercontent.com/u/628937?v=4?s=100" width="100px;" alt="Peter Heywood"/><br /><sub><b>Peter Heywood</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=ptheywood" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/phlptp"><img src="https://avatars0.githubusercontent.com/u/20667153?v=4?s=100" width="100px;" alt="Philip Top"/><br /><sub><b>Philip Top</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Aphlptp" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=phlptp" title="Documentation">📖</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=phlptp" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/rafiw"><img src="https://avatars3.githubusercontent.com/u/3034707?v=4?s=100" width="100px;" alt="Rafi Wiener"/><br /><sub><b>Rafi Wiener</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Arafiw" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=rafiw" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/RangeMachine"><img src="https://avatars.githubusercontent.com/u/11577601?v=4?s=100" width="100px;" alt="RangeMachine"/><br /><sub><b>RangeMachine</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=RangeMachine" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Krzmbrzl"><img src="https://avatars.githubusercontent.com/u/12751591?v=4?s=100" width="100px;" alt="Robert Adam"/><br /><sub><b>Robert Adam</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=Krzmbrzl" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://www.ratml.org/"><img src="https://avatars0.githubusercontent.com/u/1845039?v=4?s=100" width="100px;" alt="Ryan Curtin"/><br /><sub><b>Ryan Curtin</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=rcurtin" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/SherlockInSpace"><img src="https://avatars.githubusercontent.com/u/5507786?v=4?s=100" width="100px;" alt="Ryan Sherlock"/><br /><sub><b>Ryan Sherlock</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=SherlockInSpace" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://sam.hocevar.net/"><img src="https://avatars2.githubusercontent.com/u/245089?v=4?s=100" width="100px;" alt="Sam Hocevar"/><br /><sub><b>Sam Hocevar</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=samhocevar" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://seanfisk.com/"><img src="https://avatars0.githubusercontent.com/u/410322?v=4?s=100" width="100px;" alt="Sean Fisk"/><br /><sub><b>Sean Fisk</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Aseanfisk" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=seanfisk" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/delpinux"><img src="https://avatars0.githubusercontent.com/u/35096584?v=4?s=100" width="100px;" alt="Stéphane Del Pino"/><br /><sub><b>Stéphane Del Pino</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=delpinux" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/metopa"><img src="https://avatars2.githubusercontent.com/u/3974178?v=4?s=100" width="100px;" alt="Viacheslav Kroilov"/><br /><sub><b>Viacheslav Kroilov</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=metopa" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/VolkerChristian"><img src="https://avatars.githubusercontent.com/u/18554540?v=4?s=100" width="100px;" alt="Volker Christian"/><br /><sub><b>Volker Christian</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=VolkerChristian" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/almikhayl"><img src="https://avatars2.githubusercontent.com/u/6747040?v=4?s=100" width="100px;" alt="almikhayl"/><br /><sub><b>almikhayl</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=almikhayl" title="Code">💻</a> <a href="#platform-almikhayl" title="Packaging/porting to new platform">📦</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ayum"><img src="https://avatars.githubusercontent.com/u/6747040?v=4?s=100" width="100px;" alt="ayum"/><br /><sub><b>ayum</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=ayum" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/captainurist"><img src="https://avatars.githubusercontent.com/u/73941350?v=4?s=100" width="100px;" alt="captainurist"/><br /><sub><b>captainurist</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=captainurist" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://cs.odu.edu/~ctsolakis"><img src="https://avatars0.githubusercontent.com/u/6725596?v=4?s=100" width="100px;" alt="christos"/><br /><sub><b>christos</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=ChristosT" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/deining"><img src="https://avatars3.githubusercontent.com/u/18169566?v=4?s=100" width="100px;" alt="deining"/><br /><sub><b>deining</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=deining" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dherrera-fb"><img src="https://avatars.githubusercontent.com/u/89840711?v=4?s=100" width="100px;" alt="dherrera-fb"/><br /><sub><b>dherrera-fb</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=dherrera-fb" title="Code">💻</a></td>
     </tr>
     <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/djerius"><img src="https://avatars.githubusercontent.com/u/196875?v=4?s=100" width="100px;" alt="djerius"/><br /><sub><b>djerius</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=djerius" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dryleev"><img src="https://avatars.githubusercontent.com/u/83670813?v=4?s=100" width="100px;" alt="dryleev"/><br /><sub><b>dryleev</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=dryleev" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/elszon"><img src="https://avatars0.githubusercontent.com/u/2971495?v=4?s=100" width="100px;" alt="elszon"/><br /><sub><b>elszon</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=elszon" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ncihnegn"><img src="https://avatars3.githubusercontent.com/u/12021721?v=4?s=100" width="100px;" alt="ncihnegn"/><br /><sub><b>ncihnegn</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=ncihnegn" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/nurelin"><img src="https://avatars3.githubusercontent.com/u/5276274?v=4?s=100" width="100px;" alt="nurelin"/><br /><sub><b>nurelin</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=nurelin" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ryan4729"><img src="https://avatars3.githubusercontent.com/u/40183301?v=4?s=100" width="100px;" alt="ryan4729"/><br /><sub><b>ryan4729</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=ryan4729" title="Tests">⚠️</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://izzys.casa"><img src="https://avatars0.githubusercontent.com/u/63051?v=4?s=100" width="100px;" alt="Isabella Muerte"/><br /><sub><b>Isabella Muerte</b></sub></a><br /><a href="#platform-slurps-mad-rips" title="Packaging/porting to new platform">📦</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/KOLANICH"><img src="https://avatars1.githubusercontent.com/u/240344?v=4?s=100" width="100px;" alt="KOLANICH"/><br /><sub><b>KOLANICH</b></sub></a><br /><a href="#platform-KOLANICH" title="Packaging/porting to new platform">📦</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jgerityneurala"><img src="https://avatars2.githubusercontent.com/u/57360646?v=4?s=100" width="100px;" alt="James Gerity"/><br /><sub><b>James Gerity</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=jgerityneurala" title="Documentation">📖</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jsoref"><img src="https://avatars0.githubusercontent.com/u/2119212?v=4?s=100" width="100px;" alt="Josh Soref"/><br /><sub><b>Josh Soref</b></sub></a><br /><a href="#tool-jsoref" title="Tools">🔧</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/geir-t"><img src="https://avatars3.githubusercontent.com/u/35292136?v=4?s=100" width="100px;" alt="geir-t"/><br /><sub><b>geir-t</b></sub></a><br /><a href="#platform-geir-t" title="Packaging/porting to new platform">📦</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://ondrejcertik.com/"><img src="https://avatars3.githubusercontent.com/u/20568?v=4?s=100" width="100px;" alt="Ondřej Čertík"/><br /><sub><b>Ondřej Čertík</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Acertik" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://sam.hocevar.net/"><img src="https://avatars2.githubusercontent.com/u/245089?v=4?s=100" width="100px;" alt="Sam Hocevar"/><br /><sub><b>Sam Hocevar</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=samhocevar" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.ratml.org/"><img src="https://avatars0.githubusercontent.com/u/1845039?v=4?s=100" width="100px;" alt="Ryan Curtin"/><br /><sub><b>Ryan Curtin</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=rcurtin" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://mbh.sh"><img src="https://avatars3.githubusercontent.com/u/20403931?v=4?s=100" width="100px;" alt="Michael Hall"/><br /><sub><b>Michael Hall</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=mbhall88" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ferdymercury"><img src="https://avatars3.githubusercontent.com/u/10653970?v=4?s=100" width="100px;" alt="ferdymercury"/><br /><sub><b>ferdymercury</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=ferdymercury" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/fpeng1985"><img src="https://avatars1.githubusercontent.com/u/87981?v=4?s=100" width="100px;" alt="fpeng1985"/><br /><sub><b>fpeng1985</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=fpeng1985" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/geir-t"><img src="https://avatars3.githubusercontent.com/u/35292136?v=4?s=100" width="100px;" alt="geir-t"/><br /><sub><b>geir-t</b></sub></a><br /><a href="#platform-geir-t" title="Packaging/porting to new platform">📦</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ncihnegn"><img src="https://avatars3.githubusercontent.com/u/12021721?v=4?s=100" width="100px;" alt="ncihnegn"/><br /><sub><b>ncihnegn</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=ncihnegn" title="Code">💻</a></td>
     </tr>
     <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jakoblover"><img src="https://avatars0.githubusercontent.com/u/14160441?v=4?s=100" width="100px;" alt="Jakob Lover"/><br /><sub><b>Jakob Lover</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=jakoblover" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ZeeD26"><img src="https://avatars2.githubusercontent.com/u/2487468?v=4?s=100" width="100px;" alt="Dominik Steinberger"/><br /><sub><b>Dominik Steinberger</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=ZeeD26" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dfleury2"><img src="https://avatars1.githubusercontent.com/u/4805384?v=4?s=100" width="100px;" alt="D. Fleury"/><br /><sub><b>D. Fleury</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=dfleury2" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dbarowy"><img src="https://avatars3.githubusercontent.com/u/573142?v=4?s=100" width="100px;" alt="Dan Barowy"/><br /><sub><b>Dan Barowy</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=dbarowy" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/paddy-hack"><img src="https://avatars.githubusercontent.com/u/6804372?v=4?s=100" width="100px;" alt="Olaf Meeuwissen"/><br /><sub><b>Olaf Meeuwissen</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=paddy-hack" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dryleev"><img src="https://avatars.githubusercontent.com/u/83670813?v=4?s=100" width="100px;" alt="dryleev"/><br /><sub><b>dryleev</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=dryleev" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/AnticliMaxtic"><img src="https://avatars.githubusercontent.com/u/43995389?v=4?s=100" width="100px;" alt="Max"/><br /><sub><b>Max</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=AnticliMaxtic" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://profiles.sussex.ac.uk/p281168-alex-dewar/publications"><img src="https://avatars.githubusercontent.com/u/23149834?v=4?s=100" width="100px;" alt="Alex Dewar"/><br /><sub><b>Alex Dewar</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=alexdewar" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/trokhymchuk"><img src="https://avatars.githubusercontent.com/u/66204814?v=4?s=100" width="100px;" alt="Artem Trokhymchuk "/><br /><sub><b>Artem Trokhymchuk </b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=trokhymchuk" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/nurelin"><img src="https://avatars3.githubusercontent.com/u/5276274?v=4?s=100" width="100px;" alt="nurelin"/><br /><sub><b>nurelin</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=nurelin" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://polistern.i2p/"><img src="https://avatars.githubusercontent.com/u/55511995?v=4?s=100" width="100px;" alt="polistern"/><br /><sub><b>polistern</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=polistern" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ryan4729"><img src="https://avatars3.githubusercontent.com/u/40183301?v=4?s=100" width="100px;" alt="ryan4729"/><br /><sub><b>ryan4729</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=ryan4729" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/shameekganguly"><img src="https://avatars.githubusercontent.com/u/2412842?v=4?s=100" width="100px;" alt="shameekganguly"/><br /><sub><b>shameekganguly</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=shameekganguly" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>
@@ -1757,9 +1782,6 @@ try! Feedback is always welcome.
 [actions-link]: https://github.com/CLIUtils/CLI11/actions
 [actions-badge]:
   https://github.com/CLIUtils/CLI11/actions/workflows/tests.yml/badge.svg
-[appveyor-badge]:
-  https://ci.appveyor.com/api/projects/status/82niaxpaa28dwbms/branch/main?svg=true
-[appveyor]: https://ci.appveyor.com/project/HenrySchreiner/cli11
 [repology-badge]: https://repology.org/badge/latest-versions/cli11.svg
 [repology]: https://repology.org/project/cli11/versions
 [codecov-badge]:
@@ -1806,7 +1828,7 @@ try! Feedback is always welcome.
 [version 1.6 post]: https://iscinumpy.gitlab.io/post/announcing-cli11-16/
 [version 2.0 post]: https://iscinumpy.gitlab.io/post/announcing-cli11-20/
 [wandbox-badge]: https://img.shields.io/badge/try_2.1-online-blue.svg
-[wandbox-link]: https://wandbox.org/permlink/CA5bymNHh0AczdeN
+[wandbox-link]: https://wandbox.org/permlink/9eQyaD1DchlzukRv
 [releases-badge]: https://img.shields.io/github/release/CLIUtils/CLI11.svg
 [cli11-po-compare]:
   https://iscinumpy.gitlab.io/post/comparing-cli11-and-boostpo/
diff --git a/contrib/CLI11/include/CLI/App.hpp b/contrib/CLI11/include/CLI/App.hpp
index 979237f3b..5d7761608 100644
--- a/contrib/CLI11/include/CLI/App.hpp
+++ b/contrib/CLI11/include/CLI/App.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
 // under NSF AWARD 1414736 and by the respective contributors.
 // All rights reserved.
 //
@@ -35,9 +35,9 @@ namespace CLI {
 // [CLI11:app_hpp:verbatim]
 
 #ifndef CLI11_PARSE
-#define CLI11_PARSE(app, argc, argv)                                                                                   \
+#define CLI11_PARSE(app, ...)                                                                                          \
     try {                                                                                                              \
-        (app).parse((argc), (argv));                                                                                   \
+        (app).parse(__VA_ARGS__);                                                                                      \
     } catch(const CLI::ParseError &e) {                                                                                \
         return (app).exit(e);                                                                                          \
     }
@@ -150,6 +150,12 @@ class App {
     /// @name Help
     ///@{
 
+    /// Usage to put after program/subcommand description in the help output INHERITABLE
+    std::string usage_{};
+
+    /// This is a function that generates a usage to put after program/subcommand description in help output
+    std::function<std::string()> usage_callback_{};
+
     /// Footer to put after all options in the help output INHERITABLE
     std::string footer_{};
 
@@ -284,6 +290,14 @@ class App {
 
     ///@}
 
+#ifdef _WIN32
+    /// When normalizing argv to UTF-8 on Windows, this is the storage for normalized args.
+    std::vector<std::string> normalized_argv_{};
+
+    /// When normalizing argv to UTF-8 on Windows, this is the `char**` value returned to the user.
+    std::vector<char *> normalized_argv_view_{};
+#endif
+
     /// Special private constructor for subcommand
     App(std::string app_description, std::string app_name, App *parent);
 
@@ -303,6 +317,9 @@ class App {
     /// virtual destructor
     virtual ~App() = default;
 
+    /// Convert the contents of argv to UTF-8. Only does something on Windows, does nothing elsewhere.
+    CLI11_NODISCARD char **ensure_utf8(char **argv);
+
     /// Set a callback for execution when all parsing and processing has completed
     ///
     /// Due to a bug in c++11,
@@ -834,12 +851,18 @@ class App {
     /// Parses the command line - throws errors.
     /// This must be called after the options are in but before the rest of the program.
     void parse(int argc, const char *const *argv);
+    void parse(int argc, const wchar_t *const *argv);
+
+  private:
+    template <class CharT> void parse_char_t(int argc, const CharT *const *argv);
 
+  public:
     /// Parse a single string as if it contained command line arguments.
     /// This function splits the string into arguments then calls parse(std::vector<std::string> &)
     /// the function takes an optional boolean argument specifying if the programName is included in the string to
     /// process
     void parse(std::string commandline, bool program_name_included = false);
+    void parse(std::wstring commandline, bool program_name_included = false);
 
     /// The real work is done here. Expects a reversed vector.
     /// Changes the vector to the remaining options.
@@ -947,6 +970,16 @@ class App {
     /// @name Help
     ///@{
 
+    /// Set usage.
+    App *usage(std::string usage_string) {
+        usage_ = std::move(usage_string);
+        return this;
+    }
+    /// Set usage.
+    App *usage(std::function<std::string()> usage_function) {
+        usage_callback_ = std::move(usage_function);
+        return this;
+    }
     /// Set footer.
     App *footer(std::string footer_string) {
         footer_ = std::move(footer_string);
@@ -1055,6 +1088,11 @@ class App {
     /// Get the group of this subcommand
     CLI11_NODISCARD const std::string &get_group() const { return group_; }
 
+    /// Generate and return the usage.
+    CLI11_NODISCARD std::string get_usage() const {
+        return (usage_callback_) ? usage_callback_() + '\n' + usage_ : usage_;
+    }
+
     /// Generate and return the footer.
     CLI11_NODISCARD std::string get_footer() const {
         return (footer_callback_) ? footer_callback_() + '\n' + footer_ : footer_;
@@ -1192,6 +1230,9 @@ class App {
     /// Read and process a configuration file (main app only)
     void _process_config_file();
 
+    /// Read and process a particular configuration file
+    bool _process_config_file(const std::string &config_file, bool throw_error);
+
     /// Get envname options if not yet passed. Runs on *all* subcommands.
     void _process_env();
 
@@ -1264,8 +1305,9 @@ class App {
     bool _parse_subcommand(std::vector<std::string> &args);
 
     /// Parse a short (false) or long (true) argument, must be at the top of the list
+    /// if local_processing_only is set to true then fallthrough is disabled will return false if not found
     /// return true if the argument was processed or false if nothing was done
-    bool _parse_arg(std::vector<std::string> &args, detail::Classifier current_type);
+    bool _parse_arg(std::vector<std::string> &args, detail::Classifier current_type, bool local_processing_only);
 
     /// Trigger the pre_parse callback if needed
     void _trigger_pre_parse(std::size_t remaining_args);
diff --git a/contrib/CLI11/include/CLI/Argv.hpp b/contrib/CLI11/include/CLI/Argv.hpp
new file mode 100644
index 000000000..619a7abf9
--- /dev/null
+++ b/contrib/CLI11/include/CLI/Argv.hpp
@@ -0,0 +1,29 @@
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+// [CLI11:public_includes:set]
+#include <string>
+#include <vector>
+// [CLI11:public_includes:end]
+
+#include <CLI/Macros.hpp>
+
+namespace CLI {
+// [CLI11:argv_hpp:verbatim]
+namespace detail {
+#ifdef _WIN32
+/// Decode and return UTF-8 argv from GetCommandLineW.
+CLI11_INLINE std::vector<std::string> compute_win32_argv();
+#endif
+}  // namespace detail
+// [CLI11:argv_hpp:end]
+}  // namespace CLI
+
+#ifndef CLI11_COMPILE
+#include "impl/Argv_inl.hpp"
+#endif
diff --git a/contrib/CLI11/include/CLI/CLI.hpp b/contrib/CLI11/include/CLI/CLI.hpp
index ae4fc604d..df401e003 100644
--- a/contrib/CLI11/include/CLI/CLI.hpp
+++ b/contrib/CLI11/include/CLI/CLI.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
 // under NSF AWARD 1414736 and by the respective contributors.
 // All rights reserved.
 //
@@ -13,6 +13,10 @@
 
 #include "Macros.hpp"
 
+#include "Encoding.hpp"
+
+#include "Argv.hpp"
+
 #include "StringTools.hpp"
 
 #include "Error.hpp"
diff --git a/contrib/CLI11/include/CLI/Config.hpp b/contrib/CLI11/include/CLI/Config.hpp
index 8dfcddd95..942c43f40 100644
--- a/contrib/CLI11/include/CLI/Config.hpp
+++ b/contrib/CLI11/include/CLI/Config.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
 // under NSF AWARD 1414736 and by the respective contributors.
 // All rights reserved.
 //
@@ -14,7 +14,7 @@
 #include <string>
 #include <utility>
 #include <vector>
-// [CLI11:public_includes:set]
+// [CLI11:public_includes:end]
 
 #include "App.hpp"
 #include "ConfigFwd.hpp"
@@ -24,7 +24,10 @@ namespace CLI {
 // [CLI11:config_hpp:verbatim]
 namespace detail {
 
-std::string convert_arg_for_ini(const std::string &arg, char stringQuote = '"', char characterQuote = '\'');
+std::string convert_arg_for_ini(const std::string &arg,
+                                char stringQuote = '"',
+                                char literalQuote = '\'',
+                                bool disable_multi_line = false);
 
 /// Comma separated join, adds quotes if needed
 std::string ini_join(const std::vector<std::string> &args,
@@ -32,7 +35,9 @@ std::string ini_join(const std::vector<std::string> &args,
                      char arrayStart = '[',
                      char arrayEnd = ']',
                      char stringQuote = '"',
-                     char characterQuote = '\'');
+                     char literalQuote = '\'');
+
+void clean_name_string(std::string &name, const std::string &keyChars);
 
 std::vector<std::string> generate_parents(const std::string &section, std::string &name, char parentSeparator);
 
diff --git a/contrib/CLI11/include/CLI/ConfigFwd.hpp b/contrib/CLI11/include/CLI/ConfigFwd.hpp
index a9ae2176a..fabf84dce 100644
--- a/contrib/CLI11/include/CLI/ConfigFwd.hpp
+++ b/contrib/CLI11/include/CLI/ConfigFwd.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
 // under NSF AWARD 1414736 and by the respective contributors.
 // All rights reserved.
 //
@@ -10,6 +10,7 @@
 #include <algorithm>
 #include <fstream>
 #include <iostream>
+#include <memory>
 #include <string>
 #include <vector>
 // [CLI11:public_includes:end]
@@ -29,7 +30,6 @@ struct ConfigItem {
 
     /// This is the name
     std::string name{};
-
     /// Listing of inputs
     std::vector<std::string> inputs{};
 
@@ -92,8 +92,8 @@ class ConfigBase : public Config {
     char valueDelimiter = '=';
     /// the character to use around strings
     char stringQuote = '"';
-    /// the character to use around single characters
-    char characterQuote = '\'';
+    /// the character to use around single characters and literal strings
+    char literalQuote = '\'';
     /// the maximum number of layers to allow
     uint8_t maximumLayers{255};
     /// the separator used to separator parent layers
@@ -129,10 +129,10 @@ class ConfigBase : public Config {
         valueDelimiter = vSep;
         return this;
     }
-    /// Specify the quote characters used around strings and characters
-    ConfigBase *quoteCharacter(char qString, char qChar) {
+    /// Specify the quote characters used around strings and literal strings
+    ConfigBase *quoteCharacter(char qString, char literalChar) {
         stringQuote = qString;
-        characterQuote = qChar;
+        literalQuote = literalChar;
         return this;
     }
     /// Specify the maximum number of parents
diff --git a/contrib/CLI11/include/CLI/Encoding.hpp b/contrib/CLI11/include/CLI/Encoding.hpp
new file mode 100644
index 000000000..d723878f3
--- /dev/null
+++ b/contrib/CLI11/include/CLI/Encoding.hpp
@@ -0,0 +1,54 @@
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+#include <CLI/Macros.hpp>
+
+// [CLI11:public_includes:set]
+#include <string>
+// [CLI11:public_includes:end]
+
+// [CLI11:encoding_includes:verbatim]
+#ifdef CLI11_CPP17
+#include <string_view>
+#endif  // CLI11_CPP17
+
+#if defined CLI11_HAS_FILESYSTEM && CLI11_HAS_FILESYSTEM > 0
+#include <filesystem>
+#include <string_view>  // NOLINT(build/include)
+#endif                  // CLI11_HAS_FILESYSTEM
+// [CLI11:encoding_includes:end]
+
+namespace CLI {
+// [CLI11:encoding_hpp:verbatim]
+
+/// Convert a wide string to a narrow string.
+CLI11_INLINE std::string narrow(const std::wstring &str);
+CLI11_INLINE std::string narrow(const wchar_t *str);
+CLI11_INLINE std::string narrow(const wchar_t *str, std::size_t size);
+
+/// Convert a narrow string to a wide string.
+CLI11_INLINE std::wstring widen(const std::string &str);
+CLI11_INLINE std::wstring widen(const char *str);
+CLI11_INLINE std::wstring widen(const char *str, std::size_t size);
+
+#ifdef CLI11_CPP17
+CLI11_INLINE std::string narrow(std::wstring_view str);
+CLI11_INLINE std::wstring widen(std::string_view str);
+#endif  // CLI11_CPP17
+
+#if defined CLI11_HAS_FILESYSTEM && CLI11_HAS_FILESYSTEM > 0
+/// Convert a char-string to a native path correctly.
+CLI11_INLINE std::filesystem::path to_path(std::string_view str);
+#endif  // CLI11_HAS_FILESYSTEM
+
+// [CLI11:encoding_hpp:end]
+}  // namespace CLI
+
+#ifndef CLI11_COMPILE
+#include "impl/Encoding_inl.hpp"
+#endif
diff --git a/contrib/CLI11/include/CLI/Error.hpp b/contrib/CLI11/include/CLI/Error.hpp
index 0900da53c..2d6f673e9 100644
--- a/contrib/CLI11/include/CLI/Error.hpp
+++ b/contrib/CLI11/include/CLI/Error.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
 // under NSF AWARD 1414736 and by the respective contributors.
 // All rights reserved.
 //
@@ -123,7 +123,13 @@ class BadNameString : public ConstructionError {
     CLI11_ERROR_DEF(ConstructionError, BadNameString)
     CLI11_ERROR_SIMPLE(BadNameString)
     static BadNameString OneCharName(std::string name) { return BadNameString("Invalid one char name: " + name); }
+    static BadNameString MissingDash(std::string name) {
+        return BadNameString("Long names strings require 2 dashes " + name);
+    }
     static BadNameString BadLongName(std::string name) { return BadNameString("Bad long name: " + name); }
+    static BadNameString BadPositionalName(std::string name) {
+        return BadNameString("Invalid positional Name: " + name);
+    }
     static BadNameString DashesOnly(std::string name) {
         return BadNameString("Must have a name, not just dashes: " + name);
     }
diff --git a/contrib/CLI11/include/CLI/Formatter.hpp b/contrib/CLI11/include/CLI/Formatter.hpp
index f58058f27..bc54caf55 100644
--- a/contrib/CLI11/include/CLI/Formatter.hpp
+++ b/contrib/CLI11/include/CLI/Formatter.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
 // under NSF AWARD 1414736 and by the respective contributors.
 // All rights reserved.
 //
diff --git a/contrib/CLI11/include/CLI/FormatterFwd.hpp b/contrib/CLI11/include/CLI/FormatterFwd.hpp
index 5ef0a5b58..a0949b49d 100644
--- a/contrib/CLI11/include/CLI/FormatterFwd.hpp
+++ b/contrib/CLI11/include/CLI/FormatterFwd.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
 // under NSF AWARD 1414736 and by the respective contributors.
 // All rights reserved.
 //
diff --git a/contrib/CLI11/include/CLI/Macros.hpp b/contrib/CLI11/include/CLI/Macros.hpp
index e85439030..3fd26475e 100644
--- a/contrib/CLI11/include/CLI/Macros.hpp
+++ b/contrib/CLI11/include/CLI/Macros.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
 // under NSF AWARD 1414736 and by the respective contributors.
 // All rights reserved.
 //
@@ -66,6 +66,62 @@
 #endif
 #endif
 
+/** <filesystem> availability */
+#if defined CLI11_CPP17 && defined __has_include && !defined CLI11_HAS_FILESYSTEM
+#if __has_include(<filesystem>)
+// Filesystem cannot be used if targeting macOS < 10.15
+#if defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500
+#define CLI11_HAS_FILESYSTEM 0
+#elif defined(__wasi__)
+// As of wasi-sdk-14, filesystem is not implemented
+#define CLI11_HAS_FILESYSTEM 0
+#else
+#include <filesystem>
+#if defined __cpp_lib_filesystem && __cpp_lib_filesystem >= 201703
+#if defined _GLIBCXX_RELEASE && _GLIBCXX_RELEASE >= 9
+#define CLI11_HAS_FILESYSTEM 1
+#elif defined(__GLIBCXX__)
+// if we are using gcc and Version <9 default to no filesystem
+#define CLI11_HAS_FILESYSTEM 0
+#else
+#define CLI11_HAS_FILESYSTEM 1
+#endif
+#else
+#define CLI11_HAS_FILESYSTEM 0
+#endif
+#endif
+#endif
+#endif
+
+/** <codecvt> availability */
+#if defined(__GNUC__) && !defined(__llvm__) && !defined(__INTEL_COMPILER) && __GNUC__ < 5
+#define CLI11_HAS_CODECVT 0
+#else
+#define CLI11_HAS_CODECVT 1
+#include <codecvt>
+#endif
+
+/** disable deprecations */
+#if defined(__GNUC__)  // GCC or clang
+#define CLI11_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push")
+#define CLI11_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop")
+
+#define CLI11_DIAGNOSTIC_IGNORE_DEPRECATED _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+
+#elif defined(_MSC_VER)
+#define CLI11_DIAGNOSTIC_PUSH __pragma(warning(push))
+#define CLI11_DIAGNOSTIC_POP __pragma(warning(pop))
+
+#define CLI11_DIAGNOSTIC_IGNORE_DEPRECATED __pragma(warning(disable : 4996))
+
+#else
+#define CLI11_DIAGNOSTIC_PUSH
+#define CLI11_DIAGNOSTIC_POP
+
+#define CLI11_DIAGNOSTIC_IGNORE_DEPRECATED
+
+#endif
+
 /** Inline macro **/
 #ifdef CLI11_COMPILE
 #define CLI11_INLINE
diff --git a/contrib/CLI11/include/CLI/Option.hpp b/contrib/CLI11/include/CLI/Option.hpp
index d32350738..a0fa7ceac 100644
--- a/contrib/CLI11/include/CLI/Option.hpp
+++ b/contrib/CLI11/include/CLI/Option.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
 // under NSF AWARD 1414736 and by the respective contributors.
 // All rights reserved.
 //
@@ -41,7 +41,8 @@ enum class MultiOptionPolicy : char {
     TakeFirst,  //!< take only the first Expected number of arguments
     Join,       //!< merge all the arguments together into a single string via the delimiter character default('\n')
     TakeAll,    //!< just get all the passed argument regardless
-    Sum         //!< sum all the arguments together if numerical or concatenate directly without delimiter
+    Sum,        //!< sum all the arguments together if numerical or concatenate directly without delimiter
+    Reverse,    //!< take only the last Expected number of arguments in reverse order
 };
 
 /// This is the CRTP base class for Option and OptionDefaults. It was designed this way
@@ -549,12 +550,12 @@ class Option : public OptionBase<Option> {
         if(!lnames_.empty()) {
             return lnames_[0];
         }
-        if(!pname_.empty()) {
-            return pname_;
-        }
         if(!snames_.empty()) {
             return snames_[0];
         }
+        if(!pname_.empty()) {
+            return pname_;
+        }
         return envname_;
     }
     /// The number of times the option expects to be included
@@ -577,13 +578,13 @@ class Option : public OptionBase<Option> {
     CLI11_NODISCARD int get_items_expected() const { return get_items_expected_min(); }
 
     /// True if the argument can be given directly
-    CLI11_NODISCARD bool get_positional() const { return pname_.length() > 0; }
+    CLI11_NODISCARD bool get_positional() const { return !pname_.empty(); }
 
     /// True if option has at least one non-positional name
-    CLI11_NODISCARD bool nonpositional() const { return (snames_.size() + lnames_.size()) > 0; }
+    CLI11_NODISCARD bool nonpositional() const { return (!lnames_.empty() || !snames_.empty()); }
 
     /// True if option has description
-    CLI11_NODISCARD bool has_description() const { return description_.length() > 0; }
+    CLI11_NODISCARD bool has_description() const { return !description_.empty(); }
 
     /// Get the description
     CLI11_NODISCARD const std::string &get_description() const { return description_; }
diff --git a/contrib/CLI11/include/CLI/Split.hpp b/contrib/CLI11/include/CLI/Split.hpp
index d00e7f8cb..165575393 100644
--- a/contrib/CLI11/include/CLI/Split.hpp
+++ b/contrib/CLI11/include/CLI/Split.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
 // under NSF AWARD 1414736 and by the respective contributors.
 // All rights reserved.
 //
diff --git a/contrib/CLI11/include/CLI/StringTools.hpp b/contrib/CLI11/include/CLI/StringTools.hpp
index 2a31005c8..fb0069b71 100644
--- a/contrib/CLI11/include/CLI/StringTools.hpp
+++ b/contrib/CLI11/include/CLI/StringTools.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
 // under NSF AWARD 1414736 and by the respective contributors.
 // All rights reserved.
 //
@@ -120,6 +120,9 @@ inline std::string trim_copy(const std::string &str) {
 /// remove quotes at the front and back of a string either '"' or '\''
 CLI11_INLINE std::string &remove_quotes(std::string &str);
 
+/// remove quotes from all elements of a string vector and process escaped components
+CLI11_INLINE void remove_quotes(std::vector<std::string> &args);
+
 /// Add a leader to the beginning of all new lines (nothing is added
 /// at the start of the first line). `"; "` would be for ini files
 ///
@@ -140,14 +143,16 @@ CLI11_INLINE std::ostream &format_aliases(std::ostream &out, const std::vector<s
 
 /// Verify the first character of an option
 /// - is a trigger character, ! has special meaning and new lines would just be annoying to deal with
-template <typename T> bool valid_first_char(T c) { return ((c != '-') && (c != '!') && (c != ' ') && c != '\n'); }
+template <typename T> bool valid_first_char(T c) {
+    return ((c != '-') && (static_cast<unsigned char>(c) > 33));  // space and '!' not allowed
+}
 
 /// Verify following characters of an option
 template <typename T> bool valid_later_char(T c) {
     // = and : are value separators, { has special meaning for option defaults,
-    // and \n would just be annoying to deal with in many places allowing space here has too much potential for
-    // inadvertent entry errors and bugs
-    return ((c != '=') && (c != ':') && (c != '{') && (c != ' ') && c != '\n');
+    // and control codes other than tab would just be annoying to deal with in many places allowing space here has too
+    // much potential for inadvertent entry errors and bugs
+    return ((c != '=') && (c != ':') && (c != '{') && ((static_cast<unsigned char>(c) > 32) || c == '\t'));
 }
 
 /// Verify an option/subcommand name
@@ -210,18 +215,46 @@ template <typename Callable> inline std::string find_and_modify(std::string str,
     return str;
 }
 
+/// close a sequence of characters indicated by a closure character.  Brackets allows sub sequences
+/// recognized bracket sequences include "'`[(<{  other closure characters are assumed to be literal strings
+CLI11_INLINE std::size_t close_sequence(const std::string &str, std::size_t start, char closure_char);
+
 /// Split a string '"one two" "three"' into 'one two', 'three'
-/// Quote characters can be ` ' or "
+/// Quote characters can be ` ' or " or bracket characters [{(< with matching to the matching bracket
 CLI11_INLINE std::vector<std::string> split_up(std::string str, char delimiter = '\0');
 
+/// get the value of an environmental variable or empty string if empty
+CLI11_INLINE std::string get_environment_value(const std::string &env_name);
+
 /// This function detects an equal or colon followed by an escaped quote after an argument
 /// then modifies the string to replace the equality with a space.  This is needed
 /// to allow the split up function to work properly and is intended to be used with the find_and_modify function
 /// the return value is the offset+1 which is required by the find_and_modify function.
 CLI11_INLINE std::size_t escape_detect(std::string &str, std::size_t offset);
 
-/// Add quotes if the string contains spaces
-CLI11_INLINE std::string &add_quotes_if_needed(std::string &str);
+/// @brief  detect if a string has escapable characters
+/// @param str the string to do the detection on
+/// @return true if the string has escapable characters
+CLI11_INLINE bool has_escapable_character(const std::string &str);
+
+/// @brief escape all escapable characters
+/// @param str the string to escape
+/// @return a string with the escapble characters escaped with '\'
+CLI11_INLINE std::string add_escaped_characters(const std::string &str);
+
+/// @brief replace the escaped characters with their equivalent
+CLI11_INLINE std::string remove_escaped_characters(const std::string &str);
+
+/// generate a string with all non printable characters escaped to hex codes
+CLI11_INLINE std::string binary_escape_string(const std::string &string_to_escape);
+
+CLI11_INLINE bool is_binary_escaped_string(const std::string &escaped_string);
+
+/// extract an escaped binary_string
+CLI11_INLINE std::string extract_binary_string(const std::string &escaped_string);
+
+/// process a quoted string, remove the quotes and if appropriate handle escaped characters
+CLI11_INLINE bool process_quoted_string(std::string &str, char string_char = '\"', char literal_char = '\'');
 
 }  // namespace detail
 
diff --git a/contrib/CLI11/include/CLI/Timer.hpp b/contrib/CLI11/include/CLI/Timer.hpp
index b185d3302..7ffc2d9b2 100644
--- a/contrib/CLI11/include/CLI/Timer.hpp
+++ b/contrib/CLI11/include/CLI/Timer.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
 // under NSF AWARD 1414736 and by the respective contributors.
 // All rights reserved.
 //
@@ -126,7 +126,7 @@ class AutoTimer : public Timer {
     // GCC 4.7 does not support using inheriting constructors.
 
     /// This destructor prints the string
-    ~AutoTimer() { std::cout << to_string() << std::endl; }
+    ~AutoTimer() { std::cout << to_string() << '\n'; }
 };
 
 }  // namespace CLI
diff --git a/contrib/CLI11/include/CLI/TypeTools.hpp b/contrib/CLI11/include/CLI/TypeTools.hpp
index 1555b2994..7e66c6adc 100644
--- a/contrib/CLI11/include/CLI/TypeTools.hpp
+++ b/contrib/CLI11/include/CLI/TypeTools.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
 // under NSF AWARD 1414736 and by the respective contributors.
 // All rights reserved.
 //
@@ -7,6 +7,7 @@
 #pragma once
 
 // [CLI11:public_includes:set]
+#include <algorithm>
 #include <cmath>
 #include <cstdint>
 #include <exception>
@@ -18,6 +19,7 @@
 #include <vector>
 // [CLI11:public_includes:end]
 
+#include "Encoding.hpp"
 #include "StringTools.hpp"
 
 namespace CLI {
@@ -158,11 +160,19 @@ template <typename T, typename C> class is_direct_constructible {
     static auto test(int, std::true_type) -> decltype(
 // NVCC warns about narrowing conversions here
 #ifdef __CUDACC__
+#ifdef __NVCC_DIAG_PRAGMA_SUPPORT__
+#pragma nv_diag_suppress 2361
+#else
 #pragma diag_suppress 2361
+#endif
 #endif
         TT{std::declval<CC>()}
 #ifdef __CUDACC__
+#ifdef __NVCC_DIAG_PRAGMA_SUPPORT__
+#pragma nv_diag_default 2361
+#else
 #pragma diag_default 2361
+#endif
 #endif
         ,
         std::is_move_assignable<TT>());
@@ -242,8 +252,10 @@ struct is_mutable_container<
                          decltype(std::declval<T>().clear()),
                          decltype(std::declval<T>().insert(std::declval<decltype(std::declval<T>().end())>(),
                                                            std::declval<const typename T::value_type &>()))>,
-                  void>>
-    : public conditional_t<std::is_constructible<T, std::string>::value, std::false_type, std::true_type> {};
+                  void>> : public conditional_t<std::is_constructible<T, std::string>::value ||
+                                                    std::is_constructible<T, std::wstring>::value,
+                                                std::false_type,
+                                                std::true_type> {};
 
 // check to see if an object is a mutable container (fail by default)
 template <typename T, typename _ = void> struct is_readable_container : std::false_type {};
@@ -546,6 +558,8 @@ enum class object_category : int {
     // string like types
     string_assignable = 23,
     string_constructible = 24,
+    wstring_assignable = 25,
+    wstring_constructible = 26,
     other = 45,
     // special wrapper or container types
     wrapper_value = 50,
@@ -594,12 +608,23 @@ template <typename T> struct classify_object<T, typename std::enable_if<is_bool<
 template <typename T> struct classify_object<T, typename std::enable_if<std::is_floating_point<T>::value>::type> {
     static constexpr object_category value{object_category::floating_point};
 };
+#if defined _MSC_VER
+// in MSVC wstring should take precedence if available this isn't as useful on other compilers due to the broader use of
+// utf-8 encoding
+#define WIDE_STRING_CHECK                                                                                              \
+    !std::is_assignable<T &, std::wstring>::value && !std::is_constructible<T, std::wstring>::value
+#define STRING_CHECK true
+#else
+#define WIDE_STRING_CHECK true
+#define STRING_CHECK !std::is_assignable<T &, std::string>::value && !std::is_constructible<T, std::string>::value
+#endif
 
 /// String and similar direct assignment
 template <typename T>
-struct classify_object<T,
-                       typename std::enable_if<!std::is_floating_point<T>::value && !std::is_integral<T>::value &&
-                                               std::is_assignable<T &, std::string>::value>::type> {
+struct classify_object<
+    T,
+    typename std::enable_if<!std::is_floating_point<T>::value && !std::is_integral<T>::value && WIDE_STRING_CHECK &&
+                            std::is_assignable<T &, std::string>::value>::type> {
     static constexpr object_category value{object_category::string_assignable};
 };
 
@@ -609,10 +634,27 @@ struct classify_object<
     T,
     typename std::enable_if<!std::is_floating_point<T>::value && !std::is_integral<T>::value &&
                             !std::is_assignable<T &, std::string>::value && (type_count<T>::value == 1) &&
-                            std::is_constructible<T, std::string>::value>::type> {
+                            WIDE_STRING_CHECK && std::is_constructible<T, std::string>::value>::type> {
     static constexpr object_category value{object_category::string_constructible};
 };
 
+/// Wide strings
+template <typename T>
+struct classify_object<T,
+                       typename std::enable_if<!std::is_floating_point<T>::value && !std::is_integral<T>::value &&
+                                               STRING_CHECK && std::is_assignable<T &, std::wstring>::value>::type> {
+    static constexpr object_category value{object_category::wstring_assignable};
+};
+
+template <typename T>
+struct classify_object<
+    T,
+    typename std::enable_if<!std::is_floating_point<T>::value && !std::is_integral<T>::value &&
+                            !std::is_assignable<T &, std::wstring>::value && (type_count<T>::value == 1) &&
+                            STRING_CHECK && std::is_constructible<T, std::wstring>::value>::type> {
+    static constexpr object_category value{object_category::wstring_constructible};
+};
+
 /// Enumerations
 template <typename T> struct classify_object<T, typename std::enable_if<std::is_enum<T>::value>::type> {
     static constexpr object_category value{object_category::enumeration};
@@ -625,12 +667,13 @@ template <typename T> struct classify_object<T, typename std::enable_if<is_compl
 /// Handy helper to contain a bunch of checks that rule out many common types (integers, string like, floating point,
 /// vectors, and enumerations
 template <typename T> struct uncommon_type {
-    using type = typename std::conditional<!std::is_floating_point<T>::value && !std::is_integral<T>::value &&
-                                               !std::is_assignable<T &, std::string>::value &&
-                                               !std::is_constructible<T, std::string>::value && !is_complex<T>::value &&
-                                               !is_mutable_container<T>::value && !std::is_enum<T>::value,
-                                           std::true_type,
-                                           std::false_type>::type;
+    using type = typename std::conditional<
+        !std::is_floating_point<T>::value && !std::is_integral<T>::value &&
+            !std::is_assignable<T &, std::string>::value && !std::is_constructible<T, std::string>::value &&
+            !std::is_assignable<T &, std::wstring>::value && !std::is_constructible<T, std::wstring>::value &&
+            !is_complex<T>::value && !is_mutable_container<T>::value && !std::is_enum<T>::value,
+        std::true_type,
+        std::false_type>::type;
     static constexpr bool value = type::value;
 };
 
@@ -819,7 +862,7 @@ bool integral_conversion(const std::string &input, T &output) noexcept {
     if(input.empty() || input.front() == '-') {
         return false;
     }
-    char *val = nullptr;
+    char *val{nullptr};
     errno = 0;
     std::uint64_t output_ll = std::strtoull(input.c_str(), &val, 0);
     if(errno == ERANGE) {
@@ -835,6 +878,33 @@ bool integral_conversion(const std::string &input, T &output) noexcept {
         output = (output_sll < 0) ? static_cast<T>(0) : static_cast<T>(output_sll);
         return (static_cast<std::int64_t>(output) == output_sll);
     }
+    // remove separators
+    if(input.find_first_of("_'") != std::string::npos) {
+        std::string nstring = input;
+        nstring.erase(std::remove(nstring.begin(), nstring.end(), '_'), nstring.end());
+        nstring.erase(std::remove(nstring.begin(), nstring.end(), '\''), nstring.end());
+        return integral_conversion(nstring, output);
+    }
+    if(input.compare(0, 2, "0o") == 0) {
+        val = nullptr;
+        errno = 0;
+        output_ll = std::strtoull(input.c_str() + 2, &val, 8);
+        if(errno == ERANGE) {
+            return false;
+        }
+        output = static_cast<T>(output_ll);
+        return (val == (input.c_str() + input.size()) && static_cast<std::uint64_t>(output) == output_ll);
+    }
+    if(input.compare(0, 2, "0b") == 0) {
+        val = nullptr;
+        errno = 0;
+        output_ll = std::strtoull(input.c_str() + 2, &val, 2);
+        if(errno == ERANGE) {
+            return false;
+        }
+        output = static_cast<T>(output_ll);
+        return (val == (input.c_str() + input.size()) && static_cast<std::uint64_t>(output) == output_ll);
+    }
     return false;
 }
 
@@ -859,11 +929,38 @@ bool integral_conversion(const std::string &input, T &output) noexcept {
         output = static_cast<T>(1);
         return true;
     }
+    // remove separators
+    if(input.find_first_of("_'") != std::string::npos) {
+        std::string nstring = input;
+        nstring.erase(std::remove(nstring.begin(), nstring.end(), '_'), nstring.end());
+        nstring.erase(std::remove(nstring.begin(), nstring.end(), '\''), nstring.end());
+        return integral_conversion(nstring, output);
+    }
+    if(input.compare(0, 2, "0o") == 0) {
+        val = nullptr;
+        errno = 0;
+        output_ll = std::strtoll(input.c_str() + 2, &val, 8);
+        if(errno == ERANGE) {
+            return false;
+        }
+        output = static_cast<T>(output_ll);
+        return (val == (input.c_str() + input.size()) && static_cast<std::int64_t>(output) == output_ll);
+    }
+    if(input.compare(0, 2, "0b") == 0) {
+        val = nullptr;
+        errno = 0;
+        output_ll = std::strtoll(input.c_str() + 2, &val, 2);
+        if(errno == ERANGE) {
+            return false;
+        }
+        output = static_cast<T>(output_ll);
+        return (val == (input.c_str() + input.size()) && static_cast<std::int64_t>(output) == output_ll);
+    }
     return false;
 }
 
-/// Convert a flag into an integer value  typically binary flags
-inline std::int64_t to_flag_value(std::string val) {
+/// Convert a flag into an integer value  typically binary flags sets errno to nonzero if conversion failed
+inline std::int64_t to_flag_value(std::string val) noexcept {
     static const std::string trueString("true");
     static const std::string falseString("false");
     if(val == trueString) {
@@ -891,7 +988,8 @@ inline std::int64_t to_flag_value(std::string val) {
             ret = 1;
             break;
         default:
-            throw std::invalid_argument("unrecognized character");
+            errno = EINVAL;
+            return -1;
         }
         return ret;
     }
@@ -900,7 +998,11 @@ inline std::int64_t to_flag_value(std::string val) {
     } else if(val == falseString || val == "off" || val == "no" || val == "disable") {
         ret = -1;
     } else {
-        ret = std::stoll(val);
+        char *loc_ptr{nullptr};
+        ret = std::strtoll(val.c_str(), &loc_ptr, 0);
+        if(loc_ptr != (val.c_str() + val.size()) && errno == 0) {
+            errno = EINVAL;
+        }
     }
     return ret;
 }
@@ -929,18 +1031,16 @@ bool lexical_cast(const std::string &input, T &output) {
 template <typename T,
           enable_if_t<classify_object<T>::value == object_category::boolean_value, detail::enabler> = detail::dummy>
 bool lexical_cast(const std::string &input, T &output) {
-    try {
-        auto out = to_flag_value(input);
+    errno = 0;
+    auto out = to_flag_value(input);
+    if(errno == 0) {
         output = (out > 0);
-        return true;
-    } catch(const std::invalid_argument &) {
-        return false;
-    } catch(const std::out_of_range &) {
-        // if the number is out of the range of a 64 bit value then it is still a number and for this purpose is still
-        // valid all we care about the sign
+    } else if(errno == ERANGE) {
         output = (input[0] != '-');
-        return true;
+    } else {
+        return false;
     }
+    return true;
 }
 
 /// Floats
@@ -953,7 +1053,17 @@ bool lexical_cast(const std::string &input, T &output) {
     char *val = nullptr;
     auto output_ld = std::strtold(input.c_str(), &val);
     output = static_cast<T>(output_ld);
-    return val == (input.c_str() + input.size());
+    if(val == (input.c_str() + input.size())) {
+        return true;
+    }
+    // remove separators
+    if(input.find_first_of("_'") != std::string::npos) {
+        std::string nstring = input;
+        nstring.erase(std::remove(nstring.begin(), nstring.end(), '_'), nstring.end());
+        nstring.erase(std::remove(nstring.begin(), nstring.end(), '\''), nstring.end());
+        return lexical_cast(nstring, output);
+    }
+    return false;
 }
 
 /// complex
@@ -1005,6 +1115,23 @@ bool lexical_cast(const std::string &input, T &output) {
     return true;
 }
 
+/// Wide strings
+template <
+    typename T,
+    enable_if_t<classify_object<T>::value == object_category::wstring_assignable, detail::enabler> = detail::dummy>
+bool lexical_cast(const std::string &input, T &output) {
+    output = widen(input);
+    return true;
+}
+
+template <
+    typename T,
+    enable_if_t<classify_object<T>::value == object_category::wstring_constructible, detail::enabler> = detail::dummy>
+bool lexical_cast(const std::string &input, T &output) {
+    output = T{widen(input)};
+    return true;
+}
+
 /// Enumerations
 template <typename T,
           enable_if_t<classify_object<T>::value == object_category::enumeration, detail::enabler> = detail::dummy>
@@ -1133,7 +1260,9 @@ template <typename AssignTo,
           typename ConvertTo,
           enable_if_t<std::is_same<AssignTo, ConvertTo>::value &&
                           (classify_object<AssignTo>::value == object_category::string_assignable ||
-                           classify_object<AssignTo>::value == object_category::string_constructible),
+                           classify_object<AssignTo>::value == object_category::string_constructible ||
+                           classify_object<AssignTo>::value == object_category::wstring_assignable ||
+                           classify_object<AssignTo>::value == object_category::wstring_constructible),
                       detail::enabler> = detail::dummy>
 bool lexical_assign(const std::string &input, AssignTo &output) {
     return lexical_cast(input, output);
@@ -1144,7 +1273,9 @@ template <typename AssignTo,
           typename ConvertTo,
           enable_if_t<std::is_same<AssignTo, ConvertTo>::value && std::is_assignable<AssignTo &, AssignTo>::value &&
                           classify_object<AssignTo>::value != object_category::string_assignable &&
-                          classify_object<AssignTo>::value != object_category::string_constructible,
+                          classify_object<AssignTo>::value != object_category::string_constructible &&
+                          classify_object<AssignTo>::value != object_category::wstring_assignable &&
+                          classify_object<AssignTo>::value != object_category::wstring_constructible,
                       detail::enabler> = detail::dummy>
 bool lexical_assign(const std::string &input, AssignTo &output) {
     if(input.empty()) {
@@ -1183,9 +1314,17 @@ bool lexical_assign(const std::string &input, AssignTo &output) {
         output = 0;
         return true;
     }
-    int val = 0;
+    int val{0};
     if(lexical_cast(input, val)) {
+#if defined(__clang__)
+/* on some older clang compilers */
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wsign-conversion"
+#endif
         output = val;
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
         return true;
     }
     return false;
@@ -1240,12 +1379,12 @@ template <typename AssignTo,
                       detail::enabler> = detail::dummy>
 bool lexical_conversion(const std::vector<std ::string> &strings, AssignTo &output) {
     // the remove const is to handle pair types coming from a container
-    typename std::remove_const<typename std::tuple_element<0, ConvertTo>::type>::type v1;
-    typename std::tuple_element<1, ConvertTo>::type v2;
-    bool retval = lexical_assign<decltype(v1), decltype(v1)>(strings[0], v1);
-    if(strings.size() > 1) {
-        retval = retval && lexical_assign<decltype(v2), decltype(v2)>(strings[1], v2);
-    }
+    using FirstType = typename std::remove_const<typename std::tuple_element<0, ConvertTo>::type>::type;
+    using SecondType = typename std::tuple_element<1, ConvertTo>::type;
+    FirstType v1;
+    SecondType v2;
+    bool retval = lexical_assign<FirstType, FirstType>(strings[0], v1);
+    retval = retval && lexical_assign<SecondType, SecondType>((strings.size() > 1) ? strings[1] : std::string{}, v2);
     if(retval) {
         output = AssignTo{v1, v2};
     }
@@ -1260,6 +1399,9 @@ template <class AssignTo,
                       detail::enabler> = detail::dummy>
 bool lexical_conversion(const std::vector<std ::string> &strings, AssignTo &output) {
     output.erase(output.begin(), output.end());
+    if(strings.empty()) {
+        return true;
+    }
     if(strings.size() == 1 && strings[0] == "{}") {
         return true;
     }
@@ -1404,7 +1546,7 @@ tuple_type_conversion(std::vector<std::string> &strings, AssignTo &output) {
 
     std::size_t index{subtype_count_min<ConvertTo>::value};
     const std::size_t mx_count{subtype_count<ConvertTo>::value};
-    const std::size_t mx{(std::max)(mx_count, strings.size())};
+    const std::size_t mx{(std::min)(mx_count, strings.size() - 1)};
 
     while(index < mx) {
         if(is_separator(strings[index])) {
@@ -1414,7 +1556,11 @@ tuple_type_conversion(std::vector<std::string> &strings, AssignTo &output) {
     }
     bool retval = lexical_conversion<AssignTo, ConvertTo>(
         std::vector<std::string>(strings.begin(), strings.begin() + static_cast<std::ptrdiff_t>(index)), output);
-    strings.erase(strings.begin(), strings.begin() + static_cast<std::ptrdiff_t>(index) + 1);
+    if(strings.size() > index) {
+        strings.erase(strings.begin(), strings.begin() + static_cast<std::ptrdiff_t>(index) + 1);
+    } else {
+        strings.clear();
+    }
     return retval;
 }
 
@@ -1558,12 +1704,13 @@ inline std::string sum_string_vector(const std::vector<std::string> &values) {
         double tv{0.0};
         auto comp = lexical_cast(arg, tv);
         if(!comp) {
-            try {
-                tv = static_cast<double>(detail::to_flag_value(arg));
-            } catch(const std::exception &) {
-                fail = true;
+            errno = 0;
+            auto fv = detail::to_flag_value(arg);
+            fail = (errno != 0);
+            if(fail) {
                 break;
             }
+            tv = static_cast<double>(fv);
         }
         val += tv;
     }
@@ -1572,13 +1719,10 @@ inline std::string sum_string_vector(const std::vector<std::string> &values) {
             output.append(arg);
         }
     } else {
-        if(val <= static_cast<double>((std::numeric_limits<std::int64_t>::min)()) ||
-           val >= static_cast<double>((std::numeric_limits<std::int64_t>::max)()) ||
-           std::ceil(val) == std::floor(val)) {
-            output = detail::value_string(static_cast<int64_t>(val));
-        } else {
-            output = detail::value_string(val);
-        }
+        std::ostringstream out;
+        out.precision(16);
+        out << val;
+        output = out.str();
     }
     return output;
 }
diff --git a/contrib/CLI11/include/CLI/Validators.hpp b/contrib/CLI11/include/CLI/Validators.hpp
index 28bdcb2d8..bdddeb84f 100644
--- a/contrib/CLI11/include/CLI/Validators.hpp
+++ b/contrib/CLI11/include/CLI/Validators.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
 // under NSF AWARD 1414736 and by the respective contributors.
 // All rights reserved.
 //
@@ -26,34 +26,6 @@
 
 // [CLI11:validators_hpp_filesystem:verbatim]
 
-// C standard library
-// Only needed for existence checking
-#if defined CLI11_CPP17 && defined __has_include && !defined CLI11_HAS_FILESYSTEM
-#if __has_include(<filesystem>)
-// Filesystem cannot be used if targeting macOS < 10.15
-#if defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500
-#define CLI11_HAS_FILESYSTEM 0
-#elif defined(__wasi__)
-// As of wasi-sdk-14, filesystem is not implemented
-#define CLI11_HAS_FILESYSTEM 0
-#else
-#include <filesystem>
-#if defined __cpp_lib_filesystem && __cpp_lib_filesystem >= 201703
-#if defined _GLIBCXX_RELEASE && _GLIBCXX_RELEASE >= 9
-#define CLI11_HAS_FILESYSTEM 1
-#elif defined(__GLIBCXX__)
-// if we are using gcc and Version <9 default to no filesystem
-#define CLI11_HAS_FILESYSTEM 0
-#else
-#define CLI11_HAS_FILESYSTEM 1
-#endif
-#else
-#define CLI11_HAS_FILESYSTEM 0
-#endif
-#endif
-#endif
-#endif
-
 #if defined CLI11_HAS_FILESYSTEM && CLI11_HAS_FILESYSTEM > 0
 #include <filesystem>  // NOLINT(build/include)
 #else
@@ -246,6 +218,11 @@ class IPV4Validator : public Validator {
     IPV4Validator();
 };
 
+class EscapedStringTransformer : public Validator {
+  public:
+    EscapedStringTransformer();
+};
+
 }  // namespace detail
 
 // Static is not needed here, because global const implies static.
@@ -265,6 +242,9 @@ const detail::NonexistentPathValidator NonexistentPath;
 /// Check for an IP4 address
 const detail::IPV4Validator ValidIPV4;
 
+/// convert escaped characters into their associated values
+const detail::EscapedStringTransformer EscapedString;
+
 /// Validate the input as a particular type
 template <typename DesiredType> class TypeValidator : public Validator {
   public:
diff --git a/contrib/CLI11/include/CLI/Version.hpp b/contrib/CLI11/include/CLI/Version.hpp
index d5c817a9c..2008e91d8 100644
--- a/contrib/CLI11/include/CLI/Version.hpp
+++ b/contrib/CLI11/include/CLI/Version.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
 // under NSF AWARD 1414736 and by the respective contributors.
 // All rights reserved.
 //
@@ -9,8 +9,8 @@
 // [CLI11:version_hpp:verbatim]
 
 #define CLI11_VERSION_MAJOR 2
-#define CLI11_VERSION_MINOR 3
-#define CLI11_VERSION_PATCH 2
-#define CLI11_VERSION "2.3.2"
+#define CLI11_VERSION_MINOR 4
+#define CLI11_VERSION_PATCH 1
+#define CLI11_VERSION "2.4.1"
 
 // [CLI11:version_hpp:end]
diff --git a/contrib/CLI11/include/CLI/impl/App_inl.hpp b/contrib/CLI11/include/CLI/impl/App_inl.hpp
index 71afaa5cb..a732cbc67 100644
--- a/contrib/CLI11/include/CLI/impl/App_inl.hpp
+++ b/contrib/CLI11/include/CLI/impl/App_inl.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
 // under NSF AWARD 1414736 and by the respective contributors.
 // All rights reserved.
 //
@@ -9,6 +9,9 @@
 // This include is only needed for IDEs to discover symbols
 #include <CLI/App.hpp>
 
+#include <CLI/Argv.hpp>
+#include <CLI/Encoding.hpp>
+
 // [CLI11:public_includes:set]
 #include <algorithm>
 #include <memory>
@@ -46,6 +49,7 @@ CLI11_INLINE App::App(std::string app_description, std::string app_name, App *pa
         configurable_ = parent_->configurable_;
         allow_windows_style_options_ = parent_->allow_windows_style_options_;
         group_ = parent_->group_;
+        usage_ = parent_->usage_;
         footer_ = parent_->footer_;
         formatter_ = parent_->formatter_;
         config_formatter_ = parent_->config_formatter_;
@@ -53,10 +57,32 @@ CLI11_INLINE App::App(std::string app_description, std::string app_name, App *pa
     }
 }
 
+CLI11_NODISCARD CLI11_INLINE char **App::ensure_utf8(char **argv) {
+#ifdef _WIN32
+    (void)argv;
+
+    normalized_argv_ = detail::compute_win32_argv();
+
+    if(!normalized_argv_view_.empty()) {
+        normalized_argv_view_.clear();
+    }
+
+    normalized_argv_view_.reserve(normalized_argv_.size());
+    for(auto &arg : normalized_argv_) {
+        // using const_cast is well-defined, string is known to not be const.
+        normalized_argv_view_.push_back(const_cast<char *>(arg.data()));
+    }
+
+    return normalized_argv_view_.data();
+#else
+    return argv;
+#endif
+}
+
 CLI11_INLINE App *App::name(std::string app_name) {
 
     if(parent_ != nullptr) {
-        auto oname = name_;
+        std::string oname = name_;
         name_ = app_name;
         const auto &res = _compare_subcommand_names(*this, *_get_fallthrough_parent());
         if(!res.empty()) {
@@ -137,6 +163,32 @@ CLI11_INLINE Option *App::add_option(std::string option_name,
 
     if(std::find_if(std::begin(options_), std::end(options_), [&myopt](const Option_p &v) { return *v == myopt; }) ==
        std::end(options_)) {
+        if(myopt.lnames_.empty() && myopt.snames_.empty()) {
+            // if the option is positional only there is additional potential for ambiguities in config files and needs
+            // to be checked
+            std::string test_name = "--" + myopt.get_single_name();
+            if(test_name.size() == 3) {
+                test_name.erase(0, 1);
+            }
+
+            auto *op = get_option_no_throw(test_name);
+            if(op != nullptr) {
+                throw(OptionAlreadyAdded("added option positional name matches existing option: " + test_name));
+            }
+        } else if(parent_ != nullptr) {
+            for(auto &ln : myopt.lnames_) {
+                auto *op = parent_->get_option_no_throw(ln);
+                if(op != nullptr) {
+                    throw(OptionAlreadyAdded("added option matches existing positional option: " + ln));
+                }
+            }
+            for(auto &sn : myopt.snames_) {
+                auto *op = parent_->get_option_no_throw(sn);
+                if(op != nullptr) {
+                    throw(OptionAlreadyAdded("added option matches existing positional option: " + sn));
+                }
+            }
+        }
         options_.emplace_back();
         Option_p &option = options_.back();
         option.reset(new Option(option_name, option_description, option_callback, this));
@@ -311,8 +363,11 @@ CLI11_INLINE Option *App::set_config(std::string option_name,
         }
         if(!default_filename.empty()) {
             config_ptr_->default_str(std::move(default_filename));
+            config_ptr_->force_callback_ = true;
         }
         config_ptr_->configurable(false);
+        // set the option to take the last value and reverse given by default
+        config_ptr_->multi_option_policy(MultiOptionPolicy::Reverse);
     }
 
     return config_ptr_;
@@ -342,13 +397,14 @@ CLI11_INLINE bool App::remove_option(Option *opt) {
 CLI11_INLINE App *App::add_subcommand(std::string subcommand_name, std::string subcommand_description) {
     if(!subcommand_name.empty() && !detail::valid_name_string(subcommand_name)) {
         if(!detail::valid_first_char(subcommand_name[0])) {
-            throw IncorrectConstruction("Subcommand name starts with invalid character, '!' and '-' are not allowed");
+            throw IncorrectConstruction(
+                "Subcommand name starts with invalid character, '!' and '-' and control characters");
         }
         for(auto c : subcommand_name) {
             if(!detail::valid_later_char(c)) {
                 throw IncorrectConstruction(std::string("Subcommand name contains invalid character ('") + c +
                                             "'), all characters are allowed except"
-                                            "'=',':','{','}', and ' '");
+                                            "'=',':','{','}', ' ', and control characters");
             }
         }
     }
@@ -473,17 +529,29 @@ CLI11_INLINE void App::clear() {
     }
 }
 
-CLI11_INLINE void App::parse(int argc, const char *const *argv) {
+CLI11_INLINE void App::parse(int argc, const char *const *argv) { parse_char_t(argc, argv); }
+CLI11_INLINE void App::parse(int argc, const wchar_t *const *argv) { parse_char_t(argc, argv); }
+
+namespace detail {
+
+// Do nothing or perform narrowing
+CLI11_INLINE const char *maybe_narrow(const char *str) { return str; }
+CLI11_INLINE std::string maybe_narrow(const wchar_t *str) { return narrow(str); }
+
+}  // namespace detail
+
+template <class CharT> CLI11_INLINE void App::parse_char_t(int argc, const CharT *const *argv) {
     // If the name is not set, read from command line
     if(name_.empty() || has_automatic_name_) {
         has_automatic_name_ = true;
-        name_ = argv[0];
+        name_ = detail::maybe_narrow(argv[0]);
     }
 
     std::vector<std::string> args;
     args.reserve(static_cast<std::size_t>(argc) - 1U);
     for(auto i = static_cast<std::size_t>(argc) - 1U; i > 0U; --i)
-        args.emplace_back(argv[i]);
+        args.emplace_back(detail::maybe_narrow(argv[i]));
+
     parse(std::move(args));
 }
 
@@ -509,11 +577,19 @@ CLI11_INLINE void App::parse(std::string commandline, bool program_name_included
     auto args = detail::split_up(std::move(commandline));
     // remove all empty strings
     args.erase(std::remove(args.begin(), args.end(), std::string{}), args.end());
+    try {
+        detail::remove_quotes(args);
+    } catch(const std::invalid_argument &arg) {
+        throw CLI::ParseError(arg.what(), CLI::ExitCodes::InvalidError);
+    }
     std::reverse(args.begin(), args.end());
-
     parse(std::move(args));
 }
 
+CLI11_INLINE void App::parse(std::wstring commandline, bool program_name_included) {
+    parse(narrow(commandline), program_name_included);
+}
+
 CLI11_INLINE void App::parse(std::vector<std::string> &args) {
     // Clear if parsed
     if(parsed_ > 0)
@@ -580,7 +656,7 @@ CLI11_INLINE int App::exit(const Error &e, std::ostream &out, std::ostream &err)
     }
 
     if(e.get_name() == "CallForVersion") {
-        out << e.what() << std::endl;
+        out << e.what() << '\n';
         return e.get_exit_code();
     }
 
@@ -676,7 +752,8 @@ CLI11_NODISCARD CLI11_INLINE std::string App::help(std::string prev, AppFormatMo
 CLI11_NODISCARD CLI11_INLINE std::string App::version() const {
     std::string val;
     if(version_ptr_ != nullptr) {
-        auto rv = version_ptr_->results();
+        // copy the results for reuse later
+        results_t rv = version_ptr_->results();
         version_ptr_->clear();
         version_ptr_->add_result("true");
         try {
@@ -785,7 +862,7 @@ CLI11_NODISCARD CLI11_INLINE bool App::check_name(std::string name_to_check) con
     if(local_name == name_to_check) {
         return true;
     }
-    for(auto les : aliases_) {  // NOLINT(performance-for-range-copy)
+    for(std::string les : aliases_) {  // NOLINT(performance-for-range-copy)
         if(ignore_underscore_) {
             les = detail::remove_underscore(les);
         }
@@ -975,70 +1052,96 @@ CLI11_NODISCARD CLI11_INLINE detail::Classifier App::_recognize(const std::strin
         return detail::Classifier::WINDOWS_STYLE;
     if((current == "++") && !name_.empty() && parent_ != nullptr)
         return detail::Classifier::SUBCOMMAND_TERMINATOR;
+    auto dotloc = current.find_first_of('.');
+    if(dotloc != std::string::npos) {
+        auto *cm = _find_subcommand(current.substr(0, dotloc), true, ignore_used_subcommands);
+        if(cm != nullptr) {
+            auto res = cm->_recognize(current.substr(dotloc + 1), ignore_used_subcommands);
+            if(res == detail::Classifier::SUBCOMMAND) {
+                return res;
+            }
+        }
+    }
     return detail::Classifier::NONE;
 }
 
+CLI11_INLINE bool App::_process_config_file(const std::string &config_file, bool throw_error) {
+    auto path_result = detail::check_path(config_file.c_str());
+    if(path_result == detail::path_type::file) {
+        try {
+            std::vector<ConfigItem> values = config_formatter_->from_file(config_file);
+            _parse_config(values);
+            return true;
+        } catch(const FileError &) {
+            if(throw_error) {
+                throw;
+            }
+            return false;
+        }
+    } else if(throw_error) {
+        throw FileError::Missing(config_file);
+    } else {
+        return false;
+    }
+}
+
 CLI11_INLINE void App::_process_config_file() {
     if(config_ptr_ != nullptr) {
         bool config_required = config_ptr_->get_required();
         auto file_given = config_ptr_->count() > 0;
+        if(!(file_given || config_ptr_->envname_.empty())) {
+            std::string ename_string = detail::get_environment_value(config_ptr_->envname_);
+            if(!ename_string.empty()) {
+                config_ptr_->add_result(ename_string);
+            }
+        }
+        config_ptr_->run_callback();
+
         auto config_files = config_ptr_->as<std::vector<std::string>>();
+        bool files_used{file_given};
         if(config_files.empty() || config_files.front().empty()) {
             if(config_required) {
-                throw FileError::Missing("no specified config file");
+                throw FileError("config file is required but none was given");
             }
             return;
         }
-        for(auto rit = config_files.rbegin(); rit != config_files.rend(); ++rit) {
-            const auto &config_file = *rit;
-            auto path_result = detail::check_path(config_file.c_str());
-            if(path_result == detail::path_type::file) {
-                try {
-                    std::vector<ConfigItem> values = config_formatter_->from_file(config_file);
-                    _parse_config(values);
-                    if(!file_given) {
-                        config_ptr_->add_result(config_file);
-                    }
-                } catch(const FileError &) {
-                    if(config_required || file_given)
-                        throw;
-                }
-            } else if(config_required || file_given) {
-                throw FileError::Missing(config_file);
+        for(const auto &config_file : config_files) {
+            if(_process_config_file(config_file, config_required || file_given)) {
+                files_used = true;
             }
         }
+        if(!files_used) {
+            // this is done so the count shows as 0 if no callbacks were processed
+            config_ptr_->clear();
+            bool force = config_ptr_->force_callback_;
+            config_ptr_->force_callback_ = false;
+            config_ptr_->run_callback();
+            config_ptr_->force_callback_ = force;
+        }
     }
 }
 
 CLI11_INLINE void App::_process_env() {
     for(const Option_p &opt : options_) {
         if(opt->count() == 0 && !opt->envname_.empty()) {
-            char *buffer = nullptr;
-            std::string ename_string;
-
-#ifdef _MSC_VER
-            // Windows version
-            std::size_t sz = 0;
-            if(_dupenv_s(&buffer, &sz, opt->envname_.c_str()) == 0 && buffer != nullptr) {
-                ename_string = std::string(buffer);
-                free(buffer);
-            }
-#else
-            // This also works on Windows, but gives a warning
-            buffer = std::getenv(opt->envname_.c_str());
-            if(buffer != nullptr)
-                ename_string = std::string(buffer);
-#endif
-
+            std::string ename_string = detail::get_environment_value(opt->envname_);
             if(!ename_string.empty()) {
-                opt->add_result(ename_string);
+                std::string result = ename_string;
+                result = opt->_validate(result, 0);
+                if(result.empty()) {
+                    opt->add_result(ename_string);
+                }
             }
         }
     }
 
     for(App_p &sub : subcommands_) {
-        if(sub->get_name().empty() || !sub->parse_complete_callback_)
-            sub->_process_env();
+        if(sub->get_name().empty() || !sub->parse_complete_callback_) {
+            if(sub->count_all() > 0) {
+                // only process environment variables if the callback has actually been triggered already
+                sub->_process_env();
+            }
+        }
     }
 }
 
@@ -1338,12 +1441,11 @@ CLI11_INLINE void App::_parse_config(const std::vector<ConfigItem> &args) {
 }
 
 CLI11_INLINE bool App::_parse_single_config(const ConfigItem &item, std::size_t level) {
+
     if(level < item.parents.size()) {
         try {
             auto *subcom = get_subcommand(item.parents.at(level));
-            auto result = subcom->_parse_single_config(item, level + 1);
-
-            return result;
+            return subcom->_parse_single_config(item, level + 1);
         } catch(const OptionNotFound &) {
             return false;
         }
@@ -1373,15 +1475,19 @@ CLI11_INLINE bool App::_parse_single_config(const ConfigItem &item, std::size_t
         if(item.name.size() == 1) {
             op = get_option_no_throw("-" + item.name);
         }
+        if(op == nullptr) {
+            op = get_option_no_throw(item.name);
+        }
     }
-    if(op == nullptr) {
-        op = get_option_no_throw(item.name);
-    }
+
     if(op == nullptr) {
         // If the option was not present
         if(get_allow_config_extras() == config_extras_mode::capture)
             // Should we worry about classifying the extras properly?
             missing_.emplace_back(detail::Classifier::NONE, item.fullname());
+        for(const auto &input : item.inputs) {
+            missing_.emplace_back(detail::Classifier::NONE, input);
+        }
         return false;
     }
 
@@ -1400,29 +1506,54 @@ CLI11_INLINE bool App::_parse_single_config(const ConfigItem &item, std::size_t
                 auto res = config_formatter_->to_flag(item);
                 bool converted{false};
                 if(op->get_disable_flag_override()) {
-
-                    try {
-                        auto val = detail::to_flag_value(res);
-                        if(val == 1) {
-                            res = op->get_flag_value(item.name, "{}");
-                            converted = true;
-                        }
-                    } catch(...) {
+                    auto val = detail::to_flag_value(res);
+                    if(val == 1) {
+                        res = op->get_flag_value(item.name, "{}");
+                        converted = true;
                     }
                 }
 
                 if(!converted) {
+                    errno = 0;
                     res = op->get_flag_value(item.name, res);
                 }
 
                 op->add_result(res);
                 return true;
             }
-            if(static_cast<int>(item.inputs.size()) > op->get_items_expected_max()) {
+            if(static_cast<int>(item.inputs.size()) > op->get_items_expected_max() &&
+               op->get_multi_option_policy() != MultiOptionPolicy::TakeAll) {
                 if(op->get_items_expected_max() > 1) {
                     throw ArgumentMismatch::AtMost(item.fullname(), op->get_items_expected_max(), item.inputs.size());
                 }
-                throw ConversionError::TooManyInputsFlag(item.fullname());
+
+                if(!op->get_disable_flag_override()) {
+                    throw ConversionError::TooManyInputsFlag(item.fullname());
+                }
+                // if the disable flag override is set then we must have the flag values match a known flag value
+                // this is true regardless of the output value, so an array input is possible and must be accounted for
+                for(const auto &res : item.inputs) {
+                    bool valid_value{false};
+                    if(op->default_flag_values_.empty()) {
+                        if(res == "true" || res == "false" || res == "1" || res == "0") {
+                            valid_value = true;
+                        }
+                    } else {
+                        for(const auto &valid_res : op->default_flag_values_) {
+                            if(valid_res.second == res) {
+                                valid_value = true;
+                                break;
+                            }
+                        }
+                    }
+
+                    if(valid_value) {
+                        op->add_result(res);
+                    } else {
+                        throw InvalidError("invalid flag argument given");
+                    }
+                }
+                return true;
             }
         }
         op->add_result(item.inputs);
@@ -1457,7 +1588,7 @@ CLI11_INLINE bool App::_parse_single(std::vector<std::string> &args, bool &posit
     case detail::Classifier::SHORT:
     case detail::Classifier::WINDOWS_STYLE:
         // If already parsed a subcommand, don't accept options_
-        _parse_arg(args, classifier);
+        retval = _parse_arg(args, classifier, false);
         break;
     case detail::Classifier::NONE:
         // Probably a positional or something for a parent (sub)command
@@ -1499,6 +1630,7 @@ CLI11_NODISCARD CLI11_INLINE bool App::_has_remaining_positionals() const {
 CLI11_INLINE bool App::_parse_positional(std::vector<std::string> &args, bool haltOnSubcommand) {
 
     const std::string &positional = args.back();
+    Option *posOpt{nullptr};
 
     if(positionals_at_end_) {
         // deal with the case of required arguments at the end which should take precedence over other arguments
@@ -1515,56 +1647,47 @@ CLI11_INLINE bool App::_parse_positional(std::vector<std::string> &args, bool ha
                                 continue;
                             }
                         }
-
-                        parse_order_.push_back(opt.get());
-                        /// if we require a separator add it here
-                        if(opt->get_inject_separator()) {
-                            if(!opt->results().empty() && !opt->results().back().empty()) {
-                                opt->add_result(std::string{});
-                            }
-                        }
-                        if(opt->get_trigger_on_parse() &&
-                           opt->current_option_state_ == Option::option_state::callback_run) {
-                            opt->clear();
-                        }
-                        opt->add_result(positional);
-                        if(opt->get_trigger_on_parse()) {
-                            opt->run_callback();
-                        }
-                        args.pop_back();
-                        return true;
+                        posOpt = opt.get();
+                        break;
                     }
                 }
             }
         }
     }
-    for(const Option_p &opt : options_) {
-        // Eat options, one by one, until done
-        if(opt->get_positional() &&
-           (static_cast<int>(opt->count()) < opt->get_items_expected_min() || opt->get_allow_extra_args())) {
-            if(validate_positionals_) {
-                std::string pos = positional;
-                pos = opt->_validate(pos, 0);
-                if(!pos.empty()) {
-                    continue;
-                }
-            }
-            if(opt->get_inject_separator()) {
-                if(!opt->results().empty() && !opt->results().back().empty()) {
-                    opt->add_result(std::string{});
+    if(posOpt == nullptr) {
+        for(const Option_p &opt : options_) {
+            // Eat options, one by one, until done
+            if(opt->get_positional() &&
+               (static_cast<int>(opt->count()) < opt->get_items_expected_min() || opt->get_allow_extra_args())) {
+                if(validate_positionals_) {
+                    std::string pos = positional;
+                    pos = opt->_validate(pos, 0);
+                    if(!pos.empty()) {
+                        continue;
+                    }
                 }
+                posOpt = opt.get();
+                break;
             }
-            if(opt->get_trigger_on_parse() && opt->current_option_state_ == Option::option_state::callback_run) {
-                opt->clear();
-            }
-            opt->add_result(positional);
-            if(opt->get_trigger_on_parse()) {
-                opt->run_callback();
+        }
+    }
+    if(posOpt != nullptr) {
+        parse_order_.push_back(posOpt);
+        if(posOpt->get_inject_separator()) {
+            if(!posOpt->results().empty() && !posOpt->results().back().empty()) {
+                posOpt->add_result(std::string{});
             }
-            parse_order_.push_back(opt.get());
-            args.pop_back();
-            return true;
         }
+        if(posOpt->get_trigger_on_parse() && posOpt->current_option_state_ == Option::option_state::callback_run) {
+            posOpt->clear();
+        }
+        posOpt->add_result(positional);
+        if(posOpt->get_trigger_on_parse()) {
+            posOpt->run_callback();
+        }
+
+        args.pop_back();
+        return true;
     }
 
     for(auto &subc : subcommands_) {
@@ -1645,6 +1768,17 @@ CLI11_INLINE bool App::_parse_subcommand(std::vector<std::string> &args) {
         return true;
     }
     auto *com = _find_subcommand(args.back(), true, true);
+    if(com == nullptr) {
+        // the main way to get here is using .notation
+        auto dotloc = args.back().find_first_of('.');
+        if(dotloc != std::string::npos) {
+            com = _find_subcommand(args.back().substr(0, dotloc), true, true);
+            if(com != nullptr) {
+                args.back() = args.back().substr(dotloc + 1);
+                args.push_back(com->get_display_name());
+            }
+        }
+    }
     if(com != nullptr) {
         args.pop_back();
         if(!com->silent_) {
@@ -1667,7 +1801,8 @@ CLI11_INLINE bool App::_parse_subcommand(std::vector<std::string> &args) {
     return false;
 }
 
-CLI11_INLINE bool App::_parse_arg(std::vector<std::string> &args, detail::Classifier current_type) {
+CLI11_INLINE bool
+App::_parse_arg(std::vector<std::string> &args, detail::Classifier current_type, bool local_processing_only) {
 
     std::string current = args.back();
 
@@ -1709,7 +1844,7 @@ CLI11_INLINE bool App::_parse_arg(std::vector<std::string> &args, detail::Classi
     if(op_ptr == std::end(options_)) {
         for(auto &subc : subcommands_) {
             if(subc->name_.empty() && !subc->disabled_) {
-                if(subc->_parse_arg(args, current_type)) {
+                if(subc->_parse_arg(args, current_type, local_processing_only)) {
                     if(!subc->pre_parse_called_) {
                         subc->_trigger_pre_parse(args.size());
                     }
@@ -1723,9 +1858,57 @@ CLI11_INLINE bool App::_parse_arg(std::vector<std::string> &args, detail::Classi
             return false;
         }
 
+        // now check for '.' notation of subcommands
+        auto dotloc = arg_name.find_first_of('.', 1);
+        if(dotloc != std::string::npos) {
+            // using dot notation is equivalent to single argument subcommand
+            auto *sub = _find_subcommand(arg_name.substr(0, dotloc), true, false);
+            if(sub != nullptr) {
+                auto v = args.back();
+                args.pop_back();
+                arg_name = arg_name.substr(dotloc + 1);
+                if(arg_name.size() > 1) {
+                    args.push_back(std::string("--") + v.substr(dotloc + 3));
+                    current_type = detail::Classifier::LONG;
+                } else {
+                    auto nval = v.substr(dotloc + 2);
+                    nval.front() = '-';
+                    if(nval.size() > 2) {
+                        // '=' not allowed in short form arguments
+                        args.push_back(nval.substr(3));
+                        nval.resize(2);
+                    }
+                    args.push_back(nval);
+                    current_type = detail::Classifier::SHORT;
+                }
+                auto val = sub->_parse_arg(args, current_type, true);
+                if(val) {
+                    if(!sub->silent_) {
+                        parsed_subcommands_.push_back(sub);
+                    }
+                    // deal with preparsing
+                    increment_parsed();
+                    _trigger_pre_parse(args.size());
+                    // run the parse complete callback since the subcommand processing is now complete
+                    if(sub->parse_complete_callback_) {
+                        sub->_process_env();
+                        sub->_process_callbacks();
+                        sub->_process_help_flags();
+                        sub->_process_requirements();
+                        sub->run_callback(false, true);
+                    }
+                    return true;
+                }
+                args.pop_back();
+                args.push_back(v);
+            }
+        }
+        if(local_processing_only) {
+            return false;
+        }
         // If a subcommand, try the main command
         if(parent_ != nullptr && fallthrough_)
-            return _get_fallthrough_parent()->_parse_arg(args, current_type);
+            return _get_fallthrough_parent()->_parse_arg(args, current_type, false);
 
         // Otherwise, add to missing
         args.pop_back();
@@ -1847,7 +2030,7 @@ CLI11_INLINE void App::_trigger_pre_parse(std::size_t remaining_args) {
     } else if(immediate_callback_) {
         if(!name_.empty()) {
             auto pcnt = parsed_;
-            auto extras = std::move(missing_);
+            missing_t extras = std::move(missing_);
             clear();
             parsed_ = pcnt;
             pre_parse_called_ = true;
@@ -2033,12 +2216,12 @@ CLI11_INLINE void retire_option(App *app, Option *opt) {
                             ->allow_extra_args(opt->get_allow_extra_args());
 
     app->remove_option(opt);
-    auto *opt2 = app->add_option(option_copy->get_name(false, true), "option has been retired and has no effect")
-                     ->type_name("RETIRED")
-                     ->default_str("RETIRED")
-                     ->type_size(option_copy->get_type_size_min(), option_copy->get_type_size_max())
-                     ->expected(option_copy->get_expected_min(), option_copy->get_expected_max())
-                     ->allow_extra_args(option_copy->get_allow_extra_args());
+    auto *opt2 = app->add_option(option_copy->get_name(false, true), "option has been retired and has no effect");
+    opt2->type_name("RETIRED")
+        ->default_str("RETIRED")
+        ->type_size(option_copy->get_type_size_min(), option_copy->get_type_size_max())
+        ->expected(option_copy->get_expected_min(), option_copy->get_expected_max())
+        ->allow_extra_args(option_copy->get_allow_extra_args());
 
     Validator retired_warning{[opt2](std::string &) {
                                   std::cout << "WARNING " << opt2->get_name() << " is retired and has no effect\n";
diff --git a/contrib/CLI11/include/CLI/impl/Argv_inl.hpp b/contrib/CLI11/include/CLI/impl/Argv_inl.hpp
new file mode 100644
index 000000000..b3c328b1a
--- /dev/null
+++ b/contrib/CLI11/include/CLI/impl/Argv_inl.hpp
@@ -0,0 +1,88 @@
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+// This include is only needed for IDEs to discover symbols
+#include <CLI/Argv.hpp>
+
+#include <CLI/Encoding.hpp>
+
+// [CLI11:public_includes:set]
+#include <algorithm>
+#include <memory>
+#include <stdexcept>
+#include <string>
+#include <vector>
+// [CLI11:public_includes:end]
+
+// [CLI11:argv_inl_includes:verbatim]
+#if defined(_WIN32)
+#if !(defined(_AMD64_) || defined(_X86_) || defined(_ARM_))
+#if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || defined(_M_X64) ||           \
+    defined(_M_AMD64)
+#define _AMD64_
+#elif defined(i386) || defined(__i386) || defined(__i386__) || defined(__i386__) || defined(_M_IX86)
+#define _X86_
+#elif defined(__arm__) || defined(_M_ARM) || defined(_M_ARMT)
+#define _ARM_
+#elif defined(__aarch64__) || defined(_M_ARM64)
+#define _ARM64_
+#elif defined(_M_ARM64EC)
+#define _ARM64EC_
+#endif
+#endif
+
+// first
+#ifndef NOMINMAX
+// if NOMINMAX is already defined we don't want to mess with that either way
+#define NOMINMAX
+#include <windef.h>
+#undef NOMINMAX
+#else
+#include <windef.h>
+#endif
+
+// second
+#include <winbase.h>
+// third
+#include <processthreadsapi.h>
+#include <shellapi.h>
+#endif
+// [CLI11:argv_inl_includes:end]
+
+namespace CLI {
+// [CLI11:argv_inl_hpp:verbatim]
+
+namespace detail {
+
+#ifdef _WIN32
+CLI11_INLINE std::vector<std::string> compute_win32_argv() {
+    std::vector<std::string> result;
+    int argc = 0;
+
+    auto deleter = [](wchar_t **ptr) { LocalFree(ptr); };
+    // NOLINTBEGIN(*-avoid-c-arrays)
+    auto wargv = std::unique_ptr<wchar_t *[], decltype(deleter)>(CommandLineToArgvW(GetCommandLineW(), &argc), deleter);
+    // NOLINTEND(*-avoid-c-arrays)
+
+    if(wargv == nullptr) {
+        throw std::runtime_error("CommandLineToArgvW failed with code " + std::to_string(GetLastError()));
+    }
+
+    result.reserve(static_cast<size_t>(argc));
+    for(size_t i = 0; i < static_cast<size_t>(argc); ++i) {
+        result.push_back(narrow(wargv[i]));
+    }
+
+    return result;
+}
+#endif
+
+}  // namespace detail
+
+// [CLI11:argv_inl_hpp:end]
+}  // namespace CLI
diff --git a/contrib/CLI11/include/CLI/impl/Config_inl.hpp b/contrib/CLI11/include/CLI/impl/Config_inl.hpp
index 8021d5f63..92537c0e8 100644
--- a/contrib/CLI11/include/CLI/impl/Config_inl.hpp
+++ b/contrib/CLI11/include/CLI/impl/Config_inl.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
 // under NSF AWARD 1414736 and by the respective contributors.
 // All rights reserved.
 //
@@ -19,9 +19,19 @@
 namespace CLI {
 // [CLI11:config_inl_hpp:verbatim]
 
+static constexpr auto multiline_literal_quote = R"(''')";
+static constexpr auto multiline_string_quote = R"(""")";
+
 namespace detail {
 
-CLI11_INLINE std::string convert_arg_for_ini(const std::string &arg, char stringQuote, char characterQuote) {
+CLI11_INLINE bool is_printable(const std::string &test_string) {
+    return std::all_of(test_string.begin(), test_string.end(), [](char x) {
+        return (isprint(static_cast<unsigned char>(x)) != 0 || x == '\n' || x == '\t');
+    });
+}
+
+CLI11_INLINE std::string
+convert_arg_for_ini(const std::string &arg, char stringQuote, char literalQuote, bool disable_multi_line) {
     if(arg.empty()) {
         return std::string(2, stringQuote);
     }
@@ -34,12 +44,20 @@ CLI11_INLINE std::string convert_arg_for_ini(const std::string &arg, char string
         using CLI::detail::lexical_cast;
         double val = 0.0;
         if(lexical_cast(arg, val)) {
-            return arg;
+            if(arg.find_first_not_of("0123456789.-+eE") == std::string::npos) {
+                return arg;
+            }
         }
     }
     // just quote a single non numeric character
     if(arg.size() == 1) {
-        return std::string(1, characterQuote) + arg + characterQuote;
+        if(isprint(static_cast<unsigned char>(arg.front())) == 0) {
+            return binary_escape_string(arg);
+        }
+        if(arg == "'") {
+            return std::string(1, stringQuote) + "'" + stringQuote;
+        }
+        return std::string(1, literalQuote) + arg + literalQuote;
     }
     // handle hex, binary or octal arguments
     if(arg.front() == '0') {
@@ -59,10 +77,16 @@ CLI11_INLINE std::string convert_arg_for_ini(const std::string &arg, char string
             }
         }
     }
-    if(arg.find_first_of(stringQuote) == std::string::npos) {
-        return std::string(1, stringQuote) + arg + stringQuote;
+    if(!is_printable(arg)) {
+        return binary_escape_string(arg);
     }
-    return characterQuote + arg + characterQuote;
+    if(detail::has_escapable_character(arg)) {
+        if(arg.size() > 100 && !disable_multi_line) {
+            return std::string(multiline_literal_quote) + arg + multiline_literal_quote;
+        }
+        return std::string(1, stringQuote) + detail::add_escaped_characters(arg) + stringQuote;
+    }
+    return std::string(1, stringQuote) + arg + stringQuote;
 }
 
 CLI11_INLINE std::string ini_join(const std::vector<std::string> &args,
@@ -70,10 +94,12 @@ CLI11_INLINE std::string ini_join(const std::vector<std::string> &args,
                                   char arrayStart,
                                   char arrayEnd,
                                   char stringQuote,
-                                  char characterQuote) {
+                                  char literalQuote) {
+    bool disable_multi_line{false};
     std::string joined;
     if(args.size() > 1 && arrayStart != '\0') {
         joined.push_back(arrayStart);
+        disable_multi_line = true;
     }
     std::size_t start = 0;
     for(const auto &arg : args) {
@@ -83,7 +109,7 @@ CLI11_INLINE std::string ini_join(const std::vector<std::string> &args,
                 joined.push_back(' ');
             }
         }
-        joined.append(convert_arg_for_ini(arg, stringQuote, characterQuote));
+        joined.append(convert_arg_for_ini(arg, stringQuote, literalQuote, disable_multi_line));
     }
     if(args.size() > 1 && arrayEnd != '\0') {
         joined.push_back(arrayEnd);
@@ -96,22 +122,22 @@ generate_parents(const std::string &section, std::string &name, char parentSepar
     std::vector<std::string> parents;
     if(detail::to_lower(section) != "default") {
         if(section.find(parentSeparator) != std::string::npos) {
-            parents = detail::split(section, parentSeparator);
+            parents = detail::split_up(section, parentSeparator);
         } else {
             parents = {section};
         }
     }
     if(name.find(parentSeparator) != std::string::npos) {
-        std::vector<std::string> plist = detail::split(name, parentSeparator);
+        std::vector<std::string> plist = detail::split_up(name, parentSeparator);
         name = plist.back();
-        detail::remove_quotes(name);
         plist.pop_back();
         parents.insert(parents.end(), plist.begin(), plist.end());
     }
-
     // clean up quotes on the parents
-    for(auto &parent : parents) {
-        detail::remove_quotes(parent);
+    try {
+        detail::remove_quotes(parents);
+    } catch(const std::invalid_argument &iarg) {
+        throw CLI::ParseError(iarg.what(), CLI::ExitCodes::InvalidError);
     }
     return parents;
 }
@@ -164,30 +190,59 @@ checkParentSegments(std::vector<ConfigItem> &output, const std::string &currentS
     output.back().parents = std::move(parents);
     output.back().name = "++";
 }
+
+/// @brief  checks if a string represents a multiline comment
+CLI11_INLINE bool hasMLString(std::string const &fullString, char check) {
+    if(fullString.length() < 3) {
+        return false;
+    }
+    auto it = fullString.rbegin();
+    return (*it == check) && (*(it + 1) == check) && (*(it + 2) == check);
+}
 }  // namespace detail
 
 inline std::vector<ConfigItem> ConfigBase::from_config(std::istream &input) const {
     std::string line;
+    std::string buffer;
     std::string currentSection = "default";
     std::string previousSection = "default";
     std::vector<ConfigItem> output;
     bool isDefaultArray = (arrayStart == '[' && arrayEnd == ']' && arraySeparator == ',');
     bool isINIArray = (arrayStart == '\0' || arrayStart == ' ') && arrayStart == arrayEnd;
     bool inSection{false};
+    bool inMLineComment{false};
+    bool inMLineValue{false};
+
     char aStart = (isINIArray) ? '[' : arrayStart;
     char aEnd = (isINIArray) ? ']' : arrayEnd;
     char aSep = (isINIArray && arraySeparator == ' ') ? ',' : arraySeparator;
     int currentSectionIndex{0};
-    while(getline(input, line)) {
+
+    std::string line_sep_chars{parentSeparatorChar, commentChar, valueDelimiter};
+    while(getline(input, buffer)) {
         std::vector<std::string> items_buffer;
         std::string name;
-
-        detail::trim(line);
+        line = detail::trim_copy(buffer);
         std::size_t len = line.length();
         // lines have to be at least 3 characters to have any meaning to CLI just skip the rest
         if(len < 3) {
             continue;
         }
+        if(line.compare(0, 3, multiline_string_quote) == 0 || line.compare(0, 3, multiline_literal_quote) == 0) {
+            inMLineComment = true;
+            auto cchar = line.front();
+            while(inMLineComment) {
+                if(getline(input, line)) {
+                    detail::trim(line);
+                } else {
+                    break;
+                }
+                if(detail::hasMLString(line, cchar)) {
+                    inMLineComment = false;
+                }
+            }
+            continue;
+        }
         if(line.front() == '[' && line.back() == ']') {
             if(currentSection != "default") {
                 // insert a section end which is just an empty items_buffer
@@ -219,49 +274,130 @@ inline std::vector<ConfigItem> ConfigBase::from_config(std::istream &input) cons
         if(line.front() == ';' || line.front() == '#' || line.front() == commentChar) {
             continue;
         }
-
+        std::size_t search_start = 0;
+        if(line.find_first_of("\"'`") != std::string::npos) {
+            while(search_start < line.size()) {
+                auto test_char = line[search_start];
+                if(test_char == '\"' || test_char == '\'' || test_char == '`') {
+                    search_start = detail::close_sequence(line, search_start, line[search_start]);
+                    ++search_start;
+                } else if(test_char == valueDelimiter || test_char == commentChar) {
+                    --search_start;
+                    break;
+                } else if(test_char == ' ' || test_char == '\t' || test_char == parentSeparatorChar) {
+                    ++search_start;
+                } else {
+                    search_start = line.find_first_of(line_sep_chars, search_start);
+                }
+            }
+        }
         // Find = in string, split and recombine
-        auto pos = line.find(valueDelimiter);
-        if(pos != std::string::npos) {
-            name = detail::trim_copy(line.substr(0, pos));
-            std::string item = detail::trim_copy(line.substr(pos + 1));
-            auto cloc = item.find(commentChar);
-            if(cloc != std::string::npos) {
-                item.erase(cloc, std::string::npos);  // NOLINT(readability-suspicious-call-argument)
-                detail::trim(item);
+        auto delimiter_pos = line.find_first_of(valueDelimiter, search_start + 1);
+        auto comment_pos = line.find_first_of(commentChar, search_start);
+        if(comment_pos < delimiter_pos) {
+            delimiter_pos = std::string::npos;
+        }
+        if(delimiter_pos != std::string::npos) {
+
+            name = detail::trim_copy(line.substr(0, delimiter_pos));
+            std::string item = detail::trim_copy(line.substr(delimiter_pos + 1, std::string::npos));
+            bool mlquote =
+                (item.compare(0, 3, multiline_literal_quote) == 0 || item.compare(0, 3, multiline_string_quote) == 0);
+            if(!mlquote && comment_pos != std::string::npos) {
+                auto citems = detail::split_up(item, commentChar);
+                item = detail::trim_copy(citems.front());
             }
-            if(item.size() > 1 && item.front() == aStart) {
+            if(mlquote) {
+                // mutliline string
+                auto keyChar = item.front();
+                item = buffer.substr(delimiter_pos + 1, std::string::npos);
+                detail::ltrim(item);
+                item.erase(0, 3);
+                inMLineValue = true;
+                bool lineExtension{false};
+                bool firstLine = true;
+                if(!item.empty() && item.back() == '\\') {
+                    item.pop_back();
+                    lineExtension = true;
+                }
+                while(inMLineValue) {
+                    std::string l2;
+                    if(!std::getline(input, l2)) {
+                        break;
+                    }
+                    line = l2;
+                    detail::rtrim(line);
+                    if(detail::hasMLString(line, keyChar)) {
+                        line.pop_back();
+                        line.pop_back();
+                        line.pop_back();
+                        if(lineExtension) {
+                            detail::ltrim(line);
+                        } else if(!(firstLine && item.empty())) {
+                            item.push_back('\n');
+                        }
+                        firstLine = false;
+                        item += line;
+                        inMLineValue = false;
+                        if(!item.empty() && item.back() == '\n') {
+                            item.pop_back();
+                        }
+                        if(keyChar == '\"') {
+                            try {
+                                item = detail::remove_escaped_characters(item);
+                            } catch(const std::invalid_argument &iarg) {
+                                throw CLI::ParseError(iarg.what(), CLI::ExitCodes::InvalidError);
+                            }
+                        }
+                    } else {
+                        if(lineExtension) {
+                            detail::trim(l2);
+                        } else if(!(firstLine && item.empty())) {
+                            item.push_back('\n');
+                        }
+                        lineExtension = false;
+                        firstLine = false;
+                        if(!l2.empty() && l2.back() == '\\') {
+                            lineExtension = true;
+                            l2.pop_back();
+                        }
+                        item += l2;
+                    }
+                }
+                items_buffer = {item};
+            } else if(item.size() > 1 && item.front() == aStart) {
                 for(std::string multiline; item.back() != aEnd && std::getline(input, multiline);) {
                     detail::trim(multiline);
                     item += multiline;
                 }
-                items_buffer = detail::split_up(item.substr(1, item.length() - 2), aSep);
+                if(item.back() == aEnd) {
+                    items_buffer = detail::split_up(item.substr(1, item.length() - 2), aSep);
+                } else {
+                    items_buffer = detail::split_up(item.substr(1, std::string::npos), aSep);
+                }
             } else if((isDefaultArray || isINIArray) && item.find_first_of(aSep) != std::string::npos) {
                 items_buffer = detail::split_up(item, aSep);
             } else if((isDefaultArray || isINIArray) && item.find_first_of(' ') != std::string::npos) {
-                items_buffer = detail::split_up(item);
+                items_buffer = detail::split_up(item, '\0');
             } else {
                 items_buffer = {item};
             }
         } else {
-            name = detail::trim_copy(line);
-            auto cloc = name.find(commentChar);
-            if(cloc != std::string::npos) {
-                name.erase(cloc, std::string::npos);  // NOLINT(readability-suspicious-call-argument)
-                detail::trim(name);
-            }
-
+            name = detail::trim_copy(line.substr(0, comment_pos));
             items_buffer = {"true"};
         }
-        if(name.find(parentSeparatorChar) == std::string::npos) {
-            detail::remove_quotes(name);
-        }
-        // clean up quotes on the items
-        for(auto &it : items_buffer) {
-            detail::remove_quotes(it);
+        std::vector<std::string> parents;
+        try {
+            parents = detail::generate_parents(currentSection, name, parentSeparatorChar);
+            detail::process_quoted_string(name);
+            // clean up quotes on the items and check for escaped strings
+            for(auto &it : items_buffer) {
+                detail::process_quoted_string(it, stringQuote, literalQuote);
+            }
+        } catch(const std::invalid_argument &ia) {
+            throw CLI::ParseError(ia.what(), CLI::ExitCodes::InvalidError);
         }
 
-        std::vector<std::string> parents = detail::generate_parents(currentSection, name, parentSeparatorChar);
         if(parents.size() > maximumLayers) {
             continue;
         }
@@ -298,6 +434,23 @@ inline std::vector<ConfigItem> ConfigBase::from_config(std::istream &input) cons
     return output;
 }
 
+CLI11_INLINE std::string &clean_name_string(std::string &name, const std::string &keyChars) {
+    if(name.find_first_of(keyChars) != std::string::npos || (name.front() == '[' && name.back() == ']') ||
+       (name.find_first_of("'`\"\\") != std::string::npos)) {
+        if(name.find_first_of('\'') == std::string::npos) {
+            name.insert(0, 1, '\'');
+            name.push_back('\'');
+        } else {
+            if(detail::has_escapable_character(name)) {
+                name = detail::add_escaped_characters(name);
+            }
+            name.insert(0, 1, '\"');
+            name.push_back('\"');
+        }
+    }
+    return name;
+}
+
 CLI11_INLINE std::string
 ConfigBase::to_config(const App *app, bool default_also, bool write_description, std::string prefix) const {
     std::stringstream out;
@@ -305,6 +458,18 @@ ConfigBase::to_config(const App *app, bool default_also, bool write_description,
     commentLead.push_back(commentChar);
     commentLead.push_back(' ');
 
+    std::string commentTest = "#;";
+    commentTest.push_back(commentChar);
+    commentTest.push_back(parentSeparatorChar);
+
+    std::string keyChars = commentTest;
+    keyChars.push_back(literalQuote);
+    keyChars.push_back(stringQuote);
+    keyChars.push_back(arrayStart);
+    keyChars.push_back(arrayEnd);
+    keyChars.push_back(valueDelimiter);
+    keyChars.push_back(arraySeparator);
+
     std::vector<std::string> groups = app->get_groups();
     bool defaultUsed = false;
     groups.insert(groups.begin(), std::string("Options"));
@@ -330,13 +495,17 @@ ConfigBase::to_config(const App *app, bool default_also, bool write_description,
                         continue;
                     }
                 }
-                std::string name = prefix + opt->get_single_name();
+                std::string single_name = opt->get_single_name();
+                if(single_name.empty()) {
+                    continue;
+                }
+
                 std::string value = detail::ini_join(
-                    opt->reduced_results(), arraySeparator, arrayStart, arrayEnd, stringQuote, characterQuote);
+                    opt->reduced_results(), arraySeparator, arrayStart, arrayEnd, stringQuote, literalQuote);
 
                 if(value.empty() && default_also) {
                     if(!opt->get_default_str().empty()) {
-                        value = detail::convert_arg_for_ini(opt->get_default_str(), stringQuote, characterQuote);
+                        value = detail::convert_arg_for_ini(opt->get_default_str(), stringQuote, literalQuote, false);
                     } else if(opt->get_expected_min() == 0) {
                         value = "false";
                     } else if(opt->get_run_callback_for_default()) {
@@ -345,13 +514,35 @@ ConfigBase::to_config(const App *app, bool default_also, bool write_description,
                 }
 
                 if(!value.empty()) {
+
                     if(!opt->get_fnames().empty()) {
-                        value = opt->get_flag_value(name, value);
+                        try {
+                            value = opt->get_flag_value(single_name, value);
+                        } catch(const CLI::ArgumentMismatch &) {
+                            bool valid{false};
+                            for(const auto &test_name : opt->get_fnames()) {
+                                try {
+                                    value = opt->get_flag_value(test_name, value);
+                                    single_name = test_name;
+                                    valid = true;
+                                } catch(const CLI::ArgumentMismatch &) {
+                                    continue;
+                                }
+                            }
+                            if(!valid) {
+                                value = detail::ini_join(
+                                    opt->results(), arraySeparator, arrayStart, arrayEnd, stringQuote, literalQuote);
+                            }
+                        }
                     }
                     if(write_description && opt->has_description()) {
                         out << '\n';
                         out << commentLead << detail::fix_newlines(commentLead, opt->get_description()) << '\n';
                     }
+                    clean_name_string(single_name, keyChars);
+
+                    std::string name = prefix + single_name;
+
                     out << name << valueDelimiter << value << '\n';
                 }
             }
@@ -360,31 +551,56 @@ ConfigBase::to_config(const App *app, bool default_also, bool write_description,
     auto subcommands = app->get_subcommands({});
     for(const App *subcom : subcommands) {
         if(subcom->get_name().empty()) {
+            if(!default_also && (subcom->count_all() == 0)) {
+                continue;
+            }
             if(write_description && !subcom->get_group().empty()) {
                 out << '\n' << commentLead << subcom->get_group() << " Options\n";
             }
+            /*if (!prefix.empty() || app->get_parent() == nullptr) {
+                out << '[' << prefix << "___"<< subcom->get_group() << "]\n";
+            } else {
+                std::string subname = app->get_name() + parentSeparatorChar + "___"+subcom->get_group();
+                const auto *p = app->get_parent();
+                while(p->get_parent() != nullptr) {
+                    subname = p->get_name() + parentSeparatorChar +subname;
+                    p = p->get_parent();
+                }
+                out << '[' << subname << "]\n";
+            }
+            */
             out << to_config(subcom, default_also, write_description, prefix);
         }
     }
 
     for(const App *subcom : subcommands) {
         if(!subcom->get_name().empty()) {
+            if(!default_also && (subcom->count_all() == 0)) {
+                continue;
+            }
+            std::string subname = subcom->get_name();
+            clean_name_string(subname, keyChars);
+
             if(subcom->get_configurable() && app->got_subcommand(subcom)) {
                 if(!prefix.empty() || app->get_parent() == nullptr) {
-                    out << '[' << prefix << subcom->get_name() << "]\n";
+
+                    out << '[' << prefix << subname << "]\n";
                 } else {
-                    std::string subname = app->get_name() + parentSeparatorChar + subcom->get_name();
+                    std::string appname = app->get_name();
+                    clean_name_string(appname, keyChars);
+                    subname = appname + parentSeparatorChar + subname;
                     const auto *p = app->get_parent();
                     while(p->get_parent() != nullptr) {
-                        subname = p->get_name() + parentSeparatorChar + subname;
+                        std::string pname = p->get_name();
+                        clean_name_string(pname, keyChars);
+                        subname = pname + parentSeparatorChar + subname;
                         p = p->get_parent();
                     }
                     out << '[' << subname << "]\n";
                 }
                 out << to_config(subcom, default_also, write_description, "");
             } else {
-                out << to_config(
-                    subcom, default_also, write_description, prefix + subcom->get_name() + parentSeparatorChar);
+                out << to_config(subcom, default_also, write_description, prefix + subname + parentSeparatorChar);
             }
         }
     }
diff --git a/contrib/CLI11/include/CLI/impl/Encoding_inl.hpp b/contrib/CLI11/include/CLI/impl/Encoding_inl.hpp
new file mode 100644
index 000000000..1c82f4fc5
--- /dev/null
+++ b/contrib/CLI11/include/CLI/impl/Encoding_inl.hpp
@@ -0,0 +1,154 @@
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
+// under NSF AWARD 1414736 and by the respective contributors.
+// All rights reserved.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+// This include is only needed for IDEs to discover symbols
+#include <CLI/Encoding.hpp>
+#include <CLI/Macros.hpp>
+
+// [CLI11:public_includes:set]
+#include <array>
+#include <clocale>
+#include <cstdlib>
+#include <cstring>
+#include <cwchar>
+#include <locale>
+#include <stdexcept>
+#include <string>
+#include <type_traits>
+#include <utility>
+// [CLI11:public_includes:end]
+
+namespace CLI {
+// [CLI11:encoding_inl_hpp:verbatim]
+
+namespace detail {
+
+#if !CLI11_HAS_CODECVT
+/// Attempt to set one of the acceptable unicode locales for conversion
+CLI11_INLINE void set_unicode_locale() {
+    static const std::array<const char *, 3> unicode_locales{{"C.UTF-8", "en_US.UTF-8", ".UTF-8"}};
+
+    for(const auto &locale_name : unicode_locales) {
+        if(std::setlocale(LC_ALL, locale_name) != nullptr) {
+            return;
+        }
+    }
+    throw std::runtime_error("CLI::narrow: could not set locale to C.UTF-8");
+}
+
+template <typename F> struct scope_guard_t {
+    F closure;
+
+    explicit scope_guard_t(F closure_) : closure(closure_) {}
+    ~scope_guard_t() { closure(); }
+};
+
+template <typename F> CLI11_NODISCARD CLI11_INLINE scope_guard_t<F> scope_guard(F &&closure) {
+    return scope_guard_t<F>{std::forward<F>(closure)};
+}
+
+#endif  // !CLI11_HAS_CODECVT
+
+CLI11_DIAGNOSTIC_PUSH
+CLI11_DIAGNOSTIC_IGNORE_DEPRECATED
+
+CLI11_INLINE std::string narrow_impl(const wchar_t *str, std::size_t str_size) {
+#if CLI11_HAS_CODECVT
+#ifdef _WIN32
+    return std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>>().to_bytes(str, str + str_size);
+
+#else
+    return std::wstring_convert<std::codecvt_utf8<wchar_t>>().to_bytes(str, str + str_size);
+
+#endif  // _WIN32
+#else   // CLI11_HAS_CODECVT
+    (void)str_size;
+    std::mbstate_t state = std::mbstate_t();
+    const wchar_t *it = str;
+
+    std::string old_locale = std::setlocale(LC_ALL, nullptr);
+    auto sg = scope_guard([&] { std::setlocale(LC_ALL, old_locale.c_str()); });
+    set_unicode_locale();
+
+    std::size_t new_size = std::wcsrtombs(nullptr, &it, 0, &state);
+    if(new_size == static_cast<std::size_t>(-1)) {
+        throw std::runtime_error("CLI::narrow: conversion error in std::wcsrtombs at offset " +
+                                 std::to_string(it - str));
+    }
+    std::string result(new_size, '\0');
+    std::wcsrtombs(const_cast<char *>(result.data()), &str, new_size, &state);
+
+    return result;
+
+#endif  // CLI11_HAS_CODECVT
+}
+
+CLI11_INLINE std::wstring widen_impl(const char *str, std::size_t str_size) {
+#if CLI11_HAS_CODECVT
+#ifdef _WIN32
+    return std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>>().from_bytes(str, str + str_size);
+
+#else
+    return std::wstring_convert<std::codecvt_utf8<wchar_t>>().from_bytes(str, str + str_size);
+
+#endif  // _WIN32
+#else   // CLI11_HAS_CODECVT
+    (void)str_size;
+    std::mbstate_t state = std::mbstate_t();
+    const char *it = str;
+
+    std::string old_locale = std::setlocale(LC_ALL, nullptr);
+    auto sg = scope_guard([&] { std::setlocale(LC_ALL, old_locale.c_str()); });
+    set_unicode_locale();
+
+    std::size_t new_size = std::mbsrtowcs(nullptr, &it, 0, &state);
+    if(new_size == static_cast<std::size_t>(-1)) {
+        throw std::runtime_error("CLI::widen: conversion error in std::mbsrtowcs at offset " +
+                                 std::to_string(it - str));
+    }
+    std::wstring result(new_size, L'\0');
+    std::mbsrtowcs(const_cast<wchar_t *>(result.data()), &str, new_size, &state);
+
+    return result;
+
+#endif  // CLI11_HAS_CODECVT
+}
+
+CLI11_DIAGNOSTIC_POP
+
+}  // namespace detail
+
+CLI11_INLINE std::string narrow(const wchar_t *str, std::size_t str_size) { return detail::narrow_impl(str, str_size); }
+CLI11_INLINE std::string narrow(const std::wstring &str) { return detail::narrow_impl(str.data(), str.size()); }
+// Flawfinder: ignore
+CLI11_INLINE std::string narrow(const wchar_t *str) { return detail::narrow_impl(str, std::wcslen(str)); }
+
+CLI11_INLINE std::wstring widen(const char *str, std::size_t str_size) { return detail::widen_impl(str, str_size); }
+CLI11_INLINE std::wstring widen(const std::string &str) { return detail::widen_impl(str.data(), str.size()); }
+// Flawfinder: ignore
+CLI11_INLINE std::wstring widen(const char *str) { return detail::widen_impl(str, std::strlen(str)); }
+
+#ifdef CLI11_CPP17
+CLI11_INLINE std::string narrow(std::wstring_view str) { return detail::narrow_impl(str.data(), str.size()); }
+CLI11_INLINE std::wstring widen(std::string_view str) { return detail::widen_impl(str.data(), str.size()); }
+#endif  // CLI11_CPP17
+
+#if defined CLI11_HAS_FILESYSTEM && CLI11_HAS_FILESYSTEM > 0
+CLI11_INLINE std::filesystem::path to_path(std::string_view str) {
+    return std::filesystem::path{
+#ifdef _WIN32
+        widen(str)
+#else
+        str
+#endif  // _WIN32
+    };
+}
+#endif  // CLI11_HAS_FILESYSTEM
+
+// [CLI11:encoding_inl_hpp:end]
+}  // namespace CLI
diff --git a/contrib/CLI11/include/CLI/impl/Formatter_inl.hpp b/contrib/CLI11/include/CLI/impl/Formatter_inl.hpp
index 541cd347b..3b1c8c288 100644
--- a/contrib/CLI11/include/CLI/impl/Formatter_inl.hpp
+++ b/contrib/CLI11/include/CLI/impl/Formatter_inl.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
 // under NSF AWARD 1414736 and by the respective contributors.
 // All rights reserved.
 //
@@ -69,7 +69,7 @@ CLI11_INLINE std::string Formatter::make_description(const App *app) const {
     auto min_options = app->get_require_option_min();
     auto max_options = app->get_require_option_max();
     if(app->get_required()) {
-        desc += " REQUIRED ";
+        desc += " " + get_label("REQUIRED") + " ";
     }
     if((max_options == min_options) && (min_options > 0)) {
         if(min_options == 1) {
@@ -91,6 +91,11 @@ CLI11_INLINE std::string Formatter::make_description(const App *app) const {
 }
 
 CLI11_INLINE std::string Formatter::make_usage(const App *app, std::string name) const {
+    std::string usage = app->get_usage();
+    if(!usage.empty()) {
+        return usage + "\n";
+    }
+
     std::stringstream out;
 
     out << get_label("Usage") << ":" << (name.empty() ? "" : " ") << name;
@@ -127,7 +132,7 @@ CLI11_INLINE std::string Formatter::make_usage(const App *app, std::string name)
             << (app->get_require_subcommand_min() == 0 ? "]" : "");
     }
 
-    out << std::endl;
+    out << '\n';
 
     return out.str();
 }
@@ -208,7 +213,10 @@ CLI11_INLINE std::string Formatter::make_subcommands(const App *app, AppFormatMo
 
 CLI11_INLINE std::string Formatter::make_subcommand(const App *sub) const {
     std::stringstream out;
-    detail::format_help(out, sub->get_display_name(true), sub->get_description(), column_width_);
+    detail::format_help(out,
+                        sub->get_display_name(true) + (sub->get_required() ? " " + get_label("REQUIRED") : ""),
+                        sub->get_description(),
+                        column_width_);
     return out.str();
 }
 
diff --git a/contrib/CLI11/include/CLI/impl/Option_inl.hpp b/contrib/CLI11/include/CLI/impl/Option_inl.hpp
index a24df9ab2..aa6f4657d 100644
--- a/contrib/CLI11/include/CLI/impl/Option_inl.hpp
+++ b/contrib/CLI11/include/CLI/impl/Option_inl.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
 // under NSF AWARD 1414736 and by the respective contributors.
 // All rights reserved.
 //
@@ -309,13 +309,29 @@ CLI11_INLINE void Option::run_callback() {
 
 CLI11_NODISCARD CLI11_INLINE const std::string &Option::matching_name(const Option &other) const {
     static const std::string estring;
-    for(const std::string &sname : snames_)
+    for(const std::string &sname : snames_) {
         if(other.check_sname(sname))
             return sname;
-    for(const std::string &lname : lnames_)
+        if(other.check_lname(sname))
+            return sname;
+    }
+    for(const std::string &lname : lnames_) {
         if(other.check_lname(lname))
             return lname;
-
+        if(lname.size() == 1) {
+            if(other.check_sname(lname)) {
+                return lname;
+            }
+        }
+    }
+    if(snames_.empty() && lnames_.empty() && !pname_.empty()) {
+        if(other.check_sname(pname_) || other.check_lname(pname_) || pname_ == other.pname_)
+            return pname_;
+    }
+    if(other.snames_.empty() && other.fnames_.empty() && !other.pname_.empty()) {
+        if(check_sname(other.pname_) || check_lname(other.pname_) || (pname_ == other.pname_))
+            return other.pname_;
+    }
     if(ignore_case_ ||
        ignore_underscore_) {  // We need to do the inverse, in case we are ignore_case or ignore underscore
         for(const std::string &sname : other.snames_)
@@ -369,6 +385,9 @@ CLI11_NODISCARD CLI11_INLINE std::string Option::get_flag_value(const std::strin
             if(default_ind >= 0) {
                 // We can static cast this to std::size_t because it is more than 0 in this block
                 if(default_flag_values_[static_cast<std::size_t>(default_ind)].second != input_value) {
+                    if(input_value == default_str_ && force_callback_) {
+                        return input_value;
+                    }
                     throw(ArgumentMismatch::FlagOverride(name));
                 }
             } else {
@@ -389,15 +408,15 @@ CLI11_NODISCARD CLI11_INLINE std::string Option::get_flag_value(const std::strin
         return input_value;
     }
     if(default_flag_values_[static_cast<std::size_t>(ind)].second == falseString) {
-        try {
-            auto val = detail::to_flag_value(input_value);
-            return (val == 1) ? falseString : (val == (-1) ? trueString : std::to_string(-val));
-        } catch(const std::invalid_argument &) {
+        errno = 0;
+        auto val = detail::to_flag_value(input_value);
+        if(errno != 0) {
+            errno = 0;
             return input_value;
         }
-    } else {
-        return input_value;
+        return (val == 1) ? falseString : (val == (-1) ? trueString : std::to_string(-val));
     }
+    return input_value;
 }
 
 CLI11_INLINE Option *Option::add_result(std::string s) {
@@ -500,7 +519,8 @@ CLI11_INLINE void Option::_validate_results(results_t &res) const {
         if(type_size_max_ > 1) {  // in this context index refers to the index in the type
             int index = 0;
             if(get_items_expected_max() < static_cast<int>(res.size()) &&
-               multi_option_policy_ == CLI::MultiOptionPolicy::TakeLast) {
+               (multi_option_policy_ == CLI::MultiOptionPolicy::TakeLast ||
+                multi_option_policy_ == CLI::MultiOptionPolicy::Reverse)) {
                 // create a negative index for the earliest ones
                 index = get_items_expected_max() - static_cast<int>(res.size());
             }
@@ -518,7 +538,8 @@ CLI11_INLINE void Option::_validate_results(results_t &res) const {
         } else {
             int index = 0;
             if(expected_max_ < static_cast<int>(res.size()) &&
-               multi_option_policy_ == CLI::MultiOptionPolicy::TakeLast) {
+               (multi_option_policy_ == CLI::MultiOptionPolicy::TakeLast ||
+                multi_option_policy_ == CLI::MultiOptionPolicy::Reverse)) {
                 // create a negative index for the earliest ones
                 index = expected_max_ - static_cast<int>(res.size());
             }
@@ -550,6 +571,15 @@ CLI11_INLINE void Option::_reduce_results(results_t &out, const results_t &origi
             out.assign(original.end() - static_cast<results_t::difference_type>(trim_size), original.end());
         }
     } break;
+    case MultiOptionPolicy::Reverse: {
+        // Allow multi-option sizes (including 0)
+        std::size_t trim_size = std::min<std::size_t>(
+            static_cast<std::size_t>(std::max<int>(get_items_expected_max(), 1)), original.size());
+        if(original.size() != trim_size || trim_size > 1) {
+            out.assign(original.end() - static_cast<results_t::difference_type>(trim_size), original.end());
+        }
+        std::reverse(out.begin(), out.end());
+    } break;
     case MultiOptionPolicy::TakeFirst: {
         std::size_t trim_size = std::min<std::size_t>(
             static_cast<std::size_t>(std::max<int>(get_items_expected_max(), 1)), original.size());
@@ -579,7 +609,12 @@ CLI11_INLINE void Option::_reduce_results(results_t &out, const results_t &origi
             throw ArgumentMismatch::AtLeast(get_name(), static_cast<int>(num_min), original.size());
         }
         if(original.size() > num_max) {
-            throw ArgumentMismatch::AtMost(get_name(), static_cast<int>(num_max), original.size());
+            if(original.size() == 2 && num_max == 1 && original[1] == "%%" && original[0] == "{}") {
+                // this condition is a trap for the following empty indicator check on config files
+                out = original;
+            } else {
+                throw ArgumentMismatch::AtMost(get_name(), static_cast<int>(num_max), original.size());
+            }
         }
         break;
     }
@@ -588,11 +623,11 @@ CLI11_INLINE void Option::_reduce_results(results_t &out, const results_t &origi
     // {} is the indicator for an empty container
     if(out.empty()) {
         if(original.size() == 1 && original[0] == "{}" && get_items_expected_min() > 0) {
-            out.push_back("{}");
-            out.push_back("%%");
+            out.emplace_back("{}");
+            out.emplace_back("%%");
         }
     } else if(out.size() == 1 && out[0] == "{}" && get_items_expected_min() > 0) {
-        out.push_back("%%");
+        out.emplace_back("%%");
     }
 }
 
diff --git a/contrib/CLI11/include/CLI/impl/Split_inl.hpp b/contrib/CLI11/include/CLI/impl/Split_inl.hpp
index bb05a8681..7cd8e5b37 100644
--- a/contrib/CLI11/include/CLI/impl/Split_inl.hpp
+++ b/contrib/CLI11/include/CLI/impl/Split_inl.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
 // under NSF AWARD 1414736 and by the respective contributors.
 // All rights reserved.
 //
@@ -34,7 +34,7 @@ CLI11_INLINE bool split_short(const std::string &current, std::string &name, std
 }
 
 CLI11_INLINE bool split_long(const std::string &current, std::string &name, std::string &value) {
-    if(current.size() > 2 && current.substr(0, 2) == "--" && valid_first_char(current[2])) {
+    if(current.size() > 2 && current.compare(0, 2, "--") == 0 && valid_first_char(current[2])) {
         auto loc = current.find_first_of('=');
         if(loc != std::string::npos) {
             name = current.substr(2, loc - 2);
@@ -106,7 +106,6 @@ get_names(const std::vector<std::string> &input) {
     std::vector<std::string> short_names;
     std::vector<std::string> long_names;
     std::string pos_name;
-
     for(std::string name : input) {
         if(name.length() == 0) {
             continue;
@@ -114,6 +113,8 @@ get_names(const std::vector<std::string> &input) {
         if(name.length() > 1 && name[0] == '-' && name[1] != '-') {
             if(name.length() == 2 && valid_first_char(name[1]))
                 short_names.emplace_back(1, name[1]);
+            else if(name.length() > 2)
+                throw BadNameString::MissingDash(name);
             else
                 throw BadNameString::OneCharName(name);
         } else if(name.length() > 2 && name.substr(0, 2) == "--") {
@@ -125,12 +126,15 @@ get_names(const std::vector<std::string> &input) {
         } else if(name == "-" || name == "--") {
             throw BadNameString::DashesOnly(name);
         } else {
-            if(pos_name.length() > 0)
+            if(!pos_name.empty())
                 throw BadNameString::MultiPositionalNames(name);
-            pos_name = name;
+            if(valid_name_string(name)) {
+                pos_name = name;
+            } else {
+                throw BadNameString::BadPositionalName(name);
+            }
         }
     }
-
     return std::make_tuple(short_names, long_names, pos_name);
 }
 
diff --git a/contrib/CLI11/include/CLI/impl/StringTools_inl.hpp b/contrib/CLI11/include/CLI/impl/StringTools_inl.hpp
index 9b81fbde3..bab79a37e 100644
--- a/contrib/CLI11/include/CLI/impl/StringTools_inl.hpp
+++ b/contrib/CLI11/include/CLI/impl/StringTools_inl.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
 // under NSF AWARD 1414736 and by the respective contributors.
 // All rights reserved.
 //
@@ -10,7 +10,9 @@
 #include <CLI/StringTools.hpp>
 
 // [CLI11:public_includes:set]
+#include <cstdint>
 #include <string>
+#include <utility>
 #include <vector>
 // [CLI11:public_includes:end]
 
@@ -60,7 +62,17 @@ CLI11_INLINE std::string &rtrim(std::string &str, const std::string &filter) {
 }
 
 CLI11_INLINE std::string &remove_quotes(std::string &str) {
-    if(str.length() > 1 && (str.front() == '"' || str.front() == '\'')) {
+    if(str.length() > 1 && (str.front() == '"' || str.front() == '\'' || str.front() == '`')) {
+        if(str.front() == str.back()) {
+            str.pop_back();
+            str.erase(str.begin(), str.begin() + 1);
+        }
+    }
+    return str;
+}
+
+CLI11_INLINE std::string &remove_outer(std::string &str, char key) {
+    if(str.length() > 1 && (str.front() == key)) {
         if(str.front() == str.back()) {
             str.pop_back();
             str.erase(str.begin(), str.begin() + 1);
@@ -180,37 +192,220 @@ find_member(std::string name, const std::vector<std::string> names, bool ignore_
     return (it != std::end(names)) ? (it - std::begin(names)) : (-1);
 }
 
+static const std::string escapedChars("\b\t\n\f\r\"\\");
+static const std::string escapedCharsCode("btnfr\"\\");
+static const std::string bracketChars{"\"'`[(<{"};
+static const std::string matchBracketChars("\"'`])>}");
+
+CLI11_INLINE bool has_escapable_character(const std::string &str) {
+    return (str.find_first_of(escapedChars) != std::string::npos);
+}
+
+CLI11_INLINE std::string add_escaped_characters(const std::string &str) {
+    std::string out;
+    out.reserve(str.size() + 4);
+    for(char s : str) {
+        auto sloc = escapedChars.find_first_of(s);
+        if(sloc != std::string::npos) {
+            out.push_back('\\');
+            out.push_back(escapedCharsCode[sloc]);
+        } else {
+            out.push_back(s);
+        }
+    }
+    return out;
+}
+
+CLI11_INLINE std::uint32_t hexConvert(char hc) {
+    int hcode{0};
+    if(hc >= '0' && hc <= '9') {
+        hcode = (hc - '0');
+    } else if(hc >= 'A' && hc <= 'F') {
+        hcode = (hc - 'A' + 10);
+    } else if(hc >= 'a' && hc <= 'f') {
+        hcode = (hc - 'a' + 10);
+    } else {
+        hcode = -1;
+    }
+    return static_cast<uint32_t>(hcode);
+}
+
+CLI11_INLINE char make_char(std::uint32_t code) { return static_cast<char>(static_cast<unsigned char>(code)); }
+
+CLI11_INLINE void append_codepoint(std::string &str, std::uint32_t code) {
+    if(code < 0x80) {  // ascii code equivalent
+        str.push_back(static_cast<char>(code));
+    } else if(code < 0x800) {  // \u0080 to \u07FF
+        // 110yyyyx 10xxxxxx; 0x3f == 0b0011'1111
+        str.push_back(make_char(0xC0 | code >> 6));
+        str.push_back(make_char(0x80 | (code & 0x3F)));
+    } else if(code < 0x10000) {  // U+0800...U+FFFF
+        if(0xD800 <= code && code <= 0xDFFF) {
+            throw std::invalid_argument("[0xD800, 0xDFFF] are not valid UTF-8.");
+        }
+        // 1110yyyy 10yxxxxx 10xxxxxx
+        str.push_back(make_char(0xE0 | code >> 12));
+        str.push_back(make_char(0x80 | (code >> 6 & 0x3F)));
+        str.push_back(make_char(0x80 | (code & 0x3F)));
+    } else if(code < 0x110000) {  // U+010000 ... U+10FFFF
+        // 11110yyy 10yyxxxx 10xxxxxx 10xxxxxx
+        str.push_back(make_char(0xF0 | code >> 18));
+        str.push_back(make_char(0x80 | (code >> 12 & 0x3F)));
+        str.push_back(make_char(0x80 | (code >> 6 & 0x3F)));
+        str.push_back(make_char(0x80 | (code & 0x3F)));
+    }
+}
+
+CLI11_INLINE std::string remove_escaped_characters(const std::string &str) {
+
+    std::string out;
+    out.reserve(str.size());
+    for(auto loc = str.begin(); loc < str.end(); ++loc) {
+        if(*loc == '\\') {
+            if(str.end() - loc < 2) {
+                throw std::invalid_argument("invalid escape sequence " + str);
+            }
+            auto ecloc = escapedCharsCode.find_first_of(*(loc + 1));
+            if(ecloc != std::string::npos) {
+                out.push_back(escapedChars[ecloc]);
+                ++loc;
+            } else if(*(loc + 1) == 'u') {
+                // must have 4 hex characters
+                if(str.end() - loc < 6) {
+                    throw std::invalid_argument("unicode sequence must have 4 hex codes " + str);
+                }
+                std::uint32_t code{0};
+                std::uint32_t mplier{16 * 16 * 16};
+                for(int ii = 2; ii < 6; ++ii) {
+                    std::uint32_t res = hexConvert(*(loc + ii));
+                    if(res > 0x0F) {
+                        throw std::invalid_argument("unicode sequence must have 4 hex codes " + str);
+                    }
+                    code += res * mplier;
+                    mplier = mplier / 16;
+                }
+                append_codepoint(out, code);
+                loc += 5;
+            } else if(*(loc + 1) == 'U') {
+                // must have 8 hex characters
+                if(str.end() - loc < 10) {
+                    throw std::invalid_argument("unicode sequence must have 8 hex codes " + str);
+                }
+                std::uint32_t code{0};
+                std::uint32_t mplier{16 * 16 * 16 * 16 * 16 * 16 * 16};
+                for(int ii = 2; ii < 10; ++ii) {
+                    std::uint32_t res = hexConvert(*(loc + ii));
+                    if(res > 0x0F) {
+                        throw std::invalid_argument("unicode sequence must have 8 hex codes " + str);
+                    }
+                    code += res * mplier;
+                    mplier = mplier / 16;
+                }
+                append_codepoint(out, code);
+                loc += 9;
+            } else if(*(loc + 1) == '0') {
+                out.push_back('\0');
+                ++loc;
+            } else {
+                throw std::invalid_argument(std::string("unrecognized escape sequence \\") + *(loc + 1) + " in " + str);
+            }
+        } else {
+            out.push_back(*loc);
+        }
+    }
+    return out;
+}
+
+CLI11_INLINE std::size_t close_string_quote(const std::string &str, std::size_t start, char closure_char) {
+    std::size_t loc{0};
+    for(loc = start + 1; loc < str.size(); ++loc) {
+        if(str[loc] == closure_char) {
+            break;
+        }
+        if(str[loc] == '\\') {
+            // skip the next character for escaped sequences
+            ++loc;
+        }
+    }
+    return loc;
+}
+
+CLI11_INLINE std::size_t close_literal_quote(const std::string &str, std::size_t start, char closure_char) {
+    auto loc = str.find_first_of(closure_char, start + 1);
+    return (loc != std::string::npos ? loc : str.size());
+}
+
+CLI11_INLINE std::size_t close_sequence(const std::string &str, std::size_t start, char closure_char) {
+
+    auto bracket_loc = matchBracketChars.find(closure_char);
+    switch(bracket_loc) {
+    case 0:
+        return close_string_quote(str, start, closure_char);
+    case 1:
+    case 2:
+    case std::string::npos:
+        return close_literal_quote(str, start, closure_char);
+    default:
+        break;
+    }
+
+    std::string closures(1, closure_char);
+    auto loc = start + 1;
+
+    while(loc < str.size()) {
+        if(str[loc] == closures.back()) {
+            closures.pop_back();
+            if(closures.empty()) {
+                return loc;
+            }
+        }
+        bracket_loc = bracketChars.find(str[loc]);
+        if(bracket_loc != std::string::npos) {
+            switch(bracket_loc) {
+            case 0:
+                loc = close_string_quote(str, loc, str[loc]);
+                break;
+            case 1:
+            case 2:
+                loc = close_literal_quote(str, loc, str[loc]);
+                break;
+            default:
+                closures.push_back(matchBracketChars[bracket_loc]);
+                break;
+            }
+        }
+        ++loc;
+    }
+    if(loc > str.size()) {
+        loc = str.size();
+    }
+    return loc;
+}
+
 CLI11_INLINE std::vector<std::string> split_up(std::string str, char delimiter) {
 
-    const std::string delims("\'\"`");
     auto find_ws = [delimiter](char ch) {
         return (delimiter == '\0') ? std::isspace<char>(ch, std::locale()) : (ch == delimiter);
     };
     trim(str);
 
     std::vector<std::string> output;
-    bool embeddedQuote = false;
-    char keyChar = ' ';
     while(!str.empty()) {
-        if(delims.find_first_of(str[0]) != std::string::npos) {
-            keyChar = str[0];
-            auto end = str.find_first_of(keyChar, 1);
-            while((end != std::string::npos) && (str[end - 1] == '\\')) {  // deal with escaped quotes
-                end = str.find_first_of(keyChar, end + 1);
-                embeddedQuote = true;
-            }
-            if(end != std::string::npos) {
-                output.push_back(str.substr(1, end - 1));
+        if(bracketChars.find_first_of(str[0]) != std::string::npos) {
+            auto bracketLoc = bracketChars.find_first_of(str[0]);
+            auto end = close_sequence(str, 0, matchBracketChars[bracketLoc]);
+            if(end >= str.size()) {
+                output.push_back(std::move(str));
+                str.clear();
+            } else {
+                output.push_back(str.substr(0, end + 1));
                 if(end + 2 < str.size()) {
                     str = str.substr(end + 2);
                 } else {
                     str.clear();
                 }
-
-            } else {
-                output.push_back(str.substr(1));
-                str = "";
             }
+
         } else {
             auto it = std::find_if(std::begin(str), std::end(str), find_ws);
             if(it != std::end(str)) {
@@ -219,14 +414,9 @@ CLI11_INLINE std::vector<std::string> split_up(std::string str, char delimiter)
                 str = std::string(it + 1, str.end());
             } else {
                 output.push_back(str);
-                str = "";
+                str.clear();
             }
         }
-        // transform any embedded quotes into the regular character
-        if(embeddedQuote) {
-            output.back() = find_and_replace(output.back(), std::string("\\") + keyChar, std::string(1, keyChar));
-            embeddedQuote = false;
-        }
         trim(str);
     }
     return output;
@@ -244,15 +434,140 @@ CLI11_INLINE std::size_t escape_detect(std::string &str, std::size_t offset) {
     return offset + 1;
 }
 
-CLI11_INLINE std::string &add_quotes_if_needed(std::string &str) {
-    if((str.front() != '"' && str.front() != '\'') || str.front() != str.back()) {
-        char quote = str.find('"') < str.find('\'') ? '\'' : '"';
-        if(str.find(' ') != std::string::npos) {
-            str.insert(0, 1, quote);
-            str.append(1, quote);
+CLI11_INLINE std::string binary_escape_string(const std::string &string_to_escape) {
+    // s is our escaped output string
+    std::string escaped_string{};
+    // loop through all characters
+    for(char c : string_to_escape) {
+        // check if a given character is printable
+        // the cast is necessary to avoid undefined behaviour
+        if(isprint(static_cast<unsigned char>(c)) == 0) {
+            std::stringstream stream;
+            // if the character is not printable
+            // we'll convert it to a hex string using a stringstream
+            // note that since char is signed we have to cast it to unsigned first
+            stream << std::hex << static_cast<unsigned int>(static_cast<unsigned char>(c));
+            std::string code = stream.str();
+            escaped_string += std::string("\\x") + (code.size() < 2 ? "0" : "") + code;
+
+        } else {
+            escaped_string.push_back(c);
         }
     }
-    return str;
+    if(escaped_string != string_to_escape) {
+        auto sqLoc = escaped_string.find('\'');
+        while(sqLoc != std::string::npos) {
+            escaped_string.replace(sqLoc, sqLoc + 1, "\\x27");
+            sqLoc = escaped_string.find('\'');
+        }
+        escaped_string.insert(0, "'B\"(");
+        escaped_string.push_back(')');
+        escaped_string.push_back('"');
+        escaped_string.push_back('\'');
+    }
+    return escaped_string;
+}
+
+CLI11_INLINE bool is_binary_escaped_string(const std::string &escaped_string) {
+    size_t ssize = escaped_string.size();
+    if(escaped_string.compare(0, 3, "B\"(") == 0 && escaped_string.compare(ssize - 2, 2, ")\"") == 0) {
+        return true;
+    }
+    return (escaped_string.compare(0, 4, "'B\"(") == 0 && escaped_string.compare(ssize - 3, 3, ")\"'") == 0);
+}
+
+CLI11_INLINE std::string extract_binary_string(const std::string &escaped_string) {
+    std::size_t start{0};
+    std::size_t tail{0};
+    size_t ssize = escaped_string.size();
+    if(escaped_string.compare(0, 3, "B\"(") == 0 && escaped_string.compare(ssize - 2, 2, ")\"") == 0) {
+        start = 3;
+        tail = 2;
+    } else if(escaped_string.compare(0, 4, "'B\"(") == 0 && escaped_string.compare(ssize - 3, 3, ")\"'") == 0) {
+        start = 4;
+        tail = 3;
+    }
+
+    if(start == 0) {
+        return escaped_string;
+    }
+    std::string outstring;
+
+    outstring.reserve(ssize - start - tail);
+    std::size_t loc = start;
+    while(loc < ssize - tail) {
+        // ssize-2 to skip )" at the end
+        if(escaped_string[loc] == '\\' && (escaped_string[loc + 1] == 'x' || escaped_string[loc + 1] == 'X')) {
+            auto c1 = escaped_string[loc + 2];
+            auto c2 = escaped_string[loc + 3];
+
+            std::uint32_t res1 = hexConvert(c1);
+            std::uint32_t res2 = hexConvert(c2);
+            if(res1 <= 0x0F && res2 <= 0x0F) {
+                loc += 4;
+                outstring.push_back(static_cast<char>(res1 * 16 + res2));
+                continue;
+            }
+        }
+        outstring.push_back(escaped_string[loc]);
+        ++loc;
+    }
+    return outstring;
+}
+
+CLI11_INLINE void remove_quotes(std::vector<std::string> &args) {
+    for(auto &arg : args) {
+        if(arg.front() == '\"' && arg.back() == '\"') {
+            remove_quotes(arg);
+            // only remove escaped for string arguments not literal strings
+            arg = remove_escaped_characters(arg);
+        } else {
+            remove_quotes(arg);
+        }
+    }
+}
+
+CLI11_INLINE bool process_quoted_string(std::string &str, char string_char, char literal_char) {
+    if(str.size() <= 1) {
+        return false;
+    }
+    if(detail::is_binary_escaped_string(str)) {
+        str = detail::extract_binary_string(str);
+        return true;
+    }
+    if(str.front() == string_char && str.back() == string_char) {
+        detail::remove_outer(str, string_char);
+        if(str.find_first_of('\\') != std::string::npos) {
+            str = detail::remove_escaped_characters(str);
+        }
+        return true;
+    }
+    if((str.front() == literal_char || str.front() == '`') && str.back() == str.front()) {
+        detail::remove_outer(str, str.front());
+        return true;
+    }
+    return false;
+}
+
+std::string get_environment_value(const std::string &env_name) {
+    char *buffer = nullptr;
+    std::string ename_string;
+
+#ifdef _MSC_VER
+    // Windows version
+    std::size_t sz = 0;
+    if(_dupenv_s(&buffer, &sz, env_name.c_str()) == 0 && buffer != nullptr) {
+        ename_string = std::string(buffer);
+        free(buffer);
+    }
+#else
+    // This also works on Windows, but gives a warning
+    buffer = std::getenv(env_name.c_str());
+    if(buffer != nullptr) {
+        ename_string = std::string(buffer);
+    }
+#endif
+    return ename_string;
 }
 
 }  // namespace detail
diff --git a/contrib/CLI11/include/CLI/impl/Validators_inl.hpp b/contrib/CLI11/include/CLI/impl/Validators_inl.hpp
index d6ac4fde1..bf73e21a9 100644
--- a/contrib/CLI11/include/CLI/impl/Validators_inl.hpp
+++ b/contrib/CLI11/include/CLI/impl/Validators_inl.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, University of Cincinnati, developed by Henry Schreiner
+// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
 // under NSF AWARD 1414736 and by the respective contributors.
 // All rights reserved.
 //
@@ -8,6 +8,7 @@
 
 #include <CLI/Validators.hpp>
 
+#include <CLI/Encoding.hpp>
 #include <CLI/Macros.hpp>
 #include <CLI/StringTools.hpp>
 #include <CLI/TypeTools.hpp>
@@ -127,14 +128,14 @@ namespace detail {
 #if defined CLI11_HAS_FILESYSTEM && CLI11_HAS_FILESYSTEM > 0
 CLI11_INLINE path_type check_path(const char *file) noexcept {
     std::error_code ec;
-    auto stat = std::filesystem::status(file, ec);
+    auto stat = std::filesystem::status(to_path(file), ec);
     if(ec) {
         return path_type::nonexistent;
     }
     switch(stat.type()) {
     case std::filesystem::file_type::none:  // LCOV_EXCL_LINE
     case std::filesystem::file_type::not_found:
-        return path_type::nonexistent;
+        return path_type::nonexistent;  // LCOV_EXCL_LINE
     case std::filesystem::file_type::directory:
         return path_type::directory;
     case std::filesystem::file_type::symlink:
@@ -228,10 +229,29 @@ CLI11_INLINE IPV4Validator::IPV4Validator() : Validator("IPV4") {
                 return std::string("Each IP number must be between 0 and 255 ") + var;
             }
         }
-        return std::string();
+        return std::string{};
     };
 }
 
+CLI11_INLINE EscapedStringTransformer::EscapedStringTransformer() {
+    func_ = [](std::string &str) {
+        try {
+            if(str.size() > 1 && (str.front() == '\"' || str.front() == '\'' || str.front() == '`') &&
+               str.front() == str.back()) {
+                process_quoted_string(str);
+            } else if(str.find_first_of('\\') != std::string::npos) {
+                if(detail::is_binary_escaped_string(str)) {
+                    str = detail::extract_binary_string(str);
+                } else {
+                    str = remove_escaped_characters(str);
+                }
+            }
+            return std::string{};
+        } catch(const std::invalid_argument &ia) {
+            return std::string(ia.what());
+        }
+    };
+}
 }  // namespace detail
 
 CLI11_INLINE FileOnDefaultPath::FileOnDefaultPath(std::string default_path, bool enableErrorReturn)

From cf66989fa2a47aa406f25c0be79e3b4e146284ee Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 12 Feb 2024 14:35:18 +0100
Subject: [PATCH 080/430] prepare release 1.11.0

---
 CMakeLists.txt              | 2 +-
 man/osm2pgsql-gen.1         | 8 +++-----
 man/osm2pgsql-replication.1 | 2 +-
 man/osm2pgsql.1             | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ab83b895..168f4ac9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 cmake_minimum_required(VERSION 3.8.0)
 
-project(osm2pgsql VERSION 1.10.0 LANGUAGES CXX C)
+project(osm2pgsql VERSION 1.11.0 LANGUAGES CXX C)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
diff --git a/man/osm2pgsql-gen.1 b/man/osm2pgsql-gen.1
index 6075f0f2f..52727aee5 100644
--- a/man/osm2pgsql-gen.1
+++ b/man/osm2pgsql-gen.1
@@ -1,4 +1,4 @@
-.TH "OSM2PGSQL" "1" "1.10.0" "" ""
+.TH "OSM2PGSQL" "1" "1.11.0" "" ""
 .SH NAME
 .PP
 osm2pgsql-gen - Generalize OpenStreetMap data - EXPERIMENTAL!
@@ -29,10 +29,7 @@ Mandatory arguments to long options are mandatory for short options too.
 .TP
 -a, --append
 Run in append mode.
-.TP
--c, --create
-Run in create mode.
-This is the default if \f[B]-a, --append\f[R] is not specified.
+The default is to run in create mode.
 .TP
 -S, --style=FILE
 The Lua config file.
@@ -44,6 +41,7 @@ Usually not required because it is read from the
 Specifies the number of parallel threads used for certain operations.
 Setting this to the number of available CPU cores is a reasonable
 starting point.
+Minimum value and default is 1, maximum value is 256.
 .SH HELP/VERSION OPTIONS
 .TP
 -h, --help
diff --git a/man/osm2pgsql-replication.1 b/man/osm2pgsql-replication.1
index df8211242..311bb56cc 100644
--- a/man/osm2pgsql-replication.1
+++ b/man/osm2pgsql-replication.1
@@ -1,4 +1,4 @@
-.TH "OSM2PGSQL-REPLICATION" "1" "1.10.0" "" ""
+.TH "OSM2PGSQL-REPLICATION" "1" "1.11.0" "" ""
 .SH NAME
 osm2pgsql-replication \- osm2pgsql database updater
 .SH SYNOPSIS
diff --git a/man/osm2pgsql.1 b/man/osm2pgsql.1
index d2ec93c12..c04458ff7 100644
--- a/man/osm2pgsql.1
+++ b/man/osm2pgsql.1
@@ -1,4 +1,4 @@
-.TH "OSM2PGSQL" "1" "1.10.0" "" ""
+.TH "OSM2PGSQL" "1" "1.11.0" "" ""
 .SH NAME
 .PP
 osm2pgsql - OpenStreetMap data to PostgreSQL converter

From d58a6c408470e7ac795697085ba463ebf45d3e0e Mon Sep 17 00:00:00 2001
From: iboates <iboates@gmail.com>
Date: Fri, 1 Mar 2024 20:57:54 +0100
Subject: [PATCH 081/430] Update README.md

Updated alpine line deps
---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 84d91cb9b..3e26b1b3b 100644
--- a/README.md
+++ b/README.md
@@ -117,8 +117,9 @@ pkg install devel/cmake devel/boost-libs textproc/expat2 \
 On Alpine, use
 
 ```sh
-apk --update-cache add cmake make g++ boost-dev expat-dev \
-  bzip2-dev zlib-dev libpq nlohmann-json proj-dev lua5.3-dev postgresql-dev
+apk --update-cache add cmake make g++ nlohmann-json \
+  postgresql-dev boost-dev expat-dev bzip2-dev zlib-dev \
+  libpq proj-dev lua5.3-dev luajit-dev
 ```
 
 Once dependencies are installed, use CMake to build the Makefiles in a separate

From 76ba82c7e0a2aaab0bdcdf68e70829593999cb4c Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 6 Mar 2024 18:53:08 +0100
Subject: [PATCH 082/430] Fix off-by-one error in expire code generating out of
 bounds tiles

See #2142
---
 src/expire-tiles.cpp        |  8 ++---
 tests/test-expire-tiles.cpp | 64 +++++++++++++++++++++++++++++++++++++
 tests/test-reprojection.cpp | 37 +++++++++++++++++++++
 3 files changed, 105 insertions(+), 4 deletions(-)

diff --git a/src/expire-tiles.cpp b/src/expire-tiles.cpp
index 317710329..604524b18 100644
--- a/src/expire-tiles.cpp
+++ b/src/expire-tiles.cpp
@@ -243,15 +243,15 @@ int expire_tiles::from_bbox(geom::box_t const &box,
     /* Convert the box's Mercator coordinates into tile coordinates */
     auto const tmp_min = coords_to_tile({box.min_x(), box.max_y()});
     int const min_tile_x =
-        std::clamp(int(tmp_min.x() - expire_config.buffer), 0, m_map_width);
+        std::clamp(int(tmp_min.x() - expire_config.buffer), 0, m_map_width - 1);
     int const min_tile_y =
-        std::clamp(int(tmp_min.y() - expire_config.buffer), 0, m_map_width);
+        std::clamp(int(tmp_min.y() - expire_config.buffer), 0, m_map_width - 1);
 
     auto const tmp_max = coords_to_tile({box.max_x(), box.min_y()});
     int const max_tile_x =
-        std::clamp(int(tmp_max.x() + expire_config.buffer), 0, m_map_width);
+        std::clamp(int(tmp_max.x() + expire_config.buffer), 0, m_map_width - 1);
     int const max_tile_y =
-        std::clamp(int(tmp_max.y() + expire_config.buffer), 0, m_map_width);
+        std::clamp(int(tmp_max.y() + expire_config.buffer), 0, m_map_width - 1);
 
     for (int iterator_x = min_tile_x; iterator_x <= max_tile_x; ++iterator_x) {
         uint32_t const norm_x = normalise_tile_x_coord(iterator_x);
diff --git a/tests/test-expire-tiles.cpp b/tests/test-expire-tiles.cpp
index 374eaaef5..fd138acc5 100644
--- a/tests/test-expire-tiles.cpp
+++ b/tests/test-expire-tiles.cpp
@@ -144,6 +144,70 @@ TEST_CASE("simple expire z18", "[NoDB]")
     CHECK(*(itr++) == tile_t(18, 131072, 131072));
 }
 
+TEST_CASE("simple expire z10 bounds 0, 0", "[NoDB]")
+{
+    uint32_t const minzoom = 10;
+    uint32_t const maxzoom = 10;
+    expire_tiles et{minzoom, defproj};
+
+    et.from_geometry(geom::point_t{-20037508.34, 20037508.34},
+                     expire_config_t{});
+
+    auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
+    CHECK(tiles.size() == 1);
+
+    auto itr = tiles.begin();
+    CHECK(*(itr++) == tile_t(10, 0, 0));
+}
+
+TEST_CASE("simple expire z10 bounds 0, 1023", "[NoDB]")
+{
+    uint32_t const minzoom = 10;
+    uint32_t const maxzoom = 10;
+    expire_tiles et{minzoom, defproj};
+
+    et.from_geometry(geom::point_t{-20037508.34, -20037508.34},
+                     expire_config_t{});
+
+    auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
+    CHECK(tiles.size() == 1);
+
+    auto itr = tiles.begin();
+    CHECK(*(itr++) == tile_t(10, 0, 1023));
+}
+
+TEST_CASE("simple expire z10 bounds 1023, 0", "[NoDB]")
+{
+    uint32_t const minzoom = 10;
+    uint32_t const maxzoom = 10;
+    expire_tiles et{minzoom, defproj};
+
+    et.from_geometry(geom::point_t{20037508.34, 20037508.34},
+                     expire_config_t{});
+
+    auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
+    CHECK(tiles.size() == 1);
+
+    auto itr = tiles.begin();
+    CHECK(*(itr++) == tile_t(10, 1023, 0));
+}
+
+TEST_CASE("simple expire z10 bounds 1023, 1023", "[NoDB]")
+{
+    uint32_t const minzoom = 10;
+    uint32_t const maxzoom = 10;
+    expire_tiles et{minzoom, defproj};
+
+    et.from_geometry(geom::point_t{20037508.34, -20037508.34},
+                     expire_config_t{});
+
+    auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
+    CHECK(tiles.size() == 1);
+
+    auto itr = tiles.begin();
+    CHECK(*(itr++) == tile_t(10, 1023, 1023));
+}
+
 TEST_CASE("expire a simple line", "[NoDB]")
 {
     uint32_t const zoom = 18;
diff --git a/tests/test-reprojection.cpp b/tests/test-reprojection.cpp
index f00d38b60..3eeb9cd9f 100644
--- a/tests/test-reprojection.cpp
+++ b/tests/test-reprojection.cpp
@@ -47,6 +47,43 @@ TEST_CASE("projection 3857", "[NoDB]")
     REQUIRE(ct.y() == Approx(6982997.92));
 }
 
+TEST_CASE("projection 3857 bounds", "[NoDB]")
+{
+    osmium::Location const loc1{0.0, 0.0};
+    osmium::Location const loc2{-180.0, -85.0511288};
+    osmium::Location const loc3{180.0, 85.0511288};
+    int const srs = 3857;
+    auto const reprojection = reprojection::create_projection(srs);
+
+    {
+        auto const c = reprojection->reproject(geom::point_t{loc1});
+        REQUIRE(c.x() == Approx(0.0));
+        REQUIRE(c.y() == Approx(0.0));
+
+        auto const ct = reprojection->target_to_tile(c);
+        REQUIRE(ct.x() == Approx(0.0));
+        REQUIRE(ct.y() == Approx(0.0));
+    }
+    {
+        auto const c = reprojection->reproject(geom::point_t{loc2});
+        REQUIRE(c.x() == Approx(-20037508.34));
+        REQUIRE(c.y() == Approx(-20037508.34));
+
+        auto const ct = reprojection->target_to_tile(c);
+        REQUIRE(ct.x() == Approx(-20037508.34));
+        REQUIRE(ct.y() == Approx(-20037508.34));
+    }
+    {
+        auto const c = reprojection->reproject(geom::point_t{loc3});
+        REQUIRE(c.x() == Approx(20037508.34));
+        REQUIRE(c.y() == Approx(20037508.34));
+
+        auto const ct = reprojection->target_to_tile(c);
+        REQUIRE(ct.x() == Approx(20037508.34));
+        REQUIRE(ct.y() == Approx(20037508.34));
+    }
+}
+
 #ifdef HAVE_GENERIC_PROJ
 TEST_CASE("projection 5651", "[NoDB]")
 {

From 32be519003393373a01096c76a99e2632d6d092e Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 12 Feb 2024 17:58:51 +0100
Subject: [PATCH 083/430] Remove "create" bool from options

It is just the inverse of "append" and never used except to check that
--append and --create are not used together.
---
 src/command-line-parser.cpp | 12 ++++++------
 src/options.hpp             |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index 71fd3058c..d6a728ef5 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -208,11 +208,6 @@ static void check_options_output_pgsql(CLI::App const &app, options_t *options)
 
 static void check_options(options_t *options)
 {
-    if (options->append && options->create) {
-        throw std::runtime_error{"--append and --create options can not be "
-                                 "used at the same time!"};
-    }
-
     if (options->append && !options->slim) {
         throw std::runtime_error{"--append can only be used with slim mode!"};
     }
@@ -291,7 +286,7 @@ options_t parse_command_line(int argc, char *argv[])
         ->description("Update existing osm2pgsql database (needs --slim).");
 
     // --create
-    app.add_flag("-c,--create", options.create)
+    app.add_flag("-c,--create")
         ->description("Import OSM data from file into database. This is the "
                       "default if --append is not used.");
 
@@ -687,6 +682,11 @@ options_t parse_command_line(int argc, char *argv[])
         return options;
     }
 
+    if (options.append && app.count("--create")) {
+        throw std::runtime_error{"--append and --create options can not be "
+                                 "used at the same time!"};
+    }
+
     check_options(&options);
 
     if (options.slim) { // slim mode, use database middle
diff --git a/src/options.hpp b/src/options.hpp
index 4ec554266..b518af60e 100644
--- a/src/options.hpp
+++ b/src/options.hpp
@@ -156,7 +156,6 @@ struct options_t
     bool reproject_area = false;
 
     bool parallel_indexing = true;
-    bool create = false;
     bool pass_prompt = false;
 }; // struct options_t
 

From 7486cdbb6da40a999003f767f8437d54399195fc Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 4 Feb 2024 14:48:03 +0100
Subject: [PATCH 084/430] Move analyze() and prepare() from table_connection_t
 to flex_table_t

They don't need anything from table_connection_t.
---
 src/flex-table.cpp  | 28 ++++++++++++++--------------
 src/flex-table.hpp  |  8 ++++----
 src/output-flex.cpp |  6 +++---
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/flex-table.cpp b/src/flex-table.cpp
index 9e9676c53..370499197 100644
--- a/src/flex-table.cpp
+++ b/src/flex-table.cpp
@@ -242,6 +242,18 @@ bool flex_table_t::has_columns_with_expire() const noexcept
                        [](auto const &column) { return column.has_expire(); });
 }
 
+void flex_table_t::prepare(pg_conn_t const &db_connection) const
+{
+    if (has_id_column() && has_columns_with_expire()) {
+        db_connection.exec(build_sql_prepare_get_wkb());
+    }
+}
+
+void flex_table_t::analyze(pg_conn_t const &db_connection) const
+{
+    analyze_table(db_connection, schema(), name());
+}
+
 static void enable_check_trigger(pg_conn_t const &db_connection,
                                  flex_table_t const &table)
 {
@@ -285,7 +297,7 @@ void table_connection_t::start(pg_conn_t const &db_connection, bool append)
         enable_check_trigger(db_connection, table());
     }
 
-    prepare(db_connection);
+    table().prepare(db_connection);
 }
 
 void table_connection_t::stop(pg_conn_t const &db_connection, bool updateable,
@@ -368,19 +380,7 @@ void table_connection_t::stop(pg_conn_t const &db_connection, bool updateable,
     }
 
     log_info("Analyzing table '{}'...", table().name());
-    analyze(db_connection);
-}
-
-void table_connection_t::prepare(pg_conn_t const &db_connection)
-{
-    if (table().has_id_column() && table().has_columns_with_expire()) {
-        db_connection.exec(table().build_sql_prepare_get_wkb());
-    }
-}
-
-void table_connection_t::analyze(pg_conn_t const &db_connection)
-{
-    analyze_table(db_connection, table().schema(), table().name());
+    table().analyze(db_connection);
 }
 
 void table_connection_t::create_id_index(pg_conn_t const &db_connection)
diff --git a/src/flex-table.hpp b/src/flex-table.hpp
index cc15febff..c1278f9f7 100644
--- a/src/flex-table.hpp
+++ b/src/flex-table.hpp
@@ -199,6 +199,10 @@ class flex_table_t
 
     std::size_t num() const noexcept { return m_table_num; }
 
+    void prepare(pg_conn_t const &db_connection) const;
+
+    void analyze(pg_conn_t const &db_connection) const;
+
 private:
     /// The schema this table is in
     std::string m_schema;
@@ -270,10 +274,6 @@ class table_connection_t
 
     flex_table_t const &table() const noexcept { return *m_table; }
 
-    void prepare(pg_conn_t const &db_connection);
-
-    void analyze(pg_conn_t const &db_connection);
-
     void create_id_index(pg_conn_t const &db_connection);
 
     /**
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index daccd60fd..510746be0 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -1266,8 +1266,8 @@ output_flex_t::output_flex_t(output_flex_t const *other,
   m_select_relation_members(other->m_select_relation_members)
 {
     for (auto &table : *m_tables) {
-        auto &tc = m_table_connections.emplace_back(&table, m_copy_thread);
-        tc.prepare(m_db_connection);
+        table.prepare(m_db_connection);
+        m_table_connections.emplace_back(&table, m_copy_thread);
     }
 
     for (auto &expire_output : *m_expire_outputs) {
@@ -1514,7 +1514,7 @@ void output_flex_t::reprocess_marked()
         for (auto &table : m_table_connections) {
             if (table.table().matches_type(osmium::item_type::way) &&
                 table.table().has_id_column()) {
-                table.analyze(m_db_connection);
+                table.table().analyze(m_db_connection);
                 table.create_id_index(m_db_connection);
             }
         }

From 616711217e2d923368b31c8905fd2a2fa61aae74 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 22 Aug 2023 16:26:53 +0200
Subject: [PATCH 085/430] Sync output earlier for better objects/s numbers

Sync in after_relations() instead of in stop(). This makes the numbers
of objects per second processed a bit more accurate.
---
 src/osmdata.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/osmdata.cpp b/src/osmdata.cpp
index 0779a6c8b..f2a20af2c 100644
--- a/src/osmdata.cpp
+++ b/src/osmdata.cpp
@@ -153,6 +153,8 @@ void osmdata_t::after_relations()
     if (m_append) {
         m_dependency_manager->after_relations();
     }
+
+    m_output->sync();
 }
 
 void osmdata_t::start() const
@@ -406,8 +408,6 @@ void osmdata_t::postprocess_database() const
 
 void osmdata_t::stop() const
 {
-    m_output->sync();
-
     if (m_append && m_with_forward_dependencies) {
         process_dependents();
     }

From 407809b493d574174f5ae1bb255c2ed80a2bda18 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 27 Mar 2024 21:56:13 +0100
Subject: [PATCH 086/430] Make member variables in table_desc private

Make the member variables m_create_table, m_create_fw_dep_indexes, and
m_prepare_queries private.
---
 src/middle-pgsql.cpp | 14 ++++++++++----
 src/middle-pgsql.hpp | 14 ++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index c95bbfca1..824eba9a9 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -176,6 +176,14 @@ void middle_pgsql_t::table_desc::build_index(
     }
 }
 
+void middle_pgsql_t::table_desc::create_table(
+    pg_conn_t const &db_connection) const
+{
+    if (!m_create_table.empty()) {
+        db_connection.exec(m_create_table);
+    }
+}
+
 void middle_pgsql_t::table_desc::init_max_id(pg_conn_t const &db_connection)
 {
     auto const qual_name = qualified_name(schema(), name());
@@ -1315,9 +1323,7 @@ static void table_setup(pg_conn_t const &db_connection,
     log_debug("Setting up table '{}'", table.name());
     auto const qual_name = qualified_name(table.schema(), table.name());
     db_connection.exec("DROP TABLE IF EXISTS {} CASCADE", qual_name);
-    if (!table.m_create_table.empty()) {
-        db_connection.exec(table.m_create_table);
-    }
+    table.create_table(db_connection);
 }
 
 void middle_pgsql_t::start()
@@ -1730,7 +1736,7 @@ middle_pgsql_t::get_query_instance()
 
     // We use a connection per table to enable the use of COPY
     for (auto &table : m_tables) {
-        for (auto const &query : table.m_prepare_queries) {
+        for (auto const &query : table.prepare_queries()) {
             mid->exec_sql(query);
         }
     }
diff --git a/src/middle-pgsql.hpp b/src/middle-pgsql.hpp
index 34403272b..2e09e9b6b 100644
--- a/src/middle-pgsql.hpp
+++ b/src/middle-pgsql.hpp
@@ -153,10 +153,6 @@ struct middle_pgsql_t : public middle_t
         ///< Open a new database connection and build index on this table.
         void build_index(connection_params_t const &connection_params) const;
 
-        std::string m_create_table;
-        std::vector<std::string> m_prepare_queries;
-        std::vector<std::string> m_create_fw_dep_indexes;
-
         void task_set(std::future<std::chrono::microseconds> &&future)
         {
             m_task_result.set(std::move(future));
@@ -164,11 +160,21 @@ struct middle_pgsql_t : public middle_t
 
         std::chrono::microseconds task_wait() { return m_task_result.wait(); }
 
+        void create_table(pg_conn_t const &db_connection) const;
+
         void init_max_id(pg_conn_t const &db_connection);
 
         osmid_t max_id() const noexcept { return m_max_id; }
 
+        std::vector<std::string> const &prepare_queries() const noexcept
+        {
+            return m_prepare_queries;
+        }
+
     private:
+        std::string m_create_table;
+        std::vector<std::string> m_create_fw_dep_indexes;
+        std::vector<std::string> m_prepare_queries;
         std::shared_ptr<db_target_descr_t> m_copy_target;
         task_result_t m_task_result;
 

From 3e5daee1066aa67f1199c6f414800d8e786b3739 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 19 Aug 2023 14:33:16 +0200
Subject: [PATCH 087/430] Move idlist_t into its own header file

---
 src/dependency-manager.hpp |  1 +
 src/idlist.hpp             | 34 ++++++++++++++++++++++++++++++++++
 src/middle-pgsql.cpp       |  1 +
 src/osmdata.hpp            |  1 +
 src/osmtypes.hpp           | 17 -----------------
 src/pgsql-helper.hpp       |  1 +
 tests/common-buffer.hpp    |  1 +
 7 files changed, 39 insertions(+), 17 deletions(-)
 create mode 100644 src/idlist.hpp

diff --git a/src/dependency-manager.hpp b/src/dependency-manager.hpp
index 3afcc88c8..18358c8e5 100644
--- a/src/dependency-manager.hpp
+++ b/src/dependency-manager.hpp
@@ -10,6 +10,7 @@
  * For a full list of authors see the git log.
  */
 
+#include "idlist.hpp"
 #include "osmtypes.hpp"
 
 #include <osmium/index/id_set.hpp>
diff --git a/src/idlist.hpp b/src/idlist.hpp
new file mode 100644
index 000000000..bd75be395
--- /dev/null
+++ b/src/idlist.hpp
@@ -0,0 +1,34 @@
+#ifndef OSM2PGSQL_IDLIST_HPP
+#define OSM2PGSQL_IDLIST_HPP
+
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+/**
+ * \file
+ *
+ * This file contains the definition of the idlist_t class.
+ */
+
+#include "osmtypes.hpp"
+
+#include <vector>
+
+struct idlist_t : public std::vector<osmid_t>
+{
+    // Get all constructors from std::vector
+    using vector<osmid_t>::vector;
+
+    // Even though we got all constructors from std::vector we need this on
+    // some compilers/libraries for some reason.
+    idlist_t() = default;
+
+};
+
+#endif // OSM2PGSQL_IDLIST_HPP
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index 824eba9a9..9b169ffdc 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -33,6 +33,7 @@
 #include <nlohmann/json.hpp>
 
 #include "format.hpp"
+#include "idlist.hpp"
 #include "json-writer.hpp"
 #include "logging.hpp"
 #include "middle-pgsql.hpp"
diff --git a/src/osmdata.hpp b/src/osmdata.hpp
index 78b6ddee1..f632cd4ee 100644
--- a/src/osmdata.hpp
+++ b/src/osmdata.hpp
@@ -24,6 +24,7 @@
 #include <osmium/osm/box.hpp>
 
 #include "dependency-manager.hpp"
+#include "idlist.hpp"
 #include "osmtypes.hpp"
 #include "pgsql-params.hpp"
 
diff --git a/src/osmtypes.hpp b/src/osmtypes.hpp
index 6eadff83b..b8b2dee66 100644
--- a/src/osmtypes.hpp
+++ b/src/osmtypes.hpp
@@ -238,23 +238,6 @@ class taglist_t
     std::vector<tag_t> m_tags;
 }; // class taglist_t
 
-struct idlist_t : public std::vector<osmid_t>
-{
-    // Get all constructors from std::vector
-    using vector<osmid_t>::vector;
-
-    // Even though we got all constructors from std::vector we need this on
-    // some compilers/libraries for some reason.
-    idlist_t() = default;
-
-    explicit idlist_t(osmium::NodeRefList const &list)
-    {
-        for (auto const &n : list) {
-            push_back(n.ref());
-        }
-    }
-};
-
 using rolelist_t = std::vector<char const *>;
 
 #endif // OSM2PGSQL_OSMTYPES_HPP
diff --git a/src/pgsql-helper.hpp b/src/pgsql-helper.hpp
index 15a46785d..7a38ee753 100644
--- a/src/pgsql-helper.hpp
+++ b/src/pgsql-helper.hpp
@@ -10,6 +10,7 @@
  * For a full list of authors see the git log.
  */
 
+#include "idlist.hpp"
 #include "osmtypes.hpp"
 
 #include <string>
diff --git a/tests/common-buffer.hpp b/tests/common-buffer.hpp
index 251d6c553..a974ef36d 100644
--- a/tests/common-buffer.hpp
+++ b/tests/common-buffer.hpp
@@ -11,6 +11,7 @@
  */
 
 #include "format.hpp"
+#include "idlist.hpp"
 #include "osmtypes.hpp"
 
 #include <osmium/memory/buffer.hpp>

From 65a9317baabc626fefc41d2987979e057b1cad24 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 19 Aug 2023 15:03:45 +0200
Subject: [PATCH 088/430] Make osmid_t a real class

---
 src/idlist.hpp        | 50 +++++++++++++++++++++++++++++++++++++------
 src/osmdata.cpp       |  3 +--
 tests/test-middle.cpp | 10 ++++-----
 3 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/src/idlist.hpp b/src/idlist.hpp
index bd75be395..44a785564 100644
--- a/src/idlist.hpp
+++ b/src/idlist.hpp
@@ -18,17 +18,55 @@
 
 #include "osmtypes.hpp"
 
+#include <cassert>
 #include <vector>
 
-struct idlist_t : public std::vector<osmid_t>
+class idlist_t
 {
-    // Get all constructors from std::vector
-    using vector<osmid_t>::vector;
+public:
+    using value_type = osmid_t;
 
-    // Even though we got all constructors from std::vector we need this on
-    // some compilers/libraries for some reason.
     idlist_t() = default;
 
-};
+    idlist_t(std::initializer_list<osmid_t> ids) : m_list(ids) {}
+
+    bool empty() const noexcept { return m_list.empty(); }
+
+    std::size_t size() const noexcept { return m_list.size(); }
+
+    auto begin() const noexcept { return m_list.begin(); }
+
+    auto end() const noexcept { return m_list.end(); }
+
+    osmid_t operator[](std::size_t n) const noexcept { return m_list[n]; }
+
+    void clear() { m_list.clear(); }
+
+    void push_back(osmid_t id) { m_list.push_back(id); }
+
+    void reserve(std::size_t size) { m_list.reserve(size); }
+
+    osmid_t pop_id()
+    {
+        assert(!m_list.empty());
+        auto const id = m_list.back();
+        m_list.pop_back();
+        return id;
+    }
+
+    friend bool operator==(idlist_t const &lhs, idlist_t const &rhs) noexcept
+    {
+        return lhs.m_list == rhs.m_list;
+    }
+
+    friend bool operator!=(idlist_t const &lhs, idlist_t const &rhs) noexcept
+    {
+        return !(lhs == rhs);
+    }
+
+private:
+    std::vector<osmid_t> m_list;
+
+}; // class idlist_t
 
 #endif // OSM2PGSQL_IDLIST_HPP
diff --git a/src/osmdata.cpp b/src/osmdata.cpp
index f2a20af2c..6051194b3 100644
--- a/src/osmdata.cpp
+++ b/src/osmdata.cpp
@@ -244,8 +244,7 @@ class multithreaded_processor
 
         std::lock_guard<std::mutex> const lock{*mutex};
         if (!queue->empty()) {
-            id = queue->back();
-            queue->pop_back();
+            id = queue->pop_id();
         }
 
         return id;
diff --git a/tests/test-middle.cpp b/tests/test-middle.cpp
index 9f36536fb..f384672bd 100644
--- a/tests/test-middle.cpp
+++ b/tests/test-middle.cpp
@@ -1118,7 +1118,7 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
 
         REQUIRE(dependency_manager.has_pending());
         idlist_t const way_ids = dependency_manager.get_pending_way_ids();
-        REQUIRE_THAT(way_ids, Catch::Equals<osmid_t>({20}));
+        REQUIRE(way_ids == idlist_t{20});
 
         check_way(mid, way20);
         check_way_nodes(mid, way20.id(), {&node10a, &node11});
@@ -1153,7 +1153,7 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
 
             REQUIRE(dependency_manager.has_pending());
             idlist_t const way_ids = dependency_manager.get_pending_way_ids();
-            REQUIRE_THAT(way_ids, Catch::Equals<osmid_t>({20, 22}));
+            REQUIRE(way_ids == idlist_t{20, 22});
 
             check_way(mid, way20);
             check_way_nodes(mid, way20.id(), {&node10a, &node11});
@@ -1265,7 +1265,7 @@ TEMPLATE_TEST_CASE("middle: change nodes in relation", "", options_slim_default,
         REQUIRE(dependency_manager.has_pending());
         idlist_t const rel_ids = dependency_manager.get_pending_relation_ids();
 
-        REQUIRE_THAT(rel_ids, Catch::Equals<osmid_t>({30}));
+        REQUIRE(rel_ids == idlist_t{30});
         check_relation(mid, rel30);
     }
 
@@ -1286,9 +1286,9 @@ TEMPLATE_TEST_CASE("middle: change nodes in relation", "", options_slim_default,
 
         REQUIRE(dependency_manager.has_pending());
         idlist_t const way_ids = dependency_manager.get_pending_way_ids();
-        REQUIRE_THAT(way_ids, Catch::Equals<osmid_t>({20}));
+        REQUIRE(way_ids == idlist_t{20});
         idlist_t const rel_ids = dependency_manager.get_pending_relation_ids();
-        REQUIRE_THAT(rel_ids, Catch::Equals<osmid_t>({31}));
+        REQUIRE(rel_ids == idlist_t{31});
         check_relation(mid, rel31);
     }
 }

From ba8ef220ab27b2f0ce4ffd85656ac3e0099301f7 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 19 Aug 2023 15:28:05 +0200
Subject: [PATCH 089/430] Refactor: Use idlist_t instead of
 osmium::index::IdSetSmall<osmid_t>

They are both basically the same class. We need a few functions from
IdSetSmall though.
---
 src/CMakeLists.txt         |  1 +
 src/dependency-manager.cpp | 19 ++++++++-----------
 src/dependency-manager.hpp | 20 ++++++++------------
 src/idlist.cpp             | 33 +++++++++++++++++++++++++++++++++
 src/idlist.hpp             | 13 +++++++++++++
 src/middle-pgsql.cpp       | 20 ++++++++------------
 src/middle-pgsql.hpp       | 12 +++++-------
 src/middle.hpp             | 14 ++++++--------
 src/output-flex.cpp        |  4 ++--
 src/output-flex.hpp        |  8 +++-----
 src/output.hpp             |  8 ++++----
 11 files changed, 91 insertions(+), 61 deletions(-)
 create mode 100644 src/idlist.cpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 528ff6be1..8ddf41219 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,6 +19,7 @@ target_sources(osm2pgsql_lib PRIVATE
   geom-from-osm.cpp
   geom-functions.cpp
   geom-pole-of-inaccessibility.cpp
+  idlist.cpp
   input.cpp
   logging.cpp
   middle.cpp
diff --git a/src/dependency-manager.cpp b/src/dependency-manager.cpp
index 72f1fe42e..534d42bfc 100644
--- a/src/dependency-manager.cpp
+++ b/src/dependency-manager.cpp
@@ -15,17 +15,17 @@
 
 void full_dependency_manager_t::node_changed(osmid_t id)
 {
-    m_changed_nodes.set(id);
+    m_changed_nodes.push_back(id);
 }
 
 void full_dependency_manager_t::way_changed(osmid_t id)
 {
-    m_changed_ways.set(id);
+    m_changed_ways.push_back(id);
 }
 
 void full_dependency_manager_t::relation_changed(osmid_t id)
 {
-    m_changed_relations.set(id);
+    m_changed_relations.push_back(id);
 }
 
 void full_dependency_manager_t::after_nodes()
@@ -39,15 +39,13 @@ void full_dependency_manager_t::after_nodes()
     m_changed_nodes.clear();
 }
 
-static osmium::index::IdSetSmall<osmid_t>
-set_diff(osmium::index::IdSetSmall<osmid_t> const &set,
-         osmium::index::IdSetSmall<osmid_t> const &to_be_removed)
+static idlist_t set_diff(idlist_t const &set, idlist_t const &to_be_removed)
 {
-    osmium::index::IdSetSmall<osmid_t> new_set;
+    idlist_t new_set;
 
     for (auto const id : set) {
         if (!to_be_removed.get_binary_search(id)) {
-            new_set.set(id);
+            new_set.push_back(id);
         }
     }
 
@@ -92,7 +90,7 @@ void full_dependency_manager_t::after_relations()
 }
 
 void full_dependency_manager_t::mark_parent_relations_as_pending(
-    osmium::index::IdSetSmall<osmid_t> const &way_ids)
+    idlist_t const &way_ids)
 {
     assert(m_rels_pending_tracker.empty());
     m_object_store->get_way_parents(way_ids, &m_rels_pending_tracker);
@@ -103,8 +101,7 @@ bool full_dependency_manager_t::has_pending() const noexcept
     return !m_ways_pending_tracker.empty() || !m_rels_pending_tracker.empty();
 }
 
-idlist_t
-full_dependency_manager_t::get_ids(osmium::index::IdSetSmall<osmid_t> *tracker)
+idlist_t full_dependency_manager_t::get_ids(idlist_t *tracker)
 {
     tracker->sort_unique();
 
diff --git a/src/dependency-manager.hpp b/src/dependency-manager.hpp
index 18358c8e5..e5271e89e 100644
--- a/src/dependency-manager.hpp
+++ b/src/dependency-manager.hpp
@@ -13,8 +13,6 @@
 #include "idlist.hpp"
 #include "osmtypes.hpp"
 
-#include <osmium/index/id_set.hpp>
-
 #include <cassert>
 #include <memory>
 #include <utility>
@@ -59,8 +57,7 @@ class dependency_manager_t
     virtual void after_ways() {}
     virtual void after_relations() {}
 
-    virtual void mark_parent_relations_as_pending(
-        osmium::index::IdSetSmall<osmid_t> const & /*way_ids*/)
+    virtual void mark_parent_relations_as_pending(idlist_t const & /*way_ids*/)
     {
     }
 
@@ -112,8 +109,7 @@ class full_dependency_manager_t : public dependency_manager_t
     void after_ways() override;
     void after_relations() override;
 
-    void mark_parent_relations_as_pending(
-        osmium::index::IdSetSmall<osmid_t> const &ids) override;
+    void mark_parent_relations_as_pending(idlist_t const &ids) override;
 
     bool has_pending() const noexcept override;
 
@@ -128,7 +124,7 @@ class full_dependency_manager_t : public dependency_manager_t
     }
 
 private:
-    static idlist_t get_ids(osmium::index::IdSetSmall<osmid_t> *tracker);
+    static idlist_t get_ids(idlist_t *tracker);
 
     std::shared_ptr<middle_t> m_object_store;
 
@@ -140,7 +136,7 @@ class full_dependency_manager_t : public dependency_manager_t
      * the change file, too, and so we don't have to find out which ones they
      * are.
      */
-    osmium::index::IdSetSmall<osmid_t> m_changed_nodes;
+    idlist_t m_changed_nodes;
 
     /**
      * In append mode all new and changed ways will be added to this. After
@@ -149,17 +145,17 @@ class full_dependency_manager_t : public dependency_manager_t
      * relations that referenced deleted ways must be in the change file, too,
      * and so we don't have to find out which ones they are.
      */
-    osmium::index::IdSetSmall<osmid_t> m_changed_ways;
+    idlist_t m_changed_ways;
 
     /**
      * In append mode all new and changed relations will be added to this.
      * This is then used to remove already processed relations from the
      * pending list.
      */
-    osmium::index::IdSetSmall<osmid_t> m_changed_relations;
+    idlist_t m_changed_relations;
 
-    osmium::index::IdSetSmall<osmid_t> m_ways_pending_tracker;
-    osmium::index::IdSetSmall<osmid_t> m_rels_pending_tracker;
+    idlist_t m_ways_pending_tracker;
+    idlist_t m_rels_pending_tracker;
 };
 
 #endif // OSM2PGSQL_DEPENDENCY_MANAGER_HPP
diff --git a/src/idlist.cpp b/src/idlist.cpp
new file mode 100644
index 000000000..7eec4f2b2
--- /dev/null
+++ b/src/idlist.cpp
@@ -0,0 +1,33 @@
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+#include "idlist.hpp"
+
+#include <algorithm>
+#include <iterator>
+#include <utility>
+
+void idlist_t::sort_unique()
+{
+    std::sort(m_list.begin(), m_list.end());
+    const auto last = std::unique(m_list.begin(), m_list.end());
+    m_list.erase(last, m_list.end());
+}
+
+void idlist_t::merge_sorted(const idlist_t &other)
+{
+    std::vector<osmid_t> new_list;
+
+    new_list.reserve(m_list.size() + other.m_list.size());
+    std::set_union(m_list.cbegin(), m_list.cend(), other.m_list.cbegin(),
+                   other.m_list.cend(), std::back_inserter(new_list));
+
+    using std::swap;
+    swap(new_list, m_list);
+}
diff --git a/src/idlist.hpp b/src/idlist.hpp
index 44a785564..a8523e820 100644
--- a/src/idlist.hpp
+++ b/src/idlist.hpp
@@ -38,8 +38,17 @@ class idlist_t
 
     auto end() const noexcept { return m_list.end(); }
 
+    auto cbegin() const noexcept { return m_list.cbegin(); }
+
+    auto cend() const noexcept { return m_list.cend(); }
+
     osmid_t operator[](std::size_t n) const noexcept { return m_list[n]; }
 
+    bool get_binary_search(osmid_t id) const noexcept
+    {
+        return std::binary_search(m_list.cbegin(), m_list.cend(), id);
+    }
+
     void clear() { m_list.clear(); }
 
     void push_back(osmid_t id) { m_list.push_back(id); }
@@ -64,6 +73,10 @@ class idlist_t
         return !(lhs == rhs);
     }
 
+    void sort_unique();
+
+    void merge_sorted(const idlist_t &other);
+
 private:
     std::vector<osmid_t> m_list;
 
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index 9b169ffdc..e441363e8 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -56,8 +56,7 @@ static bool check_bucket_index(pg_conn_t const *db_connection,
 }
 
 static void send_id_list(pg_conn_t const &db_connection,
-                         std::string const &table,
-                         osmium::index::IdSetSmall<osmid_t> const &ids)
+                         std::string const &table, idlist_t const &ids)
 {
     std::string data;
     for (auto const id : ids) {
@@ -71,13 +70,12 @@ static void send_id_list(pg_conn_t const &db_connection,
 }
 
 static void load_id_list(pg_conn_t const &db_connection,
-                         std::string const &table,
-                         osmium::index::IdSetSmall<osmid_t> *ids)
+                         std::string const &table, idlist_t *ids)
 {
     auto const res = db_connection.exec(
         fmt::format("SELECT DISTINCT id FROM {} ORDER BY id", table));
     for (int n = 0; n < res.num_tuples(); ++n) {
-        ids->set(osmium::string_to_object_id(res.get_value(n, 0)));
+        ids->push_back(osmium::string_to_object_id(res.get_value(n, 0)));
     }
 }
 
@@ -827,10 +825,9 @@ void middle_pgsql_t::node_delete(osmid_t osm_id)
     }
 }
 
-void middle_pgsql_t::get_node_parents(
-    osmium::index::IdSetSmall<osmid_t> const &changed_nodes,
-    osmium::index::IdSetSmall<osmid_t> *parent_ways,
-    osmium::index::IdSetSmall<osmid_t> *parent_relations) const
+void middle_pgsql_t::get_node_parents(idlist_t const &changed_nodes,
+                                      idlist_t *parent_ways,
+                                      idlist_t *parent_relations) const
 {
     util::timer_t timer;
 
@@ -923,9 +920,8 @@ INSERT INTO osm2pgsql_changed_relations
               parent_ways->size(), parent_relations->size());
 }
 
-void middle_pgsql_t::get_way_parents(
-    osmium::index::IdSetSmall<osmid_t> const &changed_ways,
-    osmium::index::IdSetSmall<osmid_t> *parent_relations) const
+void middle_pgsql_t::get_way_parents(idlist_t const &changed_ways,
+                                     idlist_t *parent_relations) const
 {
     util::timer_t timer;
 
diff --git a/src/middle-pgsql.hpp b/src/middle-pgsql.hpp
index 2e09e9b6b..701af4da6 100644
--- a/src/middle-pgsql.hpp
+++ b/src/middle-pgsql.hpp
@@ -24,6 +24,7 @@
 #include <osmium/index/nwr_array.hpp>
 
 #include "db-copy-mgr.hpp"
+#include "idlist.hpp"
 #include "middle.hpp"
 #include "pgsql.hpp"
 
@@ -117,14 +118,11 @@ struct middle_pgsql_t : public middle_t
     void after_ways() override;
     void after_relations() override;
 
-    void get_node_parents(
-        osmium::index::IdSetSmall<osmid_t> const &changed_nodes,
-        osmium::index::IdSetSmall<osmid_t> *parent_ways,
-        osmium::index::IdSetSmall<osmid_t> *parent_relations) const override;
+    void get_node_parents(idlist_t const &changed_nodes, idlist_t *parent_ways,
+                          idlist_t *parent_relations) const override;
 
-    void get_way_parents(
-        osmium::index::IdSetSmall<osmid_t> const &changed_ways,
-        osmium::index::IdSetSmall<osmid_t> *parent_relations) const override;
+    void get_way_parents(idlist_t const &changed_ways,
+                         idlist_t *parent_relations) const override;
 
     class table_desc
     {
diff --git a/src/middle.hpp b/src/middle.hpp
index 00b323a7e..832550baf 100644
--- a/src/middle.hpp
+++ b/src/middle.hpp
@@ -10,12 +10,12 @@
  * For a full list of authors see the git log.
  */
 
-#include <osmium/index/id_set.hpp>
 #include <osmium/memory/buffer.hpp>
 #include <osmium/osm/entity_bits.hpp>
 
 #include <memory>
 
+#include "idlist.hpp"
 #include "osmtypes.hpp"
 #include "thread-pool.hpp"
 
@@ -149,16 +149,14 @@ class middle_t
 #endif
     }
 
-    virtual void get_node_parents(
-        osmium::index::IdSetSmall<osmid_t> const & /*changed_nodes*/,
-        osmium::index::IdSetSmall<osmid_t> * /*parent_ways*/,
-        osmium::index::IdSetSmall<osmid_t> * /*parent_relations*/) const
+    virtual void get_node_parents(idlist_t const & /*changed_nodes*/,
+                                  idlist_t * /*parent_ways*/,
+                                  idlist_t * /*parent_relations*/) const
     {
     }
 
-    virtual void get_way_parents(
-        osmium::index::IdSetSmall<osmid_t> const & /*changed_ways*/,
-        osmium::index::IdSetSmall<osmid_t> * /*parent_relations*/) const
+    virtual void get_way_parents(idlist_t const & /*changed_ways*/,
+                                 idlist_t * /*parent_relations*/) const
     {
     }
 
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 510746be0..030c0055a 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -998,7 +998,7 @@ void output_flex_t::select_relation_members()
                     "integer way ids."};
             }
 
-            m_stage2_way_ids->set(id);
+            m_stage2_way_ids->push_back(id);
         });
 
     lua_pop(lua_state(), 2); // return value (a table), ways field (a table)
@@ -1486,7 +1486,7 @@ void output_flex_t::init_lua(std::string const &filename)
     lua_remove(lua_state(), 1); // global "osm2pgsql"
 }
 
-idset_t const &output_flex_t::get_marked_way_ids()
+idlist_t const &output_flex_t::get_marked_way_ids()
 {
     if (m_stage2_way_ids->empty()) {
         log_info("Skipping stage 1c (no marked ways).");
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index b64d15e13..d8e07d274 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -16,9 +16,9 @@
 #include "flex-table-column.hpp"
 #include "flex-table.hpp"
 #include "geom.hpp"
+#include "idlist.hpp"
 #include "output.hpp"
 
-#include <osmium/index/id_set.hpp>
 #include <osmium/osm/item_type.hpp>
 
 #include <lua.hpp>
@@ -35,8 +35,6 @@ class geom_transform_t;
 class thread_pool_t;
 struct options_t;
 
-using idset_t = osmium::index::IdSetSmall<osmid_t>;
-
 /**
  * When C++ code is called from the Lua code we sometimes need to know
  * in what context this happens. These are the possible contexts.
@@ -128,7 +126,7 @@ class output_flex_t : public output_t
 
     void wait() override;
 
-    idset_t const &get_marked_way_ids() override;
+    idlist_t const &get_marked_way_ids() override;
     void reprocess_marked() override;
 
     void pending_way(osmid_t id) override;
@@ -295,7 +293,7 @@ class output_flex_t : public output_t
 
     // This is shared between all clones of the output and must only be
     // accessed while protected using the lua_mutex.
-    std::shared_ptr<idset_t> m_stage2_way_ids = std::make_shared<idset_t>();
+    std::shared_ptr<idlist_t> m_stage2_way_ids = std::make_shared<idlist_t>();
 
     std::shared_ptr<db_copy_thread_t> m_copy_thread;
 
diff --git a/src/output.hpp b/src/output.hpp
index 847dc3662..d380de3e6 100644
--- a/src/output.hpp
+++ b/src/output.hpp
@@ -16,8 +16,8 @@
  * Common output layer interface.
  */
 
-#include <osmium/index/id_set.hpp>
-
+#include "idlist.hpp"
+#include "options.hpp"
 #include "osmtypes.hpp"
 #include "output-requirements.hpp"
 
@@ -68,9 +68,9 @@ class output_t
 
     virtual void wait() {}
 
-    virtual osmium::index::IdSetSmall<osmid_t> const &get_marked_way_ids()
+    virtual idlist_t const &get_marked_way_ids()
     {
-        static osmium::index::IdSetSmall<osmid_t> const ids{};
+        static idlist_t const ids{};
         return ids;
     }
 

From 3b7fdc5dc07954855b2589c6e462b0290f3a55db Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 19 Aug 2023 15:38:39 +0200
Subject: [PATCH 090/430] Remove unnecessary copy of idlist

---
 src/dependency-manager.cpp | 14 --------------
 src/dependency-manager.hpp | 14 ++++++++++----
 src/idlist.cpp             |  2 +-
 src/idlist.hpp             |  2 +-
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/dependency-manager.cpp b/src/dependency-manager.cpp
index 534d42bfc..7ea433104 100644
--- a/src/dependency-manager.cpp
+++ b/src/dependency-manager.cpp
@@ -100,17 +100,3 @@ bool full_dependency_manager_t::has_pending() const noexcept
 {
     return !m_ways_pending_tracker.empty() || !m_rels_pending_tracker.empty();
 }
-
-idlist_t full_dependency_manager_t::get_ids(idlist_t *tracker)
-{
-    tracker->sort_unique();
-
-    idlist_t list;
-    list.reserve(tracker->size());
-
-    std::copy(tracker->cbegin(), tracker->cend(), std::back_inserter(list));
-
-    tracker->clear();
-
-    return list;
-}
diff --git a/src/dependency-manager.hpp b/src/dependency-manager.hpp
index e5271e89e..4902f1035 100644
--- a/src/dependency-manager.hpp
+++ b/src/dependency-manager.hpp
@@ -115,17 +115,23 @@ class full_dependency_manager_t : public dependency_manager_t
 
     idlist_t get_pending_way_ids() override
     {
-        return get_ids(&m_ways_pending_tracker);
+        idlist_t list;
+        using std::swap;
+        swap(list, m_ways_pending_tracker);
+        list.sort_unique();
+        return list;
     }
 
     idlist_t get_pending_relation_ids() override
     {
-        return get_ids(&m_rels_pending_tracker);
+        idlist_t list;
+        using std::swap;
+        swap(list, m_rels_pending_tracker);
+        list.sort_unique();
+        return list;
     }
 
 private:
-    static idlist_t get_ids(idlist_t *tracker);
-
     std::shared_ptr<middle_t> m_object_store;
 
     /**
diff --git a/src/idlist.cpp b/src/idlist.cpp
index 7eec4f2b2..25a088613 100644
--- a/src/idlist.cpp
+++ b/src/idlist.cpp
@@ -20,7 +20,7 @@ void idlist_t::sort_unique()
     m_list.erase(last, m_list.end());
 }
 
-void idlist_t::merge_sorted(const idlist_t &other)
+void idlist_t::merge_sorted(idlist_t const &other)
 {
     std::vector<osmid_t> new_list;
 
diff --git a/src/idlist.hpp b/src/idlist.hpp
index a8523e820..c4828e503 100644
--- a/src/idlist.hpp
+++ b/src/idlist.hpp
@@ -75,7 +75,7 @@ class idlist_t
 
     void sort_unique();
 
-    void merge_sorted(const idlist_t &other);
+    void merge_sorted(idlist_t const &other);
 
 private:
     std::vector<osmid_t> m_list;

From 3c1257e42e5b3497463143016b17ba3b2c5247be Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 19 Aug 2023 16:03:32 +0200
Subject: [PATCH 091/430] Replace set_diff function by something a bit more
 sensible

---
 src/dependency-manager.cpp | 19 ++-----------------
 src/idlist.cpp             | 12 ++++++++++++
 src/idlist.hpp             |  6 ++++++
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/dependency-manager.cpp b/src/dependency-manager.cpp
index 7ea433104..3a600ff8a 100644
--- a/src/dependency-manager.cpp
+++ b/src/dependency-manager.cpp
@@ -39,27 +39,13 @@ void full_dependency_manager_t::after_nodes()
     m_changed_nodes.clear();
 }
 
-static idlist_t set_diff(idlist_t const &set, idlist_t const &to_be_removed)
-{
-    idlist_t new_set;
-
-    for (auto const id : set) {
-        if (!to_be_removed.get_binary_search(id)) {
-            new_set.push_back(id);
-        }
-    }
-
-    return new_set;
-}
-
 void full_dependency_manager_t::after_ways()
 {
     if (!m_changed_ways.empty()) {
         if (!m_ways_pending_tracker.empty()) {
             // Remove ids from changed ways in the input data from
             // m_ways_pending_tracker, because they have already been processed.
-            m_ways_pending_tracker =
-                set_diff(m_ways_pending_tracker, m_changed_ways);
+            m_ways_pending_tracker.remove_ids_if_in(m_changed_ways);
 
             // Add the list of pending way ids to the list of changed ways,
             // because we need the parents for them, too.
@@ -83,8 +69,7 @@ void full_dependency_manager_t::after_relations()
 {
     // Remove ids from changed relations in the input data from
     // m_rels_pending_tracker, because they have already been processed.
-    m_rels_pending_tracker =
-        set_diff(m_rels_pending_tracker, m_changed_relations);
+    m_rels_pending_tracker.remove_ids_if_in(m_changed_relations);
 
     m_changed_relations.clear();
 }
diff --git a/src/idlist.cpp b/src/idlist.cpp
index 25a088613..341ec4a6f 100644
--- a/src/idlist.cpp
+++ b/src/idlist.cpp
@@ -31,3 +31,15 @@ void idlist_t::merge_sorted(idlist_t const &other)
     using std::swap;
     swap(new_list, m_list);
 }
+
+void idlist_t::remove_ids_if_in(idlist_t const &other)
+{
+    std::vector<osmid_t> new_list;
+
+    new_list.reserve(m_list.size());
+    std::set_difference(m_list.cbegin(), m_list.cend(), other.m_list.cbegin(),
+                        other.m_list.cend(), std::back_inserter(new_list));
+
+    using std::swap;
+    swap(new_list, m_list);
+}
diff --git a/src/idlist.hpp b/src/idlist.hpp
index c4828e503..518c18515 100644
--- a/src/idlist.hpp
+++ b/src/idlist.hpp
@@ -77,6 +77,12 @@ class idlist_t
 
     void merge_sorted(idlist_t const &other);
 
+    /**
+     * Remove all ids in this list that are also in the other list. Both
+     * lists must be sorted.
+     */
+    void remove_ids_if_in(idlist_t const &other);
+
 private:
     std::vector<osmid_t> m_list;
 

From 60987b4f15856185bb04329a1b46d62f360400fa Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 21 Aug 2023 09:36:25 +0200
Subject: [PATCH 092/430] Remove potentially expensive copy operator from
 idlist_t

And fix the unnecessary copy this found.
---
 src/idlist.hpp  | 7 +++++++
 src/osmdata.cpp | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/idlist.hpp b/src/idlist.hpp
index 518c18515..79919c1cc 100644
--- a/src/idlist.hpp
+++ b/src/idlist.hpp
@@ -27,9 +27,16 @@ class idlist_t
     using value_type = osmid_t;
 
     idlist_t() = default;
+    ~idlist_t() noexcept = default;
 
     idlist_t(std::initializer_list<osmid_t> ids) : m_list(ids) {}
 
+    idlist_t(idlist_t const &) = delete;
+    idlist_t &operator=(idlist_t const &) = delete;
+
+    idlist_t(idlist_t &&) = default;
+    idlist_t &operator=(idlist_t &&) = default;
+
     bool empty() const noexcept { return m_list.empty(); }
 
     std::size_t size() const noexcept { return m_list.size(); }
diff --git a/src/osmdata.cpp b/src/osmdata.cpp
index 6051194b3..30e623e22 100644
--- a/src/osmdata.cpp
+++ b/src/osmdata.cpp
@@ -364,7 +364,7 @@ void osmdata_t::process_dependents() const
     }
 
     // stage 1c processing: mark parent relations of marked objects as changed
-    auto marked_ways = m_output->get_marked_way_ids();
+    auto const &marked_ways = m_output->get_marked_way_ids();
     if (marked_ways.empty()) {
         return;
     }

From f082a359aaa70857d3c8adf7395db6806848d1ab Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 21 Aug 2023 09:59:18 +0200
Subject: [PATCH 093/430] Remove unused binary search function

---
 src/idlist.hpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/idlist.hpp b/src/idlist.hpp
index 79919c1cc..72e98ba05 100644
--- a/src/idlist.hpp
+++ b/src/idlist.hpp
@@ -51,11 +51,6 @@ class idlist_t
 
     osmid_t operator[](std::size_t n) const noexcept { return m_list[n]; }
 
-    bool get_binary_search(osmid_t id) const noexcept
-    {
-        return std::binary_search(m_list.cbegin(), m_list.cend(), id);
-    }
-
     void clear() { m_list.clear(); }
 
     void push_back(osmid_t id) { m_list.push_back(id); }

From bde21d8ddbb3d72ee1ea6a8e184f6e63f09545ca Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 21 Aug 2023 10:00:10 +0200
Subject: [PATCH 094/430] Documentation and various code cleanups

---
 src/idlist.cpp       |  9 +++++++++
 src/idlist.hpp       | 36 +++++++++++++++++++++++++-----------
 src/middle.hpp       |  3 ++-
 src/pgsql-helper.cpp |  3 ++-
 4 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/src/idlist.cpp b/src/idlist.cpp
index 341ec4a6f..d90ab0643 100644
--- a/src/idlist.cpp
+++ b/src/idlist.cpp
@@ -10,9 +10,18 @@
 #include "idlist.hpp"
 
 #include <algorithm>
+#include <cassert>
 #include <iterator>
 #include <utility>
 
+osmid_t idlist_t::pop_id()
+{
+    assert(!m_list.empty());
+    auto const id = m_list.back();
+    m_list.pop_back();
+    return id;
+}
+
 void idlist_t::sort_unique()
 {
     std::sort(m_list.begin(), m_list.end());
diff --git a/src/idlist.hpp b/src/idlist.hpp
index 72e98ba05..e719f01a9 100644
--- a/src/idlist.hpp
+++ b/src/idlist.hpp
@@ -18,9 +18,14 @@
 
 #include "osmtypes.hpp"
 
-#include <cassert>
 #include <vector>
 
+/**
+ * A list of OSM object ids. Internally this is a vector of ids.
+ *
+ * Some operations are only allowed when the list of ids is sorted and
+ * without duplicates. Call sort_unique() to achieve this.
+ */
 class idlist_t
 {
 public:
@@ -51,20 +56,20 @@ class idlist_t
 
     osmid_t operator[](std::size_t n) const noexcept { return m_list[n]; }
 
-    void clear() { m_list.clear(); }
+    void clear() noexcept { m_list.clear(); }
 
     void push_back(osmid_t id) { m_list.push_back(id); }
 
     void reserve(std::size_t size) { m_list.reserve(size); }
 
-    osmid_t pop_id()
-    {
-        assert(!m_list.empty());
-        auto const id = m_list.back();
-        m_list.pop_back();
-        return id;
-    }
+    /**
+     * Remove id at the end of the list and return it.
+     *
+     * \pre \code !m_list.empty()) \endcode
+     */
+    osmid_t pop_id();
 
+    /// List are equal if they contain the same ids in the same order.
     friend bool operator==(idlist_t const &lhs, idlist_t const &rhs) noexcept
     {
         return lhs.m_list == rhs.m_list;
@@ -75,13 +80,22 @@ class idlist_t
         return !(lhs == rhs);
     }
 
+    /**
+     * Sort this list and remove duplicates.
+     */
     void sort_unique();
 
+    /**
+     * Merge other list into this one.
+     *
+     * \pre Both lists must be sorted and without duplicates.
+     */
     void merge_sorted(idlist_t const &other);
 
     /**
-     * Remove all ids in this list that are also in the other list. Both
-     * lists must be sorted.
+     * Remove all ids in this list that are also in the other list.
+     *
+     * \pre Both lists must be sorted and without duplicates.
      */
     void remove_ids_if_in(idlist_t const &other);
 
diff --git a/src/middle.hpp b/src/middle.hpp
index 832550baf..2edacfe5c 100644
--- a/src/middle.hpp
+++ b/src/middle.hpp
@@ -15,10 +15,11 @@
 
 #include <memory>
 
-#include "idlist.hpp"
 #include "osmtypes.hpp"
 #include "thread-pool.hpp"
 
+class idlist_t;
+
 struct options_t;
 struct output_requirements;
 
diff --git a/src/pgsql-helper.cpp b/src/pgsql-helper.cpp
index 8d367a6a5..b438594e4 100644
--- a/src/pgsql-helper.cpp
+++ b/src/pgsql-helper.cpp
@@ -14,8 +14,9 @@
 #include <cassert>
 
 idlist_t get_ids_from_result(pg_result_t const &result) {
-    idlist_t ids;
     assert(result.num_tuples() >= 0);
+
+    idlist_t ids;
     ids.reserve(static_cast<std::size_t>(result.num_tuples()));
 
     for (int i = 0; i < result.num_tuples(); ++i) {

From 3bd217dd37691919487c9cb35c5aae7ba135b220 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 21 Jan 2022 09:43:57 +0100
Subject: [PATCH 095/430] Use std::filesystem instead of boost::filesystem

This changes the minimum GCC version supported from 7 to 8, because
std::filesystem is only in glibc 8.
---
 .../actions/ubuntu-prerequisites/action.yml    |  3 +--
 .github/actions/win-install/action.yml         |  2 --
 .github/workflows/test-install.yml             |  3 +--
 CMakeLists.txt                                 |  2 +-
 README.md                                      |  9 ++++-----
 src/lua-setup.cpp                              |  6 +++---
 src/osm2pgsql.cpp                              | 18 ++++++++----------
 tests/common-cleanup.hpp                       |  8 +++-----
 8 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/.github/actions/ubuntu-prerequisites/action.yml b/.github/actions/ubuntu-prerequisites/action.yml
index 2299044c8..4acde6d75 100644
--- a/.github/actions/ubuntu-prerequisites/action.yml
+++ b/.github/actions/ubuntu-prerequisites/action.yml
@@ -16,8 +16,7 @@ runs:
     - name: Install software
       run: |
         sudo apt-get install -yq --no-install-suggests --no-install-recommends \
-          libboost-filesystem-dev \
-          libboost-system-dev \
+          libboost-dev \
           libbz2-dev \
           libexpat1-dev \
           libopencv-dev \
diff --git a/.github/actions/win-install/action.yml b/.github/actions/win-install/action.yml
index 82bcf0c84..c56613d89 100644
--- a/.github/actions/win-install/action.yml
+++ b/.github/actions/win-install/action.yml
@@ -7,10 +7,8 @@ runs:
     - name: Install packages
       run: |
         vcpkg install \
-          boost-filesystem:x64-windows \
           boost-geometry:x64-windows \
           boost-property-tree:x64-windows \
-          boost-system:x64-windows \
           bzip2:x64-windows \
           expat:x64-windows \
           libpq:x64-windows \
diff --git a/.github/workflows/test-install.yml b/.github/workflows/test-install.yml
index 2dd9acadd..81eeb3a36 100644
--- a/.github/workflows/test-install.yml
+++ b/.github/workflows/test-install.yml
@@ -38,8 +38,7 @@ jobs:
           sudo apt-get purge -yq postgresql*
           sudo apt-get update -qq
           sudo apt-get install -yq --no-install-suggests --no-install-recommends \
-            libboost-filesystem-dev \
-            libboost-system-dev \
+            libboost-dev \
             libbz2-dev \
             libexpat1-dev \
             liblua${LUA_VERSION}-dev \
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 168f4ac9a..151ddc89b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -202,7 +202,7 @@ else()
     message(STATUS "Building without Lua support")
 endif()
 
-find_package(Boost 1.50 REQUIRED COMPONENTS system filesystem)
+find_package(Boost 1.50 REQUIRED)
 include_directories(SYSTEM ${Boost_INCLUDE_DIR})
 
 find_package(PostgreSQL REQUIRED)
diff --git a/README.md b/README.md
index 3e26b1b3b..3e1eae328 100644
--- a/README.md
+++ b/README.md
@@ -48,8 +48,7 @@ Required libraries are
 * [proj](https://proj.org/)
 * [bzip2](http://www.bzip.org/)
 * [zlib](https://www.zlib.net/)
-* [Boost libraries](https://www.boost.org/), including geometry, system and
-  filesystem
+* [Boost libraries](https://www.boost.org/) (for boost geometry)
 * [nlohmann/json](https://json.nlohmann.me/)
 * [OpenCV](https://opencv.org/) (Optional, for generalization only)
 * [potrace](https://potrace.sourceforge.net/) (Optional, for generalization only)
@@ -73,7 +72,7 @@ It also requires access to a database server running
 
 Make sure you have installed the development packages for the libraries
 mentioned in the requirements section and a C++ compiler which supports C++17.
-We officially support gcc >= 7.0 and clang >= 8.
+We officially support gcc >= 8.0 and clang >= 8.
 
 To rebuild the included man page you'll need the [pandoc](https://pandoc.org/)
 tool.
@@ -83,8 +82,8 @@ First install the dependencies.
 On a Debian or Ubuntu system, this can be done with:
 
 ```sh
-sudo apt-get install make cmake g++ libboost-dev libboost-system-dev \
-  libboost-filesystem-dev libexpat1-dev zlib1g-dev libpotrace-dev \
+sudo apt-get install make cmake g++ libboost-dev \
+  libexpat1-dev zlib1g-dev libpotrace-dev \
   libopencv-dev libbz2-dev libpq-dev libproj-dev lua5.3 liblua5.3-dev \
   pandoc nlohmann-json3-dev pyosmium
 ```
diff --git a/src/lua-setup.cpp b/src/lua-setup.cpp
index bdc864787..6e9478158 100644
--- a/src/lua-setup.cpp
+++ b/src/lua-setup.cpp
@@ -13,7 +13,7 @@
 
 #include <lua.hpp>
 
-#include <boost/filesystem.hpp>
+#include <filesystem>
 
 void setup_lua_environment(lua_State *lua_state, std::string const &filename,
                            bool append_mode)
@@ -29,9 +29,9 @@ void setup_lua_environment(lua_State *lua_state, std::string const &filename,
     luaX_add_table_str(lua_state, "version", get_osm2pgsql_short_version());
 
     std::string dir_path =
-        boost::filesystem::path{filename}.parent_path().string();
+        std::filesystem::path{filename}.parent_path().string();
     if (!dir_path.empty()) {
-        dir_path += boost::filesystem::path::preferred_separator;
+        dir_path += std::filesystem::path::preferred_separator;
     }
     luaX_add_table_str(lua_state, "config_dir", dir_path.c_str());
 
diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
index a0139ab78..a8b113169 100644
--- a/src/osm2pgsql.cpp
+++ b/src/osm2pgsql.cpp
@@ -24,9 +24,8 @@
 
 #include <osmium/util/memory.hpp>
 
-#include <boost/filesystem.hpp>
-
 #include <exception>
+#include <filesystem>
 #include <memory>
 #include <utility>
 
@@ -104,10 +103,9 @@ static void store_properties(properties_t *properties, options_t const &options)
         properties->set_string("flat_node_file", "");
     } else {
         properties->set_string(
-            "flat_node_file",
-            boost::filesystem::absolute(
-                boost::filesystem::path{options.flat_node_file})
-                .string());
+            "flat_node_file", std::filesystem::absolute(
+                                  std::filesystem::path{options.flat_node_file})
+                                  .string());
     }
 
     properties->set_string("prefix", options.prefix);
@@ -121,7 +119,7 @@ static void store_properties(properties_t *properties, options_t const &options)
     } else {
         properties->set_string(
             "style",
-            boost::filesystem::absolute(boost::filesystem::path{options.style})
+            std::filesystem::absolute(std::filesystem::path{options.style})
                 .string());
     }
 
@@ -192,8 +190,8 @@ static void check_and_update_flat_node_file(properties_t *properties,
         }
     } else {
         const auto absolute_path =
-            boost::filesystem::absolute(
-                boost::filesystem::path{options->flat_node_file})
+            std::filesystem::absolute(
+                std::filesystem::path{options->flat_node_file})
                 .string();
 
         if (flat_node_file_from_import.empty()) {
@@ -288,7 +286,7 @@ static void check_and_update_style_file(properties_t *properties,
     }
 
     const auto absolute_path =
-        boost::filesystem::absolute(boost::filesystem::path{options->style})
+        std::filesystem::absolute(std::filesystem::path{options->style})
             .string();
 
     if (absolute_path == style_file_from_import) {
diff --git a/tests/common-cleanup.hpp b/tests/common-cleanup.hpp
index e7ffa951f..a533ff04f 100644
--- a/tests/common-cleanup.hpp
+++ b/tests/common-cleanup.hpp
@@ -12,10 +12,9 @@
 
 #include "format.hpp"
 
+#include <filesystem>
 #include <string>
 
-#include <boost/filesystem.hpp>
-
 namespace testing::cleanup {
 
 /**
@@ -44,9 +43,8 @@ class file_t
             return;
         }
 
-        boost::system::error_code ec;
-        boost::filesystem::remove(m_filename, ec);
-        if (ec && warn) {
+        std::error_code ec;
+        if (!std::filesystem::remove(m_filename, ec) && warn) {
             fmt::print(stderr, "WARNING: Unable to remove \"{}\": {}\n",
                        m_filename, ec.message());
         }

From efb11cbe1266b3bd112abba7496ecc59091c6969 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 2 Apr 2024 14:22:41 +0200
Subject: [PATCH 096/430] Consistently use name m_db_connection in middle-pgsql

Instead of using m_sql_conn.
---
 src/middle-pgsql.cpp | 20 ++++++++++----------
 src/middle-pgsql.hpp |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index e441363e8..870bb3441 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -141,7 +141,7 @@ middle_pgsql_t::table_desc::table_desc(options_t const &options,
 
 void middle_query_pgsql_t::exec_sql(std::string const &sql_cmd) const
 {
-    m_sql_conn.exec(sql_cmd);
+    m_db_connection.exec(sql_cmd);
 }
 
 void middle_pgsql_t::table_desc::drop_table(
@@ -665,7 +665,7 @@ std::size_t middle_query_pgsql_t::get_way_node_locations_db(
 
     // get any remaining nodes from the DB
     // Nodes must have been written back at this point.
-    auto const res = m_sql_conn.exec_prepared("get_node_list", id_list());
+    auto const res = m_db_connection.exec_prepared("get_node_list", id_list());
     std::unordered_map<osmid_t, osmium::Location> locs;
     for (int i = 0; i < res.num_tuples(); ++i) {
         locs.emplace(osmium::string_to_object_id(res.get_value(i, 0)),
@@ -776,7 +776,7 @@ std::size_t middle_query_pgsql_t::get_way_node_locations_flatnodes(
 
 osmium::Location middle_query_pgsql_t::get_node_location_db(osmid_t id) const
 {
-    auto const res = m_sql_conn.exec_prepared("get_node", id);
+    auto const res = m_db_connection.exec_prepared("get_node", id);
     if (res.num_tuples() == 0) {
         return osmium::Location{};
     }
@@ -1026,7 +1026,7 @@ bool middle_query_pgsql_t::way_get(osmid_t id,
 {
     assert(buffer);
 
-    auto const res = m_sql_conn.exec_prepared("get_way", id);
+    auto const res = m_db_connection.exec_prepared("get_way", id);
 
     if (res.num_tuples() != 1) {
         return false;
@@ -1061,7 +1061,7 @@ middle_query_pgsql_t::rel_members_get(osmium::Relation const &rel,
 
         // ...and get those ways from database
         if (!way_ids.empty()) {
-            res = m_sql_conn.exec_prepared("get_way_list", way_ids());
+            res = m_db_connection.exec_prepared("get_way_list", way_ids());
             wayidspg = get_ids_from_result(res);
         }
     }
@@ -1178,7 +1178,7 @@ bool middle_query_pgsql_t::relation_get_format1(
 {
     assert(buffer);
 
-    auto const res = m_sql_conn.exec_prepared("get_rel", id);
+    auto const res = m_db_connection.exec_prepared("get_rel", id);
     if (res.num_tuples() != 1) {
         return false;
     }
@@ -1205,7 +1205,7 @@ bool middle_query_pgsql_t::relation_get_format2(
 {
     assert(buffer);
 
-    auto const res = m_sql_conn.exec_prepared("get_rel", id);
+    auto const res = m_db_connection.exec_prepared("get_rel", id);
 
     if (res.num_tuples() == 0) {
         return false;
@@ -1305,13 +1305,13 @@ middle_query_pgsql_t::middle_query_pgsql_t(
     std::shared_ptr<node_locations_t> cache,
     std::shared_ptr<node_persistent_cache> persistent_cache,
     middle_pgsql_options const &options)
-: m_sql_conn(connection_params, "middle.query"), m_cache(std::move(cache)),
+: m_db_connection(connection_params, "middle.query"), m_cache(std::move(cache)),
   m_persistent_cache(std::move(persistent_cache)), m_store_options(options)
 {
     // Disable JIT and parallel workers as they are known to cause
     // problems when accessing the intarrays.
-    m_sql_conn.set_config("jit_above_cost", "-1");
-    m_sql_conn.set_config("max_parallel_workers_per_gather", "0");
+    m_db_connection.set_config("jit_above_cost", "-1");
+    m_db_connection.set_config("max_parallel_workers_per_gather", "0");
 }
 
 static void table_setup(pg_conn_t const &db_connection,
diff --git a/src/middle-pgsql.hpp b/src/middle-pgsql.hpp
index 701af4da6..ffd55c22d 100644
--- a/src/middle-pgsql.hpp
+++ b/src/middle-pgsql.hpp
@@ -85,7 +85,7 @@ class middle_query_pgsql_t : public middle_query_t
     std::size_t get_way_node_locations_flatnodes(osmium::WayNodeList *nodes) const;
     std::size_t get_way_node_locations_db(osmium::WayNodeList *nodes) const;
 
-    pg_conn_t m_sql_conn;
+    pg_conn_t m_db_connection;
     std::shared_ptr<node_locations_t> m_cache;
     std::shared_ptr<node_persistent_cache> m_persistent_cache;
 

From 0343ae8036e0ea480c39c2b9185003cc562ba6c8 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 2 Apr 2024 14:26:02 +0200
Subject: [PATCH 097/430] Consistently use name m_db_connection in db-copy

Instead of using m_conn.
---
 src/db-copy.cpp | 15 ++++++++-------
 src/db-copy.hpp |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/db-copy.cpp b/src/db-copy.cpp
index a87a78dc6..bb3d97cf3 100644
--- a/src/db-copy.cpp
+++ b/src/db-copy.cpp
@@ -128,7 +128,8 @@ db_copy_thread_t::thread_t::thread_t(connection_params_t connection_params,
 void db_copy_thread_t::thread_t::operator()()
 {
     try {
-        m_conn = std::make_unique<pg_conn_t>(m_connection_params, "copy");
+        m_db_connection =
+            std::make_unique<pg_conn_t>(m_connection_params, "copy");
 
         // Disable sequential scan on database tables in the copy threads.
         // The copy threads only do COPYs (which are unaffected by this
@@ -136,7 +137,7 @@ void db_copy_thread_t::thread_t::operator()()
         // some reason PostgreSQL chooses in some cases not to use that index,
         // possibly because the DELETEs get a large list of ids to delete of
         // which many are not in the table which confuses the query planner.
-        m_conn->exec("SET enable_seqscan = off");
+        m_db_connection->exec("SET enable_seqscan = off");
 
         bool done = false;
         while (!done) {
@@ -167,7 +168,7 @@ void db_copy_thread_t::thread_t::operator()()
 
         finish_copy();
 
-        m_conn.reset();
+        m_db_connection.reset();
     } catch (std::runtime_error const &e) {
         log_error("DB copy thread failed: {}", e.what());
         std::exit(2); // NOLINT(concurrency-mt-unsafe)
@@ -181,13 +182,13 @@ void db_copy_thread_t::thread_t::write_to_db(db_cmd_copy_t *buffer)
         finish_copy();
     }
 
-    buffer->delete_data(m_conn.get());
+    buffer->delete_data(m_db_connection.get());
 
     if (!m_inflight) {
         start_copy(buffer->target);
     }
 
-    m_conn->copy_send(buffer->buffer, buffer->target->name());
+    m_db_connection->copy_send(buffer->buffer, buffer->target->name());
 }
 
 void db_copy_thread_t::thread_t::start_copy(
@@ -208,7 +209,7 @@ void db_copy_thread_t::thread_t::start_copy(
     }
 
     sql.push_back('\0');
-    m_conn->copy_start(sql.data());
+    m_db_connection->copy_start(sql.data());
 
     m_inflight = target;
 }
@@ -216,7 +217,7 @@ void db_copy_thread_t::thread_t::start_copy(
 void db_copy_thread_t::thread_t::finish_copy()
 {
     if (m_inflight) {
-        m_conn->copy_end(m_inflight->name());
+        m_db_connection->copy_end(m_inflight->name());
         m_inflight.reset();
     }
 }
diff --git a/src/db-copy.hpp b/src/db-copy.hpp
index 5ab4b56fa..b3b710e8a 100644
--- a/src/db-copy.hpp
+++ b/src/db-copy.hpp
@@ -301,7 +301,7 @@ class db_copy_thread_t
         void delete_rows(db_cmd_copy_t *buffer);
 
         connection_params_t m_connection_params;
-        std::unique_ptr<pg_conn_t> m_conn;
+        std::unique_ptr<pg_conn_t> m_db_connection;
 
         // Target for copy operation currently ongoing.
         std::shared_ptr<db_target_descr_t> m_inflight;

From ba56530125150c02f3756581dfeb412c96fd2e3b Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 2 Apr 2024 14:28:06 +0200
Subject: [PATCH 098/430] Consistently use name m_db_connection in table.[ch]pp

Instead of using m_sql_conn.
---
 src/table.cpp | 63 +++++++++++++++++++++++++++------------------------
 src/table.hpp |  2 +-
 2 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/src/table.cpp b/src/table.cpp
index f8de5b091..64c71d8af 100644
--- a/src/table.cpp
+++ b/src/table.cpp
@@ -54,25 +54,26 @@ table_t::table_t(table_t const &other,
     // if the other table has already started, then we want to execute
     // the same stuff to get into the same state. but if it hasn't, then
     // this would be premature.
-    if (other.m_sql_conn) {
+    if (other.m_db_connection) {
         connect();
         prepare();
     }
 }
 
-void table_t::teardown() { m_sql_conn.reset(); }
+void table_t::teardown() { m_db_connection.reset(); }
 
 void table_t::sync() { m_copy.sync(); }
 
 void table_t::connect()
 {
-    m_sql_conn = std::make_unique<pg_conn_t>(m_connection_params, "out.pgsql");
+    m_db_connection =
+        std::make_unique<pg_conn_t>(m_connection_params, "out.pgsql");
 }
 
 void table_t::start(connection_params_t const &connection_params,
                     std::string const &table_space)
 {
-    if (m_sql_conn) {
+    if (m_db_connection) {
         throw fmt_error("{} cannot start, its already started.",
                         m_target->name());
     }
@@ -88,11 +89,11 @@ void table_t::start(connection_params_t const &connection_params,
 
     // we are making a new table
     if (!m_append) {
-        m_sql_conn->exec("DROP TABLE IF EXISTS {} CASCADE", qual_name);
+        m_db_connection->exec("DROP TABLE IF EXISTS {} CASCADE", qual_name);
     }
 
     // These _tmp tables can be left behind if we run out of disk space.
-    m_sql_conn->exec("DROP TABLE IF EXISTS {}", qual_tmp_name);
+    m_db_connection->exec("DROP TABLE IF EXISTS {}", qual_tmp_name);
 
     //making a new table
     if (!m_append) {
@@ -128,10 +129,10 @@ void table_t::start(connection_params_t const &connection_params,
         sql += m_table_space;
 
         //create the table
-        m_sql_conn->exec(sql);
+        m_db_connection->exec(sql);
 
         if (m_srid != "4326") {
-            create_geom_check_trigger(*m_sql_conn, m_target->schema(),
+            create_geom_check_trigger(*m_db_connection, m_target->schema(),
                                       m_target->name(), "ST_IsValid(NEW.way)");
         }
     }
@@ -143,9 +144,9 @@ void table_t::prepare()
 {
     //let postgres cache this query as it will presumably happen a lot
     auto const qual_name = qualified_name(m_target->schema(), m_target->name());
-    m_sql_conn->exec("PREPARE get_wkb(int8) AS"
-                     " SELECT way FROM {} WHERE osm_id = $1",
-                     qual_name);
+    m_db_connection->exec("PREPARE get_wkb(int8) AS"
+                          " SELECT way FROM {} WHERE osm_id = $1",
+                          qual_name);
 }
 
 void table_t::generate_copy_column_list()
@@ -187,7 +188,7 @@ void table_t::stop(bool updateable, bool enable_hstore_index,
 
     if (!m_append) {
         if (m_srid != "4326") {
-            drop_geom_check_trigger(*m_sql_conn, m_target->schema(),
+            drop_geom_check_trigger(*m_db_connection, m_target->schema(),
                                     m_target->name());
         }
 
@@ -216,27 +217,29 @@ void table_t::stop(bool updateable, bool enable_hstore_index,
             sql += "way";
         }
 
-        m_sql_conn->exec(sql);
+        m_db_connection->exec(sql);
 
-        m_sql_conn->exec("DROP TABLE {}", qual_name);
-        m_sql_conn->exec(R"(ALTER TABLE {} RENAME TO "{}")", qual_tmp_name,
-                         m_target->name());
+        m_db_connection->exec("DROP TABLE {}", qual_name);
+        m_db_connection->exec(R"(ALTER TABLE {} RENAME TO "{}")", qual_tmp_name,
+                              m_target->name());
 
         log_info("Creating geometry index on table '{}'...", m_target->name());
 
         // Use fillfactor 100 for un-updatable imports
-        m_sql_conn->exec("CREATE INDEX ON {} USING GIST (way) {} {}", qual_name,
-                         (updateable ? "" : "WITH (fillfactor = 100)"),
-                         tablespace_clause(table_space_index));
+        m_db_connection->exec("CREATE INDEX ON {} USING GIST (way) {} {}",
+                              qual_name,
+                              (updateable ? "" : "WITH (fillfactor = 100)"),
+                              tablespace_clause(table_space_index));
 
         /* slim mode needs this to be able to apply diffs */
         if (updateable) {
             log_info("Creating osm_id index on table '{}'...",
                      m_target->name());
-            m_sql_conn->exec("CREATE INDEX ON {} USING BTREE (osm_id) {}",
-                             qual_name, tablespace_clause(table_space_index));
+            m_db_connection->exec("CREATE INDEX ON {} USING BTREE (osm_id) {}",
+                                  qual_name,
+                                  tablespace_clause(table_space_index));
             if (m_srid != "4326") {
-                create_geom_check_trigger(*m_sql_conn, m_target->schema(),
+                create_geom_check_trigger(*m_db_connection, m_target->schema(),
                                           m_target->name(),
                                           "ST_IsValid(NEW.way)");
             }
@@ -247,18 +250,18 @@ void table_t::stop(bool updateable, bool enable_hstore_index,
             log_info("Creating hstore indexes on table '{}'...",
                      m_target->name());
             if (m_hstore_mode != hstore_column::none) {
-                m_sql_conn->exec("CREATE INDEX ON {} USING GIN (tags) {}",
-                                 qual_name,
-                                 tablespace_clause(table_space_index));
+                m_db_connection->exec("CREATE INDEX ON {} USING GIN (tags) {}",
+                                      qual_name,
+                                      tablespace_clause(table_space_index));
             }
             for (auto const &hcolumn : m_hstore_columns) {
-                m_sql_conn->exec(R"(CREATE INDEX ON {} USING GIN ("{}") {})",
-                                 qual_name, hcolumn,
-                                 tablespace_clause(table_space_index));
+                m_db_connection->exec(
+                    R"(CREATE INDEX ON {} USING GIN ("{}") {})", qual_name,
+                    hcolumn, tablespace_clause(table_space_index));
             }
         }
         log_info("Analyzing table '{}'...", m_target->name());
-        analyze_table(*m_sql_conn, m_target->schema(), m_target->name());
+        analyze_table(*m_db_connection, m_target->schema(), m_target->name());
     }
     teardown();
 }
@@ -444,6 +447,6 @@ void table_t::escape_type(std::string const &value, ColumnType flags)
 
 pg_result_t table_t::get_wkb(osmid_t id)
 {
-    return m_sql_conn->exec_prepared_as_binary("get_wkb", id);
+    return m_db_connection->exec_prepared_as_binary("get_wkb", id);
 }
 
diff --git a/src/table.hpp b/src/table.hpp
index 3cfb8ab4a..a7a6ea8fa 100644
--- a/src/table.hpp
+++ b/src/table.hpp
@@ -73,7 +73,7 @@ class table_t
     connection_params_t m_connection_params;
     std::shared_ptr<db_target_descr_t> m_target;
     std::string m_type;
-    std::unique_ptr<pg_conn_t> m_sql_conn;
+    std::unique_ptr<pg_conn_t> m_db_connection;
     std::string m_srid;
     bool m_append;
     hstore_column m_hstore_mode;

From 978e525ecef112f4a342f828dd474a854cb95a09 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 28 Oct 2023 14:39:26 +0200
Subject: [PATCH 099/430] Dump some stats about memory usage of cache to debug
 log

---
 src/middle-pgsql.cpp   |  2 ++
 src/middle-ram.cpp     | 10 ++++++++++
 src/middle-ram.hpp     |  2 ++
 src/node-locations.cpp | 13 +++++++++++++
 src/node-locations.hpp |  3 +++
 5 files changed, 30 insertions(+)

diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index e441363e8..c00533823 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -1258,6 +1258,8 @@ void middle_pgsql_t::after_nodes()
         auto const &table = m_tables.nodes();
         analyze_table(m_db_connection, table.schema(), table.name());
     }
+
+    m_cache->log_stats();
 }
 
 void middle_pgsql_t::after_ways()
diff --git a/src/middle-ram.cpp b/src/middle-ram.cpp
index 5a7bd64b3..1f39b58f3 100644
--- a/src/middle-ram.cpp
+++ b/src/middle-ram.cpp
@@ -190,6 +190,16 @@ void middle_ram_t::relation(osmium::Relation const &relation)
     }
 }
 
+void middle_ram_t::after_nodes()
+{
+    assert(m_middle_state == middle_state::node);
+#ifndef NDEBUG
+    m_middle_state = middle_state::way;
+#endif
+
+    m_node_locations.log_stats();
+}
+
 osmium::Location middle_ram_t::get_node_location(osmid_t id) const
 {
     return m_node_locations.get(id);
diff --git a/src/middle-ram.hpp b/src/middle-ram.hpp
index 19c1245ab..1f4509fa9 100644
--- a/src/middle-ram.hpp
+++ b/src/middle-ram.hpp
@@ -60,6 +60,8 @@ class middle_ram_t : public middle_t, public middle_query_t
     void way(osmium::Way const &way) override;
     void relation(osmium::Relation const &) override;
 
+    void after_nodes() override;
+
     osmium::Location get_node_location(osmid_t id) const override;
 
     std::size_t nodes_get_list(osmium::WayNodeList *nodes) const override;
diff --git a/src/node-locations.cpp b/src/node-locations.cpp
index b85db687c..c0417df61 100644
--- a/src/node-locations.cpp
+++ b/src/node-locations.cpp
@@ -9,6 +9,8 @@
 
 #include "node-locations.hpp"
 
+#include "logging.hpp"
+
 // Workaround: This must be included before buffer_string.hpp due to a missing
 // include in the upstream code. https://github.com/mapbox/protozero/pull/104
 #include <protozero/config.hpp>
@@ -79,6 +81,17 @@ osmium::Location node_locations_t::get(osmid_t id) const
     return osmium::Location{};
 }
 
+void node_locations_t::log_stats()
+{
+    constexpr auto const mbyte = 1024 * 1024;
+    log_debug("Node locations cache:");
+    log_debug("  num locations stored: {}", m_count);
+    log_debug("  bytes overall: {}MB", used_memory() / mbyte);
+    log_debug("  data capacity: {}MB", m_data.capacity() / mbyte);
+    log_debug("  data size: {}MB", m_data.size() / mbyte);
+    log_debug("  index used memory: {}MB", m_index.used_memory() / mbyte);
+}
+
 void node_locations_t::clear()
 {
     m_data.clear();
diff --git a/src/node-locations.hpp b/src/node-locations.hpp
index 7de861fd4..4e4d9495b 100644
--- a/src/node-locations.hpp
+++ b/src/node-locations.hpp
@@ -71,6 +71,9 @@ class node_locations_t
         return m_data.capacity() + m_index.used_memory();
     }
 
+    /// Dump information about memory usage to debug log
+    void log_stats();
+
     /**
      * Clear the memory used by this object. The object can be reused after
      * that.

From 9dfa61eee1fd599ea7058b9fc911dc595eeb6667 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 3 Apr 2024 19:54:56 +0200
Subject: [PATCH 100/430] Replace add_row() by insert() in tests

As preparation for the removal of the add_row() function.
---
 tests/data/test_output_flex.lua            | 44 +++++++++++--------
 tests/data/test_output_flex_copy.lua       | 44 +++++++++++--------
 tests/data/test_output_flex_stage2.lua     | 12 +++---
 tests/data/test_output_flex_stage2_alt.lua |  8 ++--
 tests/data/test_output_flex_uni.lua        | 50 +++++++++++-----------
 tests/data/test_output_flex_validgeom.lua  | 13 +++---
 tests/data/test_output_flex_way.lua        | 18 ++++----
 7 files changed, 105 insertions(+), 84 deletions(-)

diff --git a/tests/data/test_output_flex.lua b/tests/data/test_output_flex.lua
index c25469168..175c77900 100644
--- a/tests/data/test_output_flex.lua
+++ b/tests/data/test_output_flex.lua
@@ -3,7 +3,7 @@ local tables = {}
 
 tables.point = osm2pgsql.define_node_table('osm2pgsql_test_point', {
     { column = 'tags', type = 'hstore' },
-    { column = 'geom', type = 'point' },
+    { column = 'geom', type = 'point', not_null = true },
 })
 
 tables.line = osm2pgsql.define_table{
@@ -12,7 +12,7 @@ tables.line = osm2pgsql.define_table{
     columns = {
         { column = 'tags', type = 'hstore' },
         { column = 'name', type = 'text' },
-        { column = 'geom', type = 'linestring' },
+        { column = 'geom', type = 'linestring', not_null = true },
     },
     cluster = 'auto'
 }
@@ -23,8 +23,8 @@ tables.polygon = osm2pgsql.define_table{
     columns = {
         { column = 'tags', type = 'hstore' },
         { column = 'name', type = 'text' },
-        { column = 'geom', type = 'geometry' },
-        { column = 'area', type = 'area' },
+        { column = 'geom', type = 'geometry', not_null = true },
+        { column = 'area', type = 'real' },
     }
 }
 
@@ -33,7 +33,7 @@ tables.route = osm2pgsql.define_table{
     ids = { type = 'relation', id_column = 'osm_id' },
     columns = {
         { column = 'tags', type = 'hstore' },
-        { column = 'geom', type = 'multilinestring' },
+        { column = 'geom', type = 'multilinestring', not_null = true },
     }
 }
 
@@ -85,8 +85,9 @@ function osm2pgsql.process_node(object)
         return
     end
 
-    tables.point:add_row({
-        tags = object.tags
+    tables.point:insert({
+        tags = object.tags,
+        geom = object:as_point()
     })
 end
 
@@ -96,15 +97,18 @@ function osm2pgsql.process_way(object)
     end
 
     if is_polygon(object.tags) then
-        tables.polygon:add_row({
+        local geom = object:as_polygon()
+        tables.polygon:insert({
             tags = object.tags,
             name = object.tags.name,
-            geom = { create = 'area' }
+            geom = geom,
+            area = geom:area()
         })
     else
-        tables.line:add_row({
+        tables.line:insert({
             tags = object.tags,
-            name = object.tags.name
+            name = object.tags.name,
+            geom = object:as_linestring()
         })
     end
 end
@@ -115,18 +119,22 @@ function osm2pgsql.process_relation(object)
     end
 
     if object.tags.type == 'multipolygon' or object.tags.type == 'boundary' then
-        tables.polygon:add_row({
-            tags = object.tags,
-            name = object.tags.name,
-            geom = { create = 'area', split_at = 'multi' }
-        })
+        local mgeom = object:as_multipolygon()
+        for sgeom in mgeom:geometries() do
+            tables.polygon:insert({
+                tags = object.tags,
+                name = object.tags.name,
+                geom = sgeom,
+                area = sgeom:area()
+            })
+        end
         return
     end
 
     if object.tags.type == 'route' then
-        tables.route:add_row({
+        tables.route:insert({
             tags = object.tags,
-            geom = { create = 'line' }
+            geom = object:as_multilinestring()
         })
     end
 end
diff --git a/tests/data/test_output_flex_copy.lua b/tests/data/test_output_flex_copy.lua
index c25469168..175c77900 100644
--- a/tests/data/test_output_flex_copy.lua
+++ b/tests/data/test_output_flex_copy.lua
@@ -3,7 +3,7 @@ local tables = {}
 
 tables.point = osm2pgsql.define_node_table('osm2pgsql_test_point', {
     { column = 'tags', type = 'hstore' },
-    { column = 'geom', type = 'point' },
+    { column = 'geom', type = 'point', not_null = true },
 })
 
 tables.line = osm2pgsql.define_table{
@@ -12,7 +12,7 @@ tables.line = osm2pgsql.define_table{
     columns = {
         { column = 'tags', type = 'hstore' },
         { column = 'name', type = 'text' },
-        { column = 'geom', type = 'linestring' },
+        { column = 'geom', type = 'linestring', not_null = true },
     },
     cluster = 'auto'
 }
@@ -23,8 +23,8 @@ tables.polygon = osm2pgsql.define_table{
     columns = {
         { column = 'tags', type = 'hstore' },
         { column = 'name', type = 'text' },
-        { column = 'geom', type = 'geometry' },
-        { column = 'area', type = 'area' },
+        { column = 'geom', type = 'geometry', not_null = true },
+        { column = 'area', type = 'real' },
     }
 }
 
@@ -33,7 +33,7 @@ tables.route = osm2pgsql.define_table{
     ids = { type = 'relation', id_column = 'osm_id' },
     columns = {
         { column = 'tags', type = 'hstore' },
-        { column = 'geom', type = 'multilinestring' },
+        { column = 'geom', type = 'multilinestring', not_null = true },
     }
 }
 
@@ -85,8 +85,9 @@ function osm2pgsql.process_node(object)
         return
     end
 
-    tables.point:add_row({
-        tags = object.tags
+    tables.point:insert({
+        tags = object.tags,
+        geom = object:as_point()
     })
 end
 
@@ -96,15 +97,18 @@ function osm2pgsql.process_way(object)
     end
 
     if is_polygon(object.tags) then
-        tables.polygon:add_row({
+        local geom = object:as_polygon()
+        tables.polygon:insert({
             tags = object.tags,
             name = object.tags.name,
-            geom = { create = 'area' }
+            geom = geom,
+            area = geom:area()
         })
     else
-        tables.line:add_row({
+        tables.line:insert({
             tags = object.tags,
-            name = object.tags.name
+            name = object.tags.name,
+            geom = object:as_linestring()
         })
     end
 end
@@ -115,18 +119,22 @@ function osm2pgsql.process_relation(object)
     end
 
     if object.tags.type == 'multipolygon' or object.tags.type == 'boundary' then
-        tables.polygon:add_row({
-            tags = object.tags,
-            name = object.tags.name,
-            geom = { create = 'area', split_at = 'multi' }
-        })
+        local mgeom = object:as_multipolygon()
+        for sgeom in mgeom:geometries() do
+            tables.polygon:insert({
+                tags = object.tags,
+                name = object.tags.name,
+                geom = sgeom,
+                area = sgeom:area()
+            })
+        end
         return
     end
 
     if object.tags.type == 'route' then
-        tables.route:add_row({
+        tables.route:insert({
             tags = object.tags,
-            geom = { create = 'line' }
+            geom = object:as_multilinestring()
         })
     end
 end
diff --git a/tests/data/test_output_flex_stage2.lua b/tests/data/test_output_flex_stage2.lua
index 3c129b7ba..9c55e3866 100644
--- a/tests/data/test_output_flex_stage2.lua
+++ b/tests/data/test_output_flex_stage2.lua
@@ -7,7 +7,7 @@ tables.highways = osm2pgsql.define_table{
     columns = {
         { column = 'tags',  type = 'hstore' },
         { column = 'refs',  type = 'text' },
-        { column = 'geom',  type = 'linestring', projection = 4326 },
+        { column = 'geom',  type = 'linestring', projection = 4326, not_null = true },
     }
 }
 
@@ -17,7 +17,7 @@ tables.routes = osm2pgsql.define_table{
     columns = {
         { column = 'tags',    type = 'hstore' },
         { column = 'members', type = 'text' },
-        { column = 'geom',    type = 'multilinestring', projection = 4326 },
+        { column = 'geom',    type = 'multilinestring', projection = 4326, not_null = true },
     }
 }
 
@@ -26,7 +26,7 @@ local w2r = {}
 function osm2pgsql.process_way(object)
     local row = {
         tags = object.tags,
-        geom = { create = 'line' }
+        geom = object:as_linestring()
     }
 
     local d = w2r[object.id]
@@ -40,7 +40,7 @@ function osm2pgsql.process_way(object)
         row.refs = table.concat(refs, ',')
     end
 
-    tables.highways:add_row(row)
+    tables.highways:insert(row)
 end
 
 function osm2pgsql.select_relation_members(relation)
@@ -65,10 +65,10 @@ function osm2pgsql.process_relation(object)
         end
     end
 
-    tables.routes:add_row({
+    tables.routes:insert({
         tags = object.tags,
         members = table.concat(mlist, ','),
-        geom = { create = 'line' }
+        geom = object:as_multilinestring()
     })
 end
 
diff --git a/tests/data/test_output_flex_stage2_alt.lua b/tests/data/test_output_flex_stage2_alt.lua
index 79d46dac8..6eedb9ac1 100644
--- a/tests/data/test_output_flex_stage2_alt.lua
+++ b/tests/data/test_output_flex_stage2_alt.lua
@@ -30,7 +30,7 @@ function osm2pgsql.process_way(object)
 
     local row = {
         tags = object.tags,
-        geom = { create = 'line' }
+        geom = object:as_linestring()
     }
 
     local d = w2r[object.id]
@@ -44,7 +44,7 @@ function osm2pgsql.process_way(object)
         row.refs = table.concat(refs, ',')
     end
 
-    tables.highways:add_row(row)
+    tables.highways:insert(row)
 end
 
 function osm2pgsql.select_relation_members(relation)
@@ -69,10 +69,10 @@ function osm2pgsql.process_relation(object)
         end
     end
 
-    tables.routes:add_row({
+    tables.routes:insert({
         tags = object.tags,
         members = table.concat(mlist, ','),
-        geom = { create = 'line' }
+        geom = object:as_multilinestring()
     })
 end
 
diff --git a/tests/data/test_output_flex_uni.lua b/tests/data/test_output_flex_uni.lua
index db58a8d22..2e4aaaa04 100644
--- a/tests/data/test_output_flex_uni.lua
+++ b/tests/data/test_output_flex_uni.lua
@@ -6,7 +6,7 @@ local table1idcol = osm2pgsql.define_table{
     columns = {
         { column = 'orig_id', type = 'int8' },
         { column = 'tags', type = 'hstore' },
-        { column = 'geom', type = 'geometry' },
+        { column = 'geom', type = 'geometry', not_null = true },
     }
 }
 
@@ -16,7 +16,7 @@ local table2idcol = osm2pgsql.define_table{
     ids = { type = 'any', type_column = 'x_type', id_column = 'x_id' },
     columns = {
         { column = 'tags', type = 'hstore' },
-        { column = 'geom', type = 'geometry' },
+        { column = 'geom', type = 'geometry', not_null = true },
     }
 }
 
@@ -29,14 +29,14 @@ function osm2pgsql.process_node(object)
         return
     end
 
-    table1idcol:add_row({
+    table1idcol:insert({
         orig_id = object.id,
         tags = object.tags,
-        geom = { create = 'point' }
+        geom = object:as_point()
     })
-    table2idcol:add_row({
+    table2idcol:insert({
         tags = object.tags,
-        geom = { create = 'point' }
+        geom = object:as_point()
     })
 end
 
@@ -46,40 +46,42 @@ function osm2pgsql.process_way(object)
     end
 
     if object.tags.building then
-        table1idcol:add_row({
+        table1idcol:insert({
             orig_id = object.id,
             tags = object.tags,
-            geom = { create = 'area' }
+            geom = object:as_polygon()
         })
-        table2idcol:add_row({
+        table2idcol:insert({
             tags = object.tags,
-            geom = { create = 'area' }
+            geom = object:as_polygon()
         })
     else
-        table1idcol:add_row({
+        table1idcol:insert({
             orig_id = object.id,
             tags = object.tags,
-            geom = { create = 'line' }
+            geom = object:as_linestring()
         })
-        table2idcol:add_row({
+        table2idcol:insert({
             tags = object.tags,
-            geom = { create = 'line' }
+            geom = object:as_linestring()
         })
     end
 end
 
 function osm2pgsql.process_relation(object)
     if object.tags.type == 'multipolygon' then
-        table1idcol:add_row({
-            orig_id = object.id,
-            tags = object.tags,
-            geom = { create = 'area', split_at = 'multi' }
-        })
-        table2idcol:add_row({
-            tags = object.tags,
-            geom = { create = 'area', split_at = 'multi' }
-        })
-        return
+        local mgeom = object:as_multipolygon()
+        for sgeom in mgeom:geometries() do
+            table1idcol:insert({
+                orig_id = object.id,
+                tags = object.tags,
+                geom = sgeom
+            })
+            table2idcol:insert({
+                tags = object.tags,
+                geom = sgeom
+            })
+        end
     end
 end
 
diff --git a/tests/data/test_output_flex_validgeom.lua b/tests/data/test_output_flex_validgeom.lua
index abb2a789f..afdd8944b 100644
--- a/tests/data/test_output_flex_validgeom.lua
+++ b/tests/data/test_output_flex_validgeom.lua
@@ -16,14 +16,17 @@ function osm2pgsql.process_way(object)
         return
     end
 
-    polygons:add_row({
-        geom = { create = 'area' }
+    polygons:insert({
+        geom = object:as_polygon()
     })
 end
 
 function osm2pgsql.process_relation(object)
-    polygons:add_row({
-        geom = { create = 'area', split_at='multi' }
-    })
+    local mgeom = object:as_multipolygon()
+    for sgeom in mgeom:geometries() do
+        polygons:insert({
+            geom = sgeom
+        })
+    end
 end
 
diff --git a/tests/data/test_output_flex_way.lua b/tests/data/test_output_flex_way.lua
index 24e7b3d47..873e7c983 100644
--- a/tests/data/test_output_flex_way.lua
+++ b/tests/data/test_output_flex_way.lua
@@ -3,19 +3,19 @@ local tables = {}
 
 tables.t1 = osm2pgsql.define_way_table('osm2pgsql_test_t1', {
     { column = 'tags', type = 'hstore' },
-    { column = 'geom', type = 'linestring' },
+    { column = 'geom', type = 'linestring', not_null = true },
 })
 
 tables.t2 = osm2pgsql.define_way_table('osm2pgsql_test_t2', {
     { column = 'tags', type = 'hstore' },
     { column = 'rel_ids', type = 'text' },
-    { column = 'geom', type = 'linestring' },
+    { column = 'geom', type = 'linestring', not_null = true },
 })
 
 tables.tboth = osm2pgsql.define_way_table('osm2pgsql_test_tboth', {
     { column = 'tags', type = 'hstore' },
     { column = 'rel_ids', type = 'text' },
-    { column = 'geom', type = 'linestring' },
+    { column = 'geom', type = 'linestring', not_null = true },
 })
 
 local w2r = {}
@@ -33,28 +33,28 @@ end
 
 function osm2pgsql.process_way(object)
     if object.tags.t1 then
-        tables.t1:add_row{
+        tables.t1:insert{
             tags = object.tags,
-            geom = { create = 'line' }
+            geom = object:as_linestring()
         }
     end
 
     if osm2pgsql.stage == 2 and object.tags.t2 then
         local ids = get_ids(w2r[object.id])
         if ids then
-            tables.t2:add_row{
+            tables.t2:insert{
                 rel_ids = ids,
-                geom = { create = 'line' }
+                geom = object:as_linestring()
             }
         end
     end
 
     if object.tags.tboth then
         local ids = get_ids(w2r[object.id])
-        tables.tboth:add_row{
+        tables.tboth:insert{
             tags = object.tags,
             rel_ids = ids,
-            geom = { create = 'line' }
+            geom = object:as_linestring()
         }
     end
 end

From 6c949b091967c8a2b3dabd99af7943d93613ca41 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 27 Mar 2024 22:32:31 +0100
Subject: [PATCH 101/430] Remove gazetteer output and
 --with-forward-dependencies option

---
 man/osm2pgsql.1                               |  11 +-
 man/osm2pgsql.md                              |  15 +-
 src/CMakeLists.txt                            |   2 -
 src/command-line-parser.cpp                   |  29 +-
 src/gazetteer-style.cpp                       | 576 -------------
 src/gazetteer-style.hpp                       | 196 -----
 src/middle-pgsql.cpp                          |   7 +-
 src/options.hpp                               |   6 -
 src/osm2pgsql.cpp                             |   7 +-
 src/osmdata.cpp                               |   5 +-
 src/osmdata.hpp                               |   1 -
 src/output-gazetteer.cpp                      | 221 -----
 src/output-gazetteer.hpp                      | 108 ---
 src/output.cpp                                |   8 +-
 tests/CMakeLists.txt                          |   1 -
 .../regression/forward_dependencies.feature   |  25 -
 tests/bdd/regression/gazetteer.feature        |  60 --
 tests/bdd/steps/steps_execute.py              |   2 +-
 tests/common-import.hpp                       |   4 +-
 tests/common-options.hpp                      |   7 -
 tests/data/gazetteer-test.style               | 237 ------
 tests/test-db-copy-thread.cpp                 |  95 ---
 tests/test-options-parse.cpp                  |  16 -
 tests/test-output-gazetteer.cpp               | 792 ------------------
 24 files changed, 17 insertions(+), 2414 deletions(-)
 delete mode 100644 src/gazetteer-style.cpp
 delete mode 100644 src/gazetteer-style.hpp
 delete mode 100644 src/output-gazetteer.cpp
 delete mode 100644 src/output-gazetteer.hpp
 delete mode 100644 tests/bdd/regression/gazetteer.feature
 delete mode 100644 tests/data/gazetteer-test.style
 delete mode 100644 tests/test-output-gazetteer.cpp

diff --git a/man/osm2pgsql.1 b/man/osm2pgsql.1
index c04458ff7..9be357d18 100644
--- a/man/osm2pgsql.1
+++ b/man/osm2pgsql.1
@@ -224,14 +224,12 @@ too.
 .TP
 -O, --output=OUTPUT
 Specifies the output to use.
-Currently osm2pgsql supports \f[B]pgsql\f[R], \f[B]flex\f[R],
-\f[B]gazetteer\f[R] and \f[B]null\f[R].
+Currently osm2pgsql supports \f[B]pgsql\f[R], \f[B]flex\f[R], and
+\f[B]null\f[R].
 \f[B]pgsql\f[R] is the default output still available for backwards
 compatibility.
 New setups should use the \f[B]flex\f[R] output which allows for a much
 more flexible configuration.
-The \f[B]gazetteer\f[R] output is intended for geocoding with Nominatim
-only.
 The \f[B]null\f[R] output does not write anything and is only useful for
 testing or with \f[B]--slim\f[R] for creating slim tables.
 .TP
@@ -346,11 +344,6 @@ index after the other.
 .TP
 --number-processes=THREADS
 Specifies the number of parallel threads used for certain operations.
-.TP
---with-forward-dependencies=BOOL
-Propagate changes from nodes to ways and node/way members to relations
-(Default: \f[V]true\f[R]).
-This option is deprecated.
 .SH SEE ALSO
 .IP \[bu] 2
 osm2pgsql website (https://osm2pgsql.org)
diff --git a/man/osm2pgsql.md b/man/osm2pgsql.md
index abe510b2a..2fa096383 100644
--- a/man/osm2pgsql.md
+++ b/man/osm2pgsql.md
@@ -195,12 +195,11 @@ mandatory for short options too.
 
 -O, \--output=OUTPUT
 :   Specifies the output to use. Currently osm2pgsql supports **pgsql**,
-    **flex**, **gazetteer** and **null**. **pgsql** is
-    the default output still available for backwards compatibility. New
-    setups should use the **flex** output which allows for a much more flexible
-    configuration. The **gazetteer** output is intended for geocoding with
-    Nominatim only. The **null** output does not write anything and is only
-    useful for testing or with **\--slim** for creating slim tables.
+    **flex**, and **null**. **pgsql** is the default output still available for
+    backwards compatibility. New setups should use the **flex** output which
+    allows for a much more flexible configuration. The **null** output does not
+    write anything and is only useful for testing or with **\--slim** for
+    creating slim tables.
 
 -S, \--style=FILE
 :   The style file. This specifies how the data is imported into the database,
@@ -307,10 +306,6 @@ mandatory for short options too.
 \--number-processes=THREADS
 :   Specifies the number of parallel threads used for certain operations.
 
-\--with-forward-dependencies=BOOL
-:   Propagate changes from nodes to ways and node/way members to relations
-    (Default: `true`). This option is deprecated.
-
 # SEE ALSO
 
 * [osm2pgsql website](https://osm2pgsql.org)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8ddf41219..ea1cfe979 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,7 +13,6 @@ target_sources(osm2pgsql_lib PRIVATE
   dependency-manager.cpp
   expire-tiles.cpp
   expire-output.cpp
-  gazetteer-style.cpp
   geom.cpp
   geom-box.cpp
   geom-from-osm.cpp
@@ -29,7 +28,6 @@ target_sources(osm2pgsql_lib PRIVATE
   node-persistent-cache.cpp
   ordered-index.cpp
   osmdata.cpp
-  output-gazetteer.cpp
   output-null.cpp
   output-pgsql.cpp
   output.cpp
diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index d6a728ef5..370a2fc37 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -333,8 +333,7 @@ options_t parse_command_line(int argc, char *argv[])
 
     // --output
     app.add_option("-O,--output", options.output_backend)
-        ->description("Set output ('pgsql' (default), 'flex', 'gazetteer' "
-                      "(deprecated), 'null').")
+        ->description("Set output ('pgsql' (default), 'flex', 'null').")
         ->type_name("OUTPUT")
         ->group("Output options");
 
@@ -635,29 +634,6 @@ options_t parse_command_line(int argc, char *argv[])
         ->option_text("TYPE")
         ->group("Deprecated options");
 
-    // --with-forward-dependencies
-    app.add_option_function<std::string>(
-           "--with-forward-dependencies",
-           [&](std::string const &arg) {
-               log_warn("The option --with-forward-dependencies is deprecated "
-                        "and will soon be removed.");
-               if (arg == "false") {
-                   options.with_forward_dependencies = false;
-                   return;
-               }
-               if (arg == "true") {
-                   options.with_forward_dependencies = true;
-                   return;
-               }
-               throw fmt_error(
-                   "Unknown value for --with-forward-dependencies option: {}",
-                   arg);
-           })
-        ->description("Propagate changes from nodes to ways and node/way "
-                      "members to relations (default: true).")
-        ->option_text("BOOL")
-        ->group("Deprecated options");
-
     try {
         app.parse(argc, argv);
     } catch (...) {
@@ -718,9 +694,6 @@ options_t parse_command_line(int argc, char *argv[])
 
     if (options.output_backend == "flex") {
         check_options_output_flex(app);
-    } else if (options.output_backend == "gazetteer") {
-        log_warn(
-            "The 'gazetteer' output is deprecated and will soon be removed.");
     } else if (options.output_backend == "null") {
         check_options_output_null(app);
     } else if (options.output_backend == "pgsql" ||
diff --git a/src/gazetteer-style.cpp b/src/gazetteer-style.cpp
deleted file mode 100644
index 47bdd9e2b..000000000
--- a/src/gazetteer-style.cpp
+++ /dev/null
@@ -1,576 +0,0 @@
-/**
- * SPDX-License-Identifier: GPL-2.0-or-later
- *
- * This file is part of osm2pgsql (https://osm2pgsql.org/).
- *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
- * For a full list of authors see the git log.
- */
-
-#include <algorithm>
-#include <array>
-#include <cstring>
-#include <stdexcept>
-
-#include <boost/property_tree/json_parser.hpp>
-#include <osmium/osm.hpp>
-
-#include "domain-matcher.hpp"
-#include "format.hpp"
-#include "gazetteer-style.hpp"
-#include "logging.hpp"
-#include "pgsql.hpp"
-#include "wkb.hpp"
-
-namespace pt = boost::property_tree;
-
-void db_deleter_place_t::delete_rows(std::string const &table,
-                                     std::string const &, pg_conn_t *conn)
-{
-    assert(!m_deletables.empty());
-
-    fmt::memory_buffer sql;
-    // Need a VALUES line for each deletable: type (3 bytes), id (15 bytes),
-    // class list (20 bytes), braces etc. (5 bytes). And additional space for
-    // the remainder of the SQL command.
-    sql.reserve(m_deletables.size() * 43 + 200);
-
-    fmt::format_to(std::back_inserter(sql), "DELETE FROM {} p USING (VALUES ",
-                   table);
-
-    for (auto const &item : m_deletables) {
-        fmt::format_to(std::back_inserter(sql), "('{}',{},", item.osm_type,
-                       item.osm_id);
-        if (item.classes.empty()) {
-            fmt::format_to(std::back_inserter(sql), "ARRAY[]::text[]),");
-        } else {
-            fmt::format_to(std::back_inserter(sql), "ARRAY[{}]),",
-                           item.classes);
-        }
-    }
-
-    // remove the final comma
-    sql.resize(sql.size() - 1);
-
-    fmt::format_to(std::back_inserter(sql),
-                   ") AS t (osm_type, osm_id, classes) WHERE"
-                   " p.osm_type = t.osm_type AND p.osm_id = t.osm_id"
-                   " AND NOT p.class = ANY(t.classes)");
-
-    conn->exec(fmt::to_string(sql));
-}
-
-void gazetteer_style_t::clear()
-{
-    m_main.clear();
-    m_names.clear();
-    m_extra.clear();
-    m_address.clear();
-    m_operator = nullptr;
-    m_admin_level = MAX_ADMINLEVEL;
-}
-
-std::string gazetteer_style_t::class_list() const
-{
-    fmt::memory_buffer buf;
-
-    for (auto const &m : m_main) {
-        fmt::format_to(std::back_inserter(buf), FMT_STRING("'{}',"),
-                       std::get<0>(m));
-    }
-
-    if (buf.size() > 0) {
-        buf.resize(buf.size() - 1);
-    }
-
-    return fmt::to_string(buf);
-}
-
-void gazetteer_style_t::load_style(std::string const &filename)
-{
-    log_info("Parsing gazetteer style file '{}'.", filename);
-    pt::ptree root;
-
-    pt::read_json(filename, root);
-
-    for (auto const &entry : root) {
-        for (auto const &tag : entry.second.get_child("keys")) {
-            for (auto const &value : entry.second.get_child("values")) {
-                add_style_entry(tag.second.data(), value.first,
-                                parse_flags(value.second.data()));
-            }
-        }
-    }
-}
-
-gazetteer_style_t::flag_t gazetteer_style_t::parse_flags(std::string const &str)
-{
-    flag_t out = 0;
-
-    std::string::size_type start = 0;
-
-    while (start != std::string::npos) {
-        auto const end = str.find(',', start);
-
-        std::string item;
-
-        if (end == std::string::npos) {
-            item = str.substr(start);
-            start = std::string::npos;
-        } else {
-            item = str.substr(start, end - start);
-            start = end + 1;
-        }
-
-        if (item == "skip") {
-            return 0;
-        }
-
-        if (item == "main") {
-            out |= SF_MAIN;
-        } else if (item == "with_name_key") {
-            out |= SF_MAIN_NAMED_KEY;
-        } else if (item == "with_name") {
-            out |= SF_MAIN_NAMED;
-        } else if (item == "fallback") {
-            out |= SF_MAIN_FALLBACK;
-        } else if (item == "operator") {
-            out |= SF_MAIN_OPERATOR;
-            m_any_operator_matches = true;
-        } else if (item == "name") {
-            out |= SF_NAME;
-        } else if (item == "ref") {
-            out |= SF_REF;
-        } else if (item == "address") {
-            out |= SF_ADDRESS;
-        } else if (item == "house") {
-            out |= SF_ADDRESS_POINT;
-        } else if (item == "postcode") {
-            out |= SF_POSTCODE;
-        } else if (item == "country") {
-            out |= SF_COUNTRY;
-        } else if (item == "extra") {
-            out |= SF_EXTRA;
-        } else if (item == "interpolation") {
-            out |= SF_INTERPOLATION;
-        } else {
-            throw std::runtime_error{"Unknown flag in style file."};
-        }
-    }
-
-    return out;
-}
-
-bool gazetteer_style_t::add_metadata_style_entry(std::string const &key)
-{
-    if (key == "osm_version") {
-        m_metadata_fields.set_version(true);
-    } else if (key == "osm_timestamp") {
-        m_metadata_fields.set_timestamp(true);
-    } else if (key == "osm_changeset") {
-        m_metadata_fields.set_changeset(true);
-    } else if (key == "osm_uid") {
-        m_metadata_fields.set_uid(true);
-    } else if (key == "osm_user") {
-        m_metadata_fields.set_user(true);
-    } else {
-        return false;
-    }
-    return true;
-}
-
-void gazetteer_style_t::add_style_entry(std::string const &key,
-                                        std::string const &value,
-                                        gazetteer_style_t::flag_t flags)
-{
-    if (key.empty()) {
-        if (value.empty()) {
-            m_default = flags;
-        } else {
-            m_matcher.emplace_back(value, flags, matcher_t::MT_VALUE);
-        }
-        return;
-    }
-
-    // prefix: works on empty key only
-    if (key[key.size() - 1] == '*') {
-        if (key.size() == 1) {
-            throw std::runtime_error{"Style error. Ambiguous key '*'."};
-        }
-        if (!value.empty()) {
-            throw std::runtime_error{
-                "Style error. Prefix key can only be used with empty value."};
-        }
-        m_matcher.emplace_back(key.substr(0, key.size() - 1), flags,
-                               matcher_t::MT_PREFIX);
-        return;
-    }
-
-    // suffix: dito
-    if (key[0] == '*') {
-        if (!value.empty()) {
-            throw std::runtime_error{
-                "Style error. Suffix key can only be used with empty value."};
-        }
-        m_matcher.emplace_back(key.substr(1), flags, matcher_t::MT_SUFFIX);
-        return;
-    }
-
-    if (key == "boundary") {
-        if (value.empty() || value == "administrative") {
-            flags |= SF_BOUNDARY;
-        }
-    }
-
-    if (add_metadata_style_entry(key)) {
-        if (!value.empty()) {
-            throw std::runtime_error{"Style error. Rules for OSM metadata "
-                                     "attributes must have an empty value."};
-        }
-        if (flags != SF_EXTRA) {
-            throw std::runtime_error{"Style error. Rules for OSM metadata "
-                                     "attributes must have the style flag "
-                                     "\"extra\" and no other flag."};
-        }
-        return;
-    }
-    if (value.empty()) {
-        m_matcher.emplace_back(key, flags, matcher_t::MT_KEY);
-    } else {
-        m_matcher.emplace_back(key + '\0' + value, flags, matcher_t::MT_FULL);
-    }
-}
-
-gazetteer_style_t::flag_t gazetteer_style_t::find_flag(char const *k,
-                                                       char const *v) const
-{
-    auto const klen = std::strlen(k);
-    auto const vlen = std::strlen(v);
-
-    // full match
-    auto const fulllen = klen + vlen + 1U;
-    for (auto const &e : m_matcher) {
-        switch (e.type) {
-        case matcher_t::MT_FULL:
-            if (e.name.size() == fulllen &&
-                std::strcmp(k, e.name.c_str()) == 0 &&
-                std::memcmp(v, e.name.data() + klen + 1, vlen) == 0) {
-                return e.flag;
-            }
-            break;
-        case matcher_t::MT_KEY:
-            if (e.name.size() == klen &&
-                std::memcmp(k, e.name.data(), klen) == 0) {
-                return e.flag;
-            }
-            break;
-        case matcher_t::MT_PREFIX:
-            if (e.name.size() < klen &&
-                std::memcmp(k, e.name.data(), e.name.size()) == 0) {
-                return e.flag;
-            }
-            break;
-        case matcher_t::MT_SUFFIX:
-            if (e.name.size() < klen &&
-                std::memcmp(k + klen - e.name.size(), e.name.data(),
-                            e.name.size()) == 0) {
-                return e.flag;
-            }
-            break;
-        case matcher_t::MT_VALUE:
-            if (e.name.size() == vlen &&
-                std::memcmp(v, e.name.data(), vlen) == 0) {
-                return e.flag;
-            }
-            break;
-        }
-    }
-
-    return m_default;
-}
-
-void gazetteer_style_t::process_tags(osmium::OSMObject const &o)
-{
-    clear();
-
-    bool has_postcode = false;
-    bool has_country = false;
-    char const *place = nullptr;
-    flag_t place_flag = 0;
-    bool address_point = false;
-    bool interpolation = false;
-    bool admin_boundary = false;
-    bool postcode_fallback = false;
-    bool is_named = false;
-
-    for (auto const &item : o.tags()) {
-        char const *const k = item.key();
-        char const *const v = item.value();
-
-        if (std::strcmp(k, "admin_level") == 0) {
-            char *endp = nullptr;
-            errno = 0;
-            auto const parsed = std::strtol(v, &endp, 10);
-            if (errno == 0 && *endp == '\0' && parsed > 0 &&
-                parsed < MAX_ADMINLEVEL) {
-                m_admin_level = static_cast<int>(parsed);
-            } else {
-                m_admin_level = MAX_ADMINLEVEL;
-            }
-            continue;
-        }
-
-        if (m_any_operator_matches && std::strcmp(k, "operator") == 0) {
-            m_operator = v;
-        }
-
-        flag_t const flag = find_flag(k, v);
-
-        if (flag == 0) {
-            continue;
-        }
-
-        if (flag & SF_MAIN) {
-            if (std::strcmp(k, "place") == 0) {
-                place = v;
-                place_flag = flag;
-            } else {
-                m_main.emplace_back(k, v, flag);
-                if ((flag & SF_BOUNDARY) &&
-                    std::strcmp(v, "administrative") == 0) {
-                    admin_boundary = true;
-                }
-            }
-        }
-
-        if (flag & static_cast<flag_t>(SF_NAME | SF_REF)) {
-            m_names.emplace_back(k, v);
-            if (flag & SF_NAME) {
-                is_named = true;
-            }
-        }
-
-        if (flag & SF_ADDRESS) {
-            char const *addr_key = nullptr;
-            if (std::strncmp(k, "addr:", 5) == 0) {
-                addr_key = k + 5;
-            } else if (std::strncmp(k, "is_in:", 6) == 0) {
-                addr_key = k + 6;
-            } else {
-                addr_key = k;
-            }
-
-            // country and postcode are handled specially, ignore them here
-            if (std::strcmp(addr_key, "country") != 0 &&
-                std::strcmp(addr_key, "postcode") != 0) {
-                bool const first = std::none_of(
-                    m_address.begin(), m_address.end(), [&](ptag_t const &t) {
-                        return std::strcmp(t.first, addr_key) == 0;
-                    });
-                if (first) {
-                    m_address.emplace_back(addr_key, v);
-                }
-            }
-        }
-
-        if (flag & SF_ADDRESS_POINT) {
-            address_point = true;
-            is_named = true;
-        }
-
-        if ((flag & SF_POSTCODE) && !has_postcode) {
-            has_postcode = true;
-            m_address.emplace_back("postcode", v);
-            if (flag & SF_MAIN_FALLBACK) {
-                postcode_fallback = true;
-            }
-        }
-
-        if ((flag & SF_COUNTRY) && !has_country && std::strlen(v) == 2) {
-            has_country = true;
-            m_address.emplace_back("country", v);
-        }
-
-        if (flag & SF_EXTRA) {
-            m_extra.emplace_back(k, v);
-        }
-
-        if (flag & SF_INTERPOLATION) {
-            m_main.emplace_back("place", "houses", SF_MAIN);
-            interpolation = true;
-        }
-    }
-
-    if (place) {
-        if (interpolation || (admin_boundary && std::strncmp(place, "isl", 3) !=
-                                                    0)) { // island or islet
-            m_extra.emplace_back("place", place);
-        } else {
-            m_main.emplace_back("place", place, place_flag);
-        }
-    }
-
-    filter_main_tags(is_named, o.tags());
-
-    if (m_main.empty()) {
-        if (address_point) {
-            m_main.emplace_back("place", "house", SF_MAIN | SF_MAIN_FALLBACK);
-        } else if (postcode_fallback && has_postcode) {
-            m_main.emplace_back("place", "postcode",
-                                SF_MAIN | SF_MAIN_FALLBACK);
-        }
-    }
-}
-
-void gazetteer_style_t::filter_main_tags(bool is_named,
-                                         osmium::TagList const &tags)
-{
-    // first throw away unnamed mains
-    auto mend =
-        std::remove_if(m_main.begin(), m_main.end(), [&](pmaintag_t const &t) {
-            auto const flags = std::get<2>(t);
-
-            if (flags & SF_MAIN_NAMED) {
-                return !is_named;
-            }
-
-            if (flags & SF_MAIN_NAMED_KEY) {
-                return !std::any_of(tags.begin(), tags.end(),
-                                    DomainMatcher{std::get<0>(t)});
-            }
-
-            return false;
-        });
-
-    // any non-fallback mains left?
-    bool const has_primary =
-        std::any_of(m_main.begin(), mend, [](pmaintag_t const &t) {
-            return !(std::get<2>(t) & SF_MAIN_FALLBACK);
-        });
-
-    if (has_primary) {
-        // remove all fallbacks
-        mend = std::remove_if(m_main.begin(), mend, [&](pmaintag_t const &t) {
-            return (std::get<2>(t) & SF_MAIN_FALLBACK);
-        });
-        m_main.erase(mend, m_main.end());
-    } else if (mend == m_main.begin()) {
-        m_main.clear();
-    } else {
-        // remove everything except the first entry
-        m_main.resize(1);
-    }
-}
-
-void gazetteer_style_t::copy_out(osmium::OSMObject const &o,
-                                 std::string const &geom,
-                                 copy_mgr_t *buffer) const
-{
-    for (auto const &tag : m_main) {
-        buffer->prepare();
-        // osm_id
-        buffer->add_column(o.id());
-        // osm_type
-        std::array<char const, 2> const osm_type = {
-            (char)toupper(osmium::item_type_to_char(o.type())), '\0'};
-        buffer->add_column(osm_type.data());
-        // class
-        buffer->add_column(std::get<0>(tag));
-        // type
-        buffer->add_column(std::get<1>(tag));
-        // names
-        if (std::get<2>(tag) & SF_MAIN_NAMED_KEY) {
-            DomainMatcher const m{std::get<0>(tag)};
-            buffer->new_hash();
-            for (auto const &t : o.tags()) {
-                char const *const k = m(t);
-                if (k) {
-                    buffer->add_hash_elem(k, t.value());
-                }
-            }
-            buffer->finish_hash();
-        } else {
-            bool first = true;
-            // operator will be ignored on anything but these classes
-            if (m_operator && (std::get<2>(tag) & SF_MAIN_OPERATOR)) {
-                buffer->new_hash();
-                buffer->add_hash_elem("operator", m_operator);
-                first = false;
-            }
-            for (auto const &[key, value] : m_names) {
-                if (first) {
-                    buffer->new_hash();
-                    first = false;
-                }
-
-                buffer->add_hash_elem(key, value);
-            }
-
-            if (first) {
-                buffer->add_null_column();
-            } else {
-                buffer->finish_hash();
-            }
-        }
-        // admin_level
-        buffer->add_column(m_admin_level);
-        // address
-        if (m_address.empty()) {
-            buffer->add_null_column();
-        } else {
-            buffer->new_hash();
-            for (auto const &[key, value] : m_address) {
-                if (std::strcmp(key, "tiger:county") == 0) {
-                    std::string term;
-                    auto const *const end = std::strchr(value, ',');
-                    if (end) {
-                        auto const len =
-                            (std::string::size_type)(end - value);
-                        term = std::string(value, len);
-                    } else {
-                        term = value;
-                    }
-                    term += " county";
-                    buffer->add_hash_elem(key, term);
-                } else {
-                    buffer->add_hash_elem(key, value);
-                }
-            }
-            buffer->finish_hash();
-        }
-        // extra tags
-        if (m_extra.empty() && m_metadata_fields.none()) {
-            buffer->add_null_column();
-        } else {
-            buffer->new_hash();
-            for (auto const &[key, value] : m_extra) {
-                buffer->add_hash_elem(key, value);
-            }
-            if (m_metadata_fields.version() && o.version()) {
-                buffer->add_hstore_num_noescape<osmium::object_version_type>(
-                    "osm_version", o.version());
-            }
-            if (m_metadata_fields.uid() && o.uid()) {
-                buffer->add_hstore_num_noescape<osmium::user_id_type>("osm_uid",
-                                                                      o.uid());
-            }
-            if (m_metadata_fields.user() && o.user() && *(o.user()) != '\0') {
-                buffer->add_hash_elem("osm_user", o.user());
-            }
-            if (m_metadata_fields.changeset() && o.changeset()) {
-                buffer->add_hstore_num_noescape<osmium::changeset_id_type>(
-                    "osm_changeset", o.changeset());
-            }
-            if (m_metadata_fields.timestamp() && o.timestamp()) {
-                std::string const timestamp = o.timestamp().to_iso();
-                buffer->add_hash_elem_noescape("osm_timestamp",
-                                               timestamp.c_str());
-            }
-            buffer->finish_hash();
-        }
-        // add the geometry - encoding it to hex along the way
-        buffer->add_hex_geom(geom);
-
-        buffer->finish_line();
-    }
-}
diff --git a/src/gazetteer-style.hpp b/src/gazetteer-style.hpp
deleted file mode 100644
index ceb5832ea..000000000
--- a/src/gazetteer-style.hpp
+++ /dev/null
@@ -1,196 +0,0 @@
-#ifndef OSM2PGSQL_GAZETTEER_STYLE_HPP
-#define OSM2PGSQL_GAZETTEER_STYLE_HPP
-
-/**
- * SPDX-License-Identifier: GPL-2.0-or-later
- *
- * This file is part of osm2pgsql (https://osm2pgsql.org/).
- *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
- * For a full list of authors see the git log.
- */
-
-#include <cstdint>
-#include <memory>
-#include <string>
-#include <tuple>
-#include <utility>
-#include <vector>
-
-#include <osmium/fwd.hpp>
-#include <osmium/osm/metadata_options.hpp>
-
-#include "db-copy-mgr.hpp"
-
-/**
- * Deleter which removes objects by osm_type, osm_id and class
- * from a gazetteer place table.
- *
- * It deletes all object that have a given type and id and where the
- * (comma-separated) list of classes does _not_ match.
- */
-class db_deleter_place_t
-{
-    enum
-    {
-        // Deletion in the place table is fairly complex because of the
-        // compound primary key. It is better to start earlier with the
-        // deletion, so it can run in parallel with the file import.
-        Max_entries = 100000
-    };
-
-    struct item_t
-    {
-        std::string classes;
-        osmid_t osm_id;
-        char osm_type;
-
-        item_t(char t, osmid_t i, std::string c)
-        : classes(std::move(c)), osm_id(i), osm_type(t)
-        {}
-
-        item_t(char t, osmid_t i) : osm_id(i), osm_type(t) {}
-    };
-
-public:
-    bool has_data() const noexcept { return !m_deletables.empty(); }
-
-    void add(char osm_type, osmid_t osm_id, std::string const &classes)
-    {
-        m_deletables.emplace_back(osm_type, osm_id, classes);
-    }
-
-    void add(char osm_type, osmid_t osm_id)
-    {
-        m_deletables.emplace_back(osm_type, osm_id);
-    }
-
-    void delete_rows(std::string const &table, std::string const &column,
-                     pg_conn_t *conn);
-
-    bool is_full() const noexcept { return m_deletables.size() > Max_entries; }
-
-private:
-    /// Vector with object to delete before copying
-    std::vector<item_t> m_deletables;
-};
-
-/**
- * Copy manager for the gazetteer place table only.
- *
- * Implicitly contains the table description.
- */
-class gazetteer_copy_mgr_t : public db_copy_mgr_t<db_deleter_place_t>
-{
-public:
-    explicit gazetteer_copy_mgr_t(
-        std::shared_ptr<db_copy_thread_t> const &processor)
-    : db_copy_mgr_t<db_deleter_place_t>(processor),
-      m_table(
-          std::make_shared<db_target_descr_t>("public", "place", "place_id"))
-    {
-    }
-
-    void prepare() { new_line(m_table); }
-
-private:
-    std::shared_ptr<db_target_descr_t> m_table;
-};
-
-enum : int
-{
-    MAX_ADMINLEVEL = 15
-};
-
-class gazetteer_style_t
-{
-    using flag_t = uint16_t;
-    using ptag_t = std::pair<char const *, char const *>;
-    using pmaintag_t = std::tuple<char const *, char const *, flag_t>;
-
-    enum style_flags : uint16_t
-    {
-        SF_MAIN = 1U << 0U,
-        SF_MAIN_NAMED = 1U << 1U,
-        SF_MAIN_NAMED_KEY = 1U << 2U,
-        SF_MAIN_FALLBACK = 1U << 3U,
-        SF_MAIN_OPERATOR = 1U << 4U,
-        SF_NAME = 1U << 5U,
-        SF_REF = 1U << 6U,
-        SF_ADDRESS = 1U << 7U,
-        SF_ADDRESS_POINT = 1U << 8U,
-        SF_POSTCODE = 1U << 9U,
-        SF_COUNTRY = 1U << 10U,
-        SF_EXTRA = 1U << 11U,
-        SF_INTERPOLATION = 1U << 12U,
-        SF_BOUNDARY = 1U << 13U, // internal flag for boundaries
-    };
-
-    enum class matcher_t
-    {
-        MT_FULL,
-        MT_KEY,
-        MT_PREFIX,
-        MT_SUFFIX,
-        MT_VALUE
-    };
-
-    struct string_with_flag_t
-    {
-        std::string name;
-        flag_t flag;
-        matcher_t type;
-
-        string_with_flag_t(std::string n, flag_t f, matcher_t t)
-        : name(std::move(n)), flag(f), type(t)
-        {}
-    };
-
-    using flag_list_t = std::vector<string_with_flag_t>;
-
-public:
-    using copy_mgr_t = gazetteer_copy_mgr_t;
-
-    void load_style(std::string const &filename);
-    void process_tags(osmium::OSMObject const &o);
-    void copy_out(osmium::OSMObject const &o, std::string const &geom,
-                  copy_mgr_t *buffer) const;
-    std::string class_list() const;
-
-    bool has_data() const noexcept { return !m_main.empty(); }
-
-private:
-    bool add_metadata_style_entry(std::string const &key);
-    void add_style_entry(std::string const &key, std::string const &value,
-                         flag_t flags);
-    flag_t parse_flags(std::string const &str);
-    flag_t find_flag(char const *k, char const *v) const;
-    void filter_main_tags(bool is_named, osmium::TagList const &tags);
-
-    void clear();
-
-    // Style data.
-    flag_list_t m_matcher;
-    flag_t m_default{0};
-    bool m_any_operator_matches{false};
-
-    // Cached OSM object data.
-
-    /// class/type pairs to include
-    std::vector<pmaintag_t> m_main;
-    /// name tags to include
-    std::vector<ptag_t> m_names;
-    /// extratags to include
-    std::vector<ptag_t> m_extra;
-    /// addresstags to include
-    std::vector<ptag_t> m_address;
-    /// value of operator tag
-    char const *m_operator = nullptr;
-    /// admin level
-    int m_admin_level = MAX_ADMINLEVEL;
-
-    /// which metadata fields of the OSM objects should be written to the output
-    osmium::metadata_options m_metadata_fields{"none"};
-};
-
-#endif // OSM2PGSQL_GAZETTEER_STYLE_HPP
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index 2dafdfa92..f9759840e 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -134,9 +134,7 @@ middle_pgsql_t::table_desc::table_desc(options_t const &options,
   m_copy_target(std::make_shared<db_target_descr_t>(
       options.middle_dbschema, build_sql(options, ts.name), "id"))
 {
-    if (options.with_forward_dependencies) {
-        m_create_fw_dep_indexes = build_sql(options, ts.create_fw_dep_indexes);
-    }
+    m_create_fw_dep_indexes = build_sql(options, ts.create_fw_dep_indexes);
 }
 
 void middle_query_pgsql_t::exec_sql(std::string const &sql_cmd) const
@@ -1681,8 +1679,7 @@ middle_pgsql_t::middle_pgsql_t(std::shared_ptr<thread_pool_t> thread_pool,
     bool const has_bucket_index =
         check_bucket_index(&m_db_connection, options->prefix);
 
-    if (!has_bucket_index && options->append &&
-        options->with_forward_dependencies) {
+    if (!has_bucket_index && options->append) {
         log_debug("You don't have a bucket index. See manual for details.");
     }
 
diff --git a/src/options.hpp b/src/options.hpp
index b518af60e..bf9655289 100644
--- a/src/options.hpp
+++ b/src/options.hpp
@@ -139,12 +139,6 @@ struct options_t
     bool keep_coastlines = false;
     bool droptemp = false; ///< drop slim mode temp tables after act
 
-    /**
-     * Should changes of objects be propagated forwards (from nodes to ways and
-     * from node/way members to parent relations)?
-     */
-    bool with_forward_dependencies = true;
-
     /// only copy rows that match an explicitly listed key
     bool hstore_match_only = false;
 
diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
index a8b113169..e9156e76d 100644
--- a/src/osm2pgsql.cpp
+++ b/src/osm2pgsql.cpp
@@ -61,9 +61,7 @@ static file_info run(options_t const &options)
     middle->set_requirements(output->get_requirements());
 
     auto dependency_manager =
-        options.with_forward_dependencies
-            ? std::make_unique<full_dependency_manager_t>(middle)
-            : std::make_unique<dependency_manager_t>();
+        std::make_unique<full_dependency_manager_t>(middle);
 
     osmdata_t osmdata{std::move(dependency_manager), middle, output, options};
 
@@ -339,8 +337,7 @@ static void set_option_defaults(options_t *options)
     }
 
     if (options->style.empty()) {
-        if (options->output_backend == "flex" ||
-            options->output_backend == "gazetteer") {
+        if (options->output_backend == "flex") {
             throw std::runtime_error{"You have to set the config file "
                                      "with the -S|--style option."};
         }
diff --git a/src/osmdata.cpp b/src/osmdata.cpp
index 30e623e22..8038364b7 100644
--- a/src/osmdata.cpp
+++ b/src/osmdata.cpp
@@ -33,8 +33,7 @@ osmdata_t::osmdata_t(std::unique_ptr<dependency_manager_t> dependency_manager,
   m_output(std::move(output)), m_connection_params(options.connection_params),
   m_bbox(options.bbox), m_num_procs(options.num_procs),
   m_append(options.append), m_droptemp(options.droptemp),
-  m_with_extra_attrs(options.extra_attributes),
-  m_with_forward_dependencies(options.with_forward_dependencies)
+  m_with_extra_attrs(options.extra_attributes)
 {
     assert(m_dependency_manager);
     assert(m_mid);
@@ -407,7 +406,7 @@ void osmdata_t::postprocess_database() const
 
 void osmdata_t::stop() const
 {
-    if (m_append && m_with_forward_dependencies) {
+    if (m_append) {
         process_dependents();
     }
 
diff --git a/src/osmdata.hpp b/src/osmdata.hpp
index f632cd4ee..6a66fc328 100644
--- a/src/osmdata.hpp
+++ b/src/osmdata.hpp
@@ -91,7 +91,6 @@ class osmdata_t : public osmium::handler::Handler
     bool m_append;
     bool m_droptemp;
     bool m_with_extra_attrs;
-    bool m_with_forward_dependencies;
 };
 
 #endif // OSM2PGSQL_OSMDATA_HPP
diff --git a/src/output-gazetteer.cpp b/src/output-gazetteer.cpp
deleted file mode 100644
index bb7ebe356..000000000
--- a/src/output-gazetteer.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-/**
- * SPDX-License-Identifier: GPL-2.0-or-later
- *
- * This file is part of osm2pgsql (https://osm2pgsql.org/).
- *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
- * For a full list of authors see the git log.
- */
-
-#include "format.hpp"
-#include "geom.hpp"
-#include "geom-from-osm.hpp"
-#include "geom-functions.hpp"
-#include "middle.hpp"
-#include "options.hpp"
-#include "osmtypes.hpp"
-#include "output-gazetteer.hpp"
-#include "pgsql.hpp"
-
-#include <cstring>
-#include <memory>
-#include <string>
-
-output_gazetteer_t::~output_gazetteer_t() = default;
-
-void output_gazetteer_t::delete_unused_classes(char osm_type, osmid_t osm_id)
-{
-    if (get_options()->append) {
-        m_copy.prepare();
-
-        assert(m_style.has_data());
-
-        std::string const cls = m_style.class_list();
-        m_copy.delete_object(osm_type, osm_id, cls);
-    }
-}
-
-void output_gazetteer_t::delete_unused_full(char osm_type, osmid_t osm_id)
-{
-    if (get_options()->append) {
-        m_copy.prepare();
-        m_copy.delete_object(osm_type, osm_id);
-    }
-}
-
-void output_gazetteer_t::start()
-{
-    /* (Re)create the table unless we are appending */
-    if (!get_options()->append) {
-        int const srid = get_options()->projection->target_srs();
-
-        pg_conn_t const conn{get_options()->connection_params, "out.gazetteer"};
-
-        /* Drop any existing table */
-        conn.exec("DROP TABLE IF EXISTS place CASCADE");
-
-        /* Create the new table */
-
-        std::string const sql =
-            fmt::format("CREATE TABLE place ("
-                        "  osm_id int8 NOT NULL,"
-                        "  osm_type char(1) NOT NULL,"
-                        "  class text NOT NULL,"
-                        "  type text NOT NULL,"
-                        "  name hstore,"
-                        "  admin_level smallint,"
-                        "  address hstore,"
-                        "  extratags hstore,"
-                        "  geometry Geometry(Geometry,{}) NOT NULL)",
-                        srid) +
-            tablespace_clause(get_options()->tblsmain_data);
-
-        conn.exec(sql);
-
-        std::string const index_sql =
-            "CREATE INDEX place_id_idx ON place"
-            " USING BTREE (osm_type, osm_id)" +
-            tablespace_clause(get_options()->tblsmain_index);
-        conn.exec(index_sql);
-    }
-}
-
-void output_gazetteer_t::sync() { m_copy.sync(); }
-
-void output_gazetteer_t::node_add(osmium::Node const &node)
-{
-    if (!process_node(node)) {
-        delete_unused_full('N', node.id());
-    }
-}
-
-void output_gazetteer_t::node_modify(osmium::Node const &node)
-{
-    if (!process_node(node)) {
-        delete_unused_full('N', node.id());
-    }
-}
-
-bool output_gazetteer_t::process_node(osmium::Node const &node)
-{
-    m_style.process_tags(node);
-
-    /* Are we interested in this item? */
-    if (!m_style.has_data()) {
-        return false;
-    }
-
-    auto const wkb =
-        geom_to_ewkb(geom::transform(geom::create_point(node), *m_proj));
-    delete_unused_classes('N', node.id());
-    m_style.copy_out(node, wkb, &m_copy);
-
-    return true;
-}
-
-void output_gazetteer_t::way_add(osmium::Way *way)
-{
-    if (!process_way(way)) {
-        delete_unused_full('W', way->id());
-    }
-}
-
-void output_gazetteer_t::way_modify(osmium::Way *way)
-{
-    if (!process_way(way)) {
-        delete_unused_full('W', way->id());
-    }
-}
-
-bool output_gazetteer_t::process_way(osmium::Way *way)
-{
-    m_style.process_tags(*way);
-
-    if (!m_style.has_data()) {
-        return false;
-    }
-
-    // Fetch the node details.
-    middle().nodes_get_list(&(way->nodes()));
-
-    // Get the geometry of the object.
-    geom::geometry_t geom;
-    if (!way->nodes().empty() && way->is_closed()) {
-        geom = geom::transform(geom::create_polygon(*way), *m_proj);
-    }
-    if (geom.is_null()) {
-        geom = geom::transform(geom::create_linestring(*way), *m_proj);
-        if (geom.is_null()) {
-            return false;
-        }
-    }
-
-    delete_unused_classes('W', way->id());
-    m_style.copy_out(*way, geom_to_ewkb(geom), &m_copy);
-
-    return true;
-}
-
-void output_gazetteer_t::relation_add(osmium::Relation const &rel)
-{
-    if (!process_relation(rel)) {
-        delete_unused_full('R', rel.id());
-    }
-}
-
-void output_gazetteer_t::relation_modify(osmium::Relation const &rel)
-{
-    if (!process_relation(rel)) {
-        delete_unused_full('R', rel.id());
-    }
-}
-
-bool output_gazetteer_t::process_relation(osmium::Relation const &rel)
-{
-    char const *const type = rel.tags()["type"];
-    if (!type) {
-        return false;
-    }
-
-    bool const is_waterway = std::strcmp(type, "waterway") == 0;
-
-    if (std::strcmp(type, "associatedStreet") == 0 ||
-        !(std::strcmp(type, "boundary") == 0 ||
-          std::strcmp(type, "multipolygon") == 0 || is_waterway)) {
-        return false;
-    }
-
-    m_style.process_tags(rel);
-
-    /* Are we interested in this item? */
-    if (!m_style.has_data()) {
-        return false;
-    }
-
-    /* get the boundary path (ways) */
-    m_osmium_buffer.clear();
-    auto const num_ways = middle().rel_members_get(
-        rel, &m_osmium_buffer, osmium::osm_entity_bits::way);
-
-    if (num_ways == 0) {
-        return false;
-    }
-
-    for (auto &w : m_osmium_buffer.select<osmium::Way>()) {
-        middle().nodes_get_list(&(w.nodes()));
-    }
-
-    auto const geom = geom::transform(
-        is_waterway ? geom::create_multilinestring(m_osmium_buffer)
-                    : geom::create_multipolygon(rel, m_osmium_buffer),
-        *m_proj);
-
-    if (geom.is_null()) {
-        return false;
-    }
-
-    delete_unused_classes('R', rel.id());
-    m_style.copy_out(rel, geom_to_ewkb(geom), &m_copy);
-
-    return true;
-}
diff --git a/src/output-gazetteer.hpp b/src/output-gazetteer.hpp
deleted file mode 100644
index 6f427d6be..000000000
--- a/src/output-gazetteer.hpp
+++ /dev/null
@@ -1,108 +0,0 @@
-#ifndef OSM2PGSQL_OUTPUT_GAZETTEER_HPP
-#define OSM2PGSQL_OUTPUT_GAZETTEER_HPP
-
-/**
- * SPDX-License-Identifier: GPL-2.0-or-later
- *
- * This file is part of osm2pgsql (https://osm2pgsql.org/).
- *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
- * For a full list of authors see the git log.
- */
-
-#include <memory>
-#include <utility>
-
-#include <osmium/memory/buffer.hpp>
-
-#include "gazetteer-style.hpp"
-#include "options.hpp"
-#include "osmtypes.hpp"
-#include "output.hpp"
-#include "reprojection.hpp"
-#include "wkb.hpp"
-
-class db_copy_thread_t;
-class thread_pool_t;
-
-struct middle_query_t;
-
-class output_gazetteer_t : public output_t
-{
-public:
-    /// Constructor for new objects
-    output_gazetteer_t(std::shared_ptr<middle_query_t> const &mid,
-                       std::shared_ptr<thread_pool_t> thread_pool,
-                       options_t const &options)
-    : output_t(mid, std::move(thread_pool), options),
-      m_copy(std::make_shared<db_copy_thread_t>(options.connection_params)),
-      m_proj(options.projection)
-    {
-        m_style.load_style(options.style);
-    }
-
-    /// Constructor for cloned objects
-    output_gazetteer_t(output_gazetteer_t const *other,
-                       std::shared_ptr<middle_query_t> const &mid,
-                       std::shared_ptr<db_copy_thread_t> const &copy_thread)
-    : output_t(other, mid), m_copy(copy_thread),
-      m_proj(other->get_options()->projection)
-    {}
-
-    output_gazetteer_t(output_gazetteer_t const &) = delete;
-    output_gazetteer_t &operator=(output_gazetteer_t const &) = delete;
-
-    output_gazetteer_t(output_gazetteer_t &&) = delete;
-    output_gazetteer_t &operator=(output_gazetteer_t &&) = delete;
-
-    ~output_gazetteer_t() override;
-
-    std::shared_ptr<output_t>
-    clone(std::shared_ptr<middle_query_t> const &mid,
-          std::shared_ptr<db_copy_thread_t> const &copy_thread) const override
-    {
-        return std::make_shared<output_gazetteer_t>(this, mid, copy_thread);
-    }
-
-    void start() override;
-    void stop() noexcept override {}
-    void sync() override;
-
-    void pending_way(osmid_t) noexcept override {}
-    void pending_relation(osmid_t) noexcept override {}
-
-    void node_add(osmium::Node const &node) override;
-    void way_add(osmium::Way *way) override;
-    void relation_add(osmium::Relation const &rel) override;
-
-    void node_modify(osmium::Node const &node) override;
-    void way_modify(osmium::Way *way) override;
-    void relation_modify(osmium::Relation const &rel) override;
-
-    void node_delete(osmid_t id) override { delete_unused_full('N', id); }
-    void way_delete(osmid_t id) override { delete_unused_full('W', id); }
-    void relation_delete(osmid_t id) override { delete_unused_full('R', id); }
-
-private:
-    enum
-    {
-        PLACE_BUFFER_SIZE = 4096
-    };
-
-    /// Delete all places that are not covered by the current style results.
-    void delete_unused_classes(char osm_type, osmid_t osm_id);
-    /// Delete all places for the given OSM object.
-    void delete_unused_full(char osm_type, osmid_t osm_id);
-    bool process_node(osmium::Node const &node);
-    bool process_way(osmium::Way *way);
-    bool process_relation(osmium::Relation const &rel);
-
-    gazetteer_copy_mgr_t m_copy;
-    gazetteer_style_t m_style;
-
-    std::shared_ptr<reprojection> m_proj;
-    osmium::memory::Buffer m_osmium_buffer{
-        PLACE_BUFFER_SIZE, osmium::memory::Buffer::auto_grow::yes};
-};
-
-#endif // OSM2PGSQL_OUTPUT_GAZETTEER_HPP
diff --git a/src/output.cpp b/src/output.cpp
index 51a353da8..f4b50b417 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -12,7 +12,6 @@
 #include "db-copy.hpp"
 #include "format.hpp"
 #include "options.hpp"
-#include "output-gazetteer.hpp"
 #include "output-null.hpp"
 #include "output-pgsql.hpp"
 
@@ -44,18 +43,13 @@ output_t::create_output(std::shared_ptr<middle_query_t> const &mid,
     }
 #endif
 
-    if (options.output_backend == "gazetteer") {
-        return std::make_shared<output_gazetteer_t>(mid, std::move(thread_pool),
-                                                    options);
-    }
-
     if (options.output_backend == "null") {
         return std::make_shared<output_null_t>(mid, std::move(thread_pool),
                                                options);
     }
 
     throw fmt_error("Output backend '{}' not recognised. Should be one of"
-                    " [pgsql, {}gazetteer, null].",
+                    " [pgsql, {}null].",
                     options.output_backend, flex_backend);
 }
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5288cce41..6e293eb2b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -63,7 +63,6 @@ set_test(test-options-parse LABELS NoDB)
 set_test(test-options-projection)
 set_test(test-ordered-index LABELS NoDB)
 set_test(test-osm-file-parsing LABELS NoDB)
-set_test(test-output-gazetteer)
 set_test(test-output-pgsql)
 set_test(test-output-pgsql-area)
 set_test(test-output-pgsql-hstore-match-only)
diff --git a/tests/bdd/regression/forward_dependencies.feature b/tests/bdd/regression/forward_dependencies.feature
index 77a7a74b8..8b48bbee2 100644
--- a/tests/bdd/regression/forward_dependencies.feature
+++ b/tests/bdd/regression/forward_dependencies.feature
@@ -42,28 +42,3 @@ Feature: Test forward propagation of changes
         Then table planet_osm_roads has 1 row
         Then table planet_osm_polygon has 1 row
 
-
-    Scenario: Node changes are not forwarded when forwarding is disabled
-        When running osm2pgsql pgsql with parameters
-            | --slim | --latlong |
-        Given the OSM data
-            """
-            n13 v2 x3.1 y3.0
-            w23 v2 Nn16,n17
-            """
-        When running osm2pgsql pgsql with parameters
-            | --slim | -a | --latlong | --with-forward-dependencies=false |
-
-        Then table planet_osm_point has 1 row
-        Then table planet_osm_line has 1 row
-        Then table planet_osm_line has 1 row with condition
-            """
-            abs(ST_X(ST_StartPoint(way)) - 3.0) < 0.0001
-            """
-        Then table planet_osm_line has 0 rows with condition
-            """
-            abs(ST_X(ST_StartPoint(way)) - 3.1) < 0.0001
-            """
-        Then table planet_osm_roads has 1 row
-        Then table planet_osm_polygon has 2 rows
-
diff --git a/tests/bdd/regression/gazetteer.feature b/tests/bdd/regression/gazetteer.feature
deleted file mode 100644
index 1bda297cf..000000000
--- a/tests/bdd/regression/gazetteer.feature
+++ /dev/null
@@ -1,60 +0,0 @@
-Feature: Basic tests of the gazetter output
-
-    Background:
-        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
-        And the style file 'gazetteer-test.style'
-
-    Scenario:
-        When running osm2pgsql gazetteer with parameters
-            | --slim|
-
-        Then table place has 2836 rows
-        And table place has 759 rows with condition
-            """
-            osm_type = 'N'
-            """
-        And table place has 2059 rows with condition
-            """
-            osm_type = 'W'
-            """
-        And table place has 18 rows with condition
-            """
-            osm_type = 'R'
-            """
-        And table place has 199 rows with condition
-            """
-            address ? 'housenumber'
-            """
-        And table place has 319 rows with condition
-            """
-            address is not null
-            """
-
-        Given the input file '000466354.osc.gz'
-        When running osm2pgsql gazetteer with parameters
-            | -a |
-            | --slim|
-
-
-        Then table place has 2877 rows
-        And table place has 764 rows with condition
-            """
-            osm_type = 'N'
-            """
-        And table place has 2095 rows with condition
-            """
-            osm_type = 'W'
-            """
-        And table place has 18 rows with condition
-            """
-            osm_type = 'R'
-            """
-        And table place has 199 rows with condition
-            """
-            address ? 'housenumber'
-            """
-        And table place has 319 rows with condition
-            """
-            address is not null
-            """
-
diff --git a/tests/bdd/steps/steps_execute.py b/tests/bdd/steps/steps_execute.py
index f04ee3efa..68ea46cef 100644
--- a/tests/bdd/steps/steps_execute.py
+++ b/tests/bdd/steps/steps_execute.py
@@ -38,7 +38,7 @@ def get_import_file(context):
 
 
 def run_osm2pgsql(context, output):
-    assert output in ('flex', 'pgsql', 'gazetteer', 'null', 'nooutput')
+    assert output in ('flex', 'pgsql', 'null', 'nooutput')
 
     cmdline = [str(Path(context.config.userdata['BINARY']).resolve())]
 
diff --git a/tests/common-import.hpp b/tests/common-import.hpp
index 9fc7bb325..19f170449 100644
--- a/tests/common-import.hpp
+++ b/tests/common-import.hpp
@@ -146,9 +146,7 @@ class import_t
         middle->set_requirements(output->get_requirements());
 
         auto dependency_manager =
-            options.with_forward_dependencies
-                ? std::make_unique<full_dependency_manager_t>(middle)
-                : std::make_unique<dependency_manager_t>();
+            std::make_unique<full_dependency_manager_t>(middle);
 
         osmdata_t osmdata{std::move(dependency_manager), middle, output,
                           options};
diff --git a/tests/common-options.hpp b/tests/common-options.hpp
index ac9691ecb..adcc0bef3 100644
--- a/tests/common-options.hpp
+++ b/tests/common-options.hpp
@@ -56,13 +56,6 @@ class opt_t
         return *this;
     }
 
-    opt_t &gazetteer()
-    {
-        m_opt.output_backend = "gazetteer";
-        m_opt.style = TESTDATA_DIR "gazetteer-test.style";
-        return *this;
-    }
-
     opt_t &flex(char const *style)
     {
         m_opt.output_backend = "flex";
diff --git a/tests/data/gazetteer-test.style b/tests/data/gazetteer-test.style
deleted file mode 100644
index 0b0e14e89..000000000
--- a/tests/data/gazetteer-test.style
+++ /dev/null
@@ -1,237 +0,0 @@
-[
-{
-    "keys" : ["*source"],
-    "values" : {
-        "" : "skip"
-    }
-},
-{
-    "keys" : ["name:prefix", "name:suffix", "name:botanical", "wikidata",
-              "*:wikidata"],
-    "values" : {
-        "" : "extra"
-    }
-},
-{
-    "keys" : ["ref", "int_ref", "nat_ref", "reg_ref", "loc_ref", "old_ref",
-              "iata", "icao", "pcode", "pcode:*"],
-    "values" : {
-        "" : "ref"
-    }
-},
-{
-    "keys" : ["name", "name:*", "int_name", "int_name:*", "nat_name", "nat_name:*",
-              "reg_name", "reg_name:*", "loc_name", "loc_name:*",
-              "old_name", "old_name:*", "alt_name", "alt_name:*", "alt_name_*",
-              "official_name", "official_name:*", "place_name", "place_name:*",
-              "short_name", "short_name:*", "brand"],
-    "values" : {
-        "" : "name"
-    }
-},
-{
-    "keys" : ["addr:housename"],
-    "values" : {
-        "" : "name,house"
-    }
-},
-{
-    "keys" : ["emergency"],
-    "values" : {
-        "fire_hydrant" : "skip",
-        "yes" : "skip",
-        "no" : "skip",
-        "" : "main"
-    }
-},
-{
-    "keys" : ["historic", "military"],
-    "values" : {
-        "no" : "skip",
-        "yes" : "skip",
-        "" : "main"
-    }
-},
-{
-    "keys" : ["natural"],
-    "values" : {
-        "yes" : "skip",
-        "no" : "skip",
-        "coastline" : "skip",
-        "" : "main,with_name"
-    }
-},
-{
-    "keys" : ["landuse"],
-    "values" : {
-        "cemetry" : "main,with_name",
-        "" : "main,fallback,with_name"
-    }
-},
-{
-    "keys" : ["highway"],
-    "values" : {
-        "no" : "skip",
-        "turning_circle" : "skip",
-        "mini_roundabout" : "skip",
-        "noexit" : "skip",
-        "crossing" : "skip",
-        "traffic_signals" : "main,with_name",
-        "service" : "main,with_name",
-        "cycleway" : "main,with_name",
-        "path" : "main,with_name",
-        "footway" : "main,with_name",
-        "steps" : "main,with_name",
-        "bridleway" : "main,with_name",
-        "track" : "main,with_name",
-        "byway": "main,with_name",
-        "motorway_link" : "main,with_name",
-        "trunk_link" : "main,with_name",
-        "primary_link" : "main,with_name",
-        "secondary_link" : "main,with_name",
-        "tertiary_link" : "main,with_name",
-        "" : "main"
-    }
-},
-{
-    "keys" : ["railway"],
-    "values" : {
-        "level_crossing" : "skip",
-        "no" : "skip",
-        "" : "main,with_name"
-    }
-},
-{
-    "keys" : ["man_made"],
-    "values" : {
-        "survey_point" : "skip",
-        "cutline" : "skip",
-        "" : "main"
-    }
-},
-{
-    "keys" : ["aerialway"],
-    "values" : {
-        "pylon" : "skip",
-        "no" : "skip",
-        "" : "main"
-    }
-},
-{
-    "keys" : ["boundary"],
-    "values" : {
-        "" : "main,with_name"
-    }
-},
-{
-    "keys" : ["amenity"],
-    "values" : {
-        "restaurant" : "main,operator",
-        "fuel" : "main,operator"
-    }
-},
-{
-    "keys" : ["aeroway", "amenity", "club", "craft", "leisure",
-              "office", "mountain_pass"],
-    "values" : {
-        "no" : "skip",
-        "" : "main"
-    }
-},
-{
-    "keys" : ["shop"],
-    "values" : {
-        "no" : "skip",
-        "" : "main,operator"
-    }
-},
-{
-    "keys" : ["tourism"],
-    "values" : {
-        "yes" : "skip",
-        "no" : "skip",
-        "" : "main,operator"
-    }
-},
-{
-    "keys" : ["bridge", "tunnel"],
-    "values" : {
-        "" : "main,with_name_key,extra"
-    }
-},
-{
-    "keys" : ["waterway"],
-    "values" : {
-        "riverbank" : "skip",
-        "" : "main,with_name"
-    }
-},
-{
-    "keys" : ["place"],
-    "values" : {
-        "" : "main"
-    }
-},
-{
-    "keys" : ["junction"],
-    "values" : {
-        "" : "main,fallback,with_name"
-    }
-},
-{
-    "keys" : ["postal_code", "postcode", "addr:postcode",
-              "tiger:zip_left", "tiger:zip_right"],
-    "values" : {
-        "" : "postcode,fallback"
-    }
-},
-{
-    "keys" : ["country_code", "ISO3166-1", "is_in:country_code",
-              "addr:country", "addr:country", "addr:country_code"],
-    "values" : {
-        "" : "country"
-    }
-},
-{
-    "keys" : ["addr:housenumber", "addr:conscriptionnumber", "addr:streetnumber"],
-    "values" : {
-        "" : "address,house"
-    }
-},
-{
-    "keys" : ["addr:interpolation"],
-    "values" : {
-        "" : "interpolation,address"
-    }
-},
-{
-    "keys" : ["addr:*", "is_in:*", "tiger:county", "is_in"],
-    "values" : {
-        "" : "address"
-    }
-},
-{
-    "keys" : ["building"],
-    "values" : {
-        "no" : "skip",
-        "" : "main,fallback,with_name"
-    }
-},
-{
-    "keys" : ["note", "note:*", "source", "source*", "attribution",
-              "comment", "fixme", "FIXME", "created_by", "tiger:*", "NHD:*",
-              "nhd:*", "gnis:*", "geobase:*", "KSJ2:*", "yh:*",
-              "osak:*", "naptan:*", "CLC:*", "import", "it:fvg:*",
-              "type", "lacounty:*", "ref:ruian:*", "building:ruian:type",
-              "ref:linz:*"],
-    "values" : {
-        "" : "skip"
-    }
-},
-{
-    "keys" : [""],
-    "values" : {
-        "" : "extra"
-    }
-}
-]
diff --git a/tests/test-db-copy-thread.cpp b/tests/test-db-copy-thread.cpp
index 9cfd30c61..3e6ed2d65 100644
--- a/tests/test-db-copy-thread.cpp
+++ b/tests/test-db-copy-thread.cpp
@@ -11,7 +11,6 @@
 
 #include "common-pg.hpp"
 #include "db-copy.hpp"
-#include "gazetteer-style.hpp"
 
 static testing::pg::tempdb_t db;
 
@@ -146,97 +145,3 @@ TEST_CASE("db_copy_thread_t with db_deleter_by_id_t")
         REQUIRE(table_count(conn, "WHERE id = 12") == 1);
     }
 }
-
-TEST_CASE("db_copy_thread_t with db_deleter_place_t")
-{
-    auto const conn = db.connect();
-    conn.exec("DROP TABLE IF EXISTS test_copy_thread");
-    conn.exec("CREATE TABLE test_copy_thread ("
-              "osm_type char(1),"
-              "osm_id bigint,"
-              "class text)");
-
-    auto table = std::make_shared<db_target_descr_t>(
-        "public", "test_copy_thread", "place_id");
-
-    db_copy_thread_t t{db.connection_params()};
-    using cmd_copy_t = db_cmd_copy_delete_t<db_deleter_place_t>;
-    auto cmd = std::make_unique<cmd_copy_t>(table);
-
-    SECTION("simple delete")
-    {
-        cmd->buffer += "N\t42\tbuilding\n"
-                       "N\t43\tbuilding\n"
-                       "W\t42\thighway\n"
-                       "R\t42\twaterway\n";
-
-        t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
-        t.sync_and_wait();
-
-        cmd = std::make_unique<cmd_copy_t>(table);
-
-        SECTION("full delete of existing rows")
-        {
-            cmd->add_deletable('N', 42);
-            cmd->add_deletable('R', 42);
-
-            t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
-            t.sync_and_wait();
-
-            REQUIRE(table_count(conn, "WHERE osm_type = 'N'"
-                                      "      and osm_id = 42") == 0);
-            REQUIRE(table_count(conn, "WHERE osm_type = 'N'"
-                                      "      and osm_id = 43") == 1);
-            REQUIRE(table_count(conn, "WHERE osm_type = 'W'"
-                                      "      and osm_id = 42") == 1);
-            REQUIRE(table_count(conn, "WHERE osm_type = 'R'"
-                                      "      and osm_id = 42") == 0);
-        }
-
-        SECTION("partial delete of existing rows")
-        {
-            cmd->add_deletable('N', 42, "'road','building','amenity'");
-            cmd->add_deletable('R', 42, "'road','building','amenity'");
-
-            t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
-            t.sync_and_wait();
-
-            REQUIRE(table_count(conn, "WHERE osm_type = 'N'"
-                                      "      and osm_id = 42") == 1);
-            REQUIRE(table_count(conn, "WHERE osm_type = 'N'"
-                                      "      and osm_id = 43") == 1);
-            REQUIRE(table_count(conn, "WHERE osm_type = 'W'"
-                                      "      and osm_id = 42") == 1);
-            REQUIRE(table_count(conn, "WHERE osm_type = 'R'"
-                                      "      and osm_id = 42") == 0);
-        }
-
-        SECTION("delete one add another id")
-        {
-            cmd->add_deletable('R', 42);
-            cmd->buffer += "W\t43\tamenity\n";
-
-            t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
-            t.sync_and_wait();
-
-            REQUIRE(table_count(conn, "WHERE osm_type = 'R'"
-                                      "      and osm_id = 42") == 0);
-            REQUIRE(table_count(conn, "WHERE osm_type = 'W'"
-                                      "      and osm_id = 43") == 1);
-        }
-
-        SECTION("delete one add another class type")
-        {
-            cmd->add_deletable('W', 42, "'amenity'");
-            cmd->buffer += "W\t42\tamenity\n";
-
-            t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
-            t.sync_and_wait();
-
-            REQUIRE(table_count(conn, "WHERE osm_type = 'W' and osm_id = 42"
-                                      "      and class = 'highway'") == 0);
-            REQUIRE(table_count(conn, "WHERE osm_type = 'W' and osm_id = 42"
-                                      "      and class = 'amenity'") == 1);
-        }
-    }
-}
diff --git a/tests/test-options-parse.cpp b/tests/test-options-parse.cpp
index 33518890e..be9b4971f 100644
--- a/tests/test-options-parse.cpp
+++ b/tests/test-options-parse.cpp
@@ -193,19 +193,3 @@ TEST_CASE("Parsing log-progress fails for unknown value", "[NoDB]")
     bad_opt({"--log-progress", "foo"},
             "Unknown value for --log-progress option: ");
 }
-
-TEST_CASE("Parsing with-forward-dependencies", "[NoDB]")
-{
-    auto const opt1 = opt({"--with-forward-dependencies", "true"});
-    CHECK(opt1.with_forward_dependencies);
-
-    auto const opt2 = opt({"--with-forward-dependencies", "false"});
-    CHECK_FALSE(opt2.with_forward_dependencies);
-}
-
-TEST_CASE("Parsing with-forward-dependencies fails for unknown value", "[NoDB]")
-{
-    bad_opt({"--with-forward-dependencies", "foo"},
-            "Unknown value for"
-            " --with-forward-dependencies option: ");
-}
diff --git a/tests/test-output-gazetteer.cpp b/tests/test-output-gazetteer.cpp
deleted file mode 100644
index c18ce95d9..000000000
--- a/tests/test-output-gazetteer.cpp
+++ /dev/null
@@ -1,792 +0,0 @@
-/**
- * SPDX-License-Identifier: GPL-2.0-or-later
- *
- * This file is part of osm2pgsql (https://osm2pgsql.org/).
- *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
- * For a full list of authors see the git log.
- */
-
-#include <catch.hpp>
-
-#include <random>
-#include <utility>
-#include <vector>
-
-#include "common-import.hpp"
-#include "common-options.hpp"
-
-static testing::db::import_t db;
-
-// Use a random device with a fixed seed. We don't really care about
-// the quality of random numbers here, we just need to generate valid
-// OSM test data. The fixed seed ensures that the results are reproducible.
-static std::mt19937_64 rng{47382}; // NOLINT(cert-msc32-c,cert-msc51-cpp)
-
-class node_opl_t
-{
-public:
-    void add(osmid_t id, char const *tags)
-    {
-        std::uniform_real_distribution<double> dist{-90, 89.99};
-
-        fmt::format_to(std::back_inserter(m_opl), "n{} T{} x{} y{}\n", id, tags,
-                       2 * dist(rng), dist(rng));
-    }
-
-    void del(osmid_t id)
-    {
-        fmt::format_to(std::back_inserter(m_opl), "n{} v2 dD\n", id);
-    }
-
-    std::string get_and_clear_opl()
-    {
-        std::string ret = fmt::to_string(m_opl);
-        m_opl.clear();
-        return ret;
-    }
-
-    static char type() noexcept { return 'N'; }
-
-private:
-    fmt::memory_buffer m_opl;
-};
-
-class way_opl_t
-{
-public:
-    void add(osmid_t id, char const *tags)
-    {
-        osmid_t const first_node = m_current_node_id;
-        osmid_t const last_node = make_nodes();
-
-        fmt::format_to(std::back_inserter(m_way_opl), "w{} T{} N", id, tags);
-        for (osmid_t i = first_node; i <= last_node; ++i) {
-            fmt::format_to(std::back_inserter(m_way_opl), "n{}{}", i,
-                           i == last_node ? '\n' : ',');
-        }
-    }
-
-    void del(osmid_t id)
-    {
-        fmt::format_to(std::back_inserter(m_way_opl), "w{} v2 dD\n", id);
-    }
-
-    std::string get_and_clear_opl()
-    {
-        std::string final_opl = fmt::to_string(m_node_opl);
-        final_opl += fmt::to_string(m_way_opl);
-
-        m_node_opl.clear();
-        m_way_opl.clear();
-
-        return final_opl;
-    }
-
-    static char type() noexcept { return 'W'; }
-
-private:
-    osmid_t make_nodes()
-    {
-        std::uniform_int_distribution<unsigned> intdist{2, 8};
-        unsigned const num_nodes = intdist(rng);
-
-        // compute the start point, all points afterwards are relative
-        std::uniform_real_distribution<double> dist{-89.9, 89.9};
-        double x = 2 * dist(rng);
-        double y = dist(rng);
-
-        std::uniform_real_distribution<double> diff_dist{-0.01, 0.01};
-        for (unsigned i = 0; i < num_nodes; ++i) {
-            fmt::format_to(std::back_inserter(m_node_opl), "n{} x{} y{}\n",
-                           m_current_node_id++, x, y);
-            double diffx = 0.0;
-            double diffy = 0.0;
-            do {
-                diffx = diff_dist(rng);
-                diffy = diff_dist(rng);
-            } while (diffx == 0.0 && diffy == 0.0);
-            x += diffx;
-            y += diffy;
-        }
-
-        return m_current_node_id - 1;
-    }
-
-    osmid_t m_current_node_id = 100;
-    fmt::memory_buffer m_node_opl;
-    fmt::memory_buffer m_way_opl;
-};
-
-class relation_opl_t
-{
-public:
-    void add(osmid_t id, char const *tags)
-    {
-        osmid_t const first_node = m_current_node_id;
-        osmid_t const last_node = make_nodes();
-
-        // create a very simple multipolygon with one closed way
-        fmt::format_to(std::back_inserter(m_way_opl), "w{} N", id, tags);
-        for (osmid_t i = first_node; i <= last_node; ++i) {
-            fmt::format_to(std::back_inserter(m_way_opl), "n{},", i);
-        }
-        fmt::format_to(std::back_inserter(m_way_opl), "n{}\n", first_node);
-
-        fmt::format_to(std::back_inserter(m_rel_opl),
-                       "r{} Ttype=multipolygon,{} Mw{}@\n", id, tags, id);
-    }
-
-    void del(osmid_t id)
-    {
-        fmt::format_to(std::back_inserter(m_rel_opl), "r{} v2 dD\n", id);
-    }
-
-    std::string get_and_clear_opl()
-    {
-        std::string final_opl = fmt::to_string(m_node_opl);
-        final_opl += fmt::to_string(m_way_opl);
-        final_opl += fmt::to_string(m_rel_opl);
-
-        m_node_opl.clear();
-        m_way_opl.clear();
-        m_rel_opl.clear();
-
-        return final_opl;
-    }
-
-    static char type() noexcept { return 'R'; }
-
-private:
-    osmid_t make_nodes()
-    {
-        // compute a centre points and compute four corners from this
-        std::uniform_real_distribution<double> dist{-89.9, 89.9};
-        double const x = 2 * dist(rng);
-        double const y = dist(rng);
-
-        std::uniform_real_distribution<double> diff_dist{0.0000001, 0.01};
-
-        fmt::format_to(std::back_inserter(m_node_opl), "n{} x{} y{}\n",
-                       m_current_node_id++, x - diff_dist(rng),
-                       y - diff_dist(rng));
-        fmt::format_to(std::back_inserter(m_node_opl), "n{} x{} y{}\n",
-                       m_current_node_id++, x - diff_dist(rng),
-                       y + diff_dist(rng));
-        fmt::format_to(std::back_inserter(m_node_opl), "n{} x{} y{}\n",
-                       m_current_node_id++, x + diff_dist(rng),
-                       y + diff_dist(rng));
-        fmt::format_to(std::back_inserter(m_node_opl), "n{} x{} y{}\n",
-                       m_current_node_id++, x + diff_dist(rng),
-                       y - diff_dist(rng));
-
-        return m_current_node_id - 1;
-    }
-
-    osmid_t m_current_node_id = 100;
-    fmt::memory_buffer m_node_opl;
-    fmt::memory_buffer m_way_opl;
-    fmt::memory_buffer m_rel_opl;
-};
-
-using hstore_item = std::pair<std::string, std::string>;
-using hstore_list = std::vector<hstore_item>;
-
-template <typename T>
-class gazetteer_fixture_t
-{
-public:
-    void add(osmid_t id, char const *tags) { m_opl_factory.add(id, tags); }
-
-    void del(osmid_t id) { m_opl_factory.del(id); }
-
-    void import()
-    {
-        std::string const opl = m_opl_factory.get_and_clear_opl();
-        REQUIRE_NOTHROW(
-            db.run_import(testing::opt_t().gazetteer().slim(), opl.c_str()));
-    }
-
-    void update()
-    {
-        auto const opt = testing::opt_t().gazetteer().slim().append();
-        std::string const opl = m_opl_factory.get_and_clear_opl();
-        REQUIRE_NOTHROW(db.run_import(opt, opl.c_str()));
-    }
-
-    int obj_count(testing::pg::conn_t const &conn, osmid_t id, char const *cls)
-    {
-        char const tchar = m_opl_factory.type();
-        return conn.get_count("place", fmt::format("osm_type = '{}' AND"
-                                                   " osm_id = {} AND"
-                                                   " class = '{}'",
-                                                   tchar, id, cls));
-    }
-
-    void obj_names(testing::pg::conn_t const &conn, osmid_t id, char const *cls,
-                   hstore_list const &names)
-    {
-        hstore_compare(conn, id, cls, "name", names);
-    }
-
-    void obj_address(testing::pg::conn_t const &conn, osmid_t id,
-                     char const *cls, hstore_list const &names)
-    {
-        hstore_compare(conn, id, cls, "address", names);
-    }
-
-    void obj_extratags(testing::pg::conn_t const &conn, osmid_t id,
-                       char const *cls, hstore_list const &names)
-    {
-        hstore_compare(conn, id, cls, "extratags", names);
-    }
-
-    std::string obj_field(testing::pg::conn_t const &conn, osmid_t id,
-                          char const *cls, char const *column)
-    {
-        char const tchar = m_opl_factory.type();
-        return conn.result_as_string(fmt::format(
-            "SELECT {} FROM place WHERE osm_type = '{}' AND osm_id = {}"
-            " AND class = '{}'",
-            column, tchar, id, cls));
-    }
-
-private:
-    void hstore_compare(testing::pg::conn_t const &conn, osmid_t id,
-                        char const *cls, char const *column,
-                        hstore_list const &names)
-    {
-        char const tchar = m_opl_factory.type();
-        auto const res = conn.exec("SELECT skeys({}), svals({}) FROM place"
-                                   " WHERE osm_type = '{}' AND "
-                                   " osm_id = {} AND class = '{}'",
-                                   column, column, tchar, id, cls);
-
-        hstore_list actual;
-        for (int i = 0; i < res.num_tuples(); ++i) {
-            actual.emplace_back(res.get_value(i, 0), res.get_value(i, 1));
-        }
-
-        CHECK_THAT(actual, Catch::Matchers::UnorderedEquals(names));
-    }
-
-    T m_opl_factory;
-};
-
-namespace Catch {
-template <>
-struct StringMaker<hstore_item>
-{
-    static std::string convert(hstore_item const &value)
-    {
-        return fmt::format("({}, {})", std::get<0>(value), std::get<1>(value));
-    }
-};
-} // namespace Catch
-
-using node_importer_t = gazetteer_fixture_t<node_opl_t>;
-using way_importer_t = gazetteer_fixture_t<way_opl_t>;
-using relation_importer_t = gazetteer_fixture_t<relation_opl_t>;
-
-TEMPLATE_TEST_CASE("Main tags", "", node_importer_t, way_importer_t,
-                   relation_importer_t)
-{
-    TestType t;
-
-    SECTION("Import main tags as fallback")
-    {
-        t.add(100, "junction=yes,highway=bus_stop");
-        t.add(101, "junction=yes,name=Bar");
-        t.add(200, "building=yes,amenity=cafe");
-        t.add(201, "building=yes,name=Intersting");
-        t.add(202, "building=yes");
-
-        t.import();
-
-        auto conn = db.connect();
-
-        CHECK(0 == t.obj_count(conn, 100, "junction"));
-        CHECK(1 == t.obj_count(conn, 101, "junction"));
-        CHECK(0 == t.obj_count(conn, 200, "building"));
-        CHECK(1 == t.obj_count(conn, 201, "building"));
-        CHECK(0 == t.obj_count(conn, 202, "building"));
-    }
-
-    SECTION("Main tag deleted")
-    {
-        t.add(1, "amenity=restaurant");
-        t.add(2, "highway=bus_stop,railway=stop,name=X");
-        t.add(3, "amenity=prison");
-
-        t.import();
-
-        auto conn = db.connect();
-
-        CHECK(1 == t.obj_count(conn, 1, "amenity"));
-        CHECK(1 == t.obj_count(conn, 2, "highway"));
-        CHECK(1 == t.obj_count(conn, 2, "railway"));
-        CHECK(1 == t.obj_count(conn, 3, "amenity"));
-
-        t.add(1, "not_a=restaurant");
-        t.add(2, "highway=bus_stop,name=X");
-        t.del(3);
-
-        t.update();
-
-        CHECK(0 == t.obj_count(conn, 1, "amenity"));
-        CHECK(2 == t.obj_count(conn, 2, "highway"));
-        CHECK(0 == t.obj_count(conn, 2, "railway"));
-        CHECK(0 == t.obj_count(conn, 3, "amenity"));
-    }
-
-    SECTION("Main tag added")
-    {
-        t.add(1, "atiy=restaurant");
-        t.add(2, "highway=bus_stop,name=X");
-
-        t.import();
-
-        auto conn = db.connect();
-
-        CHECK(0 == t.obj_count(conn, 1, "amenity"));
-        CHECK(1 == t.obj_count(conn, 2, "highway"));
-        CHECK(0 == t.obj_count(conn, 2, "railway"));
-        CHECK(0 == t.obj_count(conn, 3, "amenity"));
-
-        t.add(1, "amenity=restaurant");
-        t.add(2, "highway=bus_stop,railway=stop,name=X");
-        t.add(3, "amenity=prison");
-
-        t.update();
-
-        CHECK(1 == t.obj_count(conn, 1, "amenity"));
-        CHECK(2 == t.obj_count(conn, 2, "highway"));
-        CHECK(1 == t.obj_count(conn, 2, "railway"));
-        CHECK(1 == t.obj_count(conn, 3, "amenity"));
-    }
-
-    SECTION("Main tag modified")
-    {
-        t.add(10, "highway=footway,name=X");
-        t.add(11, "amenity=atm");
-
-        t.import();
-
-        auto conn = db.connect();
-
-        CHECK(1 == t.obj_count(conn, 10, "highway"));
-        CHECK(1 == t.obj_count(conn, 11, "amenity"));
-
-        t.add(10, "highway=path,name=X");
-        t.add(11, "highway=primary");
-
-        t.update();
-
-        CHECK(2 == t.obj_count(conn, 10, "highway"));
-        CHECK(0 == t.obj_count(conn, 11, "amenity"));
-        CHECK(1 == t.obj_count(conn, 11, "highway"));
-    }
-
-    SECTION("Main tags with name, name added")
-    {
-        t.add(45, "landuse=cemetry");
-        t.add(46, "building=yes");
-
-        t.import();
-
-        auto conn = db.connect();
-
-        CHECK(0 == t.obj_count(conn, 45, "landuse"));
-        CHECK(0 == t.obj_count(conn, 46, "building"));
-
-        t.add(45, "landuse=cemetry,name=TODO");
-        t.add(46, "building=yes,addr:housenumber=1");
-
-        t.update();
-
-        CHECK(1 == t.obj_count(conn, 45, "landuse"));
-        CHECK(1 == t.obj_count(conn, 46, "building"));
-    }
-
-    SECTION("Main tags with name, name removed")
-    {
-        t.add(45, "landuse=cemetry,name=TODO");
-        t.add(46, "building=yes,addr:housenumber=1");
-
-        t.import();
-
-        auto conn = db.connect();
-
-        CHECK(1 == t.obj_count(conn, 45, "landuse"));
-        CHECK(1 == t.obj_count(conn, 46, "building"));
-
-        t.add(45, "landuse=cemetry");
-        t.add(46, "building=yes");
-
-        t.update();
-
-        CHECK(0 == t.obj_count(conn, 45, "landuse"));
-        CHECK(0 == t.obj_count(conn, 46, "building"));
-    }
-
-    SECTION("Main tags with name, name modified")
-    {
-        t.add(45, "landuse=cemetry,name=TODO");
-        t.add(46, "building=yes,addr:housenumber=1");
-
-        t.import();
-
-        auto conn = db.connect();
-
-        CHECK(1 == t.obj_count(conn, 45, "landuse"));
-        CHECK(1 == t.obj_count(conn, 46, "building"));
-
-        t.add(45, "landuse=cemetry,name=DONE");
-        t.add(46, "building=yes,addr:housenumber=10");
-
-        t.update();
-
-        CHECK(2 == t.obj_count(conn, 45, "landuse"));
-        CHECK(2 == t.obj_count(conn, 46, "building"));
-    }
-
-    SECTION("Main tag added to address only node")
-    {
-        t.add(1, "addr:housenumber=345");
-
-        t.import();
-
-        auto conn = db.connect();
-
-        CHECK(1 == t.obj_count(conn, 1, "place"));
-        CHECK(0 == t.obj_count(conn, 1, "building"));
-
-        t.add(1, "addr:housenumber=345,building=yes");
-
-        t.update();
-
-        CHECK(0 == t.obj_count(conn, 1, "place"));
-        CHECK(1 == t.obj_count(conn, 1, "building"));
-    }
-
-    SECTION("Main tag removed from address only node")
-    {
-        t.add(1, "addr:housenumber=345,building=yes");
-
-        t.import();
-
-        auto conn = db.connect();
-
-        CHECK(0 == t.obj_count(conn, 1, "place"));
-        CHECK(1 == t.obj_count(conn, 1, "building"));
-
-        t.add(1, "addr:housenumber=345");
-
-        t.update();
-
-        CHECK(1 == t.obj_count(conn, 1, "place"));
-        CHECK(0 == t.obj_count(conn, 1, "building"));
-    }
-
-    SECTION("Main tags with name key, adding key name")
-    {
-        t.add(22, "bridge=yes");
-
-        t.import();
-
-        auto conn = db.connect();
-
-        CHECK(0 == t.obj_count(conn, 22, "bridge"));
-
-        t.add(22, "bridge=yes,bridge:name=high");
-
-        t.update();
-
-        CHECK(1 == t.obj_count(conn, 22, "bridge"));
-    }
-
-    SECTION("Main tags with name key, deleting key name")
-    {
-        t.add(22, "bridge=yes,bridge:name=high");
-
-        t.import();
-
-        auto conn = db.connect();
-
-        CHECK(1 == t.obj_count(conn, 22, "bridge"));
-
-        t.add(22, "bridge=yes");
-
-        t.update();
-
-        CHECK(0 == t.obj_count(conn, 22, "bridge"));
-    }
-
-    SECTION("Main tags with name key, changing key name")
-    {
-        t.add(22, "bridge=yes,bridge:name=high");
-
-        t.import();
-
-        auto conn = db.connect();
-
-        CHECK(1 == t.obj_count(conn, 22, "bridge"));
-
-        t.add(22, "bridge=yes,bridge:name:en=high");
-
-        t.update();
-
-        CHECK(2 == t.obj_count(conn, 22, "bridge"));
-    }
-}
-
-TEST_CASE("Operator tag")
-{
-    node_importer_t t;
-
-    t.add(1001, "amenity=restaurant,operator=McDo");
-    t.add(1002, "amenity=prison,operator=police");
-
-    t.import();
-
-    auto conn = db.connect();
-
-    t.obj_names(conn, 1001, "amenity", {{"operator", "McDo"}});
-    t.obj_names(conn, 1002, "amenity", {});
-}
-
-TEST_CASE("Name and reg tags")
-{
-    node_importer_t t;
-
-    t.add(2001, "highway=road,name=Foo,alt_name:de=Bar,ref=45");
-    t.add(2002, "highway=road,name:prefix=Pre,name:suffix=Post,ref:de=55");
-    t.add(2003, "highway=yes,name:%20%de=Foo,name=real1");
-    t.add(2004, "highway=yes,name:%a%de=Foo,name=real2");
-    t.add(2005, "highway=yes,name:%9%de=Foo,name:\\\\=real3");
-    t.add(2006, "highway=yes,name:%9%de=Foo,name=rea\\l3");
-
-    t.import();
-
-    auto conn = db.connect();
-
-    t.obj_names(conn, 2001, "highway",
-                {{"name", "Foo"}, {"alt_name:de", "Bar"}, {"ref", "45"}});
-    t.obj_names(conn, 2002, "highway", {});
-    t.obj_extratags(
-        conn, 2002, "highway",
-        {{"name:prefix", "Pre"}, {"name:suffix", "Post"}, {"ref:de", "55"}});
-    t.obj_names(conn, 2003, "highway",
-                {{"name: de", "Foo"}, {"name", "real1"}});
-    t.obj_names(conn, 2004, "highway",
-                {{"name:\nde", "Foo"}, {"name", "real2"}});
-    t.obj_names(conn, 2005, "highway",
-                {{"name:\tde", "Foo"}, {"name:\\\\", "real3"}});
-    t.obj_names(conn, 2006, "highway",
-                {{"name:\tde", "Foo"}, {"name", "rea\\l3"}});
-}
-
-TEST_CASE("Name when using with_name flag")
-{
-    node_importer_t t;
-
-    t.add(3001, "bridge=yes,bridge:name=GoldenGate");
-    t.add(3002, "bridge=yes,bridge:name:en=Rainbow");
-
-    t.import();
-
-    auto conn = db.connect();
-
-    t.obj_names(conn, 3001, "bridge", {{"name", "GoldenGate"}});
-    t.obj_names(conn, 3002, "bridge", {{"name:en", "Rainbow"}});
-}
-
-TEST_CASE("Address tags")
-{
-    node_importer_t t;
-
-    t.add(4001, "addr:housenumber=34,addr:city=Esmarald,addr:county=Land");
-    t.add(4002, "addr:streetnumber=10,is_in:city=Rootoo,is_in=Gold");
-
-    t.import();
-
-    auto conn = db.connect();
-
-    t.obj_address(
-        conn, 4001, "place",
-        {{"housenumber", "34"}, {"city", "Esmarald"}, {"county", "Land"}});
-    t.obj_address(
-        conn, 4002, "place",
-        {{"streetnumber", "10"}, {"city", "Rootoo"}, {"is_in", "Gold"}});
-}
-
-TEST_CASE("Country codes")
-{
-    node_importer_t t;
-
-    t.add(5001, "shop=yes,country_code=DE");
-    t.add(5002, "shop=yes,country_code=toolong");
-    t.add(5003, "shop=yes,country_code=x");
-    t.add(5004, "shop=yes,addr:country=us");
-    t.add(5005, "shop=yes,is_in:country=be");
-
-    t.import();
-
-    auto conn = db.connect();
-
-    t.obj_address(conn, 5001, "shop", {{"country", "DE"}});
-    t.obj_address(conn, 5002, "shop", {});
-    t.obj_address(conn, 5003, "shop", {});
-    t.obj_address(conn, 5004, "shop", {{"country", "us"}});
-    t.obj_address(conn, 5005, "shop", {});
-}
-
-TEST_CASE("Postcodes")
-{
-    node_importer_t t;
-
-    t.add(6001, "shop=bank,addr:postcode=12345");
-    t.add(6002, "shop=bank,tiger:zip_left=34343");
-    t.add(6003, "shop=bank,is_in:postcode=9009");
-
-    t.import();
-
-    auto conn = db.connect();
-
-    t.obj_address(conn, 6001, "shop", {{"postcode", "12345"}});
-    t.obj_address(conn, 6002, "shop", {{"postcode", "34343"}});
-    t.obj_address(conn, 6003, "shop", {});
-}
-
-TEST_CASE("Main with extra")
-{
-    way_importer_t t;
-
-    t.add(7001, "highway=primary,bridge=yes,name=1");
-
-    t.import();
-
-    auto conn = db.connect();
-
-    t.obj_extratags(conn, 7001, "highway", {{"bridge", "yes"}});
-}
-
-TEST_CASE("Global fallback and skipping")
-{
-    node_importer_t t;
-
-    t.add(8001, "shop=shoes,note:de=Nein,xx=yy");
-    t.add(8002, "shop=shoes,building=no,ele=234");
-    t.add(8003, "shop=shoes,name:source=survey");
-
-    t.import();
-
-    auto conn = db.connect();
-
-    t.obj_extratags(conn, 8001, "shop", {{"xx", "yy"}});
-    t.obj_extratags(conn, 8002, "shop", {{"ele", "234"}});
-    t.obj_extratags(conn, 8003, "shop", {});
-}
-
-TEST_CASE("Admin levels")
-{
-    node_importer_t t;
-
-    t.add(9001, "place=city");
-    t.add(9002, "place=city,admin_level=16");
-    t.add(9003, "place=city,admin_level=x");
-    t.add(9004, "place=city,admin_level=1");
-    t.add(9005, "place=city,admin_level=0");
-    t.add(9006, "place=city,admin_level=2.5");
-
-    t.import();
-
-    auto conn = db.connect();
-
-    CHECK("15" == t.obj_field(conn, 9001, "place", "admin_level"));
-    CHECK("15" == t.obj_field(conn, 9002, "place", "admin_level"));
-    CHECK("15" == t.obj_field(conn, 9003, "place", "admin_level"));
-    CHECK("1" == t.obj_field(conn, 9004, "place", "admin_level"));
-    CHECK("15" == t.obj_field(conn, 9005, "place", "admin_level"));
-    CHECK("15" == t.obj_field(conn, 9006, "place", "admin_level"));
-}
-
-TEST_CASE("Administrative boundaries with place tags")
-{
-    relation_importer_t t;
-
-    t.add(10001, "boundary=administrative,place=city,name=A");
-    t.add(10002, "boundary=natural,place=city,name=B");
-    t.add(10003, "boundary=administrative,place=island,name=C");
-
-    t.import();
-
-    auto conn = db.connect();
-
-    CHECK(1 == t.obj_count(conn, 10001, "boundary"));
-    CHECK(0 == t.obj_count(conn, 10001, "place"));
-    t.obj_extratags(conn, 10001, "boundary", {{"place", "city"}});
-    CHECK(1 == t.obj_count(conn, 10002, "boundary"));
-    CHECK(1 == t.obj_count(conn, 10002, "place"));
-    t.obj_extratags(conn, 10002, "boundary", {});
-    CHECK(1 == t.obj_count(conn, 10003, "boundary"));
-    CHECK(1 == t.obj_count(conn, 10003, "place"));
-    t.obj_extratags(conn, 10003, "boundary", {});
-}
-
-TEST_CASE("Shorten tiger:county tags")
-{
-    node_importer_t t;
-
-    t.add(11001, "place=village,tiger:county=Feebourgh%2c%%20%AL");
-    t.add(11002,
-          "place=village,addr:state=Alabama,tiger:county=Feebourgh%2c%%20%AL");
-    t.add(11003, "place=village,tiger:county=Feebourgh");
-
-    t.import();
-
-    auto conn = db.connect();
-
-    t.obj_address(conn, 11001, "place", {{"tiger:county", "Feebourgh county"}});
-    t.obj_address(conn, 11002, "place",
-                  {{"tiger:county", "Feebourgh county"}, {"state", "Alabama"}});
-    t.obj_address(conn, 11003, "place", {{"tiger:county", "Feebourgh county"}});
-}
-
-TEST_CASE("Building fallbacks")
-{
-    node_importer_t t;
-
-    t.add(12001, "tourism=hotel,building=yes");
-    t.add(12002, "building=house");
-    t.add(12003, "building=shed,addr:housenumber=1");
-    t.add(12004, "building=yes,name=Das-Haus");
-    t.add(12005, "building=yes,addr:postcode=12345");
-
-    t.import();
-
-    auto conn = db.connect();
-
-    CHECK("hotel" == t.obj_field(conn, 12001, "tourism", "type"));
-    CHECK(0 == t.obj_count(conn, 12001, "building"));
-    CHECK(0 == t.obj_count(conn, 12002, "building"));
-    CHECK("shed" == t.obj_field(conn, 12003, "building", "type"));
-    CHECK("yes" == t.obj_field(conn, 12004, "building", "type"));
-    CHECK("postcode" == t.obj_field(conn, 12005, "place", "type"));
-}
-
-TEST_CASE("Address interpolations")
-{
-    way_importer_t t;
-
-    t.add(13001, "addr:interpolation=odd");
-    t.add(13002, "addr:interpolation=even,place=city");
-
-    t.import();
-
-    auto conn = db.connect();
-
-    CHECK("houses" == t.obj_field(conn, 13001, "place", "type"));
-    CHECK("houses" == t.obj_field(conn, 13002, "place", "type"));
-    t.obj_extratags(conn, 13002, "place", {{"place", "city"}});
-}

From 7acb80c8cdb8d6fc09c7919c486ffcdbff2a5f8d Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 3 Apr 2024 21:32:30 +0200
Subject: [PATCH 102/430] Replace add_row() by insert() in BDD tests

As preparation for the removal of the add_row() function.
---
 tests/bdd/flex/area.feature               | 19 ++++++----
 tests/bdd/flex/bbox.feature               | 21 ++++++-----
 tests/bdd/flex/extra-attributes.feature   |  6 ++--
 tests/bdd/flex/invalid-geometries.feature | 24 +++++++------
 tests/bdd/flex/line-splitting.feature     | 18 +++++-----
 tests/bdd/flex/multigeom.feature          | 44 ++++++++++++-----------
 tests/bdd/flex/nocluster.feature          |  7 ++--
 tests/bdd/flex/nogeom.feature             |  2 +-
 tests/bdd/flex/relation-changes.feature   |  6 ++--
 9 files changed, 83 insertions(+), 64 deletions(-)

diff --git a/tests/bdd/flex/area.feature b/tests/bdd/flex/area.feature
index 27f952263..bc6d7a5ba 100644
--- a/tests/bdd/flex/area.feature
+++ b/tests/bdd/flex/area.feature
@@ -21,22 +21,27 @@ Feature: Tests for area column type
                 columns = {
                     { column = 'name', type = 'text' },
                     { column = 'geom', type = 'geometry', projection = <geom proj> },
-                    { column = 'area', type = 'area', projection = <area proj> },
+                    { column = 'area', type = 'real' },
                 }
             }
 
             function osm2pgsql.process_way(object)
-                polygons:add_row({
+                local geom = object:as_polygon()
+                polygons:insert({
                     name = object.tags.name,
-                    geom = { create = 'area' }
+                    geom = geom,
+                    area = geom:transform(<area proj>):area()
                 })
             end
 
             function osm2pgsql.process_relation(object)
-                polygons:add_row({
-                    name = object.tags.name,
-                    geom = { create = 'area', split_at = 'multi' }
-                })
+                for sgeom in object:as_multipolygon():geometries() do
+                    polygons:insert({
+                        name = object.tags.name,
+                        geom = sgeom,
+                        area = sgeom:transform(<area proj>):area()
+                    })
+                end
             end
             """
         When running osm2pgsql flex
diff --git a/tests/bdd/flex/bbox.feature b/tests/bdd/flex/bbox.feature
index 485e7d674..8c50fbc6f 100644
--- a/tests/bdd/flex/bbox.feature
+++ b/tests/bdd/flex/bbox.feature
@@ -12,13 +12,13 @@ Feature: Test get_bbox() function
                 { column = 'min_y', type = 'real' },
                 { column = 'max_x', type = 'real' },
                 { column = 'max_y', type = 'real' },
-                { column = 'geom',  type = 'point', projection = <projection> },
+                { column = 'geom',  type = 'point', projection = <projection>, not_null = true },
             })
 
             function osm2pgsql.process_node(object)
-                local row = {}
+                local row = { geom = object:as_point() }
                 row.min_x, row.min_y, row.max_x, row.max_y = object:get_bbox()
-                points:add_row(row)
+                points:insert(row)
             end
             """
         When running osm2pgsql flex
@@ -47,13 +47,13 @@ Feature: Test get_bbox() function
                 { column = 'min_y', type = 'real' },
                 { column = 'max_x', type = 'real' },
                 { column = 'max_y', type = 'real' },
-                { column = 'geom',  type = 'linestring', projection = <projection> },
+                { column = 'geom',  type = 'linestring', projection = <projection>, not_null = true },
             })
 
             function osm2pgsql.process_way(object)
-                local row = { geom = { create = 'line' } }
+                local row = { geom = object:as_linestring() }
                 row.min_x, row.min_y, row.max_x, row.max_y = object:get_bbox()
-                highways:add_row(row)
+                highways:insert(row)
             end
             """
         When running osm2pgsql flex
@@ -85,13 +85,16 @@ Feature: Test get_bbox() function
                 { column = 'min_y', type = 'real' },
                 { column = 'max_x', type = 'real' },
                 { column = 'max_y', type = 'real' },
-                { column = 'geom',  type = 'linestring', projection = <projection> },
+                { column = 'geom',  type = 'linestring', projection = <projection>, not_null = true },
             })
 
             function osm2pgsql.process_relation(object)
-                local row = { geom = { create = 'line' } }
+                local row = {}
                 row.min_x, row.min_y, row.max_x, row.max_y = object:get_bbox()
-                rels:add_row(row)
+                for sgeom in object:as_multilinestring():line_merge():geometries() do
+                    row.geom = sgeom
+                    rels:insert(row)
+                end
             end
             """
         When running osm2pgsql flex
diff --git a/tests/bdd/flex/extra-attributes.feature b/tests/bdd/flex/extra-attributes.feature
index b299a8d2e..d885dbbe2 100644
--- a/tests/bdd/flex/extra-attributes.feature
+++ b/tests/bdd/flex/extra-attributes.feature
@@ -14,13 +14,13 @@ Feature: Tests for including extra attributes
                     { column = 'timestamp', type = 'int4' },
                     { column = 'uid', type = 'int4' },
                     { column = 'user', type = 'text' },
-                    { column = 'geom', type = 'linestring' },
+                    { column = 'geom', type = 'linestring', not_null = true },
                 }
             }
 
             function osm2pgsql.process_way(object)
-                object.geom = { create = 'line' }
-                attr_table:add_row(object)
+                object.geom = object:as_linestring()
+                attr_table:insert(object)
             end
             """
 
diff --git a/tests/bdd/flex/invalid-geometries.feature b/tests/bdd/flex/invalid-geometries.feature
index 3ed9b6641..c9c47421d 100644
--- a/tests/bdd/flex/invalid-geometries.feature
+++ b/tests/bdd/flex/invalid-geometries.feature
@@ -10,7 +10,7 @@ Feature: Test handling of invalid geometries
                 ids = { type = 'way', id_column = 'osm_id' },
                 columns = {
                     { column = 'tags', type = 'hstore' },
-                    { column = 'geom', type = 'linestring', projection = 4326 },
+                    { column = 'geom', type = 'linestring', projection = 4326, not_null = true },
                 }
             }
 
@@ -19,28 +19,32 @@ Feature: Test handling of invalid geometries
                 ids = { type = 'area', id_column = 'osm_id' },
                 columns = {
                     { column = 'tags', type = 'hstore' },
-                    { column = 'geom', type = 'geometry', projection = 4326 }
+                    { column = 'geom', type = 'geometry', projection = 4326, not_null = true }
                 }
             }
 
             function osm2pgsql.process_way(object)
                 if object.tags.natural then
-                    tables.polygon:add_row({
+                    tables.polygon:insert({
                         tags = object.tags,
-                        geom = { create = 'area' }
+                        geom = object:as_polygon()
                     })
                 else
-                    tables.line:add_row({
-                        tags = object.tags
+                    tables.line:insert({
+                        tags = object.tags,
+                        geom = object:as_linestring()
                     })
                 end
             end
 
             function osm2pgsql.process_relation(object)
-                tables.polygon:add_row({
-                    tags = object.tags,
-                    geom = { create = 'area', split_at = 'multi' }
-                })
+                local mgeom = object:as_multipolygon()
+                for sgeom in mgeom:geometries() do
+                    tables.polygon:insert({
+                        tags = object.tags,
+                        geom = sgeom
+                    })
+                end
             end
             """
 
diff --git a/tests/bdd/flex/line-splitting.feature b/tests/bdd/flex/line-splitting.feature
index 4ed2debf9..48fdfdcae 100644
--- a/tests/bdd/flex/line-splitting.feature
+++ b/tests/bdd/flex/line-splitting.feature
@@ -7,23 +7,25 @@ Feature: Test splitting of lines
 
             tables.line = osm2pgsql.define_way_table('osm2pgsql_test_line', {
                 { column = 'tags', type = 'hstore' },
-                { column = 'geom', type = 'linestring', projection = 4326 }
+                { column = 'geom', type = 'linestring', projection = 4326, not_null = true }
             })
 
             tables.split = osm2pgsql.define_way_table('osm2pgsql_test_split', {
                 { column = 'tags', type = 'hstore' },
-                { column = 'geom', type = 'linestring', projection = 4326 }
+                { column = 'geom', type = 'linestring', projection = 4326, not_null = true }
             })
 
             function osm2pgsql.process_way(object)
-                tables.line:add_row({
+                tables.line:insert({
                     tags = object.tags,
-                    geom = { create = 'line' }
-                })
-                tables.split:add_row({
-                    tags = object.tags,
-                    geom = { create = 'line', split_at = 1.0 }
+                    geom = object:as_linestring()
                 })
+                for sgeom in object:as_linestring():segmentize(1.0):geometries() do
+                    tables.split:insert({
+                        tags = object.tags,
+                        geom = sgeom
+                    })
+                end
             end
             """
 
diff --git a/tests/bdd/flex/multigeom.feature b/tests/bdd/flex/multigeom.feature
index 944990e65..c5083729d 100644
--- a/tests/bdd/flex/multigeom.feature
+++ b/tests/bdd/flex/multigeom.feature
@@ -26,16 +26,16 @@ Feature: Handling of multiple geometries
             }
 
             function osm2pgsql.process_way(object)
-                polygons:add_row({
+                polygons:insert({
                     name = object.tags.name,
-                    geom = { create = 'area' }
+                    geom = object:as_polygon()
                 })
             end
 
             function osm2pgsql.process_relation(object)
-                polygons:add_row({
+                polygons:insert({
                     name = object.tags.name,
-                    geom = { create = 'area' }
+                    geom = object:as_multipolygon()
                 })
             end
             """
@@ -61,17 +61,19 @@ Feature: Handling of multiple geometries
             }
 
             function osm2pgsql.process_way(object)
-                polygons:add_row({
+                polygons:insert({
                     name = object.tags.name,
-                    geom = { create = 'area' }
+                    geom = object:as_polygon()
                 })
             end
 
             function osm2pgsql.process_relation(object)
-                polygons:add_row({
-                    name = object.tags.name,
-                    geom = { create = 'area', split_at = 'multi' }
-                })
+                for sgeom in object:as_multipolygon():geometries() do
+                    polygons:insert({
+                        name = object.tags.name,
+                        geom = sgeom
+                    })
+                end
             end
             """
         When running osm2pgsql flex
@@ -102,16 +104,16 @@ Feature: Handling of multiple geometries
             }
 
             function osm2pgsql.process_way(object)
-                polygons:add_row({
+                polygons:insert({
                     name = object.tags.name,
-                    geom = { create = 'area' }
+                    geom = object:as_polygon()
                 })
             end
 
             function osm2pgsql.process_relation(object)
-                polygons:add_row({
+                polygons:insert({
                     name = object.tags.name,
-                    geom = { create = 'area' }
+                    geom = object:as_multipolygon()
                 })
             end
             """
@@ -137,17 +139,19 @@ Feature: Handling of multiple geometries
             }
 
             function osm2pgsql.process_way(object)
-                polygons:add_row({
+                polygons:insert({
                     name = object.tags.name,
-                    geom = { create = 'area' }
+                    geom = object:as_polygon()
                 })
             end
 
             function osm2pgsql.process_relation(object)
-                polygons:add_row({
-                    name = object.tags.name,
-                    geom = { create = 'area', split_at = 'multi' }
-                })
+                for sgeom in object:as_multipolygon():geometries() do
+                    polygons:insert({
+                        name = object.tags.name,
+                        geom = sgeom
+                    })
+                end
             end
             """
         When running osm2pgsql flex
diff --git a/tests/bdd/flex/nocluster.feature b/tests/bdd/flex/nocluster.feature
index 3cfdcc982..0d99853a6 100644
--- a/tests/bdd/flex/nocluster.feature
+++ b/tests/bdd/flex/nocluster.feature
@@ -7,12 +7,13 @@ Feature: Test flex config without clustering
             """
             local dtable = osm2pgsql.define_node_table('osm2pgsql_test_point', {
                 { column = 'tags', type = 'hstore' },
-                { column = 'geom', type = 'point' },
+                { column = 'geom', type = 'point', not_null = true },
             }, { cluster = 'no' })
 
             function osm2pgsql.process_node(data)
-                dtable:add_row({
-                    tags = data.tags
+                dtable:insert({
+                    tags = data.tags,
+                    geom = data:as_point()
                 })
             end
             """
diff --git a/tests/bdd/flex/nogeom.feature b/tests/bdd/flex/nogeom.feature
index 5c3a2338a..d5f313bf3 100644
--- a/tests/bdd/flex/nogeom.feature
+++ b/tests/bdd/flex/nogeom.feature
@@ -13,7 +13,7 @@ Feature: Handling of tables without geometry
             })
 
             function osm2pgsql.process_node(object)
-                pois:add_row{ tags = object.tags }
+                pois:insert{ tags = object.tags }
             end
             """
         When running osm2pgsql flex with parameters
diff --git a/tests/bdd/flex/relation-changes.feature b/tests/bdd/flex/relation-changes.feature
index 3ab06983d..a05c469e7 100644
--- a/tests/bdd/flex/relation-changes.feature
+++ b/tests/bdd/flex/relation-changes.feature
@@ -5,14 +5,14 @@ Feature: Handling changes to relations
             """
             local rel_table = osm2pgsql.define_area_table('osm2pgsql_test_relations', {
                 { column = 'tags', type = 'hstore' },
-                { column = 'geom', type = 'geometry' }
+                { column = 'geom', type = 'geometry', not_null = true }
             })
 
             function osm2pgsql.process_relation(object)
                 if object.tags.type == 'multipolygon' then
-                    rel_table:add_row{
+                    rel_table:insert{
                         tags = object.tags,
-                        geom = { create = 'area' }
+                        geom = object:as_multipolygon()
                     }
                 end
             end

From d69022f324c15ff874a1ae80447a3c96a5d5e4cd Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 7 Apr 2024 19:51:38 +0200
Subject: [PATCH 103/430] reduce dependencies for windows build

Removes now unneeded boost-property-tree and reduces the proj
and bzip2 dependencies to the core build. This means that some
more exotic features of proj are no longer available.
---
 .github/actions/win-install/action.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/actions/win-install/action.yml b/.github/actions/win-install/action.yml
index c56613d89..a31825a95 100644
--- a/.github/actions/win-install/action.yml
+++ b/.github/actions/win-install/action.yml
@@ -8,13 +8,12 @@ runs:
       run: |
         vcpkg install \
           boost-geometry:x64-windows \
-          boost-property-tree:x64-windows \
-          bzip2:x64-windows \
+          bzip2[core]:x64-windows \
           expat:x64-windows \
           libpq:x64-windows \
           lua:x64-windows \
           nlohmann-json:x64-windows \
-          proj:x64-windows \
+          proj[core]:x64-windows \
           zlib:x64-windows
       shell: bash
     - name: Install psycopg2 and behave

From e752fdeaf48980586df7067e228a2f29ac0384ed Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 8 Aug 2023 09:28:51 +0200
Subject: [PATCH 104/430] Use helper function for DROP TABLE

---
 src/flex-table.cpp   |  6 +++---
 src/middle-pgsql.cpp |  8 ++------
 src/pgsql-helper.cpp | 11 ++++++++++-
 src/pgsql-helper.hpp |  3 +++
 src/table.cpp        | 11 ++++++-----
 5 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/flex-table.cpp b/src/flex-table.cpp
index 370499197..6dff56a4e 100644
--- a/src/flex-table.cpp
+++ b/src/flex-table.cpp
@@ -281,12 +281,12 @@ static void enable_check_trigger(pg_conn_t const &db_connection,
 void table_connection_t::start(pg_conn_t const &db_connection, bool append)
 {
     if (!append) {
-        db_connection.exec("DROP TABLE IF EXISTS {} CASCADE",
-                           table().full_name());
+        drop_table_if_exists(db_connection, table().schema(), table().name());
     }
 
     // These _tmp tables can be left behind if we run out of disk space.
-    db_connection.exec("DROP TABLE IF EXISTS {}", table().full_tmp_name());
+    drop_table_if_exists(db_connection, table().schema(),
+                         table().name() + "_tmp");
 
     if (!append) {
         db_connection.exec(table().build_sql_create_table(
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index f9759840e..e2f1df1ea 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -148,10 +148,7 @@ void middle_pgsql_t::table_desc::drop_table(
     util::timer_t timer;
 
     log_info("Dropping table '{}'", name());
-
-    auto const qual_name = qualified_name(schema(), name());
-    db_connection.exec("DROP TABLE IF EXISTS {}", qual_name);
-
+    drop_table_if_exists(db_connection, schema(), name());
     log_info("Table '{}' dropped in {}", name(),
              util::human_readable_duration(timer.stop()));
 }
@@ -1318,8 +1315,7 @@ static void table_setup(pg_conn_t const &db_connection,
                         middle_pgsql_t::table_desc const &table)
 {
     log_debug("Setting up table '{}'", table.name());
-    auto const qual_name = qualified_name(table.schema(), table.name());
-    db_connection.exec("DROP TABLE IF EXISTS {} CASCADE", qual_name);
+    drop_table_if_exists(db_connection, table.schema(), table.name());
     table.create_table(db_connection);
 }
 
diff --git a/src/pgsql-helper.cpp b/src/pgsql-helper.cpp
index b438594e4..43e2e1241 100644
--- a/src/pgsql-helper.cpp
+++ b/src/pgsql-helper.cpp
@@ -7,9 +7,11 @@
  * For a full list of authors see the git log.
  */
 
+#include "pgsql-helper.hpp"
+
 #include "format.hpp"
 #include "pgsql.hpp"
-#include "pgsql-helper.hpp"
+#include "pgsql-capabilities.hpp"
 
 #include <cassert>
 
@@ -73,3 +75,10 @@ void analyze_table(pg_conn_t const &db_connection, std::string const &schema,
     auto const qual_name = qualified_name(schema, name);
     db_connection.exec("ANALYZE {}", qual_name);
 }
+
+void drop_table_if_exists(pg_conn_t const &db_connection,
+                          std::string const &schema, std::string const &name)
+{
+    db_connection.exec("DROP TABLE IF EXISTS {} CASCADE",
+                       qualified_name(schema, name));
+}
diff --git a/src/pgsql-helper.hpp b/src/pgsql-helper.hpp
index 7a38ee753..4e0894b35 100644
--- a/src/pgsql-helper.hpp
+++ b/src/pgsql-helper.hpp
@@ -40,4 +40,7 @@ void drop_geom_check_trigger(pg_conn_t const &db_connection,
 void analyze_table(pg_conn_t const &db_connection, std::string const &schema,
                    std::string const &name);
 
+void drop_table_if_exists(pg_conn_t const &db_connection,
+                          std::string const &schema, std::string const &name);
+
 #endif // OSM2PGSQL_PGSQL_HELPER_HPP
diff --git a/src/table.cpp b/src/table.cpp
index 64c71d8af..0dc78826e 100644
--- a/src/table.cpp
+++ b/src/table.cpp
@@ -83,21 +83,22 @@ void table_t::start(connection_params_t const &connection_params,
 
     connect();
     log_info("Setting up table '{}'", m_target->name());
-    auto const qual_name = qualified_name(m_target->schema(), m_target->name());
-    auto const qual_tmp_name =
-        qualified_name(m_target->schema(), m_target->name() + "_tmp");
 
     // we are making a new table
     if (!m_append) {
-        m_db_connection->exec("DROP TABLE IF EXISTS {} CASCADE", qual_name);
+        drop_table_if_exists(*m_db_connection, m_target->schema(),
+                             m_target->name());
     }
 
     // These _tmp tables can be left behind if we run out of disk space.
-    m_db_connection->exec("DROP TABLE IF EXISTS {}", qual_tmp_name);
+    drop_table_if_exists(*m_db_connection, m_target->schema(),
+                         m_target->name() + "_tmp");
 
     //making a new table
     if (!m_append) {
         //define the new table
+        auto const qual_name =
+            qualified_name(m_target->schema(), m_target->name());
         auto sql =
             fmt::format("CREATE UNLOGGED TABLE {} (osm_id int8,", qual_name);
 

From a4f723b76fc7443eee7ea05999e95f9610c13805 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 2 Apr 2024 11:23:36 +0200
Subject: [PATCH 105/430] Remove support for the legacy Proj interface (Proj 4)

All major distributions have switched to newer versiosn long ago.
---
 .github/actions/build-and-test/action.yml |  4 +-
 .github/workflows/ci.yml                  | 28 +--------
 CMakeLists.txt                            | 43 +++----------
 README.md                                 | 18 +-----
 src/CMakeLists.txt                        |  8 +--
 src/reprojection-generic-proj4.cpp        | 77 -----------------------
 src/reprojection-generic-proj6.cpp        |  2 +-
 7 files changed, 19 insertions(+), 161 deletions(-)
 delete mode 100644 src/reprojection-generic-proj4.cpp

diff --git a/.github/actions/build-and-test/action.yml b/.github/actions/build-and-test/action.yml
index ce5a190e7..b62fc1048 100644
--- a/.github/actions/build-and-test/action.yml
+++ b/.github/actions/build-and-test/action.yml
@@ -22,8 +22,8 @@ runs:
           else
             CMAKE_OPTIONS="$CMAKE_OPTIONS -DWITH_LUAJIT=${LUAJIT_OPTION}"
           fi
-          if [ -n "$USE_PROJ_LIB" ]; then
-            CMAKE_OPTIONS="$CMAKE_OPTIONS -DUSE_PROJ_LIB=$USE_PROJ_LIB"
+          if [ -n "$WITH_PROJ" ]; then
+            CMAKE_OPTIONS="$CMAKE_OPTIONS -DWITH_PROJ=$WITH_PROJ"
           fi
           if [ -n "$CPP_VERSION" ]; then
             CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_CXX_STANDARD=$CPP_VERSION"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 543afe5bb..fdf016251 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -157,25 +157,6 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  ubuntu20-pg15-clang10-proj6:
-    runs-on: ubuntu-20.04
-
-    env:
-      CC: clang-10
-      CXX: clang++-10
-      LUA_VERSION: 5.3
-      LUAJIT_OPTION: OFF
-      POSTGRESQL_VERSION: 15
-      POSTGIS_VERSION: 3
-      USE_PROJ_LIB: 6
-      BUILD_TYPE: Debug
-      PSYCOPG: 2
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/ubuntu-prerequisites
-      - uses: ./.github/actions/build-and-test
-
   ubuntu20-pg15-clang10-noproj:
     runs-on: ubuntu-20.04
 
@@ -186,7 +167,7 @@ jobs:
       LUAJIT_OPTION: OFF
       POSTGRESQL_VERSION: 15
       POSTGIS_VERSION: 3
-      USE_PROJ_LIB: off
+      WITH_PROJ: OFF
       BUILD_TYPE: Debug
       PSYCOPG: 2
 
@@ -205,7 +186,6 @@ jobs:
       LUAJIT_OPTION: OFF
       POSTGRESQL_VERSION: 16
       POSTGIS_VERSION: 3
-      USE_PROJ_LIB: 6
       BUILD_TYPE: Debug
       PSYCOPG: 2
 
@@ -266,7 +246,7 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  ubuntu22-pg16-clang14-proj6:
+  ubuntu22-pg16-clang14-proj:
     runs-on: ubuntu-22.04
 
     env:
@@ -276,7 +256,6 @@ jobs:
       LUAJIT_OPTION: OFF
       POSTGRESQL_VERSION: 16
       POSTGIS_VERSION: 3
-      USE_PROJ_LIB: 6
       BUILD_TYPE: Debug
       PSYCOPG: 2
 
@@ -295,7 +274,7 @@ jobs:
       LUAJIT_OPTION: OFF
       POSTGRESQL_VERSION: 16
       POSTGIS_VERSION: 3
-      USE_PROJ_LIB: off
+      WITH_PROJ: OFF
       BUILD_TYPE: Debug
       PSYCOPG: 2
 
@@ -314,7 +293,6 @@ jobs:
       LUAJIT_OPTION: OFF
       POSTGRESQL_VERSION: 15
       POSTGIS_VERSION: 3
-      USE_PROJ_LIB: 6
       BUILD_TYPE: Debug
       PSYCOPG: 2
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 151ddc89b..109778ae0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,6 +30,7 @@ option(BUILD_TESTS    "Build test suite" OFF)
 option(BUILD_COVERAGE "Build with coverage" OFF)
 option(WITH_LUA       "Build with Lua support" ON)
 option(WITH_LUAJIT    "Build with LuaJIT support" OFF)
+option(WITH_PROJ      "Build with Projection support" ON)
 
 if (PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR)
     message(FATAL_ERROR "In-source builds are not allowed, please use a separate build directory like `mkdir build && cd build && cmake ..`")
@@ -57,8 +58,6 @@ option(EXTERNAL_PROTOZERO "Do not use the bundled protozero" OFF)
 option(EXTERNAL_FMT       "Do not use the bundled fmt"       OFF)
 option(EXTERNAL_CLI11     "Do not use the bundled CLI11"     OFF)
 
-set(USE_PROJ_LIB "auto" CACHE STRING "Which version of PROJ API to use: ('4', '6', 'off', or 'auto')")
-
 if (NOT WIN32 AND NOT APPLE)
     # No need for this path, just a workaround to make cmake work on all systems.
     # Without this we need the PostgreSQL server libraries installed.
@@ -222,42 +221,18 @@ find_package(OpenCV QUIET OPTIONAL_COMPONENTS core imgcodecs imgproc)
 
 set(LIBS ${Boost_LIBRARIES} ${PostgreSQL_LIBRARY} ${OSMIUM_LIBRARIES})
 
-if (USE_PROJ_LIB STREQUAL "off")
-    message(STATUS "Proj library disabled (because USE_PROJ_LIB is set to 'off').")
-else()
-    find_path(PROJ4_INCLUDE_DIR proj_api.h)
-    if (PROJ4_INCLUDE_DIR AND NOT USE_PROJ_LIB STREQUAL "6")
-        message(STATUS "Found proj_api.h")
-        find_library(PROJ_LIBRARY NAMES proj)
-        message(STATUS "Found Proj [API 4] ${PROJ_LIBRARY}")
-        add_definitions(-DHAVE_GENERIC_PROJ=4)
-        set(HAVE_PROJ4 1)
+if (WITH_PROJ)
+    find_path(PROJ6_INCLUDE_DIR proj.h)
+    find_library(PROJ_LIBRARY NAMES proj)
+    if (PROJ_LIBRARY)
+        message(STATUS "Found Proj ${PROJ_LIBRARY}")
+        add_definitions(-DHAVE_GENERIC_PROJ=6)
+        set(HAVE_PROJ6 1)
         list(APPEND LIBS ${PROJ_LIBRARY})
-        include_directories(SYSTEM ${PROJ4_INCLUDE_DIR})
-    elseif (NOT USE_PROJ_LIB STREQUAL "4")
-        find_path(PROJ6_INCLUDE_DIR proj.h)
-        find_library(PROJ_LIBRARY NAMES proj)
-        if (PROJ_LIBRARY)
-            message(STATUS "Found Proj [API 6] ${PROJ_LIBRARY}")
-            add_definitions(-DHAVE_GENERIC_PROJ=6)
-            set(HAVE_PROJ6 1)
-            list(APPEND LIBS ${PROJ_LIBRARY})
-            include_directories(SYSTEM ${PROJ6_INCLUDE_DIR})
-        else()
-            message(STATUS "Proj library not found.")
-            message(STATUS "    Only Mercartor and WGS84 projections will be available.")
-        endif()
+        include_directories(SYSTEM ${PROJ6_INCLUDE_DIR})
     endif()
 endif()
 
-if (USE_PROJ_LIB STREQUAL "4" AND NOT HAVE_PROJ4)
-    message(FATAL_ERROR "USE_PROJ_LIB was set to '4', but PROJ version 4 API not found")
-endif()
-
-if (USE_PROJ_LIB STREQUAL "6" AND NOT HAVE_PROJ6)
-    message(FATAL_ERROR "USE_PROJ_LIB was set to '6', but PROJ version 6 API not found")
-endif()
-
 if (LUAJIT_FOUND)
     list(APPEND LIBS ${LUAJIT_LIBRARIES})
 elseif (LUA_FOUND)
diff --git a/README.md b/README.md
index 3e1eae328..070d56826 100644
--- a/README.md
+++ b/README.md
@@ -171,21 +171,9 @@ Note that `Debug` builds will be much slower than release build. For production
 ### Using the PROJ library
 
 Osm2pgsql has builtin support for the Latlong (WGS84, EPSG:4326) and the
-WebMercator (EPSG:3857) projection. If you need other projections you have to
-compile with the PROJ library.
-
-Both the older API (PROJ version 4) and the newer API (PROJ version 6.1 and
-above) are supported. Usually the CMake configuration will find a suitable
-version and use it automatically, but you can set the `USE_PROJ_LIB` CMake
-cache variable to choose between the following behaviours:
-
-* `4`: Look for PROJ library with API version 4. If it is not found, stop with
-  error.
-* `6`: Look for PROJ library with API version 6. If it is not found, stop with
-  error.
-* `off`: Build without PROJ library.
-* `auto`: Choose API 4 if available, otherwise API 6. If both are not available
-  build without PROJ library. (This is the default.)
+WebMercator (EPSG:3857) projection. Other projections are supported through
+the [Proj library](https://proj.org/) which is used by default. Set the CMake
+option `WITH_PROJ` to `OFF` to disable use of that library.
 
 ## Using LuaJIT
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ea1cfe979..1fe239e02 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -72,13 +72,7 @@ endif()
 
 target_sources(osm2pgsql_lib PRIVATE ${PROJECT_BINARY_DIR}/src/version.cpp)
 
-if (HAVE_PROJ4)
-    target_sources(osm2pgsql_lib PRIVATE reprojection-generic-proj4.cpp)
-    if (NOT MSVC)
-        set_source_files_properties(reprojection-generic-proj4.cpp
-            PROPERTIES COMPILE_FLAGS -Wno-deprecated-declarations)
-    endif()
-elseif(HAVE_PROJ6)
+if (HAVE_PROJ6)
     target_sources(osm2pgsql_lib PRIVATE reprojection-generic-proj6.cpp)
 else()
     target_sources(osm2pgsql_lib PRIVATE reprojection-generic-none.cpp)
diff --git a/src/reprojection-generic-proj4.cpp b/src/reprojection-generic-proj4.cpp
deleted file mode 100644
index 453018ccb..000000000
--- a/src/reprojection-generic-proj4.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * SPDX-License-Identifier: GPL-2.0-or-later
- *
- * This file is part of osm2pgsql (https://osm2pgsql.org/).
- *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
- * For a full list of authors see the git log.
- */
-
-#include "format.hpp"
-#include "reprojection.hpp"
-
-#include <osmium/geom/projection.hpp>
-
-namespace {
-
-/**
- * Generic projection using proj library.
- */
-class generic_reprojection_t : public reprojection
-{
-public:
-    explicit generic_reprojection_t(int srs) : m_target_srs(srs), pj_target(srs)
-    {}
-
-    geom::point_t reproject(geom::point_t point) const override
-    {
-        double const lon = osmium::geom::deg_to_rad(point.x());
-        double const lat = osmium::geom::deg_to_rad(point.y());
-
-        auto const c = osmium::geom::transform(
-            pj_source, pj_target, osmium::geom::Coordinates{lon, lat});
-        return {c.x, c.y};
-    }
-
-    geom::point_t target_to_tile(geom::point_t point) const override
-    {
-        auto const c = osmium::geom::transform(
-            pj_target, pj_tile,
-            osmium::geom::Coordinates{point.x(), point.y()});
-        return {c.x, c.y};
-    }
-
-    int target_srs() const noexcept override { return m_target_srs; }
-
-    char const *target_desc() const noexcept override
-    {
-        return pj_get_def(pj_target.get(), 0);
-    }
-
-private:
-    int m_target_srs;
-    osmium::geom::CRS pj_target;
-
-    /// The projection of the source data. Always lat/lon (EPSG:4326).
-    osmium::geom::CRS pj_source{PROJ_LATLONG};
-
-    /**
-     * The projection used for tiles. Currently this is fixed to be Spherical
-     * Mercator. You will usually have tiles in the same projection as used
-     * for PostGIS, but it is theoretically possible to have your PostGIS data
-     * in, say, lat/lon but still create tiles in Spherical Mercator.
-     */
-    osmium::geom::CRS pj_tile{PROJ_SPHERE_MERC};
-};
-
-} // anonymous namespace
-
-std::shared_ptr<reprojection> reprojection::make_generic_projection(int srs)
-{
-    return std::make_shared<generic_reprojection_t>(srs);
-}
-
-std::string get_proj_version()
-{
-    return fmt::format("[API 4] {}", pj_get_release());
-}
diff --git a/src/reprojection-generic-proj6.cpp b/src/reprojection-generic-proj6.cpp
index 654ebc860..636ccd99a 100644
--- a/src/reprojection-generic-proj6.cpp
+++ b/src/reprojection-generic-proj6.cpp
@@ -119,6 +119,6 @@ std::shared_ptr<reprojection> reprojection::make_generic_projection(int srs)
 
 std::string get_proj_version()
 {
-    return fmt::format("[API 6] {}", proj_info().version);
+    return fmt::format("{}", proj_info().version);
 }
 

From 6214c398357ee8a3ebde74fd4961e8fe9fc82384 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 3 Apr 2024 16:25:37 +0200
Subject: [PATCH 106/430] Report missing nodes in the input (in debug mode)

A maximum of 100 missing nodes (with the ways they are missing from) are
reported.
---
 src/output-flex.cpp                  | 33 +++++++++++++++++++++--
 tests/bdd/flex/missing-nodes.feature | 39 ++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 tests/bdd/flex/missing-nodes.feature

diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 030c0055a..a80fab239 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -499,10 +499,39 @@ void output_flex_t::way_cache_t::init(osmium::Way *way)
     m_way = way;
 }
 
+static std::size_t get_nodes(middle_query_t const &middle, osmium::Way *way)
+{
+    constexpr std::size_t const max_missing_nodes = 100;
+    static std::size_t count_missing_nodes = 0;
+
+    auto const count = middle.nodes_get_list(&way->nodes());
+
+    if (count_missing_nodes <= max_missing_nodes &&
+        count != way->nodes().size()) {
+        util::string_joiner_t id_list{','};
+        for (auto const &nr : way->nodes()) {
+            if (!nr.location().valid()) {
+                id_list.add(fmt::to_string(nr.ref()));
+                ++count_missing_nodes;
+            }
+        }
+
+        log_debug("Missing nodes in way {}: {}", way->id(), id_list());
+
+        if (count_missing_nodes > max_missing_nodes) {
+            log_debug("Reported more than {} missing nodes, no further missing "
+                      "nodes will be reported!",
+                      max_missing_nodes);
+        }
+    }
+
+    return count;
+}
+
 std::size_t output_flex_t::way_cache_t::add_nodes(middle_query_t const &middle)
 {
     if (m_num_way_nodes == std::numeric_limits<std::size_t>::max()) {
-        m_num_way_nodes = middle.nodes_get_list(&m_way->nodes());
+        m_num_way_nodes = get_nodes(middle, m_way);
     }
 
     return m_num_way_nodes;
@@ -547,7 +576,7 @@ bool output_flex_t::relation_cache_t::add_members(middle_query_t const &middle)
         }
 
         for (auto &way : m_members_buffer.select<osmium::Way>()) {
-            middle.nodes_get_list(&(way.nodes()));
+            get_nodes(middle, &way);
         }
     }
 
diff --git a/tests/bdd/flex/missing-nodes.feature b/tests/bdd/flex/missing-nodes.feature
new file mode 100644
index 000000000..f15b0cc92
--- /dev/null
+++ b/tests/bdd/flex/missing-nodes.feature
@@ -0,0 +1,39 @@
+Feature: Test handling of missing nodes
+
+    Background:
+        Given the lua style
+            """
+            local tables = {}
+
+            tables.line = osm2pgsql.define_table{
+                name = 'osm2pgsql_test_lines',
+                ids = { type = 'way', id_column = 'osm_id' },
+                columns = {
+                    { column = 'geom', type = 'linestring', projection = 4326 },
+                }
+            }
+
+            function osm2pgsql.process_way(object)
+                tables.line:insert({
+                    geom = object:as_linestring()
+                })
+            end
+            """
+
+    Scenario: Missing node is reported
+        Given the OSM data
+            """
+            n10 v1 dV x10.0 y10.0
+            n11 v1 dV x10.0 y11.0
+            w20 v1 dV Thighway=primary Nn10,n11,n12,n13
+            """
+        When running osm2pgsql flex with parameters
+            | --log-level=debug |
+
+        Then table osm2pgsql_test_lines has 1 rows
+
+        And the error output contains
+            """
+            Missing nodes in way 20: 12,13
+            """
+

From 9e6deff80ac395f71b39df4f7ce3eace165acdfa Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 2 Apr 2024 14:46:15 +0200
Subject: [PATCH 107/430] Consistently use db_connection as param/var name

for database connections. Also use it as const ref instead of ptr.
---
 src/db-copy.cpp       | 11 ++++++-----
 src/db-copy.hpp       | 10 +++++-----
 src/expire-output.cpp | 30 +++++++++++++++---------------
 src/expire-output.hpp |  2 +-
 4 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/db-copy.cpp b/src/db-copy.cpp
index bb3d97cf3..261bb95ed 100644
--- a/src/db-copy.cpp
+++ b/src/db-copy.cpp
@@ -15,7 +15,8 @@
 #include "pgsql.hpp"
 
 void db_deleter_by_id_t::delete_rows(std::string const &table,
-                                     std::string const &column, pg_conn_t *conn)
+                                     std::string const &column,
+                                     pg_conn_t const &db_connection)
 {
     fmt::memory_buffer sql;
     // Each deletable contributes an OSM ID and a comma. The highest node ID
@@ -32,12 +33,12 @@ void db_deleter_by_id_t::delete_rows(std::string const &table,
     sql[sql.size() - 1] = ')';
 
     sql.push_back('\0');
-    conn->exec(sql.data());
+    db_connection.exec(sql.data());
 }
 
 void db_deleter_by_type_and_id_t::delete_rows(std::string const &table,
                                               std::string const &column,
-                                              pg_conn_t *conn)
+                                              pg_conn_t const &db_connection)
 {
     assert(!m_deletables.empty());
 
@@ -78,7 +79,7 @@ void db_deleter_by_type_and_id_t::delete_rows(std::string const &table,
     }
 
     sql.push_back('\0');
-    conn->exec(sql.data());
+    db_connection.exec(sql.data());
 }
 
 db_copy_thread_t::db_copy_thread_t(connection_params_t const &connection_params)
@@ -182,7 +183,7 @@ void db_copy_thread_t::thread_t::write_to_db(db_cmd_copy_t *buffer)
         finish_copy();
     }
 
-    buffer->delete_data(m_db_connection.get());
+    buffer->delete_data(*m_db_connection);
 
     if (!m_inflight) {
         start_copy(buffer->target);
diff --git a/src/db-copy.hpp b/src/db-copy.hpp
index b3b710e8a..a297d0f15 100644
--- a/src/db-copy.hpp
+++ b/src/db-copy.hpp
@@ -85,7 +85,7 @@ class db_deleter_by_id_t
     void add(osmid_t osm_id) { m_deletables.push_back(osm_id); }
 
     void delete_rows(std::string const &table, std::string const &column,
-                     pg_conn_t *conn);
+                     pg_conn_t const &db_connection);
 
     bool is_full() const noexcept { return m_deletables.size() > Max_entries; }
 
@@ -126,7 +126,7 @@ class db_deleter_by_type_and_id_t
     }
 
     void delete_rows(std::string const &table, std::string const &column,
-                     pg_conn_t *conn);
+                     pg_conn_t const &db_connection);
 
     bool is_full() const noexcept { return m_deletables.size() > Max_entries; }
 
@@ -183,7 +183,7 @@ struct db_cmd_copy_t : public db_cmd_t
     std::string buffer;
 
     virtual bool has_deletables() const noexcept = 0;
-    virtual void delete_data(pg_conn_t *conn) = 0;
+    virtual void delete_data(pg_conn_t const &db_connection) = 0;
 
     explicit db_cmd_copy_t(std::shared_ptr<db_target_descr_t> t)
     : db_cmd_t(db_cmd_t::Cmd_copy), target(std::move(t))
@@ -209,12 +209,12 @@ class db_cmd_copy_delete_t : public db_cmd_copy_t
         return m_deleter.has_data();
     }
 
-    void delete_data(pg_conn_t *conn) override
+    void delete_data(pg_conn_t const &db_connection) override
     {
         if (m_deleter.has_data()) {
             m_deleter.delete_rows(
                 qualified_name(target->schema(), target->name()), target->id(),
-                conn);
+                db_connection);
         }
     }
 
diff --git a/src/expire-output.cpp b/src/expire-output.cpp
index cc4f90465..68d2ac372 100644
--- a/src/expire-output.cpp
+++ b/src/expire-output.cpp
@@ -58,38 +58,38 @@ std::size_t expire_output_t::output_tiles_to_table(
 {
     auto const qn = qualified_name(m_schema, m_table);
 
-    pg_conn_t connection{connection_params, "expire"};
+    pg_conn_t const db_connection{connection_params, "expire"};
 
-    auto const result = connection.exec("SELECT * FROM {} LIMIT 1", qn);
+    auto const result = db_connection.exec("SELECT * FROM {} LIMIT 1", qn);
 
     if (result.num_fields() == 3) {
         // old format with fields: zoom, x, y
-        connection.exec("PREPARE insert_tiles(int4, int4, int4) AS"
-                        " INSERT INTO {} (zoom, x, y) VALUES ($1, $2, $3)"
-                        " ON CONFLICT DO NOTHING",
-                        qn);
+        db_connection.exec("PREPARE insert_tiles(int4, int4, int4) AS"
+                           " INSERT INTO {} (zoom, x, y) VALUES ($1, $2, $3)"
+                           " ON CONFLICT DO NOTHING",
+                           qn);
     } else {
         // new format with fields: zoom, x, y, first, last
-        connection.exec("PREPARE insert_tiles(int4, int4, int4) AS"
-                        " INSERT INTO {} (zoom, x, y) VALUES ($1, $2, $3)"
-                        " ON CONFLICT (zoom, x, y)"
-                        " DO UPDATE SET last = CURRENT_TIMESTAMP(0)",
-                        qn);
+        db_connection.exec("PREPARE insert_tiles(int4, int4, int4) AS"
+                           " INSERT INTO {} (zoom, x, y) VALUES ($1, $2, $3)"
+                           " ON CONFLICT (zoom, x, y)"
+                           " DO UPDATE SET last = CURRENT_TIMESTAMP(0)",
+                           qn);
     }
 
     auto const count = for_each_tile(
         tiles_at_maxzoom, m_minzoom, m_maxzoom, [&](tile_t const &tile) {
-            connection.exec_prepared("insert_tiles", tile.zoom(), tile.x(),
-                                     tile.y());
+            db_connection.exec_prepared("insert_tiles", tile.zoom(), tile.x(),
+                                        tile.y());
         });
 
     return count;
 }
 
-void expire_output_t::create_output_table(pg_conn_t const &connection) const
+void expire_output_t::create_output_table(pg_conn_t const &db_connection) const
 {
     auto const qn = qualified_name(m_schema, m_table);
-    connection.exec(
+    db_connection.exec(
         "CREATE TABLE IF NOT EXISTS {} ("
         " zoom int4 NOT NULL,"
         " x int4 NOT NULL,"
diff --git a/src/expire-output.hpp b/src/expire-output.hpp
index fc4dba4ad..1c9821617 100644
--- a/src/expire-output.hpp
+++ b/src/expire-output.hpp
@@ -76,7 +76,7 @@ class expire_output_t
     /**
      * Create table for tiles.
      */
-    void create_output_table(pg_conn_t const &connection) const;
+    void create_output_table(pg_conn_t const &db_connection) const;
 
 private:
     /// The filename (if any) for output

From b699cde8adfcb40e743fd98958d514581ad2c169 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 7 Apr 2024 20:53:08 +0200
Subject: [PATCH 108/430] Remove long deprecated add_row() Lua command

This also removes the special "area" column type which was only used
with the add_row() function.
---
 src/CMakeLists.txt                    |   1 -
 src/flex-lua-table.cpp                |   5 +-
 src/flex-table-column.cpp             |   9 -
 src/flex-table-column.hpp             |   5 +-
 src/flex-write.cpp                    |  72 --------
 src/flex-write.hpp                    |   5 -
 src/geom-transform.cpp                | 247 --------------------------
 src/geom-transform.hpp                | 128 -------------
 src/output-flex.cpp                   | 163 +----------------
 src/output-flex.hpp                   |  22 +--
 tests/bdd/flex/empty-insert.feature   |  29 +++
 tests/bdd/flex/script-failure.feature |  25 ---
 12 files changed, 37 insertions(+), 674 deletions(-)
 delete mode 100644 src/geom-transform.cpp
 delete mode 100644 src/geom-transform.hpp
 create mode 100644 tests/bdd/flex/empty-insert.feature
 delete mode 100644 tests/bdd/flex/script-failure.feature

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1fe239e02..f8e2fad8f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -62,7 +62,6 @@ if (WITH_LUA)
         flex-lua-index.cpp
         flex-lua-table.cpp
         flex-write.cpp
-        geom-transform.cpp
         lua-setup.cpp
         lua-utils.cpp
         output-flex.cpp
diff --git a/src/flex-lua-table.cpp b/src/flex-lua-table.cpp
index a37d1d84e..98888fdd3 100644
--- a/src/flex-lua-table.cpp
+++ b/src/flex-lua-table.cpp
@@ -342,12 +342,11 @@ setup_flex_table_columns(lua_State *lua_state, flex_table_t *table,
 
         lua_getfield(lua_state, -1, "projection");
         if (!lua_isnil(lua_state, -1)) {
-            if (column.is_geometry_column() ||
-                column.type() == table_column_type::area) {
+            if (column.is_geometry_column()) {
                 column.set_projection(lua_tostring(lua_state, -1));
             } else {
                 throw std::runtime_error{"Projection can only be set on "
-                                         "geometry and area columns."};
+                                         "geometry columns."};
             }
         }
         lua_pop(lua_state, 1); // "projection"
diff --git a/src/flex-table-column.cpp b/src/flex-table-column.cpp
index c27b74318..fa0e10a07 100644
--- a/src/flex-table-column.cpp
+++ b/src/flex-table-column.cpp
@@ -51,7 +51,6 @@ static std::array<column_type_lookup, 26> const column_types = {
      {"multilinestring", table_column_type::multilinestring},
      {"multipolygon", table_column_type::multipolygon},
      {"geometrycollection", table_column_type::geometrycollection},
-     {"area", table_column_type::area},
      {"id_type", table_column_type::id_type},
      {"id_num", table_column_type::id_num}}};
 
@@ -62,12 +61,6 @@ static table_column_type get_column_type_from_string(std::string const &type)
         throw fmt_error("Unknown column type '{}'.", type);
     }
 
-    if (column_type->type == table_column_type::area) {
-        log_warn("The 'area' column type is deprecated. Please read");
-        log_warn("https://osm2pgsql.org/doc/tutorials/"
-                 "switching-from-add-row-to-insert/");
-    }
-
     return column_type->type;
 }
 
@@ -167,8 +160,6 @@ std::string flex_table_column_t::sql_type_name() const
         return fmt::format("Geometry(MULTIPOLYGON, {})", m_srid);
     case table_column_type::geometrycollection:
         return fmt::format("Geometry(GEOMETRYCOLLECTION, {})", m_srid);
-    case table_column_type::area:
-        return "real";
     case table_column_type::id_type:
         return "char(1)";
     case table_column_type::id_num:
diff --git a/src/flex-table-column.hpp b/src/flex-table-column.hpp
index c14edc320..4410e03da 100644
--- a/src/flex-table-column.hpp
+++ b/src/flex-table-column.hpp
@@ -46,8 +46,6 @@ enum class table_column_type : uint8_t
     multipolygon,
     geometrycollection,
 
-    area,
-
     id_type,
     id_num
 };
@@ -158,8 +156,7 @@ class flex_table_column_t
     table_column_type m_type;
 
     /**
-     * For geometry and area columns only: The projection SRID. Default is
-     * web mercator.
+     * For geometry columns only: The projection SRID. Default is web mercator.
      */
     int m_srid = 3857;
 
diff --git a/src/flex-write.cpp b/src/flex-write.cpp
index c0090591d..376e75537 100644
--- a/src/flex-write.cpp
+++ b/src/flex-write.cpp
@@ -257,14 +257,6 @@ void flex_write_column(lua_State *lua_state,
                        flex_table_column_t const &column,
                        std::vector<expire_tiles> *expire)
 {
-    // If there is nothing on the Lua stack, then the Lua function add_row()
-    // was called without a table parameter. In that case this column will
-    // be set to NULL.
-    if (lua_gettop(lua_state) == 0) {
-        write_null(copy_mgr, column);
-        return;
-    }
-
     lua_getfield(lua_state, -1, column.name().c_str());
     int const ltype = lua_type(lua_state, -1);
 
@@ -414,9 +406,6 @@ void flex_write_column(lua_State *lua_state,
                             lua_typename(lua_state, ltype));
         }
     } else if (column.is_geometry_column()) {
-        // If this is a geometry column, the Lua function 'insert()' was
-        // called, because for 'add_row()' geometry columns are handled
-        // earlier and 'write_column()' is not called.
         if (ltype == LUA_TUSERDATA) {
             auto const *const geom = unpack_geometry(lua_state, -1);
             if (geom && !geom->is_null()) {
@@ -446,12 +435,6 @@ void flex_write_column(lua_State *lua_state,
             throw fmt_error("Need geometry data for geometry column '{}'.",
                             column.name());
         }
-    } else if (column.type() == table_column_type::area) {
-        // If this is an area column, the Lua function 'insert()' was
-        // called, because for 'add_row()' area columns are handled
-        // earlier and 'write_column()' is not called.
-        throw std::runtime_error{"Column type 'area' not allowed with "
-                                 "'insert()'. Maybe use 'real'?"};
     } else {
         throw fmt_error("Column type {} not implemented.",
                         static_cast<uint8_t>(column.type()));
@@ -459,58 +442,3 @@ void flex_write_column(lua_State *lua_state,
 
     lua_pop(lua_state, 1);
 }
-
-void flex_write_row(lua_State *lua_state, table_connection_t *table_connection,
-                    osmium::item_type id_type, osmid_t id,
-                    geom::geometry_t const &geom, int srid,
-                    std::vector<expire_tiles> *expire)
-{
-    assert(table_connection);
-    table_connection->new_line();
-    auto *copy_mgr = table_connection->copy_mgr();
-
-    geom::geometry_t projected_geom;
-    geom::geometry_t const *output_geom = &geom;
-    if (srid && geom.srid() != srid) {
-        projected_geom = geom::transform(geom, get_projection(srid));
-        output_geom = &projected_geom;
-    }
-
-    for (auto const &column : table_connection->table()) {
-        if (column.create_only()) {
-            continue;
-        }
-        if (column.type() == table_column_type::id_type) {
-            copy_mgr->add_column(type_to_char(id_type));
-        } else if (column.type() == table_column_type::id_num) {
-            copy_mgr->add_column(id);
-        } else if (column.is_geometry_column()) {
-            assert(!geom.is_null());
-            auto const type = column.type();
-            bool const wrap_multi =
-                (type == table_column_type::multilinestring ||
-                 type == table_column_type::multipolygon);
-            copy_mgr->add_hex_geom(geom_to_ewkb(*output_geom, wrap_multi));
-        } else if (column.type() == table_column_type::area) {
-            if (geom.is_null()) {
-                write_null(copy_mgr, column);
-            } else {
-                // if srid of the area column is the same as for the geom column
-                double area = 0;
-                if (column.srid() == 4326) {
-                    area = geom::area(geom);
-                } else if (column.srid() == srid) {
-                    area = geom::area(projected_geom);
-                } else {
-                    auto const &mproj = get_projection(column.srid());
-                    area = geom::area(geom::transform(geom, mproj));
-                }
-                copy_mgr->add_column(area);
-            }
-        } else {
-            flex_write_column(lua_state, copy_mgr, column, expire);
-        }
-    }
-
-    copy_mgr->finish_line();
-}
diff --git a/src/flex-write.hpp b/src/flex-write.hpp
index fac403925..999923530 100644
--- a/src/flex-write.hpp
+++ b/src/flex-write.hpp
@@ -36,9 +36,4 @@ void flex_write_column(lua_State *lua_state,
                        flex_table_column_t const &column,
                        std::vector<expire_tiles> *expire);
 
-void flex_write_row(lua_State *lua_state, table_connection_t *table_connection,
-                    osmium::item_type id_type, osmid_t id,
-                    geom::geometry_t const &geom, int srid,
-                    std::vector<expire_tiles> *expire);
-
 #endif // OSM2PGSQL_FLEX_WRITE_HPP
diff --git a/src/geom-transform.cpp b/src/geom-transform.cpp
deleted file mode 100644
index 0ee7ee57d..000000000
--- a/src/geom-transform.cpp
+++ /dev/null
@@ -1,247 +0,0 @@
-/**
- * SPDX-License-Identifier: GPL-2.0-or-later
- *
- * This file is part of osm2pgsql (https://osm2pgsql.org/).
- *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
- * For a full list of authors see the git log.
- */
-
-#include "geom-from-osm.hpp"
-#include "geom-functions.hpp"
-#include "geom-transform.hpp"
-#include "logging.hpp"
-#include "lua-utils.hpp"
-
-#include <osmium/osm.hpp>
-
-#include <cstring>
-#include <stdexcept>
-
-bool geom_transform_point_t::is_compatible_with(
-    table_column_type geom_type) const noexcept
-{
-    return geom_type == table_column_type::point ||
-           geom_type == table_column_type::geometry;
-}
-
-geom::geometry_t geom_transform_point_t::convert(reprojection const &proj,
-                                                 osmium::Node const &node) const
-{
-    return geom::transform(geom::create_point(node), proj);
-}
-
-bool geom_transform_line_t::set_param(char const *name, lua_State *lua_state)
-{
-    if (std::strcmp(name, "split_at") != 0) {
-        return false;
-    }
-
-    if (lua_type(lua_state, -1) != LUA_TNUMBER) {
-        throw std::runtime_error{
-            "The 'split_at' field in a geometry transformation "
-            "description must be a number."};
-    }
-    m_split_at = lua_tonumber(lua_state, -1);
-
-    return true;
-}
-
-bool geom_transform_line_t::is_compatible_with(
-    table_column_type geom_type) const noexcept
-{
-    return geom_type == table_column_type::linestring ||
-           geom_type == table_column_type::multilinestring ||
-           geom_type == table_column_type::geometry;
-}
-
-geom::geometry_t geom_transform_line_t::convert(reprojection const &proj,
-                                                osmium::Way const &way) const
-{
-    auto geom = geom::transform(geom::create_linestring(way), proj);
-    if (!geom.is_null() && m_split_at > 0.0) {
-        geom = geom::segmentize(geom, m_split_at);
-    }
-    return geom;
-}
-
-geom::geometry_t
-geom_transform_line_t::convert(reprojection const &proj,
-                               osmium::Relation const & /*relation*/,
-                               osmium::memory::Buffer const &buffer) const
-{
-    auto geom = geom::transform(
-        geom::line_merge(geom::create_multilinestring(buffer)), proj);
-    if (!geom.is_null() && m_split_at > 0.0) {
-        geom = geom::segmentize(geom, m_split_at);
-    }
-    return geom;
-}
-
-bool geom_transform_area_t::set_param(char const *name, lua_State *lua_state)
-{
-    if (std::strcmp(name, "multi") == 0) {
-        throw std::runtime_error{
-            "The 'multi' field in the geometry transformation has been"
-            " removed. See docs on how to use 'split_at' instead."};
-    }
-
-    if (std::strcmp(name, "split_at") != 0) {
-        return false;
-    }
-
-    char const *const val = lua_tostring(lua_state, -1);
-
-    if (!val) {
-        throw std::runtime_error{
-            "The 'split_at' field in a geometry transformation "
-            "description must be a string."};
-    }
-
-    if (std::strcmp(val, "multi") == 0) {
-        m_multi = false;
-        return true;
-    }
-
-    throw fmt_error("Unknown value for 'split_at' field in a geometry"
-                    " transformation: '{}'",
-                    val);
-}
-
-bool geom_transform_area_t::is_compatible_with(
-    table_column_type geom_type) const noexcept
-{
-    return geom_type == table_column_type::polygon ||
-           geom_type == table_column_type::multipolygon ||
-           geom_type == table_column_type::geometry;
-}
-
-geom::geometry_t geom_transform_area_t::convert(reprojection const & /*proj*/,
-                                                osmium::Way const &way) const
-{
-    return geom::create_polygon(way);
-}
-
-geom::geometry_t
-geom_transform_area_t::convert(reprojection const & /*proj*/,
-                               osmium::Relation const &relation,
-                               osmium::memory::Buffer const &buffer) const
-{
-    return geom::create_multipolygon(relation, buffer);
-}
-
-std::unique_ptr<geom_transform_t> create_geom_transform(char const *type)
-{
-    if (std::strcmp(type, "point") == 0) {
-        return std::make_unique<geom_transform_point_t>();
-    }
-
-    if (std::strcmp(type, "line") == 0) {
-        return std::make_unique<geom_transform_line_t>();
-    }
-
-    if (std::strcmp(type, "area") == 0) {
-        return std::make_unique<geom_transform_area_t>();
-    }
-
-    throw fmt_error("Unknown geometry transformation '{}'.", type);
-}
-
-void init_geom_transform(geom_transform_t *transform, lua_State *lua_state)
-{
-    static bool show_warning = true;
-
-    assert(transform);
-    assert(lua_state);
-
-    luaX_for_each(lua_state, [&]() {
-        char const *const field = lua_tostring(lua_state, -2);
-        if (field == nullptr) {
-            throw std::runtime_error{"All fields in geometry transformation "
-                                     "description must have string keys."};
-        }
-
-        if (std::strcmp(field, "create") != 0) {
-            if (!transform->set_param(field, lua_state) && show_warning) {
-                log_warn("Ignoring unknown field '{}' in geometry "
-                         "transformation description.",
-                         field);
-                show_warning = false;
-            }
-        }
-    });
-}
-
-std::unique_ptr<geom_transform_t>
-get_transform(lua_State *lua_state, flex_table_column_t const &column)
-{
-    assert(lua_state);
-    assert(lua_gettop(lua_state) == 1);
-
-    std::unique_ptr<geom_transform_t> transform{};
-
-    lua_getfield(lua_state, -1, column.name().c_str());
-    int const ltype = lua_type(lua_state, -1);
-
-    // Field not set, return null transform
-    if (ltype == LUA_TNIL) {
-        lua_pop(lua_state, 1); // geom field
-        return transform;
-    }
-
-    // Field set to anything but a Lua table is not allowed
-    if (ltype != LUA_TTABLE) {
-        lua_pop(lua_state, 1); // geom field
-        throw fmt_error("Invalid geometry transformation for column '{}'.",
-                        column.name());
-    }
-
-    lua_getfield(lua_state, -1, "create");
-    char const *create_type = lua_tostring(lua_state, -1);
-    if (create_type == nullptr) {
-        throw fmt_error("Missing geometry transformation for column '{}'.",
-                        column.name());
-    }
-
-    transform = create_geom_transform(create_type);
-    lua_pop(lua_state, 1); // 'create' field
-    init_geom_transform(transform.get(), lua_state);
-    if (!transform->is_compatible_with(column.type())) {
-        throw fmt_error("Geometry transformation is not compatible"
-                        " with column type '{}'.",
-                        column.type_name());
-    }
-
-    lua_pop(lua_state, 1); // geom field
-
-    return transform;
-}
-
-geom_transform_t const *get_default_transform(flex_table_column_t const &column,
-                                              osmium::item_type object_type)
-{
-    static geom_transform_point_t const default_transform_node_to_point{};
-    static geom_transform_line_t const default_transform_way_to_line{};
-    static geom_transform_area_t const default_transform_way_to_area{};
-
-    switch (object_type) {
-    case osmium::item_type::node:
-        if (column.type() == table_column_type::point) {
-            return &default_transform_node_to_point;
-        }
-        break;
-    case osmium::item_type::way:
-        if (column.type() == table_column_type::linestring) {
-            return &default_transform_way_to_line;
-        }
-        if (column.type() == table_column_type::polygon) {
-            return &default_transform_way_to_area;
-        }
-        break;
-    default:
-        break;
-    }
-
-    throw fmt_error("Missing geometry transformation for column '{}'.",
-                    column.name());
-}
diff --git a/src/geom-transform.hpp b/src/geom-transform.hpp
deleted file mode 100644
index 65f48dac5..000000000
--- a/src/geom-transform.hpp
+++ /dev/null
@@ -1,128 +0,0 @@
-#ifndef OSM2PGSQL_GEOM_TRANSFORM_HPP
-#define OSM2PGSQL_GEOM_TRANSFORM_HPP
-
-/**
- * SPDX-License-Identifier: GPL-2.0-or-later
- *
- * This file is part of osm2pgsql (https://osm2pgsql.org/).
- *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
- * For a full list of authors see the git log.
- */
-
-#include "flex-table-column.hpp"
-#include "geom.hpp"
-#include "reprojection.hpp"
-
-#include <osmium/fwd.hpp>
-#include <osmium/memory/buffer.hpp>
-
-#include <lua.hpp>
-
-#include <memory>
-
-/**
- * Abstract base class for geometry transformations from nodes, ways, or
- * relations to simple feature type geometries.
- */
-class geom_transform_t
-{
-public:
-    virtual ~geom_transform_t() = default;
-
-    virtual bool set_param(char const * /*name*/, lua_State * /*lua_state*/)
-    {
-        return false;
-    }
-
-    virtual bool
-    is_compatible_with(table_column_type geom_type) const noexcept = 0;
-
-    virtual geom::geometry_t convert(reprojection const & /*proj*/,
-                                     osmium::Node const & /*node*/) const
-    {
-        return {};
-    }
-
-    virtual geom::geometry_t convert(reprojection const & /*proj*/,
-                                     osmium::Way const & /*way*/) const
-    {
-        return {};
-    }
-
-    virtual geom::geometry_t
-    convert(reprojection const & /*proj*/,
-            osmium::Relation const & /*relation*/,
-            osmium::memory::Buffer const & /*buffer*/) const
-    {
-        return {};
-    }
-
-    virtual bool split() const noexcept { return false; }
-
-}; // class geom_transform_t
-
-class geom_transform_point_t : public geom_transform_t
-{
-public:
-    bool
-    is_compatible_with(table_column_type geom_type) const noexcept override;
-
-    geom::geometry_t convert(reprojection const &proj,
-                             osmium::Node const &node) const override;
-
-}; // class geom_transform_point_t
-
-class geom_transform_line_t : public geom_transform_t
-{
-public:
-    bool set_param(char const *name, lua_State *lua_state) override;
-
-    bool
-    is_compatible_with(table_column_type geom_type) const noexcept override;
-
-    geom::geometry_t convert(reprojection const &proj,
-                             osmium::Way const &way) const override;
-
-    geom::geometry_t
-    convert(reprojection const &proj, osmium::Relation const &relation,
-            osmium::memory::Buffer const &buffer) const override;
-
-private:
-    double m_split_at = 0.0;
-
-}; // class geom_transform_line_t
-
-class geom_transform_area_t : public geom_transform_t
-{
-public:
-    bool set_param(char const *name, lua_State *lua_state) override;
-
-    bool
-    is_compatible_with(table_column_type geom_type) const noexcept override;
-
-    geom::geometry_t convert(reprojection const &proj,
-                             osmium::Way const &way) const override;
-
-    geom::geometry_t
-    convert(reprojection const &proj, osmium::Relation const &relation,
-            osmium::memory::Buffer const &buffer) const override;
-
-    bool split() const noexcept override { return !m_multi; }
-
-private:
-    bool m_multi = true;
-
-}; // class geom_transform_area_t
-
-std::unique_ptr<geom_transform_t> create_geom_transform(char const *type);
-
-void init_geom_transform(geom_transform_t *transform, lua_State *lua_state);
-
-std::unique_ptr<geom_transform_t>
-get_transform(lua_State *lua_state, flex_table_column_t const &column);
-
-geom_transform_t const *get_default_transform(flex_table_column_t const &column,
-                                              osmium::item_type object_type);
-
-#endif // OSM2PGSQL_GEOM_TRANSFORM_HPP
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index a80fab239..58a579ca1 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -20,7 +20,6 @@
 #include "format.hpp"
 #include "geom-from-osm.hpp"
 #include "geom-functions.hpp"
-#include "geom-transform.hpp"
 #include "logging.hpp"
 #include "lua-init.hpp"
 #include "lua-setup.hpp"
@@ -86,7 +85,6 @@ TRAMPOLINE(app_as_geometrycollection, as_geometrycollection)
 TRAMPOLINE(table_name, name)
 TRAMPOLINE(table_schema, schema)
 TRAMPOLINE(table_cluster, cluster)
-TRAMPOLINE(table_add_row, add_row)
 TRAMPOLINE(table_insert, insert)
 TRAMPOLINE(table_columns, columns)
 TRAMPOLINE(table_tostring, __tostring)
@@ -583,67 +581,6 @@ bool output_flex_t::relation_cache_t::add_members(middle_query_t const &middle)
     return true;
 }
 
-int output_flex_t::table_add_row()
-{
-    if (m_disable_add_row) {
-        return 0;
-    }
-
-    if (m_calling_context != calling_context::process_node &&
-        m_calling_context != calling_context::process_way &&
-        m_calling_context != calling_context::process_relation) {
-        throw std::runtime_error{
-            "The function add_row() can only be called from the "
-            "process_node/way/relation() functions."};
-    }
-
-    // Params are the table object and an optional Lua table with the contents
-    // for the fields.
-    auto const num_params = lua_gettop(lua_state());
-    if (num_params < 1 || num_params > 2) {
-        throw std::runtime_error{
-            "Need two parameters: The osm2pgsql.Table and the row data."};
-    }
-
-    auto &table_connection = m_table_connections.at(
-        idx_from_param(lua_state(), osm2pgsql_table_name));
-
-    auto const &table = table_connection.table();
-
-    // If there is a second parameter, it must be a Lua table.
-    if (num_params == 2) {
-        luaL_checktype(lua_state(), 2, LUA_TTABLE);
-    }
-    lua_remove(lua_state(), 1);
-
-    if (m_add_row_has_never_been_called) {
-        m_add_row_has_never_been_called = false;
-        log_warn("The add_row() function is deprecated. Please read");
-        log_warn("https://osm2pgsql.org/doc/tutorials/"
-                 "switching-from-add-row-to-insert/");
-    }
-
-    if (m_calling_context == calling_context::process_node) {
-        if (!table.matches_type(osmium::item_type::node)) {
-            throw fmt_error("Trying to add node to table '{}'.", table.name());
-        }
-        add_row(&table_connection, *m_context_node);
-    } else if (m_calling_context == calling_context::process_way) {
-        if (!table.matches_type(osmium::item_type::way)) {
-            throw fmt_error("Trying to add way to table '{}'.", table.name());
-        }
-        add_row(&table_connection, m_way_cache.get());
-    } else if (m_calling_context == calling_context::process_relation) {
-        if (!table.matches_type(osmium::item_type::relation)) {
-            throw fmt_error("Trying to add relation to table '{}'.",
-                            table.name());
-        }
-        add_row(&table_connection, m_relation_cache.get());
-    }
-
-    return 0;
-}
-
 osmium::OSMObject const &
 output_flex_t::check_and_get_context_object(flex_table_t const &table)
 {
@@ -671,7 +608,7 @@ output_flex_t::check_and_get_context_object(flex_table_t const &table)
 
 int output_flex_t::table_insert()
 {
-    if (m_disable_add_row) {
+    if (m_disable_insert) {
         return 0;
     }
 
@@ -783,99 +720,6 @@ int output_flex_t::table_cluster()
     return 1;
 }
 
-geom::geometry_t output_flex_t::run_transform(reprojection const &proj,
-                                              geom_transform_t const *transform,
-                                              osmium::Node const &node)
-{
-    return transform->convert(proj, node);
-}
-
-geom::geometry_t output_flex_t::run_transform(reprojection const &proj,
-                                              geom_transform_t const *transform,
-                                              osmium::Way const & /*way*/)
-{
-    if (m_way_cache.add_nodes(middle()) <= 1U) {
-        return {};
-    }
-
-    return transform->convert(proj, m_way_cache.get());
-}
-
-geom::geometry_t output_flex_t::run_transform(reprojection const &proj,
-                                              geom_transform_t const *transform,
-                                              osmium::Relation const &relation)
-{
-    if (!m_relation_cache.add_members(middle())) {
-        return {};
-    }
-
-    return transform->convert(proj, relation,
-                              m_relation_cache.members_buffer());
-}
-
-template <typename OBJECT>
-void output_flex_t::add_row(table_connection_t *table_connection,
-                            OBJECT const &object)
-{
-    assert(table_connection);
-    auto const &table = table_connection->table();
-
-    if (table.has_multiple_geom_columns()) {
-        throw fmt_error("Table '{}' has more than one geometry column."
-                        " This is not allowed with 'add_row()'."
-                        " Maybe use 'insert()' instead?",
-                        table.name());
-    }
-
-    osmid_t const id = table.map_id(object.type(), object.id());
-
-    if (!table.has_geom_column()) {
-        flex_write_row(lua_state(), table_connection, object.type(), id, {}, 0,
-                       &m_expire_tiles);
-        return;
-    }
-
-    // From here we are handling the case where the table has a geometry
-    // column. In this case the second parameter to the Lua function add_row()
-    // must be present.
-    if (lua_gettop(lua_state()) == 0) {
-        throw std::runtime_error{
-            "Need two parameters: The osm2pgsql.Table and the row data."};
-    }
-
-    auto const &proj = table_connection->proj();
-    auto const type = table.geom_column().type();
-
-    auto const geom_transform = get_transform(lua_state(), table.geom_column());
-    assert(lua_gettop(lua_state()) == 1);
-
-    geom_transform_t const *transform = geom_transform.get();
-    if (!transform) {
-        transform = get_default_transform(table.geom_column(), object.type());
-    }
-
-    // The geometry returned by run_transform() is in 4326 if it is a
-    // (multi)polygon. If it is a point or linestring, it is already in the
-    // target geometry.
-    auto geom = run_transform(proj, transform, object);
-
-    // We need to split a multi geometry into its parts if the geometry
-    // column can only take non-multi geometries or if the transform
-    // explicitly asked us to split, which is the case when an area
-    // transform explicitly set `split_at = 'multi'`.
-    bool const split_multi = type == table_column_type::linestring ||
-                             type == table_column_type::polygon ||
-                             transform->split();
-
-    auto const geoms = geom::split_multi(std::move(geom), split_multi);
-    for (auto const &sgeom : geoms) {
-        table.geom_column().do_expire(sgeom, &m_expire_tiles);
-        flex_write_row(lua_state(), table_connection, object.type(), id, sgeom,
-                       table.geom_column().srid(), &m_expire_tiles);
-        table_connection->increment_insert_counter();
-    }
-}
-
 int output_flex_t::expire_output_tostring()
 {
     auto const &expire_output = get_expire_output_from_param();
@@ -1075,9 +919,9 @@ void output_flex_t::pending_relation_stage1c(osmid_t id)
         return;
     }
 
-    m_disable_add_row = true;
+    m_disable_insert = true;
     get_mutex_and_call_lua_function(m_process_relation, m_relation_cache.get());
-    m_disable_add_row = false;
+    m_disable_insert = false;
 }
 
 void output_flex_t::sync()
@@ -1387,7 +1231,6 @@ static void init_table_class(lua_State *lua_state)
     lua_pushvalue(lua_state, -1);
     lua_setfield(lua_state, -2, "__index");
     luaX_add_table_func(lua_state, "__tostring", lua_trampoline_table_tostring);
-    luaX_add_table_func(lua_state, "add_row", lua_trampoline_table_add_row);
     luaX_add_table_func(lua_state, "insert", lua_trampoline_table_insert);
     luaX_add_table_func(lua_state, "name", lua_trampoline_table_name);
     luaX_add_table_func(lua_state, "schema", lua_trampoline_table_schema);
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index d8e07d274..0eca75dbd 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -163,7 +163,6 @@ class output_flex_t : public output_t
     int app_mark_way();
 
     int table_tostring();
-    int table_add_row();
     int table_insert();
     int table_name();
     int table_schema();
@@ -206,21 +205,6 @@ class output_flex_t : public output_t
     osmium::OSMObject const &
     check_and_get_context_object(flex_table_t const &table);
 
-    geom::geometry_t run_transform(reprojection const &proj,
-                                   geom_transform_t const *transform,
-                                   osmium::Node const &node);
-
-    geom::geometry_t run_transform(reprojection const &proj,
-                                   geom_transform_t const *transform,
-                                   osmium::Way const &way);
-
-    geom::geometry_t run_transform(reprojection const &proj,
-                                   geom_transform_t const *transform,
-                                   osmium::Relation const &relation);
-
-    template <typename OBJECT>
-    void add_row(table_connection_t *table_connection, OBJECT const &object);
-
     void delete_from_table(table_connection_t *table_connection,
                            pg_conn_t const &db_connection,
                            osmium::item_type type, osmid_t osm_id);
@@ -316,11 +300,9 @@ class output_flex_t : public output_t
 
     /**
      * This is set before calling stage1c process_relation() to disable the
-     * add_row() command.
+     * insert() command.
      */
-    bool m_disable_add_row = false;
-
-    bool m_add_row_has_never_been_called = true;
+    bool m_disable_insert = false;
 };
 
 #endif // OSM2PGSQL_OUTPUT_FLEX_HPP
diff --git a/tests/bdd/flex/empty-insert.feature b/tests/bdd/flex/empty-insert.feature
new file mode 100644
index 000000000..7e032c5b4
--- /dev/null
+++ b/tests/bdd/flex/empty-insert.feature
@@ -0,0 +1,29 @@
+Feature: Tests that empty insert command does something
+
+    Scenario:
+        Given the OSM data
+            """
+            n1 Tnatural=water x1 y2
+            """
+        And the lua style
+            """
+            local points = osm2pgsql.define_table{
+                name = 'osm2pgsql_test_points',
+                ids = { type = 'node', id_column = 'node_id' },
+                columns = {
+                    { column = 'geom', type = 'point' },
+                }
+            }
+
+            function osm2pgsql.process_node(object)
+                points:insert()
+            end
+            """
+
+        Then running osm2pgsql flex fails
+
+        And the error output contains
+            """
+            Need two parameters
+            """
+
diff --git a/tests/bdd/flex/script-failure.feature b/tests/bdd/flex/script-failure.feature
deleted file mode 100644
index 419b11ebe..000000000
--- a/tests/bdd/flex/script-failure.feature
+++ /dev/null
@@ -1,25 +0,0 @@
-Feature: Handling of errors in the Lua script
-
-    Background:
-        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
-
-    Scenario: Missing geom transform in table with geometry should lead to an error
-        Given the lua style
-            """
-            local test_table = osm2pgsql.define_area_table('osm2pgsql_test_lua', {
-                { column = 'tags', type = 'hstore' },
-                { column = 'geom', type = 'geometry' }
-            })
-
-            function osm2pgsql.process_way(object)
-                test_table:add_row({
-                    tags = object.tags
-                })
-            end
-            """
-        Then running osm2pgsql flex fails
-        And the error output contains
-            """
-            Missing geometry transformation for column 'geom'
-            """
-

From 6b6e18348fd09763bcf1271d90e8e1f465404c1e Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 7 Apr 2024 21:40:58 +0200
Subject: [PATCH 109/430] Github actions: build on several macOS versions

---
 .github/workflows/ci.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fdf016251..b7942e2ce 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,8 +8,9 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - "macos-12" # latest
-#          - "macos-13" disabled, because it doesn't work due to some problem with Homebrew
+          - "macos-12"
+          - "macos-13"
+          - "macos-14" # latest
     runs-on: ${{ matrix.os }}
 
     env:
@@ -21,13 +22,11 @@ jobs:
       - name: Install prerequisites
         run: |
           brew install boost lua nlohmann-json opencv pandoc postgis potrace
-          pip3 install psycopg2 behave osmium
-          pg_ctl -D /usr/local/var/postgres init
-          pg_ctl -D /usr/local/var/postgres start
-          # Work around homebrew postgresql installation screw-up, see
-          # https://github.com/actions/runner-images/issues/6176
-          ln -s $(pg_config --libdir)/* /usr/local/lib/ || true
-          ln -s $(pg_config --includedir)/* /usr/local/include/
+          # --break-system-packages is needed on macOS 14
+          pip3 install --break-system-packages psycopg2 behave osmium
+          mkdir ~/postgres
+          pg_ctl -D ~/postgres init
+          pg_ctl -D ~/postgres start
         shell: bash
 
       - name: Setup database

From 762ec1fefcd182ed8bcaea5445816b8880564845 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 9 Apr 2024 14:48:26 +0200
Subject: [PATCH 110/430] Remove --cache-strategy option

It hasn't done anything in a long time and was marked deprecated.
---
 man/osm2pgsql.1             |  3 ---
 man/osm2pgsql.md            |  3 ---
 src/command-line-parser.cpp | 15 ---------------
 3 files changed, 21 deletions(-)

diff --git a/man/osm2pgsql.1 b/man/osm2pgsql.1
index 9be357d18..f99cc65ce 100644
--- a/man/osm2pgsql.1
+++ b/man/osm2pgsql.1
@@ -165,9 +165,6 @@ It needs at least the amount of \f[V]shared_buffers\f[R] given in its
 configuration.
 Defaults to 800.
 .TP
---cache-strategy=STRATEGY
-This deprecated option will be ignored.
-.TP
 -x, --extra-attributes
 Include attributes of each object in the middle tables and make them
 available to the outputs.
diff --git a/man/osm2pgsql.md b/man/osm2pgsql.md
index 2fa096383..d4f22027d 100644
--- a/man/osm2pgsql.md
+++ b/man/osm2pgsql.md
@@ -149,9 +149,6 @@ mandatory for short options too.
     It needs at least the amount of `shared_buffers` given in its configuration.
     Defaults to 800.
 
-\--cache-strategy=STRATEGY
-:   This deprecated option will be ignored.
-
 -x, \--extra-attributes
 :   Include attributes of each object in the middle tables and make them
     available to the outputs. Attributes are: user name, user id, changeset id,
diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index 370a2fc37..fcf216eab 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -619,21 +619,6 @@ options_t parse_command_line(int argc, char *argv[])
         ->option_text("TBLSPC")
         ->group("Tablespace options");
 
-    // ----------------------------------------------------------------------
-    // Deprecated options
-    // ----------------------------------------------------------------------
-
-    // --cache-strategy
-    app.add_option_function<std::string>(
-           "--cache-strategy",
-           [&](std::string const &) {
-               log_warn("Deprecated option --cache-strategy ignored");
-           })
-        ->description(
-            "The option has been removed and only a warning is printed.")
-        ->option_text("TYPE")
-        ->group("Deprecated options");
-
     try {
         app.parse(argc, argv);
     } catch (...) {

From eeef67882dc0109e288ebd4be7f60cd7f8f42731 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 7 Apr 2024 20:15:07 +0200
Subject: [PATCH 111/430] Optionally build id index as unique index

Specify with `create_index = 'unique'` in the `ids` field of the
`define_table()` Lua function.

The user has to make sure not to insert multiple rows into such a table.

This can be useful if some program using the data has special handling
for unique ids/primary keys, for instance when it needs unique ids to
allow editing.
---
 src/flex-lua-table.cpp |  3 +++
 src/flex-table.cpp     |  3 ++-
 src/flex-table.hpp     | 13 +++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/flex-lua-table.cpp b/src/flex-lua-table.cpp
index 98888fdd3..242463d09 100644
--- a/src/flex-lua-table.cpp
+++ b/src/flex-lua-table.cpp
@@ -108,6 +108,9 @@ static void parse_create_index(lua_State *lua_state, flex_table_t *table)
     lua_pop(lua_state, 1); // "create_index"
     if (create_index == "always") {
         table->set_always_build_id_index();
+    } else if (create_index == "unique") {
+        table->set_always_build_id_index();
+        table->set_build_unique_id_index();
     } else if (create_index != "auto") {
         throw fmt_error("Unknown value '{}' for 'create_index' field of ids",
                         create_index);
diff --git a/src/flex-table.cpp b/src/flex-table.cpp
index 6dff56a4e..76224a6b7 100644
--- a/src/flex-table.cpp
+++ b/src/flex-table.cpp
@@ -226,7 +226,8 @@ std::string flex_table_t::build_sql_column_list() const
 
 std::string flex_table_t::build_sql_create_id_index() const
 {
-    return fmt::format("CREATE INDEX ON {} USING BTREE ({}) {}", full_name(),
+    return fmt::format("CREATE {}INDEX ON {} USING BTREE ({}) {}",
+                       m_build_unique_id_index ? "UNIQUE " : "", full_name(),
                        id_column_names(),
                        tablespace_clause(index_tablespace()));
 }
diff --git a/src/flex-table.hpp b/src/flex-table.hpp
index c1278f9f7..5fef823e1 100644
--- a/src/flex-table.hpp
+++ b/src/flex-table.hpp
@@ -195,6 +195,16 @@ class flex_table_t
         return m_always_build_id_index;
     }
 
+    void set_build_unique_id_index() noexcept
+    {
+        m_build_unique_id_index = true;
+    }
+
+    bool build_unique_id_index() const noexcept
+    {
+        return m_build_unique_id_index;
+    }
+
     bool has_columns_with_expire() const noexcept;
 
     std::size_t num() const noexcept { return m_table_num; }
@@ -253,6 +263,9 @@ class flex_table_t
     /// Always build the id index, not only when it is needed for updates?
     bool m_always_build_id_index = false;
 
+    /// Build the index as a unique index.
+    bool m_build_unique_id_index = false;
+
 }; // class flex_table_t
 
 class table_connection_t

From f07eb240aceb993fe0463337bf7acff62bf6e1fe Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 4 Feb 2024 14:20:26 +0100
Subject: [PATCH 112/430] Make a variable const (because we can)

---
 tests/test-pgsql.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test-pgsql.cpp b/tests/test-pgsql.cpp
index 11e26bdc3..12429a73b 100644
--- a/tests/test-pgsql.cpp
+++ b/tests/test-pgsql.cpp
@@ -138,7 +138,7 @@ TEST_CASE("create table and insert something")
 
 TEST_CASE("empty result object should return fatal status")
 {
-    pg_result_t result;
+    pg_result_t const result;
     REQUIRE(result.status() == PGRES_FATAL_ERROR);
     REQUIRE_FALSE(result);
     REQUIRE(result.num_fields() == 0);

From 1b94019b64058d037e5bacf13ce036a376219c11 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 4 Apr 2024 10:36:36 +0200
Subject: [PATCH 113/430] Fix typo

---
 src/geom-from-osm.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/geom-from-osm.cpp b/src/geom-from-osm.cpp
index 68e4cb078..3d241349a 100644
--- a/src/geom-from-osm.cpp
+++ b/src/geom-from-osm.cpp
@@ -170,7 +170,7 @@ void create_multilinestring(geometry_t *geom,
         // retroactively.
         if (multiline.num_geometries() == 1 && !force_multi) {
             // This has to be done in two steps, because the set<>()
-            // destroys the content of mulitline.
+            // destroys the content of multiline.
             auto p = std::move(multiline[0]);
             geom->set<linestring_t>() = std::move(p);
         }

From 60afdaf533c1cb5d1063910d0a306170261235b0 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 4 Apr 2024 16:09:56 +0200
Subject: [PATCH 114/430] Remove superfluous @ in test file

---
 tests/bdd/flex/bbox.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/bdd/flex/bbox.feature b/tests/bdd/flex/bbox.feature
index 8c50fbc6f..129f8ac3d 100644
--- a/tests/bdd/flex/bbox.feature
+++ b/tests/bdd/flex/bbox.feature
@@ -75,7 +75,7 @@ Feature: Test get_bbox() function
             """
             w20 v1 dV Nn10,n11
             w21 v1 dV Nn11,n12
-            r30 v1 dV Ttype=route,route=bus Mw20@@
+            r30 v1 dV Ttype=route,route=bus Mw20@
             r31 v1 dV Ttype=route,route=bus Mw20@,w21@
             """
         And the lua style

From 1bcf13815078a025e0eb3d4002ad4db0c8c6fba9 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 9 Apr 2024 14:43:53 +0200
Subject: [PATCH 115/430] Make table_connection_t::start() function const

---
 src/flex-table.cpp | 3 ++-
 src/flex-table.hpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/flex-table.cpp b/src/flex-table.cpp
index 76224a6b7..dc11f4176 100644
--- a/src/flex-table.cpp
+++ b/src/flex-table.cpp
@@ -279,7 +279,8 @@ static void enable_check_trigger(pg_conn_t const &db_connection,
                               checks);
 }
 
-void table_connection_t::start(pg_conn_t const &db_connection, bool append)
+void table_connection_t::start(pg_conn_t const &db_connection,
+                               bool append) const
 {
     if (!append) {
         drop_table_if_exists(db_connection, table().schema(), table().name());
diff --git a/src/flex-table.hpp b/src/flex-table.hpp
index 5fef823e1..11ce27eb1 100644
--- a/src/flex-table.hpp
+++ b/src/flex-table.hpp
@@ -281,7 +281,7 @@ class table_connection_t
     {
     }
 
-    void start(pg_conn_t const &db_connection, bool append);
+    void start(pg_conn_t const &db_connection, bool append) const;
 
     void stop(pg_conn_t const &db_connection, bool updateable, bool append);
 

From 515dfb25e900fa781f97145246fb280e0d93f187 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 9 Apr 2024 15:41:38 +0200
Subject: [PATCH 116/430] Remove support for legacy middle database format

---
 man/osm2pgsql.1                        |  10 -
 man/osm2pgsql.md                       |   8 -
 src/command-line-parser.cpp            |  33 +-
 src/db-copy-mgr.hpp                    |  13 +-
 src/middle-pgsql.cpp                   | 447 ++-----------------------
 src/middle-pgsql.hpp                   |  11 -
 src/options.hpp                        |   2 +-
 src/osm2pgsql.cpp                      |  12 +-
 tests/bdd/command-line/invalid.feature |  16 -
 tests/bdd/regression/import.feature    |   8 +-
 tests/test-db-copy-mgr.cpp             |  28 +-
 tests/test-middle.cpp                  |  50 +--
 12 files changed, 42 insertions(+), 596 deletions(-)

diff --git a/man/osm2pgsql.1 b/man/osm2pgsql.1
index f99cc65ce..b954a8bc6 100644
--- a/man/osm2pgsql.1
+++ b/man/osm2pgsql.1
@@ -203,16 +203,6 @@ Set ID shift for way node bucket index in middle.
 Experts only.
 See documentation for details.
 .TP
---middle-database-format=FORMAT
-Set the database format for the middle tables to FORMAT.
-Allowed formats are \f[B]new\f[R] (default) and \f[B]legacy\f[R] .
-The \f[B]legacy\f[R] format is deprecated and will be removed in version
-2.0.0.
-See the manual for details on these formats.
-(Only works with \f[B]--slim\f[R].
-In append mode osm2pgsql will automatically detect the database format,
-so don\[cq]t use this with \f[B]-a, --append\f[R].)
-.TP
 --middle-with-nodes
 Used together with the \f[B]new\f[R] middle database format when a flat
 nodes file is used to force storing nodes with tags in the database,
diff --git a/man/osm2pgsql.md b/man/osm2pgsql.md
index d4f22027d..d355ce643 100644
--- a/man/osm2pgsql.md
+++ b/man/osm2pgsql.md
@@ -176,14 +176,6 @@ mandatory for short options too.
 :   Set ID shift for way node bucket index in middle. Experts only. See
     documentation for details.
 
-\--middle-database-format=FORMAT
-:   Set the database format for the middle tables to FORMAT. Allowed formats
-    are **new** (default) and **legacy** . The **legacy** format is deprecated
-    and will be removed in version 2.0.0. See the manual for details on these
-    formats. (Only works with **\--slim**. In append mode osm2pgsql will
-    automatically detect the database format, so don't use this with
-    **-a, \--append**.)
-
 \--middle-with-nodes
 :   Used together with the **new** middle database format when a flat nodes
     file is used to force storing nodes with tags in the database, too.
diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index fcf216eab..6d529c828 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -131,9 +131,8 @@ void print_version()
 
 static void check_options_non_slim(CLI::App const &app)
 {
-    std::array<std::string, 7> const slim_options = {
+    std::array<std::string, 6> const slim_options = {
         "--flat-nodes",
-        "--middle-database-format",
         "--middle-schema",
         "--middle-with-nodes",
         "--middle-way-node-index-id-shift",
@@ -525,13 +524,6 @@ options_t parse_command_line(int argc, char *argv[])
         ->type_name("SCHEMA")
         ->group("Middle options");
 
-    std::string middle_database_format_raw;
-    // --middle-database-format
-    app.add_option("--middle-database-format", middle_database_format_raw)
-        ->description("Set middle db format ('legacy', 'new' (default)).")
-        ->type_name("FORMAT")
-        ->group("Middle options");
-
     // --middle-with-nodes
     app.add_flag("--middle-with-nodes", options.middle_with_nodes)
         ->description("Store tagged nodes in db (new middle db format only).")
@@ -651,28 +643,7 @@ options_t parse_command_line(int argc, char *argv[])
     check_options(&options);
 
     if (options.slim) { // slim mode, use database middle
-        if (middle_database_format_raw.empty()) {
-            // Database format not set on the command line, use defaults. For
-            // append mode we keep old default for backwards compatibility, for
-            // create mode the new format is the default. (These will possibly
-            // be overwritten later by properties setting if it exists.)
-            options.middle_database_format = options.append ? 1 : 2;
-        } else if (options.append) {
-            // Database format set on command line in append mode.
-            throw std::runtime_error{
-                "Do not use --middle-database-format with --append."};
-        } else {
-            // Database format set on the command line in create mode.
-            if (middle_database_format_raw == "legacy") {
-                options.middle_database_format = 1;
-            } else if (middle_database_format_raw == "new") {
-                options.middle_database_format = 2;
-            } else {
-                throw std::runtime_error{
-                    "Unknown value for --middle-database-format"
-                    " (Use 'legacy' or 'new')."};
-            }
-        }
+        options.middle_database_format = 2;
     } else { // non-slim mode, use ram middle
         check_options_non_slim(app);
     }
diff --git a/src/db-copy-mgr.hpp b/src/db-copy-mgr.hpp
index 0548b32c5..a37ca299a 100644
--- a/src/db-copy-mgr.hpp
+++ b/src/db-copy-mgr.hpp
@@ -121,23 +121,12 @@ class db_copy_mgr_t
      * Adds the value in the format appropriate for an array and a value
      * separator.
      */
-    template <typename T>
-    void add_array_elem(T value)
+    void add_array_elem(osmid_t value)
     {
         add_value(value);
         m_current->buffer += ',';
     }
 
-    void add_array_elem(std::string const &s) { add_array_elem(s.c_str()); }
-
-    void add_array_elem(char const *s)
-    {
-        assert(m_current);
-        m_current->buffer += '"';
-        add_escaped_string(s);
-        m_current->buffer += "\",";
-    }
-
     /**
      * Finish an array column previously started with new_array().
      *
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index e2f1df1ea..e8a0df5eb 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -190,134 +190,8 @@ void middle_pgsql_t::table_desc::init_max_id(pg_conn_t const &db_connection)
     m_max_id = osmium::string_to_object_id(res.get_value(0, 0));
 }
 
-/**
- * Decode item in an array literal from PostgreSQL to the next delimiter.
- *
- * \param src Pointer to the text with the array literal.
- * \param dst The decoded item is written to this string. The string is
- *            cleared before use.
- * \returns Pointer to the delimiter found.
- * \throws runtime_error If the input string ends before the delimiter is found.
- */
-static char const *decode_to_delimiter(char const *src, std::string *dst)
-{
-    assert(src);
-    dst->clear();
-
-    bool const quoted = (*src == '"');
-    if (quoted) {
-        ++src;
-    }
-
-    while (quoted ? (*src != '"') : (*src != ',' && *src != '}')) {
-        if (*src == '\0') {
-            throw std::runtime_error{
-                "Parsing array literal from database failed."};
-        }
-        if (*src == '\\') {
-            switch (src[1]) {
-            case 'n':
-                dst->append(1, '\n');
-                break;
-            case 't':
-                dst->append(1, '\t');
-                break;
-            default:
-                dst->append(1, src[1]);
-                break;
-            }
-            src += 2;
-        } else {
-            dst->append(1, *src++);
-        }
-    }
-
-    if (quoted) {
-        ++src;
-    }
-
-    return src;
-}
-
 namespace {
 
-/**
- * Go through tags returned from a version 1 middle table, get the attributes
- * from the "osm_*" tags and add them to the builder.
- */
-template <typename T>
-void pgsql_get_attr_from_tags(char const *string, T *builder)
-{
-    if (*string++ != '{') {
-        return;
-    }
-
-    std::string key;
-    std::string val;
-    std::string user;
-    while (*string != '}') {
-        string = decode_to_delimiter(string, &key);
-        // String points to the comma */
-        ++string;
-        string = decode_to_delimiter(string, &val);
-
-        if (key == "osm_version") {
-            builder->set_version(val.c_str());
-        } else if (key == "osm_timestamp") {
-            builder->set_timestamp(osmium::Timestamp{val});
-        } else if (key == "osm_changeset") {
-            builder->set_changeset(val.c_str());
-        } else if (key == "osm_uid") {
-            builder->set_uid(val.c_str());
-        } else if (key == "osm_user") {
-            user = val;
-        }
-
-        // String points to the comma or closing '}' */
-        if (*string == ',') {
-            ++string;
-        }
-    }
-
-    // Must be done at the end, because after that call the builder might
-    // become invalid due to buffer resizing.
-    builder->set_user(user);
-}
-
-/**
- * Go through tags returned from a version 1 middle table, get all tags except
- * the pseudo-tags containing attributes and add them to the builder.
- */
-template <typename T>
-void pgsql_parse_tags(char const *string, osmium::memory::Buffer *buffer,
-                      T *obuilder)
-{
-    if (*string++ != '{') {
-        return;
-    }
-
-    osmium::builder::TagListBuilder builder{*buffer, obuilder};
-
-    std::string key;
-    std::string val;
-    while (*string != '}') {
-        string = decode_to_delimiter(string, &key);
-        // String points to the comma */
-        ++string;
-        string = decode_to_delimiter(string, &val);
-
-        if (key != "osm_version" && key != "osm_timestamp" &&
-            key != "osm_changeset" && key != "osm_uid" && key != "osm_user") {
-            builder.add_tag(key, val);
-        }
-
-        // String points to the comma or closing '}' */
-        if (*string == ',') {
-            ++string;
-        }
-    }
-}
-
 /**
  * Parse JSON-encoded tags from a version 2 middle table and add them to the
  * builder.
@@ -455,30 +329,6 @@ void pgsql_parse_json_members(char const *string,
     nlohmann::json::sax_parse(string, &parser);
 }
 
-void pgsql_parse_members(char const *string, osmium::memory::Buffer *buffer,
-                         osmium::builder::RelationBuilder *obuilder)
-{
-    if (*string++ != '{') {
-        return;
-    }
-
-    std::string role;
-    osmium::builder::RelationMemberListBuilder builder{*buffer, obuilder};
-
-    while (*string != '}') {
-        char const type = string[0];
-        char *endp = nullptr;
-        osmid_t const id = std::strtoll(string + 1, &endp, 10);
-        // String points to the comma */
-        string = decode_to_delimiter(endp + 1, &role);
-        builder.add_member(osmium::char_to_item_type(type), id, role);
-        // String points to the comma or closing '}' */
-        if (*string == ',') {
-            ++string;
-        }
-    }
-}
-
 void pgsql_parse_nodes(char const *string, osmium::memory::Buffer *buffer,
                        osmium::builder::WayBuilder *obuilder)
 {
@@ -568,31 +418,6 @@ static void members_to_json(osmium::RelationMemberList const &members,
     writer->end_array();
 }
 
-void middle_pgsql_t::buffer_store_tags(osmium::OSMObject const &obj, bool attrs)
-{
-    if (obj.tags().empty() && !attrs) {
-        m_db_copy.add_null_column();
-    } else {
-        m_db_copy.new_array();
-
-        for (auto const &it : obj.tags()) {
-            m_db_copy.add_array_elem(it.key());
-            m_db_copy.add_array_elem(it.value());
-        }
-
-        if (attrs) {
-            taglist_t extra;
-            extra.add_attributes(obj);
-            for (auto const &it : extra) {
-                m_db_copy.add_array_elem(it.key);
-                m_db_copy.add_array_elem(it.value);
-            }
-        }
-
-        m_db_copy.finish_array();
-    }
-}
-
 void middle_pgsql_t::copy_attributes(osmium::OSMObject const &obj)
 {
     if (obj.timestamp()) {
@@ -623,17 +448,13 @@ void middle_pgsql_t::copy_attributes(osmium::OSMObject const &obj)
 
 void middle_pgsql_t::copy_tags(osmium::OSMObject const &obj)
 {
-    if (m_store_options.db_format == 2) {
-        if (obj.tags().empty()) {
-            m_db_copy.add_null_column();
-            return;
-        }
-        json_writer_t writer;
-        tags_to_json(obj.tags(), &writer);
-        m_db_copy.add_column(writer.json());
+    if (obj.tags().empty()) {
+        m_db_copy.add_null_column();
         return;
     }
-    buffer_store_tags(obj, m_store_options.with_attributes);
+    json_writer_t writer;
+    tags_to_json(obj.tags(), &writer);
+    m_db_copy.add_column(writer.json());
 }
 
 std::size_t middle_query_pgsql_t::get_way_node_locations_db(
@@ -740,12 +561,10 @@ void middle_pgsql_t::node_set(osmium::Node const &node)
 
     m_db_copy.add_columns(node.id(), node.location().y(), node.location().x());
 
-    if (m_store_options.db_format == 2) {
-        if (m_store_options.with_attributes) {
-            copy_attributes(node);
-        }
-        copy_tags(node);
+    if (m_store_options.with_attributes) {
+        copy_attributes(node);
     }
+    copy_tags(node);
 
     m_db_copy.finish_line();
 }
@@ -973,7 +792,7 @@ void middle_pgsql_t::way_set(osmium::Way const &way)
 
     m_db_copy.add_column(way.id());
 
-    if (m_store_options.db_format == 2 && m_store_options.with_attributes) {
+    if (m_store_options.with_attributes) {
         copy_attributes(way);
     }
 
@@ -994,21 +813,11 @@ void middle_pgsql_t::way_set(osmium::Way const &way)
  */
 static void build_way(osmid_t id, pg_result_t const &res, int res_num,
                       int offset, osmium::memory::Buffer *buffer,
-                      uint8_t db_format, bool with_attributes)
+                      bool with_attributes)
 {
     osmium::builder::WayBuilder builder{*buffer};
     builder.set_id(id);
 
-    if (db_format == 1) {
-        if (with_attributes) {
-            pgsql_get_attr_from_tags(res.get_value(res_num, offset + 1),
-                                     &builder);
-        }
-        pgsql_parse_nodes(res.get_value(res_num, offset + 0), buffer, &builder);
-        pgsql_parse_tags(res.get_value(res_num, offset + 1), buffer, &builder);
-        return;
-    }
-
     if (with_attributes) {
         set_attributes_on_builder(&builder, res, res_num, offset);
     }
@@ -1027,8 +836,7 @@ bool middle_query_pgsql_t::way_get(osmid_t id,
         return false;
     }
 
-    build_way(id, res, 0, 0, buffer, m_store_options.db_format,
-              m_store_options.with_attributes);
+    build_way(id, res, 0, 0, buffer, m_store_options.with_attributes);
 
     buffer->commit();
 
@@ -1075,7 +883,6 @@ middle_query_pgsql_t::rel_members_get(osmium::Relation const &rel,
             for (int j = 0; j < res.num_tuples(); ++j) {
                 if (member.ref() == wayidspg[static_cast<std::size_t>(j)]) {
                     build_way(member.ref(), res, j, 1, buffer,
-                              m_store_options.db_format,
                               m_store_options.with_attributes);
                     ++members_found;
                     break;
@@ -1099,50 +906,7 @@ void middle_pgsql_t::way_delete(osmid_t osm_id)
     }
 }
 
-void middle_pgsql_t::relation_set_format1(osmium::Relation const &rel)
-{
-    // Sort relation members by their type.
-    std::array<idlist_t, 3> parts;
-
-    for (auto const &m : rel.members()) {
-        parts.at(osmium::item_type_to_nwr_index(m.type())).push_back(m.ref());
-    }
-
-    m_db_copy.new_line(m_tables.relations().copy_target());
-
-    // id, way offset, relation offset
-    m_db_copy.add_columns(rel.id(), parts[0].size(),
-                          parts[0].size() + parts[1].size());
-
-    // parts
-    m_db_copy.new_array();
-    for (auto const &part : parts) {
-        for (auto it : part) {
-            m_db_copy.add_array_elem(it);
-        }
-    }
-    m_db_copy.finish_array();
-
-    // members
-    if (rel.members().empty()) {
-        m_db_copy.add_null_column();
-    } else {
-        m_db_copy.new_array();
-        for (auto const &m : rel.members()) {
-            m_db_copy.add_array_elem(osmium::item_type_to_char(m.type()) +
-                                     std::to_string(m.ref()));
-            m_db_copy.add_array_elem(m.role());
-        }
-        m_db_copy.finish_array();
-    }
-
-    // tags
-    buffer_store_tags(rel, m_options->extra_attributes);
-
-    m_db_copy.finish_line();
-}
-
-void middle_pgsql_t::relation_set_format2(osmium::Relation const &rel)
+void middle_pgsql_t::relation_set(osmium::Relation const &rel)
 {
     m_db_copy.new_line(m_tables.relations().copy_target());
     m_db_copy.add_column(rel.id());
@@ -1160,43 +924,8 @@ void middle_pgsql_t::relation_set_format2(osmium::Relation const &rel)
     m_db_copy.finish_line();
 }
 
-void middle_pgsql_t::relation_set(osmium::Relation const &rel)
-{
-    if (m_store_options.db_format == 2) {
-        return relation_set_format2(rel);
-    }
-    return relation_set_format1(rel);
-}
-
-bool middle_query_pgsql_t::relation_get_format1(
-    osmid_t id, osmium::memory::Buffer *buffer) const
-{
-    assert(buffer);
-
-    auto const res = m_db_connection.exec_prepared("get_rel", id);
-    if (res.num_tuples() != 1) {
-        return false;
-    }
-
-    {
-        osmium::builder::RelationBuilder builder{*buffer};
-        builder.set_id(id);
-        if (m_store_options.with_attributes) {
-            pgsql_get_attr_from_tags(res.get_value(0, 1), &builder);
-        }
-
-        pgsql_get_attr_from_tags(res.get_value(0, 1), &builder);
-        pgsql_parse_members(res.get_value(0, 0), buffer, &builder);
-        pgsql_parse_tags(res.get_value(0, 1), buffer, &builder);
-    }
-
-    buffer->commit();
-
-    return true;
-}
-
-bool middle_query_pgsql_t::relation_get_format2(
-    osmid_t id, osmium::memory::Buffer *buffer) const
+bool middle_query_pgsql_t::relation_get(osmid_t id,
+                                        osmium::memory::Buffer *buffer) const
 {
     assert(buffer);
 
@@ -1222,15 +951,6 @@ bool middle_query_pgsql_t::relation_get_format2(
     return true;
 }
 
-bool middle_query_pgsql_t::relation_get(osmid_t id,
-                                        osmium::memory::Buffer *buffer) const
-{
-    if (m_store_options.db_format == 2) {
-        return relation_get_format2(id, buffer);
-    }
-    return relation_get_format1(id, buffer);
-}
-
 void middle_pgsql_t::relation_delete(osmid_t osm_id)
 {
     assert(m_options->append);
@@ -1284,8 +1004,7 @@ void middle_pgsql_t::after_relations()
         analyze_table(m_db_connection, table.schema(), table.name());
     }
 
-    if (m_store_options.db_format == 2 && m_store_options.with_attributes &&
-        !m_options->droptemp) {
+    if (m_store_options.with_attributes && !m_options->droptemp) {
         if (m_append) {
             update_users_table();
         } else {
@@ -1342,9 +1061,7 @@ void middle_pgsql_t::start()
         m_tables.ways().init_max_id(m_db_connection);
         m_tables.relations().init_max_id(m_db_connection);
     } else {
-        if (m_store_options.db_format == 2) {
-            table_setup(m_db_connection, m_users_table);
-        }
+        table_setup(m_db_connection, m_users_table);
         for (auto const &table : m_tables) {
             table_setup(m_db_connection, table);
         }
@@ -1438,33 +1155,7 @@ static table_sql sql_for_users(middle_pgsql_options const &store_options)
     return sql;
 }
 
-static table_sql sql_for_nodes_format1(bool create_table)
-{
-    table_sql sql{};
-
-    sql.name = "{prefix}_nodes";
-
-    if (create_table) {
-        sql.create_table =
-            "CREATE {unlogged} TABLE {schema}\"{prefix}_nodes\" ("
-            "  id int8 PRIMARY KEY {using_tablespace},"
-            "  lat int4 NOT NULL,"
-            "  lon int4 NOT NULL"
-            ") {data_tablespace}";
-
-        sql.prepare_queries = {
-            "PREPARE get_node_list(int8[]) AS"
-            "  SELECT id, lon, lat FROM {schema}\"{prefix}_nodes\""
-            "  WHERE id = ANY($1::int8[])",
-            "PREPARE get_node(int8) AS"
-            "  SELECT id, lon, lat FROM {schema}\"{prefix}_nodes\""
-            "  WHERE id = $1"};
-    }
-
-    return sql;
-}
-
-static table_sql sql_for_nodes_format2(middle_pgsql_options const &options)
+static table_sql sql_for_nodes(middle_pgsql_options const &options)
 {
     table_sql sql{};
 
@@ -1492,48 +1183,7 @@ static table_sql sql_for_nodes_format2(middle_pgsql_options const &options)
     return sql;
 }
 
-static table_sql sql_for_ways_format1(uint8_t way_node_index_id_shift)
-{
-    table_sql sql{};
-
-    sql.name = "{prefix}_ways";
-
-    sql.create_table = "CREATE {unlogged} TABLE {schema}\"{prefix}_ways\" ("
-                       "  id int8 PRIMARY KEY {using_tablespace},"
-                       "  nodes int8[] NOT NULL,"
-                       "  tags text[]"
-                       ") {data_tablespace}";
-
-    sql.prepare_queries = {"PREPARE get_way(int8) AS"
-                           "  SELECT nodes, tags"
-                           "    FROM {schema}\"{prefix}_ways\" WHERE id = $1",
-                           "PREPARE get_way_list(int8[]) AS"
-                           "  SELECT id, nodes, tags"
-                           "    FROM {schema}\"{prefix}_ways\""
-                           "      WHERE id = ANY($1::int8[])"};
-
-    if (way_node_index_id_shift == 0) {
-        sql.create_fw_dep_indexes = {
-            "CREATE INDEX ON {schema}\"{prefix}_ways\" USING GIN (nodes)"
-            "  WITH (fastupdate = off) {index_tablespace}"};
-    } else {
-        sql.create_fw_dep_indexes = {
-            "CREATE OR REPLACE FUNCTION"
-            "    {schema}\"{prefix}_index_bucket\"(int8[])"
-            "  RETURNS int8[] AS $$"
-            "  SELECT ARRAY(SELECT DISTINCT"
-            "    unnest($1) >> {way_node_index_id_shift})"
-            "$$ LANGUAGE SQL IMMUTABLE",
-            "CREATE INDEX \"{prefix}_ways_nodes_bucket_idx\""
-            "  ON {schema}\"{prefix}_ways\""
-            "  USING GIN ({schema}\"{prefix}_index_bucket\"(nodes))"
-            "  WITH (fastupdate = off) {index_tablespace}"};
-    }
-
-    return sql;
-}
-
-static table_sql sql_for_ways_format2(middle_pgsql_options const &options)
+static table_sql sql_for_ways(middle_pgsql_options const &options)
 {
     table_sql sql{};
 
@@ -1578,33 +1228,7 @@ static table_sql sql_for_ways_format2(middle_pgsql_options const &options)
     return sql;
 }
 
-static table_sql sql_for_relations_format1()
-{
-    table_sql sql{};
-
-    sql.name = "{prefix}_rels";
-
-    sql.create_table = "CREATE {unlogged} TABLE {schema}\"{prefix}_rels\" ("
-                       "  id int8 PRIMARY KEY {using_tablespace},"
-                       "  way_off int2,"
-                       "  rel_off int2,"
-                       "  parts int8[],"
-                       "  members text[],"
-                       "  tags text[]"
-                       ") {data_tablespace}";
-
-    sql.prepare_queries = {"PREPARE get_rel(int8) AS"
-                           "  SELECT members, tags"
-                           "    FROM {schema}\"{prefix}_rels\" WHERE id = $1"};
-
-    sql.create_fw_dep_indexes = {
-        "CREATE INDEX ON {schema}\"{prefix}_rels\" USING GIN (parts)"
-        "  WITH (fastupdate = off) {index_tablespace}"};
-
-    return sql;
-}
-
-static table_sql sql_for_relations_format2()
+static table_sql sql_for_relations()
 {
     table_sql sql{};
 
@@ -1653,10 +1277,9 @@ middle_pgsql_t::middle_pgsql_t(std::shared_ptr<thread_pool_t> thread_pool,
   m_db_copy(m_copy_thread), m_append(options->append)
 {
     m_store_options.with_attributes = options->extra_attributes;
-    m_store_options.db_format = options->middle_database_format;
     m_store_options.way_node_index_id_shift = options->way_node_index_id_shift;
 
-    if (m_store_options.db_format == 2 && options->middle_with_nodes) {
+    if (options->middle_with_nodes) {
         m_store_options.nodes = true;
     }
 
@@ -1669,8 +1292,7 @@ middle_pgsql_t::middle_pgsql_t(std::shared_ptr<thread_pool_t> thread_pool,
             options->flat_node_file, options->droptemp);
     }
 
-    log_debug("Mid: pgsql, cache={}, db_format={}", options->cache,
-              options->middle_database_format);
+    log_debug("Mid: pgsql, cache={}", options->cache);
 
     bool const has_bucket_index =
         check_bucket_index(&m_db_connection, options->prefix);
@@ -1679,29 +1301,11 @@ middle_pgsql_t::middle_pgsql_t(std::shared_ptr<thread_pool_t> thread_pool,
         log_debug("You don't have a bucket index. See manual for details.");
     }
 
-    if (m_store_options.db_format == 1) {
-        m_tables.nodes() = table_desc{
-            *options,
-            sql_for_nodes_format1(!m_store_options.use_flat_node_file)};
+    m_tables.nodes() = table_desc{*options, sql_for_nodes(m_store_options)};
+    m_tables.ways() = table_desc{*options, sql_for_ways(m_store_options)};
+    m_tables.relations() = table_desc{*options, sql_for_relations()};
 
-        m_tables.ways() = table_desc{
-            *options,
-            sql_for_ways_format1(m_store_options.way_node_index_id_shift)};
-
-        m_tables.relations() =
-            table_desc{*options, sql_for_relations_format1()};
-    } else {
-        m_tables.nodes() =
-            table_desc{*options, sql_for_nodes_format2(m_store_options)};
-
-        m_tables.ways() =
-            table_desc{*options, sql_for_ways_format2(m_store_options)};
-
-        m_tables.relations() =
-            table_desc{*options, sql_for_relations_format2()};
-
-        m_users_table = table_desc{*options, sql_for_users(m_store_options)};
-    }
+    m_users_table = table_desc{*options, sql_for_users(m_store_options)};
 }
 
 void middle_pgsql_t::set_requirements(
@@ -1710,7 +1314,6 @@ void middle_pgsql_t::set_requirements(
     log_debug("Middle 'pgsql' options:");
     log_debug("  nodes: {}", m_store_options.nodes);
     log_debug("  untagged_nodes: {}", m_store_options.untagged_nodes);
-    log_debug("  db_format: {}", m_store_options.db_format);
     log_debug("  use_flat_node_file: {}", m_store_options.use_flat_node_file);
     log_debug("  way_node_index_id_shift: {}",
               m_store_options.way_node_index_id_shift);
diff --git a/src/middle-pgsql.hpp b/src/middle-pgsql.hpp
index ffd55c22d..15d91bc76 100644
--- a/src/middle-pgsql.hpp
+++ b/src/middle-pgsql.hpp
@@ -42,9 +42,6 @@ struct middle_pgsql_options
     // Bit shift used in way node index
     uint8_t way_node_index_id_shift = 5;
 
-    // Database format (legacy = 1, new = 2)
-    uint8_t db_format = 1;
-
     // Use a flat node file
     bool use_flat_node_file = false;
 
@@ -71,9 +68,6 @@ class middle_query_pgsql_t : public middle_query_t
                            osmium::memory::Buffer *buffer,
                            osmium::osm_entity_bits::type types) const override;
 
-    bool relation_get_format1(osmid_t id, osmium::memory::Buffer *buffer) const;
-    bool relation_get_format2(osmid_t id, osmium::memory::Buffer *buffer) const;
-
     bool relation_get(osmid_t id,
                       osmium::memory::Buffer *buffer) const override;
 
@@ -191,14 +185,9 @@ struct middle_pgsql_t : public middle_t
     void way_set(osmium::Way const &way);
     void way_delete(osmid_t id);
 
-    void relation_set_format1(osmium::Relation const &rel);
-    void relation_set_format2(osmium::Relation const &rel);
-
     void relation_set(osmium::Relation const &rel);
     void relation_delete(osmid_t id);
 
-    void buffer_store_tags(osmium::OSMObject const &obj, bool attrs);
-
     void copy_attributes(osmium::OSMObject const &obj);
     void copy_tags(osmium::OSMObject const &obj);
 
diff --git a/src/options.hpp b/src/options.hpp
index bf9655289..c0acd0890 100644
--- a/src/options.hpp
+++ b/src/options.hpp
@@ -118,7 +118,7 @@ struct options_t
     /**
      * Middle database format:
      * 0 = non-slim mode, no database middle (ram middle)
-     * 1 = slim mode, legacy database format
+     * 1 = slim mode, legacy database format (not used any more)
      * 2 = slim mode, new database format
      */
     uint8_t middle_database_format = 0;
diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
index e9156e76d..ead6eabd6 100644
--- a/src/osm2pgsql.cpp
+++ b/src/osm2pgsql.cpp
@@ -231,17 +231,7 @@ static void check_db_format(properties_t const &properties, options_t *options)
 {
     auto const format = properties.get_int("db_format", -1);
 
-    if (format == -1) {
-        // db_format not set, so this is a legacy import
-        return;
-    }
-
-    if (format == 0) {
-        throw std::runtime_error{
-            "This database is not updatable (db_format=0)."};
-    }
-
-    if (format < -1 || format > 2) {
+    if (format != 2) {
         throw fmt_error("Unknown db_format '{}' in properties.", format);
     }
 
diff --git a/tests/bdd/command-line/invalid.feature b/tests/bdd/command-line/invalid.feature
index 49ab7455a..edcce7376 100644
--- a/tests/bdd/command-line/invalid.feature
+++ b/tests/bdd/command-line/invalid.feature
@@ -22,19 +22,3 @@ Feature: Errors for invalid command line parameter combinations
             --append can only be used with slim mode
             """
 
-    Scenario: append and middle-database-format cannot be used together
-        Then running osm2pgsql pgsql with parameters fails
-            | -a | --slim | --middle-database-format=legacy |
-        And the error output contains
-            """
-            Do not use --middle-database-format with --append.
-            """
-
-    Scenario: middle-database-format value
-        Then running osm2pgsql pgsql with parameters fails
-            | --slim | --middle-database-format=foo |
-        And the error output contains
-            """
-            Unknown value for --middle-database-format
-            """
-
diff --git a/tests/bdd/regression/import.feature b/tests/bdd/regression/import.feature
index 71b3cfe1d..eb98fafc0 100644
--- a/tests/bdd/regression/import.feature
+++ b/tests/bdd/regression/import.feature
@@ -149,12 +149,11 @@ Feature: Imports of the test database
             | --tablespace-slim-index| tablespacetest |        |
 
 
-    Scenario Outline: Import slim with hstore and extra tags
+    Scenario: Import slim with hstore and extra tags
         When running osm2pgsql pgsql with parameters
             | --slim |
             | -j |
             | -x |
-            | <middle_format> |
 
         Then table planet_osm_point has 1360 rows with condition
             """
@@ -185,8 +184,3 @@ Feature: Imports of the test database
             tags ? 'osm_changeset'
             """
 
-        Examples: Middle database format
-            | middle_format |
-            | --middle-database-format=legacy |
-            | --middle-database-format=new |
-
diff --git a/tests/test-db-copy-mgr.cpp b/tests/test-db-copy-mgr.cpp
index ef9df4bfc..5c7d5f980 100644
--- a/tests/test-db-copy-mgr.cpp
+++ b/tests/test-db-copy-mgr.cpp
@@ -44,9 +44,8 @@ void add_row(copy_mgr_t *mgr, std::shared_ptr<db_target_descr_t> const &t,
     mgr->sync();
 }
 
-template <typename T>
 void add_array(copy_mgr_t *mgr, std::shared_ptr<db_target_descr_t> const &t,
-               int id, std::vector<T> const &values)
+               int id, std::vector<int> const &values)
 {
     mgr->new_line(t);
     mgr->add_column(id);
@@ -154,33 +153,10 @@ TEST_CASE("copy_mgr_t: Insert int arrays")
 
     auto const t = setup_table("a int[]");
 
-    add_array<int>(&mgr, t, -9000, {45, -2, 0, 56});
+    add_array(&mgr, t, -9000, {45, -2, 0, 56});
     check_row({"-9000", "{45,-2,0,56}"});
 }
 
-TEST_CASE("copy_mgr_t: Insert string arrays")
-{
-    copy_mgr_t mgr{std::make_shared<db_copy_thread_t>(db.connection_params())};
-
-    auto const t = setup_table("a text[]");
-
-    add_array<std::string>(&mgr, t, 3,
-                           {"foo", "", "with space", "with \"quote\"", "the\t",
-                            "line\nbreak", "rr\rrr", "s\\l"});
-    check_row({"3", "{foo,\"\",\"with space\",\"with "
-                    "\\\"quote\\\"\",\"the\t\",\"line\nbreak\","
-                    "\"rr\rrr\",\"s\\\\l\"}"});
-
-    auto const c = db.connect();
-    CHECK(c.result_as_string("SELECT a[4] FROM test_copy_mgr") ==
-          "with \"quote\"");
-    CHECK(c.result_as_string("SELECT a[5] FROM test_copy_mgr") == "the\t");
-    CHECK(c.result_as_string("SELECT a[6] FROM test_copy_mgr") ==
-          "line\nbreak");
-    CHECK(c.result_as_string("SELECT a[7] FROM test_copy_mgr") == "rr\rrr");
-    CHECK(c.result_as_string("SELECT a[8] FROM test_copy_mgr") == "s\\l");
-}
-
 TEST_CASE("copy_mgr_t: Insert hashes")
 {
     copy_mgr_t mgr{std::make_shared<db_copy_thread_t>(db.connection_params())};
diff --git a/tests/test-middle.cpp b/tests/test-middle.cpp
index f384672bd..2f2ec129f 100644
--- a/tests/test-middle.cpp
+++ b/tests/test-middle.cpp
@@ -83,26 +83,6 @@ struct options_flat_node_cache
     }
 };
 
-struct options_slim_legacy_format
-{
-    static options_t options(testing::pg::tempdb_t const &tmpdb)
-    {
-        options_t o = testing::opt_t().slim(tmpdb);
-        o.middle_database_format = 1;
-        return o;
-    }
-};
-
-struct options_slim_legacy_format_with_flatnodes
-{
-    static options_t options(testing::pg::tempdb_t const &tmpdb)
-    {
-        options_t o = testing::opt_t().slim(tmpdb).flatnodes();
-        o.middle_database_format = 1;
-        return o;
-    }
-};
-
 struct options_ram_optimized
 {
     static options_t options(testing::pg::tempdb_t const &)
@@ -112,9 +92,8 @@ struct options_ram_optimized
 };
 
 TEMPLATE_TEST_CASE("middle import", "", options_slim_default,
-                   options_slim_legacy_format, options_slim_with_lc_prefix,
-                   options_slim_with_uc_prefix, options_slim_with_schema,
-                   options_ram_optimized)
+                   options_slim_with_lc_prefix, options_slim_with_uc_prefix,
+                   options_slim_with_schema, options_ram_optimized)
 {
     options_t const options = TestType::options(db);
     testing::cleanup::file_t const flatnode_cleaner{options.flat_node_file};
@@ -367,9 +346,7 @@ static bool no_node(std::shared_ptr<middle_pgsql_t> const &mid, osmid_t id)
 }
 
 TEMPLATE_TEST_CASE("middle: add, delete and update node", "",
-                   options_slim_default, options_slim_legacy_format,
-                   options_flat_node_cache,
-                   options_slim_legacy_format_with_flatnodes)
+                   options_slim_default, options_flat_node_cache)
 {
     auto thread_pool = std::make_shared<thread_pool_t>(1U);
 
@@ -586,9 +563,7 @@ static bool no_way(std::shared_ptr<middle_pgsql_t> const &mid, osmid_t id)
 }
 
 TEMPLATE_TEST_CASE("middle: add, delete and update way", "",
-                   options_slim_default, options_slim_legacy_format,
-                   options_flat_node_cache,
-                   options_slim_legacy_format_with_flatnodes)
+                   options_slim_default, options_flat_node_cache)
 {
     auto thread_pool = std::make_shared<thread_pool_t>(1U);
 
@@ -739,8 +714,7 @@ TEMPLATE_TEST_CASE("middle: add, delete and update way", "",
 }
 
 TEMPLATE_TEST_CASE("middle: add way with attributes", "", options_slim_default,
-                   options_slim_legacy_format, options_flat_node_cache,
-                   options_slim_legacy_format_with_flatnodes)
+                   options_flat_node_cache)
 {
     auto thread_pool = std::make_shared<thread_pool_t>(1U);
 
@@ -840,9 +814,7 @@ static bool no_relation(std::shared_ptr<middle_pgsql_t> const &mid, osmid_t id)
 }
 
 TEMPLATE_TEST_CASE("middle: add, delete and update relation", "",
-                   options_slim_default, options_slim_legacy_format,
-                   options_flat_node_cache,
-                   options_slim_legacy_format_with_flatnodes)
+                   options_slim_default, options_flat_node_cache)
 {
     auto thread_pool = std::make_shared<thread_pool_t>(1U);
 
@@ -993,9 +965,7 @@ TEMPLATE_TEST_CASE("middle: add, delete and update relation", "",
 }
 
 TEMPLATE_TEST_CASE("middle: add relation with attributes", "",
-                   options_slim_default, options_slim_legacy_format,
-                   options_flat_node_cache,
-                   options_slim_legacy_format_with_flatnodes)
+                   options_slim_default, options_flat_node_cache)
 {
     auto thread_pool = std::make_shared<thread_pool_t>(1U);
 
@@ -1042,8 +1012,7 @@ TEMPLATE_TEST_CASE("middle: add relation with attributes", "",
 }
 
 TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
-                   options_slim_legacy_format, options_flat_node_cache,
-                   options_slim_legacy_format_with_flatnodes)
+                   options_flat_node_cache)
 {
     auto thread_pool = std::make_shared<thread_pool_t>(1U);
 
@@ -1198,8 +1167,7 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
 }
 
 TEMPLATE_TEST_CASE("middle: change nodes in relation", "", options_slim_default,
-                   options_slim_legacy_format, options_flat_node_cache,
-                   options_slim_legacy_format_with_flatnodes)
+                   options_flat_node_cache)
 {
     auto thread_pool = std::make_shared<thread_pool_t>(1U);
 

From 94a8d33eed3d0910ddbf91003f08a704323c73aa Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 11 Apr 2024 12:02:22 +0200
Subject: [PATCH 117/430] Better checks for different situations regarding the
 middle tables

We don't support the case any more where you don't have an
osm2pgsql_properties table.
---
 src/osm2pgsql.cpp | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
index ead6eabd6..e2ef89e0c 100644
--- a/src/osm2pgsql.cpp
+++ b/src/osm2pgsql.cpp
@@ -231,6 +231,12 @@ static void check_db_format(properties_t const &properties, options_t *options)
 {
     auto const format = properties.get_int("db_format", -1);
 
+    if (format == 1) {
+        throw std::runtime_error{
+            "Old database format detected. This version of osm2pgsql can not "
+            "read this any more. Downgrade osm2pgsql or reimport database."};
+    }
+
     if (format != 2) {
         throw fmt_error("Unknown db_format '{}' in properties.", format);
     }
@@ -303,23 +309,6 @@ static void check_and_update_properties(properties_t *properties,
     check_and_update_style_file(properties, options);
 }
 
-// If we are in append mode and the middle nodes table isn't there, it probably
-// means we used a flat node store when we created this database. Check for
-// that and stop if it looks like we are missing the node location store
-// option. (This function is only used in legacy systems which don't have the
-// properties stored in the database.)
-static void check_for_nodes_table(options_t const &options)
-{
-    if (!options.flat_node_file.empty()) {
-        return;
-    }
-
-    if (!has_table(options.middle_dbschema, options.prefix + "_nodes")) {
-        throw std::runtime_error{"You seem to not have a nodes table. Did "
-                                 "you forget the --flat-nodes option?"};
-    }
-}
-
 static void set_option_defaults(options_t *options)
 {
     if (options->output_backend.empty()) {
@@ -360,13 +349,14 @@ int main(int argc, char *argv[])
         properties_t properties{options.connection_params,
                                 options.middle_dbschema};
         if (options.append) {
-            if (properties.load()) {
-                check_and_update_properties(&properties, &options);
-            } else {
-                set_option_defaults(&options);
-                check_for_nodes_table(options);
+            if (!properties.load()) {
+                throw std::runtime_error{
+                    "Did not find table 'osm2pgsql_properties' in database. "
+                    "Database too old? Wrong schema?"};
             }
 
+            check_and_update_properties(&properties, &options);
+
             auto const finfo = run(options);
 
             if (finfo.last_timestamp.valid()) {

From 06eb3faf9d1895f16efd21e35a897026308ba07e Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 10 Apr 2024 15:48:02 +0200
Subject: [PATCH 118/430] Generalizer: Add "append" flag as parameter to all
 generalizers

and make it accessible through the append_mode() function.
---
 src/gen/gen-base.cpp               |  4 ++--
 src/gen/gen-base.hpp               |  5 ++++-
 src/gen/gen-create.cpp             | 13 +++++++------
 src/gen/gen-create.hpp             |  2 +-
 src/gen/gen-discrete-isolation.cpp |  4 ++--
 src/gen/gen-discrete-isolation.hpp |  2 +-
 src/gen/gen-rivers.cpp             |  4 ++--
 src/gen/gen-rivers.hpp             |  2 +-
 src/gen/gen-tile-builtup.cpp       |  5 +++--
 src/gen/gen-tile-builtup.hpp       |  2 +-
 src/gen/gen-tile-raster.cpp        |  4 ++--
 src/gen/gen-tile-raster.hpp        |  3 ++-
 src/gen/gen-tile-vector.cpp        |  5 +++--
 src/gen/gen-tile-vector.hpp        |  3 ++-
 src/gen/gen-tile.cpp               |  4 ++--
 src/gen/gen-tile.hpp               |  2 +-
 src/gen/osm2pgsql-gen.cpp          |  5 +++--
 17 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/src/gen/gen-base.cpp b/src/gen/gen-base.cpp
index 5e5d3ad15..c8737ee4c 100644
--- a/src/gen/gen-base.cpp
+++ b/src/gen/gen-base.cpp
@@ -14,8 +14,8 @@
 
 #include <fmt/args.h>
 
-gen_base_t::gen_base_t(pg_conn_t *connection, params_t *params)
-: m_connection(connection), m_params(params)
+gen_base_t::gen_base_t(pg_conn_t *connection, bool append, params_t *params)
+: m_connection(connection), m_params(params), m_append(append)
 {
     assert(connection);
     assert(params);
diff --git a/src/gen/gen-base.hpp b/src/gen/gen-base.hpp
index 59579b85c..3117b968c 100644
--- a/src/gen/gen-base.hpp
+++ b/src/gen/gen-base.hpp
@@ -67,8 +67,10 @@ class gen_base_t
         }
     }
 
+    bool append_mode() const noexcept { return m_append; }
+
 protected:
-    gen_base_t(pg_conn_t *connection, params_t *params);
+    gen_base_t(pg_conn_t *connection, bool append, params_t *params);
 
     /**
      * Check that the 'src_table' and 'dest_table' parameters exist and that
@@ -106,6 +108,7 @@ class gen_base_t
     std::vector<util::timer_t> m_timers;
     pg_conn_t *m_connection;
     params_t *m_params;
+    bool m_append;
     bool m_debug = false;
 }; // class gen_base_t
 
diff --git a/src/gen/gen-create.cpp b/src/gen/gen-create.cpp
index dd532fec4..e26db109c 100644
--- a/src/gen/gen-create.cpp
+++ b/src/gen/gen-create.cpp
@@ -18,24 +18,25 @@
 
 std::unique_ptr<gen_base_t> create_generalizer(std::string const &strategy,
                                                pg_conn_t *connection,
-                                               params_t *params)
+                                               bool append, params_t *params)
 {
     auto generalizer = [&]() -> std::unique_ptr<gen_base_t> {
         if (strategy == "builtup") {
-            return std::make_unique<gen_tile_builtup_t>(connection, params);
+            return std::make_unique<gen_tile_builtup_t>(connection, append,
+                                                        params);
         }
         if (strategy == "discrete-isolation") {
-            return std::make_unique<gen_di_t>(connection, params);
+            return std::make_unique<gen_di_t>(connection, append, params);
         }
         if (strategy == "raster-union") {
-            return std::make_unique<gen_tile_raster_union_t>(connection,
+            return std::make_unique<gen_tile_raster_union_t>(connection, append,
                                                              params);
         }
         if (strategy == "rivers") {
-            return std::make_unique<gen_rivers_t>(connection, params);
+            return std::make_unique<gen_rivers_t>(connection, append, params);
         }
         if (strategy == "vector-union") {
-            return std::make_unique<gen_tile_vector_union_t>(connection,
+            return std::make_unique<gen_tile_vector_union_t>(connection, append,
                                                              params);
         }
         throw fmt_error("Unknown generalization strategy '{}'.", strategy);
diff --git a/src/gen/gen-create.hpp b/src/gen/gen-create.hpp
index 56a652c43..b7997bb3c 100644
--- a/src/gen/gen-create.hpp
+++ b/src/gen/gen-create.hpp
@@ -21,6 +21,6 @@ class pg_conn_t;
 /// Instantiate a generalizer for the specified strategy.
 std::unique_ptr<gen_base_t> create_generalizer(std::string const &strategy,
                                                pg_conn_t *connection,
-                                               params_t *params);
+                                               bool append, params_t *params);
 
 #endif // OSM2PGSQL_GEN_CREATE_HPP
diff --git a/src/gen/gen-discrete-isolation.cpp b/src/gen/gen-discrete-isolation.cpp
index 292ae6f04..b56f5ba19 100644
--- a/src/gen/gen-discrete-isolation.cpp
+++ b/src/gen/gen-discrete-isolation.cpp
@@ -17,8 +17,8 @@
 #include <algorithm>
 #include <vector>
 
-gen_di_t::gen_di_t(pg_conn_t *connection, params_t *params)
-: gen_base_t(connection, params), m_timer_get(add_timer("get")),
+gen_di_t::gen_di_t(pg_conn_t *connection, bool append, params_t *params)
+: gen_base_t(connection, append, params), m_timer_get(add_timer("get")),
   m_timer_sort(add_timer("sort")), m_timer_di(add_timer("di")),
   m_timer_reorder(add_timer("reorder")), m_timer_write(add_timer("write"))
 {
diff --git a/src/gen/gen-discrete-isolation.hpp b/src/gen/gen-discrete-isolation.hpp
index 3ee6824af..29d680b9a 100644
--- a/src/gen/gen-discrete-isolation.hpp
+++ b/src/gen/gen-discrete-isolation.hpp
@@ -17,7 +17,7 @@
 class gen_di_t : public gen_base_t
 {
 public:
-    gen_di_t(pg_conn_t *connection, params_t *params);
+    gen_di_t(pg_conn_t *connection, bool append, params_t *params);
 
     void process() override;
 
diff --git a/src/gen/gen-rivers.cpp b/src/gen/gen-rivers.cpp
index 959c1d02a..76a165160 100644
--- a/src/gen/gen-rivers.cpp
+++ b/src/gen/gen-rivers.cpp
@@ -22,8 +22,8 @@
 #include <unordered_map>
 #include <vector>
 
-gen_rivers_t::gen_rivers_t(pg_conn_t *connection, params_t *params)
-: gen_base_t(connection, params), m_timer_area(add_timer("area")),
+gen_rivers_t::gen_rivers_t(pg_conn_t *connection, bool append, params_t *params)
+: gen_base_t(connection, append, params), m_timer_area(add_timer("area")),
   m_timer_prep(add_timer("prep")), m_timer_get(add_timer("get")),
   m_timer_sort(add_timer("sort")), m_timer_net(add_timer("net")),
   m_timer_remove(add_timer("remove")), m_timer_width(add_timer("width")),
diff --git a/src/gen/gen-rivers.hpp b/src/gen/gen-rivers.hpp
index 002d83561..f1f4040f9 100644
--- a/src/gen/gen-rivers.hpp
+++ b/src/gen/gen-rivers.hpp
@@ -17,7 +17,7 @@
 class gen_rivers_t : public gen_base_t
 {
 public:
-    gen_rivers_t(pg_conn_t *connection, params_t *params);
+    gen_rivers_t(pg_conn_t *connection, bool append, params_t *params);
 
     void process() override;
 
diff --git a/src/gen/gen-tile-builtup.cpp b/src/gen/gen-tile-builtup.cpp
index 3f84c698b..4fb4f3e38 100644
--- a/src/gen/gen-tile-builtup.cpp
+++ b/src/gen/gen-tile-builtup.cpp
@@ -26,8 +26,9 @@ static std::size_t round_up(std::size_t value, std::size_t multiple) noexcept
     return ((value + multiple - 1U) / multiple) * multiple;
 }
 
-gen_tile_builtup_t::gen_tile_builtup_t(pg_conn_t *connection, params_t *params)
-: gen_tile_t(connection, params), m_timer_draw(add_timer("draw")),
+gen_tile_builtup_t::gen_tile_builtup_t(pg_conn_t *connection, bool append,
+                                       params_t *params)
+: gen_tile_t(connection, append, params), m_timer_draw(add_timer("draw")),
   m_timer_simplify(add_timer("simplify")),
   m_timer_vectorize(add_timer("vectorize")), m_timer_write(add_timer("write"))
 {
diff --git a/src/gen/gen-tile-builtup.hpp b/src/gen/gen-tile-builtup.hpp
index 92367026b..afec9a5e2 100644
--- a/src/gen/gen-tile-builtup.hpp
+++ b/src/gen/gen-tile-builtup.hpp
@@ -19,7 +19,7 @@
 class gen_tile_builtup_t final : public gen_tile_t
 {
 public:
-    gen_tile_builtup_t(pg_conn_t *connection, params_t *params);
+    gen_tile_builtup_t(pg_conn_t *connection, bool append, params_t *params);
 
     ~gen_tile_builtup_t() override = default;
 
diff --git a/src/gen/gen-tile-raster.cpp b/src/gen/gen-tile-raster.cpp
index 64dca0f09..34de9866e 100644
--- a/src/gen/gen-tile-raster.cpp
+++ b/src/gen/gen-tile-raster.cpp
@@ -26,8 +26,8 @@ static std::size_t round_up(std::size_t value, std::size_t multiple) noexcept
 }
 
 gen_tile_raster_union_t::gen_tile_raster_union_t(pg_conn_t *connection,
-                                                 params_t *params)
-: gen_tile_t(connection, params), m_timer_draw(add_timer("draw")),
+                                                 bool append, params_t *params)
+: gen_tile_t(connection, append, params), m_timer_draw(add_timer("draw")),
   m_timer_simplify(add_timer("simplify")),
   m_timer_vectorize(add_timer("vectorize")), m_timer_write(add_timer("write"))
 {
diff --git a/src/gen/gen-tile-raster.hpp b/src/gen/gen-tile-raster.hpp
index e39344dac..8365d7a8b 100644
--- a/src/gen/gen-tile-raster.hpp
+++ b/src/gen/gen-tile-raster.hpp
@@ -18,7 +18,8 @@
 class gen_tile_raster_union_t final : public gen_tile_t
 {
 public:
-    gen_tile_raster_union_t(pg_conn_t *connection, params_t *params);
+    gen_tile_raster_union_t(pg_conn_t *connection, bool append,
+                            params_t *params);
 
     ~gen_tile_raster_union_t() override = default;
 
diff --git a/src/gen/gen-tile-vector.cpp b/src/gen/gen-tile-vector.cpp
index 205d84ff1..3a7fcfd8c 100644
--- a/src/gen/gen-tile-vector.cpp
+++ b/src/gen/gen-tile-vector.cpp
@@ -15,8 +15,9 @@
 #include "tile.hpp"
 
 gen_tile_vector_union_t::gen_tile_vector_union_t(pg_conn_t *connection,
-                                                 params_t *params)
-: gen_tile_t(connection, params), m_timer_simplify(add_timer("simplify"))
+                                                 bool append, params_t *params)
+: gen_tile_t(connection, append, params),
+  m_timer_simplify(add_timer("simplify"))
 {
     check_src_dest_table_params_exist();
 
diff --git a/src/gen/gen-tile-vector.hpp b/src/gen/gen-tile-vector.hpp
index da80ac27f..f361d7801 100644
--- a/src/gen/gen-tile-vector.hpp
+++ b/src/gen/gen-tile-vector.hpp
@@ -17,7 +17,8 @@
 class gen_tile_vector_union_t final : public gen_tile_t
 {
 public:
-    gen_tile_vector_union_t(pg_conn_t *connection, params_t *params);
+    gen_tile_vector_union_t(pg_conn_t *connection, bool append,
+                            params_t *params);
 
     ~gen_tile_vector_union_t() override = default;
 
diff --git a/src/gen/gen-tile.cpp b/src/gen/gen-tile.cpp
index 8719015d6..13bc95022 100644
--- a/src/gen/gen-tile.cpp
+++ b/src/gen/gen-tile.cpp
@@ -16,8 +16,8 @@
 
 #include <cstdlib>
 
-gen_tile_t::gen_tile_t(pg_conn_t *connection, params_t *params)
-: gen_base_t(connection, params), m_timer_delete(add_timer("delete")),
+gen_tile_t::gen_tile_t(pg_conn_t *connection, bool append, params_t *params)
+: gen_base_t(connection, append, params), m_timer_delete(add_timer("delete")),
   m_zoom(parse_zoom())
 {
     m_with_group_by = !get_params().get_identifier("group_by_column").empty();
diff --git a/src/gen/gen-tile.hpp b/src/gen/gen-tile.hpp
index fa963c448..ded09462b 100644
--- a/src/gen/gen-tile.hpp
+++ b/src/gen/gen-tile.hpp
@@ -23,7 +23,7 @@ class gen_tile_t : public gen_base_t
     uint32_t get_zoom() const noexcept override { return m_zoom; }
 
 protected:
-    gen_tile_t(pg_conn_t *connection, params_t *params);
+    gen_tile_t(pg_conn_t *connection, bool append, params_t *params);
 
     uint32_t parse_zoom();
 
diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index 9cad4b870..0ff658485 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -207,7 +207,8 @@ void run_tile_gen(connection_params_t const &connection_params,
               master_generalizer->strategy());
     pg_conn_t db_connection{connection_params, "gen.tile"};
     std::string const strategy{master_generalizer->strategy()};
-    auto generalizer = create_generalizer(strategy, &db_connection, &params);
+    auto generalizer = create_generalizer(
+        strategy, &db_connection, master_generalizer->append_mode(), &params);
 
     while (true) {
         std::pair<uint32_t, uint32_t> p;
@@ -290,7 +291,7 @@ class genproc_t
 
         log_debug("Creating generalizer...");
         auto generalizer =
-            create_generalizer(strategy, &db_connection, &params);
+            create_generalizer(strategy, &db_connection, m_append, &params);
 
         log_info("Running generalizer '{}' ({})...", generalizer->name(),
                  generalizer->strategy());

From f196471428e137f199289aefe1580ecebddcf512 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 10 Apr 2024 15:53:29 +0200
Subject: [PATCH 119/430] Generalizer: Do not run ANALYZE in append mode

Running ANALYZE excessively can lead to the autovacuum daemon canceling
vacuum runs. If we don't run ANALYZE all the time, the autovacuum daemon
will do it for us when needed.
---
 src/gen/gen-discrete-isolation.cpp |  4 +++-
 src/gen/gen-rivers.cpp             | 10 ++++++++--
 src/gen/gen-tile-builtup.cpp       |  5 ++++-
 src/gen/gen-tile-raster.cpp        |  5 ++++-
 src/gen/gen-tile-vector.cpp        |  7 ++++++-
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/gen/gen-discrete-isolation.cpp b/src/gen/gen-discrete-isolation.cpp
index b56f5ba19..a713091c9 100644
--- a/src/gen/gen-discrete-isolation.cpp
+++ b/src/gen/gen-discrete-isolation.cpp
@@ -143,7 +143,9 @@ FROM {src} WHERE {importance_column} > 0
     connection().exec("COMMIT");
     timer(m_timer_write).stop();
 
-    dbexec("ANALYZE {src}");
+    if (!append_mode()) {
+        dbexec("ANALYZE {src}");
+    }
 
     log_gen("Done.");
 }
diff --git a/src/gen/gen-rivers.cpp b/src/gen/gen-rivers.cpp
index 76a165160..c769ab57c 100644
--- a/src/gen/gen-rivers.cpp
+++ b/src/gen/gen-rivers.cpp
@@ -197,7 +197,11 @@ void gen_rivers_t::process()
     dbexec(R"(UPDATE {qualified_src_areas} SET width =)"
            R"( (ST_MaximumInscribedCircle("{geom_column}")).radius * 2)"
            R"( WHERE width IS NULL)");
-    dbexec("ANALYZE {qualified_src_areas}");
+
+    if (!append_mode()) {
+        dbexec("ANALYZE {qualified_src_areas}");
+    }
+
     timer(m_timer_area).stop();
 
     log_gen("Get 'width' from areas onto lines...");
@@ -343,7 +347,9 @@ SELECT "{id_column}", "{width_column}", "{name_column}", "{geom_column}"
     connection().exec("COMMIT");
     timer(m_timer_write).stop();
 
-    dbexec("ANALYZE {dest}");
+    if (!append_mode()) {
+        dbexec("ANALYZE {dest}");
+    }
 
     log_gen("Done.");
 }
diff --git a/src/gen/gen-tile-builtup.cpp b/src/gen/gen-tile-builtup.cpp
index 4fb4f3e38..391a2dacd 100644
--- a/src/gen/gen-tile-builtup.cpp
+++ b/src/gen/gen-tile-builtup.cpp
@@ -279,5 +279,8 @@ void gen_tile_builtup_t::post()
             }
         }
     }
-    dbexec("ANALYZE {dest}");
+
+    if (!append_mode()) {
+        dbexec("ANALYZE {dest}");
+    }
 }
diff --git a/src/gen/gen-tile-raster.cpp b/src/gen/gen-tile-raster.cpp
index 34de9866e..d750adf22 100644
--- a/src/gen/gen-tile-raster.cpp
+++ b/src/gen/gen-tile-raster.cpp
@@ -256,5 +256,8 @@ void gen_tile_raster_union_t::post()
                 fmt::format("{}_{}", m_image_table, variant));
         }
     }
-    dbexec("ANALYZE {dest}");
+
+    if (!append_mode()) {
+        dbexec("ANALYZE {dest}");
+    }
 }
diff --git a/src/gen/gen-tile-vector.cpp b/src/gen/gen-tile-vector.cpp
index 3a7fcfd8c..2686691a8 100644
--- a/src/gen/gen-tile-vector.cpp
+++ b/src/gen/gen-tile-vector.cpp
@@ -96,4 +96,9 @@ void gen_tile_vector_union_t::process(tile_t const &tile)
     log_gen("Inserted {} generalized polygons", result.affected_rows());
 }
 
-void gen_tile_vector_union_t::post() { dbexec("ANALYZE {dest}"); }
+void gen_tile_vector_union_t::post()
+{
+    if (!append_mode()) {
+        dbexec("ANALYZE {dest}");
+    }
+}

From 3f8fff59169a66275dc3a8a11f38cce0d3cc8a77 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 10 Apr 2024 16:06:15 +0200
Subject: [PATCH 120/430] Generalizer: Use new append flag instead of
 delete_existing flag

---
 src/gen/gen-rivers.cpp    | 5 ++---
 src/gen/gen-rivers.hpp    | 1 -
 src/gen/gen-tile.cpp      | 5 ++---
 src/gen/gen-tile.hpp      | 1 -
 src/gen/osm2pgsql-gen.cpp | 4 ----
 5 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/gen/gen-rivers.cpp b/src/gen/gen-rivers.cpp
index c769ab57c..160a98330 100644
--- a/src/gen/gen-rivers.cpp
+++ b/src/gen/gen-rivers.cpp
@@ -27,8 +27,7 @@ gen_rivers_t::gen_rivers_t(pg_conn_t *connection, bool append, params_t *params)
   m_timer_prep(add_timer("prep")), m_timer_get(add_timer("get")),
   m_timer_sort(add_timer("sort")), m_timer_net(add_timer("net")),
   m_timer_remove(add_timer("remove")), m_timer_width(add_timer("width")),
-  m_timer_write(add_timer("write")),
-  m_delete_existing(params->has("delete_existing"))
+  m_timer_write(add_timer("write"))
 {
     check_src_dest_table_params_exist();
 
@@ -327,7 +326,7 @@ SELECT "{id_column}", "{width_column}", "{name_column}", "{geom_column}"
     }
     timer(m_timer_width).stop();
 
-    if (m_delete_existing) {
+    if (append_mode()) {
         dbexec("TRUNCATE {dest}");
     }
 
diff --git a/src/gen/gen-rivers.hpp b/src/gen/gen-rivers.hpp
index f1f4040f9..3cd351ce5 100644
--- a/src/gen/gen-rivers.hpp
+++ b/src/gen/gen-rivers.hpp
@@ -37,7 +37,6 @@ class gen_rivers_t : public gen_base_t
 
     std::size_t m_num_waterways = 0;
     std::size_t m_num_points = 0;
-    bool m_delete_existing;
 };
 
 #endif // OSM2PGSQL_GEN_RIVERS_HPP
diff --git a/src/gen/gen-tile.cpp b/src/gen/gen-tile.cpp
index 13bc95022..eb9dc22bc 100644
--- a/src/gen/gen-tile.cpp
+++ b/src/gen/gen-tile.cpp
@@ -22,8 +22,7 @@ gen_tile_t::gen_tile_t(pg_conn_t *connection, bool append, params_t *params)
 {
     m_with_group_by = !get_params().get_identifier("group_by_column").empty();
 
-    if (get_params().get_bool("delete_existing")) {
-        m_delete_existing = true;
+    if (append_mode()) {
         dbexec("PREPARE del_geoms (int, int) AS"
                " DELETE FROM {dest} WHERE x=$1 AND y=$2");
     }
@@ -55,7 +54,7 @@ uint32_t gen_tile_t::parse_zoom()
 
 void gen_tile_t::delete_existing(tile_t const &tile)
 {
-    if (!m_delete_existing) {
+    if (!append_mode()) {
         return;
     }
 
diff --git a/src/gen/gen-tile.hpp b/src/gen/gen-tile.hpp
index ded09462b..cac3cfea7 100644
--- a/src/gen/gen-tile.hpp
+++ b/src/gen/gen-tile.hpp
@@ -34,7 +34,6 @@ class gen_tile_t : public gen_base_t
 private:
     std::size_t m_timer_delete;
     uint32_t m_zoom;
-    bool m_delete_existing = false;
     bool m_with_group_by = false;
 };
 
diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index 0ff658485..581c57083 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -280,10 +280,6 @@ class genproc_t
             params.set("schema", m_dbschema);
         }
 
-        if (m_append) {
-            params.set("delete_existing", true);
-        }
-
         write_to_debug_log(params, "Params (config):");
 
         log_debug("Connecting to database...");

From 1f5452f7d62cfe6240a02230f54fe60816f58563 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 9 Apr 2024 14:59:13 +0200
Subject: [PATCH 121/430] Remove the deprecated --tablespace-index option

Use --tablespace-slim-index and/or --tablespace-main-index instead.
---
 man/osm2pgsql.1             |  7 -------
 man/osm2pgsql.md            |  5 -----
 src/command-line-parser.cpp | 19 -------------------
 3 files changed, 31 deletions(-)

diff --git a/man/osm2pgsql.1 b/man/osm2pgsql.1
index b954a8bc6..824626e8a 100644
--- a/man/osm2pgsql.1
+++ b/man/osm2pgsql.1
@@ -229,13 +229,6 @@ depends on the output.
 no default.)
 .SH PGSQL OUTPUT OPTIONS
 .TP
--i, --tablespace-index=TABLESPC
-Store all indexes in the PostgreSQL tablespace \f[V]TABLESPC\f[R].
-This option also affects the middle tables.
-This option is deprecated.
-Use the --tablespace-slim-index and/or --tablespace-main-index options
-instead.
-.TP
 --tablespace-main-data=TABLESPC
 Store the data tables in the PostgreSQL tablespace \f[V]TABLESPC\f[R].
 .TP
diff --git a/man/osm2pgsql.md b/man/osm2pgsql.md
index d355ce643..872f715ba 100644
--- a/man/osm2pgsql.md
+++ b/man/osm2pgsql.md
@@ -198,11 +198,6 @@ mandatory for short options too.
 
 # PGSQL OUTPUT OPTIONS
 
--i, \--tablespace-index=TABLESPC
-:   Store all indexes in the PostgreSQL tablespace `TABLESPC`. This option
-    also affects the middle tables. This option is deprecated. Use the
-    \--tablespace-slim-index and/or \--tablespace-main-index options instead.
-
 \--tablespace-main-data=TABLESPC
 :   Store the data tables in the PostgreSQL tablespace `TABLESPC`.
 
diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index 6d529c828..e2380ae15 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -584,13 +584,6 @@ options_t parse_command_line(int argc, char *argv[])
     // Tablespace options
     // ----------------------------------------------------------------------
 
-    std::string tablespace_index;
-    app.add_option("-i,--tablespace-index", tablespace_index)
-        ->description("Tablespace for indexes (sets default for "
-                      "--tablespace-(main|slim)-index).")
-        ->option_text("TBLSPC")
-        ->group("Tablespace options");
-
     app.add_option("--tablespace-main-data", options.tblsmain_data)
         ->description("Tablespace for main tables.")
         ->option_text("TBLSPC")
@@ -661,18 +654,6 @@ options_t parse_command_line(int argc, char *argv[])
         options.input_format.clear();
     }
 
-    if (!tablespace_index.empty()) {
-        log_warn(
-            "The option -i, --tablespace-index is deprecated. Use "
-            "--tablespace-slim-index and/or --tablespace-main-index instead.");
-        if (options.tblsmain_index.empty()) {
-            options.tblsmain_index = tablespace_index;
-        }
-        if (options.tblsslim_index.empty()) {
-            options.tblsslim_index = tablespace_index;
-        }
-    }
-
     if (options.dbschema.empty()) {
         throw std::runtime_error{"Schema can not be empty."};
     }

From afb39ddb6c43cdf3e7df8ccfe552ca61d8af8a1d Mon Sep 17 00:00:00 2001
From: danieldegroot2 <67521919+danieldegroot2@users.noreply.github.com>
Date: Sat, 4 May 2024 17:05:48 +0200
Subject: [PATCH 122/430] Change separation in AUTHORS

Adds comma separating Martijn van Oosterhout and Sarah Hoffman.
---
 AUTHORS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index f497783c1..c679eb7f3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,3 @@
-osm2pgsql was written by Jon Burgess, Artem Pavlenko, Martijn van Oosterhout
+osm2pgsql was written by Jon Burgess, Artem Pavlenko, Martijn van Oosterhout,
 Sarah Hoffmann, Kai Krueger, Frederik Ramm, Brian Quinion, Matt Amos,
 Kevin Kreiser, Paul Norman, Jochen Topf and other OpenStreetMap project members.

From 4c70618f2f90059f10f99c4f37432f9d6a84dc9b Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 9 May 2024 08:54:59 +0200
Subject: [PATCH 123/430] Fix number of members in array

This was forgotten when the contents of the array changed in
b699cde8adfcb40e743fd98958d514581ad2c169.
---
 src/flex-table-column.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/flex-table-column.cpp b/src/flex-table-column.cpp
index fa0e10a07..96931428b 100644
--- a/src/flex-table-column.cpp
+++ b/src/flex-table-column.cpp
@@ -27,7 +27,7 @@ struct column_type_lookup
     char const *name() const noexcept { return m_name; }
 };
 
-static std::array<column_type_lookup, 26> const column_types = {
+static std::array<column_type_lookup, 25> const column_types = {
     {{"text", table_column_type::text},
      {"boolean", table_column_type::boolean},
      {"bool", table_column_type::boolean},

From 17d879a7e60bdbc6eec79839e06c0790e3ae87d5 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 9 May 2024 09:05:48 +0200
Subject: [PATCH 124/430] Use std::vector instead of std::array to make code
 more robust

Avoids problem fixed in previous commit where the number of array
members was not correct.
---
 src/command-line-parser.cpp | 13 +++++--------
 src/flex-table-column.cpp   |  4 ++--
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index e2380ae15..ee252a358 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -27,11 +27,11 @@
 #endif
 
 #include <algorithm>
-#include <array>
 #include <cstdio>
 #include <cstring>
 #include <stdexcept>
 #include <thread> // for number of threads
+#include <vector>
 
 static osmium::Box parse_bbox_param(std::string const &arg)
 {
@@ -131,13 +131,10 @@ void print_version()
 
 static void check_options_non_slim(CLI::App const &app)
 {
-    std::array<std::string, 6> const slim_options = {
-        "--flat-nodes",
-        "--middle-schema",
-        "--middle-with-nodes",
-        "--middle-way-node-index-id-shift",
-        "--tablespace-slim-data",
-        "--tablespace-slim-index"};
+    std::vector<std::string> const slim_options = {
+        "--flat-nodes",           "--middle-schema",
+        "--middle-with-nodes",    "--middle-way-node-index-id-shift",
+        "--tablespace-slim-data", "--tablespace-slim-index"};
 
     for (auto const &opt : slim_options) {
         if (app.count(opt) > 0) {
diff --git a/src/flex-table-column.cpp b/src/flex-table-column.cpp
index 96931428b..54aa984c3 100644
--- a/src/flex-table-column.cpp
+++ b/src/flex-table-column.cpp
@@ -13,11 +13,11 @@
 #include "util.hpp"
 
 #include <algorithm>
-#include <array>
 #include <cctype>
 #include <cstdlib>
 #include <stdexcept>
 #include <utility>
+#include <vector>
 
 struct column_type_lookup
 {
@@ -27,7 +27,7 @@ struct column_type_lookup
     char const *name() const noexcept { return m_name; }
 };
 
-static std::array<column_type_lookup, 25> const column_types = {
+static std::vector<column_type_lookup> const column_types = {
     {{"text", table_column_type::text},
      {"boolean", table_column_type::boolean},
      {"bool", table_column_type::boolean},

From 1fcef0ce28f6d49c2e27ade4da4a8e601f3ef2bd Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 9 May 2024 09:14:24 +0200
Subject: [PATCH 125/430] Remove somewhat magical way of iterating over table
 columns

Use accessor function flex_table_t::columns() to get to a vector of
columns instead of having begin()/end() functions on flex_table_t.
---
 src/debug-output.cpp   | 2 +-
 src/flex-lua-index.cpp | 2 +-
 src/flex-table.cpp     | 2 +-
 src/flex-table.hpp     | 9 ++-------
 src/output-flex.cpp    | 6 +++---
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/debug-output.cpp b/src/debug-output.cpp
index 87c7c9940..ea27e8cfd 100644
--- a/src/debug-output.cpp
+++ b/src/debug-output.cpp
@@ -48,7 +48,7 @@ void write_table_list_to_debug_log(std::vector<flex_table_t> const &tables)
     for (auto const &table : tables) {
         log_debug("- Table {}", qualified_name(table.schema(), table.name()));
         log_debug("  - columns:");
-        for (auto const &column : table) {
+        for (auto const &column : table.columns()) {
             log_debug(R"(    - "{}" {} ({}) not_null={} create_only={})",
                       column.name(), column.type_name(), column.sql_type_name(),
                       column.not_null(), column.create_only());
diff --git a/src/flex-lua-index.cpp b/src/flex-lua-index.cpp
index 9cdcdb1c4..33876fd37 100644
--- a/src/flex-lua-index.cpp
+++ b/src/flex-lua-index.cpp
@@ -20,7 +20,7 @@ static void check_and_add_column(flex_table_t const &table,
                                  std::vector<std::string> *columns,
                                  char const *column_name)
 {
-    auto const *column = util::find_by_name(table, column_name);
+    auto const *column = util::find_by_name(table.columns(), column_name);
     if (!column) {
         throw fmt_error("Unknown column '{}' in table '{}'.", column_name,
                         table.name());
diff --git a/src/flex-table.cpp b/src/flex-table.cpp
index dc11f4176..b4b5d8f35 100644
--- a/src/flex-table.cpp
+++ b/src/flex-table.cpp
@@ -260,7 +260,7 @@ static void enable_check_trigger(pg_conn_t const &db_connection,
 {
     std::string checks;
 
-    for (auto const &column : table) {
+    for (auto const &column : table.columns()) {
         if (column.is_geometry_column() && column.needs_isvalid()) {
             checks.append(fmt::format(
                 R"((NEW."{0}" IS NULL OR ST_IsValid(NEW."{0}")) AND )",
diff --git a/src/flex-table.hpp b/src/flex-table.hpp
index 11ce27eb1..4973fe20a 100644
--- a/src/flex-table.hpp
+++ b/src/flex-table.hpp
@@ -111,14 +111,9 @@ class flex_table_t
 
     std::size_t num_columns() const noexcept { return m_columns.size(); }
 
-    std::vector<flex_table_column_t>::const_iterator begin() const noexcept
+    std::vector<flex_table_column_t> const &columns() const noexcept
     {
-        return m_columns.begin();
-    }
-
-    std::vector<flex_table_column_t>::const_iterator end() const noexcept
-    {
-        return m_columns.end();
+        return m_columns;
     }
 
     flex_table_column_t *find_column_by_name(std::string const &name)
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 58a579ca1..0c8ccb8cc 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -643,7 +643,7 @@ int output_flex_t::table_insert()
     auto *copy_mgr = table_connection.copy_mgr();
 
     try {
-        for (auto const &column : table_connection.table()) {
+        for (auto const &column : table_connection.table().columns()) {
             if (column.create_only()) {
                 continue;
             }
@@ -681,7 +681,7 @@ int output_flex_t::table_columns()
     lua_createtable(lua_state(), (int)table.num_columns(), 0);
 
     int n = 0;
-    for (auto const &column : table) {
+    for (auto const &column : table.columns()) {
         lua_pushinteger(lua_state(), ++n);
         lua_newtable(lua_state());
 
@@ -1039,7 +1039,7 @@ void output_flex_t::delete_from_table(table_connection_t *table_connection,
         auto const num_tuples = result.num_tuples();
         if (num_tuples > 0) {
             int col = 0;
-            for (auto const &column : table_connection->table()) {
+            for (auto const &column : table_connection->table().columns()) {
                 if (column.has_expire()) {
                     for (int i = 0; i < num_tuples; ++i) {
                         auto const geom = ewkb_to_geom(result.get(i, col));

From b99c7d9b6db860f4319669cbb6c1ce2df4c65da0 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 28 Apr 2024 17:14:42 +0200
Subject: [PATCH 126/430] Add tile-based generalizer calling SQL commands

It is named "tile-sql". Parameters are "name", "src_table",
"dest_table", "zoom", and "sql", the command to be called. Use {ZOOM},
{X}, and {Y} in the command to set the zoom level and tile coordinates.
---
 CMakeLists.txt           |  1 +
 src/gen/gen-create.cpp   |  4 ++++
 src/gen/gen-tile-sql.cpp | 47 ++++++++++++++++++++++++++++++++++++++++
 src/gen/gen-tile-sql.hpp | 35 ++++++++++++++++++++++++++++++
 4 files changed, 87 insertions(+)
 create mode 100644 src/gen/gen-tile-sql.cpp
 create mode 100644 src/gen/gen-tile-sql.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 109778ae0..2fa2491aa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -269,6 +269,7 @@ else()
                     src/gen/gen-rivers.cpp
                     src/gen/gen-tile-builtup.cpp
                     src/gen/gen-tile-raster.cpp
+                    src/gen/gen-tile-sql.cpp
                     src/gen/gen-tile-vector.cpp
                     src/gen/gen-tile.cpp
                     src/gen/params.cpp
diff --git a/src/gen/gen-create.cpp b/src/gen/gen-create.cpp
index e26db109c..195f59c16 100644
--- a/src/gen/gen-create.cpp
+++ b/src/gen/gen-create.cpp
@@ -13,6 +13,7 @@
 #include "gen-rivers.hpp"
 #include "gen-tile-builtup.hpp"
 #include "gen-tile-raster.hpp"
+#include "gen-tile-sql.hpp"
 #include "gen-tile-vector.hpp"
 #include "params.hpp"
 
@@ -35,6 +36,9 @@ std::unique_ptr<gen_base_t> create_generalizer(std::string const &strategy,
         if (strategy == "rivers") {
             return std::make_unique<gen_rivers_t>(connection, append, params);
         }
+        if (strategy == "tile-sql") {
+            return std::make_unique<gen_tile_sql_t>(connection, append, params);
+        }
         if (strategy == "vector-union") {
             return std::make_unique<gen_tile_vector_union_t>(connection, append,
                                                              params);
diff --git a/src/gen/gen-tile-sql.cpp b/src/gen/gen-tile-sql.cpp
new file mode 100644
index 000000000..0389568cb
--- /dev/null
+++ b/src/gen/gen-tile-sql.cpp
@@ -0,0 +1,47 @@
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+#include "gen-tile-sql.hpp"
+
+#include "logging.hpp"
+#include "params.hpp"
+#include "pgsql.hpp"
+#include "tile.hpp"
+
+gen_tile_sql_t::gen_tile_sql_t(pg_conn_t *connection, bool append,
+                               params_t *params)
+: gen_tile_t(connection, append, params),
+  m_sql_template(get_params().get_string("sql"))
+{
+    check_src_dest_table_params_exist();
+}
+
+void gen_tile_sql_t::process(tile_t const &tile)
+{
+    connection().exec("BEGIN");
+    delete_existing(tile);
+
+    log_gen("Run SQL...");
+
+    params_t tmp_params;
+    tmp_params.set("ZOOM", tile.zoom());
+    tmp_params.set("X", tile.x());
+    tmp_params.set("Y", tile.y());
+    dbexec(tmp_params, m_sql_template);
+
+    connection().exec("COMMIT");
+    log_gen("Done.");
+}
+
+void gen_tile_sql_t::post()
+{
+    if (!append_mode()) {
+        dbexec("ANALYZE {dest}");
+    }
+}
diff --git a/src/gen/gen-tile-sql.hpp b/src/gen/gen-tile-sql.hpp
new file mode 100644
index 000000000..a19904e87
--- /dev/null
+++ b/src/gen/gen-tile-sql.hpp
@@ -0,0 +1,35 @@
+#ifndef OSM2PGSQL_GEN_TILE_SQL_HPP
+#define OSM2PGSQL_GEN_TILE_SQL_HPP
+
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+#include "gen-tile.hpp"
+
+#include <string>
+#include <string_view>
+
+class gen_tile_sql_t final : public gen_tile_t
+{
+public:
+    gen_tile_sql_t(pg_conn_t *connection, bool append, params_t *params);
+
+    ~gen_tile_sql_t() override = default;
+
+    void process(tile_t const &tile) override;
+
+    void post() override;
+
+    std::string_view strategy() const noexcept override { return "tile-sql"; }
+
+private:
+    std::string m_sql_template;
+};
+
+#endif // OSM2PGSQL_GEN_TILE_SQL_HPP

From eb8ac61679b0eae03313c842676c1dadf204f3e7 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 10 May 2024 10:00:37 +0200
Subject: [PATCH 127/430] Move dependency manager code into osmdata

Now that we always use dependency management, we don't need the
dependency manager to be a virtual class any more. In fact it isn't
really doing that much, so we can roll it into the code in osmdata_t.
---
 src/CMakeLists.txt              |   1 -
 src/dependency-manager.cpp      |  87 ----------------
 src/dependency-manager.hpp      | 167 -----------------------------
 src/osm2pgsql.cpp               |   6 +-
 src/osmdata.cpp                 | 105 ++++++++++++++-----
 src/osmdata.hpp                 |  50 +++++++--
 tests/common-import.hpp         |  16 +--
 tests/test-middle.cpp           | 179 +++++++++++++++++---------------
 tests/test-osm-file-parsing.cpp |  64 ++----------
 9 files changed, 230 insertions(+), 445 deletions(-)
 delete mode 100644 src/dependency-manager.cpp
 delete mode 100644 src/dependency-manager.hpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f8e2fad8f..9ab722474 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,7 +10,6 @@ target_sources(osm2pgsql_lib PRIVATE
   command-line-parser.cpp
   db-copy.cpp
   debug-output.cpp
-  dependency-manager.cpp
   expire-tiles.cpp
   expire-output.cpp
   geom.cpp
diff --git a/src/dependency-manager.cpp b/src/dependency-manager.cpp
deleted file mode 100644
index 3a600ff8a..000000000
--- a/src/dependency-manager.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * SPDX-License-Identifier: GPL-2.0-or-later
- *
- * This file is part of osm2pgsql (https://osm2pgsql.org/).
- *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
- * For a full list of authors see the git log.
- */
-
-#include "dependency-manager.hpp"
-#include "middle.hpp"
-
-#include <algorithm>
-#include <iterator>
-
-void full_dependency_manager_t::node_changed(osmid_t id)
-{
-    m_changed_nodes.push_back(id);
-}
-
-void full_dependency_manager_t::way_changed(osmid_t id)
-{
-    m_changed_ways.push_back(id);
-}
-
-void full_dependency_manager_t::relation_changed(osmid_t id)
-{
-    m_changed_relations.push_back(id);
-}
-
-void full_dependency_manager_t::after_nodes()
-{
-    if (m_changed_nodes.empty()) {
-        return;
-    }
-
-    m_object_store->get_node_parents(m_changed_nodes, &m_ways_pending_tracker,
-                                     &m_rels_pending_tracker);
-    m_changed_nodes.clear();
-}
-
-void full_dependency_manager_t::after_ways()
-{
-    if (!m_changed_ways.empty()) {
-        if (!m_ways_pending_tracker.empty()) {
-            // Remove ids from changed ways in the input data from
-            // m_ways_pending_tracker, because they have already been processed.
-            m_ways_pending_tracker.remove_ids_if_in(m_changed_ways);
-
-            // Add the list of pending way ids to the list of changed ways,
-            // because we need the parents for them, too.
-            m_changed_ways.merge_sorted(m_ways_pending_tracker);
-        }
-
-        m_object_store->get_way_parents(m_changed_ways,
-                                        &m_rels_pending_tracker);
-
-        m_changed_ways.clear();
-        return;
-    }
-
-    if (!m_ways_pending_tracker.empty()) {
-        m_object_store->get_way_parents(m_ways_pending_tracker,
-                                        &m_rels_pending_tracker);
-    }
-}
-
-void full_dependency_manager_t::after_relations()
-{
-    // Remove ids from changed relations in the input data from
-    // m_rels_pending_tracker, because they have already been processed.
-    m_rels_pending_tracker.remove_ids_if_in(m_changed_relations);
-
-    m_changed_relations.clear();
-}
-
-void full_dependency_manager_t::mark_parent_relations_as_pending(
-    idlist_t const &way_ids)
-{
-    assert(m_rels_pending_tracker.empty());
-    m_object_store->get_way_parents(way_ids, &m_rels_pending_tracker);
-}
-
-bool full_dependency_manager_t::has_pending() const noexcept
-{
-    return !m_ways_pending_tracker.empty() || !m_rels_pending_tracker.empty();
-}
diff --git a/src/dependency-manager.hpp b/src/dependency-manager.hpp
deleted file mode 100644
index 4902f1035..000000000
--- a/src/dependency-manager.hpp
+++ /dev/null
@@ -1,167 +0,0 @@
-#ifndef OSM2PGSQL_DEPENDENCY_MANAGER_HPP
-#define OSM2PGSQL_DEPENDENCY_MANAGER_HPP
-
-/**
- * SPDX-License-Identifier: GPL-2.0-or-later
- *
- * This file is part of osm2pgsql (https://osm2pgsql.org/).
- *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
- * For a full list of authors see the git log.
- */
-
-#include "idlist.hpp"
-#include "osmtypes.hpp"
-
-#include <cassert>
-#include <memory>
-#include <utility>
-
-class middle_t;
-
-/**
- * The job of the dependency manager is to keep track of the dependencies
- * between OSM objects, that is nodes in ways and members of relations.
- *
- * Whenever an OSM object changes, this class is notified and can remember
- * the ids for later use.
- *
- * This base class doesn't actually do the dependency management but is a
- * dummy for cases where no dependency management is needed. See the
- * full_dependency_manager_t class for the real dependency manager.
- */
-class dependency_manager_t
-{
-public:
-    virtual ~dependency_manager_t() = default;
-
-    /**
-     * Mark a node as changed to trigger the propagation of this change to
-     * ways and relations.
-     *
-     * This has to be called *after* the object was stored in the object store.
-     */
-    virtual void node_changed(osmid_t) {}
-
-    /**
-     * Mark a way as changed to trigger the propagation of this change to
-     * relations.
-     *
-     * This has to be called *after* the object was stored in the object store.
-     */
-    virtual void way_changed(osmid_t) {}
-
-    virtual void relation_changed(osmid_t) {}
-
-    virtual void after_nodes() {}
-    virtual void after_ways() {}
-    virtual void after_relations() {}
-
-    virtual void mark_parent_relations_as_pending(idlist_t const & /*way_ids*/)
-    {
-    }
-
-    /// Are there pending objects that need to be processed?
-    virtual bool has_pending() const noexcept { return false; }
-
-    /**
-     * Get the list of pending way ids. After calling this, the internal
-     * list is cleared.
-     */
-    virtual idlist_t get_pending_way_ids() { return {}; }
-
-    /**
-     * Get the list of pending relation ids. After calling this, the internal
-     * list is cleared.
-     */
-    virtual idlist_t get_pending_relation_ids() { return {}; }
-};
-
-/**
- * The job of the dependency manager is to keep track of the dependencies
- * between OSM objects, that is nodes in ways and members of relations.
- *
- * Whenever an OSM object changes, this class is notified and remembers
- * the ids for later use.
- */
-class full_dependency_manager_t : public dependency_manager_t
-{
-public:
-    /**
-     * Constructor.
-     *
-     * \param object_store Pointer to the middle that keeps the actual
-     *        database of objects and their relationsships.
-     *
-     * \pre object_store != nullptr
-     */
-    explicit full_dependency_manager_t(std::shared_ptr<middle_t> object_store)
-    : m_object_store(std::move(object_store))
-    {
-        assert(m_object_store != nullptr);
-    }
-
-    void node_changed(osmid_t id) override;
-    void way_changed(osmid_t id) override;
-    void relation_changed(osmid_t id) override;
-
-    void after_nodes() override;
-    void after_ways() override;
-    void after_relations() override;
-
-    void mark_parent_relations_as_pending(idlist_t const &ids) override;
-
-    bool has_pending() const noexcept override;
-
-    idlist_t get_pending_way_ids() override
-    {
-        idlist_t list;
-        using std::swap;
-        swap(list, m_ways_pending_tracker);
-        list.sort_unique();
-        return list;
-    }
-
-    idlist_t get_pending_relation_ids() override
-    {
-        idlist_t list;
-        using std::swap;
-        swap(list, m_rels_pending_tracker);
-        list.sort_unique();
-        return list;
-    }
-
-private:
-    std::shared_ptr<middle_t> m_object_store;
-
-    /**
-     * In append mode all new and changed nodes will be added to this. After
-     * all nodes are read this is used to figure out which parent ways and
-     * relations reference these nodes. Deleted nodes are not stored in here,
-     * because all ways and relations that referenced deleted nodes must be in
-     * the change file, too, and so we don't have to find out which ones they
-     * are.
-     */
-    idlist_t m_changed_nodes;
-
-    /**
-     * In append mode all new and changed ways will be added to this. After
-     * all ways are read this is used to figure out which parent relations
-     * reference these ways. Deleted ways are not stored in here, because all
-     * relations that referenced deleted ways must be in the change file, too,
-     * and so we don't have to find out which ones they are.
-     */
-    idlist_t m_changed_ways;
-
-    /**
-     * In append mode all new and changed relations will be added to this.
-     * This is then used to remove already processed relations from the
-     * pending list.
-     */
-    idlist_t m_changed_relations;
-
-    idlist_t m_ways_pending_tracker;
-    idlist_t m_rels_pending_tracker;
-};
-
-#endif // OSM2PGSQL_DEPENDENCY_MANAGER_HPP
diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
index e2ef89e0c..832f7d1d4 100644
--- a/src/osm2pgsql.cpp
+++ b/src/osm2pgsql.cpp
@@ -8,7 +8,6 @@
  */
 
 #include "command-line-parser.hpp"
-#include "dependency-manager.hpp"
 #include "input.hpp"
 #include "logging.hpp"
 #include "middle.hpp"
@@ -60,10 +59,7 @@ static file_info run(options_t const &options)
 
     middle->set_requirements(output->get_requirements());
 
-    auto dependency_manager =
-        std::make_unique<full_dependency_manager_t>(middle);
-
-    osmdata_t osmdata{std::move(dependency_manager), middle, output, options};
+    osmdata_t osmdata{middle, output, options};
 
     osmdata.start();
 
diff --git a/src/osmdata.cpp b/src/osmdata.cpp
index 8038364b7..2d52f62df 100644
--- a/src/osmdata.cpp
+++ b/src/osmdata.cpp
@@ -26,16 +26,13 @@
 #include "output.hpp"
 #include "util.hpp"
 
-osmdata_t::osmdata_t(std::unique_ptr<dependency_manager_t> dependency_manager,
-                     std::shared_ptr<middle_t> mid,
+osmdata_t::osmdata_t(std::shared_ptr<middle_t> mid,
                      std::shared_ptr<output_t> output, options_t const &options)
-: m_dependency_manager(std::move(dependency_manager)), m_mid(std::move(mid)),
-  m_output(std::move(output)), m_connection_params(options.connection_params),
-  m_bbox(options.bbox), m_num_procs(options.num_procs),
-  m_append(options.append), m_droptemp(options.droptemp),
-  m_with_extra_attrs(options.extra_attributes)
+: m_mid(std::move(mid)), m_output(std::move(output)),
+  m_connection_params(options.connection_params), m_bbox(options.bbox),
+  m_num_procs(options.num_procs), m_append(options.append),
+  m_droptemp(options.droptemp), m_with_extra_attrs(options.extra_attributes)
 {
-    assert(m_dependency_manager);
     assert(m_mid);
     assert(m_output);
 }
@@ -67,7 +64,7 @@ void osmdata_t::node(osmium::Node const &node)
         } else {
             m_output->node_delete(node.id());
         }
-        m_dependency_manager->node_changed(node.id());
+        m_changed_nodes.push_back(node.id());
     } else if (has_tags_or_attrs) {
         m_output->node_add(node);
     }
@@ -77,8 +74,15 @@ void osmdata_t::after_nodes()
 {
     m_mid->after_nodes();
     m_output->after_nodes();
-    if (m_append) {
-        m_dependency_manager->after_nodes();
+
+    if (!m_append) {
+        return;
+    }
+
+    if (!m_changed_nodes.empty()) {
+        m_mid->get_node_parents(m_changed_nodes, &m_ways_pending_tracker,
+                                &m_rels_pending_tracker);
+        m_changed_nodes.clear();
     }
 }
 
@@ -98,7 +102,7 @@ void osmdata_t::way(osmium::Way &way)
         } else {
             m_output->way_delete(way.id());
         }
-        m_dependency_manager->way_changed(way.id());
+        m_changed_ways.push_back(way.id());
     } else if (has_tags_or_attrs) {
         m_output->way_add(&way);
     }
@@ -108,8 +112,31 @@ void osmdata_t::after_ways()
 {
     m_mid->after_ways();
     m_output->after_ways();
-    if (m_append) {
-        m_dependency_manager->after_ways();
+
+    if (!m_append) {
+        return;
+    }
+
+    if (!m_changed_ways.empty()) {
+        if (!m_ways_pending_tracker.empty()) {
+            // Remove ids from changed ways in the input data from
+            // m_ways_pending_tracker, because they have already been
+            // processed.
+            m_ways_pending_tracker.remove_ids_if_in(m_changed_ways);
+
+            // Add the list of pending way ids to the list of changed ways,
+            // because we need the parents for them, too.
+            m_changed_ways.merge_sorted(m_ways_pending_tracker);
+        }
+
+        m_mid->get_way_parents(m_changed_ways, &m_rels_pending_tracker);
+
+        m_changed_ways.clear();
+        return;
+    }
+
+    if (!m_ways_pending_tracker.empty()) {
+        m_mid->get_way_parents(m_ways_pending_tracker, &m_rels_pending_tracker);
     }
 }
 
@@ -140,7 +167,7 @@ void osmdata_t::relation(osmium::Relation const &rel)
         } else {
             m_output->relation_delete(rel.id());
         }
-        m_dependency_manager->relation_changed(rel.id());
+        m_changed_relations.push_back(rel.id());
     } else if (has_tags_or_attrs) {
         m_output->relation_add(rel);
     }
@@ -149,8 +176,13 @@ void osmdata_t::relation(osmium::Relation const &rel)
 void osmdata_t::after_relations()
 {
     m_mid->after_relations();
+
     if (m_append) {
-        m_dependency_manager->after_relations();
+        // Remove ids from changed relations in the input data from
+        // m_rels_pending_tracker, because they have already been processed.
+        m_rels_pending_tracker.remove_ids_if_in(m_changed_relations);
+
+        m_changed_relations.clear();
     }
 
     m_output->sync();
@@ -349,16 +381,15 @@ class multithreaded_processor
 
 } // anonymous namespace
 
-void osmdata_t::process_dependents() const
+void osmdata_t::process_dependents()
 {
     multithreaded_processor proc{m_connection_params, m_mid, m_output,
                                  m_num_procs};
 
     // stage 1b processing: process parents of changed objects
-    if (m_dependency_manager->has_pending()) {
-        proc.process_ways(m_dependency_manager->get_pending_way_ids());
-        proc.process_relations(
-            m_dependency_manager->get_pending_relation_ids());
+    if (has_pending()) {
+        proc.process_ways(get_pending_way_ids());
+        proc.process_relations(get_pending_relation_ids());
         proc.merge_expire_trees();
     }
 
@@ -368,12 +399,13 @@ void osmdata_t::process_dependents() const
         return;
     }
 
-    m_dependency_manager->mark_parent_relations_as_pending(marked_ways);
+    assert(m_rels_pending_tracker.empty());
+    m_mid->get_way_parents(marked_ways, &m_rels_pending_tracker);
 
     // process parent relations of marked ways
-    if (m_dependency_manager->has_pending()) {
+    if (has_pending()) {
         proc.process_relations_stage1c(
-            m_dependency_manager->get_pending_relation_ids());
+            get_pending_relation_ids());
     }
 }
 
@@ -404,7 +436,7 @@ void osmdata_t::postprocess_database() const
     m_output->wait();
 }
 
-void osmdata_t::stop() const
+void osmdata_t::stop()
 {
     if (m_append) {
         process_dependents();
@@ -414,3 +446,26 @@ void osmdata_t::stop() const
 
     postprocess_database();
 }
+
+bool osmdata_t::has_pending() const noexcept
+{
+    return !m_ways_pending_tracker.empty() || !m_rels_pending_tracker.empty();
+}
+
+idlist_t osmdata_t::get_pending_way_ids()
+{
+    idlist_t list;
+    using std::swap;
+    swap(list, m_ways_pending_tracker);
+    list.sort_unique();
+    return list;
+}
+
+idlist_t osmdata_t::get_pending_relation_ids()
+{
+    idlist_t list;
+    using std::swap;
+    swap(list, m_rels_pending_tracker);
+    list.sort_unique();
+    return list;
+}
diff --git a/src/osmdata.hpp b/src/osmdata.hpp
index 6a66fc328..7fef955ff 100644
--- a/src/osmdata.hpp
+++ b/src/osmdata.hpp
@@ -23,7 +23,6 @@
 #include <osmium/handler.hpp>
 #include <osmium/osm/box.hpp>
 
-#include "dependency-manager.hpp"
 #include "idlist.hpp"
 #include "osmtypes.hpp"
 #include "pgsql-params.hpp"
@@ -34,14 +33,15 @@ struct options_t;
 
 /**
  * This class guides the processing of the OSM data through its multiple
- * stages. It calls upon the major compontents of osm2pgsql, the dependency
- * manager, the middle, and the output to do their work.
+ * stages. It calls upon the the middle and the output to do their work.
+ *
+ * It also does the dependency management, keeping track of the dependencies
+ * between OSM objects (nodes in ways and members of relations).
  */
 class osmdata_t : public osmium::handler::Handler
 {
 public:
-    osmdata_t(std::unique_ptr<dependency_manager_t> dependency_manager,
-              std::shared_ptr<middle_t> mid, std::shared_ptr<output_t> output,
+    osmdata_t(std::shared_ptr<middle_t> mid, std::shared_ptr<output_t> output,
               options_t const &options);
 
     void start() const;
@@ -58,14 +58,20 @@ class osmdata_t : public osmium::handler::Handler
      * Rest of the processing (stages 1b, 1c, 2, and database postprocessing).
      * This is called once after the input files are processed.
      */
-    void stop() const;
+    void stop();
+
+    bool has_pending() const noexcept;
+
+    idlist_t get_pending_way_ids();
+
+    idlist_t get_pending_relation_ids();
 
 private:
     /**
      * Run stage 1b and stage 1c processing: Process dependent objects in
      * append mode.
      */
-    void process_dependents() const;
+    void process_dependents();
 
     /**
      * Run stage 2 processing: Reprocess objects marked in stage 1 (if any).
@@ -77,7 +83,35 @@ class osmdata_t : public osmium::handler::Handler
      */
     void postprocess_database() const;
 
-    std::unique_ptr<dependency_manager_t> m_dependency_manager;
+    /**
+     * In append mode all new and changed nodes will be added to this. After
+     * all nodes are read this is used to figure out which parent ways and
+     * relations reference these nodes. Deleted nodes are not stored in here,
+     * because all ways and relations that referenced deleted nodes must be in
+     * the change file, too, and so we don't have to find out which ones they
+     * are.
+     */
+    idlist_t m_changed_nodes;
+
+    /**
+     * In append mode all new and changed ways will be added to this. After
+     * all ways are read this is used to figure out which parent relations
+     * reference these ways. Deleted ways are not stored in here, because all
+     * relations that referenced deleted ways must be in the change file, too,
+     * and so we don't have to find out which ones they are.
+     */
+    idlist_t m_changed_ways;
+
+    /**
+     * In append mode all new and changed relations will be added to this.
+     * This is then used to remove already processed relations from the
+     * pending list.
+     */
+    idlist_t m_changed_relations;
+
+    idlist_t m_ways_pending_tracker;
+    idlist_t m_rels_pending_tracker;
+
     std::shared_ptr<middle_t> m_mid;
     std::shared_ptr<output_t> m_output;
 
diff --git a/tests/common-import.hpp b/tests/common-import.hpp
index 19f170449..ff9dfa042 100644
--- a/tests/common-import.hpp
+++ b/tests/common-import.hpp
@@ -17,7 +17,6 @@
 #include <osmium/osm/types_from_string.hpp>
 #include <osmium/visitor.hpp>
 
-#include "dependency-manager.hpp"
 #include "input.hpp"
 #include "middle-pgsql.hpp"
 #include "middle-ram.hpp"
@@ -35,12 +34,11 @@
 namespace testing {
 
 inline void parse_file(options_t const &options,
-                       std::unique_ptr<dependency_manager_t> dependency_manager,
                        std::shared_ptr<middle_t> const &mid,
                        std::shared_ptr<output_t> const &output,
                        char const *filename = nullptr, bool do_stop = true)
 {
-    osmdata_t osmdata{std::move(dependency_manager), mid, output, options};
+    osmdata_t osmdata{mid, output, options};
 
     osmdata.start();
 
@@ -145,11 +143,7 @@ class import_t
 
         middle->set_requirements(output->get_requirements());
 
-        auto dependency_manager =
-            std::make_unique<full_dependency_manager_t>(middle);
-
-        osmdata_t osmdata{std::move(dependency_manager), middle, output,
-                          options};
+        osmdata_t osmdata{middle, output, options};
 
         osmdata.start();
 
@@ -182,11 +176,7 @@ class import_t
 
         middle->set_requirements(output->get_requirements());
 
-        auto dependency_manager =
-            std::make_unique<full_dependency_manager_t>(middle);
-
-        parse_file(options, std::move(dependency_manager), middle, output,
-                   file);
+        parse_file(options, middle, output, file);
 
         middle->wait();
         output->wait();
diff --git a/tests/test-middle.cpp b/tests/test-middle.cpp
index 2f2ec129f..1265949c0 100644
--- a/tests/test-middle.cpp
+++ b/tests/test-middle.cpp
@@ -15,9 +15,10 @@
 #include <osmium/osm/crc.hpp>
 #include <osmium/osm/crc_zlib.hpp>
 
-#include "dependency-manager.hpp"
 #include "middle-pgsql.hpp"
 #include "middle-ram.hpp"
+#include "osmdata.hpp"
+#include "output-null.hpp"
 #include "output-requirements.hpp"
 
 #include "common-buffer.hpp"
@@ -580,13 +581,13 @@ TEMPLATE_TEST_CASE("middle: add, delete and update way", "",
 
     auto const &way22 = buffer.add_way("w22 Nn12,n10 Tpower=line");
 
-    auto const &way20a =
+    auto &way20a =
         buffer.add_way("w20 Nn10,n12 Thighway=primary,name=High_Street");
 
     auto const &way5d = buffer.add_way("w5 dD");
-    auto const &way20d = buffer.add_way("w20 dD");
-    auto const &way22d = buffer.add_way("w22 dD");
-    auto const &way42d = buffer.add_way("w42 dD");
+    auto &way20d = buffer.add_way("w20 dD");
+    auto &way22d = buffer.add_way("w22 dD");
+    auto &way42d = buffer.add_way("w42 dD");
 
     // Set up middle in "create" mode to get a cleanly initialized database and
     // add some ways. Does this in its own scope so that the mid is closed
@@ -1029,29 +1030,34 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
 
     auto const &node10d = buffer.add_node("n10 dD");
 
-    auto const &way20 = buffer.add_way("w20 Nn10,n11");
-    auto const &way21 = buffer.add_way("w21 Nn11,n12");
-    auto const &way22 = buffer.add_way("w22 Nn12,n10");
-    auto const &way20a = buffer.add_way("w20 Nn11,n12");
+    auto &way20 = buffer.add_way("w20 Nn10,n11");
+    auto &way21 = buffer.add_way("w21 Nn11,n12");
+    auto &way22 = buffer.add_way("w22 Nn12,n10");
+    auto &way20a = buffer.add_way("w20 Nn11,n12");
 
-    auto const &way20d = buffer.add_way("w20 dD");
+    auto &way20d = buffer.add_way("w20 dD");
 
     // Set up middle in "create" mode to get a cleanly initialized database and
     // add some nodes and ways. Does this in its own scope so that the mid is
     // closed properly.
     {
         auto mid = std::make_shared<middle_pgsql_t>(thread_pool, &options);
-        full_dependency_manager_t const dependency_manager{mid};
         mid->start();
 
-        mid->node(node10);
-        mid->node(node11);
-        mid->node(node12);
-        mid->after_nodes();
-        mid->way(way20);
-        mid->way(way21);
-        mid->after_ways();
-        mid->after_relations();
+        auto output = std::make_shared<output_null_t>(mid->get_query_instance(),
+                                                      thread_pool, options);
+        osmdata_t osmdata{mid, output, options};
+
+        osmdata.start();
+
+        osmdata.node(node10);
+        osmdata.node(node11);
+        osmdata.node(node12);
+        osmdata.after_nodes();
+        osmdata.way(way20);
+        osmdata.way(way21);
+        osmdata.after_ways();
+        osmdata.after_relations();
 
         check_node(mid, node10);
         check_node(mid, node11);
@@ -1061,10 +1067,9 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
         check_way(mid, way21);
         check_way_nodes(mid, way21.id(), {&node11, &node12});
 
-        REQUIRE_FALSE(dependency_manager.has_pending());
+        REQUIRE_FALSE(osmdata.has_pending());
 
-        mid->stop();
-        mid->wait();
+        osmdata.stop();
     }
 
     // From now on use append mode to not destroy the data we just added.
@@ -1073,20 +1078,21 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
     SECTION("Single way affected")
     {
         auto mid = std::make_shared<middle_pgsql_t>(thread_pool, &options);
-        full_dependency_manager_t dependency_manager{mid};
         mid->start();
 
-        mid->node(node10d);
-        mid->node(node10a);
-        dependency_manager.node_changed(10);
-        mid->after_nodes();
-        dependency_manager.after_nodes();
-        mid->after_ways();
-        dependency_manager.after_ways();
-        mid->after_relations();
+        auto output = std::make_shared<output_null_t>(mid->get_query_instance(),
+                                                      thread_pool, options);
+        osmdata_t osmdata{mid, output, options};
+
+        osmdata.start();
+        osmdata.node(node10d);
+        osmdata.node(node10a);
+        osmdata.after_nodes();
+        osmdata.after_ways();
+        osmdata.after_relations();
 
-        REQUIRE(dependency_manager.has_pending());
-        idlist_t const way_ids = dependency_manager.get_pending_way_ids();
+        REQUIRE(osmdata.has_pending());
+        idlist_t const way_ids = osmdata.get_pending_way_ids();
         REQUIRE(way_ids == idlist_t{20});
 
         check_way(mid, way20);
@@ -1108,20 +1114,21 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
         }
         {
             auto mid = std::make_shared<middle_pgsql_t>(thread_pool, &options);
-            full_dependency_manager_t dependency_manager{mid};
             mid->start();
 
-            mid->node(node10d);
-            mid->node(node10a);
-            dependency_manager.node_changed(10);
-            mid->after_nodes();
-            dependency_manager.after_nodes();
-            mid->after_ways();
-            dependency_manager.after_ways();
-            mid->after_relations();
+            auto output = std::make_shared<output_null_t>(
+                mid->get_query_instance(), thread_pool, options);
+            osmdata_t osmdata{mid, output, options};
+            osmdata.start();
 
-            REQUIRE(dependency_manager.has_pending());
-            idlist_t const way_ids = dependency_manager.get_pending_way_ids();
+            osmdata.node(node10d);
+            osmdata.node(node10a);
+            osmdata.after_nodes();
+            osmdata.after_ways();
+            osmdata.after_relations();
+
+            REQUIRE(osmdata.has_pending());
+            idlist_t const way_ids = osmdata.get_pending_way_ids();
             REQUIRE(way_ids == idlist_t{20, 22});
 
             check_way(mid, way20);
@@ -1137,11 +1144,16 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
             auto mid = std::make_shared<middle_pgsql_t>(thread_pool, &options);
             mid->start();
 
-            mid->after_nodes();
-            mid->way(way20d);
-            mid->way(way20a);
-            mid->after_ways();
-            mid->after_relations();
+            auto output = std::make_shared<output_null_t>(
+                mid->get_query_instance(), thread_pool, options);
+            osmdata_t osmdata{mid, output, options};
+            osmdata.start();
+
+            osmdata.after_nodes();
+            osmdata.way(way20d);
+            osmdata.way(way20a);
+            osmdata.after_ways();
+            osmdata.after_relations();
 
             check_way(mid, way20a);
             check_way_nodes(mid, way20.id(), {&node11, &node12});
@@ -1149,19 +1161,20 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
 
         {
             auto mid = std::make_shared<middle_pgsql_t>(thread_pool, &options);
-            full_dependency_manager_t dependency_manager{mid};
             mid->start();
 
-            mid->node(node10d);
-            mid->node(node10a);
-            dependency_manager.node_changed(10);
-            mid->after_nodes();
-            dependency_manager.after_nodes();
-            mid->after_ways();
-            dependency_manager.after_ways();
-            mid->after_relations();
+            auto output = std::make_shared<output_null_t>(
+                mid->get_query_instance(), thread_pool, options);
+            osmdata_t osmdata{mid, output, options};
+            osmdata.start();
+
+            osmdata.node(node10d);
+            osmdata.node(node10a);
+            osmdata.after_nodes();
+            osmdata.after_ways();
+            osmdata.after_relations();
 
-            REQUIRE_FALSE(dependency_manager.has_pending());
+            REQUIRE_FALSE(osmdata.has_pending());
         }
     }
 }
@@ -1218,20 +1231,21 @@ TEMPLATE_TEST_CASE("middle: change nodes in relation", "", options_slim_default,
     SECTION("Single relation directly affected")
     {
         auto mid = std::make_shared<middle_pgsql_t>(thread_pool, &options);
-        full_dependency_manager_t dependency_manager{mid};
         mid->start();
 
-        mid->node(node10d);
-        mid->node(node10a);
-        dependency_manager.node_changed(10);
-        mid->after_nodes();
-        dependency_manager.after_nodes();
-        mid->after_ways();
-        dependency_manager.after_ways();
-        mid->after_relations();
+        auto output = std::make_shared<output_null_t>(mid->get_query_instance(),
+                                                      thread_pool, options);
+        osmdata_t osmdata{mid, output, options};
+        osmdata.start();
 
-        REQUIRE(dependency_manager.has_pending());
-        idlist_t const rel_ids = dependency_manager.get_pending_relation_ids();
+        osmdata.node(node10d);
+        osmdata.node(node10a);
+        osmdata.after_nodes();
+        osmdata.after_ways();
+        osmdata.after_relations();
+
+        REQUIRE(osmdata.has_pending());
+        idlist_t const rel_ids = osmdata.get_pending_relation_ids();
 
         REQUIRE(rel_ids == idlist_t{30});
         check_relation(mid, rel30);
@@ -1240,22 +1254,23 @@ TEMPLATE_TEST_CASE("middle: change nodes in relation", "", options_slim_default,
     SECTION("Single relation indirectly affected (through way)")
     {
         auto mid = std::make_shared<middle_pgsql_t>(thread_pool, &options);
-        full_dependency_manager_t dependency_manager{mid};
         mid->start();
 
-        mid->node(node11d);
-        mid->node(node11a);
-        dependency_manager.node_changed(11);
-        mid->after_nodes();
-        dependency_manager.after_nodes();
-        mid->after_ways();
-        dependency_manager.after_ways();
-        mid->after_relations();
+        auto output = std::make_shared<output_null_t>(mid->get_query_instance(),
+                                                      thread_pool, options);
+        osmdata_t osmdata{mid, output, options};
+        osmdata.start();
+
+        osmdata.node(node11d);
+        osmdata.node(node11a);
+        osmdata.after_nodes();
+        osmdata.after_ways();
+        osmdata.after_relations();
 
-        REQUIRE(dependency_manager.has_pending());
-        idlist_t const way_ids = dependency_manager.get_pending_way_ids();
+        REQUIRE(osmdata.has_pending());
+        idlist_t const way_ids = osmdata.get_pending_way_ids();
         REQUIRE(way_ids == idlist_t{20});
-        idlist_t const rel_ids = dependency_manager.get_pending_relation_ids();
+        idlist_t const rel_ids = osmdata.get_pending_relation_ids();
         REQUIRE(rel_ids == idlist_t{31});
         check_relation(mid, rel31);
     }
diff --git a/tests/test-osm-file-parsing.cpp b/tests/test-osm-file-parsing.cpp
index 66d11f1ba..64afdaafe 100644
--- a/tests/test-osm-file-parsing.cpp
+++ b/tests/test-osm-file-parsing.cpp
@@ -142,29 +142,6 @@ struct counting_output_t : public output_null_t
     std::size_t sum_members = 0;
 };
 
-struct counts_t {
-    std::size_t nodes_changed = 0;
-    std::size_t ways_changed = 0;
-};
-
-/**
- * This pseudo-dependency manager is just used for testing. It counts how
- * often the *_changed() member functions are called.
- */
-class counting_dependency_manager_t : public dependency_manager_t
-{
-public:
-    explicit counting_dependency_manager_t(std::shared_ptr<counts_t> counts)
-    : m_counts(std::move(counts))
-    {}
-
-    void node_changed(osmid_t) override { ++m_counts->nodes_changed; }
-    void way_changed(osmid_t) override { ++m_counts->ways_changed; }
-
-private:
-    std::shared_ptr<counts_t> m_counts;
-};
-
 TEST_CASE("parse xml file")
 {
     options_t const options = testing::opt_t().slim();
@@ -174,12 +151,8 @@ TEST_CASE("parse xml file")
 
     auto const output = std::make_shared<counting_output_t>(options);
 
-    auto counts = std::make_shared<counts_t>();
-    auto dependency_manager =
-        std::make_unique<counting_dependency_manager_t>(counts);
-
-    testing::parse_file(options, std::move(dependency_manager), middle,
-                        output, "test_multipolygon.osm", false);
+    testing::parse_file(options, middle, output, "test_multipolygon.osm",
+                        false);
 
     REQUIRE(output->sum_ids == 4728);
     REQUIRE(output->sum_nds == 186);
@@ -201,9 +174,6 @@ TEST_CASE("parse xml file")
     REQUIRE(mid_test->way_count.deleted == 0);
     REQUIRE(mid_test->relation_count.added == 40);
     REQUIRE(mid_test->relation_count.deleted == 0);
-
-    REQUIRE(counts->nodes_changed == 0);
-    REQUIRE(counts->ways_changed == 0);
 }
 
 TEST_CASE("parse diff file")
@@ -215,12 +185,7 @@ TEST_CASE("parse diff file")
 
     auto const output = std::make_shared<counting_output_t>(options);
 
-    auto counts = std::make_shared<counts_t>();
-    auto dependency_manager =
-        std::make_unique<counting_dependency_manager_t>(counts);
-
-    testing::parse_file(options, std::move(dependency_manager), middle,
-                        output, "008-ch.osc.gz", false);
+    testing::parse_file(options, middle, output, "008-ch.osc.gz", false);
 
     REQUIRE(output->node.added == 0);
     REQUIRE(output->node.modified == 153);
@@ -239,9 +204,6 @@ TEST_CASE("parse diff file")
     REQUIRE(mid_test->way_count.deleted == 165);
     REQUIRE(mid_test->relation_count.added == 11);
     REQUIRE(mid_test->relation_count.deleted == 12);
-
-    REQUIRE(counts->nodes_changed == 1176);
-    REQUIRE(counts->ways_changed == 161);
 }
 
 TEST_CASE("parse xml file with extra args")
@@ -254,12 +216,8 @@ TEST_CASE("parse xml file with extra args")
 
     auto const output = std::make_shared<counting_output_t>(options);
 
-    auto counts = std::make_shared<counts_t>();
-    auto dependency_manager =
-        std::make_unique<counting_dependency_manager_t>(counts);
-
-    testing::parse_file(options, std::move(dependency_manager), middle,
-                        output, "test_multipolygon.osm", false);
+    testing::parse_file(options, middle, output, "test_multipolygon.osm",
+                        false);
 
     REQUIRE(output->sum_ids == 73514);
     REQUIRE(output->sum_nds == 495);
@@ -281,9 +239,6 @@ TEST_CASE("parse xml file with extra args")
     REQUIRE(mid_test->way_count.deleted == 0);
     REQUIRE(mid_test->relation_count.added == 40);
     REQUIRE(mid_test->relation_count.deleted == 0);
-
-    REQUIRE(counts->nodes_changed == 0);
-    REQUIRE(counts->ways_changed == 0);
 }
 
 TEST_CASE("invalid location")
@@ -295,15 +250,10 @@ TEST_CASE("invalid location")
 
     auto const output = std::make_shared<counting_output_t>(options);
 
-    auto counts = std::make_shared<counts_t>();
-    auto dependency_manager =
-        std::make_unique<counting_dependency_manager_t>(counts);
-
-    testing::parse_file(options, std::move(dependency_manager), middle,
-                        output, "test_invalid_location.osm", false);
+    testing::parse_file(options, middle, output, "test_invalid_location.osm",
+                        false);
 
     REQUIRE(output->node.added == 0);
     REQUIRE(output->way.added == 0);
     REQUIRE(output->relation.added == 0);
 }
-

From 89f4b0baaa4c03bd46672f6f9db0988f01a35556 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 10 May 2024 10:00:37 +0200
Subject: [PATCH 128/430] Remove osmdata_t::start() function, do its job in
 constructor

---
 src/osm2pgsql.cpp       | 2 --
 src/osmdata.cpp         | 6 +-----
 src/osmdata.hpp         | 2 --
 tests/common-import.hpp | 4 ----
 tests/test-middle.cpp   | 8 --------
 5 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
index 832f7d1d4..ec59a3384 100644
--- a/src/osm2pgsql.cpp
+++ b/src/osm2pgsql.cpp
@@ -61,8 +61,6 @@ static file_info run(options_t const &options)
 
     osmdata_t osmdata{middle, output, options};
 
-    osmdata.start();
-
     // Processing: In this phase the input file(s) are read and parsed,
     // populating some of the tables.
     auto finfo = process_files(files, &osmdata, options.append,
diff --git a/src/osmdata.cpp b/src/osmdata.cpp
index 2d52f62df..a44fb43a1 100644
--- a/src/osmdata.cpp
+++ b/src/osmdata.cpp
@@ -35,6 +35,7 @@ osmdata_t::osmdata_t(std::shared_ptr<middle_t> mid,
 {
     assert(m_mid);
     assert(m_output);
+    m_output->start();
 }
 
 void osmdata_t::node(osmium::Node const &node)
@@ -188,11 +189,6 @@ void osmdata_t::after_relations()
     m_output->sync();
 }
 
-void osmdata_t::start() const
-{
-    m_output->start();
-}
-
 namespace {
 
 /**
diff --git a/src/osmdata.hpp b/src/osmdata.hpp
index 7fef955ff..82dd1ae81 100644
--- a/src/osmdata.hpp
+++ b/src/osmdata.hpp
@@ -44,8 +44,6 @@ class osmdata_t : public osmium::handler::Handler
     osmdata_t(std::shared_ptr<middle_t> mid, std::shared_ptr<output_t> output,
               options_t const &options);
 
-    void start() const;
-
     void node(osmium::Node const &node);
     void way(osmium::Way &way);
     void relation(osmium::Relation const &rel);
diff --git a/tests/common-import.hpp b/tests/common-import.hpp
index ff9dfa042..82f41b2b9 100644
--- a/tests/common-import.hpp
+++ b/tests/common-import.hpp
@@ -40,8 +40,6 @@ inline void parse_file(options_t const &options,
 {
     osmdata_t osmdata{mid, output, options};
 
-    osmdata.start();
-
     std::string filepath{TESTDATA_DIR};
     if (filename) {
         filepath += filename;
@@ -145,8 +143,6 @@ class import_t
 
         osmdata_t osmdata{middle, output, options};
 
-        osmdata.start();
-
         std::vector<osmium::io::File> files;
         for (auto const &data : input_data) {
             files.emplace_back(data.data(), data.size(), format);
diff --git a/tests/test-middle.cpp b/tests/test-middle.cpp
index 1265949c0..aa496efe3 100644
--- a/tests/test-middle.cpp
+++ b/tests/test-middle.cpp
@@ -1048,8 +1048,6 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
                                                       thread_pool, options);
         osmdata_t osmdata{mid, output, options};
 
-        osmdata.start();
-
         osmdata.node(node10);
         osmdata.node(node11);
         osmdata.node(node12);
@@ -1084,7 +1082,6 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
                                                       thread_pool, options);
         osmdata_t osmdata{mid, output, options};
 
-        osmdata.start();
         osmdata.node(node10d);
         osmdata.node(node10a);
         osmdata.after_nodes();
@@ -1119,7 +1116,6 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
             auto output = std::make_shared<output_null_t>(
                 mid->get_query_instance(), thread_pool, options);
             osmdata_t osmdata{mid, output, options};
-            osmdata.start();
 
             osmdata.node(node10d);
             osmdata.node(node10a);
@@ -1147,7 +1143,6 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
             auto output = std::make_shared<output_null_t>(
                 mid->get_query_instance(), thread_pool, options);
             osmdata_t osmdata{mid, output, options};
-            osmdata.start();
 
             osmdata.after_nodes();
             osmdata.way(way20d);
@@ -1166,7 +1161,6 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
             auto output = std::make_shared<output_null_t>(
                 mid->get_query_instance(), thread_pool, options);
             osmdata_t osmdata{mid, output, options};
-            osmdata.start();
 
             osmdata.node(node10d);
             osmdata.node(node10a);
@@ -1236,7 +1230,6 @@ TEMPLATE_TEST_CASE("middle: change nodes in relation", "", options_slim_default,
         auto output = std::make_shared<output_null_t>(mid->get_query_instance(),
                                                       thread_pool, options);
         osmdata_t osmdata{mid, output, options};
-        osmdata.start();
 
         osmdata.node(node10d);
         osmdata.node(node10a);
@@ -1259,7 +1252,6 @@ TEMPLATE_TEST_CASE("middle: change nodes in relation", "", options_slim_default,
         auto output = std::make_shared<output_null_t>(mid->get_query_instance(),
                                                       thread_pool, options);
         osmdata_t osmdata{mid, output, options};
-        osmdata.start();
 
         osmdata.node(node11d);
         osmdata.node(node11a);

From d4a7b377ea272ea1e189545bdc50a52c938ffcaf Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 10 May 2024 10:00:37 +0200
Subject: [PATCH 129/430] Refactor osmdata_t code

Remove has_pending() which checks two things we can easily check each by
itself and sometimes only need one or the other.

Turn get_pending_way_ids() and get_pending_relation_ids() into simple
getters, they are only needed for testing outside the class.
---
 src/osmdata.cpp       | 49 +++++++++++++++----------------------------
 src/osmdata.hpp       | 15 ++++++++-----
 tests/test-middle.cpp | 27 +++++++++++++-----------
 3 files changed, 42 insertions(+), 49 deletions(-)

diff --git a/src/osmdata.cpp b/src/osmdata.cpp
index a44fb43a1..82de7ddd8 100644
--- a/src/osmdata.cpp
+++ b/src/osmdata.cpp
@@ -383,9 +383,15 @@ void osmdata_t::process_dependents()
                                  m_num_procs};
 
     // stage 1b processing: process parents of changed objects
-    if (has_pending()) {
-        proc.process_ways(get_pending_way_ids());
-        proc.process_relations(get_pending_relation_ids());
+    if (!m_ways_pending_tracker.empty() || !m_rels_pending_tracker.empty()) {
+        if (!m_ways_pending_tracker.empty()) {
+            m_ways_pending_tracker.sort_unique();
+            proc.process_ways(std::move(m_ways_pending_tracker));
+        }
+        if (!m_rels_pending_tracker.empty()) {
+            m_rels_pending_tracker.sort_unique();
+            proc.process_relations(std::move(m_rels_pending_tracker));
+        }
         proc.merge_expire_trees();
     }
 
@@ -395,14 +401,16 @@ void osmdata_t::process_dependents()
         return;
     }
 
-    assert(m_rels_pending_tracker.empty());
-    m_mid->get_way_parents(marked_ways, &m_rels_pending_tracker);
-
     // process parent relations of marked ways
-    if (has_pending()) {
-        proc.process_relations_stage1c(
-            get_pending_relation_ids());
+    idlist_t rels_pending_tracker{};
+    m_mid->get_way_parents(marked_ways, &rels_pending_tracker);
+
+    if (rels_pending_tracker.empty()) {
+        return;
     }
+
+    rels_pending_tracker.sort_unique();
+    proc.process_relations_stage1c(std::move(rels_pending_tracker));
 }
 
 void osmdata_t::reprocess_marked() const { m_output->reprocess_marked(); }
@@ -442,26 +450,3 @@ void osmdata_t::stop()
 
     postprocess_database();
 }
-
-bool osmdata_t::has_pending() const noexcept
-{
-    return !m_ways_pending_tracker.empty() || !m_rels_pending_tracker.empty();
-}
-
-idlist_t osmdata_t::get_pending_way_ids()
-{
-    idlist_t list;
-    using std::swap;
-    swap(list, m_ways_pending_tracker);
-    list.sort_unique();
-    return list;
-}
-
-idlist_t osmdata_t::get_pending_relation_ids()
-{
-    idlist_t list;
-    using std::swap;
-    swap(list, m_rels_pending_tracker);
-    list.sort_unique();
-    return list;
-}
diff --git a/src/osmdata.hpp b/src/osmdata.hpp
index 82dd1ae81..f4dc78c4d 100644
--- a/src/osmdata.hpp
+++ b/src/osmdata.hpp
@@ -58,11 +58,16 @@ class osmdata_t : public osmium::handler::Handler
      */
     void stop();
 
-    bool has_pending() const noexcept;
-
-    idlist_t get_pending_way_ids();
-
-    idlist_t get_pending_relation_ids();
+    // These getters are needed only for tests
+    idlist_t const &get_pending_way_ids() const noexcept
+    {
+        return m_ways_pending_tracker;
+    }
+
+    idlist_t const &get_pending_relation_ids() const noexcept
+    {
+        return m_rels_pending_tracker;
+    }
 
 private:
     /**
diff --git a/tests/test-middle.cpp b/tests/test-middle.cpp
index aa496efe3..c9b2272c2 100644
--- a/tests/test-middle.cpp
+++ b/tests/test-middle.cpp
@@ -1065,7 +1065,8 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
         check_way(mid, way21);
         check_way_nodes(mid, way21.id(), {&node11, &node12});
 
-        REQUIRE_FALSE(osmdata.has_pending());
+        REQUIRE(osmdata.get_pending_way_ids().empty());
+        REQUIRE(osmdata.get_pending_relation_ids().empty());
 
         osmdata.stop();
     }
@@ -1088,10 +1089,11 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
         osmdata.after_ways();
         osmdata.after_relations();
 
-        REQUIRE(osmdata.has_pending());
-        idlist_t const way_ids = osmdata.get_pending_way_ids();
+        idlist_t const &way_ids = osmdata.get_pending_way_ids();
         REQUIRE(way_ids == idlist_t{20});
 
+        REQUIRE(osmdata.get_pending_relation_ids().empty());
+
         check_way(mid, way20);
         check_way_nodes(mid, way20.id(), {&node10a, &node11});
     }
@@ -1123,10 +1125,11 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
             osmdata.after_ways();
             osmdata.after_relations();
 
-            REQUIRE(osmdata.has_pending());
-            idlist_t const way_ids = osmdata.get_pending_way_ids();
+            idlist_t const &way_ids = osmdata.get_pending_way_ids();
             REQUIRE(way_ids == idlist_t{20, 22});
 
+            REQUIRE(osmdata.get_pending_relation_ids().empty());
+
             check_way(mid, way20);
             check_way_nodes(mid, way20.id(), {&node10a, &node11});
             check_way(mid, way22);
@@ -1168,7 +1171,8 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
             osmdata.after_ways();
             osmdata.after_relations();
 
-            REQUIRE_FALSE(osmdata.has_pending());
+            REQUIRE(osmdata.get_pending_way_ids().empty());
+            REQUIRE(osmdata.get_pending_relation_ids().empty());
         }
     }
 }
@@ -1237,10 +1241,10 @@ TEMPLATE_TEST_CASE("middle: change nodes in relation", "", options_slim_default,
         osmdata.after_ways();
         osmdata.after_relations();
 
-        REQUIRE(osmdata.has_pending());
-        idlist_t const rel_ids = osmdata.get_pending_relation_ids();
-
+        REQUIRE(osmdata.get_pending_way_ids().empty());
+        idlist_t const &rel_ids = osmdata.get_pending_relation_ids();
         REQUIRE(rel_ids == idlist_t{30});
+
         check_relation(mid, rel30);
     }
 
@@ -1259,10 +1263,9 @@ TEMPLATE_TEST_CASE("middle: change nodes in relation", "", options_slim_default,
         osmdata.after_ways();
         osmdata.after_relations();
 
-        REQUIRE(osmdata.has_pending());
-        idlist_t const way_ids = osmdata.get_pending_way_ids();
+        idlist_t const &way_ids = osmdata.get_pending_way_ids();
         REQUIRE(way_ids == idlist_t{20});
-        idlist_t const rel_ids = osmdata.get_pending_relation_ids();
+        idlist_t const &rel_ids = osmdata.get_pending_relation_ids();
         REQUIRE(rel_ids == idlist_t{31});
         check_relation(mid, rel31);
     }

From 1c4ce753b68f40c372fc886293df4829d2937edb Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 13 May 2024 16:55:27 +0200
Subject: [PATCH 130/430] New nodes and ways can't have existing parents

New nodes or ways (ie with version=1) can't have parent ways or
relations. So we don't have to add them to the list of "changed nodes"
or "changed ways" to trigger re-processing of changed parents. This will
save us a whole lot of effort looking for parents that are never there.

Note that we are checking for version != 1. In the (unlikely) case that
there are no versions in the input file (making version == 0),
everything will work as before.
---
 src/osmdata.cpp                   | 18 ++++++++++++++++--
 tests/bdd/flex/way-change.feature | 22 +++++++++++-----------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/osmdata.cpp b/src/osmdata.cpp
index 82de7ddd8..de28d8bc2 100644
--- a/src/osmdata.cpp
+++ b/src/osmdata.cpp
@@ -65,7 +65,14 @@ void osmdata_t::node(osmium::Node const &node)
         } else {
             m_output->node_delete(node.id());
         }
-        m_changed_nodes.push_back(node.id());
+
+        // Version 1 means this is a new node, so there can't be an existing
+        // way or relation referencing it, so we don't have to add that node
+        // to the list of changed nodes. If the input data doesn't contain
+        // object versions this will still work, because then the version is 0.
+        if (node.version() != 1) {
+            m_changed_nodes.push_back(node.id());
+        }
     } else if (has_tags_or_attrs) {
         m_output->node_add(node);
     }
@@ -103,7 +110,14 @@ void osmdata_t::way(osmium::Way &way)
         } else {
             m_output->way_delete(way.id());
         }
-        m_changed_ways.push_back(way.id());
+
+        // Version 1 means this is a new way, so there can't be an existing
+        // relation referencing it, so we don't have to add that way to the
+        // list of changed ways. If the input data doesn't contain object
+        // versions this will still work, because then the version is 0.
+        if (way.version() != 1) {
+            m_changed_ways.push_back(way.id());
+        }
     } else if (has_tags_or_attrs) {
         m_output->way_add(&way);
     }
diff --git a/tests/bdd/flex/way-change.feature b/tests/bdd/flex/way-change.feature
index 00499b268..9e98564ea 100644
--- a/tests/bdd/flex/way-change.feature
+++ b/tests/bdd/flex/way-change.feature
@@ -10,11 +10,11 @@ Feature: Changing ways in a flex database
     Scenario Outline:
         Given the OSM data:
             """
+            w10 v1 dV Tt1=yes Nn10,n11
             w11 v1 dV Tt1=yes Nn12,n13
             w12 v1 dV Tt2=yes Nn14,n15
             w13 v1 dV Ttboth=yes Nn16,n17
             w14 v1 dV Ttboth=yes Nn18,n19
-            w10 v1 dV Tt1=yes Nn10,n11
             r30 v1 dV Tt=ag Mw10@mark,w11@,w12@mark,w13@,w14@mark
             """
         When running osm2pgsql flex with parameters
@@ -56,18 +56,18 @@ Feature: Changing ways in a flex database
 
         Examples:
             | input                             | num_w10 |
-            | w10 v1 dV Tt2=yes Nn10,n11        | 0       |
-            | w10 v1 dV Tt1=yes,t2=yes Nn10,n11 | 1       |
+            | w10 v2 dV Tt2=yes Nn10,n11        | 0       |
+            | w10 v2 dV Tt1=yes,t2=yes Nn10,n11 | 1       |
 
 
     Scenario Outline: change way from t2
         Given the OSM data
             """
+            w10 v1 dV Tt2=yes Nn10,n11
             w11 v1 dV Tt1=yes Nn12,n13
             w12 v1 dV Tt2=yes Nn14,n15
             w13 v1 dV Ttboth=yes Nn16,n17
             w14 v1 dV Ttboth=yes Nn18,n19
-            w10 v1 dV Tt2=yes Nn10,n11
             r30 v1 dV Tt=ag Mw10@mark,w11@,w12@mark,w13@,w14@mark
             """
         When running osm2pgsql flex with parameters
@@ -109,18 +109,18 @@ Feature: Changing ways in a flex database
 
         Examples:
             | input                             | num_w10 |
-            | w10 v1 dV Tt1=yes Nn10,n11        | 0       |
-            | w10 v1 dV Tt1=yes,t2=yes Nn10,n11 | 1       |
+            | w10 v2 dV Tt1=yes Nn10,n11        | 0       |
+            | w10 v2 dV Tt1=yes,t2=yes Nn10,n11 | 1       |
 
 
     Scenario Outline: change way from t1 and t2
         Given the OSM data
             """
+            w10 v1 dV Tt1=yes,t2=yes Nn10,n11
             w11 v1 dV Tt1=yes Nn12,n13
             w12 v1 dV Tt2=yes Nn14,n15
             w13 v1 dV Ttboth=yes Nn16,n17
             w14 v1 dV Ttboth=yes Nn18,n19
-            w10 v1 dV Tt1=yes,t2=yes Nn10,n11
             r30 v1 dV Tt=ag Mw10@mark,w11@,w12@mark,w13@,w14@mark
             """
         When running osm2pgsql flex with parameters
@@ -166,18 +166,18 @@ Feature: Changing ways in a flex database
 
         Examples:
             | input                      | num_t1 | num_t2 |
-            | w10 v1 dV Tt1=yes Nn10,n11 | 1      | 0      |
-            | w10 v1 dV Tt2=yes Nn10,n11 | 0      | 1      |
+            | w10 v2 dV Tt1=yes Nn10,n11 | 1      | 0      |
+            | w10 v2 dV Tt2=yes Nn10,n11 | 0      | 1      |
 
 
     Scenario Outline: change valid geom to invalid geom
         Given the OSM data
             """
+            w10 v1 dV Tt1=yes,t2=yes,tboth=yes Nn10,n11
             w11 v1 dV Tt1=yes Nn12,n13
             w12 v1 dV Tt2=yes Nn14,n15
             w13 v1 dV Ttboth=yes Nn16,n17
             w14 v1 dV Ttboth=yes Nn18,n19
-            w10 v1 dV Tt1=yes,t2=yes,tboth=yes Nn10,n11
             r30 v1 dV Tt=ag Mw10@mark,w11@,w12@mark,w13@,w14@mark
             """
         When running osm2pgsql flex with parameters
@@ -223,11 +223,11 @@ Feature: Changing ways in a flex database
     Scenario: change invalid geom to valid geom
         Given the OSM data
             """
+            w10 v1 dV Tt1=yes,t2=yes,tboth=yes Nn10
             w11 v1 dV Tt1=yes Nn12,n13
             w12 v1 dV Tt2=yes Nn14,n15
             w13 v1 dV Ttboth=yes Nn16,n17
             w14 v1 dV Ttboth=yes Nn18,n19
-            w10 v1 dV Tt1=yes,t2=yes,tboth=yes Nn10
             r30 v1 dV Tt=ag Mw10@mark,w11@,w12@mark,w13@,w14@mark
             """
         When running osm2pgsql flex with parameters

From dcdb6814a70eb1967ea8fdbbd3f9b16699c1f123 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 14 May 2024 13:44:08 +0200
Subject: [PATCH 131/430] Handle erros in threads correctly

Generalization processing can run in multiple threads. If a thread
throws an error that error was not caught correctly. The new code
catches the error and reports it and sets a flag that the main thread
knows an error happened, so it can terminate the program correctly.
---
 src/gen/osm2pgsql-gen.cpp | 68 ++++++++++++++++++++++++---------------
 1 file changed, 42 insertions(+), 26 deletions(-)

diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index 581c57083..3077c06d5 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -46,6 +46,7 @@
 
 #include <algorithm>
 #include <array>
+#include <atomic>
 #include <cassert>
 #include <chrono>
 #include <cstdint>
@@ -195,39 +196,49 @@ class tile_processor_t
     std::size_t m_num_tiles;
 };
 
-void run_tile_gen(connection_params_t const &connection_params,
+void run_tile_gen(std::atomic_flag *error_flag,
+                  connection_params_t const &connection_params,
                   gen_base_t *master_generalizer, params_t params,
                   uint32_t zoom,
                   std::vector<std::pair<uint32_t, uint32_t>> *queue,
                   std::mutex *mut, unsigned int n)
 {
-    logger::init_thread(n);
+    try {
+        logger::init_thread(n);
 
-    log_debug("Started generalizer thread for '{}'.",
-              master_generalizer->strategy());
-    pg_conn_t db_connection{connection_params, "gen.tile"};
-    std::string const strategy{master_generalizer->strategy()};
-    auto generalizer = create_generalizer(
-        strategy, &db_connection, master_generalizer->append_mode(), &params);
+        log_debug("Started generalizer thread for '{}'.",
+                  master_generalizer->strategy());
+        pg_conn_t db_connection{connection_params, "gen.tile"};
+        std::string const strategy{master_generalizer->strategy()};
+        auto generalizer =
+            create_generalizer(strategy, &db_connection,
+                               master_generalizer->append_mode(), &params);
 
-    while (true) {
-        std::pair<uint32_t, uint32_t> p;
-        {
-            std::lock_guard<std::mutex> const guard{*mut};
-            if (queue->empty()) {
-                master_generalizer->merge_timers(*generalizer);
-                break;
+        while (true) {
+            std::pair<uint32_t, uint32_t> p;
+            {
+                std::lock_guard<std::mutex> const guard{*mut};
+                if (queue->empty()) {
+                    master_generalizer->merge_timers(*generalizer);
+                    break;
+                }
+                p = queue->back();
+                queue->pop_back();
             }
-            p = queue->back();
-            queue->pop_back();
-        }
 
-        tile_t const tile{zoom, p.first, p.second};
-        log_debug("Processing tile {}/{}/{}...", tile.zoom(), tile.x(),
-                  tile.y());
-        generalizer->process(tile);
+            tile_t const tile{zoom, p.first, p.second};
+            log_debug("Processing tile {}/{}/{}...", tile.zoom(), tile.x(),
+                      tile.y());
+            generalizer->process(tile);
+        }
+        log_debug("Shutting down generalizer thread.");
+    } catch (std::exception const &e) {
+        log_error("{}", e.what());
+        error_flag->test_and_set();
+    } catch (...) {
+        log_error("Unknown exception in generalizer thread.");
+        error_flag->test_and_set();
     }
-    log_debug("Shutting down generalizer thread.");
 }
 
 class genproc_t
@@ -490,16 +501,21 @@ class genproc_t
             log_debug("Running in multi-threaded mode.");
             std::mutex mut;
             std::vector<std::thread> threads;
+            std::atomic_flag error_flag = ATOMIC_FLAG_INIT;
             for (unsigned int n = 1;
                  n <= std::min(m_jobs, static_cast<uint32_t>(tile_list.size()));
                  ++n) {
-                threads.emplace_back(run_tile_gen, m_connection_params,
-                                     generalizer, params, zoom, &tile_list,
-                                     &mut, n);
+                threads.emplace_back(run_tile_gen, &error_flag,
+                                     m_connection_params, generalizer, params,
+                                     zoom, &tile_list, &mut, n);
             }
             for (auto &t : threads) {
                 t.join();
             }
+            if (error_flag.test_and_set()) {
+                throw std::runtime_error{
+                    "Error in generalizer thread. Stopping."};
+            }
         }
     }
 

From 542833d1c4cfb319e0e0a38aef105462f18dd5db Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 30 May 2024 08:44:43 +0200
Subject: [PATCH 132/430] Add Ubuntu 24.04 build to CI

---
 .github/workflows/ci.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b7942e2ce..9fb7954ed 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -374,6 +374,24 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
+  ubuntu24-pg16-gcc14:
+    runs-on: ubuntu-24.04
+
+    env:
+      CC: gcc-14
+      CXX: g++-14
+      LUA_VERSION: 5.4
+      LUAJIT_OPTION: OFF
+      POSTGRESQL_VERSION: 16
+      POSTGIS_VERSION: 3
+      BUILD_TYPE: Debug
+      PSYCOPG: 3
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/ubuntu-prerequisites
+      - uses: ./.github/actions/build-and-test
+
   windows:
     strategy:
       fail-fast: false

From 9f02b0fb184e1b2b0b228f1035d9d1fb6967946b Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 30 May 2024 09:11:13 +0200
Subject: [PATCH 133/430] Fix pip3 install

---
 .github/actions/ubuntu-prerequisites/action.yml | 4 ++--
 .github/workflows/ci.yml                        | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/actions/ubuntu-prerequisites/action.yml b/.github/actions/ubuntu-prerequisites/action.yml
index 4acde6d75..1d3f95d8f 100644
--- a/.github/actions/ubuntu-prerequisites/action.yml
+++ b/.github/actions/ubuntu-prerequisites/action.yml
@@ -31,12 +31,12 @@ runs:
           postgresql-client postgresql-contrib-${POSTGRESQL_VERSION} \
           python3-setuptools \
           zlib1g-dev
-        pip3 install behave osmium
+        pip3 install $PIP_OPTION behave osmium
         if [ "$CC" = clang-8 ]; then sudo apt-get install -yq --no-install-suggests --no-install-recommends clang-8; fi
         if [ "$PSYCOPG" = "2"]; then
             sudo apt-get install -yq --no-install-suggests --no-install-recommends python3-psycopg2
         else
-            pip3 install psycopg
+            pip3 install $PIP_OPTION psycopg
         fi
       shell: bash
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9fb7954ed..d79872bbe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -386,6 +386,7 @@ jobs:
       POSTGIS_VERSION: 3
       BUILD_TYPE: Debug
       PSYCOPG: 3
+      PIP_OPTION: --break-system-packages
 
     steps:
       - uses: actions/checkout@v4

From 45049217a027b7783485b03f90c6f930925b534c Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 26 May 2024 09:47:07 +0200
Subject: [PATCH 134/430] Remove special case for old PostGIS versions when
 clustering

Ordering by geometry was done differently before PostGIS 2.4.
This commit removes the old code and adds a check that PostGIS 2.5
is available which is the oldest version we are checking in our CI.

Note that PostGIS 3 has been available for a long time now (it is in
Debian Bullseye ("oldstable", released 2021) and Ubuntu 20.04), so
we are way beyond where this should matter in real setups.
---
 README.md          |  4 ++--
 src/flex-table.cpp | 28 ++++------------------------
 src/osm2pgsql.cpp  |  5 +++++
 src/table.cpp      | 25 +++----------------------
 4 files changed, 14 insertions(+), 48 deletions(-)

diff --git a/README.md b/README.md
index 070d56826..0ef1c7100 100644
--- a/README.md
+++ b/README.md
@@ -67,8 +67,8 @@ with other versions of those libraries (set the `EXTERNAL_*libname*` option to
 * [protozero](https://github.com/mapbox/protozero) (>= 1.6.3)
 
 It also requires access to a database server running
-[PostgreSQL](https://www.postgresql.org/) 9.6+ and
-[PostGIS](https://www.postgis.net/) 2.2+.
+[PostgreSQL](https://www.postgresql.org/) (version 9.6+ works, 13+ strongly
+recommended) and [PostGIS](https://www.postgis.net/) (version 2.5+).
 
 Make sure you have installed the development packages for the libraries
 mentioned in the requirements section and a C++ compiler which supports C++17.
diff --git a/src/flex-table.cpp b/src/flex-table.cpp
index b4b5d8f35..82114f59a 100644
--- a/src/flex-table.cpp
+++ b/src/flex-table.cpp
@@ -323,34 +323,14 @@ void table_connection_t::stop(pg_conn_t const &db_connection, bool updateable,
             flex_table_t::table_type::permanent, table().full_tmp_name()));
 
         std::string const columns = table().build_sql_column_list();
-        std::string sql = fmt::format("INSERT INTO {} ({}) SELECT {} FROM {}",
-                                      table().full_tmp_name(), columns, columns,
-                                      table().full_name());
-
-        auto const postgis_version = get_postgis_version();
 
         auto const geom_column_name =
             "\"" + table().geom_column().name() + "\"";
 
-        sql += " ORDER BY ";
-        if (postgis_version.major == 2 && postgis_version.minor < 4) {
-            log_debug("Using GeoHash for clustering table '{}'",
-                      table().name());
-            if (table().geom_column().srid() == 4326) {
-                sql += fmt::format("ST_GeoHash({},10)", geom_column_name);
-            } else {
-                sql += fmt::format(
-                    "ST_GeoHash(ST_Transform(ST_Envelope({}),4326),10)",
-                    geom_column_name);
-            }
-            sql += " COLLATE \"C\"";
-        } else {
-            log_debug("Using native order for clustering table '{}'",
-                      table().name());
-            // Since Postgis 2.4 the order function for geometries gives
-            // useful results.
-            sql += geom_column_name;
-        }
+        std::string const sql =
+            fmt::format("INSERT INTO {} ({}) SELECT {} FROM {} ORDER BY {}",
+                        table().full_tmp_name(), columns, columns,
+                        table().full_name(), geom_column_name);
 
         db_connection.exec(sql);
 
diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
index ec59a3384..6d4ee7934 100644
--- a/src/osm2pgsql.cpp
+++ b/src/osm2pgsql.cpp
@@ -81,6 +81,11 @@ static void check_db(options_t const &options)
 
     init_database_capabilities(db_connection);
 
+    auto const pv = get_postgis_version();
+    if (pv.major < 2 || (pv.major == 2 && pv.minor < 5)) {
+        throw std::runtime_error{"Need at least PostGIS version 2.5"};
+    }
+
     check_schema(options.dbschema);
     check_schema(options.middle_dbschema);
     check_schema(options.output_dbschema);
diff --git a/src/table.cpp b/src/table.cpp
index 0dc78826e..229e7b160 100644
--- a/src/table.cpp
+++ b/src/table.cpp
@@ -195,28 +195,9 @@ void table_t::stop(bool updateable, bool enable_hstore_index,
 
         log_info("Clustering table '{}' by geometry...", m_target->name());
 
-        std::string sql = fmt::format("CREATE TABLE {} {} AS SELECT * FROM {}",
-                                      qual_tmp_name, m_table_space, qual_name);
-
-        auto const postgis_version = get_postgis_version();
-
-        sql += " ORDER BY ";
-        if (postgis_version.major == 2 && postgis_version.minor < 4) {
-            log_debug("Using GeoHash for clustering table '{}'",
-                      m_target->name());
-            if (m_srid == "4326") {
-                sql += "ST_GeoHash(way,10)";
-            } else {
-                sql += "ST_GeoHash(ST_Transform(ST_Envelope(way),4326),10)";
-            }
-            sql += " COLLATE \"C\"";
-        } else {
-            log_debug("Using native order for clustering table '{}'",
-                      m_target->name());
-            // Since Postgis 2.4 the order function for geometries gives
-            // useful results.
-            sql += "way";
-        }
+        std::string const sql =
+            fmt::format("CREATE TABLE {} {} AS SELECT * FROM {} ORDER BY way",
+                        qual_tmp_name, m_table_space, qual_name);
 
         m_db_connection->exec(sql);
 

From 2e36ec86b9a6c099faaf0729d58f1fe283c39cb7 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 20 May 2024 09:32:26 +0200
Subject: [PATCH 135/430] Flush and close COPYs after nodes, ways, and
 relations in flex output

Most output tables are only filled by either nodes or ways or relations.
So it makes sense to close COPY operations after the last
node/way/relation was found. Before this change active COPY operations
could sometimes be open for a long time.
---
 src/db-copy-mgr.hpp |  4 +++-
 src/db-copy.cpp     |  8 ++++++++
 src/db-copy.hpp     | 13 +++++++++++--
 src/osmdata.cpp     |  1 +
 src/output-flex.cpp | 15 +++++++--------
 src/output-flex.hpp |  1 +
 src/output.hpp      |  1 +
 7 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/db-copy-mgr.hpp b/src/db-copy-mgr.hpp
index a37ca299a..d2089cc22 100644
--- a/src/db-copy-mgr.hpp
+++ b/src/db-copy-mgr.hpp
@@ -262,10 +262,12 @@ class db_copy_mgr_t
 
     void flush()
     {
-        // finish any ongoing copy operations
+        // flush current buffer if there is one
         if (m_current) {
             m_processor->add_buffer(std::move(m_current));
         }
+        // close any ongoing copy operations
+        m_processor->end_copy();
     }
 
     /**
diff --git a/src/db-copy.cpp b/src/db-copy.cpp
index 261bb95ed..7c320dca1 100644
--- a/src/db-copy.cpp
+++ b/src/db-copy.cpp
@@ -105,6 +105,11 @@ void db_copy_thread_t::add_buffer(std::unique_ptr<db_cmd_t> &&buffer)
     m_shared.queue_cond.notify_one();
 }
 
+void db_copy_thread_t::end_copy()
+{
+    add_buffer(std::make_unique<db_cmd_end_copy_t>());
+}
+
 void db_copy_thread_t::sync_and_wait()
 {
     std::promise<void> barrier;
@@ -157,6 +162,9 @@ void db_copy_thread_t::thread_t::operator()()
             case db_cmd_t::Cmd_copy:
                 write_to_db(static_cast<db_cmd_copy_t *>(item.get()));
                 break;
+            case db_cmd_t::Cmd_end_copy:
+                finish_copy();
+                break;
             case db_cmd_t::Cmd_sync:
                 finish_copy();
                 static_cast<db_cmd_sync_t *>(item.get())->barrier.set_value();
diff --git a/src/db-copy.hpp b/src/db-copy.hpp
index a297d0f15..af4e1fa0d 100644
--- a/src/db-copy.hpp
+++ b/src/db-copy.hpp
@@ -144,8 +144,9 @@ class db_cmd_t
 public:
     enum cmd_t
     {
-        Cmd_copy, ///< Copy buffer content into given target.
-        Cmd_sync, ///< Synchronize with parent.
+        Cmd_copy,     ///< Copy buffer content into given target.
+        Cmd_end_copy, ///< End COPY command.
+        Cmd_sync,     ///< Synchronize with parent.
         Cmd_finish
     };
 
@@ -229,6 +230,11 @@ class db_cmd_copy_delete_t : public db_cmd_copy_t
     DELETER m_deleter;
 };
 
+struct db_cmd_end_copy_t : public db_cmd_t
+{
+    db_cmd_end_copy_t() : db_cmd_t(db_cmd_t::Cmd_end_copy) {}
+};
+
 struct db_cmd_sync_t : public db_cmd_t
 {
     std::promise<void> barrier;
@@ -264,6 +270,9 @@ class db_copy_thread_t
      */
     void add_buffer(std::unique_ptr<db_cmd_t> &&buffer);
 
+    /// Close COPY if one is open
+    void end_copy();
+
     /**
      * Send sync command and wait for the notification.
      */
diff --git a/src/osmdata.cpp b/src/osmdata.cpp
index de28d8bc2..ae2ae05cb 100644
--- a/src/osmdata.cpp
+++ b/src/osmdata.cpp
@@ -191,6 +191,7 @@ void osmdata_t::relation(osmium::Relation const &rel)
 void osmdata_t::after_relations()
 {
     m_mid->after_relations();
+    m_output->after_relations();
 
     if (m_append) {
         // Remove ids from changed relations in the input data from
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 0c8ccb8cc..a52f10c09 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -931,19 +931,18 @@ void output_flex_t::sync()
     }
 }
 
-void output_flex_t::after_nodes()
+static void flush_tables(std::vector<table_connection_t> &table_connections)
 {
-    for (auto &table : m_table_connections) {
+    for (auto &table : table_connections) {
         table.flush();
     }
 }
 
-void output_flex_t::after_ways()
-{
-    for (auto &table : m_table_connections) {
-        table.flush();
-    }
-}
+void output_flex_t::after_nodes() { flush_tables(m_table_connections); }
+
+void output_flex_t::after_ways() { flush_tables(m_table_connections); }
+
+void output_flex_t::after_relations() { flush_tables(m_table_connections); }
 
 void output_flex_t::stop()
 {
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index 0eca75dbd..e88c20b6f 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -123,6 +123,7 @@ class output_flex_t : public output_t
 
     void after_nodes() override;
     void after_ways() override;
+    void after_relations() override;
 
     void wait() override;
 
diff --git a/src/output.hpp b/src/output.hpp
index d380de3e6..a20e78f9c 100644
--- a/src/output.hpp
+++ b/src/output.hpp
@@ -65,6 +65,7 @@ class output_t
 
     virtual void after_nodes() {}
     virtual void after_ways() {}
+    virtual void after_relations() {}
 
     virtual void wait() {}
 

From 6bbeca533cf4bc28e6e16069e670c16ef26f01bb Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 2 Jun 2024 11:21:22 +0200
Subject: [PATCH 136/430] Allow setting the index names in the flex output

Usually the name chosen by PostgreSQL for an index is fine, but
sometimes you want to use a better name, especially if you are
using expression indexes.
---
 flex-config/indexes.lua | 5 ++++-
 src/debug-output.cpp    | 5 +++++
 src/flex-index.cpp      | 8 +++++++-
 src/flex-index.hpp      | 8 ++++++++
 src/flex-lua-index.cpp  | 6 ++++++
 5 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/flex-config/indexes.lua b/flex-config/indexes.lua
index 942c6f066..238083a30 100644
--- a/flex-config/indexes.lua
+++ b/flex-config/indexes.lua
@@ -62,11 +62,14 @@ tables.roads = osm2pgsql.define_way_table('roads', {
 }})
 
 -- Instead of on a column (or columns) you can define an index on an expression.
+-- Indexes can be named (the default name is the one that PostgreSQL creates).
 tables.postboxes = osm2pgsql.define_node_table('postboxes', {
     { column = 'operator', type = 'text' },
     { column = 'geom', type = 'point', not_null = true },
 }, { indexes = {
-    { expression = 'lower(operator)', method = 'btree' },
+    { expression = 'lower(operator)',
+      method = 'btree',
+      name = 'postbox_operator_idx' },
 }})
 
 -- Helper function that looks at the tags and decides if this is possibly
diff --git a/src/debug-output.cpp b/src/debug-output.cpp
index ea27e8cfd..3ee119d2c 100644
--- a/src/debug-output.cpp
+++ b/src/debug-output.cpp
@@ -61,6 +61,11 @@ void write_table_list_to_debug_log(std::vector<flex_table_t> const &tables)
         log_debug("  - cluster={}", table.cluster_by_geom());
         for (auto const &index : table.indexes()) {
             log_debug("  - INDEX USING {}", index.method());
+            if (index.name().empty()) {
+                log_debug("    - name=(default name)");
+            } else {
+                log_debug("    - name={}", index.name());
+            }
             log_debug("    - column={}", index.columns());
             log_debug("    - expression={}", index.expression());
             log_debug("    - include={}", index.include_columns());
diff --git a/src/flex-index.cpp b/src/flex-index.cpp
index 99cc0b92a..0f6ef2928 100644
--- a/src/flex-index.cpp
+++ b/src/flex-index.cpp
@@ -30,7 +30,13 @@ flex_index_t::create_index(std::string const &qualified_table_name) const
         joiner.add("UNIQUE");
     }
 
-    joiner.add("INDEX ON");
+    joiner.add("INDEX");
+
+    if (!m_name.empty()) {
+        joiner.add(fmt::format(R"("{}")", m_name));
+    }
+
+    joiner.add("ON");
     joiner.add(qualified_table_name);
 
     joiner.add("USING");
diff --git a/src/flex-index.hpp b/src/flex-index.hpp
index ba38e2c27..b6ee96389 100644
--- a/src/flex-index.hpp
+++ b/src/flex-index.hpp
@@ -48,6 +48,13 @@ class flex_index_t
         m_include_columns = columns;
     }
 
+    std::string const &name() const noexcept { return m_name; }
+
+    void set_name(std::string name)
+    {
+        m_name = std::move(name);
+    }
+
     std::string const &expression() const noexcept { return m_expression; }
 
     void set_expression(std::string expression)
@@ -89,6 +96,7 @@ class flex_index_t
 private:
     std::vector<std::string> m_columns;
     std::vector<std::string> m_include_columns;
+    std::string m_name;
     std::string m_method;
     std::string m_expression;
     std::string m_tablespace;
diff --git a/src/flex-lua-index.cpp b/src/flex-lua-index.cpp
index 33876fd37..c9168b3a7 100644
--- a/src/flex-lua-index.cpp
+++ b/src/flex-lua-index.cpp
@@ -78,6 +78,12 @@ void flex_lua_setup_index(lua_State *lua_state, flex_table_t *table)
     }
     lua_pop(lua_state, 1);
 
+    // get name
+    std::string const name =
+        luaX_get_table_string(lua_state, "name", -1, "Index definition", "");
+    lua_pop(lua_state, 1);
+    index.set_name(name);
+
     // get expression
     std::string const expression = luaX_get_table_string(
         lua_state, "expression", -1, "Index definition", "");

From 490ad6a7d6b8405e77c9323819da45e2e872dfd4 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 7 Jun 2024 13:58:07 +0200
Subject: [PATCH 137/430] Avoid warnings for integer conversions from MSVC

---
 src/osm2pgsql.cpp        | 2 +-
 src/pgsql.hpp            | 4 ++--
 tests/test-lua-utils.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
index 6d4ee7934..f6bb541bd 100644
--- a/src/osm2pgsql.cpp
+++ b/src/osm2pgsql.cpp
@@ -240,7 +240,7 @@ static void check_db_format(properties_t const &properties, options_t *options)
         throw fmt_error("Unknown db_format '{}' in properties.", format);
     }
 
-    options->middle_database_format = format;
+    options->middle_database_format = static_cast<uint8_t>(format);
 }
 
 static void check_output(properties_t const &properties, options_t *options)
diff --git a/src/pgsql.hpp b/src/pgsql.hpp
index ad3959c1b..9712e7a4d 100644
--- a/src/pgsql.hpp
+++ b/src/pgsql.hpp
@@ -262,10 +262,10 @@ class pg_conn_t
         if constexpr (std::is_same_v<T, char const *>) {
             return param;
         } else if constexpr (std::is_same_v<T, std::string>) {
-            *length = param.size();
+            *length = static_cast<int>(param.size());
             return param.c_str();
         } else if constexpr (std::is_same_v<T, binary_param>) {
-            *length = param.size();
+            *length = static_cast<int>(param.size());
             *bin = 1;
             return param.data();
         }
diff --git a/tests/test-lua-utils.cpp b/tests/test-lua-utils.cpp
index abd11f2cd..b1b6cf04a 100644
--- a/tests/test-lua-utils.cpp
+++ b/tests/test-lua-utils.cpp
@@ -89,7 +89,7 @@ TEST_CASE("luaX_for_each should call function n times", "[NoDB]")
         luaL_newstate(), [](lua_State *state) { lua_close(state); }};
 
     test_lua(lua_state.get(), "return { 3, 4, 5 }", [&](){
-        int sum = 0;
+        lua_Number sum = 0;
         luaX_for_each(lua_state.get(), [&]() {
             sum += lua_tonumber(lua_state.get(), -1);
         });

From 330354f1b08728b74ef73742a3e992787d42bf91 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 13 Jun 2024 21:42:57 +0200
Subject: [PATCH 138/430] Remove /STACK option for Windows linker

This has been in the config since it supported Windows. It is not clear
why it is needed. We are not doing anything with recursion or storing
large objects on the stack. We are probably fine without it.
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fa2491aa..9cb2708cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,7 +48,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 if (MSVC)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS -DNOMINMAX)
     add_compile_options(-wd4996)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ignore:4099 /STACK:30000000")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ignore:4099")
 else()
     add_compile_options(-Wall)
 endif()

From fc85ae2d867dc3b84f99e3dda39d4898c386093e Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 15 Jun 2024 14:16:29 +0200
Subject: [PATCH 139/430] Remove python before brew install

Workaround for github/brew problem. Python is already install
on the Github action runner and then homebrew comes along...
See also: https://github.com/Homebrew/homebrew-core/issues/173191
---
 .github/workflows/ci.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d79872bbe..e8ee5d005 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,7 +21,11 @@ jobs:
 
       - name: Install prerequisites
         run: |
-          brew install boost lua nlohmann-json opencv pandoc postgis potrace
+          # Workaround for github/brew problem. Python is already install
+          # on the Github action runner and then homebrew comes along...
+          # See also: https://github.com/Homebrew/homebrew-core/issues/173191
+          rm -f /usr/local/bin/2to3* /usr/local/bin/idle3* /usr/local/bin/pydoc3* /usr/local/bin/python3*
+          brew install boost lua nlohmann-json opencv pandoc postgis potrace python3
           # --break-system-packages is needed on macOS 14
           pip3 install --break-system-packages psycopg2 behave osmium
           mkdir ~/postgres

From 8c5e1e22dc5931d0013086f49671b540bd1ab03f Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 11 Jun 2024 17:19:59 +0200
Subject: [PATCH 140/430] Lua is now required

We are moving to the flex output which always needs Lua. Making Lua
optional isn't useful any more and just makes code more complicated.
This commit makes Lua non-optional.
---
 .github/actions/build-and-test/action.yml |   7 +-
 .github/workflows/ci.yml                  |  33 ------
 CMakeLists.txt                            |  67 ++++++------
 README.md                                 |   3 +-
 src/CMakeLists.txt                        | 120 +++++++++++-----------
 src/command-line-parser.cpp               |   8 --
 src/output.cpp                            |  14 +--
 src/tagtransform.cpp                      |  12 +--
 tests/CMakeLists.txt                      |  61 +++++------
 tests/test-options-parse.cpp              |   2 -
 10 files changed, 121 insertions(+), 206 deletions(-)

diff --git a/.github/actions/build-and-test/action.yml b/.github/actions/build-and-test/action.yml
index b62fc1048..a19bf1042 100644
--- a/.github/actions/build-and-test/action.yml
+++ b/.github/actions/build-and-test/action.yml
@@ -16,12 +16,7 @@ runs:
 
       - name: configure
         run: |
-          CMAKE_OPTIONS="-LA -DBUILD_TESTS=ON"
-          if [ -z "${LUA_VERSION}" ]; then
-            CMAKE_OPTIONS="$CMAKE_OPTIONS -DWITH_LUA=OFF"
-          else
-            CMAKE_OPTIONS="$CMAKE_OPTIONS -DWITH_LUAJIT=${LUAJIT_OPTION}"
-          fi
+          CMAKE_OPTIONS="-LA -DBUILD_TESTS=ON -DWITH_LUAJIT=${LUAJIT_OPTION}"
           if [ -n "$WITH_PROJ" ]; then
             CMAKE_OPTIONS="$CMAKE_OPTIONS -DWITH_PROJ=$WITH_PROJ"
           fi
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e8ee5d005..a0093bd0e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -215,22 +215,6 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  ubuntu20-pg13-gcc10-release-nolua:
-    runs-on: ubuntu-20.04
-
-    env:
-      CC: gcc-10
-      CXX: g++-10
-      POSTGRESQL_VERSION: 13
-      POSTGIS_VERSION: 2.5
-      BUILD_TYPE: Release
-      PSYCOPG: 2
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/ubuntu-prerequisites
-      - uses: ./.github/actions/build-and-test
-
   ubuntu22-pg16-clang14-jit:
     runs-on: ubuntu-22.04
 
@@ -323,23 +307,6 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  ubuntu22-pg16-gcc12-release-nolua:
-    runs-on: ubuntu-22.04
-
-    env:
-      CC: gcc-12
-      CXX: g++-12
-      EXTRA_FLAGS: -Wno-stringop-overread
-      POSTGRESQL_VERSION: 16
-      POSTGIS_VERSION: 3
-      BUILD_TYPE: Release
-      PSYCOPG: 2
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/ubuntu-prerequisites
-      - uses: ./.github/actions/build-and-test
-
   ubuntu22-pg16-clang15-cpp20:
     runs-on: ubuntu-22.04
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9cb2708cd..5da692841 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,6 @@ endif()
 
 option(BUILD_TESTS    "Build test suite" OFF)
 option(BUILD_COVERAGE "Build with coverage" OFF)
-option(WITH_LUA       "Build with Lua support" ON)
 option(WITH_LUAJIT    "Build with LuaJIT support" OFF)
 option(WITH_PROJ      "Build with Projection support" ON)
 
@@ -184,23 +183,19 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR})
 find_package(Osmium 2.17.3 REQUIRED COMPONENTS io)
 include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR} ${FMT_INCLUDE_DIR} ${CLI11_INCLUDE_DIR})
 
-if (WITH_LUA)
-    if (WITH_LUAJIT)
-        message(STATUS "Building with LuaJIT support")
-        find_package(LuaJIT REQUIRED)
-        include_directories(SYSTEM ${LUAJIT_INCLUDE_DIR})
-        add_definitions(-DHAVE_LUAJIT=1)
-    else()
-        message(STATUS "Building with Lua support")
-        find_package(Lua REQUIRED)
-        include_directories(SYSTEM ${LUA_INCLUDE_DIR})
-    endif()
-    add_definitions(-DHAVE_LUA=1)
-    find_program(LUA_EXE NAMES lua lua5.4 lua5.3 lua5.2 lua5.1)
+if (WITH_LUAJIT)
+    message(STATUS "Building with LuaJIT support")
+    find_package(LuaJIT REQUIRED)
+    include_directories(SYSTEM ${LUAJIT_INCLUDE_DIR})
+    add_definitions(-DHAVE_LUAJIT=1)
 else()
-    message(STATUS "Building without Lua support")
+    message(STATUS "Building with Lua (but not LuaJIT) support")
+    find_package(Lua REQUIRED)
+    include_directories(SYSTEM ${LUA_INCLUDE_DIR})
 endif()
 
+find_program(LUA_EXE NAMES lua lua5.4 lua5.3 lua5.2 lua5.1)
+
 find_package(Boost 1.50 REQUIRED)
 include_directories(SYSTEM ${Boost_INCLUDE_DIR})
 
@@ -235,7 +230,7 @@ endif()
 
 if (LUAJIT_FOUND)
     list(APPEND LIBS ${LUAJIT_LIBRARIES})
-elseif (LUA_FOUND)
+else()
     list(APPEND LIBS ${LUA_LIBRARIES})
 endif()
 
@@ -257,28 +252,24 @@ target_link_libraries(osm2pgsql osm2pgsql_lib ${LIBS})
 if (${POTRACE_LIBRARY} STREQUAL "POTRACE_LIBRARY-NOTFOUND" OR NOT OPENCV_CORE_FOUND)
     message(STATUS "Did not find opencv and/or potrace library. Not building osm2pgsql-gen.")
 else()
-    if (WITH_LUA)
-        message(STATUS "Found opencv and potrace library. Building osm2pgsql-gen.")
-        set(BUILD_GEN 1)
-        include_directories(SYSTEM ${POTRACE_INCLUDE_DIR})
-        add_executable(osm2pgsql-gen src/gen/osm2pgsql-gen.cpp
-                    src/gen/canvas.cpp
-                    src/gen/gen-base.cpp
-                    src/gen/gen-create.cpp
-                    src/gen/gen-discrete-isolation.cpp
-                    src/gen/gen-rivers.cpp
-                    src/gen/gen-tile-builtup.cpp
-                    src/gen/gen-tile-raster.cpp
-                    src/gen/gen-tile-sql.cpp
-                    src/gen/gen-tile-vector.cpp
-                    src/gen/gen-tile.cpp
-                    src/gen/params.cpp
-                    src/gen/raster.cpp
-                    src/gen/tracer.cpp)
-        target_link_libraries(osm2pgsql-gen osm2pgsql_lib ${LIBS} ${POTRACE_LIBRARY} ${OpenCV_LIBS})
-    else()
-        message(STATUS "No Lua. Not building osm2pgsql-gen.")
-    endif()
+    message(STATUS "Found opencv and potrace library. Building osm2pgsql-gen.")
+    set(BUILD_GEN 1)
+    include_directories(SYSTEM ${POTRACE_INCLUDE_DIR})
+    add_executable(osm2pgsql-gen src/gen/osm2pgsql-gen.cpp
+                src/gen/canvas.cpp
+                src/gen/gen-base.cpp
+                src/gen/gen-create.cpp
+                src/gen/gen-discrete-isolation.cpp
+                src/gen/gen-rivers.cpp
+                src/gen/gen-tile-builtup.cpp
+                src/gen/gen-tile-raster.cpp
+                src/gen/gen-tile-sql.cpp
+                src/gen/gen-tile-vector.cpp
+                src/gen/gen-tile.cpp
+                src/gen/params.cpp
+                src/gen/raster.cpp
+                src/gen/tracer.cpp)
+    target_link_libraries(osm2pgsql-gen osm2pgsql_lib ${LIBS} ${POTRACE_LIBRARY} ${OpenCV_LIBS})
 endif()
 
 #############################################################
diff --git a/README.md b/README.md
index 0ef1c7100..003c44ede 100644
--- a/README.md
+++ b/README.md
@@ -53,8 +53,7 @@ Required libraries are
 * [OpenCV](https://opencv.org/) (Optional, for generalization only)
 * [potrace](https://potrace.sourceforge.net/) (Optional, for generalization only)
 * [PostgreSQL](https://www.postgresql.org/) client libraries
-* [Lua](https://www.lua.org/) (Optional, used for Lua tag transforms
-  and the flex output)
+* [Lua](https://www.lua.org/)
 * [Python](https://python.org/) (only for running tests)
 * [Psycopg](https://www.psycopg.org/) (only for running tests)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9ab722474..83094f608 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,71 +5,67 @@ add_library(osm2pgsql_lib STATIC)
 # binaries that use it.
 target_compile_features(osm2pgsql_lib PUBLIC cxx_std_17)
 
+set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
+                "${CMAKE_CURRENT_SOURCE_DIR}/init.lua")
+file(READ "${CMAKE_CURRENT_SOURCE_DIR}/init.lua" LUA_INIT_CODE)
+configure_file(lua-init.cpp.in lua-init.cpp @ONLY)
+
 target_sources(osm2pgsql_lib PRIVATE
-  command-line-app.cpp
-  command-line-parser.cpp
-  db-copy.cpp
-  debug-output.cpp
-  expire-tiles.cpp
-  expire-output.cpp
-  geom.cpp
-  geom-box.cpp
-  geom-from-osm.cpp
-  geom-functions.cpp
-  geom-pole-of-inaccessibility.cpp
-  idlist.cpp
-  input.cpp
-  logging.cpp
-  middle.cpp
-  middle-pgsql.cpp
-  middle-ram.cpp
-  node-locations.cpp
-  node-persistent-cache.cpp
-  ordered-index.cpp
-  osmdata.cpp
-  output-null.cpp
-  output-pgsql.cpp
-  output.cpp
-  pgsql.cpp
-  pgsql-capabilities.cpp
-  pgsql-helper.cpp
-  progress-display.cpp
-  properties.cpp
-  reprojection.cpp
-  table.cpp
-  taginfo.cpp
-  tagtransform-c.cpp
-  tagtransform.cpp
-  tile.cpp
-  thread-pool.cpp
-  util.cpp
-  wildcmp.cpp
-  wkb.cpp
+    command-line-app.cpp
+    command-line-parser.cpp
+    db-copy.cpp
+    debug-output.cpp
+    expire-output.cpp
+    expire-tiles.cpp
+    flex-index.cpp
+    flex-lua-expire-output.cpp
+    flex-lua-geom.cpp
+    flex-lua-index.cpp
+    flex-lua-table.cpp
+    flex-table-column.cpp
+    flex-table.cpp
+    flex-write.cpp
+    geom-box.cpp
+    geom-from-osm.cpp
+    geom-functions.cpp
+    geom-pole-of-inaccessibility.cpp
+    geom.cpp
+    idlist.cpp
+    input.cpp
+    logging.cpp
+    lua-setup.cpp
+    lua-utils.cpp
+    middle-pgsql.cpp
+    middle-ram.cpp
+    middle.cpp
+    node-locations.cpp
+    node-persistent-cache.cpp
+    ordered-index.cpp
+    osmdata.cpp
+    output-flex.cpp
+    output-null.cpp
+    output-pgsql.cpp
+    output.cpp
+    pgsql-capabilities.cpp
+    pgsql-helper.cpp
+    pgsql.cpp
+    progress-display.cpp
+    properties.cpp
+    reprojection.cpp
+    table.cpp
+    taginfo.cpp
+    tagtransform-c.cpp
+    tagtransform-lua.cpp
+    tagtransform.cpp
+    thread-pool.cpp
+    tile.cpp
+    util.cpp
+    wildcmp.cpp
+    wkb.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/lua-init.cpp
+    ${PROJECT_BINARY_DIR}/src/version.cpp
 )
 
-if (WITH_LUA)
-    set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
-                 "${CMAKE_CURRENT_SOURCE_DIR}/init.lua")
-    file(READ "${CMAKE_CURRENT_SOURCE_DIR}/init.lua" LUA_INIT_CODE)
-    configure_file(lua-init.cpp.in lua-init.cpp @ONLY)
-    target_sources(osm2pgsql_lib PRIVATE
-        flex-index.cpp
-        flex-table.cpp
-        flex-table-column.cpp
-        flex-lua-expire-output.cpp
-        flex-lua-geom.cpp
-        flex-lua-index.cpp
-        flex-lua-table.cpp
-        flex-write.cpp
-        lua-setup.cpp
-        lua-utils.cpp
-        output-flex.cpp
-        tagtransform-lua.cpp
-        ${CMAKE_CURRENT_BINARY_DIR}/lua-init.cpp)
-endif()
-
-target_sources(osm2pgsql_lib PRIVATE ${PROJECT_BINARY_DIR}/src/version.cpp)
-
 if (HAVE_PROJ6)
     target_sources(osm2pgsql_lib PRIVATE reprojection-generic-proj6.cpp)
 else()
diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index ee252a358..4f6b575da 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -22,9 +22,7 @@
 
 #include <CLI/CLI.hpp>
 
-#ifdef HAVE_LUA
 #include <lua.hpp>
-#endif
 
 #include <algorithm>
 #include <cstdio>
@@ -118,15 +116,11 @@ void print_version()
     fmt::print(stderr, "Compiled using the following library versions:\n");
     fmt::print(stderr, "Libosmium {}\n", LIBOSMIUM_VERSION_STRING);
     fmt::print(stderr, "Proj {}\n", get_proj_version());
-#ifdef HAVE_LUA
 #ifdef HAVE_LUAJIT
     fmt::print(stderr, "{} ({})\n", LUA_RELEASE, LUAJIT_VERSION);
 #else
     fmt::print(stderr, "{}\n", LUA_RELEASE);
 #endif
-#else
-    fmt::print(stderr, "Lua support not included\n");
-#endif
 }
 
 static void check_options_non_slim(CLI::App const &app)
@@ -446,7 +440,6 @@ options_t parse_command_line(int argc, char *argv[])
         ->description("Compute area column using Web Mercator coordinates.")
         ->group("Pgsql output options");
 
-#ifdef HAVE_LUA
     // --tag-transform-script
     app.add_option("--tag-transform-script", options.tag_transform_script)
         ->description(
@@ -454,7 +447,6 @@ options_t parse_command_line(int argc, char *argv[])
         ->option_text("SCRIPT")
         ->check(CLI::ExistingFile)
         ->group("Pgsql output options");
-#endif
 
     // ----------------------------------------------------------------------
     // Expire options
diff --git a/src/output.cpp b/src/output.cpp
index f4b50b417..da3490114 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -12,16 +12,10 @@
 #include "db-copy.hpp"
 #include "format.hpp"
 #include "options.hpp"
+#include "output-flex.hpp"
 #include "output-null.hpp"
 #include "output-pgsql.hpp"
 
-#ifdef HAVE_LUA
-# include "output-flex.hpp"
-static constexpr char const *const flex_backend = "flex, ";
-#else
-static constexpr char const *const flex_backend = "";
-#endif
-
 #include <stdexcept>
 #include <string>
 #include <utility>
@@ -36,12 +30,10 @@ output_t::create_output(std::shared_ptr<middle_query_t> const &mid,
                                                 options);
     }
 
-#ifdef HAVE_LUA
     if (options.output_backend == "flex") {
         return std::make_shared<output_flex_t>(mid, std::move(thread_pool),
                                                options);
     }
-#endif
 
     if (options.output_backend == "null") {
         return std::make_shared<output_null_t>(mid, std::move(thread_pool),
@@ -49,8 +41,8 @@ output_t::create_output(std::shared_ptr<middle_query_t> const &mid,
     }
 
     throw fmt_error("Output backend '{}' not recognised. Should be one of"
-                    " [pgsql, {}null].",
-                    options.output_backend, flex_backend);
+                    " [pgsql, flex, null].",
+                    options.output_backend);
 }
 
 output_t::output_t(std::shared_ptr<middle_query_t> mid,
diff --git a/src/tagtransform.cpp b/src/tagtransform.cpp
index 4fef20387..41c25ffdc 100644
--- a/src/tagtransform.cpp
+++ b/src/tagtransform.cpp
@@ -7,14 +7,12 @@
  * For a full list of authors see the git log.
  */
 
+#include "tagtransform.hpp"
+
 #include "logging.hpp"
 #include "options.hpp"
 #include "tagtransform-c.hpp"
-#include "tagtransform.hpp"
-
-#ifdef HAVE_LUA
 #include "tagtransform-lua.hpp"
-#endif
 
 #include <stdexcept>
 #include <utility>
@@ -24,16 +22,10 @@ tagtransform_t::make_tagtransform(options_t const *options,
                                   export_list const &exlist)
 {
     if (!options->tag_transform_script.empty()) {
-#ifdef HAVE_LUA
         log_debug("Using lua based tag transformations with script {}",
                   options->tag_transform_script);
         return std::make_unique<lua_tagtransform_t>(
             &options->tag_transform_script, options->extra_attributes);
-#else
-        throw std::runtime_error{"Error: Could not init lua tag transform, as "
-                                 "lua support was not compiled into this "
-                                 "version."};
-#endif
     }
 
     log_debug("Using built-in tag transformations");
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6e293eb2b..3e85a303b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -39,11 +39,12 @@ add_library(catch_main_lib STATIC catch-main.cpp)
 target_compile_features(catch_main_lib PUBLIC cxx_std_17)
 
 set_test(test-check-input LABELS NoDB)
-set_test(test-db-copy-thread)
 set_test(test-db-copy-mgr)
+set_test(test-db-copy-thread)
 set_test(test-domain-matcher LABELS NoDB)
 set_test(test-expire-from-geometry LABELS NoDB)
 set_test(test-expire-tiles LABELS NoDB)
+set_test(test-flex-indexes)
 set_test(test-geom-box LABELS NoDB)
 set_test(test-geom-collections LABELS NoDB)
 set_test(test-geom-linestrings LABELS NoDB)
@@ -53,16 +54,29 @@ set_test(test-geom-multipolygons LABELS NoDB)
 set_test(test-geom-null LABELS NoDB)
 set_test(test-geom-output LABELS NoDB)
 set_test(test-geom-points LABELS NoDB)
-set_test(test-geom-polygons LABELS NoDB)
 set_test(test-geom-pole-of-inaccessibility LABELS NoDB)
+set_test(test-geom-polygons LABELS NoDB)
 set_test(test-geom-transform LABELS NoDB)
 set_test(test-json-writer LABELS NoDB)
+set_test(test-lua-utils)
 set_test(test-middle)
 set_test(test-node-locations LABELS NoDB)
 set_test(test-options-parse LABELS NoDB)
 set_test(test-options-projection)
 set_test(test-ordered-index LABELS NoDB)
 set_test(test-osm-file-parsing LABELS NoDB)
+set_test(test-output-flex)
+set_test(test-output-flex-multi-input)
+set_test(test-output-flex-nodes)
+set_test(test-output-flex-relation-combinations)
+set_test(test-output-flex-relations)
+set_test(test-output-flex-schema)
+set_test(test-output-flex-stage2)
+set_test(test-output-flex-tablespace LABELS Tablespace)
+set_test(test-output-flex-types)
+set_test(test-output-flex-uni)
+set_test(test-output-flex-update)
+set_test(test-output-flex-validgeom)
 set_test(test-output-pgsql)
 set_test(test-output-pgsql-area)
 set_test(test-output-pgsql-hstore-match-only)
@@ -83,29 +97,10 @@ set_test(test-util LABELS NoDB)
 set_test(test-wildcard-match LABELS NoDB)
 set_test(test-wkb LABELS NoDB)
 
-# these tests require LUA support
-if (WITH_LUA)
-    set_test(test-flex-indexes)
-    set_test(test-lua-utils)
-    set_test(test-output-flex)
-    set_test(test-output-flex-multi-input)
-    set_test(test-output-flex-nodes)
-    set_test(test-output-flex-uni)
-    set_test(test-output-flex-relations)
-    set_test(test-output-flex-relation-combinations)
-    set_test(test-output-flex-schema)
-    set_test(test-output-flex-stage2)
-    set_test(test-output-flex-tablespace LABELS Tablespace)
-    set_test(test-output-flex-types)
-    set_test(test-output-flex-update)
-    set_test(test-output-flex-validgeom)
-
-    set_test(test-output-flex-example-configs)
-    set(FLEX_EXAMPLE_CONFIGS "addresses,attributes,bbox,compatible,data-types,expire,generic,geometries,indexes,places,route-relations,simple,unitable")
-    # with-schema.lua is not tested because it needs the schema created in the database
-    set_tests_properties(test-output-flex-example-configs PROPERTIES ENVIRONMENT "EXAMPLE_FILES=${FLEX_EXAMPLE_CONFIGS}")
-endif()
-
+set_test(test-output-flex-example-configs)
+set(FLEX_EXAMPLE_CONFIGS "addresses,attributes,bbox,compatible,data-types,expire,generic,geometries,indexes,places,route-relations,simple,unitable")
+# with-schema.lua is not tested because it needs the schema created in the database
+set_tests_properties(test-output-flex-example-configs PROPERTIES ENVIRONMENT "EXAMPLE_FILES=${FLEX_EXAMPLE_CONFIGS}")
 
 # Fixture for creating test tablespace under a pg_virtualenv
 if (NOT WIN32)
@@ -138,13 +133,11 @@ else()
     message(WARNING "Cannot find behave, BDD tests disabled")
 endif()
 
-if (WITH_LUA)
-    if (LUA_EXE)
-        message(STATUS "Added test: lua-lib")
-        add_test(NAME lua-lib COMMAND ${LUA_EXE} lua/tests.lua
-                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-        set_tests_properties(lua-lib PROPERTIES LABELS NoDB)
-    else()
-        message(WARNING "Can not find Lua interpreter, test 'lua-lib' disabled")
-    endif()
+if (LUA_EXE)
+    message(STATUS "Added test: lua-lib")
+    add_test(NAME lua-lib COMMAND ${LUA_EXE} lua/tests.lua
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+    set_tests_properties(lua-lib PROPERTIES LABELS NoDB)
+else()
+    message(WARNING "Can not find Lua interpreter, test 'lua-lib' disabled")
 endif()
diff --git a/tests/test-options-parse.cpp b/tests/test-options-parse.cpp
index be9b4971f..6ac4505b3 100644
--- a/tests/test-options-parse.cpp
+++ b/tests/test-options-parse.cpp
@@ -66,10 +66,8 @@ TEST_CASE("Middle selection", "[NoDB]")
 
 TEST_CASE("Lua styles", "[NoDB]")
 {
-#ifdef HAVE_LUA
     REQUIRE_THROWS_WITH(opt({"--tag-transform-script", "non_existing.lua"}),
                         Catch::Matchers::Contains("File does not exist"));
-#endif
 }
 
 TEST_CASE("Parsing bbox", "[NoDB]")

From 05f4ff91bff9ab00aa26f6787007cab956e0afe3 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 14 Jun 2024 22:19:30 +0200
Subject: [PATCH 141/430] Remove superfluous c_str(), decode_hex() parameter is
 a string_view

---
 tests/test-wkb.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test-wkb.cpp b/tests/test-wkb.cpp
index 810485a0f..e3078b538 100644
--- a/tests/test-wkb.cpp
+++ b/tests/test-wkb.cpp
@@ -215,7 +215,7 @@ TEST_CASE("wkb hex decode of valid hex string")
                               static_cast<char>(0x99),
                               static_cast<char>(0xff)};
 
-    auto const result = decode_hex(hex.c_str());
+    auto const result = decode_hex(hex);
     REQUIRE(result.size() == hex.size() / 2);
     REQUIRE(result == data);
 }
@@ -223,7 +223,7 @@ TEST_CASE("wkb hex decode of valid hex string")
 TEST_CASE("wkb hex decode of empty string is okay")
 {
     std::string const hex{};
-    REQUIRE(decode_hex(hex.c_str()).empty());
+    REQUIRE(decode_hex(hex).empty());
 }
 
 TEST_CASE("wkb hex decode of string with odd number of characters fails")

From e69c5187076fcbc261a84ae205dcbb3b49d2b114 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 15 Jun 2024 09:22:51 +0200
Subject: [PATCH 142/430] Avoid class member that is a reference

---
 src/geom-functions.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/geom-functions.cpp b/src/geom-functions.cpp
index f2e6da346..3431345c5 100644
--- a/src/geom-functions.cpp
+++ b/src/geom-functions.cpp
@@ -252,18 +252,18 @@ namespace {
 class without_first
 {
 public:
-    explicit without_first(point_list_t const &list) : m_list(list) {}
+    explicit without_first(point_list_t const &list) : m_list(&list) {}
 
     point_list_t::const_iterator begin()
     {
-        assert(m_list.begin() != m_list.end());
-        return std::next(m_list.begin());
+        assert(m_list->begin() != m_list->end());
+        return std::next(m_list->begin());
     }
 
-    point_list_t::const_iterator end() { return m_list.end(); }
+    point_list_t::const_iterator end() { return m_list->end(); }
 
 private:
-    point_list_t const &m_list;
+    point_list_t const *m_list;
 }; // class without_first
 
 } // anonymous namespace

From 7c6a49030ccfe56568d483bae97e5ba457ef2505 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 15 Jun 2024 09:29:49 +0200
Subject: [PATCH 143/430] Replace short variable/member name "ls" by
 "linestring"

---
 src/geom-functions.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/geom-functions.cpp b/src/geom-functions.cpp
index 3431345c5..840ff2096 100644
--- a/src/geom-functions.cpp
+++ b/src/geom-functions.cpp
@@ -593,10 +593,10 @@ void line_merge(geometry_t *output, geometry_t const &input)
     struct connection_t
     {
         std::size_t left = NOCONN;
-        linestring_t const *ls;
+        linestring_t const *linestring;
         std::size_t right = NOCONN;
 
-        explicit connection_t(linestring_t const *l) noexcept : ls(l) {}
+        explicit connection_t(linestring_t const *l) noexcept : linestring(l) {}
     };
 
     std::vector<connection_t> conns;
@@ -633,7 +633,7 @@ void line_merge(geometry_t *output, geometry_t const &input)
     std::size_t done_ways = 0;
     std::size_t const todo_ways = conns.size();
     for (std::size_t i = 0; i < todo_ways; ++i) {
-        if (!conns[i].ls ||
+        if (!conns[i].linestring ||
             (conns[i].left != NOCONN && conns[i].right != NOCONN)) {
             continue; // way already done or not the beginning of a segment
         }
@@ -645,8 +645,8 @@ void line_merge(geometry_t *output, geometry_t const &input)
 
             do {
                 auto &conn = conns[cur];
-                assert(conn.ls);
-                auto const &nl = *conn.ls;
+                assert(conn.linestring);
+                auto const &nl = *conn.linestring;
                 bool const forward = conn.left == prev;
                 prev = cur;
                 // add line
@@ -660,7 +660,7 @@ void line_merge(geometry_t *output, geometry_t const &input)
                     cur = conn.left;
                 }
                 // mark line as done
-                conns[prev].ls = nullptr;
+                conns[prev].linestring = nullptr;
                 ++done_ways;
             } while (cur != NOCONN);
         }
@@ -675,7 +675,7 @@ void line_merge(geometry_t *output, geometry_t const &input)
         // oh dear, there must be circular ways without an end
         // need to do the same shebang again
         for (std::size_t i = 0; i < todo_ways; ++i) {
-            if (!conns[i].ls) {
+            if (!conns[i].linestring) {
                 continue; // way already done
             }
 
@@ -686,12 +686,12 @@ void line_merge(geometry_t *output, geometry_t const &input)
 
                 do {
                     auto &conn = conns[cur];
-                    assert(conn.ls);
-                    auto const &nl = *conn.ls;
+                    assert(conn.linestring);
+                    auto const &nl = *conn.linestring;
                     bool const forward =
                         (conn.left == prev &&
-                         (!conns[conn.left].ls ||
-                          conns[conn.left].ls->back() == nl.front()));
+                         (!conns[conn.left].linestring ||
+                          conns[conn.left].linestring->back() == nl.front()));
                     prev = cur;
                     if (forward) {
                         // add line forwards
@@ -705,7 +705,7 @@ void line_merge(geometry_t *output, geometry_t const &input)
                         cur = conn.left;
                     }
                     // mark line as done
-                    conns[prev].ls = nullptr;
+                    conns[prev].linestring = nullptr;
                 } while (cur != i);
             }
 
@@ -801,9 +801,9 @@ static bool simplify(linestring_t *output, linestring_t const &input,
 static bool simplify(multilinestring_t *output, multilinestring_t const &input,
                      double tolerance)
 {
-    for (auto const &ls : input) {
+    for (auto const &linestring : input) {
         linestring_t simplified_ls;
-        if (simplify(&simplified_ls, ls, tolerance)) {
+        if (simplify(&simplified_ls, linestring, tolerance)) {
             output->add_geometry(std::move(simplified_ls));
         }
     }

From 178cf7a84986a88007ae87161ad645c9bba02339 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 15 Jun 2024 10:15:19 +0200
Subject: [PATCH 144/430] Rename function parameter to avoid confusing
 parameters

---
 src/output-pgsql.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/output-pgsql.cpp b/src/output-pgsql.cpp
index 9f2fc621d..cf4274071 100644
--- a/src/output-pgsql.cpp
+++ b/src/output-pgsql.cpp
@@ -47,7 +47,7 @@
 
 static double calculate_area(bool reproject_area,
                              geom::geometry_t const &geom4326,
-                             geom::geometry_t const &geom)
+                             geom::geometry_t const &projected_geom)
 {
     static thread_local auto const proj3857 =
         reprojection::create_projection(3857);
@@ -56,7 +56,7 @@ static double calculate_area(bool reproject_area,
         auto const ogeom = geom::transform(geom4326, *proj3857);
         return geom::area(ogeom);
     }
-    return geom::area(geom);
+    return geom::area(projected_geom);
 }
 
 void output_pgsql_t::pgsql_out_way(osmium::Way const &way, taglist_t *tags,

From 718ada775f7eae12b15947ea669942f89f6efe45 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 15 Jun 2024 17:00:40 +0200
Subject: [PATCH 145/430] Use emplace_back() instead of push_back()

---
 src/flex-lua-index.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/flex-lua-index.cpp b/src/flex-lua-index.cpp
index c9168b3a7..3a396a7ec 100644
--- a/src/flex-lua-index.cpp
+++ b/src/flex-lua-index.cpp
@@ -25,7 +25,7 @@ static void check_and_add_column(flex_table_t const &table,
         throw fmt_error("Unknown column '{}' in table '{}'.", column_name,
                         table.name());
     }
-    columns->push_back(column_name);
+    columns->emplace_back(column_name);
 }
 
 static void check_and_add_columns(flex_table_t const &table,

From d2799fd64ea119d82f63f2c39dc9be2887530055 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 15 Jun 2024 17:02:10 +0200
Subject: [PATCH 146/430] Remove unused code

---
 src/gen/osm2pgsql-gen.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index 3077c06d5..bcb3f0884 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -250,14 +250,6 @@ class genproc_t
 
     int app_define_table()
     {
-#if 0
-        if (m_calling_context != calling_context::main) {
-            throw std::runtime_error{
-                "Database tables have to be defined in the"
-                " main Lua code, not in any of the callbacks."};
-        }
-#endif
-
         return setup_flex_table(m_lua_state.get(), &m_tables, &m_expire_outputs,
                                 m_dbschema, true, m_append);
     }

From e7ed8d0ae96ff0f64d4c4db6a257a40c0008c2ef Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 11 Jun 2024 15:45:25 +0200
Subject: [PATCH 147/430] Allow empty config file in flex output

No flex config file, or one that doesn't define any tables is usually
not very useful. But it can be used in slim mode to have the middle
tables only. Or it can be used to do some other processing or instead
if the null output for testing.

This change allows an empty config file, but a warning is printed that
no output tables are defined. You still have to specify a config file,
it can be an empty one, but it has to be there. This is so that if the
user forgets naming a config file on the command line they get an error
and not only a warning that might be missed.
---
 src/output-flex.cpp               | 3 +--
 tests/bdd/flex/lua-basics.feature | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index a52f10c09..290dc9d98 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -1172,8 +1172,7 @@ output_flex_t::output_flex_t(std::shared_ptr<middle_query_t> const &mid,
     }
 
     if (m_tables->empty()) {
-        throw std::runtime_error{
-            "No tables defined in Lua config. Nothing to do!"};
+        log_warn("No output tables defined!");
     }
 
     // For backwards compatibility we add a "default" expire output to all
diff --git a/tests/bdd/flex/lua-basics.feature b/tests/bdd/flex/lua-basics.feature
index 669933f1d..b8d68923a 100644
--- a/tests/bdd/flex/lua-basics.feature
+++ b/tests/bdd/flex/lua-basics.feature
@@ -9,10 +9,10 @@ Feature: Flex output uses a Lua config file
             print("stage=" .. osm2pgsql.stage)
             print("Table=" .. type(osm2pgsql.Table))
             """
-        Then running osm2pgsql flex fails
-        And the error output contains
+        When running osm2pgsql flex
+        Then the error output contains
             """
-            No tables defined in Lua config. Nothing to do!
+            No output tables defined
             """
         And the standard output contains
             """

From eee1cd5b541c985ebe55ce4e674a8aee5cb91096 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 15 Jun 2024 16:35:24 +0200
Subject: [PATCH 148/430] Use anonymous namespaces instead of declaring static
 functions

This is recommended in C++ Core Guidelines SF.22
https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Rs-unnamed2
---
 src/command-line-parser.cpp          |  53 ++++---
 src/flex-lua-expire-output.cpp       |   6 +-
 src/flex-lua-geom.cpp                |  36 ++---
 src/flex-lua-index.cpp               |  16 ++-
 src/flex-lua-table.cpp               |  40 +++---
 src/flex-table-column.cpp            |   8 +-
 src/flex-table.cpp                   |   8 +-
 src/flex-write.cpp                   |  41 +++---
 src/gen/gen-base.cpp                 |   6 +-
 src/gen/gen-rivers.cpp               |  39 +++---
 src/gen/gen-tile-builtup.cpp         |  88 ++++++------
 src/gen/gen-tile-raster.cpp          |  98 ++++++-------
 src/gen/osm2pgsql-gen.cpp            |  33 +++--
 src/gen/tracer.cpp                   |  22 +--
 src/geom-from-osm.cpp                |  41 +++---
 src/geom-functions.cpp               |  55 +++++---
 src/geom-pole-of-inaccessibility.cpp |  24 ++--
 src/input.cpp                        |  78 ++++++-----
 src/lua-utils.cpp                    |   6 +-
 src/middle-pgsql.cpp                 |  59 +++++---
 src/middle-ram.cpp                   |  78 ++++++-----
 src/osm2pgsql.cpp                    |  37 ++---
 src/output-flex.cpp                  | 200 ++++++++++++++-------------
 src/output-pgsql.cpp                 |  67 ++++-----
 src/pgsql-capabilities.cpp           |  23 +--
 src/pgsql.cpp                        |  31 +++--
 src/progress-display.cpp             |   8 +-
 src/taginfo.cpp                      |   6 +-
 src/tagtransform-c.cpp               |  16 +--
 src/tagtransform-lua.cpp             |   6 +-
 src/tile.cpp                         |   8 +-
 31 files changed, 683 insertions(+), 554 deletions(-)

diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index 4f6b575da..3430099d9 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -31,7 +31,9 @@
 #include <thread> // for number of threads
 #include <vector>
 
-static osmium::Box parse_bbox_param(std::string const &arg)
+namespace {
+
+osmium::Box parse_bbox_param(std::string const &arg)
 {
     double minx = NAN;
     double maxx = NAN;
@@ -61,9 +63,8 @@ static osmium::Box parse_bbox_param(std::string const &arg)
     return osmium::Box{minx, miny, maxx, maxy};
 }
 
-static void parse_expire_tiles_param(char const *arg,
-                                     uint32_t *expire_tiles_zoom_min,
-                                     uint32_t *expire_tiles_zoom)
+void parse_expire_tiles_param(char const *arg, uint32_t *expire_tiles_zoom_min,
+                              uint32_t *expire_tiles_zoom)
 {
     if (!arg || arg[0] == '-') {
         throw std::runtime_error{"Missing argument for option --expire-tiles."
@@ -110,20 +111,7 @@ static void parse_expire_tiles_param(char const *arg,
                              " tile expiry must be separated by '-'."};
 }
 
-void print_version()
-{
-    fmt::print(stderr, "Build: {}\n", get_build_type());
-    fmt::print(stderr, "Compiled using the following library versions:\n");
-    fmt::print(stderr, "Libosmium {}\n", LIBOSMIUM_VERSION_STRING);
-    fmt::print(stderr, "Proj {}\n", get_proj_version());
-#ifdef HAVE_LUAJIT
-    fmt::print(stderr, "{} ({})\n", LUA_RELEASE, LUAJIT_VERSION);
-#else
-    fmt::print(stderr, "{}\n", LUA_RELEASE);
-#endif
-}
-
-static void check_options_non_slim(CLI::App const &app)
+void check_options_non_slim(CLI::App const &app)
 {
     std::vector<std::string> const slim_options = {
         "--flat-nodes",           "--middle-schema",
@@ -138,7 +126,7 @@ static void check_options_non_slim(CLI::App const &app)
     }
 }
 
-static void check_options_output_flex(CLI::App const &app)
+void check_options_output_flex(CLI::App const &app)
 {
     auto const ignored_options = app.get_options([](CLI::Option const *option) {
         return option->get_group() == "Pgsql output options" ||
@@ -154,7 +142,7 @@ static void check_options_output_flex(CLI::App const &app)
     }
 }
 
-static void check_options_output_null(CLI::App const &app)
+void check_options_output_null(CLI::App const &app)
 {
     auto const ignored_options = app.get_options([](CLI::Option const *option) {
         return option->get_group() == "Pgsql output options" ||
@@ -172,7 +160,7 @@ static void check_options_output_null(CLI::App const &app)
     }
 }
 
-static void check_options_output_pgsql(CLI::App const &app, options_t *options)
+void check_options_output_pgsql(CLI::App const &app, options_t *options)
 {
     if (app.count("--latlong") + app.count("--merc") + app.count("--proj") >
         1) {
@@ -196,7 +184,7 @@ static void check_options_output_pgsql(CLI::App const &app, options_t *options)
     }
 }
 
-static void check_options(options_t *options)
+void check_options(options_t *options)
 {
     if (options->append && !options->slim) {
         throw std::runtime_error{"--append can only be used with slim mode!"};
@@ -223,7 +211,7 @@ static void check_options(options_t *options)
     }
 }
 
-static void check_options_expire(options_t *options) {
+void check_options_expire(options_t *options) {
     // Zoom level 31 is the technical limit because we use 32-bit integers for
     // the x and y index of a tile ID.
     if (options->expire_tiles_zoom_min > 31) {
@@ -246,6 +234,25 @@ static void check_options_expire(options_t *options) {
     }
 }
 
+} // anonymous namespace
+
+void print_version()
+{
+    fmt::print(stderr, "Build: {}\n", get_build_type());
+    fmt::print(stderr, "Compiled using the following library versions:\n");
+    fmt::print(stderr, "Libosmium {}\n", LIBOSMIUM_VERSION_STRING);
+    fmt::print(stderr, "Proj {}\n", get_proj_version());
+#ifdef HAVE_LUA
+#ifdef HAVE_LUAJIT
+    fmt::print(stderr, "{} ({})\n", LUA_RELEASE, LUAJIT_VERSION);
+#else
+    fmt::print(stderr, "{}\n", LUA_RELEASE);
+#endif
+#else
+    fmt::print(stderr, "Lua support not included\n");
+#endif
+}
+
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
 options_t parse_command_line(int argc, char *argv[])
 {
diff --git a/src/flex-lua-expire-output.cpp b/src/flex-lua-expire-output.cpp
index cc26a2cf2..ab2188cc6 100644
--- a/src/flex-lua-expire-output.cpp
+++ b/src/flex-lua-expire-output.cpp
@@ -17,7 +17,9 @@
 
 #include <lua.hpp>
 
-static expire_output_t &
+namespace {
+
+expire_output_t &
 create_expire_output(lua_State *lua_state, std::string const &default_schema,
                      std::vector<expire_output_t> *expire_outputs)
 {
@@ -65,6 +67,8 @@ create_expire_output(lua_State *lua_state, std::string const &default_schema,
     return new_expire_output;
 }
 
+} // anonymous namespace
+
 int setup_flex_expire_output(lua_State *lua_state,
                              std::string const &default_schema,
                              std::vector<expire_output_t> *expire_outputs)
diff --git a/src/flex-lua-geom.cpp b/src/flex-lua-geom.cpp
index 0a4a5f538..47accbaed 100644
--- a/src/flex-lua-geom.cpp
+++ b/src/flex-lua-geom.cpp
@@ -50,10 +50,12 @@ int geom_gc(lua_State *lua_state) noexcept
     return 0;
 }
 
+namespace {
+
 // The following functions are called when their counterparts in Lua are
 // called on geometry objects.
 
-static int geom_area(lua_State *lua_state)
+int geom_area(lua_State *lua_state)
 {
     auto const *const input_geometry = unpack_geometry(lua_state);
 
@@ -66,7 +68,7 @@ static int geom_area(lua_State *lua_state)
     return 1;
 }
 
-static int geom_spherical_area(lua_State *lua_state)
+int geom_spherical_area(lua_State *lua_state)
 {
     auto const *const input_geometry = unpack_geometry(lua_state);
 
@@ -84,7 +86,7 @@ static int geom_spherical_area(lua_State *lua_state)
     return 1;
 }
 
-static int geom_length(lua_State *lua_state)
+int geom_length(lua_State *lua_state)
 {
     auto const *const input_geometry = unpack_geometry(lua_state);
     try {
@@ -96,7 +98,7 @@ static int geom_length(lua_State *lua_state)
     return 1;
 }
 
-static int geom_centroid(lua_State *lua_state)
+int geom_centroid(lua_State *lua_state)
 {
     auto const *const input_geometry = unpack_geometry(lua_state);
 
@@ -110,7 +112,7 @@ static int geom_centroid(lua_State *lua_state)
     return 1;
 }
 
-static int geom_geometry_n(lua_State *lua_state)
+int geom_geometry_n(lua_State *lua_state)
 {
     auto const *const input_geometry = unpack_geometry(lua_state);
     auto const index = static_cast<int>(luaL_checkinteger(lua_state, 2));
@@ -125,7 +127,7 @@ static int geom_geometry_n(lua_State *lua_state)
     return 1;
 }
 
-static int geom_geometry_type(lua_State *lua_state)
+int geom_geometry_type(lua_State *lua_state)
 {
     auto const *const input_geometry = unpack_geometry(lua_state);
 
@@ -139,14 +141,14 @@ static int geom_geometry_type(lua_State *lua_state)
     return 1;
 }
 
-static int geom_is_null(lua_State *lua_state)
+int geom_is_null(lua_State *lua_state)
 {
     auto const *const input_geometry = unpack_geometry(lua_state);
     lua_pushboolean(lua_state, input_geometry->is_null());
     return 1;
 }
 
-static int geom_reverse(lua_State *lua_state)
+int geom_reverse(lua_State *lua_state)
 {
     auto const *const input_geometry = unpack_geometry(lua_state);
 
@@ -160,7 +162,7 @@ static int geom_reverse(lua_State *lua_state)
     return 1;
 }
 
-static int geom_line_merge(lua_State *lua_state)
+int geom_line_merge(lua_State *lua_state)
 {
     auto const *const input_geometry = unpack_geometry(lua_state);
 
@@ -174,7 +176,7 @@ static int geom_line_merge(lua_State *lua_state)
     return 1;
 }
 
-static int geom_num_geometries(lua_State *lua_state)
+int geom_num_geometries(lua_State *lua_state)
 {
     auto const *const input_geometry = unpack_geometry(lua_state);
     lua_pushinteger(lua_state,
@@ -182,7 +184,7 @@ static int geom_num_geometries(lua_State *lua_state)
     return 1;
 }
 
-static int geom_pole_of_inaccessibility(lua_State *lua_state)
+int geom_pole_of_inaccessibility(lua_State *lua_state)
 {
     auto const *const input_geometry = unpack_geometry(lua_state);
 
@@ -210,7 +212,7 @@ static int geom_pole_of_inaccessibility(lua_State *lua_state)
     return 1;
 }
 
-static int geom_segmentize(lua_State *lua_state)
+int geom_segmentize(lua_State *lua_state)
 {
     auto const *const input_geometry = unpack_geometry(lua_state);
     double const max_segment_length = luaL_checknumber(lua_state, 2);
@@ -225,7 +227,7 @@ static int geom_segmentize(lua_State *lua_state)
     return 1;
 }
 
-static int geom_simplify(lua_State *lua_state)
+int geom_simplify(lua_State *lua_state)
 {
     auto const *const input_geometry = unpack_geometry(lua_state);
     double const tolerance = luaL_checknumber(lua_state, 2);
@@ -240,7 +242,7 @@ static int geom_simplify(lua_State *lua_state)
     return 1;
 }
 
-static int geom_srid(lua_State *lua_state)
+int geom_srid(lua_State *lua_state)
 {
     auto const *const input_geometry = unpack_geometry(lua_state);
     lua_pushinteger(lua_state,
@@ -251,12 +253,12 @@ static int geom_srid(lua_State *lua_state)
 // XXX Implementation for Lua __tostring function on geometries. Currently
 // just returns the type as string. This could be improved, for instance by
 // showing a WKT representation of the geometry.
-static int geom_tostring(lua_State *lua_state)
+int geom_tostring(lua_State *lua_state)
 {
     return geom_geometry_type(lua_state);
 }
 
-static int geom_transform(lua_State *lua_state)
+int geom_transform(lua_State *lua_state)
 {
     auto const *const input_geometry = unpack_geometry(lua_state);
     auto const srid = static_cast<int>(luaL_checkinteger(lua_state, 2));
@@ -275,6 +277,8 @@ static int geom_transform(lua_State *lua_state)
     return 1;
 }
 
+} // anonymous namespace
+
 void init_geometry_class(lua_State *lua_state)
 {
     lua_getglobal(lua_state, "osm2pgsql");
diff --git a/src/flex-lua-index.cpp b/src/flex-lua-index.cpp
index 3a396a7ec..085b360f5 100644
--- a/src/flex-lua-index.cpp
+++ b/src/flex-lua-index.cpp
@@ -16,9 +16,11 @@
 #include <string>
 #include <vector>
 
-static void check_and_add_column(flex_table_t const &table,
-                                 std::vector<std::string> *columns,
-                                 char const *column_name)
+namespace {
+
+void check_and_add_column(flex_table_t const &table,
+                          std::vector<std::string> *columns,
+                          char const *column_name)
 {
     auto const *column = util::find_by_name(table.columns(), column_name);
     if (!column) {
@@ -28,9 +30,9 @@ static void check_and_add_column(flex_table_t const &table,
     columns->emplace_back(column_name);
 }
 
-static void check_and_add_columns(flex_table_t const &table,
-                                  std::vector<std::string> *columns,
-                                  lua_State *lua_state)
+void check_and_add_columns(flex_table_t const &table,
+                           std::vector<std::string> *columns,
+                           lua_State *lua_state)
 {
     if (!luaX_is_array(lua_state)) {
         throw std::runtime_error{
@@ -46,6 +48,8 @@ static void check_and_add_columns(flex_table_t const &table,
     });
 }
 
+} // anonymous namespace
+
 void flex_lua_setup_index(lua_State *lua_state, flex_table_t *table)
 {
     // get method
diff --git a/src/flex-lua-table.cpp b/src/flex-lua-table.cpp
index 242463d09..30b7a64bd 100644
--- a/src/flex-lua-table.cpp
+++ b/src/flex-lua-table.cpp
@@ -18,7 +18,9 @@
 
 #include <lua.hpp>
 
-static void check_tablespace(std::string const &tablespace)
+namespace {
+
+void check_tablespace(std::string const &tablespace)
 {
     if (!has_tablespace(tablespace)) {
         throw fmt_error(
@@ -28,9 +30,9 @@ static void check_tablespace(std::string const &tablespace)
     }
 }
 
-static flex_table_t &create_flex_table(lua_State *lua_state,
-                                       std::string const &default_schema,
-                                       std::vector<flex_table_t> *tables)
+flex_table_t &create_flex_table(lua_State *lua_state,
+                                std::string const &default_schema,
+                                std::vector<flex_table_t> *tables)
 {
     std::string const table_name =
         luaX_get_table_string(lua_state, "name", -1, "The table");
@@ -101,7 +103,7 @@ static flex_table_t &create_flex_table(lua_State *lua_state,
     return new_table;
 }
 
-static void parse_create_index(lua_State *lua_state, flex_table_t *table)
+void parse_create_index(lua_State *lua_state, flex_table_t *table)
 {
     std::string const create_index = luaX_get_table_string(
         lua_state, "create_index", -1, "The ids field", "auto");
@@ -117,8 +119,7 @@ static void parse_create_index(lua_State *lua_state, flex_table_t *table)
     }
 }
 
-static void setup_flex_table_id_columns(lua_State *lua_state,
-                                        flex_table_t *table)
+void setup_flex_table_id_columns(lua_State *lua_state, flex_table_t *table)
 {
     assert(lua_state);
     assert(table);
@@ -180,8 +181,8 @@ static void setup_flex_table_id_columns(lua_State *lua_state,
     lua_pop(lua_state, 1); // "ids"
 }
 
-static std::size_t idx_from_userdata(lua_State *lua_state, int idx,
-                                     std::size_t expire_outputs_size)
+std::size_t idx_from_userdata(lua_State *lua_state, int idx,
+                              std::size_t expire_outputs_size)
 {
     void const *const user_data = lua_touserdata(lua_state, idx);
 
@@ -202,10 +203,10 @@ static std::size_t idx_from_userdata(lua_State *lua_state, int idx,
     return eo;
 }
 
-static void parse_and_set_expire_options(lua_State *lua_state,
-                                         flex_table_column_t *column,
-                                         std::size_t expire_outputs_size,
-                                         bool append_mode)
+void parse_and_set_expire_options(lua_State *lua_state,
+                                  flex_table_column_t *column,
+                                  std::size_t expire_outputs_size,
+                                  bool append_mode)
 {
     auto const type = lua_type(lua_state, -1);
 
@@ -300,10 +301,9 @@ static void parse_and_set_expire_options(lua_State *lua_state,
     });
 }
 
-static void
-setup_flex_table_columns(lua_State *lua_state, flex_table_t *table,
-                         std::vector<expire_output_t> *expire_outputs,
-                         bool append_mode)
+void setup_flex_table_columns(lua_State *lua_state, flex_table_t *table,
+                              std::vector<expire_output_t> *expire_outputs,
+                              bool append_mode)
 {
     assert(lua_state);
     assert(table);
@@ -369,8 +369,8 @@ setup_flex_table_columns(lua_State *lua_state, flex_table_t *table,
     lua_pop(lua_state, 1); // "columns"
 }
 
-static void setup_flex_table_indexes(lua_State *lua_state, flex_table_t *table,
-                                     bool updatable)
+void setup_flex_table_indexes(lua_State *lua_state, flex_table_t *table,
+                              bool updatable)
 {
     assert(lua_state);
     assert(table);
@@ -413,6 +413,8 @@ static void setup_flex_table_indexes(lua_State *lua_state, flex_table_t *table,
     lua_pop(lua_state, 1); // "indexes"
 }
 
+} // anonymous namespace
+
 int setup_flex_table(lua_State *lua_state, std::vector<flex_table_t> *tables,
                      std::vector<expire_output_t> *expire_outputs,
                      std::string const &default_schema, bool updatable,
diff --git a/src/flex-table-column.cpp b/src/flex-table-column.cpp
index 54aa984c3..59ecd2b6a 100644
--- a/src/flex-table-column.cpp
+++ b/src/flex-table-column.cpp
@@ -19,6 +19,8 @@
 #include <utility>
 #include <vector>
 
+namespace {
+
 struct column_type_lookup
 {
     char const *m_name;
@@ -54,7 +56,7 @@ static std::vector<column_type_lookup> const column_types = {
      {"id_type", table_column_type::id_type},
      {"id_num", table_column_type::id_num}}};
 
-static table_column_type get_column_type_from_string(std::string const &type)
+table_column_type get_column_type_from_string(std::string const &type)
 {
     auto const *column_type = util::find_by_name(column_types, type);
     if (!column_type) {
@@ -64,7 +66,7 @@ static table_column_type get_column_type_from_string(std::string const &type)
     return column_type->type;
 }
 
-static std::string lowercase(std::string const &str)
+std::string lowercase(std::string const &str)
 {
     std::string result;
 
@@ -76,6 +78,8 @@ static std::string lowercase(std::string const &str)
     return result;
 }
 
+} // anonymous namespace
+
 flex_table_column_t::flex_table_column_t(std::string name,
                                          std::string const &type,
                                          std::string sql_type)
diff --git a/src/flex-table.cpp b/src/flex-table.cpp
index 82114f59a..80a2195b6 100644
--- a/src/flex-table.cpp
+++ b/src/flex-table.cpp
@@ -255,8 +255,10 @@ void flex_table_t::analyze(pg_conn_t const &db_connection) const
     analyze_table(db_connection, schema(), name());
 }
 
-static void enable_check_trigger(pg_conn_t const &db_connection,
-                                 flex_table_t const &table)
+namespace {
+
+void enable_check_trigger(pg_conn_t const &db_connection,
+                          flex_table_t const &table)
 {
     std::string checks;
 
@@ -279,6 +281,8 @@ static void enable_check_trigger(pg_conn_t const &db_connection,
                               checks);
 }
 
+} // anonymous namespace
+
 void table_connection_t::start(pg_conn_t const &db_connection,
                                bool append) const
 {
diff --git a/src/flex-write.cpp b/src/flex-write.cpp
index 376e75537..96cd2745e 100644
--- a/src/flex-write.cpp
+++ b/src/flex-write.cpp
@@ -22,7 +22,9 @@
 #include <limits>
 #include <vector>
 
-static int sgn(double val) noexcept
+namespace {
+
+int sgn(double val) noexcept
 {
     if (val > 0) {
         return 1;
@@ -33,8 +35,8 @@ static int sgn(double val) noexcept
     return 0;
 }
 
-static void write_null(db_copy_mgr_t<db_deleter_by_type_and_id_t> *copy_mgr,
-                       flex_table_column_t const &column)
+void write_null(db_copy_mgr_t<db_deleter_by_type_and_id_t> *copy_mgr,
+                flex_table_column_t const &column)
 {
     if (column.not_null()) {
         throw not_null_exception{
@@ -45,8 +47,8 @@ static void write_null(db_copy_mgr_t<db_deleter_by_type_and_id_t> *copy_mgr,
     copy_mgr->add_null_column();
 }
 
-static void write_boolean(db_copy_mgr_t<db_deleter_by_type_and_id_t> *copy_mgr,
-                          flex_table_column_t const &column, char const *str)
+void write_boolean(db_copy_mgr_t<db_deleter_by_type_and_id_t> *copy_mgr,
+                   flex_table_column_t const &column, char const *str)
 {
     if ((std::strcmp(str, "yes") == 0) || (std::strcmp(str, "true") == 0) ||
         std::strcmp(str, "1") == 0) {
@@ -63,9 +65,8 @@ static void write_boolean(db_copy_mgr_t<db_deleter_by_type_and_id_t> *copy_mgr,
     write_null(copy_mgr, column);
 }
 
-static void
-write_direction(db_copy_mgr_t<db_deleter_by_type_and_id_t> *copy_mgr,
-                flex_table_column_t const &column, char const *str)
+void write_direction(db_copy_mgr_t<db_deleter_by_type_and_id_t> *copy_mgr,
+                     flex_table_column_t const &column, char const *str)
 {
     if ((std::strcmp(str, "yes") == 0) || (std::strcmp(str, "1") == 0)) {
         copy_mgr->add_column(1);
@@ -112,8 +113,8 @@ void write_integer(db_copy_mgr_t<db_deleter_by_type_and_id_t> *copy_mgr,
     write_null(copy_mgr, column);
 }
 
-static void write_double(db_copy_mgr_t<db_deleter_by_type_and_id_t> *copy_mgr,
-                         flex_table_column_t const &column, char const *str)
+void write_double(db_copy_mgr_t<db_deleter_by_type_and_id_t> *copy_mgr,
+                  flex_table_column_t const &column, char const *str)
 {
     if (*str == '\0') {
         write_null(copy_mgr, column);
@@ -133,11 +134,11 @@ static void write_double(db_copy_mgr_t<db_deleter_by_type_and_id_t> *copy_mgr,
 
 using table_register_type = std::vector<void const *>;
 
-static void write_json(json_writer_t *writer, lua_State *lua_state,
-                       table_register_type *tables);
+void write_json(json_writer_t *writer, lua_State *lua_state,
+                table_register_type *tables);
 
-static void write_json_table(json_writer_t *writer, lua_State *lua_state,
-                             table_register_type *tables)
+void write_json_table(json_writer_t *writer, lua_State *lua_state,
+                      table_register_type *tables)
 {
     void const *table_ptr = lua_topointer(lua_state, -1);
     assert(table_ptr);
@@ -176,7 +177,7 @@ static void write_json_table(json_writer_t *writer, lua_State *lua_state,
     }
 }
 
-static void write_json_number(json_writer_t *writer, lua_State *lua_state)
+void write_json_number(json_writer_t *writer, lua_State *lua_state)
 {
 #if LUA_VERSION_NUM >= 503
     int okay = 0;
@@ -197,8 +198,8 @@ static void write_json_number(json_writer_t *writer, lua_State *lua_state)
 #endif
 }
 
-static void write_json(json_writer_t *writer, lua_State *lua_state,
-                       table_register_type *tables)
+void write_json(json_writer_t *writer, lua_State *lua_state,
+                table_register_type *tables)
 {
     assert(writer);
     assert(lua_state);
@@ -226,8 +227,8 @@ static void write_json(json_writer_t *writer, lua_State *lua_state,
     }
 }
 
-static bool is_compatible(geom::geometry_t const &geom,
-                          table_column_type type) noexcept
+bool is_compatible(geom::geometry_t const &geom,
+                   table_column_type type) noexcept
 {
     switch (type) {
     case table_column_type::geometry:
@@ -252,6 +253,8 @@ static bool is_compatible(geom::geometry_t const &geom,
     return false;
 }
 
+} // anonymous namespace
+
 void flex_write_column(lua_State *lua_state,
                        db_copy_mgr_t<db_deleter_by_type_and_id_t> *copy_mgr,
                        flex_table_column_t const &column,
diff --git a/src/gen/gen-base.cpp b/src/gen/gen-base.cpp
index c8737ee4c..d883eb1e2 100644
--- a/src/gen/gen-base.cpp
+++ b/src/gen/gen-base.cpp
@@ -82,7 +82,9 @@ std::string gen_base_t::context()
     return gen_name.empty() ? "" : fmt::format(" '{}'", gen_name);
 }
 
-static pg_result_t dbexec_internal(
+namespace {
+
+pg_result_t dbexec_internal(
     pg_conn_t const &connection, std::string const &templ,
     fmt::dynamic_format_arg_store<fmt::format_context> const &format_store)
 {
@@ -95,6 +97,8 @@ static pg_result_t dbexec_internal(
     }
 }
 
+} // anonymous namespace
+
 pg_result_t gen_base_t::dbexec(std::string const &templ)
 {
     fmt::dynamic_format_arg_store<fmt::format_context> format_store;
diff --git a/src/gen/gen-rivers.cpp b/src/gen/gen-rivers.cpp
index 160a98330..0f7e8d1c8 100644
--- a/src/gen/gen-rivers.cpp
+++ b/src/gen/gen-rivers.cpp
@@ -76,10 +76,12 @@ bool operator<(geom::point_t a, edge_t const &b) noexcept
     return a < b.points[0];
 }
 
-static void
-follow_chain_and_set_width(edge_t const &edge, std::vector<edge_t> *edges,
-                           std::map<geom::point_t, uint8_t> const &node_order,
-                           geom::linestring_t *seen)
+namespace {
+
+void follow_chain_and_set_width(
+    edge_t const &edge, std::vector<edge_t> *edges,
+    std::map<geom::point_t, uint8_t> const &node_order,
+    geom::linestring_t *seen)
 {
     assert(!edge.points.empty());
 
@@ -115,9 +117,8 @@ follow_chain_and_set_width(edge_t const &edge, std::vector<edge_t> *edges,
     }
 }
 
-static void assemble_edge(edge_t *edge, std::vector<edge_t> *edges,
-                          std::map<geom::point_t, uint8_t> const &node_order)
-
+void assemble_edge(edge_t *edge, std::vector<edge_t> *edges,
+                   std::map<geom::point_t, uint8_t> const &node_order)
 {
     assert(edge);
     assert(edges);
@@ -165,6 +166,19 @@ static void assemble_edge(edge_t *edge, std::vector<edge_t> *edges,
     }
 }
 
+std::string const &get_name(
+    std::unordered_map<osmid_t, std::string> const &names, osmid_t id)
+{
+    static std::string const empty;
+    auto const it = names.find(id);
+    if (it == names.end()) {
+        return empty;
+    }
+    return it->second;
+}
+
+} // anonymous namespace
+
 /// Get some stats from source table
 void gen_rivers_t::get_stats()
 {
@@ -178,17 +192,6 @@ void gen_rivers_t::get_stats()
             m_num_points);
 }
 
-static std::string const &
-get_name(std::unordered_map<osmid_t, std::string> const &names, osmid_t id)
-{
-    static std::string const empty;
-    auto const it = names.find(id);
-    if (it == names.end()) {
-        return empty;
-    }
-    return it->second;
-}
-
 void gen_rivers_t::process()
 {
     log_gen("Calculate waterway area width...");
diff --git a/src/gen/gen-tile-builtup.cpp b/src/gen/gen-tile-builtup.cpp
index 391a2dacd..e075bb8a9 100644
--- a/src/gen/gen-tile-builtup.cpp
+++ b/src/gen/gen-tile-builtup.cpp
@@ -21,11 +21,54 @@
 
 #include <osmium/util/string.hpp>
 
-static std::size_t round_up(std::size_t value, std::size_t multiple) noexcept
+namespace {
+
+std::size_t round_up(std::size_t value, std::size_t multiple) noexcept
 {
     return ((value + multiple - 1U) / multiple) * multiple;
 }
 
+void save_image_to_table(pg_conn_t *connection, canvas_t const &canvas,
+                         tile_t const &tile, double margin,
+                         std::string const &table, char const *variant,
+                         std::string const &table_prefix)
+{
+    auto const wkb = to_hex(canvas.to_wkb(tile, margin));
+
+    connection->exec("INSERT INTO \"{}_{}_{}\" (zoom, x, y, rast)"
+                     " VALUES ({}, {}, {}, '{}')",
+                     table_prefix, table, variant, tile.zoom(), tile.x(),
+                     tile.y(), wkb);
+}
+
+struct param_canvas_t
+{
+    canvas_t canvas;
+    std::string table;
+};
+
+using canvas_list_t = std::vector<param_canvas_t>;
+
+void draw_from_db(double margin, canvas_list_t *canvas_list, pg_conn_t *conn,
+                  tile_t const &tile)
+{
+    int prep = 0;
+    auto const box = tile.box(margin);
+    for (auto &cc : *canvas_list) {
+        std::string const statement = "get_geoms_" + fmt::to_string(prep++);
+        auto const result =
+            conn->exec_prepared(statement.c_str(), box.min_x(), box.min_y(),
+                                box.max_x(), box.max_y());
+
+        for (int n = 0; n < result.num_tuples(); ++n) {
+            auto const geom = ewkb_to_geom(decode_hex(result.get(n, 0)));
+            cc.canvas.draw(geom, tile);
+        }
+    }
+}
+
+} // anonymous namespace
+
 gen_tile_builtup_t::gen_tile_builtup_t(pg_conn_t *connection, bool append,
                                        params_t *params)
 : gen_tile_t(connection, append, params), m_timer_draw(add_timer("draw")),
@@ -137,49 +180,6 @@ PREPARE insert_geoms (geometry, int, int) AS
     }
 }
 
-static void save_image_to_table(pg_conn_t *connection, canvas_t const &canvas,
-                                tile_t const &tile, double margin,
-                                std::string const &table, char const *variant,
-                                std::string const &table_prefix)
-{
-    auto const wkb = to_hex(canvas.to_wkb(tile, margin));
-
-    connection->exec("INSERT INTO \"{}_{}_{}\" (zoom, x, y, rast)"
-                     " VALUES ({}, {}, {}, '{}')",
-                     table_prefix, table, variant, tile.zoom(), tile.x(),
-                     tile.y(), wkb);
-}
-
-namespace {
-
-struct param_canvas_t
-{
-    canvas_t canvas;
-    std::string table;
-};
-
-} // anonymous namespace
-
-using canvas_list_t = std::vector<param_canvas_t>;
-
-static void draw_from_db(double margin, canvas_list_t *canvas_list,
-                         pg_conn_t *conn, tile_t const &tile)
-{
-    int prep = 0;
-    auto const box = tile.box(margin);
-    for (auto &cc : *canvas_list) {
-        std::string const statement = "get_geoms_" + fmt::to_string(prep++);
-        auto const result =
-            conn->exec_prepared(statement.c_str(), box.min_x(), box.min_y(),
-                                box.max_x(), box.max_y());
-
-        for (int n = 0; n < result.num_tuples(); ++n) {
-            auto const geom = ewkb_to_geom(decode_hex(result.get(n, 0)));
-            cc.canvas.draw(geom, tile);
-        }
-    }
-}
-
 void gen_tile_builtup_t::process(tile_t const &tile)
 {
     connection().exec("BEGIN");
diff --git a/src/gen/gen-tile-raster.cpp b/src/gen/gen-tile-raster.cpp
index d750adf22..4771b9d6d 100644
--- a/src/gen/gen-tile-raster.cpp
+++ b/src/gen/gen-tile-raster.cpp
@@ -20,11 +20,59 @@
 
 #include <unordered_map>
 
-static std::size_t round_up(std::size_t value, std::size_t multiple) noexcept
+namespace {
+
+std::size_t round_up(std::size_t value, std::size_t multiple) noexcept
 {
     return ((value + multiple - 1U) / multiple) * multiple;
 }
 
+struct param_canvas_t
+{
+    canvas_t canvas;
+    std::size_t points = 0;
+
+    param_canvas_t(unsigned int image_extent, unsigned int image_buffer)
+    : canvas(image_extent, image_buffer)
+    {}
+};
+
+using canvas_list_t = std::unordered_map<std::string, param_canvas_t>;
+
+void draw_from_db(double margin, unsigned int image_extent,
+                  unsigned int image_buffer, canvas_list_t *canvas_list,
+                  pg_conn_t *conn, tile_t const &tile)
+{
+    auto const box = tile.box(margin);
+    auto const result = conn->exec_prepared(
+        "get_geoms", box.min_x(), box.min_y(), box.max_x(), box.max_y());
+
+    for (int n = 0; n < result.num_tuples(); ++n) {
+        std::string param = result.get_value(n, 1);
+        auto const geom = ewkb_to_geom(decode_hex(result.get(n, 0)));
+
+        auto const [it, success] = canvas_list->try_emplace(
+            std::move(param), image_extent, image_buffer);
+
+        it->second.points += it->second.canvas.draw(geom, tile);
+    }
+}
+
+void save_image_to_table(pg_conn_t *connection, canvas_t const &canvas,
+                         tile_t const &tile, double margin,
+                         std::string const &param, char const *variant,
+                         std::string const &table_prefix)
+{
+    auto const wkb = to_hex(canvas.to_wkb(tile, margin));
+
+    connection->exec("INSERT INTO \"{}_{}\" (type, zoom, x, y, rast)"
+                     " VALUES ('{}', {}, {}, {}, '{}')",
+                     table_prefix, variant, param, tile.zoom(), tile.x(),
+                     tile.y(), wkb);
+}
+
+} // anonymous namespace
+
 gen_tile_raster_union_t::gen_tile_raster_union_t(pg_conn_t *connection,
                                                  bool append, params_t *params)
 : gen_tile_t(connection, append, params), m_timer_draw(add_timer("draw")),
@@ -124,54 +172,6 @@ PREPARE insert_geoms (geometry, int, int, text) AS
     dbexec(prepare);
 }
 
-static void save_image_to_table(pg_conn_t *connection, canvas_t const &canvas,
-                                tile_t const &tile, double margin,
-                                std::string const &param, char const *variant,
-                                std::string const &table_prefix)
-{
-    auto const wkb = to_hex(canvas.to_wkb(tile, margin));
-
-    connection->exec("INSERT INTO \"{}_{}\" (type, zoom, x, y, rast)"
-                     " VALUES ('{}', {}, {}, {}, '{}')",
-                     table_prefix, variant, param, tile.zoom(), tile.x(),
-                     tile.y(), wkb);
-}
-
-namespace {
-
-struct param_canvas_t
-{
-    canvas_t canvas;
-    std::size_t points = 0;
-
-    param_canvas_t(unsigned int image_extent, unsigned int image_buffer)
-    : canvas(image_extent, image_buffer)
-    {}
-};
-
-} // anonymous namespace
-
-using canvas_list_t = std::unordered_map<std::string, param_canvas_t>;
-
-static void draw_from_db(double margin, unsigned int image_extent,
-                         unsigned int image_buffer, canvas_list_t *canvas_list,
-                         pg_conn_t *conn, tile_t const &tile)
-{
-    auto const box = tile.box(margin);
-    auto const result = conn->exec_prepared(
-        "get_geoms", box.min_x(), box.min_y(), box.max_x(), box.max_y());
-
-    for (int n = 0; n < result.num_tuples(); ++n) {
-        std::string param = result.get_value(n, 1);
-        auto const geom = ewkb_to_geom(decode_hex(result.get(n, 0)));
-
-        auto const [it, success] = canvas_list->try_emplace(
-            std::move(param), image_extent, image_buffer);
-
-        it->second.points += it->second.canvas.draw(geom, tile);
-    }
-}
-
 void gen_tile_raster_union_t::process(tile_t const &tile)
 {
     connection().exec("BEGIN");
diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index bcb3f0884..fb767edbe 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -58,8 +58,6 @@
 #include <string>
 #include <thread>
 
-constexpr std::size_t const max_force_single_thread = 4;
-
 // Lua can't call functions on C++ objects directly. This macro defines simple
 // C "trampoline" functions which are called from Lua which get the current
 // context (the genproc_t object) and call the respective function on the
@@ -80,6 +78,10 @@ constexpr std::size_t const max_force_single_thread = 4;
         }                                                                      \
     }
 
+namespace {
+
+constexpr std::size_t const max_force_single_thread = 4;
+
 struct tile_extent
 {
     uint32_t xmin = 0;
@@ -89,18 +91,18 @@ struct tile_extent
     bool valid = false;
 };
 
-static bool table_is_empty(pg_conn_t const &db_connection,
-                           std::string const &schema, std::string const &table)
+bool table_is_empty(pg_conn_t const &db_connection, std::string const &schema,
+                    std::string const &table)
 {
     auto const result = db_connection.exec("SELECT 1 FROM {} LIMIT 1",
                                            qualified_name(schema, table));
     return result.num_tuples() == 0;
 }
 
-static tile_extent get_extent_from_db(pg_conn_t const &db_connection,
-                                      std::string const &schema,
-                                      std::string const &table,
-                                      std::string const &column, uint32_t zoom)
+tile_extent get_extent_from_db(pg_conn_t const &db_connection,
+                               std::string const &schema,
+                               std::string const &table,
+                               std::string const &column, uint32_t zoom)
 {
     if (table_is_empty(db_connection, schema, table)) {
         return {};
@@ -128,9 +130,9 @@ static tile_extent get_extent_from_db(pg_conn_t const &db_connection,
             osmium::geom::mercy_to_tiley(zoom, extent_ymin), true};
 }
 
-static tile_extent get_extent_from_db(pg_conn_t const &db_connection,
-                                      std::string const &default_schema,
-                                      params_t const &params, uint32_t zoom)
+tile_extent get_extent_from_db(pg_conn_t const &db_connection,
+                               std::string const &default_schema,
+                               params_t const &params, uint32_t zoom)
 {
     auto const schema = params.get_string("schema", default_schema);
     std::string table;
@@ -149,10 +151,9 @@ static tile_extent get_extent_from_db(pg_conn_t const &db_connection,
     return get_extent_from_db(db_connection, schema, table, geom_column, zoom);
 }
 
-static void
-get_tiles_from_table(pg_conn_t const &connection, std::string const &table,
-                     uint32_t zoom,
-                     std::vector<std::pair<uint32_t, uint32_t>> *tiles)
+void get_tiles_from_table(pg_conn_t const &connection, std::string const &table,
+                          uint32_t zoom,
+                          std::vector<std::pair<uint32_t, uint32_t>> *tiles)
 {
     auto const result = connection.exec(
         R"(SELECT x, y FROM "{}" WHERE zoom = {})", table, zoom);
@@ -613,6 +614,8 @@ void genproc_t::run()
     }
 }
 
+} // anonymous namespace
+
 // NOLINTNEXTLINE(bugprone-exception-escape)
 int main(int argc, char *argv[])
 {
diff --git a/src/gen/tracer.cpp b/src/gen/tracer.cpp
index 588988ff6..027fb3415 100644
--- a/src/gen/tracer.cpp
+++ b/src/gen/tracer.cpp
@@ -15,6 +15,19 @@
 #include <cmath>
 #include <stdexcept>
 
+static_assert(sizeof(potrace_word) == 8);
+
+namespace {
+
+potrace_word bit_squeeze(potrace_word w, unsigned char const *d) noexcept
+{
+    return (0x80U & d[0]) | (0x40U & d[1]) | (0x20U & d[2]) | (0x10U & d[3]) |
+           (0x08U & d[4]) | (0x04U & d[5]) | (0x02U & d[6]) | (0x01U & d[7]) |
+           w;
+}
+
+} // anonymous namespace
+
 geom::point_t tracer_t::make_point(potrace_dpoint_t const &p) const noexcept
 {
     return {p.x - static_cast<double>(m_buffer),
@@ -46,15 +59,6 @@ void tracer_t::reset()
     m_num_points = 0;
 }
 
-static potrace_word bit_squeeze(potrace_word w, unsigned char const *d) noexcept
-{
-    return (0x80U & d[0]) | (0x40U & d[1]) | (0x20U & d[2]) | (0x10U & d[3]) |
-           (0x08U & d[4]) | (0x04U & d[5]) | (0x02U & d[6]) | (0x01U & d[7]) |
-           w;
-}
-
-static_assert(sizeof(potrace_word) == 8);
-
 void tracer_t::prepare(canvas_t const &canvas) noexcept
 {
     std::size_t const size = canvas.size();
diff --git a/src/geom-from-osm.cpp b/src/geom-from-osm.cpp
index 3d241349a..71f858f12 100644
--- a/src/geom-from-osm.cpp
+++ b/src/geom-from-osm.cpp
@@ -29,6 +29,8 @@ geometry_t create_point(osmium::Node const &node)
     return geometry_t{point_t{node.location()}};
 }
 
+namespace {
+
 /**
  * Fill point list with locations from nodes list. Consecutive identical
  * locations are collapsed into a single point.
@@ -36,8 +38,7 @@ geometry_t create_point(osmium::Node const &node)
  * Returns true if the result is a valid linestring, i.e. it has more than
  * one point.
  */
-static bool fill_point_list(point_list_t *list,
-                            osmium::NodeRefList const &nodes)
+bool fill_point_list(point_list_t *list, osmium::NodeRefList const &nodes)
 {
     osmium::Location last{};
 
@@ -53,6 +54,25 @@ static bool fill_point_list(point_list_t *list,
     return list->size() > 1;
 }
 
+void fill_polygon(polygon_t *polygon, osmium::Area const &area,
+                  osmium::OuterRing const &outer_ring)
+{
+    assert(polygon->inners().empty());
+
+    for (auto const &nr : outer_ring) {
+        polygon->outer().emplace_back(nr.location());
+    }
+
+    for (auto const &inner_ring : area.inner_rings(outer_ring)) {
+        auto &ring = polygon->inners().emplace_back();
+        for (auto const &nr : inner_ring) {
+            ring.emplace_back(nr.location());
+        }
+    }
+}
+
+} // anonymous namespace
+
 void create_linestring(geometry_t *geom, osmium::Way const &way)
 {
     auto &line = geom->set<linestring_t>();
@@ -185,23 +205,6 @@ geometry_t create_multilinestring(osmium::memory::Buffer const &buffer,
     return geom;
 }
 
-static void fill_polygon(polygon_t *polygon, osmium::Area const &area,
-                         osmium::OuterRing const &outer_ring)
-{
-    assert(polygon->inners().empty());
-
-    for (auto const &nr : outer_ring) {
-        polygon->outer().emplace_back(nr.location());
-    }
-
-    for (auto const &inner_ring : area.inner_rings(outer_ring)) {
-        auto &ring = polygon->inners().emplace_back();
-        for (auto const &nr : inner_ring) {
-            ring.emplace_back(nr.location());
-        }
-    }
-}
-
 void create_multipolygon(geometry_t *geom, osmium::Relation const &relation,
                          osmium::memory::Buffer const &buffer)
 {
diff --git a/src/geom-functions.cpp b/src/geom-functions.cpp
index 840ff2096..f223f1f32 100644
--- a/src/geom-functions.cpp
+++ b/src/geom-functions.cpp
@@ -266,10 +266,8 @@ class without_first
     point_list_t const *m_list;
 }; // class without_first
 
-} // anonymous namespace
-
-static void split_linestring(linestring_t const &line, double split_at,
-                             multilinestring_t *output)
+void split_linestring(linestring_t const &line, double split_at,
+                      multilinestring_t *output)
 {
     double dist = 0;
     point_t prev_pt{line.front()};
@@ -320,6 +318,8 @@ static void split_linestring(linestring_t const &line, double split_at,
     }
 }
 
+} // anonymous namespace
+
 void segmentize(geometry_t *output, geometry_t const &input,
                 double max_segment_length)
 {
@@ -364,7 +364,9 @@ double area(geometry_t const &geom)
 
 /****************************************************************************/
 
-static double spherical_area(polygon_t const &geom)
+namespace {
+
+double spherical_area(polygon_t const &geom)
 {
     boost::geometry::strategy::area::spherical<> const spherical_earth{
         6371008.8};
@@ -378,6 +380,8 @@ static double spherical_area(polygon_t const &geom)
     return boost::geometry::area(sph_geom, spherical_earth);
 }
 
+} // anonymous namespace
+
 double spherical_area(geometry_t const &geom)
 {
     assert(geom.srid() == 4326);
@@ -471,23 +475,25 @@ std::vector<geometry_t> split_multi(geometry_t &&geom, bool split_multi)
 
 /****************************************************************************/
 
-static void reverse(geom::nullgeom_t * /*output*/,
-                    geom::nullgeom_t const & /*input*/) noexcept
+namespace {
+
+void reverse(geom::nullgeom_t * /*output*/,
+             geom::nullgeom_t const & /*input*/) noexcept
 {}
 
-static void reverse(geom::point_t *output, geom::point_t const &input) noexcept
+void reverse(geom::point_t *output, geom::point_t const &input) noexcept
 {
     *output = input;
 }
 
-static void reverse(point_list_t *output, point_list_t const &input)
+void reverse(point_list_t *output, point_list_t const &input)
 {
     output->reserve(input.size());
     std::reverse_copy(input.cbegin(), input.cend(),
                       std::back_inserter(*output));
 }
 
-static void reverse(geom::polygon_t *output, geom::polygon_t const &input)
+void reverse(geom::polygon_t *output, geom::polygon_t const &input)
 {
     reverse(&output->outer(), input.outer());
     for (auto const &g : input.inners()) {
@@ -505,6 +511,8 @@ void reverse(geom::multigeometry_t<T> *output,
     }
 }
 
+} // anonymous namespace
+
 void reverse(geometry_t *output, geometry_t const &input)
 {
     output->set_srid(input.srid());
@@ -525,13 +533,15 @@ geometry_t reverse(geometry_t const &input)
 
 /****************************************************************************/
 
+namespace {
+
 /**
  * Add points specified by iterators to the linestring. If linestring is not
  * empty, do not add the first point returned by *it.
  */
 template <typename ITERATOR>
-static void add_nodes_to_linestring(linestring_t *linestring, ITERATOR it,
-                                    ITERATOR end)
+void add_nodes_to_linestring(linestring_t *linestring, ITERATOR it,
+                             ITERATOR end)
 {
     if (!linestring->empty()) {
         assert(it != end);
@@ -544,6 +554,8 @@ static void add_nodes_to_linestring(linestring_t *linestring, ITERATOR it,
     }
 }
 
+} // anonymous namespace
+
 void line_merge(geometry_t *output, geometry_t const &input)
 {
     if (input.is_linestring()) {
@@ -728,6 +740,8 @@ geometry_t line_merge(geometry_t const &input)
 
 /****************************************************************************/
 
+namespace {
+
 /**
  * This helper function is used to calculate centroids of geometry collections.
  * It first creates a multi geometry that only contains the geometries of
@@ -740,7 +754,7 @@ geometry_t line_merge(geometry_t const &input)
  * Nested geometry collections are not allowed.
  */
 template <std::size_t N, typename T>
-static void filtered_centroid(collection_t const &collection, point_t *center)
+void filtered_centroid(collection_t const &collection, point_t *center)
 {
     multigeometry_t<T> multi;
     for (auto const &geom : collection) {
@@ -758,6 +772,8 @@ static void filtered_centroid(collection_t const &collection, point_t *center)
     boost::geometry::centroid(multi, *center);
 }
 
+} // anonymous namespace
+
 geometry_t centroid(geometry_t const &geom)
 {
     geom::geometry_t output{point_t{}, geom.srid()};
@@ -785,8 +801,9 @@ geometry_t centroid(geometry_t const &geom)
 
 /****************************************************************************/
 
-static bool simplify(linestring_t *output, linestring_t const &input,
-                     double tolerance)
+namespace {
+
+bool simplify(linestring_t *output, linestring_t const &input, double tolerance)
 {
     boost::geometry::simplify(input, *output, tolerance);
 
@@ -798,8 +815,8 @@ static bool simplify(linestring_t *output, linestring_t const &input,
     return output->size() > 1;
 }
 
-static bool simplify(multilinestring_t *output, multilinestring_t const &input,
-                     double tolerance)
+bool simplify(multilinestring_t *output, multilinestring_t const &input,
+              double tolerance)
 {
     for (auto const &linestring : input) {
         linestring_t simplified_ls;
@@ -811,11 +828,13 @@ static bool simplify(multilinestring_t *output, multilinestring_t const &input,
 }
 
 template <typename T>
-static bool simplify(T * /*output*/, T const & /*input*/, double /*tolerance*/)
+bool simplify(T * /*output*/, T const & /*input*/, double /*tolerance*/)
 {
     return false;
 }
 
+} // anonymous namespace
+
 void simplify(geometry_t *output, geometry_t const &input, double tolerance)
 {
     output->set_srid(input.srid());
diff --git a/src/geom-pole-of-inaccessibility.cpp b/src/geom-pole-of-inaccessibility.cpp
index 35b981eac..de3bd6b66 100644
--- a/src/geom-pole-of-inaccessibility.cpp
+++ b/src/geom-pole-of-inaccessibility.cpp
@@ -39,9 +39,11 @@
 
 namespace geom {
 
+namespace {
+
 /// Get squared distance from a point p to a segment (a, b).
-static double point_to_segment_distance_squared(point_t p, point_t a, point_t b,
-                                                double stretch) noexcept
+double point_to_segment_distance_squared(point_t p, point_t a, point_t b,
+                                         double stretch) noexcept
 {
     double x = a.x();
     double y = a.y() * stretch;
@@ -68,9 +70,9 @@ static double point_to_segment_distance_squared(point_t p, point_t a, point_t b,
 }
 
 /// Get squared distance from a point p to ring.
-static bool point_to_ring_distance_squared(point_t point, ring_t const &ring,
-                                           bool inside, double stretch,
-                                           double *min_dist_squared) noexcept
+bool point_to_ring_distance_squared(point_t point, ring_t const &ring,
+                                    bool inside, double stretch,
+                                    double *min_dist_squared) noexcept
 {
     std::size_t const len = ring.size();
 
@@ -100,8 +102,8 @@ static bool point_to_ring_distance_squared(point_t point, ring_t const &ring,
  * Signed distance from point to polygon boundary. The result is negative if
  * the point is outside.
  */
-static auto point_to_polygon_distance(point_t point, polygon_t const &polygon,
-                                      double stretch)
+auto point_to_polygon_distance(point_t point, polygon_t const &polygon,
+                               double stretch)
 {
     double min_dist_squared = std::numeric_limits<double>::infinity();
 
@@ -116,8 +118,6 @@ static auto point_to_polygon_distance(point_t point, polygon_t const &polygon,
     return (inside ? 1 : -1) * std::sqrt(min_dist_squared);
 }
 
-namespace {
-
 struct Cell
 {
     static constexpr double const SQRT2 = 1.4142135623730951;
@@ -139,9 +139,7 @@ struct Cell
     }
 };
 
-} // anonymous namespace
-
-static Cell make_centroid_cell(polygon_t const &polygon, double stretch)
+Cell make_centroid_cell(polygon_t const &polygon, double stretch)
 {
     point_t centroid{0, 0};
     boost::geometry::centroid(polygon, centroid);
@@ -149,6 +147,8 @@ static Cell make_centroid_cell(polygon_t const &polygon, double stretch)
     return {centroid, 0, polygon, stretch};
 }
 
+} // anonymous namespace
+
 point_t pole_of_inaccessibility(const polygon_t &polygon, double precision,
                                 double stretch)
 {
diff --git a/src/input.cpp b/src/input.cpp
index 93aa5c61c..f23731034 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -59,6 +59,8 @@ type_id check_input(type_id const &last, osmium::OSMObject const &object)
     return check_input(last, {object.type(), object.id()});
 }
 
+namespace {
+
 /**
  * A data source is where we get the OSM objects from, one at a time. It
  * wraps the osmium::io::Reader.
@@ -173,37 +175,6 @@ class queue_element_t
 
 }; // class queue_element_t
 
-std::vector<osmium::io::File>
-prepare_input_files(std::vector<std::string> const &input_files,
-                    std::string const &input_format, bool append)
-{
-    std::vector<osmium::io::File> files;
-
-    for (auto const &filename : input_files) {
-        osmium::io::File const file{filename, input_format};
-
-        if (file.format() == osmium::io::file_format::unknown) {
-            if (input_format.empty()) {
-                throw fmt_error("Cannot detect file format for '{}'."
-                                " Try using -r.",
-                                filename);
-            }
-            throw fmt_error("Unknown file format '{}'.", input_format);
-        }
-
-        if (!append && file.has_multiple_object_versions()) {
-            throw std::runtime_error{
-                "Reading an OSM change file only works in append mode."};
-        }
-
-        log_debug("Reading file: {}", filename);
-
-        files.emplace_back(file);
-    }
-
-    return files;
-}
-
 class input_context_t
 {
 public:
@@ -261,9 +232,8 @@ class input_context_t
     bool m_append;
 }; // class input_context_t
 
-static file_info process_single_file(osmium::io::File const &file,
-                                     osmdata_t *osmdata,
-                                     progress_display_t *progress, bool append)
+file_info process_single_file(osmium::io::File const &file, osmdata_t *osmdata,
+                              progress_display_t *progress, bool append)
 {
     file_info finfo;
 
@@ -288,10 +258,9 @@ static file_info process_single_file(osmium::io::File const &file,
     return finfo;
 }
 
-static file_info
-process_multiple_files(std::vector<osmium::io::File> const &files,
-                       osmdata_t *osmdata, progress_display_t *progress,
-                       bool append)
+file_info process_multiple_files(std::vector<osmium::io::File> const &files,
+                                 osmdata_t *osmdata,
+                                 progress_display_t *progress, bool append)
 {
     file_info finfo;
 
@@ -333,6 +302,39 @@ process_multiple_files(std::vector<osmium::io::File> const &files,
     return finfo;
 }
 
+} // anonymous namespace
+
+std::vector<osmium::io::File>
+prepare_input_files(std::vector<std::string> const &input_files,
+                    std::string const &input_format, bool append)
+{
+    std::vector<osmium::io::File> files;
+
+    for (auto const &filename : input_files) {
+        osmium::io::File const file{filename, input_format};
+
+        if (file.format() == osmium::io::file_format::unknown) {
+            if (input_format.empty()) {
+                throw fmt_error("Cannot detect file format for '{}'."
+                                " Try using -r.",
+                                filename);
+            }
+            throw fmt_error("Unknown file format '{}'.", input_format);
+        }
+
+        if (!append && file.has_multiple_object_versions()) {
+            throw std::runtime_error{
+                "Reading an OSM change file only works in append mode."};
+        }
+
+        log_debug("Reading file: {}", filename);
+
+        files.emplace_back(file);
+    }
+
+    return files;
+}
+
 file_info process_files(std::vector<osmium::io::File> const &files,
                         osmdata_t *osmdata, bool append, bool show_progress)
 {
diff --git a/src/lua-utils.cpp b/src/lua-utils.cpp
index bbca3a4ed..1a28f346b 100644
--- a/src/lua-utils.cpp
+++ b/src/lua-utils.cpp
@@ -193,7 +193,9 @@ int luaX_pcall(lua_State *lua_state, int narg, int nres)
 
 #else
 
-static int pcall_error_traceback_handler(lua_State *lua_state)
+namespace {
+
+int pcall_error_traceback_handler(lua_State *lua_state)
 {
     assert(lua_state);
 
@@ -210,6 +212,8 @@ static int pcall_error_traceback_handler(lua_State *lua_state)
     return 1;
 }
 
+} // anonymous namespace
+
 /// Wrapper function for lua_pcall() showing a stack trace on error.
 int luaX_pcall(lua_State *lua_state, int narg, int nres)
 {
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index e8a0df5eb..83e229cd9 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -44,8 +44,10 @@
 #include "pgsql-helper.hpp"
 #include "util.hpp"
 
-static bool check_bucket_index(pg_conn_t const *db_connection,
-                               std::string const &prefix)
+namespace {
+
+bool check_bucket_index(pg_conn_t const *db_connection,
+                        std::string const &prefix)
 {
     auto const res =
         db_connection->exec("SELECT relname FROM pg_class"
@@ -55,7 +57,7 @@ static bool check_bucket_index(pg_conn_t const *db_connection,
     return res.num_tuples() > 0;
 }
 
-static void send_id_list(pg_conn_t const &db_connection,
+void send_id_list(pg_conn_t const &db_connection,
                          std::string const &table, idlist_t const &ids)
 {
     std::string data;
@@ -69,8 +71,8 @@ static void send_id_list(pg_conn_t const &db_connection,
     db_connection.copy_end(table);
 }
 
-static void load_id_list(pg_conn_t const &db_connection,
-                         std::string const &table, idlist_t *ids)
+void load_id_list(pg_conn_t const &db_connection, std::string const &table,
+                  idlist_t *ids)
 {
     auto const res = db_connection.exec(
         fmt::format("SELECT DISTINCT id FROM {} ORDER BY id", table));
@@ -79,7 +81,7 @@ static void load_id_list(pg_conn_t const &db_connection,
     }
 }
 
-static std::string build_sql(options_t const &options, std::string const &templ)
+std::string build_sql(options_t const &options, std::string const &templ)
 {
     std::string const using_tablespace{options.tblsslim_index.empty()
                                            ? ""
@@ -114,8 +116,8 @@ static std::string build_sql(options_t const &options, std::string const &templ)
                      : ""));
 }
 
-static std::vector<std::string>
-build_sql(options_t const &options, std::vector<std::string> const &templs)
+std::vector<std::string> build_sql(options_t const &options,
+                                   std::vector<std::string> const &templs)
 {
     std::vector<std::string> out;
     out.reserve(templs.size());
@@ -127,6 +129,8 @@ build_sql(options_t const &options, std::vector<std::string> const &templs)
     return out;
 }
 
+} // anonymous namespace
+
 middle_pgsql_t::table_desc::table_desc(options_t const &options,
                                        table_sql const &ts)
 : m_create_table(build_sql(options, ts.create_table)),
@@ -367,9 +371,7 @@ void set_attributes_on_builder(T *builder, pg_result_t const &result, int num,
     }
 }
 
-} // anonymous namespace
-
-static void tags_to_json(osmium::TagList const &tags, json_writer_t *writer)
+void tags_to_json(osmium::TagList const &tags, json_writer_t *writer)
 {
     writer->start_object();
 
@@ -382,8 +384,8 @@ static void tags_to_json(osmium::TagList const &tags, json_writer_t *writer)
     writer->end_object();
 }
 
-static void members_to_json(osmium::RelationMemberList const &members,
-                            json_writer_t *writer)
+void members_to_json(osmium::RelationMemberList const &members,
+                     json_writer_t *writer)
 {
     writer->start_array();
 
@@ -418,6 +420,8 @@ static void members_to_json(osmium::RelationMemberList const &members,
     writer->end_array();
 }
 
+} // anonymous namespace
+
 void middle_pgsql_t::copy_attributes(osmium::OSMObject const &obj)
 {
     if (obj.timestamp()) {
@@ -808,12 +812,13 @@ void middle_pgsql_t::way_set(osmium::Way const &way)
     m_db_copy.finish_line();
 }
 
+namespace {
+
 /**
  * Build way in buffer from database results.
  */
-static void build_way(osmid_t id, pg_result_t const &res, int res_num,
-                      int offset, osmium::memory::Buffer *buffer,
-                      bool with_attributes)
+void build_way(osmid_t id, pg_result_t const &res, int res_num, int offset,
+               osmium::memory::Buffer *buffer, bool with_attributes)
 {
     osmium::builder::WayBuilder builder{*buffer};
     builder.set_id(id);
@@ -825,6 +830,8 @@ static void build_way(osmid_t id, pg_result_t const &res, int res_num,
     pgsql_parse_json_tags(res.get_value(res_num, offset + 1), buffer, &builder);
 }
 
+} // anonymous namespace
+
 bool middle_query_pgsql_t::way_get(osmid_t id,
                                    osmium::memory::Buffer *buffer) const
 {
@@ -1030,14 +1037,18 @@ middle_query_pgsql_t::middle_query_pgsql_t(
     m_db_connection.set_config("max_parallel_workers_per_gather", "0");
 }
 
-static void table_setup(pg_conn_t const &db_connection,
-                        middle_pgsql_t::table_desc const &table)
+namespace {
+
+void table_setup(pg_conn_t const &db_connection,
+                 middle_pgsql_t::table_desc const &table)
 {
     log_debug("Setting up table '{}'", table.name());
     drop_table_if_exists(db_connection, table.schema(), table.name());
     table.create_table(db_connection);
 }
 
+} // anonymous namespace
+
 void middle_pgsql_t::start()
 {
     assert(m_middle_state == middle_state::constructed);
@@ -1139,7 +1150,9 @@ void middle_pgsql_t::wait()
     }
 }
 
-static table_sql sql_for_users(middle_pgsql_options const &store_options)
+namespace {
+
+table_sql sql_for_users(middle_pgsql_options const &store_options)
 {
     table_sql sql{};
 
@@ -1155,7 +1168,7 @@ static table_sql sql_for_users(middle_pgsql_options const &store_options)
     return sql;
 }
 
-static table_sql sql_for_nodes(middle_pgsql_options const &options)
+table_sql sql_for_nodes(middle_pgsql_options const &options)
 {
     table_sql sql{};
 
@@ -1183,7 +1196,7 @@ static table_sql sql_for_nodes(middle_pgsql_options const &options)
     return sql;
 }
 
-static table_sql sql_for_ways(middle_pgsql_options const &options)
+table_sql sql_for_ways(middle_pgsql_options const &options)
 {
     table_sql sql{};
 
@@ -1228,7 +1241,7 @@ static table_sql sql_for_ways(middle_pgsql_options const &options)
     return sql;
 }
 
-static table_sql sql_for_relations()
+table_sql sql_for_relations()
 {
     table_sql sql{};
 
@@ -1267,6 +1280,8 @@ static table_sql sql_for_relations()
     return sql;
 }
 
+} // anonymous namespace
+
 middle_pgsql_t::middle_pgsql_t(std::shared_ptr<thread_pool_t> thread_pool,
                                options_t const *options)
 : middle_t(std::move(thread_pool)), m_options(options),
diff --git a/src/middle-ram.cpp b/src/middle-ram.cpp
index 1f39b58f3..82170fbe0 100644
--- a/src/middle-ram.cpp
+++ b/src/middle-ram.cpp
@@ -25,6 +25,47 @@
 #include <cassert>
 #include <memory>
 
+namespace {
+
+void add_delta_encoded_way_node_list(std::string *data,
+                                     osmium::WayNodeList const &wnl)
+{
+    assert(data);
+
+    // Add number of nodes in list
+    protozero::add_varint_to_buffer(data, wnl.size());
+
+    // Add delta encoded node ids
+    osmium::DeltaEncode<osmid_t> delta;
+    for (auto const &nr : wnl) {
+        protozero::add_varint_to_buffer(
+            data, protozero::encode_zigzag64(delta.update(nr.ref())));
+    }
+}
+
+void get_delta_encoded_way_nodes_list(std::string const &data,
+                                      std::size_t offset,
+                                      osmium::builder::WayBuilder *builder)
+{
+    assert(builder);
+
+    char const *begin = data.data() + offset;
+    char const *const end = data.data() + data.size();
+
+    auto count = protozero::decode_varint(&begin, end);
+
+    osmium::DeltaDecode<osmid_t> delta;
+    osmium::builder::WayNodeListBuilder wnl_builder{*builder};
+    while (count > 0) {
+        auto const val =
+            protozero::decode_zigzag64(protozero::decode_varint(&begin, end));
+        wnl_builder.add_node_ref(delta.update(val));
+        --count;
+    }
+}
+
+} // anonymous namespace
+
 middle_ram_t::middle_ram_t(std::shared_ptr<thread_pool_t> thread_pool,
                            options_t const *options)
 : middle_t(std::move(thread_pool))
@@ -133,22 +174,6 @@ bool middle_ram_t::get_object(osmium::item_type type, osmid_t id,
     return true;
 }
 
-static void add_delta_encoded_way_node_list(std::string *data,
-                                            osmium::WayNodeList const &wnl)
-{
-    assert(data);
-
-    // Add number of nodes in list
-    protozero::add_varint_to_buffer(data, wnl.size());
-
-    // Add delta encoded node ids
-    osmium::DeltaEncode<osmid_t> delta;
-    for (auto const &nr : wnl) {
-        protozero::add_varint_to_buffer(
-            data, protozero::encode_zigzag64(delta.update(nr.ref())));
-    }
-}
-
 void middle_ram_t::node(osmium::Node const &node)
 {
     assert(m_middle_state == middle_state::node);
@@ -233,27 +258,6 @@ bool middle_ram_t::way_get(osmid_t id, osmium::memory::Buffer *buffer) const
     return false;
 }
 
-static void
-get_delta_encoded_way_nodes_list(std::string const &data, std::size_t offset,
-                                 osmium::builder::WayBuilder *builder)
-{
-    assert(builder);
-
-    char const *begin = data.data() + offset;
-    char const *const end = data.data() + data.size();
-
-    auto count = protozero::decode_varint(&begin, end);
-
-    osmium::DeltaDecode<osmid_t> delta;
-    osmium::builder::WayNodeListBuilder wnl_builder{*builder};
-    while (count > 0) {
-        auto const val =
-            protozero::decode_zigzag64(protozero::decode_varint(&begin, end));
-        wnl_builder.add_node_ref(delta.update(val));
-        --count;
-    }
-}
-
 std::size_t
 middle_ram_t::rel_members_get(osmium::Relation const &rel,
                               osmium::memory::Buffer *buffer,
diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
index f6bb541bd..b8d7ff510 100644
--- a/src/osm2pgsql.cpp
+++ b/src/osm2pgsql.cpp
@@ -28,12 +28,14 @@
 #include <memory>
 #include <utility>
 
+namespace {
+
 /**
  * Output overall memory usage as debug message.
  *
  * This only works on Linux.
  */
-static void show_memory_usage()
+void show_memory_usage()
 {
     osmium::MemoryUsage const mem;
     if (mem.peak() != 0) {
@@ -42,7 +44,7 @@ static void show_memory_usage()
     }
 }
 
-static file_info run(options_t const &options)
+file_info run(options_t const &options)
 {
     auto const files = prepare_input_files(
         options.input_files, options.input_format, options.append);
@@ -75,7 +77,7 @@ static file_info run(options_t const &options)
     return finfo;
 }
 
-static void check_db(options_t const &options)
+void check_db(options_t const &options)
 {
     pg_conn_t const db_connection{options.connection_params, "check"};
 
@@ -92,7 +94,7 @@ static void check_db(options_t const &options)
 }
 
 // This is called in "create" mode to store properties into the database.
-static void store_properties(properties_t *properties, options_t const &options)
+void store_properties(properties_t *properties, options_t const &options)
 {
     properties->set_bool("attributes", options.extra_attributes);
 
@@ -123,8 +125,7 @@ static void store_properties(properties_t *properties, options_t const &options)
     properties->store();
 }
 
-static void store_data_properties(properties_t *properties,
-                                  file_info const &finfo)
+void store_data_properties(properties_t *properties, file_info const &finfo)
 {
     if (finfo.last_timestamp.valid()) {
         auto const timestamp = finfo.last_timestamp.to_iso();
@@ -142,7 +143,7 @@ static void store_data_properties(properties_t *properties,
     properties->store();
 }
 
-static void check_updatable(properties_t const &properties)
+void check_updatable(properties_t const &properties)
 {
     if (properties.get_bool("updatable", false)) {
         return;
@@ -153,7 +154,7 @@ static void check_updatable(properties_t const &properties)
         " updatable database use --slim (without --drop)."};
 }
 
-static void check_attributes(properties_t const &properties, options_t *options)
+void check_attributes(properties_t const &properties, options_t *options)
 {
     bool const with_attributes = properties.get_bool("attributes", false);
 
@@ -172,8 +173,8 @@ static void check_attributes(properties_t const &properties, options_t *options)
     }
 }
 
-static void check_and_update_flat_node_file(properties_t *properties,
-                                            options_t *options)
+void check_and_update_flat_node_file(properties_t *properties,
+                                     options_t *options)
 {
     auto const flat_node_file_from_import =
         properties->get_string("flat_node_file", "");
@@ -210,7 +211,7 @@ static void check_and_update_flat_node_file(properties_t *properties,
     }
 }
 
-static void check_prefix(properties_t const &properties, options_t *options)
+void check_prefix(properties_t const &properties, options_t *options)
 {
     auto const prefix = properties.get_string("prefix", "planet_osm");
     if (!options->prefix_is_set) {
@@ -226,7 +227,7 @@ static void check_prefix(properties_t const &properties, options_t *options)
     }
 }
 
-static void check_db_format(properties_t const &properties, options_t *options)
+void check_db_format(properties_t const &properties, options_t *options)
 {
     auto const format = properties.get_int("db_format", -1);
 
@@ -243,7 +244,7 @@ static void check_db_format(properties_t const &properties, options_t *options)
     options->middle_database_format = static_cast<uint8_t>(format);
 }
 
-static void check_output(properties_t const &properties, options_t *options)
+void check_output(properties_t const &properties, options_t *options)
 {
     auto const output = properties.get_string("output", "pgsql");
 
@@ -262,8 +263,7 @@ static void check_output(properties_t const &properties, options_t *options)
                     options->output_backend, output);
 }
 
-static void check_and_update_style_file(properties_t *properties,
-                                        options_t *options)
+void check_and_update_style_file(properties_t *properties, options_t *options)
 {
     auto const style_file_from_import = properties->get_string("style", "");
 
@@ -296,8 +296,7 @@ static void check_and_update_style_file(properties_t *properties,
 
 // This is called in "append" mode to check that the command line options are
 // compatible with the properties stored in the database.
-static void check_and_update_properties(properties_t *properties,
-                                        options_t *options)
+void check_and_update_properties(properties_t *properties, options_t *options)
 {
     check_updatable(*properties);
     check_attributes(*properties, options);
@@ -308,7 +307,7 @@ static void check_and_update_properties(properties_t *properties,
     check_and_update_style_file(properties, options);
 }
 
-static void set_option_defaults(options_t *options)
+void set_option_defaults(options_t *options)
 {
     if (options->output_backend.empty()) {
         options->output_backend = "pgsql";
@@ -325,6 +324,8 @@ static void set_option_defaults(options_t *options)
     }
 }
 
+} // anonymous namespace
+
 // NOLINTNEXTLINE(bugprone-exception-escape)
 int main(int argc, char *argv[])
 {
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 290dc9d98..6c7e6f68c 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -122,9 +122,11 @@ prepared_lua_function_t::prepared_lua_function_t(lua_State *lua_state,
     throw fmt_error("osm2pgsql.{} must be a function.", name);
 }
 
-static void push_osm_object_to_lua_stack(lua_State *lua_state,
-                                         osmium::OSMObject const &object,
-                                         bool with_attributes)
+namespace {
+
+void push_osm_object_to_lua_stack(lua_State *lua_state,
+                                  osmium::OSMObject const &object,
+                                  bool with_attributes)
 {
     assert(lua_state);
 
@@ -200,13 +202,103 @@ static void push_osm_object_to_lua_stack(lua_State *lua_state,
  * Helper function to push the lon/lat of the specified location onto the
  * Lua stack
  */
-static void push_location(lua_State *lua_state,
-                          osmium::Location location) noexcept
+void push_location(lua_State *lua_state, osmium::Location location) noexcept
 {
     lua_pushnumber(lua_state, location.lon());
     lua_pushnumber(lua_state, location.lat());
 }
 
+// Check that the first element on the Lua stack is a "type_name"
+// parameter and return its internal index.
+std::size_t idx_from_param(lua_State *lua_state, char const *type_name)
+{
+    assert(lua_gettop(lua_state) >= 1);
+
+    void const *const user_data = lua_touserdata(lua_state, 1);
+
+    if (user_data == nullptr || !lua_getmetatable(lua_state, 1)) {
+        throw fmt_error("First parameter must be of type {}.", type_name);
+    }
+
+    luaL_getmetatable(lua_state, type_name);
+    if (!lua_rawequal(lua_state, -1, -2)) {
+        throw fmt_error("First parameter must be of type {}.", type_name);
+    }
+    lua_pop(lua_state, 2); // remove the two metatables
+
+    return *static_cast<std::size_t const *>(user_data);
+}
+
+template <typename CONTAINER>
+typename CONTAINER::value_type const &get_from_idx_param(lua_State *lua_state,
+                                                         CONTAINER *container,
+                                                         char const *type_name)
+{
+    if (lua_gettop(lua_state) != 1) {
+        throw fmt_error("Need exactly one parameter of type {}.", type_name);
+    }
+
+    auto const &item = container->at(idx_from_param(lua_state, type_name));
+    lua_remove(lua_state, 1);
+    return item;
+}
+
+std::size_t get_nodes(middle_query_t const &middle, osmium::Way *way)
+{
+    constexpr std::size_t const max_missing_nodes = 100;
+    static std::size_t count_missing_nodes = 0;
+
+    auto const count = middle.nodes_get_list(&way->nodes());
+
+    if (count_missing_nodes <= max_missing_nodes &&
+        count != way->nodes().size()) {
+        util::string_joiner_t id_list{','};
+        for (auto const &nr : way->nodes()) {
+            if (!nr.location().valid()) {
+                id_list.add(fmt::to_string(nr.ref()));
+                ++count_missing_nodes;
+            }
+        }
+
+        log_debug("Missing nodes in way {}: {}", way->id(), id_list());
+
+        if (count_missing_nodes > max_missing_nodes) {
+            log_debug("Reported more than {} missing nodes, no further missing "
+                      "nodes will be reported!",
+                      max_missing_nodes);
+        }
+    }
+
+    return count;
+}
+
+void flush_tables(std::vector<table_connection_t> &table_connections)
+{
+    for (auto &table : table_connections) {
+        table.flush();
+    }
+}
+
+void create_expire_tables(std::vector<expire_output_t> const &expire_outputs,
+                          connection_params_t const &connection_params)
+{
+    if (std::all_of(expire_outputs.begin(), expire_outputs.end(),
+                    [](auto const &expire_output) {
+                        return expire_output.table().empty();
+                    })) {
+        return;
+    }
+
+    pg_conn_t const connection{connection_params, "out.flex.expire"};
+    for (auto const &expire_output : expire_outputs) {
+        if (!expire_output.table().empty()) {
+            expire_output.create_output_table(connection);
+        }
+    }
+}
+
+} // anonymous namespace
+
 /**
  * Helper function checking that Lua function "name" is called in the correct
  * context and without parameters.
@@ -420,41 +512,6 @@ int output_flex_t::app_define_expire_output()
                                     m_expire_outputs.get());
 }
 
-// Check that the first element on the Lua stack is a "type_name"
-// parameter and return its internal index.
-static std::size_t idx_from_param(lua_State *lua_state, char const *type_name)
-{
-    assert(lua_gettop(lua_state) >= 1);
-
-    void const *const user_data = lua_touserdata(lua_state, 1);
-
-    if (user_data == nullptr || !lua_getmetatable(lua_state, 1)) {
-        throw fmt_error("First parameter must be of type {}.", type_name);
-    }
-
-    luaL_getmetatable(lua_state, type_name);
-    if (!lua_rawequal(lua_state, -1, -2)) {
-        throw fmt_error("First parameter must be of type {}.", type_name);
-    }
-    lua_pop(lua_state, 2); // remove the two metatables
-
-    return *static_cast<std::size_t const *>(user_data);
-}
-
-template <typename CONTAINER>
-static typename CONTAINER::value_type const &
-get_from_idx_param(lua_State *lua_state, CONTAINER *container,
-                   char const *type_name)
-{
-    if (lua_gettop(lua_state) != 1) {
-        throw fmt_error("Need exactly one parameter of type {}.", type_name);
-    }
-
-    auto const &item = container->at(idx_from_param(lua_state, type_name));
-    lua_remove(lua_state, 1);
-    return item;
-}
-
 flex_table_t const &output_flex_t::get_table_from_param()
 {
     return get_from_idx_param(lua_state(), m_tables.get(),
@@ -497,35 +554,6 @@ void output_flex_t::way_cache_t::init(osmium::Way *way)
     m_way = way;
 }
 
-static std::size_t get_nodes(middle_query_t const &middle, osmium::Way *way)
-{
-    constexpr std::size_t const max_missing_nodes = 100;
-    static std::size_t count_missing_nodes = 0;
-
-    auto const count = middle.nodes_get_list(&way->nodes());
-
-    if (count_missing_nodes <= max_missing_nodes &&
-        count != way->nodes().size()) {
-        util::string_joiner_t id_list{','};
-        for (auto const &nr : way->nodes()) {
-            if (!nr.location().valid()) {
-                id_list.add(fmt::to_string(nr.ref()));
-                ++count_missing_nodes;
-            }
-        }
-
-        log_debug("Missing nodes in way {}: {}", way->id(), id_list());
-
-        if (count_missing_nodes > max_missing_nodes) {
-            log_debug("Reported more than {} missing nodes, no further missing "
-                      "nodes will be reported!",
-                      max_missing_nodes);
-        }
-    }
-
-    return count;
-}
-
 std::size_t output_flex_t::way_cache_t::add_nodes(middle_query_t const &middle)
 {
     if (m_num_way_nodes == std::numeric_limits<std::size_t>::max()) {
@@ -931,13 +959,6 @@ void output_flex_t::sync()
     }
 }
 
-static void flush_tables(std::vector<table_connection_t> &table_connections)
-{
-    for (auto &table : table_connections) {
-        table.flush();
-    }
-}
-
 void output_flex_t::after_nodes() { flush_tables(m_table_connections); }
 
 void output_flex_t::after_ways() { flush_tables(m_table_connections); }
@@ -1106,25 +1127,6 @@ void output_flex_t::start()
     }
 }
 
-static void
-create_expire_tables(std::vector<expire_output_t> const &expire_outputs,
-                     connection_params_t const &connection_params)
-{
-    if (std::all_of(expire_outputs.begin(), expire_outputs.end(),
-                    [](auto const &expire_output) {
-                        return expire_output.table().empty();
-                    })) {
-        return;
-    }
-
-    pg_conn_t const connection{connection_params, "out.flex.expire"};
-    for (auto const &expire_output : expire_outputs) {
-        if (!expire_output.table().empty()) {
-            expire_output.create_output_table(connection);
-        }
-    }
-}
-
 output_flex_t::output_flex_t(output_flex_t const *other,
                              std::shared_ptr<middle_query_t> mid,
                              std::shared_ptr<db_copy_thread_t> copy_thread)
@@ -1211,10 +1213,12 @@ output_flex_t::output_flex_t(std::shared_ptr<middle_query_t> const &mid,
     create_expire_tables(*m_expire_outputs, get_options()->connection_params);
 }
 
+namespace {
+
 /**
  * Define the osm2pgsql.Table class/metatable.
  */
-static void init_table_class(lua_State *lua_state)
+void init_table_class(lua_State *lua_state)
 {
     lua_getglobal(lua_state, "osm2pgsql");
     if (luaL_newmetatable(lua_state, osm2pgsql_table_name) != 1) {
@@ -1241,7 +1245,7 @@ static void init_table_class(lua_State *lua_state)
 /**
  * Define the osm2pgsql.ExpireOutput class/metatable.
  */
-static void init_expire_output_class(lua_State *lua_state)
+void init_expire_output_class(lua_State *lua_state)
 {
     lua_getglobal(lua_state, "osm2pgsql");
     if (luaL_newmetatable(lua_state, osm2pgsql_expire_output_name) != 1) {
@@ -1270,6 +1274,8 @@ static void init_expire_output_class(lua_State *lua_state)
     lua_pop(lua_state, 2);
 }
 
+} // anonymous namespace
+
 void output_flex_t::init_lua(std::string const &filename)
 {
     m_lua_state.reset(luaL_newstate(),
diff --git a/src/output-pgsql.cpp b/src/output-pgsql.cpp
index cf4274071..9a8b34d06 100644
--- a/src/output-pgsql.cpp
+++ b/src/output-pgsql.cpp
@@ -45,9 +45,10 @@
 #include "wildcmp.hpp"
 #include "wkb.hpp"
 
-static double calculate_area(bool reproject_area,
-                             geom::geometry_t const &geom4326,
-                             geom::geometry_t const &projected_geom)
+namespace {
+
+double calculate_area(bool reproject_area, geom::geometry_t const &geom4326,
+                      geom::geometry_t const &projected_geom)
 {
     static thread_local auto const proj3857 =
         reprojection::create_projection(3857);
@@ -59,6 +60,37 @@ static double calculate_area(bool reproject_area,
     return geom::area(projected_geom);
 }
 
+// The roles of all available member ways of a relation are available in the
+// Lua "filter_tags_relation_member" callback function. This function extracts
+// the roles from all ways in the buffer and returns the list.
+rolelist_t get_rolelist(osmium::Relation const &rel,
+                        osmium::memory::Buffer const &buffer)
+{
+    rolelist_t roles;
+
+    auto it = buffer.select<osmium::Way>().cbegin();
+    auto const end = buffer.select<osmium::Way>().cend();
+
+    if (it == end) {
+        return roles;
+    }
+
+    for (auto const &member : rel.members()) {
+        if (member.type() == osmium::item_type::way &&
+            member.ref() == it->id()) {
+            roles.emplace_back(member.role());
+            ++it;
+            if (it == end) {
+                break;
+            }
+        }
+    }
+
+    return roles;
+}
+
+} // anonymous namespace
+
 void output_pgsql_t::pgsql_out_way(osmium::Way const &way, taglist_t *tags,
                                    bool polygon, bool roads)
 {
@@ -203,35 +235,6 @@ void output_pgsql_t::way_add(osmium::Way *way)
     }
 }
 
-// The roles of all available member ways of a relation are available in the
-// Lua "filter_tags_relation_member" callback function. This function extracts
-// the roles from all ways in the buffer and returns the list.
-static rolelist_t get_rolelist(osmium::Relation const &rel,
-                               osmium::memory::Buffer const &buffer)
-{
-    rolelist_t roles;
-
-    auto it = buffer.select<osmium::Way>().cbegin();
-    auto const end = buffer.select<osmium::Way>().cend();
-
-    if (it == end) {
-        return roles;
-    }
-
-    for (auto const &member : rel.members()) {
-        if (member.type() == osmium::item_type::way &&
-            member.ref() == it->id()) {
-            roles.emplace_back(member.role());
-            ++it;
-            if (it == end) {
-                break;
-            }
-        }
-    }
-
-    return roles;
-}
-
 /* This is the workhorse of pgsql_add_relation, split out because it is used as the callback for iterate relations */
 void output_pgsql_t::pgsql_process_relation(osmium::Relation const &rel)
 {
diff --git a/src/pgsql-capabilities.cpp b/src/pgsql-capabilities.cpp
index 8123b7478..6ea96e737 100644
--- a/src/pgsql-capabilities.cpp
+++ b/src/pgsql-capabilities.cpp
@@ -16,21 +16,26 @@
 
 #include <stdexcept>
 
-static database_capabilities_t &capabilities() noexcept
+namespace {
+
+database_capabilities_t &capabilities() noexcept
 {
     static database_capabilities_t c;
     return c;
 }
 
+} // anonymous namespace
+
 database_capabilities_t &database_capabilities_for_testing() noexcept
 {
     return capabilities();
 }
 
-static void init_set_from_query(std::set<std::string> *set,
-                                pg_conn_t const &db_connection,
-                                char const *table, char const *column,
-                                char const *condition = "true")
+namespace {
+
+void init_set_from_query(std::set<std::string> *set,
+                         pg_conn_t const &db_connection, char const *table,
+                         char const *column, char const *condition = "true")
 {
     set->clear(); // Clear existing in case this is called multiple times
 
@@ -42,7 +47,7 @@ static void init_set_from_query(std::set<std::string> *set,
 }
 
 /// Get all config settings from the database.
-static void init_settings(pg_conn_t const &db_connection)
+void init_settings(pg_conn_t const &db_connection)
 {
     capabilities().settings.clear(); // In case this is called multiple times
 
@@ -54,7 +59,7 @@ static void init_settings(pg_conn_t const &db_connection)
     }
 }
 
-static void init_database_name(pg_conn_t const &db_connection)
+void init_database_name(pg_conn_t const &db_connection)
 {
     auto const res = db_connection.exec("SELECT current_catalog");
 
@@ -66,7 +71,7 @@ static void init_database_name(pg_conn_t const &db_connection)
     capabilities().database_name = res.get(0, 0);
 }
 
-static void init_postgis_version(pg_conn_t const &db_connection)
+void init_postgis_version(pg_conn_t const &db_connection)
 {
     auto const res = db_connection.exec(
         "SELECT regexp_split_to_table(extversion, '\\.') FROM"
@@ -84,6 +89,8 @@ static void init_postgis_version(pg_conn_t const &db_connection)
                               std::stoi(std::string{res.get(1, 0)})};
 }
 
+} // anonymous namespace
+
 void init_database_capabilities(pg_conn_t const &db_connection)
 {
     init_settings(db_connection);
diff --git a/src/pgsql.cpp b/src/pgsql.cpp
index 5b1637486..04c5c033d 100644
--- a/src/pgsql.cpp
+++ b/src/pgsql.cpp
@@ -28,8 +28,10 @@ std::size_t pg_result_t::affected_rows() const noexcept
 
 std::atomic<std::uint32_t> pg_conn_t::connection_id{0};
 
-static PGconn *open_connection(connection_params_t const &connection_params,
-                               std::string_view context, std::uint32_t id)
+namespace {
+
+PGconn *open_connection(connection_params_t const &connection_params,
+                        std::string_view context, std::uint32_t id)
 {
     std::vector<char const *> keywords;
     std::vector<char const *> values;
@@ -49,6 +51,19 @@ static PGconn *open_connection(connection_params_t const &connection_params,
     return PQconnectdbParams(keywords.data(), values.data(), 1);
 }
 
+std::string concat_params(int num_params, char const *const *param_values)
+{
+    util::string_joiner_t joiner{','};
+
+    for (int i = 0; i < num_params; ++i) {
+        joiner.add(param_values[i] ? param_values[i] : "<NULL>");
+    }
+
+    return joiner();
+}
+
+} // anonymous namespace
+
 pg_conn_t::pg_conn_t(connection_params_t const &connection_params,
                      std::string_view context)
 : m_connection_id(connection_id.fetch_add(1))
@@ -179,18 +194,6 @@ void pg_conn_t::copy_end(std::string_view context) const
     }
 }
 
-static std::string concat_params(int num_params,
-                                 char const *const *param_values)
-{
-    util::string_joiner_t joiner{','};
-
-    for (int i = 0; i < num_params; ++i) {
-        joiner.add(param_values[i] ? param_values[i] : "<NULL>");
-    }
-
-    return joiner();
-}
-
 pg_result_t pg_conn_t::exec_prepared_internal(char const *stmt, int num_params,
                                               char const *const *param_values,
                                               int *param_lengths,
diff --git a/src/progress-display.cpp b/src/progress-display.cpp
index 5fd21a290..ae8aa946d 100644
--- a/src/progress-display.cpp
+++ b/src/progress-display.cpp
@@ -12,7 +12,9 @@
 #include "progress-display.hpp"
 #include "util.hpp"
 
-static double count_per_second(std::size_t count, uint64_t elapsed) noexcept
+namespace {
+
+double count_per_second(std::size_t count, uint64_t elapsed) noexcept
 {
     if (count == 0) {
         return 0.0;
@@ -25,7 +27,7 @@ static double count_per_second(std::size_t count, uint64_t elapsed) noexcept
     return static_cast<double>(count) / static_cast<double>(elapsed);
 }
 
-static std::string cps_display(std::size_t count, uint64_t elapsed)
+std::string cps_display(std::size_t count, uint64_t elapsed)
 {
     double const cps = count_per_second(count, elapsed);
 
@@ -35,6 +37,8 @@ static std::string cps_display(std::size_t count, uint64_t elapsed)
     return fmt::format("{:.0f}/s", cps);
 }
 
+} // anonymous namespace
+
 void progress_display_t::print_summary() const
 {
     std::time_t const now = std::time(nullptr);
diff --git a/src/taginfo.cpp b/src/taginfo.cpp
index 45be7186d..64e7e34f5 100644
--- a/src/taginfo.cpp
+++ b/src/taginfo.cpp
@@ -64,10 +64,12 @@ unsigned parse_tag_flags(std::string const &flags, int lineno)
     return temp_flags;
 }
 
+namespace {
+
 /**
  * Get the tag type. For unknown types, 0 will be returned.
  */
-static unsigned get_tag_type(std::string const &tag)
+unsigned get_tag_type(std::string const &tag)
 {
     static std::map<std::string, unsigned> const tagtypes = {
         {"smallint", FLAG_INT_TYPE}, {"integer", FLAG_INT_TYPE},
@@ -83,6 +85,8 @@ static unsigned get_tag_type(std::string const &tag)
     return 0;
 }
 
+} // anonymous namespace
+
 bool read_style_file(std::string const &filename, export_list *exlist)
 {
     bool enable_way_area = true;
diff --git a/src/tagtransform-c.cpp b/src/tagtransform-c.cpp
index e606d2915..9e96f949f 100644
--- a/src/tagtransform-c.cpp
+++ b/src/tagtransform-c.cpp
@@ -44,9 +44,7 @@ constexpr std::array<layers_type, 25> const layers = {
      {"primary", 37, true},        {"trunk", 38, true},
      {"motorway", 39, true}}};
 
-} // anonymous namespace
-
-static void add_z_order(taglist_t *tags, bool *roads)
+void add_z_order(taglist_t *tags, bool *roads)
 {
     std::string const *const layer = tags->get("layer");
     std::string const *const highway = tags->get("highway");
@@ -91,6 +89,13 @@ static void add_z_order(taglist_t *tags, bool *roads)
     tags->add_tag("z_order", fmt::to_string(z_order));
 }
 
+bool starts_with(char const *input, std::string const &test) noexcept
+{
+    return std::strncmp(input, test.c_str(), test.size()) == 0;
+}
+
+} // anonymous namespace
+
 c_tagtransform_t::c_tagtransform_t(options_t const *options, export_list exlist)
 : m_options(options), m_export_list(std::move(exlist))
 {}
@@ -100,11 +105,6 @@ std::unique_ptr<tagtransform_t> c_tagtransform_t::clone() const
     return std::make_unique<c_tagtransform_t>(m_options, m_export_list);
 }
 
-static bool starts_with(char const *input, std::string const& test) noexcept
-{
-    return std::strncmp(input, test.c_str(), test.size()) == 0;
-}
-
 bool c_tagtransform_t::check_key(std::vector<taginfo> const &infos,
                                  char const *k, bool *filter,
                                  unsigned int *flags)
diff --git a/src/tagtransform-lua.cpp b/src/tagtransform-lua.cpp
index 95eb99715..2f69b7f93 100644
--- a/src/tagtransform-lua.cpp
+++ b/src/tagtransform-lua.cpp
@@ -45,10 +45,12 @@ void lua_tagtransform_t::check_lua_function_exists(char const *func_name)
     lua_pop(lua_state(), 1);
 }
 
+namespace {
+
 /**
  * Read tags from the Lua table on the stack and write them to out_tags
  */
-static void get_out_tags(lua_State *lua_state, taglist_t *out_tags)
+void get_out_tags(lua_State *lua_state, taglist_t *out_tags)
 {
     luaX_for_each(lua_state, [&]() {
         auto const key_type = lua_type(lua_state, -2);
@@ -77,6 +79,8 @@ static void get_out_tags(lua_State *lua_state, taglist_t *out_tags)
     lua_pop(lua_state, 1);
 }
 
+} // anonymous namespace
+
 bool lua_tagtransform_t::filter_tags(osmium::OSMObject const &o, bool *polygon,
                                      bool *roads, taglist_t *out_tags)
 {
diff --git a/src/tile.cpp b/src/tile.cpp
index 3351ed75e..8b5c2a443 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -28,10 +28,12 @@ geom::point_t tile_t::center() const noexcept
     return to_world_coords({0.5, 0.5}, 1);
 }
 
+namespace {
+
 // Quadkey implementation uses bit interleaving code from
 // https://github.com/lemire/Code-used-on-Daniel-Lemire-s-blog/blob/master/2018/01/08/interleave.c
 
-static uint64_t interleave_uint32_with_zeros(uint32_t input) noexcept
+uint64_t interleave_uint32_with_zeros(uint32_t input) noexcept
 {
     uint64_t word = input;
     word = (word ^ (word << 16U)) & 0x0000ffff0000ffffULL;
@@ -42,7 +44,7 @@ static uint64_t interleave_uint32_with_zeros(uint32_t input) noexcept
     return word;
 }
 
-static uint32_t deinterleave_lowuint32(uint64_t word) noexcept
+uint32_t deinterleave_lowuint32(uint64_t word) noexcept
 {
     word &= 0x5555555555555555ULL;
     word = (word ^ (word >> 1U)) & 0x3333333333333333ULL;
@@ -53,6 +55,8 @@ static uint32_t deinterleave_lowuint32(uint64_t word) noexcept
     return static_cast<uint32_t>(word);
 }
 
+} // anonymous namespace
+
 quadkey_t tile_t::quadkey() const noexcept
 {
     return quadkey_t{interleave_uint32_with_zeros(m_x) |

From 728a92dd601670423c563a8eaa6aa87e5909bfb9 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 24 Sep 2023 21:13:58 +0200
Subject: [PATCH 149/430] Make properties available in Lua in
 osm2pgsql.properties

---
 src/osm2pgsql.cpp                 |  8 ++++----
 src/output-flex.cpp               | 17 ++++++++++++++---
 src/output-flex.hpp               |  4 ++--
 src/output.cpp                    |  5 +++--
 src/output.hpp                    |  3 ++-
 src/properties.hpp                |  6 ++++++
 tests/bdd/flex/lua-basics.feature | 19 +++++++++++++++++++
 tests/common-import.hpp           | 11 +++++++++--
 8 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
index b8d7ff510..26bdc47f7 100644
--- a/src/osm2pgsql.cpp
+++ b/src/osm2pgsql.cpp
@@ -44,7 +44,7 @@ void show_memory_usage()
     }
 }
 
-file_info run(options_t const &options)
+file_info run(options_t const &options, properties_t const &properties)
 {
     auto const files = prepare_input_files(
         options.input_files, options.input_format, options.append);
@@ -57,7 +57,7 @@ file_info run(options_t const &options)
     middle->start();
 
     auto output = output_t::create_output(middle->get_query_instance(),
-                                          thread_pool, options);
+                                          thread_pool, options, properties);
 
     middle->set_requirements(output->get_requirements());
 
@@ -357,7 +357,7 @@ int main(int argc, char *argv[])
 
             check_and_update_properties(&properties, &options);
 
-            auto const finfo = run(options);
+            auto const finfo = run(options, properties);
 
             if (finfo.last_timestamp.valid()) {
                 auto const current_timestamp =
@@ -373,7 +373,7 @@ int main(int argc, char *argv[])
         } else {
             set_option_defaults(&options);
             store_properties(&properties, options);
-            auto const finfo = run(options);
+            auto const finfo = run(options, properties);
             store_data_properties(&properties, finfo);
         }
 
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 6c7e6f68c..e43e0312a 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -30,6 +30,7 @@
 #include "output-flex.hpp"
 #include "pgsql.hpp"
 #include "pgsql-capabilities.hpp"
+#include "properties.hpp"
 #include "reprojection.hpp"
 #include "thread-pool.hpp"
 #include "util.hpp"
@@ -1159,12 +1160,13 @@ output_flex_t::clone(std::shared_ptr<middle_query_t> const &mid,
 
 output_flex_t::output_flex_t(std::shared_ptr<middle_query_t> const &mid,
                              std::shared_ptr<thread_pool_t> thread_pool,
-                             options_t const &options)
+                             options_t const &options,
+                             properties_t const &properties)
 : output_t(mid, std::move(thread_pool), options),
   m_db_connection(get_options()->connection_params, "out.flex.main"),
   m_copy_thread(std::make_shared<db_copy_thread_t>(options.connection_params))
 {
-    init_lua(options.style);
+    init_lua(options.style, properties);
 
     // If the osm2pgsql.select_relation_members() Lua function is defined
     // it means we need two-stage processing which in turn means we need
@@ -1276,7 +1278,8 @@ void init_expire_output_class(lua_State *lua_state)
 
 } // anonymous namespace
 
-void output_flex_t::init_lua(std::string const &filename)
+void output_flex_t::init_lua(std::string const &filename,
+                             properties_t const &properties)
 {
     m_lua_state.reset(luaL_newstate(),
                       [](lua_State *state) { lua_close(state); });
@@ -1285,6 +1288,14 @@ void output_flex_t::init_lua(std::string const &filename)
 
     luaX_add_table_int(lua_state(), "stage", 1);
 
+    lua_pushstring(lua_state(), "properties");
+    lua_createtable(lua_state(), 0, (int)properties.size());
+    for (auto const &property : properties) {
+        luaX_add_table_str(lua_state(), property.first.c_str(),
+                           property.second.c_str());
+    }
+    lua_rawset(lua_state(), -3);
+
     luaX_add_table_func(lua_state(), "define_table",
                         lua_trampoline_app_define_table);
 
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index e88c20b6f..cc05b6ebc 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -98,7 +98,7 @@ class output_flex_t : public output_t
     /// Constructor for new objects
     output_flex_t(std::shared_ptr<middle_query_t> const &mid,
                   std::shared_ptr<thread_pool_t> thread_pool,
-                  options_t const &options);
+                  options_t const &options, properties_t const &properties);
 
     /// Constructor for cloned objects
     output_flex_t(output_flex_t const *other,
@@ -192,7 +192,7 @@ class output_flex_t : public output_t
     void get_mutex_and_call_lua_function(prepared_lua_function_t func,
                                          osmium::OSMObject const &object);
 
-    void init_lua(std::string const &filename);
+    void init_lua(std::string const &filename, properties_t const &properties);
 
     // Get the flex table that is as first parameter on the Lua stack.
     flex_table_t const &get_table_from_param();
diff --git a/src/output.cpp b/src/output.cpp
index da3490114..005689b40 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -23,7 +23,8 @@
 std::shared_ptr<output_t>
 output_t::create_output(std::shared_ptr<middle_query_t> const &mid,
                         std::shared_ptr<thread_pool_t> thread_pool,
-                        options_t const &options)
+                        options_t const &options,
+                        properties_t const &properties)
 {
     if (options.output_backend == "pgsql") {
         return std::make_shared<output_pgsql_t>(mid, std::move(thread_pool),
@@ -32,7 +33,7 @@ output_t::create_output(std::shared_ptr<middle_query_t> const &mid,
 
     if (options.output_backend == "flex") {
         return std::make_shared<output_flex_t>(mid, std::move(thread_pool),
-                                               options);
+                                               options, properties);
     }
 
     if (options.output_backend == "null") {
diff --git a/src/output.hpp b/src/output.hpp
index a20e78f9c..ac807e425 100644
--- a/src/output.hpp
+++ b/src/output.hpp
@@ -22,6 +22,7 @@
 #include "output-requirements.hpp"
 
 class db_copy_thread_t;
+class properties_t;
 class thread_pool_t;
 
 struct middle_query_t;
@@ -34,7 +35,7 @@ class output_t
     static std::shared_ptr<output_t>
     create_output(std::shared_ptr<middle_query_t> const &mid,
                   std::shared_ptr<thread_pool_t> thread_pool,
-                  options_t const &options);
+                  options_t const &options, properties_t const &properties);
 
     output_t(output_t const &) = default;
     output_t &operator=(output_t const &) = default;
diff --git a/src/properties.hpp b/src/properties.hpp
index f8339da9f..3828628be 100644
--- a/src/properties.hpp
+++ b/src/properties.hpp
@@ -39,6 +39,8 @@ class properties_t
      */
     properties_t(connection_params_t connection_params, std::string schema);
 
+    std::size_t size() const noexcept { return m_properties.size(); }
+
     std::string get_string(std::string const &property,
                            std::string const &default_value) const;
 
@@ -93,6 +95,10 @@ class properties_t
      */
     bool load();
 
+    auto begin() const { return m_properties.begin(); }
+
+    auto end() const { return m_properties.end(); }
+
 private:
     std::string table_name() const;
 
diff --git a/tests/bdd/flex/lua-basics.feature b/tests/bdd/flex/lua-basics.feature
index b8d68923a..35bf38db4 100644
--- a/tests/bdd/flex/lua-basics.feature
+++ b/tests/bdd/flex/lua-basics.feature
@@ -26,3 +26,22 @@ Feature: Flex output uses a Lua config file
             """
             Table=table
             """
+
+    Scenario: Check access to osm2pgsql properties from Lua
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            local p = osm2pgsql.properties
+            print("attributes=" .. p.attributes)
+            print("prefix=" .. p.prefix)
+            """
+        Then running osm2pgsql flex fails
+        And the standard output contains
+            """
+            attributes=false
+            """
+        And the standard output contains
+            """
+            prefix=planet_osm
+            """
+
diff --git a/tests/common-import.hpp b/tests/common-import.hpp
index 82f41b2b9..8cdfe0403 100644
--- a/tests/common-import.hpp
+++ b/tests/common-import.hpp
@@ -22,6 +22,7 @@
 #include "middle-ram.hpp"
 #include "osmdata.hpp"
 #include "output.hpp"
+#include "properties.hpp"
 #include "taginfo-impl.hpp"
 
 #include "common-pg.hpp"
@@ -132,12 +133,15 @@ class import_t
     {
         options.connection_params = m_db.connection_params();
 
+        properties_t const properties{options.connection_params,
+                                      options.middle_dbschema};
+
         auto thread_pool = std::make_shared<thread_pool_t>(1U);
         auto middle = create_middle(thread_pool, options);
         middle->start();
 
         auto output = output_t::create_output(middle->get_query_instance(),
-                                              thread_pool, options);
+                                              thread_pool, options, properties);
 
         middle->set_requirements(output->get_requirements());
 
@@ -163,12 +167,15 @@ class import_t
     {
         options.connection_params = m_db.connection_params();
 
+        properties_t const properties{options.connection_params,
+                                      options.middle_dbschema};
+
         auto thread_pool = std::make_shared<thread_pool_t>(1U);
         auto middle = std::make_shared<middle_ram_t>(thread_pool, &options);
         middle->start();
 
         auto output = output_t::create_output(middle->get_query_instance(),
-                                              thread_pool, options);
+                                              thread_pool, options, properties);
 
         middle->set_requirements(output->get_requirements());
 

From 7acd35fc9b79acf130c30638d5d0e7b208118ad7 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 7 Jul 2024 22:20:56 +0200
Subject: [PATCH 150/430] Fix unusual member name in column_type_lookup

And some other small fixes in the same file.
---
 src/flex-table-column.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/flex-table-column.cpp b/src/flex-table-column.cpp
index 59ecd2b6a..489cd722e 100644
--- a/src/flex-table-column.cpp
+++ b/src/flex-table-column.cpp
@@ -8,11 +8,13 @@
  */
 
 #include "flex-table-column.hpp"
+
 #include "format.hpp"
 #include "pgsql-capabilities.hpp"
 #include "util.hpp"
 
 #include <algorithm>
+#include <cassert>
 #include <cctype>
 #include <cstdlib>
 #include <stdexcept>
@@ -24,12 +26,12 @@ namespace {
 struct column_type_lookup
 {
     char const *m_name;
-    table_column_type type;
+    table_column_type m_type;
 
     char const *name() const noexcept { return m_name; }
 };
 
-static std::vector<column_type_lookup> const column_types = {
+std::vector<column_type_lookup> const column_types = {
     {{"text", table_column_type::text},
      {"boolean", table_column_type::boolean},
      {"bool", table_column_type::boolean},
@@ -63,7 +65,7 @@ table_column_type get_column_type_from_string(std::string const &type)
         throw fmt_error("Unknown column type '{}'.", type);
     }
 
-    return column_type->type;
+    return column_type->m_type;
 }
 
 std::string lowercase(std::string const &str)

From 0ce67d1fe7f1a8e07f9ef0d1c1f9c08490d9837c Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 7 Jul 2024 22:25:50 +0200
Subject: [PATCH 151/430] Refactor how COPY is handled, use variant instead of
 virtual class

COPYs are handled in extra threads through a worker queue. Using
std::variant instead of virtual classes simplifies the code, because we
don't need the indirection through a unique_ptr any more.
---
 src/db-copy-mgr.hpp           | 110 +++++++++++++++++-----------------
 src/db-copy.cpp               |  58 ++++++++++--------
 src/db-copy.hpp               |  84 +++++++++++---------------
 tests/test-db-copy-thread.cpp |  70 ++++++++++++----------
 4 files changed, 161 insertions(+), 161 deletions(-)

diff --git a/src/db-copy-mgr.hpp b/src/db-copy-mgr.hpp
index d2089cc22..88767ba75 100644
--- a/src/db-copy-mgr.hpp
+++ b/src/db-copy-mgr.hpp
@@ -36,20 +36,19 @@ class db_copy_mgr_t
      */
     void new_line(std::shared_ptr<db_target_descr_t> const &table)
     {
-        if (!m_current || !m_current->target->same_copy_target(*table)) {
+        if (!m_current || !m_current.target->same_copy_target(*table)) {
             if (m_current) {
-                m_processor->add_buffer(std::move(m_current));
+                m_processor->send_command(std::move(m_current));
             }
-
-            m_current = std::make_unique<db_cmd_copy_delete_t<DELETER>>(table);
+            m_current = db_cmd_copy_delete_t<DELETER>(table);
         }
-        m_committed = m_current->buffer.size();
+        m_committed = m_current.buffer.size();
     }
 
     void rollback_line()
     {
         assert(m_current);
-        m_current->buffer.resize(m_committed);
+        m_current.buffer.resize(m_committed);
     }
 
     /**
@@ -62,7 +61,7 @@ class db_copy_mgr_t
     {
         assert(m_current);
 
-        auto &buf = m_current->buffer;
+        auto &buf = m_current.buffer;
         assert(!buf.empty());
 
         // Expect that a column has been written last which ended in a '\t'.
@@ -70,8 +69,9 @@ class db_copy_mgr_t
         assert(buf.back() == '\t');
         buf.back() = '\n';
 
-        if (m_current->is_full()) {
-            m_processor->add_buffer(std::move(m_current));
+        if (m_current.is_full()) {
+            m_processor->send_command(std::move(m_current));
+            m_current = {};
         }
     }
 
@@ -96,7 +96,7 @@ class db_copy_mgr_t
     void add_column(T value)
     {
         add_value(value);
-        m_current->buffer += '\t';
+        m_current.buffer += '\t';
     }
 
     /**
@@ -104,7 +104,7 @@ class db_copy_mgr_t
      *
      * Adds a NULL value for the column.
      */
-    void add_null_column() { m_current->buffer += "\\N\t"; }
+    void add_null_column() { m_current.buffer += "\\N\t"; }
 
     /**
      * Start an array column.
@@ -113,7 +113,7 @@ class db_copy_mgr_t
      *
      * Must be finished with a call to finish_array().
      */
-    void new_array() { m_current->buffer += "{"; }
+    void new_array() { m_current.buffer += "{"; }
 
     /**
      * Add a single value to an array column.
@@ -124,7 +124,7 @@ class db_copy_mgr_t
     void add_array_elem(osmid_t value)
     {
         add_value(value);
-        m_current->buffer += ',';
+        m_current.buffer += ',';
     }
 
     /**
@@ -135,13 +135,13 @@ class db_copy_mgr_t
      */
     void finish_array()
     {
-        assert(!m_current->buffer.empty());
-        if (m_current->buffer.back() == '{') {
-            m_current->buffer += '}';
+        assert(!m_current.buffer.empty());
+        if (m_current.buffer.back() == '{') {
+            m_current.buffer += '}';
         } else {
-            m_current->buffer.back() = '}';
+            m_current.buffer.back() = '}';
         }
-        m_current->buffer += '\t';
+        m_current.buffer += '\t';
     }
 
     /**
@@ -172,11 +172,11 @@ class db_copy_mgr_t
      */
     void add_hash_elem(char const *k, char const *v)
     {
-        m_current->buffer += '"';
+        m_current.buffer += '"';
         add_escaped_string(k);
-        m_current->buffer += "\"=>\"";
+        m_current.buffer += "\"=>\"";
         add_escaped_string(v);
-        m_current->buffer += "\",";
+        m_current.buffer += "\",";
     }
 
     /**
@@ -187,11 +187,11 @@ class db_copy_mgr_t
      */
     void add_hash_elem_noescape(char const *k, char const *v)
     {
-        m_current->buffer += '"';
-        m_current->buffer += k;
-        m_current->buffer += "\"=>\"";
-        m_current->buffer += v;
-        m_current->buffer += "\",";
+        m_current.buffer += '"';
+        m_current.buffer += k;
+        m_current.buffer += "\"=>\"";
+        m_current.buffer += v;
+        m_current.buffer += "\",";
     }
 
     /**
@@ -207,11 +207,11 @@ class db_copy_mgr_t
     template <typename T>
     void add_hstore_num_noescape(char const *k, T const value)
     {
-        m_current->buffer += '"';
-        m_current->buffer += k;
-        m_current->buffer += "\"=>\"";
-        m_current->buffer += std::to_string(value);
-        m_current->buffer += "\",";
+        m_current.buffer += '"';
+        m_current.buffer += k;
+        m_current.buffer += "\"=>\"";
+        m_current.buffer += std::to_string(value);
+        m_current.buffer += "\",";
     }
 
     /**
@@ -222,11 +222,11 @@ class db_copy_mgr_t
      */
     void finish_hash()
     {
-        auto const idx = m_current->buffer.size() - 1;
-        if (!m_current->buffer.empty() && m_current->buffer[idx] == ',') {
-            m_current->buffer[idx] = '\t';
+        auto const idx = m_current.buffer.size() - 1;
+        if (!m_current.buffer.empty() && m_current.buffer[idx] == ',') {
+            m_current.buffer[idx] = '\t';
         } else {
-            m_current->buffer += '\t';
+            m_current.buffer += '\t';
         }
     }
 
@@ -241,10 +241,10 @@ class db_copy_mgr_t
 
         for (auto c : wkb) {
             unsigned int const num = static_cast<unsigned char>(c);
-            m_current->buffer += lookup_hex[(num >> 4U) & 0xfU];
-            m_current->buffer += lookup_hex[num & 0xfU];
+            m_current.buffer += lookup_hex[(num >> 4U) & 0xfU];
+            m_current.buffer += lookup_hex[num & 0xfU];
         }
-        m_current->buffer += '\t';
+        m_current.buffer += '\t';
     }
 
     /**
@@ -257,14 +257,16 @@ class db_copy_mgr_t
     void delete_object(ARGS &&... args)
     {
         assert(m_current);
-        m_current->add_deletable(std::forward<ARGS>(args)...);
+        m_current.add_deletable(std::forward<ARGS>(args)...);
     }
 
     void flush()
     {
         // flush current buffer if there is one
         if (m_current) {
-            m_processor->add_buffer(std::move(m_current));
+            m_processor->send_command(
+                db_cmd_copy_delete_t<DELETER>{std::move(m_current)});
+            m_current = {};
         }
         // close any ongoing copy operations
         m_processor->end_copy();
@@ -285,7 +287,7 @@ class db_copy_mgr_t
     template <typename T>
     void add_value(T value)
     {
-        m_current->buffer += fmt::to_string(value);
+        m_current.buffer += fmt::to_string(value);
     }
 
     void add_value(std::string const &s) { add_value(s.c_str()); }
@@ -296,22 +298,22 @@ class db_copy_mgr_t
         for (char const *c = s; *c; ++c) {
             switch (*c) {
             case '"':
-                m_current->buffer += "\\\"";
+                m_current.buffer += "\\\"";
                 break;
             case '\\':
-                m_current->buffer += "\\\\";
+                m_current.buffer += "\\\\";
                 break;
             case '\n':
-                m_current->buffer += "\\n";
+                m_current.buffer += "\\n";
                 break;
             case '\r':
-                m_current->buffer += "\\r";
+                m_current.buffer += "\\r";
                 break;
             case '\t':
-                m_current->buffer += "\\t";
+                m_current.buffer += "\\t";
                 break;
             default:
-                m_current->buffer += *c;
+                m_current.buffer += *c;
                 break;
             }
         }
@@ -322,29 +324,29 @@ class db_copy_mgr_t
         for (char const *c = s; *c; ++c) {
             switch (*c) {
             case '"':
-                m_current->buffer += R"(\\")";
+                m_current.buffer += R"(\\")";
                 break;
             case '\\':
-                m_current->buffer += R"(\\\\)";
+                m_current.buffer += R"(\\\\)";
                 break;
             case '\n':
-                m_current->buffer += "\\n";
+                m_current.buffer += "\\n";
                 break;
             case '\r':
-                m_current->buffer += "\\r";
+                m_current.buffer += "\\r";
                 break;
             case '\t':
-                m_current->buffer += "\\t";
+                m_current.buffer += "\\t";
                 break;
             default:
-                m_current->buffer += *c;
+                m_current.buffer += *c;
                 break;
             }
         }
     }
 
     std::shared_ptr<db_copy_thread_t> m_processor;
-    std::unique_ptr<db_cmd_copy_delete_t<DELETER>> m_current;
+    db_cmd_copy_delete_t<DELETER> m_current;
     std::size_t m_committed = 0;
 };
 
diff --git a/src/db-copy.cpp b/src/db-copy.cpp
index 7c320dca1..0753fe6e7 100644
--- a/src/db-copy.cpp
+++ b/src/db-copy.cpp
@@ -92,7 +92,7 @@ db_copy_thread_t::db_copy_thread_t(connection_params_t const &connection_params)
 
 db_copy_thread_t::~db_copy_thread_t() { finish(); }
 
-void db_copy_thread_t::add_buffer(std::unique_ptr<db_cmd_t> &&buffer)
+void db_copy_thread_t::send_command(db_cmd_t &&buffer)
 {
     assert(m_worker.joinable()); // thread must not have been finished
 
@@ -107,21 +107,21 @@ void db_copy_thread_t::add_buffer(std::unique_ptr<db_cmd_t> &&buffer)
 
 void db_copy_thread_t::end_copy()
 {
-    add_buffer(std::make_unique<db_cmd_end_copy_t>());
+    send_command(db_cmd_end_copy_t{});
 }
 
 void db_copy_thread_t::sync_and_wait()
 {
     std::promise<void> barrier;
     std::future<void> const sync = barrier.get_future();
-    add_buffer(std::make_unique<db_cmd_sync_t>(std::move(barrier)));
+    send_command(db_cmd_sync_t{std::move(barrier)});
     sync.wait();
 }
 
 void db_copy_thread_t::finish()
 {
     if (m_worker.joinable()) {
-        add_buffer(std::make_unique<db_cmd_finish_t>());
+        send_command(db_cmd_finish_t{});
         m_worker.join();
     }
 }
@@ -147,7 +147,7 @@ void db_copy_thread_t::thread_t::operator()()
 
         bool done = false;
         while (!done) {
-            std::unique_ptr<db_cmd_t> item;
+            db_cmd_t item{};
             {
                 std::unique_lock<std::mutex> lock{m_shared->queue_mutex};
                 m_shared->queue_cond.wait(
@@ -158,21 +158,11 @@ void db_copy_thread_t::thread_t::operator()()
                 m_shared->queue_full_cond.notify_one();
             }
 
-            switch (item->type) {
-            case db_cmd_t::Cmd_copy:
-                write_to_db(static_cast<db_cmd_copy_t *>(item.get()));
-                break;
-            case db_cmd_t::Cmd_end_copy:
-                finish_copy();
-                break;
-            case db_cmd_t::Cmd_sync:
-                finish_copy();
-                static_cast<db_cmd_sync_t *>(item.get())->barrier.set_value();
-                break;
-            case db_cmd_t::Cmd_finish:
-                done = true;
-                break;
-            }
+            done = std::visit(
+                [&](auto &&cmd) {
+                    return execute(std::forward<decltype(cmd)>(cmd));
+                },
+                item);
         }
 
         finish_copy();
@@ -184,20 +174,36 @@ void db_copy_thread_t::thread_t::operator()()
     }
 }
 
-void db_copy_thread_t::thread_t::write_to_db(db_cmd_copy_t *buffer)
+template <typename DELETER>
+bool db_copy_thread_t::thread_t::execute(db_cmd_copy_delete_t<DELETER> &cmd)
 {
-    if (buffer->has_deletables() ||
-        (m_inflight && !buffer->target->same_copy_target(*m_inflight))) {
+    if (cmd.has_deletables() ||
+        (m_inflight && !cmd.target->same_copy_target(*m_inflight))) {
         finish_copy();
     }
 
-    buffer->delete_data(*m_db_connection);
+    cmd.delete_data(*m_db_connection);
 
     if (!m_inflight) {
-        start_copy(buffer->target);
+        start_copy(cmd.target);
     }
 
-    m_db_connection->copy_send(buffer->buffer, buffer->target->name());
+    m_db_connection->copy_send(cmd.buffer, cmd.target->name());
+
+    return false;
+}
+
+bool db_copy_thread_t::thread_t::execute(db_cmd_end_copy_t &)
+{
+    finish_copy();
+    return false;
+}
+
+bool db_copy_thread_t::thread_t::execute(db_cmd_sync_t &cmd)
+{
+    finish_copy();
+    cmd.barrier.set_value();
+    return false;
 }
 
 void db_copy_thread_t::thread_t::start_copy(
diff --git a/src/db-copy.hpp b/src/db-copy.hpp
index af4e1fa0d..766f3451f 100644
--- a/src/db-copy.hpp
+++ b/src/db-copy.hpp
@@ -19,6 +19,7 @@
 #include <string>
 #include <thread>
 #include <utility>
+#include <variant>
 #include <vector>
 
 #include "osmtypes.hpp"
@@ -136,29 +137,7 @@ class db_deleter_by_type_and_id_t
     bool m_has_type = false;
 };
 
-/**
- * A command for the copy thread to execute.
- */
-class db_cmd_t
-{
-public:
-    enum cmd_t
-    {
-        Cmd_copy,     ///< Copy buffer content into given target.
-        Cmd_end_copy, ///< End COPY command.
-        Cmd_sync,     ///< Synchronize with parent.
-        Cmd_finish
-    };
-
-    virtual ~db_cmd_t() = default;
-
-    cmd_t type;
-
-protected:
-    explicit db_cmd_t(cmd_t t) : type(t) {}
-};
-
-struct db_cmd_copy_t : public db_cmd_t
+struct db_cmd_copy_t
 {
     enum
     {
@@ -183,14 +162,15 @@ struct db_cmd_copy_t : public db_cmd_t
     /// actual copy buffer
     std::string buffer;
 
-    virtual bool has_deletables() const noexcept = 0;
-    virtual void delete_data(pg_conn_t const &db_connection) = 0;
+    db_cmd_copy_t() = default;
 
     explicit db_cmd_copy_t(std::shared_ptr<db_target_descr_t> t)
-    : db_cmd_t(db_cmd_t::Cmd_copy), target(std::move(t))
+    : target(std::move(t))
     {
         buffer.reserve(Max_buf_size);
     }
+
+    explicit operator bool() const noexcept { return target != nullptr; }
 };
 
 template <typename DELETER>
@@ -205,12 +185,9 @@ class db_cmd_copy_delete_t : public db_cmd_copy_t
         return (buffer.size() > Max_buf_size - 100) || m_deleter.is_full();
     }
 
-    bool has_deletables() const noexcept override
-    {
-        return m_deleter.has_data();
-    }
+    bool has_deletables() const noexcept { return m_deleter.has_data(); }
 
-    void delete_data(pg_conn_t const &db_connection) override
+    void delete_data(pg_conn_t const &db_connection)
     {
         if (m_deleter.has_data()) {
             m_deleter.delete_rows(
@@ -230,25 +207,30 @@ class db_cmd_copy_delete_t : public db_cmd_copy_t
     DELETER m_deleter;
 };
 
-struct db_cmd_end_copy_t : public db_cmd_t
+struct db_cmd_end_copy_t
 {
-    db_cmd_end_copy_t() : db_cmd_t(db_cmd_t::Cmd_end_copy) {}
 };
 
-struct db_cmd_sync_t : public db_cmd_t
+struct db_cmd_sync_t
 {
     std::promise<void> barrier;
 
-    explicit db_cmd_sync_t(std::promise<void> &&b)
-    : db_cmd_t(db_cmd_t::Cmd_sync), barrier(std::move(b))
-    {}
+    explicit db_cmd_sync_t(std::promise<void> &&b) : barrier(std::move(b)) {}
 };
 
-struct db_cmd_finish_t : public db_cmd_t
+struct db_cmd_finish_t
 {
-    db_cmd_finish_t() : db_cmd_t(db_cmd_t::Cmd_finish) {}
 };
 
+/**
+ * This type implements the commands that can be sent through the worker
+ * queue to the worker thread.
+ */
+using db_cmd_t =
+    std::variant<db_cmd_copy_delete_t<db_deleter_by_id_t>,
+                 db_cmd_copy_delete_t<db_deleter_by_type_and_id_t>,
+                 db_cmd_end_copy_t, db_cmd_sync_t, db_cmd_finish_t>;
+
 /**
  * The manager for the worker thread that streams copy data into the database.
  */
@@ -265,17 +247,13 @@ class db_copy_thread_t
 
     ~db_copy_thread_t();
 
-    /**
-     * Add another command for the worker.
-     */
-    void add_buffer(std::unique_ptr<db_cmd_t> &&buffer);
+    /// Add a command to the worker queue.
+    void send_command(db_cmd_t &&buffer);
 
-    /// Close COPY if one is open
+    /// Close COPY if one is open.
     void end_copy();
 
-    /**
-     * Send sync command and wait for the notification.
-     */
+    /// Send sync command and wait for it to finish.
     void sync_and_wait();
 
     /**
@@ -292,7 +270,7 @@ class db_copy_thread_t
         std::mutex queue_mutex;
         std::condition_variable queue_cond;
         std::condition_variable queue_full_cond;
-        std::deque<std::unique_ptr<db_cmd_t>> worker_queue;
+        std::deque<db_cmd_t> worker_queue;
     };
 
     // This is the class that actually instantiated and run in the thread.
@@ -304,7 +282,15 @@ class db_copy_thread_t
         void operator()();
 
     private:
-        void write_to_db(db_cmd_copy_t *buffer);
+        template <typename DELETER>
+        bool execute(db_cmd_copy_delete_t<DELETER> &cmd);
+
+        bool execute(db_cmd_end_copy_t &);
+
+        bool execute(db_cmd_sync_t &cmd);
+
+        static bool execute(db_cmd_finish_t &) { return true; }
+
         void start_copy(std::shared_ptr<db_target_descr_t> const &target);
         void finish_copy();
         void delete_rows(db_cmd_copy_t *buffer);
diff --git a/tests/test-db-copy-thread.cpp b/tests/test-db-copy-thread.cpp
index 3e6ed2d65..728aa8b38 100644
--- a/tests/test-db-copy-thread.cpp
+++ b/tests/test-db-copy-thread.cpp
@@ -31,16 +31,16 @@ TEST_CASE("db_copy_thread_t with db_deleter_by_id_t")
 
     db_copy_thread_t t{db.connection_params()};
     using cmd_copy_t = db_cmd_copy_delete_t<db_deleter_by_id_t>;
-    auto cmd = std::make_unique<cmd_copy_t>(table);
 
     SECTION("simple copy command")
     {
 
         SECTION("add one copy line and sync")
         {
-            cmd->buffer += "42\n";
+            cmd_copy_t cmd{table};
+            cmd.buffer += "42\n";
 
-            t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
+            t.send_command(std::move(cmd));
             t.sync_and_wait();
 
             REQUIRE(conn.result_as_int("SELECT id FROM test_copy_thread") ==
@@ -49,9 +49,10 @@ TEST_CASE("db_copy_thread_t with db_deleter_by_id_t")
 
         SECTION("add multiple rows and sync")
         {
-            cmd->buffer += "101\n  23\n 900\n";
+            cmd_copy_t cmd{table};
+            cmd.buffer += "101\n  23\n 900\n";
 
-            t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
+            t.send_command(std::move(cmd));
             t.sync_and_wait();
 
             REQUIRE(table_count(conn) == 3);
@@ -59,9 +60,10 @@ TEST_CASE("db_copy_thread_t with db_deleter_by_id_t")
 
         SECTION("add one line and finish")
         {
-            cmd->buffer += "2\n";
+            cmd_copy_t cmd{table};
+            cmd.buffer += "2\n";
 
-            t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
+            t.send_command(std::move(cmd));
             t.finish();
 
             REQUIRE(conn.result_as_int("SELECT id FROM test_copy_thread") == 2);
@@ -70,18 +72,18 @@ TEST_CASE("db_copy_thread_t with db_deleter_by_id_t")
 
     SECTION("delete command")
     {
-        cmd->buffer += "42\n43\n133\n223\n224\n";
-        t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
+        cmd_copy_t cmd{table};
+        cmd.buffer += "42\n43\n133\n223\n224\n";
+        t.send_command(std::move(cmd));
         t.sync_and_wait();
 
-        cmd = std::make_unique<cmd_copy_t>(table);
-
         SECTION("simple delete of existing rows")
         {
-            cmd->add_deletable(223);
-            cmd->add_deletable(42);
+            cmd = cmd_copy_t{table};
+            cmd.add_deletable(223);
+            cmd.add_deletable(42);
 
-            t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
+            t.send_command(std::move(cmd));
             t.sync_and_wait();
 
             REQUIRE(table_count(conn, "WHERE id = 42") == 0);
@@ -90,10 +92,11 @@ TEST_CASE("db_copy_thread_t with db_deleter_by_id_t")
 
         SECTION("delete one and add another")
         {
-            cmd->add_deletable(133);
-            cmd->buffer += "134\n";
+            cmd = cmd_copy_t{table};
+            cmd.add_deletable(133);
+            cmd.buffer += "134\n";
 
-            t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
+            t.send_command(std::move(cmd));
             t.sync_and_wait();
 
             REQUIRE(table_count(conn, "WHERE id = 133") == 0);
@@ -102,10 +105,11 @@ TEST_CASE("db_copy_thread_t with db_deleter_by_id_t")
 
         SECTION("delete one and add the same")
         {
-            cmd->add_deletable(133);
-            cmd->buffer += "133\n";
+            cmd = cmd_copy_t{table};
+            cmd.add_deletable(133);
+            cmd.buffer += "133\n";
 
-            t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
+            t.send_command(std::move(cmd));
             t.sync_and_wait();
 
             REQUIRE(table_count(conn, "WHERE id = 133") == 1);
@@ -114,12 +118,13 @@ TEST_CASE("db_copy_thread_t with db_deleter_by_id_t")
 
     SECTION("multi buffer add without delete")
     {
-        cmd->buffer += "542\n5543\n10133\n";
-        t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
+        cmd_copy_t cmd{table};
+        cmd.buffer += "542\n5543\n10133\n";
+        t.send_command(std::move(cmd));
 
-        cmd = std::make_unique<cmd_copy_t>(table);
-        cmd->buffer += "12\n784\n523\n";
-        t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
+        cmd = cmd_copy_t{table};
+        cmd.buffer += "12\n784\n523\n";
+        t.send_command(std::move(cmd));
 
         t.finish();
 
@@ -130,13 +135,14 @@ TEST_CASE("db_copy_thread_t with db_deleter_by_id_t")
 
     SECTION("multi buffer add with delete")
     {
-        cmd->buffer += "542\n5543\n10133\n";
-        t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
-
-        cmd = std::make_unique<cmd_copy_t>(table);
-        cmd->add_deletable(542);
-        cmd->buffer += "12\n";
-        t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
+        cmd_copy_t cmd{table};
+        cmd.buffer += "542\n5543\n10133\n";
+        t.send_command(std::move(cmd));
+
+        cmd = cmd_copy_t{table};
+        cmd.add_deletable(542);
+        cmd.buffer += "12\n";
+        t.send_command(std::move(cmd));
 
         t.finish();
 

From 6bd67a749d890a092557c8812fd67c0d3f170dce Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 7 Jul 2024 22:25:50 +0200
Subject: [PATCH 152/430] Create db connection in main thread and move it into
 the thread

This is simpler than having the connection in a unique_ptr in the worker
thread. Open the connection in the main thread also means any errors
happen still in the main thread where they are trivial to handle.
---
 src/db-copy-mgr.hpp |  3 +--
 src/db-copy.cpp     | 22 +++++++++-------------
 src/db-copy.hpp     |  4 ++--
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/db-copy-mgr.hpp b/src/db-copy-mgr.hpp
index 88767ba75..108900cc4 100644
--- a/src/db-copy-mgr.hpp
+++ b/src/db-copy-mgr.hpp
@@ -264,8 +264,7 @@ class db_copy_mgr_t
     {
         // flush current buffer if there is one
         if (m_current) {
-            m_processor->send_command(
-                db_cmd_copy_delete_t<DELETER>{std::move(m_current)});
+            m_processor->send_command(std::move(m_current));
             m_current = {};
         }
         // close any ongoing copy operations
diff --git a/src/db-copy.cpp b/src/db-copy.cpp
index 0753fe6e7..a58a9aea3 100644
--- a/src/db-copy.cpp
+++ b/src/db-copy.cpp
@@ -87,7 +87,8 @@ db_copy_thread_t::db_copy_thread_t(connection_params_t const &connection_params)
     // Connection params are captured by copy here, because we don't know
     // whether the reference will still be valid once we get around to running
     // the thread.
-    m_worker = std::thread{thread_t{connection_params, &m_shared}};
+    m_worker =
+        std::thread{thread_t{pg_conn_t{connection_params, "copy"}, &m_shared}};
 }
 
 db_copy_thread_t::~db_copy_thread_t() { finish(); }
@@ -126,24 +127,21 @@ void db_copy_thread_t::finish()
     }
 }
 
-db_copy_thread_t::thread_t::thread_t(connection_params_t connection_params,
+db_copy_thread_t::thread_t::thread_t(pg_conn_t &&db_connection,
                                      shared *shared)
-: m_connection_params(std::move(connection_params)), m_shared(shared)
+: m_db_connection(std::move(db_connection)), m_shared(shared)
 {}
 
 void db_copy_thread_t::thread_t::operator()()
 {
     try {
-        m_db_connection =
-            std::make_unique<pg_conn_t>(m_connection_params, "copy");
-
         // Disable sequential scan on database tables in the copy threads.
         // The copy threads only do COPYs (which are unaffected by this
         // setting) and DELETEs which we know benefit from the index. For
         // some reason PostgreSQL chooses in some cases not to use that index,
         // possibly because the DELETEs get a large list of ids to delete of
         // which many are not in the table which confuses the query planner.
-        m_db_connection->exec("SET enable_seqscan = off");
+        m_db_connection.exec("SET enable_seqscan = off");
 
         bool done = false;
         while (!done) {
@@ -166,8 +164,6 @@ void db_copy_thread_t::thread_t::operator()()
         }
 
         finish_copy();
-
-        m_db_connection.reset();
     } catch (std::runtime_error const &e) {
         log_error("DB copy thread failed: {}", e.what());
         std::exit(2); // NOLINT(concurrency-mt-unsafe)
@@ -182,13 +178,13 @@ bool db_copy_thread_t::thread_t::execute(db_cmd_copy_delete_t<DELETER> &cmd)
         finish_copy();
     }
 
-    cmd.delete_data(*m_db_connection);
+    cmd.delete_data(m_db_connection);
 
     if (!m_inflight) {
         start_copy(cmd.target);
     }
 
-    m_db_connection->copy_send(cmd.buffer, cmd.target->name());
+    m_db_connection.copy_send(cmd.buffer, cmd.target->name());
 
     return false;
 }
@@ -224,7 +220,7 @@ void db_copy_thread_t::thread_t::start_copy(
     }
 
     sql.push_back('\0');
-    m_db_connection->copy_start(sql.data());
+    m_db_connection.copy_start(sql.data());
 
     m_inflight = target;
 }
@@ -232,7 +228,7 @@ void db_copy_thread_t::thread_t::start_copy(
 void db_copy_thread_t::thread_t::finish_copy()
 {
     if (m_inflight) {
-        m_db_connection->copy_end(m_inflight->name());
+        m_db_connection.copy_end(m_inflight->name());
         m_inflight.reset();
     }
 }
diff --git a/src/db-copy.hpp b/src/db-copy.hpp
index 766f3451f..bd5946a0d 100644
--- a/src/db-copy.hpp
+++ b/src/db-copy.hpp
@@ -277,7 +277,7 @@ class db_copy_thread_t
     class thread_t
     {
     public:
-        thread_t(connection_params_t connection_params, shared *shared);
+        thread_t(pg_conn_t &&db_connection, shared *shared);
 
         void operator()();
 
@@ -296,7 +296,7 @@ class db_copy_thread_t
         void delete_rows(db_cmd_copy_t *buffer);
 
         connection_params_t m_connection_params;
-        std::unique_ptr<pg_conn_t> m_db_connection;
+        pg_conn_t m_db_connection;
 
         // Target for copy operation currently ongoing.
         std::shared_ptr<db_target_descr_t> m_inflight;

From 41b069e0d36bc9a7031f4604c7bb9ae521c9697f Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 10 Jul 2024 14:17:31 +0200
Subject: [PATCH 153/430] return a 3 error code in osm2pgsql-replication on
 exception

---
 scripts/osm2pgsql-replication | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/osm2pgsql-replication b/scripts/osm2pgsql-replication
index acc095821..10eb8848e 100755
--- a/scripts/osm2pgsql-replication
+++ b/scripts/osm2pgsql-replication
@@ -721,4 +721,10 @@ def main(prog_args=None):
 
 
 if __name__ == '__main__':
-    sys.exit(main())
+    try:
+        retcode = main()
+    except Exception as ex:
+        LOG.fatal("Exception during execution: %s", ex)
+        retcode = 3
+
+    sys.exit(retcode)

From d0b6f323a3f2a2797b5a68096a135d2ef2510c6d Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 11 Jul 2024 11:14:54 +0200
Subject: [PATCH 154/430] remove left-over HAVE_LUA check

This reverts an accidental revert from eee1cd5b541c985ebe55ce4e674a8aee5cb91096.
---
 src/command-line-parser.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index 3430099d9..fba4d3cc9 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -242,15 +242,11 @@ void print_version()
     fmt::print(stderr, "Compiled using the following library versions:\n");
     fmt::print(stderr, "Libosmium {}\n", LIBOSMIUM_VERSION_STRING);
     fmt::print(stderr, "Proj {}\n", get_proj_version());
-#ifdef HAVE_LUA
 #ifdef HAVE_LUAJIT
     fmt::print(stderr, "{} ({})\n", LUA_RELEASE, LUAJIT_VERSION);
 #else
     fmt::print(stderr, "{}\n", LUA_RELEASE);
 #endif
-#else
-    fmt::print(stderr, "Lua support not included\n");
-#endif
 }
 
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)

From 319dff8d2bc5585a2d94902eade031018276a4b4 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 11 Jul 2024 11:31:25 +0200
Subject: [PATCH 155/430] remove HAVE_LUA config option from BDD tests

Lua is now mandatory.
---
 tests/bdd/environment.py                |  7 -------
 tests/bdd/regression/properties.feature |  1 -
 tests/bdd/steps/steps_execute.py        | 12 ------------
 3 files changed, 20 deletions(-)

diff --git a/tests/bdd/environment.py b/tests/bdd/environment.py
index 97ff17995..93b4f242a 100644
--- a/tests/bdd/environment.py
+++ b/tests/bdd/environment.py
@@ -38,7 +38,6 @@
     'KEEP_TEST_DB': False,
     'TEST_DB': 'osm2pgsql-test',
     'HAVE_TABLESPACE': True,
-    'HAVE_LUA': True,
     'HAVE_PROJ': True
 }
 
@@ -93,9 +92,6 @@ def before_all(context):
     if proc.returncode != 0:
         raise RuntimeError('Cannot run osm2pgsql')
 
-    if context.config.userdata['HAVE_LUA']:
-        context.config.userdata['HAVE_LUA'] = 'Lua support not included' not in ver_info
-
     if context.config.userdata['HAVE_PROJ']:
         context.config.userdata['HAVE_PROJ'] = 'Proj [disabled]' not in ver_info
 
@@ -118,9 +114,6 @@ def before_scenario(context, scenario):
     if 'config.have_proj' in scenario.tags and not context.config.userdata['HAVE_PROJ']:
         scenario.skip("Generic proj library not configured.")
 
-    if 'config.have_lua' in scenario.tags and not context.config.userdata['HAVE_LUA']:
-        scenario.skip("Lua support not compiled in.")
-
     context.db = use_fixture(test_db, context)
     context.import_file = None
     context.import_data = {'n': [], 'w': [], 'r': []}
diff --git a/tests/bdd/regression/properties.feature b/tests/bdd/regression/properties.feature
index c90e60b18..37c8bf379 100644
--- a/tests/bdd/regression/properties.feature
+++ b/tests/bdd/regression/properties.feature
@@ -92,7 +92,6 @@ Feature: Updates to the test database with properties check
             Using style file '' (same as on import).
             """
 
-    @config.have_lua
     Scenario Outline: Create/append with various style parameters with flex output
         When running osm2pgsql flex with parameters
             | --slim         |
diff --git a/tests/bdd/steps/steps_execute.py b/tests/bdd/steps/steps_execute.py
index 68ea46cef..0e9b946aa 100644
--- a/tests/bdd/steps/steps_execute.py
+++ b/tests/bdd/steps/steps_execute.py
@@ -121,19 +121,11 @@ def do_not_setup_tagtransform(context):
 
 @given("the default lua tagtransform")
 def setup_lua_tagtransform(context):
-    if not context.config.userdata['HAVE_LUA']:
-        context.scenario.skip("Lua support not compiled in.")
-        return
-
     context.osm2pgsql_params.extend(('--tag-transform-script',
                                     str(context.default_data_dir / 'style.lua')))
 
 @given("the lua style")
 def setup_inline_lua_style(context):
-    if not context.config.userdata['HAVE_LUA']:
-        context.scenario.skip("Lua support not compiled in.")
-        return
-
     outfile = context.workdir / 'inline_style.lua'
     outfile.write_text(context.text)
     context.osm2pgsql_params.extend(('-S', str(outfile)))
@@ -141,10 +133,6 @@ def setup_inline_lua_style(context):
 
 @given("the style file '(?P<style>.+)'")
 def setup_style_file(context, style):
-    if style.endswith('.lua') and not context.config.userdata['HAVE_LUA']:
-        context.scenario.skip("Lua support not compiled in.")
-        return
-
     context.osm2pgsql_params.extend(('-S', str(context.test_data_dir / style)))
 
 

From a5f0872756855e6202bc206a92412872d80aaaee Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 11 Jul 2024 11:34:38 +0200
Subject: [PATCH 156/430] bdd: run basic lua tests against empty files

This way osm2pgsql can be run without failure but the test will be
quick.
---
 tests/bdd/flex/lua-basics.feature | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/bdd/flex/lua-basics.feature b/tests/bdd/flex/lua-basics.feature
index 35bf38db4..9e5ecf2aa 100644
--- a/tests/bdd/flex/lua-basics.feature
+++ b/tests/bdd/flex/lua-basics.feature
@@ -1,7 +1,9 @@
 Feature: Flex output uses a Lua config file
 
     Scenario: Check access to osm2pgsql object from Lua
-        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        Given the OSM data
+            """
+            """
         And the lua style
             """
             print("version=" .. osm2pgsql.version)
@@ -28,15 +30,17 @@ Feature: Flex output uses a Lua config file
             """
 
     Scenario: Check access to osm2pgsql properties from Lua
-        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        Given the OSM data
+            """
+            """
         And the lua style
             """
             local p = osm2pgsql.properties
             print("attributes=" .. p.attributes)
             print("prefix=" .. p.prefix)
             """
-        Then running osm2pgsql flex fails
-        And the standard output contains
+        When running osm2pgsql flex
+        Then the standard output contains
             """
             attributes=false
             """

From b13126a9dbd37644e2cac87caa61ccad5861d1b6 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 11 Jul 2024 10:17:13 +0200
Subject: [PATCH 157/430] make sure diffs are recent enough when initialising
 replication

---
 scripts/osm2pgsql-replication                 | 18 +++++--
 tests/bdd/command-line/replication.feature    | 50 +++++++++++++++++--
 .../command-line/replication_legacy.feature   |  4 ++
 tests/bdd/steps/replication_server_mock.py    |  2 +-
 4 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/scripts/osm2pgsql-replication b/scripts/osm2pgsql-replication
index 10eb8848e..c2e63f672 100755
--- a/scripts/osm2pgsql-replication
+++ b/scripts/osm2pgsql-replication
@@ -447,12 +447,22 @@ def init(props, args):
             raise DBError(1, f"Cannot reach the configured replication service '{base_url}'.\n"
                              "Does the URL point to a directory containing OSM update data?")
 
+    state = repl.get_state_info(seq)
+    if state is None:
+        raise DBError(1, f"Cannot load state information for {seq} from replication service {base_url}.\n"
+                         + (f"The server may not have diffs going as far back as {date}."
+                            if date is not None else
+                            "Does the URL point to a directory containing OSM update data?"))
+
     if date is None:
-        state = repl.get_state_info(seq)
-        if state is None:
-            raise DBError(1, f"Cannot reach the configured replication service '{base_url}'.\n"
-                             "Does the URL point to a directory containing OSM update data?")
         date = from_osm_date(state.timestamp)
+    else:
+        # Sanity check. Is the sequence in line with the date requested?
+        if state.timestamp > date:
+            raise DBError(1, "The replication service does not have diff files for the requested date.\n"
+                             f"Replication service used: {base_url}\n"
+                             f"Most recent diffs available start at: {state.timestamp}\n"
+                             f"Database date: {date}")
 
     props.write_replication_state(base_url, seq, date)
 
diff --git a/tests/bdd/command-line/replication.feature b/tests/bdd/command-line/replication.feature
index 3fc89bb64..7329bee41 100644
--- a/tests/bdd/command-line/replication.feature
+++ b/tests/bdd/command-line/replication.feature
@@ -6,6 +6,8 @@ Feature: Tests for the osm2pgsql-replication script with property table
             n34 Tamenity=restaurant x77 y45.3
             """
         And the replication service at http://example.com/europe/liechtenstein-updates
+            | sequence | timestamp            |
+            | 9999999  | 2013-08-03T19:00:02Z |
         When running osm2pgsql pgsql with parameters
             | --slim |
 
@@ -22,6 +24,8 @@ Feature: Tests for the osm2pgsql-replication script with property table
     Scenario: Replication will be initialised from the information of the import file
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
         And the replication service at http://example.com/europe/liechtenstein-updates
+            | sequence | timestamp            |
+            | 9999999  | 2013-08-03T19:00:02Z |
         When running osm2pgsql pgsql with parameters
             | --slim |
 
@@ -65,6 +69,8 @@ Feature: Tests for the osm2pgsql-replication script with property table
         Given the database schema foobar
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
         And the replication service at http://example.com/europe/liechtenstein-updates
+            | sequence | timestamp            |
+            | 9999999  | 2013-08-03T19:00:02Z |
         When running osm2pgsql pgsql with parameters
             | --slim | --middle-schema=foobar |
 
@@ -82,6 +88,8 @@ Feature: Tests for the osm2pgsql-replication script with property table
         Given the database schema foobar
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
         And the replication service at http://example.com/europe/liechtenstein-updates
+            | sequence | timestamp            |
+            | 9999999  | 2013-08-03T19:00:02Z |
         When running osm2pgsql pgsql with parameters
             | --slim | --schema=foobar |
 
@@ -100,6 +108,8 @@ Feature: Tests for the osm2pgsql-replication script with property table
         Given the database schema baz
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
         And the replication service at http://example.com/europe/liechtenstein-updates
+            | sequence | timestamp            |
+            | 9999999  | 2013-08-03T19:00:02Z |
         When running osm2pgsql pgsql with parameters
             | --slim | --middle-schema=foobar | --schema=baz |
 
@@ -220,9 +230,9 @@ Feature: Tests for the osm2pgsql-replication script with property table
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
         And the replication service at http://example.com/europe/liechtenstein-updates
             | sequence | timestamp            |
-            | 345      | 2020-10-04T01:00:00Z |
-            | 346      | 2020-10-04T02:00:00Z |
-            | 347      | 2020-10-04T03:00:00Z |
+            | 344      | 2013-08-03T13:00:02Z |
+            | 345      | 2013-08-03T14:00:02Z |
+            | 346      | 2013-08-03T15:00:02Z |
         When running osm2pgsql pgsql with parameters
             | --slim |
 
@@ -370,3 +380,37 @@ Feature: Tests for the osm2pgsql-replication script with property table
             "server": {"base_url": "http://example.com/europe/liechtenstein-updates", "sequence": 10000001, "timestamp": "2013-10-01T01:00:00Z"
             "local": {"sequence": 9999999, "timestamp": "2013-08-03T19:00:02Z"
             """
+
+
+    Scenario: Replication initialisation will fail when diffs are not old enough
+        Given the database schema foobar
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the replication service at http://example.com/europe/liechtenstein-updates
+            | sequence | timestamp            |
+            | 10000000 | 2020-01-01T01:00:02Z |
+        When running osm2pgsql pgsql with parameters
+            | --slim |
+
+        Then running osm2pgsql-replication fails with returncode 1
+            | init | --server | http://example.com/europe/liechtenstein-updates |
+        And the error output contains
+            """
+            The replication service does not have diff files for the requested date.
+            """
+
+
+    Scenario: Replication initialisation will fail when diffs are not old enough
+        Given the database schema foobar
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the replication service at http://example.com/europe/liechtenstein-updates
+            | sequence | timestamp            |
+            | 10000000 | 2020-01-01T01:00:02Z |
+        When running osm2pgsql pgsql with parameters
+            | --slim |
+
+        Then running osm2pgsql-replication fails with returncode 1
+            | init |
+        And the error output contains
+            """
+            Cannot load state information for 9999999 from replication service http://example.com/europe/liechtenstein-updates.
+            """
diff --git a/tests/bdd/command-line/replication_legacy.feature b/tests/bdd/command-line/replication_legacy.feature
index 5835ccac8..de7db6248 100644
--- a/tests/bdd/command-line/replication_legacy.feature
+++ b/tests/bdd/command-line/replication_legacy.feature
@@ -10,6 +10,8 @@ Feature: Tests for the osm2pgsql-replication script without property table
 
     Scenario: Replication can be initialised with a osm file
         Given the replication service at http://example.com/europe/liechtenstein-updates
+            | sequence | timestamp            |
+            | 9999999  | 2013-08-03T19:00:02Z |
         When running osm2pgsql pgsql with parameters
             | --slim |
         And deleting table osm2pgsql_properties
@@ -38,6 +40,8 @@ Feature: Tests for the osm2pgsql-replication script without property table
 
     Scenario: Replication can be initialised in different schema
         Given the replication service at http://example.com/europe/liechtenstein-updates
+            | sequence | timestamp            |
+            | 9999999  | 2013-08-03T19:00:02Z |
         Given the database schema foobar
         When running osm2pgsql pgsql with parameters
             | --slim | --middle-schema=foobar |
diff --git a/tests/bdd/steps/replication_server_mock.py b/tests/bdd/steps/replication_server_mock.py
index 5d9080824..9ae7ba972 100644
--- a/tests/bdd/steps/replication_server_mock.py
+++ b/tests/bdd/steps/replication_server_mock.py
@@ -28,7 +28,7 @@ def get_state_info(self, seq=None, retries=2):
             if info.sequence == seq:
                 return info
 
-        assert False, f"No sequence information for sequence ID {seq}."
+        return None
 
     def timestamp_to_sequence(self, timestamp, balanced_search=False):
         assert self.state_infos, 'Replication mock not properly set up'

From e934f2087db672e28528162e9439d12423f217fe Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 12 Jul 2024 16:59:33 +0200
Subject: [PATCH 158/430] replication: guess state from file when state info is
 not available

---
 scripts/osm2pgsql-replication | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/scripts/osm2pgsql-replication b/scripts/osm2pgsql-replication
index 10eb8848e..917ff6324 100755
--- a/scripts/osm2pgsql-replication
+++ b/scripts/osm2pgsql-replication
@@ -45,6 +45,7 @@ except ImportError:
 try:
     from osmium.replication.server import ReplicationServer
     from osmium.replication.utils import get_replication_header
+    from osmium.replication import newest_change_from_file
     from osmium import WriteHandler
 except ImportError:
     missing_modules.append('osmium')
@@ -208,7 +209,8 @@ class Osm2pgsqlProperties:
     def write_replication_state(self, base_url, seq, date):
         self._set_prop('replication_base_url', base_url)
         self._set_prop('replication_sequence_number', seq)
-        self._set_prop('replication_timestamp', osm_date(date))
+        if date is not None:
+            self._set_prop('replication_timestamp', osm_date(date))
         self.db.conn.commit()
 
 
@@ -553,19 +555,25 @@ def update(props, args):
         seq = endseq
 
         nextstate = repl.get_state_info(seq)
-        timestamp = nextstate.timestamp if nextstate else None
+        if nextstate:
+            timestamp = nextstate.timestamp
+        else:
+            # Can't get state information for some reason, get the timestamp from file.
+            timestamp = newest_change_from_file(str(outfile))
+            if timestamp <= dt.datetime(1970, 1, 1, tzinfo=dt.timezone.utc):
+                timestamp = None
 
         if args.post_processing:
             cmd = [args.post_processing, str(endseq), str(timestamp or '')]
             LOG.debug('Calling post-processing script: %s', ' '.join(cmd))
             subprocess.run(cmd, check=True)
 
-        props.write_replication_state(base_url, seq, nextstate.timestamp if nextstate else None)
+        props.write_replication_state(base_url, seq, timestamp)
 
-        if nextstate is not None:
+        if timestamp is not None:
             LOG.info("Data imported until %s. Backlog remaining: %s",
-                osm_date(nextstate.timestamp.astimezone(dt.timezone.utc)),
-                pretty_format_timedelta((dt.datetime.now(dt.timezone.utc) - nextstate.timestamp).total_seconds()),
+                osm_date(timestamp.astimezone(dt.timezone.utc)),
+                pretty_format_timedelta((dt.datetime.now(dt.timezone.utc) - timestamp).total_seconds()),
             )
 
         if args.once:

From 2449b294735c7cc59e4ee9acc4ef0473391175d4 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 9 Aug 2024 15:21:36 +0200
Subject: [PATCH 159/430] Do not print timestamp before the version when
 --version is used

---
 src/command-line-parser.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index fba4d3cc9..8666f09d0 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -238,6 +238,7 @@ void check_options_expire(options_t *options) {
 
 void print_version()
 {
+    fmt::print(stderr, "osm2pgsql version {}", get_osm2pgsql_version());
     fmt::print(stderr, "Build: {}\n", get_build_type());
     fmt::print(stderr, "Compiled using the following library versions:\n");
     fmt::print(stderr, "Libosmium {}\n", LIBOSMIUM_VERSION_STRING);
@@ -609,17 +610,17 @@ options_t parse_command_line(int argc, char *argv[])
         return options;
     }
 
+    if (app.want_version()) {
+        options.command = command_t::version;
+        return options;
+    }
+
     log_info("osm2pgsql version {}", get_osm2pgsql_version());
 
     if (verbose) {
         get_logger().set_level(log_level::debug);
     }
 
-    if (app.want_version()) {
-        options.command = command_t::version;
-        return options;
-    }
-
     if (options.append && app.count("--create")) {
         throw std::runtime_error{"--append and --create options can not be "
                                  "used at the same time!"};

From 67543d761d7216b279a31ded3883e063ad927747 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 10 May 2024 09:55:58 +0200
Subject: [PATCH 160/430] Generalization: Get extent of source layer also for
 raster layers

When generalizations are calculated by tile we need to know which extent
to work on. If we are not working with a full planet we get that
information from the (estimated) extent of the source layer. This adds
support for determining the extent for raster-based source layers.

This is needed when we generalize source layers into rasters and then
use those rasters as source for even lower level tiles.
---
 src/gen/osm2pgsql-gen.cpp | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index fb767edbe..9b977cf83 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -102,16 +102,22 @@ bool table_is_empty(pg_conn_t const &db_connection, std::string const &schema,
 tile_extent get_extent_from_db(pg_conn_t const &db_connection,
                                std::string const &schema,
                                std::string const &table,
-                               std::string const &column, uint32_t zoom)
+                               std::string const &column, bool raster,
+                               uint32_t zoom)
 {
     if (table_is_empty(db_connection, schema, table)) {
         return {};
     }
 
-    auto const result = db_connection.exec(
-        "SELECT ST_XMin(e), ST_YMin(e), ST_XMax(e), ST_YMax(e)"
-        " FROM ST_EstimatedExtent('{}', '{}', '{}') AS e",
-        schema, table, column);
+    std::string const sql =
+        raster ? "SELECT ST_XMin(extent), ST_YMin(extent),"
+                 " ST_XMax(extent), ST_YMax(extent)"
+                 " FROM raster_columns WHERE r_table_schema='{}'"
+                 " AND r_table_name='{}' AND r_raster_column = '{}'"
+               : "SELECT ST_XMin(e), ST_YMin(e), ST_XMax(e), ST_YMax(e)"
+                 " FROM ST_EstimatedExtent('{}', '{}', '{}') AS e";
+
+    auto const result = db_connection.exec(sql, schema, table, column);
 
     if (result.num_tuples() == 0 || result.is_null(0, 0)) {
         return {};
@@ -135,6 +141,7 @@ tile_extent get_extent_from_db(pg_conn_t const &db_connection,
                                params_t const &params, uint32_t zoom)
 {
     auto const schema = params.get_string("schema", default_schema);
+
     std::string table;
     if (params.has("src_table")) {
         table = params.get_string("src_table");
@@ -147,8 +154,15 @@ tile_extent get_extent_from_db(pg_conn_t const &db_connection,
     } else {
         throw std::runtime_error{"Need 'src_table' or 'src_tables' param."};
     }
+
     auto const geom_column = params.get_string("geom_column", "geom");
-    return get_extent_from_db(db_connection, schema, table, geom_column, zoom);
+    auto const raster_column = params.get_string("raster_column", "");
+
+    bool const is_raster = raster_column != "";
+
+    return get_extent_from_db(db_connection, schema, table,
+                              is_raster ? raster_column : geom_column,
+                              is_raster, zoom);
 }
 
 void get_tiles_from_table(pg_conn_t const &connection, std::string const &table,

From 050276e91e2772bca620a5dedbb60d6583efa5f6 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 10 Aug 2024 20:31:40 +0200
Subject: [PATCH 161/430] Fix problem with previous commit on C++20

It appears that with C++20 the fmt library expects the format string to
be constexpr.
---
 src/gen/osm2pgsql-gen.cpp | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index 9b977cf83..c3292da22 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -109,15 +109,20 @@ tile_extent get_extent_from_db(pg_conn_t const &db_connection,
         return {};
     }
 
-    std::string const sql =
-        raster ? "SELECT ST_XMin(extent), ST_YMin(extent),"
-                 " ST_XMax(extent), ST_YMax(extent)"
-                 " FROM raster_columns WHERE r_table_schema='{}'"
-                 " AND r_table_name='{}' AND r_raster_column = '{}'"
-               : "SELECT ST_XMin(e), ST_YMin(e), ST_XMax(e), ST_YMax(e)"
-                 " FROM ST_EstimatedExtent('{}', '{}', '{}') AS e";
-
-    auto const result = db_connection.exec(sql, schema, table, column);
+    pg_result_t result;
+    if (raster) {
+        result = db_connection.exec(
+            "SELECT ST_XMin(extent), ST_YMin(extent),"
+            " ST_XMax(extent), ST_YMax(extent)"
+            " FROM raster_columns WHERE r_table_schema='{}'"
+            " AND r_table_name='{}' AND r_raster_column = '{}'",
+            schema, table, column);
+    } else {
+        result = db_connection.exec(
+            "SELECT ST_XMin(e), ST_YMin(e), ST_XMax(e), ST_YMax(e)"
+            " FROM ST_EstimatedExtent('{}', '{}', '{}') AS e",
+            schema, table, column);
+    }
 
     if (result.num_tuples() == 0 || result.is_null(0, 0)) {
         return {};

From 3537f17fdb6d388f4844cf6cd37661de4e40f862 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 12 Aug 2024 15:40:56 +0200
Subject: [PATCH 162/430] Add after_nodes/ways/relations() callback functions
 in Lua

---
 src/output-flex.cpp                  | 53 +++++++++++++++++++++++++---
 src/output-flex.hpp                  | 10 +++++-
 tests/bdd/flex/lua-callbacks.feature | 49 +++++++++++++++++++++++++
 3 files changed, 107 insertions(+), 5 deletions(-)
 create mode 100644 tests/bdd/flex/lua-callbacks.feature

diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index e43e0312a..3c0a5d8c5 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -804,6 +804,15 @@ int output_flex_t::expire_output_table()
     return 1;
 }
 
+void output_flex_t::call_lua_function(prepared_lua_function_t func)
+{
+    lua_pushvalue(lua_state(), func.index());
+    if (luaX_pcall(lua_state(), 0, func.nresults())) {
+        throw fmt_error("Failed to execute Lua function 'osm2pgsql.{}': {}.",
+                        func.name(), lua_tostring(lua_state(), -1));
+    }
+}
+
 void output_flex_t::call_lua_function(prepared_lua_function_t func,
                                       osmium::OSMObject const &object)
 {
@@ -823,6 +832,13 @@ void output_flex_t::call_lua_function(prepared_lua_function_t func,
     m_calling_context = calling_context::main;
 }
 
+void output_flex_t::get_mutex_and_call_lua_function(
+    prepared_lua_function_t func)
+{
+    std::lock_guard<std::mutex> const guard{lua_mutex};
+    call_lua_function(func);
+}
+
 void output_flex_t::get_mutex_and_call_lua_function(
     prepared_lua_function_t func, osmium::OSMObject const &object)
 {
@@ -960,11 +976,32 @@ void output_flex_t::sync()
     }
 }
 
-void output_flex_t::after_nodes() { flush_tables(m_table_connections); }
+void output_flex_t::after_nodes()
+{
+    if (m_after_nodes) {
+        get_mutex_and_call_lua_function(m_after_nodes);
+    }
+
+    flush_tables(m_table_connections);
+}
 
-void output_flex_t::after_ways() { flush_tables(m_table_connections); }
+void output_flex_t::after_ways()
+{
+    if (m_after_ways) {
+        get_mutex_and_call_lua_function(m_after_ways);
+    }
 
-void output_flex_t::after_relations() { flush_tables(m_table_connections); }
+    flush_tables(m_table_connections);
+}
+
+void output_flex_t::after_relations()
+{
+    if (m_after_relations) {
+        get_mutex_and_call_lua_function(m_after_relations);
+    }
+
+    flush_tables(m_table_connections);
+}
 
 void output_flex_t::stop()
 {
@@ -1138,7 +1175,9 @@ output_flex_t::output_flex_t(output_flex_t const *other,
   m_copy_thread(std::move(copy_thread)), m_lua_state(other->m_lua_state),
   m_process_node(other->m_process_node), m_process_way(other->m_process_way),
   m_process_relation(other->m_process_relation),
-  m_select_relation_members(other->m_select_relation_members)
+  m_select_relation_members(other->m_select_relation_members),
+  m_after_nodes(other->m_after_nodes), m_after_ways(other->m_after_ways),
+  m_after_relations(other->m_after_relations)
 {
     for (auto &table : *m_tables) {
         table.prepare(m_db_connection);
@@ -1369,6 +1408,12 @@ void output_flex_t::init_lua(std::string const &filename,
     m_select_relation_members = prepared_lua_function_t{
         lua_state(), calling_context::select_relation_members,
         "select_relation_members", 1};
+    m_after_nodes = prepared_lua_function_t{lua_state(), calling_context::main,
+                                            "after_nodes"};
+    m_after_ways = prepared_lua_function_t{lua_state(), calling_context::main,
+                                           "after_ways"};
+    m_after_relations = prepared_lua_function_t{
+        lua_state(), calling_context::main, "after_relations"};
 
     lua_remove(lua_state(), 1); // global "osm2pgsql"
 }
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index cc05b6ebc..7bbac95e4 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -181,6 +181,9 @@ class output_flex_t : public output_t
 private:
     void select_relation_members();
 
+    /// Call a Lua function that was "prepared" earlier.
+    void call_lua_function(prepared_lua_function_t func);
+
     /**
      * Call a Lua function that was "prepared" earlier with the OSMObject
      * as its only parameter.
@@ -188,7 +191,9 @@ class output_flex_t : public output_t
     void call_lua_function(prepared_lua_function_t func,
                            osmium::OSMObject const &object);
 
-    /// Aquire the lua_mutex and the call `call_lua_function()`.
+    /// Aquire the lua_mutex and then call `call_lua_function()`.
+    void get_mutex_and_call_lua_function(prepared_lua_function_t func);
+
     void get_mutex_and_call_lua_function(prepared_lua_function_t func,
                                          osmium::OSMObject const &object);
 
@@ -296,6 +301,9 @@ class output_flex_t : public output_t
     prepared_lua_function_t m_process_way{};
     prepared_lua_function_t m_process_relation{};
     prepared_lua_function_t m_select_relation_members{};
+    prepared_lua_function_t m_after_nodes{};
+    prepared_lua_function_t m_after_ways{};
+    prepared_lua_function_t m_after_relations{};
 
     calling_context m_calling_context = calling_context::main;
 
diff --git a/tests/bdd/flex/lua-callbacks.feature b/tests/bdd/flex/lua-callbacks.feature
new file mode 100644
index 000000000..e330b9452
--- /dev/null
+++ b/tests/bdd/flex/lua-callbacks.feature
@@ -0,0 +1,49 @@
+Feature: Lua callbacks are called
+
+    Scenario: Check access to osm2pgsql object from Lua
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            local nodes = 0
+            local ways = 0
+            local relations = 0
+            local n = 0
+
+            osm2pgsql.define_node_table('dummy', {})
+
+            function osm2pgsql.process_node(object)
+                nodes = nodes + 1
+            end
+
+            function osm2pgsql.process_way(object)
+                ways = ways + 1
+            end
+
+            function osm2pgsql.process_relation(object)
+                relations = relations + 1
+            end
+
+            local function out()
+                print(n .. 'n=' .. nodes .. '@')
+                print(n .. 'w=' .. ways .. '@')
+                print(n .. 'r=' .. relations .. '@')
+                n = n + 1
+            end
+
+            osm2pgsql.after_nodes = out
+            osm2pgsql.after_ways = out
+            osm2pgsql.after_relations = out
+            """
+        When running osm2pgsql flex
+        Then the standard output contains
+            """
+            0n=1562@
+            0w=0@
+            0r=0@
+            1n=1562@
+            1w=7105@
+            1r=0@
+            2n=1562@
+            2w=7105@
+            2r=113@
+            """

From ac8bc1d8af499aa5bbd396cd9f47d837f354bbf2 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 13 Aug 2024 13:48:59 +0200
Subject: [PATCH 163/430] Add get_bbox() function to geometries in Lua

Add new get_bbox() function for geometries in Lua. Like the get_bbox()
function on OSM objects it returns the bounding box as four numbers in a
Lua array (table). Having this function on geometries allows for more
flexibility, you can call it on a centroid or a projected geometry for
instance.

It is faster to call get_bbox() on the OSM object, because it removes
the step of building the geometry first, so for those cases where this
is good enough the old use is fine and is still supported.

See #2219
---
 src/flex-lua-geom.cpp       | 19 +++++++++++++++++++
 tests/bdd/flex/bbox.feature | 15 +++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/src/flex-lua-geom.cpp b/src/flex-lua-geom.cpp
index 47accbaed..448c949f0 100644
--- a/src/flex-lua-geom.cpp
+++ b/src/flex-lua-geom.cpp
@@ -8,6 +8,7 @@
  */
 
 #include "flex-lua-geom.hpp"
+#include "geom-box.hpp"
 #include "geom-functions.hpp"
 #include "geom-pole-of-inaccessibility.hpp"
 #include "lua-utils.hpp"
@@ -242,6 +243,23 @@ int geom_simplify(lua_State *lua_state)
     return 1;
 }
 
+int geom_get_bbox(lua_State *lua_state)
+{
+    auto const *const input_geometry = unpack_geometry(lua_state);
+
+    try {
+        auto const box = geom::envelope(*input_geometry);
+        lua_pushnumber(lua_state, box.min_x());
+        lua_pushnumber(lua_state, box.min_y());
+        lua_pushnumber(lua_state, box.max_x());
+        lua_pushnumber(lua_state, box.max_y());
+    } catch (...) {
+        return luaL_error(lua_state, "Unknown error in 'get_bbox()'.\n");
+    }
+
+    return 4;
+}
+
 int geom_srid(lua_State *lua_state)
 {
     auto const *const input_geometry = unpack_geometry(lua_state);
@@ -298,6 +316,7 @@ void init_geometry_class(lua_State *lua_state)
     luaX_add_table_func(lua_state, "area", geom_area);
     luaX_add_table_func(lua_state, "length", geom_length);
     luaX_add_table_func(lua_state, "centroid", geom_centroid);
+    luaX_add_table_func(lua_state, "get_bbox", geom_get_bbox);
     luaX_add_table_func(lua_state, "geometry_n", geom_geometry_n);
     luaX_add_table_func(lua_state, "geometry_type", geom_geometry_type);
     luaX_add_table_func(lua_state, "is_null", geom_is_null);
diff --git a/tests/bdd/flex/bbox.feature b/tests/bdd/flex/bbox.feature
index 129f8ac3d..da1e606c2 100644
--- a/tests/bdd/flex/bbox.feature
+++ b/tests/bdd/flex/bbox.feature
@@ -18,6 +18,11 @@ Feature: Test get_bbox() function
             function osm2pgsql.process_node(object)
                 local row = { geom = object:as_point() }
                 row.min_x, row.min_y, row.max_x, row.max_y = object:get_bbox()
+                local min_x, min_y, max_x, max_y = object:as_point():get_bbox()
+                assert(row.min_x == min_x)
+                assert(row.min_y == min_y)
+                assert(row.max_x == max_x)
+                assert(row.max_y == max_y)
                 points:insert(row)
             end
             """
@@ -53,6 +58,11 @@ Feature: Test get_bbox() function
             function osm2pgsql.process_way(object)
                 local row = { geom = object:as_linestring() }
                 row.min_x, row.min_y, row.max_x, row.max_y = object:get_bbox()
+                local min_x, min_y, max_x, max_y = object:as_linestring():get_bbox()
+                assert(row.min_x == min_x)
+                assert(row.min_y == min_y)
+                assert(row.max_x == max_x)
+                assert(row.max_y == max_y)
                 highways:insert(row)
             end
             """
@@ -93,6 +103,11 @@ Feature: Test get_bbox() function
                 row.min_x, row.min_y, row.max_x, row.max_y = object:get_bbox()
                 for sgeom in object:as_multilinestring():line_merge():geometries() do
                     row.geom = sgeom
+                    local min_x, min_y, max_x, max_y = sgeom:get_bbox()
+                    assert(row.min_x == min_x)
+                    assert(row.min_y == min_y)
+                    assert(row.max_x == max_x)
+                    assert(row.max_y == max_y)
                     rels:insert(row)
                 end
             end

From d6256a0c89b1c6a92add8d980f8aeb6f226c8a21 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 12 Aug 2024 10:52:19 +0200
Subject: [PATCH 164/430] Make --flat-nodes also work in non-slim mode

This is useful if memory is tight.

Flat node file is not deleted automatically. Use --drop to delete it.
This is the same behaviour as in slim mode.
---
 man/osm2pgsql.md                          | 15 +++----
 src/command-line-parser.cpp               | 16 +++-----
 src/middle-ram.cpp                        | 48 ++++++++++++++++++-----
 src/middle-ram.hpp                        |  5 +++
 src/node-persistent-cache.hpp             |  6 +++
 tests/bdd/regression/multipolygon.feature | 16 ++++++++
 tests/test-options-parse.cpp              |  2 -
 7 files changed, 80 insertions(+), 28 deletions(-)

diff --git a/man/osm2pgsql.md b/man/osm2pgsql.md
index 872f715ba..1e23b990a 100644
--- a/man/osm2pgsql.md
+++ b/man/osm2pgsql.md
@@ -155,16 +155,17 @@ mandatory for short options too.
     timestamp and version.
 
 \--flat-nodes=FILENAME
-:   The flat-nodes mode is a separate method to store slim mode node information on disk.
-    Instead of storing this information in the main PostgreSQL database, this mode creates
-    its own separate custom database to store the information. As this custom database
-    has application level knowledge about the data to store and is not general purpose,
-    it can store the data much more efficiently. Storing the node information for the full
-    planet requires more than 300GB in PostgreSQL, the same data is stored in "only" 50GB using
+:   Use a file on disk to store node locations instead of storing them in
+    memory (in non-slim mode) or in the database (in slim mode). This is much
+    more efficient than storing the data in the database.
+    Storing the node information for the full
+    planet requires more than 500GB in PostgreSQL, the same data is stored in "only" 90GB using
     the flat-nodes mode. This can also increase the speed of applying diff files. This option
     activates the flat-nodes mode and specifies the location of the database file. It is a
     single large file. This mode is only recommended for full planet imports
-    as it doesn't work well with small imports. The default is disabled.
+    as it doesn't work well with small imports. The default is disabled. The
+    file will stay on disk after import, use \--drop to remove it (but you
+    can't do updates then).
 
 \--middle-schema=SCHEMA
 :   Use PostgreSQL schema SCHEMA for all tables, indexes, and functions in the
diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index 8666f09d0..73da7a734 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -114,9 +114,9 @@ void parse_expire_tiles_param(char const *arg, uint32_t *expire_tiles_zoom_min,
 void check_options_non_slim(CLI::App const &app)
 {
     std::vector<std::string> const slim_options = {
-        "--flat-nodes",           "--middle-schema",
-        "--middle-with-nodes",    "--middle-way-node-index-id-shift",
-        "--tablespace-slim-data", "--tablespace-slim-index"};
+        "--middle-schema", "--middle-with-nodes",
+        "--middle-way-node-index-id-shift", "--tablespace-slim-data",
+        "--tablespace-slim-index"};
 
     for (auto const &opt : slim_options) {
         if (app.count(opt) > 0) {
@@ -190,10 +190,6 @@ void check_options(options_t *options)
         throw std::runtime_error{"--append can only be used with slim mode!"};
     }
 
-    if (options->droptemp && !options->slim) {
-        throw std::runtime_error{"--drop only makes sense with --slim."};
-    }
-
     if (options->cache < 0) {
         options->cache = 0;
         log_warn("RAM cache cannot be negative. Using 0 instead.");
@@ -494,7 +490,7 @@ options_t parse_command_line(int argc, char *argv[])
 
     // --drop
     app.add_flag("--drop", options.droptemp)
-        ->description("Drop middle tables after import (needs --slim).")
+        ->description("Drop middle tables and flat node file after import.")
         ->group("Middle options");
 
     // --extra-attributes
@@ -505,8 +501,8 @@ options_t parse_command_line(int argc, char *argv[])
 
     // --flat-nodes
     app.add_option("-F,--flat-nodes", options.flat_node_file)
-        ->description("File for storing node locations (needs --slim,"
-                      " default: store in database).")
+        ->description(
+            "File for storing node locations (default: store in database).")
         ->type_name("FILE")
         ->group("Middle options");
 
diff --git a/src/middle-ram.cpp b/src/middle-ram.cpp
index 82170fbe0..13c3d96eb 100644
--- a/src/middle-ram.cpp
+++ b/src/middle-ram.cpp
@@ -7,8 +7,10 @@
  * For a full list of authors see the git log.
  */
 
-#include "logging.hpp"
 #include "middle-ram.hpp"
+
+#include "logging.hpp"
+#include "node-persistent-cache.hpp"
 #include "options.hpp"
 #include "output-requirements.hpp"
 
@@ -75,6 +77,11 @@ middle_ram_t::middle_ram_t(std::shared_ptr<thread_pool_t> thread_pool,
     if (options->extra_attributes) {
         m_store_options.untagged_nodes = true;
     }
+
+    if (!options->flat_node_file.empty()) {
+        m_persistent_cache = std::make_shared<node_persistent_cache>(
+            options->flat_node_file, options->droptemp);
+    }
 }
 
 void middle_ram_t::set_requirements(output_requirements const &requirements)
@@ -94,6 +101,7 @@ void middle_ram_t::set_requirements(output_requirements const &requirements)
 
     log_debug("Middle 'ram' options:");
     log_debug("  locations: {}", m_store_options.locations);
+    log_debug("  locations_on_disk: {}", !!m_persistent_cache);
     log_debug("  way_nodes: {}", m_store_options.way_nodes);
     log_debug("  nodes: {}", m_store_options.nodes);
     log_debug("  untagged_nodes: {}", m_store_options.untagged_nodes);
@@ -107,8 +115,15 @@ void middle_ram_t::stop()
 
     auto const mbyte = 1024 * 1024;
 
-    log_debug("Middle 'ram': Node locations: size={} bytes={}M",
-              m_node_locations.size(), m_node_locations.used_memory() / mbyte);
+    if (m_persistent_cache) {
+        log_debug("Middle 'ram': Node locations on disk: size={} bytes={}M",
+                  m_persistent_cache->size(),
+                  m_persistent_cache->used_memory() / mbyte);
+    } else {
+        log_debug("Middle 'ram': Node locations in memory: size={} bytes={}M",
+                  m_node_locations.size(),
+                  m_node_locations.used_memory() / mbyte);
+    }
 
     log_debug("Middle 'ram': Way nodes data: size={} capacity={} bytes={}M",
               m_way_nodes_data.size(), m_way_nodes_data.capacity(),
@@ -180,7 +195,11 @@ void middle_ram_t::node(osmium::Node const &node)
     assert(node.visible());
 
     if (m_store_options.locations) {
-        m_node_locations.set(node.id(), node.location());
+        if (m_persistent_cache) {
+            m_persistent_cache->set(node.id(), node.location());
+        } else {
+            m_node_locations.set(node.id(), node.location());
+        }
     }
 
     if (m_store_options.nodes &&
@@ -222,7 +241,9 @@ void middle_ram_t::after_nodes()
     m_middle_state = middle_state::way;
 #endif
 
-    m_node_locations.log_stats();
+    if (!m_persistent_cache) {
+        m_node_locations.log_stats();
+    }
 }
 
 osmium::Location middle_ram_t::get_node_location(osmid_t id) const
@@ -237,10 +258,19 @@ std::size_t middle_ram_t::nodes_get_list(osmium::WayNodeList *nodes) const
     std::size_t count = 0;
 
     if (m_store_options.locations) {
-        for (auto &nr : *nodes) {
-            nr.set_location(m_node_locations.get(nr.ref()));
-            if (nr.location().valid()) {
-                ++count;
+        if (m_persistent_cache) {
+            for (auto &nr : *nodes) {
+                nr.set_location(m_persistent_cache->get(nr.ref()));
+                if (nr.location().valid()) {
+                    ++count;
+                }
+            }
+        } else {
+            for (auto &nr : *nodes) {
+                nr.set_location(m_node_locations.get(nr.ref()));
+                if (nr.location().valid()) {
+                    ++count;
+                }
             }
         }
     }
diff --git a/src/middle-ram.hpp b/src/middle-ram.hpp
index 1f4509fa9..a595104bc 100644
--- a/src/middle-ram.hpp
+++ b/src/middle-ram.hpp
@@ -24,6 +24,7 @@
 #include <string>
 #include <utility>
 
+class node_persistent_cache;
 class thread_pool_t;
 
 /**
@@ -124,6 +125,10 @@ class middle_ram_t : public middle_t, public middle_query_t
 
     /// Options for this middle.
     middle_ram_options m_store_options;
+
+    /// File cache
+    std::shared_ptr<node_persistent_cache> m_persistent_cache;
+
 }; // class middle_ram_t
 
 #endif // OSM2PGSQL_MIDDLE_RAM_HPP
diff --git a/src/node-persistent-cache.hpp b/src/node-persistent-cache.hpp
index 3bebc4887..07b7e6962 100644
--- a/src/node-persistent-cache.hpp
+++ b/src/node-persistent-cache.hpp
@@ -33,6 +33,12 @@ class node_persistent_cache
     void set(osmid_t id, osmium::Location location);
     osmium::Location get(osmid_t id) const noexcept;
 
+    /// The number of locations stored.
+    std::size_t size() const { return m_index->size(); }
+
+    /// Return the approximate number of bytes used for internal storage.
+    std::size_t used_memory() const { return m_index->used_memory(); }
+
 private:
     using index_t =
         osmium::index::map::DenseFileArray<osmium::unsigned_object_id_type,
diff --git a/tests/bdd/regression/multipolygon.feature b/tests/bdd/regression/multipolygon.feature
index 1b54d8062..1e3701219 100644
--- a/tests/bdd/regression/multipolygon.feature
+++ b/tests/bdd/regression/multipolygon.feature
@@ -137,6 +137,22 @@ Feature: Import and update of multipolygon areas
             | -k     | the default |
 
 
+     Scenario: Import with flat-node option
+        When running osm2pgsql pgsql with parameters
+            | -F | flat.store | --drop |
+
+        Then table planet_osm_polygon contains
+            | osm_id | landuse     | name      | round(ST_Area(way)) |
+            | -1     | residential | Name_rel  | 12895               |
+            | 4      | farmland    | Name_way3 | 3144                |
+            | -8     | residential | Name_rel2 | 12894               |
+            | 5      | farmland    | Name_way4 | 3144                |
+            | -14    | residential | Name_way5 | 12894               |
+            | -11    | residential | Name_rel6 | 11529               |
+            | -3     | residential | Name_rel11| 9286                |
+            | 83     | farmland    | NULL      | 24859               |
+
+
      Scenario: Import and update with flat-node option
         When running osm2pgsql pgsql with parameters
             | --slim | -F | flat.store |
diff --git a/tests/test-options-parse.cpp b/tests/test-options-parse.cpp
index 6ac4505b3..8c696d02e 100644
--- a/tests/test-options-parse.cpp
+++ b/tests/test-options-parse.cpp
@@ -48,8 +48,6 @@ TEST_CASE("Incompatible arguments", "[NoDB]")
 {
     bad_opt({"-a", "-c", "--slim"}, "options can not be used at the same time");
 
-    bad_opt({"--drop"}, "drop only makes sense with");
-
     bad_opt({"-j", "-k"}, "--hstore excludes --hstore-all");
 
     bad_opt({"-a"}, "--append can only be used with slim mode");

From ef940c6a61012cc07c5eabcf859f211a91aa2437 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 14 Aug 2024 11:37:47 +0200
Subject: [PATCH 165/430] Write our own area assembler wrapper class

This is very similar to the one provided by libosmium. But it is a bit
simpler, removing some code that is unnecessary for us.

The actual work is done in the osmium::area::detail::BasicAssembler
class anyway. And the new class is still based on that.
---
 src/CMakeLists.txt          |  1 +
 src/geom-area-assembler.cpp | 59 ++++++++++++++++++++++++++++++++
 src/geom-area-assembler.hpp | 67 +++++++++++++++++++++++++++++++++++++
 src/geom-from-osm.cpp       | 19 +++++------
 4 files changed, 135 insertions(+), 11 deletions(-)
 create mode 100644 src/geom-area-assembler.cpp
 create mode 100644 src/geom-area-assembler.hpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 83094f608..ee2b260b9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -25,6 +25,7 @@ target_sources(osm2pgsql_lib PRIVATE
     flex-table-column.cpp
     flex-table.cpp
     flex-write.cpp
+    geom-area-assembler.cpp
     geom-box.cpp
     geom-from-osm.cpp
     geom-functions.cpp
diff --git a/src/geom-area-assembler.cpp b/src/geom-area-assembler.cpp
new file mode 100644
index 000000000..e012d9cf8
--- /dev/null
+++ b/src/geom-area-assembler.cpp
@@ -0,0 +1,59 @@
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+#include "geom-area-assembler.hpp"
+
+#include <osmium/builder/osm_object_builder.hpp>
+
+namespace geom {
+
+const osmium::area::AssemblerConfig area_config;
+
+area_assembler_t::area_assembler_t(osmium::memory::Buffer *buffer)
+: osmium::area::detail::BasicAssembler(area_config), m_buffer(buffer)
+{
+}
+
+bool area_assembler_t::make_area()
+{
+    if (!create_rings()) {
+        return false;
+    }
+
+    m_buffer->clear();
+    {
+        osmium::builder::AreaBuilder builder{*m_buffer};
+        add_rings_to_area(builder);
+    }
+    m_buffer->commit();
+
+    return true;
+}
+
+bool area_assembler_t::operator()(const osmium::Way &way)
+{
+    segment_list().extract_segments_from_way(nullptr, stats().duplicate_nodes,
+                                             way);
+    return make_area();
+}
+
+// Currently the relation is not needed for assembling the area, because
+// the roles on the members are ignored. In the future we might want to use
+// the roles, so we leave the function signature as it is.
+bool area_assembler_t::operator()(const osmium::Relation & /*relation*/,
+                                  const osmium::memory::Buffer &ways_buffer)
+{
+    for (const auto &way : ways_buffer.select<osmium::Way>()) {
+        segment_list().extract_segments_from_way(nullptr,
+                                                 stats().duplicate_nodes, way);
+    }
+    return make_area();
+}
+
+} // namespace geom
diff --git a/src/geom-area-assembler.hpp b/src/geom-area-assembler.hpp
new file mode 100644
index 000000000..0a3387cc1
--- /dev/null
+++ b/src/geom-area-assembler.hpp
@@ -0,0 +1,67 @@
+#ifndef OSM2PGSQL_GEOM_AREA_ASSEMBLER_HPP
+#define OSM2PGSQL_GEOM_AREA_ASSEMBLER_HPP
+
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+/**
+ * \file
+ *
+ * Code for assembling areas from ways or relations.
+ */
+
+#include <osmium/area/detail/basic_assembler.hpp>
+
+namespace geom {
+
+/**
+ * The area_assembler_t class is a light wrapper around the libosmium class
+ * for assembling areas.
+ */
+class area_assembler_t : public osmium::area::detail::BasicAssembler
+{
+public:
+    area_assembler_t(osmium::memory::Buffer *buffer);
+
+    /**
+     * Assemble an area from the given way.
+     *
+     * @returns false if there was some kind of error building the
+     *          area, true otherwise.
+     */
+    bool operator()(const osmium::Way &way);
+
+    /**
+     * Assemble an area from the given relation and its member ways
+     * which are in the ways_buffer.
+     *
+     * @returns false if there was some kind of error building the
+     *          area, true otherwise.
+     */
+    bool operator()(const osmium::Relation &relation,
+                    const osmium::memory::Buffer &ways_buffer);
+
+    /**
+     * Access the area that was built last.
+     */
+    osmium::Area const &get_area() const noexcept
+    {
+        return m_buffer->get<osmium::Area>(0);
+    }
+
+private:
+    bool make_area();
+
+    osmium::memory::Buffer* m_buffer;
+
+}; // class area_assembler_t
+
+} // namespace geom
+
+#endif // OSM2PGSQL_GEOM_AREA_ASSEMBLER_HPP
diff --git a/src/geom-from-osm.cpp b/src/geom-from-osm.cpp
index 71f858f12..ac64d9f45 100644
--- a/src/geom-from-osm.cpp
+++ b/src/geom-from-osm.cpp
@@ -8,9 +8,10 @@
  */
 
 #include "geom-from-osm.hpp"
+
+#include "geom-area-assembler.hpp"
 #include "osmtypes.hpp"
 
-#include <osmium/area/geom_assembler.hpp>
 #include <osmium/osm/way.hpp>
 
 #include <utility>
@@ -99,17 +100,15 @@ void create_polygon(geometry_t *geom, osmium::Way const &way)
         return;
     }
 
-    osmium::area::AssemblerConfig area_config;
-    area_config.ignore_invalid_locations = true;
-    osmium::area::GeomAssembler assembler{area_config};
     osmium::memory::Buffer area_buffer{1024};
+    geom::area_assembler_t assembler{&area_buffer};
 
-    if (!assembler(way, area_buffer)) {
+    if (!assembler(way)) {
         geom->reset();
         return;
     }
 
-    auto const &area = area_buffer.get<osmium::Area>(0);
+    auto const &area = assembler.get_area();
     auto const &ring = *area.begin<osmium::OuterRing>();
 
     fill_point_list(&polygon.outer(), ring);
@@ -208,17 +207,15 @@ geometry_t create_multilinestring(osmium::memory::Buffer const &buffer,
 void create_multipolygon(geometry_t *geom, osmium::Relation const &relation,
                          osmium::memory::Buffer const &buffer)
 {
-    osmium::area::AssemblerConfig area_config;
-    area_config.ignore_invalid_locations = true;
-    osmium::area::GeomAssembler assembler{area_config};
     osmium::memory::Buffer area_buffer{1024};
+    geom::area_assembler_t assembler{&area_buffer};
 
-    if (!assembler(relation, buffer, area_buffer)) {
+    if (!assembler(relation, buffer)) {
         geom->reset();
         return;
     }
 
-    auto const &area = area_buffer.get<osmium::Area>(0);
+    auto const &area = assembler.get_area();
 
     if (area.is_multipolygon()) {
         auto &multipolygon = geom->set<multipolygon_t>();

From 83072b075f02c3e5c25eec705d6975fd77b7425f Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 14 Aug 2024 13:42:29 +0200
Subject: [PATCH 166/430] Re-use temp buffer for area creation

Saves memory allocations.
---
 src/geom-from-osm.cpp             | 22 ++++++++++++----------
 src/geom-from-osm.hpp             | 16 ++++++++++++----
 src/output-flex.cpp               | 11 +++++++----
 src/output-flex.hpp               |  2 ++
 src/output-pgsql.cpp              | 14 ++++++++------
 src/output-pgsql.hpp              |  1 +
 tests/test-geom-multipolygons.cpp | 24 ++++++++++++++++++------
 tests/test-geom-polygons.cpp      | 24 ++++++++++++++++++------
 8 files changed, 78 insertions(+), 36 deletions(-)

diff --git a/src/geom-from-osm.cpp b/src/geom-from-osm.cpp
index ac64d9f45..5f534bb22 100644
--- a/src/geom-from-osm.cpp
+++ b/src/geom-from-osm.cpp
@@ -90,7 +90,8 @@ geometry_t create_linestring(osmium::Way const &way)
     return geom;
 }
 
-void create_polygon(geometry_t *geom, osmium::Way const &way)
+void create_polygon(geometry_t *geom, osmium::Way const &way,
+                    osmium::memory::Buffer *area_buffer)
 {
     auto &polygon = geom->set<polygon_t>();
 
@@ -100,8 +101,7 @@ void create_polygon(geometry_t *geom, osmium::Way const &way)
         return;
     }
 
-    osmium::memory::Buffer area_buffer{1024};
-    geom::area_assembler_t assembler{&area_buffer};
+    geom::area_assembler_t assembler{area_buffer};
 
     if (!assembler(way)) {
         geom->reset();
@@ -114,10 +114,11 @@ void create_polygon(geometry_t *geom, osmium::Way const &way)
     fill_point_list(&polygon.outer(), ring);
 }
 
-geometry_t create_polygon(osmium::Way const &way)
+geometry_t create_polygon(osmium::Way const &way,
+                          osmium::memory::Buffer *area_buffer)
 {
     geometry_t geom{};
-    create_polygon(&geom, way);
+    create_polygon(&geom, way, area_buffer);
     return geom;
 }
 
@@ -205,10 +206,10 @@ geometry_t create_multilinestring(osmium::memory::Buffer const &buffer,
 }
 
 void create_multipolygon(geometry_t *geom, osmium::Relation const &relation,
-                         osmium::memory::Buffer const &buffer)
+                         osmium::memory::Buffer const &buffer,
+                         osmium::memory::Buffer *area_buffer)
 {
-    osmium::memory::Buffer area_buffer{1024};
-    geom::area_assembler_t assembler{&area_buffer};
+    geom::area_assembler_t assembler{area_buffer};
 
     if (!assembler(relation, buffer)) {
         geom->reset();
@@ -231,10 +232,11 @@ void create_multipolygon(geometry_t *geom, osmium::Relation const &relation,
 }
 
 geometry_t create_multipolygon(osmium::Relation const &relation,
-                               osmium::memory::Buffer const &buffer)
+                               osmium::memory::Buffer const &buffer,
+                               osmium::memory::Buffer *area_buffer)
 {
     geometry_t geom{};
-    create_multipolygon(&geom, relation, buffer);
+    create_multipolygon(&geom, relation, buffer, area_buffer);
     return geom;
 }
 
diff --git a/src/geom-from-osm.hpp b/src/geom-from-osm.hpp
index 7b109250a..ece07d0ec 100644
--- a/src/geom-from-osm.hpp
+++ b/src/geom-from-osm.hpp
@@ -76,8 +76,10 @@ void create_linestring(geometry_t *geom, osmium::Way const &way);
  *
  * \param geom Pointer to an existing geometry which will be used as output.
  * \param way The input way.
+ * \param area_buffer Temporary buffer used to create area.
  */
-void create_polygon(geometry_t *geom, osmium::Way const &way);
+void create_polygon(geometry_t *geom, osmium::Way const &way,
+                    osmium::memory::Buffer *area_buffer);
 
 /**
  * Create a polygon geometry from a way.
@@ -85,9 +87,11 @@ void create_polygon(geometry_t *geom, osmium::Way const &way);
  * If the resulting polygon would be invalid, a null geometry is returned.
  *
  * \param way The input way.
+ * \param area_buffer Temporary buffer used to create area.
  * \returns The created geometry.
  */
-[[nodiscard]] geometry_t create_polygon(osmium::Way const &way);
+[[nodiscard]] geometry_t create_polygon(osmium::Way const &way,
+                                        osmium::memory::Buffer *area_buffer);
 
 /**
  * Create a multipoint geometry from a bunch of nodes (usually this would be
@@ -163,9 +167,11 @@ create_multilinestring(osmium::memory::Buffer const &buffer,
  * \param geom Pointer to an existing geometry which will be used as output.
  * \param relation The input relation.
  * \param buffer Buffer with OSM objects. Anything but ways are ignored.
+ * \param area_buffer Temporary buffer used to create area.
  */
 void create_multipolygon(geometry_t *geom, osmium::Relation const &relation,
-                         osmium::memory::Buffer const &buffer);
+                         osmium::memory::Buffer const &buffer,
+                         osmium::memory::Buffer *area_buffer);
 
 /**
  * Create a (multi)polygon geometry from a relation and member ways.
@@ -175,11 +181,13 @@ void create_multipolygon(geometry_t *geom, osmium::Relation const &relation,
  *
  * \param relation The input relation.
  * \param buffer Buffer with OSM objects. Anything but ways are ignored.
+ * \param area_buffer Temporary buffer used to create area.
  * \returns The created geometry.
  */
 [[nodiscard]] geometry_t
 create_multipolygon(osmium::Relation const &relation,
-                    osmium::memory::Buffer const &buffer);
+                    osmium::memory::Buffer const &buffer,
+                    osmium::memory::Buffer *area_buffer);
 
 /**
  * Create a geometry collection from nodes and ways, usually used for
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 3c0a5d8c5..80a6bb029 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -400,7 +400,7 @@ int output_flex_t::app_as_polygon()
     m_way_cache.add_nodes(middle());
 
     auto *geom = create_lua_geometry_object(lua_state());
-    geom::create_polygon(geom, m_way_cache.get());
+    geom::create_polygon(geom, m_way_cache.get(), &m_area_buffer);
 
     return 1;
 }
@@ -459,7 +459,7 @@ int output_flex_t::app_as_multipolygon()
         m_way_cache.add_nodes(middle());
 
         auto *geom = create_lua_geometry_object(lua_state());
-        geom::create_polygon(geom, m_way_cache.get());
+        geom::create_polygon(geom, m_way_cache.get(), &m_area_buffer);
 
         return 1;
     }
@@ -468,7 +468,8 @@ int output_flex_t::app_as_multipolygon()
 
     auto *geom = create_lua_geometry_object(lua_state());
     geom::create_multipolygon(geom, m_relation_cache.get(),
-                              m_relation_cache.members_buffer());
+                              m_relation_cache.members_buffer(),
+                              &m_area_buffer);
 
     return 1;
 }
@@ -1173,6 +1174,7 @@ output_flex_t::output_flex_t(output_flex_t const *other,
   m_db_connection(get_options()->connection_params, "out.flex.thread"),
   m_stage2_way_ids(other->m_stage2_way_ids),
   m_copy_thread(std::move(copy_thread)), m_lua_state(other->m_lua_state),
+  m_area_buffer(1024, osmium::memory::Buffer::auto_grow::yes),
   m_process_node(other->m_process_node), m_process_way(other->m_process_way),
   m_process_relation(other->m_process_relation),
   m_select_relation_members(other->m_select_relation_members),
@@ -1203,7 +1205,8 @@ output_flex_t::output_flex_t(std::shared_ptr<middle_query_t> const &mid,
                              properties_t const &properties)
 : output_t(mid, std::move(thread_pool), options),
   m_db_connection(get_options()->connection_params, "out.flex.main"),
-  m_copy_thread(std::make_shared<db_copy_thread_t>(options.connection_params))
+  m_copy_thread(std::make_shared<db_copy_thread_t>(options.connection_params)),
+  m_area_buffer(1024, osmium::memory::Buffer::auto_grow::yes)
 {
     init_lua(options.style, properties);
 
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index 7bbac95e4..4ca5f733e 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -297,6 +297,8 @@ class output_flex_t : public output_t
     relation_cache_t m_relation_cache;
     osmium::Node const *m_context_node = nullptr;
 
+    osmium::memory::Buffer m_area_buffer;
+
     prepared_lua_function_t m_process_node{};
     prepared_lua_function_t m_process_way{};
     prepared_lua_function_t m_process_relation{};
diff --git a/src/output-pgsql.cpp b/src/output-pgsql.cpp
index 9a8b34d06..896683636 100644
--- a/src/output-pgsql.cpp
+++ b/src/output-pgsql.cpp
@@ -95,7 +95,7 @@ void output_pgsql_t::pgsql_out_way(osmium::Way const &way, taglist_t *tags,
                                    bool polygon, bool roads)
 {
     if (polygon && !way.nodes().empty() && way.is_closed()) {
-        auto const geom = geom::create_polygon(way);
+        auto const geom = geom::create_polygon(way, &m_area_buffer);
         auto const projected_geom = geom::transform(geom, *m_proj);
 
         auto const wkb = geom_to_ewkb(projected_geom);
@@ -297,9 +297,9 @@ void output_pgsql_t::pgsql_process_relation(osmium::Relation const &rel)
 
     // multipolygons and boundaries
     if (make_boundary || make_polygon) {
-        auto const geoms =
-            geom::split_multi(geom::create_multipolygon(rel, m_buffer),
-                              !get_options()->enable_multi);
+        auto const geoms = geom::split_multi(
+            geom::create_multipolygon(rel, m_buffer, &m_area_buffer),
+            !get_options()->enable_multi);
         for (auto const &sgeom : geoms) {
             auto const projected_geom = geom::transform(sgeom, *m_proj);
             m_expire.from_geometry_if_3857(projected_geom, m_expire_config);
@@ -439,7 +439,8 @@ output_pgsql_t::output_pgsql_t(std::shared_ptr<middle_query_t> const &mid,
 : output_t(mid, std::move(thread_pool), options), m_proj(options.projection),
   m_expire(options.expire_tiles_zoom, options.projection),
   m_buffer(32768, osmium::memory::Buffer::auto_grow::yes),
-  m_rels_buffer(1024, osmium::memory::Buffer::auto_grow::yes)
+  m_rels_buffer(1024, osmium::memory::Buffer::auto_grow::yes),
+  m_area_buffer(1024, osmium::memory::Buffer::auto_grow::yes)
 {
     m_expire_config.full_area_limit = get_options()->expire_tiles_max_bbox;
     if (get_options()->expire_tiles_max_bbox > 0.0) {
@@ -505,7 +506,8 @@ output_pgsql_t::output_pgsql_t(
   m_proj(get_options()->projection), m_expire_config(other->m_expire_config),
   m_expire(get_options()->expire_tiles_zoom, get_options()->projection),
   m_buffer(1024, osmium::memory::Buffer::auto_grow::yes),
-  m_rels_buffer(1024, osmium::memory::Buffer::auto_grow::yes)
+  m_rels_buffer(1024, osmium::memory::Buffer::auto_grow::yes),
+  m_area_buffer(1024, osmium::memory::Buffer::auto_grow::yes)
 {
     for (std::size_t i = 0; i < m_tables.size(); ++i) {
         //copy constructor will just connect to the already there table
diff --git a/src/output-pgsql.hpp b/src/output-pgsql.hpp
index bd4b7a667..e9b6994e8 100644
--- a/src/output-pgsql.hpp
+++ b/src/output-pgsql.hpp
@@ -109,6 +109,7 @@ class output_pgsql_t : public output_t
 
     osmium::memory::Buffer m_buffer;
     osmium::memory::Buffer m_rels_buffer;
+    osmium::memory::Buffer m_area_buffer;
 };
 
 #endif // OSM2PGSQL_OUTPUT_PGSQL_HPP
diff --git a/tests/test-geom-multipolygons.cpp b/tests/test-geom-multipolygons.cpp
index fd891e1a0..b938acca4 100644
--- a/tests/test-geom-multipolygons.cpp
+++ b/tests/test-geom-multipolygons.cpp
@@ -70,7 +70,9 @@ TEST_CASE("create_multipolygon creates simple polygon from OSM data", "[NoDB]")
     buffer.add_way("w21 Nn4x1y2,n1x1y1");
     auto const &relation = buffer.add_relation("r30 Mw20@,w21@");
 
-    auto const geom = geom::create_multipolygon(relation, buffer.buffer());
+    osmium::memory::Buffer area_buffer{1024};
+    auto const geom =
+        geom::create_multipolygon(relation, buffer.buffer(), &area_buffer);
 
     REQUIRE(geom.is_polygon());
     REQUIRE(geometry_type(geom) == "POLYGON");
@@ -92,7 +94,9 @@ TEST_CASE("create_multipolygon from OSM data", "[NoDB]")
     buffer.add_way("w22 Nn5x10y10,n6x10y20,n7x20y20,n5x10y10");
     auto const &relation = buffer.add_relation("r30 Mw20@,w21@,w22@");
 
-    auto const geom = geom::create_multipolygon(relation, buffer.buffer());
+    osmium::memory::Buffer area_buffer{1024};
+    auto const geom =
+        geom::create_multipolygon(relation, buffer.buffer(), &area_buffer);
 
     REQUIRE(geom.is_multipolygon());
     REQUIRE(geometry_type(geom) == "MULTIPOLYGON");
@@ -107,7 +111,9 @@ TEST_CASE("create_multipolygon from OSM data without locations", "[NoDB]")
     buffer.add_way("w20 Nn1,n2,n3,n1");
 
     auto const &relation = buffer.add_relation("r30 Mw20@");
-    auto const geom = geom::create_multipolygon(relation, buffer.buffer());
+    osmium::memory::Buffer area_buffer{1024};
+    auto const geom =
+        geom::create_multipolygon(relation, buffer.buffer(), &area_buffer);
 
     REQUIRE(geom.is_null());
 }
@@ -118,7 +124,9 @@ TEST_CASE("create_multipolygon from invalid OSM data (single node)", "[NoDB]")
     buffer.add_way("w20 Nn1x1y1");
 
     auto const &relation = buffer.add_relation("r30 Mw20@");
-    auto const geom = geom::create_multipolygon(relation, buffer.buffer());
+    osmium::memory::Buffer area_buffer{1024};
+    auto const geom =
+        geom::create_multipolygon(relation, buffer.buffer(), &area_buffer);
 
     REQUIRE(geom.is_null());
 }
@@ -130,7 +138,9 @@ TEST_CASE("create_multipolygon from invalid OSM data (way node closed)",
     buffer.add_way("w20 Nn1x1y1,n2x2y2");
 
     auto const &relation = buffer.add_relation("r30 Mw20@");
-    auto const geom = geom::create_multipolygon(relation, buffer.buffer());
+    osmium::memory::Buffer area_buffer{1024};
+    auto const geom =
+        geom::create_multipolygon(relation, buffer.buffer(), &area_buffer);
 
     REQUIRE(geom.is_null());
 }
@@ -143,7 +153,9 @@ TEST_CASE("create_multipolygon from invalid OSM data (self-intersection)",
     buffer.add_way("w21 Nn4x2y2,n1x1y1");
 
     auto const &relation = buffer.add_relation("r30 Mw20@,w21@");
-    auto const geom = geom::create_multipolygon(relation, buffer.buffer());
+    osmium::memory::Buffer area_buffer{1024};
+    auto const geom =
+        geom::create_multipolygon(relation, buffer.buffer(), &area_buffer);
 
     REQUIRE(geom.is_null());
 }
diff --git a/tests/test-geom-polygons.cpp b/tests/test-geom-polygons.cpp
index 7df25d8d8..61c7bbe6e 100644
--- a/tests/test-geom-polygons.cpp
+++ b/tests/test-geom-polygons.cpp
@@ -85,7 +85,9 @@ TEST_CASE("create_polygon from OSM data", "[NoDB]")
     test_buffer_t buffer;
     buffer.add_way("w20 Nn1x1y1,n2x2y1,n3x2y2,n4x1y2,n1x1y1");
 
-    auto const geom = geom::create_polygon(buffer.buffer().get<osmium::Way>(0));
+    osmium::memory::Buffer area_buffer{1024};
+    auto const geom =
+        geom::create_polygon(buffer.buffer().get<osmium::Way>(0), &area_buffer);
 
     REQUIRE(geom.is_polygon());
     REQUIRE(geometry_type(geom) == "POLYGON");
@@ -104,7 +106,9 @@ TEST_CASE("create_polygon from OSM data (reverse)", "[NoDB]")
     test_buffer_t buffer;
     buffer.add_way("w20 Nn1x1y1,n2x1y2,n3x2y2,n4x2y1,n1x1y1");
 
-    auto const geom = geom::create_polygon(buffer.buffer().get<osmium::Way>(0));
+    osmium::memory::Buffer area_buffer{1024};
+    auto const geom =
+        geom::create_polygon(buffer.buffer().get<osmium::Way>(0), &area_buffer);
 
     REQUIRE(geom.is_polygon());
     REQUIRE(geometry_type(geom) == "POLYGON");
@@ -122,7 +126,9 @@ TEST_CASE("create_polygon from OSM data without locations", "[NoDB]")
     test_buffer_t buffer;
     buffer.add_way("w20 Nn1,n2,n3,n1");
 
-    auto const geom = geom::create_polygon(buffer.buffer().get<osmium::Way>(0));
+    osmium::memory::Buffer area_buffer{1024};
+    auto const geom =
+        geom::create_polygon(buffer.buffer().get<osmium::Way>(0), &area_buffer);
 
     REQUIRE(geom.is_null());
 }
@@ -132,7 +138,9 @@ TEST_CASE("create_polygon from invalid OSM data (single node)", "[NoDB]")
     test_buffer_t buffer;
     buffer.add_way("w20 Nn1x1y1");
 
-    auto const geom = geom::create_polygon(buffer.buffer().get<osmium::Way>(0));
+    osmium::memory::Buffer area_buffer{1024};
+    auto const geom =
+        geom::create_polygon(buffer.buffer().get<osmium::Way>(0), &area_buffer);
 
     REQUIRE(geom.is_null());
 }
@@ -142,7 +150,9 @@ TEST_CASE("create_polygon from invalid OSM data (way node closed)", "[NoDB]")
     test_buffer_t buffer;
     buffer.add_way("w20 Nn1x1y1,n2x2y2");
 
-    auto const geom = geom::create_polygon(buffer.buffer().get<osmium::Way>(0));
+    osmium::memory::Buffer area_buffer{1024};
+    auto const geom =
+        geom::create_polygon(buffer.buffer().get<osmium::Way>(0), &area_buffer);
 
     REQUIRE(geom.is_null());
 }
@@ -152,7 +162,9 @@ TEST_CASE("create_polygon from invalid OSM data (self-intersection)", "[NoDB]")
     test_buffer_t buffer;
     buffer.add_way("w20 Nn1x1y1,n2x1y2,n3x2y1,n4x2y2,n1x1y1");
 
-    auto const geom = geom::create_polygon(buffer.buffer().get<osmium::Way>(0));
+    osmium::memory::Buffer area_buffer{1024};
+    auto const geom =
+        geom::create_polygon(buffer.buffer().get<osmium::Way>(0), &area_buffer);
 
     REQUIRE(geom.is_null());
 }

From f0b7a3f6ab6ff6d182f91ffb44e48eeb6cfe578a Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 14 Aug 2024 14:29:53 +0200
Subject: [PATCH 167/430] Cleanup: Use .empty() instead of comparing to empty
 string

---
 src/gen/osm2pgsql-gen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index c3292da22..7134d2148 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -163,7 +163,7 @@ tile_extent get_extent_from_db(pg_conn_t const &db_connection,
     auto const geom_column = params.get_string("geom_column", "geom");
     auto const raster_column = params.get_string("raster_column", "");
 
-    bool const is_raster = raster_column != "";
+    bool const is_raster = !raster_column.empty();
 
     return get_extent_from_db(db_connection, schema, table,
                               is_raster ? raster_column : geom_column,

From 3e4611aa990d40d540e6c65d6945aee51149a827 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 16 Jun 2024 10:05:29 +0200
Subject: [PATCH 168/430] Clean up some includes

Found with IWYU, unfortunately that tool also produces a lot of errors
which is cumbersome to work through, so this fixes only some of the
problems detected.
---
 src/db-copy.cpp                    |  8 ++++++--
 src/db-copy.hpp                    |  7 ++++---
 src/debug-output.cpp               |  2 ++
 src/debug-output.hpp               |  6 ++++--
 src/expire-output.cpp              |  1 +
 src/expire-output.hpp              |  1 +
 src/flex-lua-index.cpp             |  6 +++++-
 src/flex-table-column.cpp          |  1 -
 src/flex-table.hpp                 |  3 +++
 src/flex-write.hpp                 |  5 ++++-
 src/gen/canvas.cpp                 |  3 +++
 src/gen/canvas.hpp                 |  5 ++++-
 src/gen/gen-base.cpp               |  2 ++
 src/gen/gen-base.hpp               |  1 +
 src/gen/gen-create.cpp             |  2 ++
 src/gen/gen-create.hpp             |  3 +--
 src/gen/gen-discrete-isolation.cpp |  6 ++++--
 src/gen/gen-discrete-isolation.hpp |  4 ++++
 src/gen/gen-rivers.hpp             |  4 ++++
 src/gen/osm2pgsql-gen.cpp          | 10 +++-------
 src/gen/tracer.cpp                 |  2 ++
 src/gen/tracer.hpp                 |  6 ++++--
 src/geom-box.cpp                   |  2 ++
 src/geom-from-osm.cpp              |  1 +
 src/geom-functions.hpp             |  2 ++
 src/lua-utils.cpp                  |  1 -
 src/middle-ram.hpp                 |  1 +
 src/node-persistent-cache.cpp      |  3 ++-
 src/osm2pgsql.cpp                  |  2 +-
 src/table.cpp                      |  2 --
 30 files changed, 73 insertions(+), 29 deletions(-)

diff --git a/src/db-copy.cpp b/src/db-copy.cpp
index a58a9aea3..96fcf8c18 100644
--- a/src/db-copy.cpp
+++ b/src/db-copy.cpp
@@ -7,13 +7,17 @@
  * For a full list of authors see the git log.
  */
 
-#include <cassert>
-
 #include "db-copy.hpp"
+
 #include "format.hpp"
 #include "logging.hpp"
 #include "pgsql.hpp"
 
+#include <cassert>
+#include <cstdlib>
+#include <iterator>
+#include <stdexcept>
+
 void db_deleter_by_id_t::delete_rows(std::string const &table,
                                      std::string const &column,
                                      pg_conn_t const &db_connection)
diff --git a/src/db-copy.hpp b/src/db-copy.hpp
index bd5946a0d..beebc8155 100644
--- a/src/db-copy.hpp
+++ b/src/db-copy.hpp
@@ -10,6 +10,10 @@
  * For a full list of authors see the git log.
  */
 
+#include "osmtypes.hpp"
+#include "pgsql.hpp"
+#include "pgsql-params.hpp"
+
 #include <cassert>
 #include <condition_variable>
 #include <deque>
@@ -22,9 +26,6 @@
 #include <variant>
 #include <vector>
 
-#include "osmtypes.hpp"
-#include "pgsql.hpp"
-
 /**
  * Table information necessary for building SQL queries.
  */
diff --git a/src/debug-output.cpp b/src/debug-output.cpp
index 3ee119d2c..c8a94d19b 100644
--- a/src/debug-output.cpp
+++ b/src/debug-output.cpp
@@ -9,6 +9,8 @@
 
 #include "debug-output.hpp"
 
+#include "expire-output.hpp"
+#include "flex-table.hpp"
 #include "logging.hpp"
 
 void write_expire_output_list_to_debug_log(
diff --git a/src/debug-output.hpp b/src/debug-output.hpp
index e4777221e..96256a5d7 100644
--- a/src/debug-output.hpp
+++ b/src/debug-output.hpp
@@ -10,8 +10,10 @@
  * For a full list of authors see the git log.
  */
 
-#include "expire-output.hpp"
-#include "flex-table.hpp"
+#include <vector>
+
+class expire_output_t;
+class flex_table_t;
 
 void write_expire_output_list_to_debug_log(
     std::vector<expire_output_t> const &expire_outputs);
diff --git a/src/expire-output.cpp b/src/expire-output.cpp
index 68d2ac372..5ec48d9f2 100644
--- a/src/expire-output.cpp
+++ b/src/expire-output.cpp
@@ -14,6 +14,7 @@
 #include "pgsql.hpp"
 #include "tile.hpp"
 
+#include <cerrno>
 #include <system_error>
 
 std::size_t
diff --git a/src/expire-output.hpp b/src/expire-output.hpp
index 1c9821617..cbfa92869 100644
--- a/src/expire-output.hpp
+++ b/src/expire-output.hpp
@@ -13,6 +13,7 @@
 #include "tile.hpp"
 
 #include <cassert>
+#include <cstddef>
 #include <cstdint>
 #include <string>
 #include <utility>
diff --git a/src/flex-lua-index.cpp b/src/flex-lua-index.cpp
index 085b360f5..5db9db648 100644
--- a/src/flex-lua-index.cpp
+++ b/src/flex-lua-index.cpp
@@ -8,11 +8,15 @@
  */
 
 #include "flex-lua-index.hpp"
+
+#include "flex-index.hpp"
+#include "flex-table.hpp"
+#include "format.hpp"
 #include "lua-utils.hpp"
-#include "output-flex.hpp"
 #include "pgsql-capabilities.hpp"
 #include "util.hpp"
 
+#include <stdexcept>
 #include <string>
 #include <vector>
 
diff --git a/src/flex-table-column.cpp b/src/flex-table-column.cpp
index 489cd722e..7cf561dbc 100644
--- a/src/flex-table-column.cpp
+++ b/src/flex-table-column.cpp
@@ -13,7 +13,6 @@
 #include "pgsql-capabilities.hpp"
 #include "util.hpp"
 
-#include <algorithm>
 #include <cassert>
 #include <cctype>
 #include <cstdlib>
diff --git a/src/flex-table.hpp b/src/flex-table.hpp
index 4973fe20a..f45b0057c 100644
--- a/src/flex-table.hpp
+++ b/src/flex-table.hpp
@@ -20,7 +20,10 @@
 
 #include <osmium/osm/item_type.hpp>
 
+#include <cassert>
+#include <chrono>
 #include <cstddef>
+#include <future>
 #include <limits>
 #include <memory>
 #include <string>
diff --git a/src/flex-write.hpp b/src/flex-write.hpp
index 999923530..a8536d4fa 100644
--- a/src/flex-write.hpp
+++ b/src/flex-write.hpp
@@ -10,12 +10,15 @@
  * For a full list of authors see the git log.
  */
 
-#include "expire-tiles.hpp"
 #include "flex-table.hpp"
 
 #include <lua.hpp>
 
 #include <stdexcept>
+#include <string>
+#include <vector>
+
+class expire_tiles;
 
 class not_null_exception : public std::runtime_error
 {
diff --git a/src/gen/canvas.cpp b/src/gen/canvas.cpp
index 8978c4ffc..e88095563 100644
--- a/src/gen/canvas.cpp
+++ b/src/gen/canvas.cpp
@@ -10,10 +10,13 @@
 #include "canvas.hpp"
 
 #include "raster.hpp"
+#include "tile.hpp"
 
 #include <opencv2/imgcodecs.hpp>
 #include <opencv2/imgproc.hpp>
 
+#include <cassert>
+
 void canvas_t::open_close(unsigned int buffer_size)
 {
     auto const kernel1 = cv::getStructuringElement(
diff --git a/src/gen/canvas.hpp b/src/gen/canvas.hpp
index c184af827..5ccaa906d 100644
--- a/src/gen/canvas.hpp
+++ b/src/gen/canvas.hpp
@@ -11,11 +11,14 @@
  */
 
 #include "geom.hpp"
-#include "tile.hpp"
 
 #include <opencv2/core.hpp>
 
 #include <cstddef>
+#include <string>
+#include <vector>
+
+class tile_t;
 
 /**
  * This class wraps the image class from the OpenCV library.
diff --git a/src/gen/gen-base.cpp b/src/gen/gen-base.cpp
index d883eb1e2..f71c13f9b 100644
--- a/src/gen/gen-base.cpp
+++ b/src/gen/gen-base.cpp
@@ -14,6 +14,8 @@
 
 #include <fmt/args.h>
 
+#include <cassert>
+
 gen_base_t::gen_base_t(pg_conn_t *connection, bool append, params_t *params)
 : m_connection(connection), m_params(params), m_append(append)
 {
diff --git a/src/gen/gen-base.hpp b/src/gen/gen-base.hpp
index 3117b968c..90e8ae37f 100644
--- a/src/gen/gen-base.hpp
+++ b/src/gen/gen-base.hpp
@@ -17,6 +17,7 @@
 #include <cstdint>
 #include <cstdlib>
 #include <string>
+#include <string_view>
 #include <vector>
 
 class params_t;
diff --git a/src/gen/gen-create.cpp b/src/gen/gen-create.cpp
index 195f59c16..32d6487ad 100644
--- a/src/gen/gen-create.cpp
+++ b/src/gen/gen-create.cpp
@@ -9,6 +9,8 @@
 
 #include "gen-create.hpp"
 
+#include "format.hpp"
+#include "gen-base.hpp"
 #include "gen-discrete-isolation.hpp"
 #include "gen-rivers.hpp"
 #include "gen-tile-builtup.hpp"
diff --git a/src/gen/gen-create.hpp b/src/gen/gen-create.hpp
index b7997bb3c..a445a9455 100644
--- a/src/gen/gen-create.hpp
+++ b/src/gen/gen-create.hpp
@@ -10,11 +10,10 @@
  * For a full list of authors see the git log.
  */
 
-#include "gen-base.hpp"
-
 #include <memory>
 #include <string>
 
+class gen_base_t;
 class params_t;
 class pg_conn_t;
 
diff --git a/src/gen/gen-discrete-isolation.cpp b/src/gen/gen-discrete-isolation.cpp
index a713091c9..6c8ca8a55 100644
--- a/src/gen/gen-discrete-isolation.cpp
+++ b/src/gen/gen-discrete-isolation.cpp
@@ -9,12 +9,14 @@
 
 #include "gen-discrete-isolation.hpp"
 
-#include "logging.hpp"
 #include "params.hpp"
 #include "pgsql.hpp"
 #include "util.hpp"
 
 #include <algorithm>
+#include <cmath>
+#include <cstdint>
+#include <cstdlib>
 #include <vector>
 
 gen_di_t::gen_di_t(pg_conn_t *connection, bool append, params_t *params)
@@ -115,7 +117,7 @@ FROM {src} WHERE {importance_column} > 0
                     min = dist;
                 }
             }
-            data[n].di = sqrt(min);
+            data[n].di = std::sqrt(min);
         }
         data[0].di = data[1].di + 1;
     }
diff --git a/src/gen/gen-discrete-isolation.hpp b/src/gen/gen-discrete-isolation.hpp
index 29d680b9a..d6d5c2725 100644
--- a/src/gen/gen-discrete-isolation.hpp
+++ b/src/gen/gen-discrete-isolation.hpp
@@ -12,8 +12,12 @@
 
 #include "gen-base.hpp"
 
+#include <cstddef>
 #include <string_view>
 
+class params_t;
+class pg_conn_t;
+
 class gen_di_t : public gen_base_t
 {
 public:
diff --git a/src/gen/gen-rivers.hpp b/src/gen/gen-rivers.hpp
index 3cd351ce5..513da5786 100644
--- a/src/gen/gen-rivers.hpp
+++ b/src/gen/gen-rivers.hpp
@@ -12,8 +12,12 @@
 
 #include "gen-base.hpp"
 
+#include <cstddef>
 #include <string_view>
 
+class params_t;
+class pg_conn_t;
+
 class gen_rivers_t : public gen_base_t
 {
 public:
diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index c3292da22..5ba2b245a 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -15,7 +15,6 @@
  * in the future.
  */
 
-#include "canvas.hpp"
 #include "command-line-app.hpp"
 #include "debug-output.hpp"
 #include "expire-output.hpp"
@@ -30,7 +29,6 @@
 #include "lua-init.hpp"
 #include "lua-setup.hpp"
 #include "lua-utils.hpp"
-#include "options.hpp"
 #include "params.hpp"
 #include "pgsql-capabilities.hpp"
 #include "pgsql.hpp"
@@ -45,18 +43,16 @@
 #include <lua.hpp>
 
 #include <algorithm>
-#include <array>
 #include <atomic>
-#include <cassert>
 #include <chrono>
 #include <cstdint>
 #include <cstdlib>
-#include <cstring>
-#include <getopt.h>
-#include <limits>
+#include <memory>
+#include <mutex>
 #include <stdexcept>
 #include <string>
 #include <thread>
+#include <vector>
 
 // Lua can't call functions on C++ objects directly. This macro defines simple
 // C "trampoline" functions which are called from Lua which get the current
diff --git a/src/gen/tracer.cpp b/src/gen/tracer.cpp
index 027fb3415..7673bf024 100644
--- a/src/gen/tracer.cpp
+++ b/src/gen/tracer.cpp
@@ -9,7 +9,9 @@
 
 #include "tracer.hpp"
 
+#include "canvas.hpp"
 #include "geom-boost-adaptor.hpp"
+#include "tile.hpp"
 
 #include <cassert>
 #include <cmath>
diff --git a/src/gen/tracer.hpp b/src/gen/tracer.hpp
index 141cdea93..d07910883 100644
--- a/src/gen/tracer.hpp
+++ b/src/gen/tracer.hpp
@@ -10,15 +10,17 @@
  * For a full list of authors see the git log.
  */
 
-#include "canvas.hpp"
 #include "geom.hpp"
-#include "tile.hpp"
 
 #include <potracelib.h>
 
+#include <cstddef>
 #include <memory>
 #include <vector>
 
+class canvas_t;
+class tile_t;
+
 class tracer_t
 {
 public:
diff --git a/src/geom-box.cpp b/src/geom-box.cpp
index a5f8217fd..9393e8ce8 100644
--- a/src/geom-box.cpp
+++ b/src/geom-box.cpp
@@ -9,6 +9,8 @@
 
 #include "geom-box.hpp"
 
+#include <variant>
+
 namespace geom {
 
 box_t &box_t::extend(point_t const &point) noexcept
diff --git a/src/geom-from-osm.cpp b/src/geom-from-osm.cpp
index 71f858f12..3cfd98441 100644
--- a/src/geom-from-osm.cpp
+++ b/src/geom-from-osm.cpp
@@ -13,6 +13,7 @@
 #include <osmium/area/geom_assembler.hpp>
 #include <osmium/osm/way.hpp>
 
+#include <cassert>
 #include <utility>
 
 namespace geom {
diff --git a/src/geom-functions.hpp b/src/geom-functions.hpp
index 51e122ed4..1048a6b8e 100644
--- a/src/geom-functions.hpp
+++ b/src/geom-functions.hpp
@@ -13,6 +13,8 @@
 #include "geom.hpp"
 #include "reprojection.hpp"
 
+#include <cassert>
+#include <cstddef>
 #include <string_view>
 #include <utility>
 #include <vector>
diff --git a/src/lua-utils.cpp b/src/lua-utils.cpp
index 1a28f346b..ee047f9b5 100644
--- a/src/lua-utils.cpp
+++ b/src/lua-utils.cpp
@@ -12,7 +12,6 @@
 #include "format.hpp"
 
 #include <cassert>
-#include <stdexcept>
 
 // The lua_getextraspace() function is only available from Lua 5.3. For
 // earlier versions we fall back to storing the context pointer in the
diff --git a/src/middle-ram.hpp b/src/middle-ram.hpp
index 1f4509fa9..9aec8a87a 100644
--- a/src/middle-ram.hpp
+++ b/src/middle-ram.hpp
@@ -19,6 +19,7 @@
 #include <osmium/memory/buffer.hpp>
 #include <osmium/osm.hpp>
 
+#include <cassert>
 #include <cstddef>
 #include <memory>
 #include <string>
diff --git a/src/node-persistent-cache.cpp b/src/node-persistent-cache.cpp
index 6b06b1ceb..7cd97b8c3 100644
--- a/src/node-persistent-cache.cpp
+++ b/src/node-persistent-cache.cpp
@@ -11,8 +11,9 @@
 #include "node-persistent-cache.hpp"
 
 #include <cassert>
-#include <stdexcept>
+#include <cerrno>
 #include <system_error>
+#include <utility>
 
 void node_persistent_cache::set(osmid_t id, osmium::Location location)
 {
diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
index 26bdc47f7..b3178e1e6 100644
--- a/src/osm2pgsql.cpp
+++ b/src/osm2pgsql.cpp
@@ -16,7 +16,6 @@
 #include "output.hpp"
 #include "pgsql.hpp"
 #include "pgsql-capabilities.hpp"
-#include "pgsql-helper.hpp"
 #include "properties.hpp"
 #include "util.hpp"
 #include "version.hpp"
@@ -26,6 +25,7 @@
 #include <exception>
 #include <filesystem>
 #include <memory>
+#include <string>
 #include <utility>
 
 namespace {
diff --git a/src/table.cpp b/src/table.cpp
index 229e7b160..9d707497f 100644
--- a/src/table.cpp
+++ b/src/table.cpp
@@ -8,11 +8,9 @@
  */
 
 #include <algorithm>
-#include <cassert>
 #include <cstdint>
 #include <cstdio>
 #include <limits>
-#include <stdexcept>
 #include <string>
 #include <vector>
 

From 8ba86126524b09e48df028a81b10ee579e51a75f Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 14 Aug 2024 17:34:26 +0200
Subject: [PATCH 169/430] We don't need the exp() function for squaring a
 number

---
 src/expire-tiles.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/expire-tiles.cpp b/src/expire-tiles.cpp
index 604524b18..b28488f88 100644
--- a/src/expire-tiles.cpp
+++ b/src/expire-tiles.cpp
@@ -174,7 +174,7 @@ void expire_tiles::from_line_segment(geom::point_t const &a,
     }
 
     double const y_len = tilec_b.y() - tilec_a.y();
-    double const hyp_len = sqrt(pow(x_len, 2) + pow(y_len, 2)); /* Pythagoras */
+    double const hyp_len = std::sqrt(x_len * x_len + y_len * y_len); /* Pythagoras */
     double const x_step = x_len / hyp_len;
     double const y_step = y_len / hyp_len;
 

From 724f676a275bca25c6d2fc7bc9a569916eb76ee7 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 15 Aug 2024 09:01:08 +0200
Subject: [PATCH 170/430] Suppress various false-positive clang-tidy warnings

---
 src/expire-tiles.cpp   | 2 ++
 src/geom-functions.cpp | 4 ++++
 src/thread-pool.hpp    | 1 +
 3 files changed, 7 insertions(+)

diff --git a/src/expire-tiles.cpp b/src/expire-tiles.cpp
index b28488f88..98dc8e5c2 100644
--- a/src/expire-tiles.cpp
+++ b/src/expire-tiles.cpp
@@ -135,6 +135,8 @@ void expire_tiles::from_geometry(geom::multipolygon_t const &geom,
     }
 }
 
+// False positive: Apparently clang-tidy can not see through the visit()
+// NOLINTNEXTLINE(readability-convert-member-functions-to-static)
 void expire_tiles::from_geometry(geom::geometry_t const &geom,
                                  expire_config_t const &expire_config)
 {
diff --git a/src/geom-functions.cpp b/src/geom-functions.cpp
index f223f1f32..db7605bb4 100644
--- a/src/geom-functions.cpp
+++ b/src/geom-functions.cpp
@@ -437,6 +437,8 @@ class split_visitor
     void operator()(T) const
     {}
 
+    // false positive https://github.com/llvm/llvm-project/issues/74738
+    // NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
     void operator()(geom::collection_t &&geom) const
     {
         for (auto &&sgeom : geom) {
@@ -445,6 +447,8 @@ class split_visitor
     }
 
     template <typename T>
+    // false positive https://github.com/llvm/llvm-project/issues/74738
+    // NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
     void operator()(geom::multigeometry_t<T> &&geom) const
     {
         for (auto &&sgeom : geom) {
diff --git a/src/thread-pool.hpp b/src/thread-pool.hpp
index 7392e3670..e61b9a7b4 100644
--- a/src/thread-pool.hpp
+++ b/src/thread-pool.hpp
@@ -95,6 +95,7 @@ class thread_pool_t
      *         of the task can be queried.
      */
     template <typename TFunction>
+    // NOLINTNEXTLINE(cppcoreguidelines-missing-std-forward) false positive
     std::future<std::chrono::microseconds> submit(TFunction &&func)
     {
         std::packaged_task<std::chrono::microseconds()> task{

From 4361dbe28de6787b5397e80b287cc8eff675ad86 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 15 Aug 2024 09:05:26 +0200
Subject: [PATCH 171/430] Remove some false-positives from clang-tidy warnings

---
 .clang-tidy                   | 4 ++++
 src/node-persistent-cache.cpp | 1 +
 2 files changed, 5 insertions(+)

diff --git a/.clang-tidy b/.clang-tidy
index e15b32fff..3daeae295 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -87,4 +87,8 @@ CheckOptions:
       value: 100
     - key: readability-function-cognitive-complexity.IgnoreMacros
       value: true
+    - key: cppcoreguidelines-rvalue-reference-param-not-moved.AllowPartialMove
+      value: true
+    - key: bugprone-empty-catch.IgnoreCatchWithKeywords
+      value: "@todo;@fixme;exception ignored on purpose"
 ...
diff --git a/src/node-persistent-cache.cpp b/src/node-persistent-cache.cpp
index 6b06b1ceb..31d139a00 100644
--- a/src/node-persistent-cache.cpp
+++ b/src/node-persistent-cache.cpp
@@ -55,6 +55,7 @@ node_persistent_cache::~node_persistent_cache() noexcept
         try {
             log_debug("Removing persistent node cache at '{}'.", m_file_name);
         } catch (...) {
+            // exception ignored on purpose
         }
         unlink(m_file_name.c_str());
     }

From 246044a1755643565316f154bb7b54072e20109a Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 15 Aug 2024 09:27:25 +0200
Subject: [PATCH 172/430] Github actions: Add clang-tidy run to CI

Currently CI will not fail if there are warnings from clang-tidy. This
is, for the time being, only a way to easily see the messages.

Clang-tidy has its own workflow, so it doesn't interfere with the rest.
But because it also needs cmake to run, the cmake run has been taken
out of the 'build-and-test' action and put into its own.

This commit also disables some clang-tidy warnings we get from newer
versions of clang-tidy.
---
 .clang-tidy                               | 12 +++++++++-
 .github/actions/build-and-test/action.yml | 22 ------------------
 .github/actions/clang-tidy/action.yml     |  9 ++++++++
 .github/actions/linux-cmake/action.yml    | 28 +++++++++++++++++++++++
 .github/workflows/ci.yml                  | 18 +++++++++++++++
 .github/workflows/clang-tidy.yml          | 25 ++++++++++++++++++++
 6 files changed, 91 insertions(+), 23 deletions(-)
 create mode 100644 .github/actions/clang-tidy/action.yml
 create mode 100644 .github/actions/linux-cmake/action.yml
 create mode 100644 .github/workflows/clang-tidy.yml

diff --git a/.clang-tidy b/.clang-tidy
index 3daeae295..8364f24af 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,5 +1,5 @@
 ---
-Checks: '*,-abseil-*,-altera-*,-android-cloexec-*,-bugprone-easily-swappable-parameters,-cert-err58-cpp,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-cstyle-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-vararg,-fuchsia-*,-google-readability-casting,-google-readability-todo,-hicpp-named-parameter,-hicpp-no-array-decay,-hicpp-vararg,-llvm-include-order,-llvm-header-guard,-llvmlibc-*,-misc-no-recursion,-modernize-use-nodiscard,-modernize-use-trailing-return-type,-readability-identifier-length,-readability-implicit-bool-conversion,-readability-named-parameter,-readability-magic-numbers'
+Checks: '*,-abseil-*,-altera-*,-android-cloexec-*,-bugprone-easily-swappable-parameters,-cert-err58-cpp,-cppcoreguidelines-avoid-do-while,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-cstyle-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-vararg,-fuchsia-*,-google-readability-casting,-google-readability-todo,-hicpp-named-parameter,-hicpp-no-array-decay,-hicpp-vararg,-llvm-include-order,-llvm-header-guard,-llvmlibc-*,-misc-include-cleaner,-misc-no-recursion,-misc-use-anonymous-namespace,-modernize-use-nodiscard,-modernize-use-trailing-return-type,-readability-identifier-length,-readability-implicit-bool-conversion,-readability-named-parameter,-readability-magic-numbers'
 #
 #  cppcoreguidelines-pro-type-cstyle-cast
 #  google-build-using-namespace
@@ -26,6 +26,10 @@ Checks: '*,-abseil-*,-altera-*,-android-cloexec-*,-bugprone-easily-swappable-par
 #    There are many of these in the test code, most of them from the Catch
 #    framework. Difficult to avoid.
 #
+#  cppcoreguidelines-avoid-do-while (new in clang-tidy-16)
+#    Its a good idea to avoid them when there are better alternatives, but
+#    sometimes they are the cleanest alternative.
+#
 #  cppcoreguidelines-avoid-magic-numbers
 #  readability-magic-numbers
 #    We have a lot of these and should probably at least fix some. But remove
@@ -55,9 +59,15 @@ Checks: '*,-abseil-*,-altera-*,-android-cloexec-*,-bugprone-easily-swappable-par
 #  llvmlibc-*
 #    Not applicable
 #
+#  misc-include-cleaner (new in clang-tidy-17)
+#    Many instances of this warning, disabled for now. (TODO)
+#
 #  misc-no-recursion
 #    Nothing wrong with recursion
 #
+#  misc-use-anonymous-namespace (new in clang-tidy-16)
+#    Lots of these, need some time to fix. (TODO)
+#
 #  modernize-use-nodiscard
 #    We have a lot of these. Remove it for the time being because there are
 #    too many to fix quickly. (TODO)
diff --git a/.github/actions/build-and-test/action.yml b/.github/actions/build-and-test/action.yml
index a19bf1042..9ab77f14f 100644
--- a/.github/actions/build-and-test/action.yml
+++ b/.github/actions/build-and-test/action.yml
@@ -10,28 +10,6 @@ runs:
     using: composite
 
     steps:
-      - name: create build directory
-        run: mkdir build
-        shell: bash
-
-      - name: configure
-        run: |
-          CMAKE_OPTIONS="-LA -DBUILD_TESTS=ON -DWITH_LUAJIT=${LUAJIT_OPTION}"
-          if [ -n "$WITH_PROJ" ]; then
-            CMAKE_OPTIONS="$CMAKE_OPTIONS -DWITH_PROJ=$WITH_PROJ"
-          fi
-          if [ -n "$CPP_VERSION" ]; then
-            CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_CXX_STANDARD=$CPP_VERSION"
-          fi
-          if [ -n "$BUILD_TYPE" ]; then
-            CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_BUILD_TYPE=$BUILD_TYPE"
-          fi
-          cmake $CMAKE_OPTIONS ..
-        shell: bash
-        working-directory: build
-        env:
-          CXXFLAGS: -pedantic -Wextra ${{ env.EXTRA_FLAGS }} -Werror
-
       - name: build
         run: make -j3 all man
         shell: bash
diff --git a/.github/actions/clang-tidy/action.yml b/.github/actions/clang-tidy/action.yml
new file mode 100644
index 000000000..75a75fcca
--- /dev/null
+++ b/.github/actions/clang-tidy/action.yml
@@ -0,0 +1,9 @@
+name: Run clang-tidy
+
+runs:
+    using: composite
+
+    steps:
+      - name: Run clang-tidy
+        run: run-clang-tidy-17 -q -p build
+        shell: bash
diff --git a/.github/actions/linux-cmake/action.yml b/.github/actions/linux-cmake/action.yml
new file mode 100644
index 000000000..58081d6e0
--- /dev/null
+++ b/.github/actions/linux-cmake/action.yml
@@ -0,0 +1,28 @@
+name: CMake
+
+runs:
+    using: composite
+
+    steps:
+      - name: create build directory
+        run: mkdir build
+        shell: bash
+
+      - name: configure
+        run: |
+          CMAKE_OPTIONS="-LA -DBUILD_TESTS=ON -DWITH_LUAJIT=${LUAJIT_OPTION}"
+          if [ -n "$WITH_PROJ" ]; then
+            CMAKE_OPTIONS="$CMAKE_OPTIONS -DWITH_PROJ=$WITH_PROJ"
+          fi
+          if [ -n "$CPP_VERSION" ]; then
+            CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_CXX_STANDARD=$CPP_VERSION"
+          fi
+          if [ -n "$BUILD_TYPE" ]; then
+            CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_BUILD_TYPE=$BUILD_TYPE"
+          fi
+          cmake $CMAKE_OPTIONS ..
+        shell: bash
+        working-directory: build
+        env:
+          CXXFLAGS: -pedantic -Wextra ${{ env.EXTRA_FLAGS }} -Werror
+
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a0093bd0e..7bbb503c4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,6 +42,7 @@ jobs:
           psql -d postgres -c "CREATE TABLESPACE tablespacetest LOCATION '$GITHUB_WORKSPACE/tablespacetest'"
         shell: bash
 
+      - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
         with:
           test-wrapper: ''
@@ -65,6 +66,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
+      - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
   ubuntu20-pg96-clang10-jit:
@@ -83,6 +85,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
+      - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
   ubuntu20-pg10-gcc10:
@@ -102,6 +105,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
+      - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
 
@@ -121,6 +125,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
+      - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
   ubuntu20-pg13-gcc10-jit:
@@ -139,6 +144,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
+      - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
 
@@ -158,6 +164,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
+      - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
   ubuntu20-pg15-clang10-noproj:
@@ -177,6 +184,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
+      - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
   ubuntu20-pg16-clang10:
@@ -195,6 +203,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
+      - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
   ubuntu20-pg13-gcc10-release:
@@ -213,6 +222,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
+      - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
   ubuntu22-pg16-clang14-jit:
@@ -231,6 +241,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
+      - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
   ubuntu22-pg16-clang14-proj:
@@ -249,6 +260,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
+      - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
   ubuntu22-pg16-clang14-noproj:
@@ -268,6 +280,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
+      - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
   ubuntu22-pg15-clang14:
@@ -286,6 +299,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
+      - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
   ubuntu22-pg16-gcc12-release:
@@ -305,6 +319,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
+      - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
   ubuntu22-pg16-clang15-cpp20:
@@ -324,6 +339,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
+      - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
   ubuntu22-pg16-gcc12-cpp20:
@@ -343,6 +359,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
+      - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
   ubuntu24-pg16-gcc14:
@@ -362,6 +379,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/ubuntu-prerequisites
+      - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
   windows:
diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
new file mode 100644
index 000000000..6e8721787
--- /dev/null
+++ b/.github/workflows/clang-tidy.yml
@@ -0,0 +1,25 @@
+name: clang-tidy
+
+on: [ push, pull_request ]
+
+jobs:
+  clang-tidy:
+    runs-on: ubuntu-24.04
+
+    env:
+      CC: clang-18
+      CXX: clang++-18
+      LUA_VERSION: 5.4
+      LUAJIT_OPTION: OFF
+      POSTGRESQL_VERSION: 16
+      POSTGIS_VERSION: 3
+      BUILD_TYPE: Debug
+      PSYCOPG: 3
+      PIP_OPTION: --break-system-packages
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/ubuntu-prerequisites
+      - uses: ./.github/actions/linux-cmake
+      - uses: ./.github/actions/clang-tidy
+

From cf46e7076bfd6a9a1bab091cb5e8a8d3cb8c92f0 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 15 Aug 2024 11:35:05 +0200
Subject: [PATCH 173/430] Make new assembler class constructor explicit

---
 src/geom-area-assembler.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/geom-area-assembler.hpp b/src/geom-area-assembler.hpp
index 0a3387cc1..0fb47681b 100644
--- a/src/geom-area-assembler.hpp
+++ b/src/geom-area-assembler.hpp
@@ -27,7 +27,7 @@ namespace geom {
 class area_assembler_t : public osmium::area::detail::BasicAssembler
 {
 public:
-    area_assembler_t(osmium::memory::Buffer *buffer);
+    explicit area_assembler_t(osmium::memory::Buffer *buffer);
 
     /**
      * Assemble an area from the given way.

From 3679e60d9df5959b38bb1ead1ee510475b5d1ec9 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 15 Aug 2024 11:36:15 +0200
Subject: [PATCH 174/430] Show -F as alternative to --flat-nodes in man page

---
 man/osm2pgsql.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/osm2pgsql.md b/man/osm2pgsql.md
index 1e23b990a..833b62e02 100644
--- a/man/osm2pgsql.md
+++ b/man/osm2pgsql.md
@@ -154,7 +154,7 @@ mandatory for short options too.
     available to the outputs. Attributes are: user name, user id, changeset id,
     timestamp and version.
 
-\--flat-nodes=FILENAME
+-F, \--flat-nodes=FILENAME
 :   Use a file on disk to store node locations instead of storing them in
     memory (in non-slim mode) or in the database (in slim mode). This is much
     more efficient than storing the data in the database.

From 0795976975725c79280378902cced027859ffa13 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 15 Aug 2024 11:41:07 +0200
Subject: [PATCH 175/430] Work around some clang-tidy warnings

---
 src/expire-tiles.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/expire-tiles.cpp b/src/expire-tiles.cpp
index 98dc8e5c2..cf6d867eb 100644
--- a/src/expire-tiles.cpp
+++ b/src/expire-tiles.cpp
@@ -36,7 +36,7 @@
 expire_tiles::expire_tiles(uint32_t max_zoom,
                            std::shared_ptr<reprojection> projection)
 : m_projection(std::move(projection)), m_maxzoom(max_zoom),
-  m_map_width(1U << m_maxzoom)
+  m_map_width(static_cast<int>(1U << m_maxzoom))
 {}
 
 void expire_tiles::expire_tile(uint32_t x, uint32_t y)
@@ -167,7 +167,7 @@ void expire_tiles::from_line_segment(geom::point_t const &a,
     }
 
     double const x_len = tilec_b.x() - tilec_a.x();
-    if (x_len > m_map_width / 2) {
+    if (x_len > m_map_width / 2) { // NOLINT(bugprone-integer-division)
         /* If the line is wider than half the map, assume it
            crosses the international date line.
            These coordinates get normalised again later */

From 193ac44a9878e002e53b8a8c85516d24fe6bc3bc Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 15 Aug 2024 13:57:36 +0200
Subject: [PATCH 176/430] Improved parsing of --bbox command line option

Without use of scanf.
---
 src/command-line-parser.cpp  | 44 +++++++++++++++++++++++++++---------
 tests/test-options-parse.cpp | 18 +++++++++++++++
 2 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index 73da7a734..dab9e4070 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -18,6 +18,7 @@
 #include "util.hpp"
 #include "version.hpp"
 
+#include <osmium/util/string.hpp>
 #include <osmium/version.hpp>
 
 #include <CLI/CLI.hpp>
@@ -25,6 +26,7 @@
 #include <lua.hpp>
 
 #include <algorithm>
+#include <cmath>
 #include <cstdio>
 #include <cstring>
 #include <stdexcept>
@@ -33,21 +35,36 @@
 
 namespace {
 
-osmium::Box parse_bbox_param(std::string const &arg)
+void error_bbox()
+{
+    throw std::runtime_error{"Bounding box must be specified like: "
+                             "minlon,minlat,maxlon,maxlat."};
+}
+
+double parse_and_check_coordinate(std::string const &str)
 {
-    double minx = NAN;
-    double maxx = NAN;
-    double miny = NAN;
-    double maxy = NAN;
+    char *end = nullptr;
+
+    double const value = std::strtod(str.c_str(), &end);
+    if (end != &*str.end() || !std::isfinite(value)) {
+        error_bbox();
+    }
 
-    int const n =
-        sscanf(arg.c_str(), "%lf,%lf,%lf,%lf", &minx, &miny, &maxx, &maxy);
+    return value;
+}
 
-    if (n != 4) {
-        throw std::runtime_error{"Bounding box must be specified like: "
-                                 "minlon,minlat,maxlon,maxlat."};
+osmium::Box parse_bbox_param(std::string const &arg)
+{
+    auto const values = osmium::split_string(arg, ',', true);
+    if (values.size() != 4) {
+        error_bbox();
     }
 
+    double const minx = parse_and_check_coordinate(values[0]);
+    double const miny = parse_and_check_coordinate(values[1]);
+    double const maxx = parse_and_check_coordinate(values[2]);
+    double const maxy = parse_and_check_coordinate(values[3]);
+
     if (maxx <= minx) {
         throw std::runtime_error{
             "Bounding box failed due to maxlon <= minlon."};
@@ -60,7 +77,12 @@ osmium::Box parse_bbox_param(std::string const &arg)
 
     log_debug("Applying bounding box: {},{} to {},{}", minx, miny, maxx, maxy);
 
-    return osmium::Box{minx, miny, maxx, maxy};
+    osmium::Box const box{minx, miny, maxx, maxy};
+    if (!box.valid()) {
+        error_bbox();
+    }
+
+    return box;
 }
 
 void parse_expire_tiles_param(char const *arg, uint32_t *expire_tiles_zoom_min,
diff --git a/tests/test-options-parse.cpp b/tests/test-options-parse.cpp
index 8c696d02e..69283cf89 100644
--- a/tests/test-options-parse.cpp
+++ b/tests/test-options-parse.cpp
@@ -89,6 +89,24 @@ TEST_CASE("Parsing bbox fails if wrong format", "[NoDB]")
 {
     bad_opt({"-b", "123"}, "Bounding box must be specified like:"
                            " minlon,minlat,maxlon,maxlat.");
+
+    bad_opt({"-b", "1,2,3,4x"}, "Bounding box must be specified like:"
+                                " minlon,minlat,maxlon,maxlat.");
+
+    bad_opt({"-b", "1,,3,4"}, "Bounding box must be specified like:"
+                              " minlon,minlat,maxlon,maxlat.");
+
+    bad_opt({"-b", "1,2,3"}, "Bounding box must be specified like:"
+                             " minlon,minlat,maxlon,maxlat.");
+
+    bad_opt({"-b", "1,2,3,4,5"}, "Bounding box must be specified like:"
+                                 " minlon,minlat,maxlon,maxlat.");
+
+    bad_opt({"-b", "1,2,INF,4"}, "Bounding box must be specified like:"
+                                 " minlon,minlat,maxlon,maxlat.");
+
+    bad_opt({"-b", "1,NAN,3,4"}, "Bounding box must be specified like:"
+                                 " minlon,minlat,maxlon,maxlat.");
 }
 
 TEST_CASE("Parsing number-processes", "[NoDB]")

From 7b6ed0d2bc5279a80d31227ef0796701bfe188e2 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 15 Aug 2024 22:03:06 +0200
Subject: [PATCH 177/430] 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
---
 tests/test-db-copy-mgr.cpp                    | 16 +++++---
 tests/test-db-copy-thread.cpp                 |  9 ++--
 tests/test-domain-matcher.cpp                 |  8 +++-
 tests/test-expire-from-geometry.cpp           |  8 +++-
 tests/test-expire-tiles.cpp                   | 19 +++++----
 tests/test-geom-transform.cpp                 |  6 ++-
 tests/test-middle.cpp                         | 41 ++++++++++++-------
 tests/test-options-parse.cpp                  | 10 +++--
 tests/test-options-projection.cpp             |  6 ++-
 tests/test-output-flex-example-configs.cpp    |  8 +++-
 tests/test-output-flex-multi-input.cpp        | 12 ++++--
 tests/test-output-flex-nodes.cpp              |  8 +++-
 ...test-output-flex-relation-combinations.cpp |  9 ++--
 tests/test-output-flex-relations.cpp          |  8 +++-
 tests/test-output-flex-schema.cpp             | 10 +++--
 tests/test-output-flex-stage2.cpp             |  8 +++-
 tests/test-output-flex-tablespace.cpp         |  8 +++-
 tests/test-output-flex-types.cpp              |  8 +++-
 tests/test-output-flex-uni.cpp                |  8 +++-
 tests/test-output-flex-update.cpp             |  8 +++-
 tests/test-output-flex-validgeom.cpp          | 10 +++--
 tests/test-output-flex.cpp                    |  8 +++-
 tests/test-output-pgsql-area.cpp              |  6 ++-
 tests/test-output-pgsql-hstore-match-only.cpp |  6 ++-
 tests/test-output-pgsql-int4.cpp              |  8 +++-
 tests/test-output-pgsql-schema.cpp            |  6 ++-
 tests/test-output-pgsql-tablespace.cpp        |  8 +++-
 tests/test-output-pgsql-validgeom.cpp         |  6 ++-
 tests/test-output-pgsql-z_order.cpp           |  6 ++-
 tests/test-output-pgsql.cpp                   |  8 +++-
 tests/test-persistent-cache.cpp               | 14 ++++---
 tests/test-pgsql-capabilities.cpp             |  6 ++-
 tests/test-pgsql.cpp                          |  6 ++-
 33 files changed, 226 insertions(+), 90 deletions(-)

diff --git a/tests/test-db-copy-mgr.cpp b/tests/test-db-copy-mgr.cpp
index 5c7d5f980..bc8ac1202 100644
--- a/tests/test-db-copy-mgr.cpp
+++ b/tests/test-db-copy-mgr.cpp
@@ -16,11 +16,13 @@
 #include "common-pg.hpp"
 #include "db-copy-mgr.hpp"
 
-static testing::pg::tempdb_t db;
+namespace {
+
+testing::pg::tempdb_t db;
 
 using copy_mgr_t = db_copy_mgr_t<db_deleter_by_id_t>;
 
-static std::shared_ptr<db_target_descr_t> setup_table(std::string const &cols)
+std::shared_ptr<db_target_descr_t> setup_table(std::string const &cols)
 {
     auto const conn = db.connect();
     conn.exec("DROP TABLE IF EXISTS test_copy_mgr");
@@ -59,9 +61,9 @@ void add_array(copy_mgr_t *mgr, std::shared_ptr<db_target_descr_t> const &t,
     mgr->sync();
 }
 
-static void
-add_hash(copy_mgr_t *mgr, std::shared_ptr<db_target_descr_t> const &t, int id,
-         std::vector<std::pair<std::string, std::string>> const &values)
+void add_hash(copy_mgr_t *mgr, std::shared_ptr<db_target_descr_t> const &t,
+              int id,
+              std::vector<std::pair<std::string, std::string>> const &values)
 {
     mgr->new_line(t);
 
@@ -76,7 +78,7 @@ add_hash(copy_mgr_t *mgr, std::shared_ptr<db_target_descr_t> const &t, int id,
     mgr->sync();
 }
 
-static void check_row(std::vector<std::string> const &row)
+void check_row(std::vector<std::string> const &row)
 {
     auto const conn = db.connect();
     auto const res = conn.require_row("SELECT * FROM test_copy_mgr");
@@ -86,6 +88,8 @@ static void check_row(std::vector<std::string> const &row)
     }
 }
 
+} // anonymous namespace
+
 TEST_CASE("copy_mgr_t: Insert null")
 {
     copy_mgr_t mgr{std::make_shared<db_copy_thread_t>(db.connection_params())};
diff --git a/tests/test-db-copy-thread.cpp b/tests/test-db-copy-thread.cpp
index 728aa8b38..c28705322 100644
--- a/tests/test-db-copy-thread.cpp
+++ b/tests/test-db-copy-thread.cpp
@@ -12,14 +12,17 @@
 #include "common-pg.hpp"
 #include "db-copy.hpp"
 
-static testing::pg::tempdb_t db;
+namespace {
 
-static int table_count(testing::pg::conn_t const &conn,
-                       std::string const &where = "")
+testing::pg::tempdb_t db;
+
+int table_count(testing::pg::conn_t const &conn, std::string const &where = "")
 {
     return conn.result_as_int("SELECT count(*) FROM test_copy_thread " + where);
 }
 
+} // anonymous namespace
+
 TEST_CASE("db_copy_thread_t with db_deleter_by_id_t")
 {
     auto const conn = db.connect();
diff --git a/tests/test-domain-matcher.cpp b/tests/test-domain-matcher.cpp
index dad7e5cd2..b4b991767 100644
--- a/tests/test-domain-matcher.cpp
+++ b/tests/test-domain-matcher.cpp
@@ -17,8 +17,10 @@
 
 #include <cstring>
 
-static osmium::Tag &fill_buffer(osmium::memory::Buffer *buffer, char const *key,
-                                char const *value)
+namespace {
+
+osmium::Tag &fill_buffer(osmium::memory::Buffer *buffer, char const *key,
+                         char const *value)
 {
     {
         osmium::builder::TagListBuilder builder{*buffer};
@@ -29,6 +31,8 @@ static osmium::Tag &fill_buffer(osmium::memory::Buffer *buffer, char const *key,
     return *buffer->get<osmium::TagList>(0).begin();
 }
 
+} // anonymous namespace
+
 TEST_CASE("DomainMatcher: name", "[NoDB]")
 {
     osmium::memory::Buffer buffer{1024};
diff --git a/tests/test-expire-from-geometry.cpp b/tests/test-expire-from-geometry.cpp
index 695d5ee21..d614960f7 100644
--- a/tests/test-expire-from-geometry.cpp
+++ b/tests/test-expire-from-geometry.cpp
@@ -17,12 +17,16 @@
 #include "tile-output.hpp"
 #include "tile.hpp"
 
-static std::shared_ptr<reprojection> defproj{
+namespace {
+
+std::shared_ptr<reprojection> defproj{
     reprojection::create_projection(PROJ_SPHERE_MERC)};
 
 // We are using zoom level 12 here, because at that level a tile is about
 // 10,000 units wide/high which gives us easy numbers to work with.
-static constexpr uint32_t const zoom = 12;
+constexpr uint32_t const zoom = 12;
+
+} // anonymous namespace
 
 TEST_CASE("expire null geometry does nothing", "[NoDB]")
 {
diff --git a/tests/test-expire-tiles.cpp b/tests/test-expire-tiles.cpp
index fd138acc5..0756f4f6d 100644
--- a/tests/test-expire-tiles.cpp
+++ b/tests/test-expire-tiles.cpp
@@ -17,10 +17,12 @@
 #include "tile-output.hpp"
 #include "tile.hpp"
 
-static std::shared_ptr<reprojection> defproj{
+namespace {
+
+std::shared_ptr<reprojection> defproj{
     reprojection::create_projection(PROJ_SPHERE_MERC)};
 
-static std::set<tile_t> generate_random(uint32_t zoom, size_t count)
+std::set<tile_t> generate_random(uint32_t zoom, size_t count)
 {
     // Use a random device with a fixed seed. We don't really care about
     // the quality of random numbers here, we just need to generate valid
@@ -39,7 +41,7 @@ static std::set<tile_t> generate_random(uint32_t zoom, size_t count)
     return set;
 }
 
-static void expire_centroids(expire_tiles *et, std::set<tile_t> const &tiles)
+void expire_centroids(expire_tiles *et, std::set<tile_t> const &tiles)
 {
     for (auto const &t : tiles) {
         auto const p = t.center();
@@ -47,16 +49,15 @@ static void expire_centroids(expire_tiles *et, std::set<tile_t> const &tiles)
     }
 }
 
-static void check_quadkey(quadkey_t quadkey_expected,
-                          tile_t const &tile) noexcept
+void check_quadkey(quadkey_t quadkey_expected, tile_t const &tile) noexcept
 {
     CHECK(tile.quadkey() == quadkey_expected);
     auto const t = tile_t::from_quadkey(quadkey_expected, tile.zoom());
     CHECK(t == tile);
 }
 
-static std::vector<tile_t> get_tiles_ordered(expire_tiles *et, uint32_t minzoom,
-                                             uint32_t maxzoom)
+std::vector<tile_t> get_tiles_ordered(expire_tiles *et, uint32_t minzoom,
+                                      uint32_t maxzoom)
 {
     std::vector<tile_t> tiles;
 
@@ -66,7 +67,7 @@ static std::vector<tile_t> get_tiles_ordered(expire_tiles *et, uint32_t minzoom,
     return tiles;
 }
 
-static std::set<tile_t> get_tiles_unordered(expire_tiles *et, uint32_t zoom)
+std::set<tile_t> get_tiles_unordered(expire_tiles *et, uint32_t zoom)
 {
     std::set<tile_t> tiles;
 
@@ -76,6 +77,8 @@ static std::set<tile_t> get_tiles_unordered(expire_tiles *et, uint32_t zoom)
     return tiles;
 }
 
+} // anonymous namespace
+
 TEST_CASE("tile to quadkey", "[NoDB]")
 {
     check_quadkey(quadkey_t{0x27}, tile_t{3, 3, 5});
diff --git a/tests/test-geom-transform.cpp b/tests/test-geom-transform.cpp
index 2dec12ecf..394137ab4 100644
--- a/tests/test-geom-transform.cpp
+++ b/tests/test-geom-transform.cpp
@@ -14,12 +14,16 @@
 #include "geom.hpp"
 #include "reprojection.hpp"
 
-static void check(geom::point_t a, geom::point_t b)
+namespace {
+
+void check(geom::point_t a, geom::point_t b)
 {
     REQUIRE(a.x() == Approx(b.x()));
     REQUIRE(a.y() == Approx(b.y()));
 }
 
+} // anonymous namespace
+
 double const X55 = 612257.1993630046;  // lon 5.5
 double const Y44 = 490287.90003313165; // lat 4.4
 double const X33 = 367354.31961780274; // lon 3.3
diff --git a/tests/test-middle.cpp b/tests/test-middle.cpp
index c9b2272c2..bf35d3e54 100644
--- a/tests/test-middle.cpp
+++ b/tests/test-middle.cpp
@@ -26,17 +26,17 @@
 #include "common-options.hpp"
 #include "common-pg.hpp"
 
-static testing::pg::tempdb_t db;
-
 namespace {
 
+testing::pg::tempdb_t db;
+
 void check_locations_are_equal(osmium::Location a, osmium::Location b)
 {
     CHECK(a.lat() == Approx(b.lat()));
     CHECK(a.lon() == Approx(b.lon()));
 }
 
-} // namespace
+} // anonymous namespace
 
 struct options_slim_default
 {
@@ -323,11 +323,13 @@ TEMPLATE_TEST_CASE("middle import", "", options_slim_default,
     }
 }
 
+namespace {
+
 /**
  * Check that the node is in the mid with the right id and location.
  */
-static void check_node(std::shared_ptr<middle_pgsql_t> const &mid,
-                       osmium::Node const &node)
+void check_node(std::shared_ptr<middle_pgsql_t> const &mid,
+                osmium::Node const &node)
 {
     test_buffer_t buffer;
     auto &nodes = buffer.add_way(999, {node.id()}).nodes();
@@ -338,7 +340,7 @@ static void check_node(std::shared_ptr<middle_pgsql_t> const &mid,
 }
 
 /// Return true if the node with the specified id is not in the mid.
-static bool no_node(std::shared_ptr<middle_pgsql_t> const &mid, osmid_t id)
+bool no_node(std::shared_ptr<middle_pgsql_t> const &mid, osmid_t id)
 {
     test_buffer_t buffer;
     auto &nodes = buffer.add_way(999, {id}).nodes();
@@ -346,6 +348,8 @@ static bool no_node(std::shared_ptr<middle_pgsql_t> const &mid, osmid_t id)
     return mid_q->nodes_get_list(&nodes) == 0;
 }
 
+} // anonymous namespace
+
 TEMPLATE_TEST_CASE("middle: add, delete and update node", "",
                    options_slim_default, options_flat_node_cache)
 {
@@ -490,12 +494,14 @@ TEMPLATE_TEST_CASE("middle: add, delete and update node", "",
     }
 }
 
+namespace {
+
 /**
  * Check that the way is in the mid with the right attributes and tags.
  * Does not check node locations.
  */
-static void check_way(std::shared_ptr<middle_pgsql_t> const &mid,
-                      osmium::Way const &orig_way)
+void check_way(std::shared_ptr<middle_pgsql_t> const &mid,
+               osmium::Way const &orig_way)
 {
     auto const mid_q = mid->get_query_instance();
 
@@ -535,9 +541,8 @@ static void check_way(std::shared_ptr<middle_pgsql_t> const &mid,
  * Check that the nodes (ids and locations) of the way with the way_id in the
  * mid are identical to the nodes in the nodes vector.
  */
-static void check_way_nodes(std::shared_ptr<middle_pgsql_t> const &mid,
-                            osmid_t way_id,
-                            std::vector<osmium::Node const *> const &nodes)
+void check_way_nodes(std::shared_ptr<middle_pgsql_t> const &mid, osmid_t way_id,
+                     std::vector<osmium::Node const *> const &nodes)
 {
     auto const mid_q = mid->get_query_instance();
 
@@ -556,13 +561,15 @@ static void check_way_nodes(std::shared_ptr<middle_pgsql_t> const &mid,
 }
 
 /// Return true if the way with the specified id is not in the mid.
-static bool no_way(std::shared_ptr<middle_pgsql_t> const &mid, osmid_t id)
+bool no_way(std::shared_ptr<middle_pgsql_t> const &mid, osmid_t id)
 {
     auto const mid_q = mid->get_query_instance();
     osmium::memory::Buffer outbuf{4096, osmium::memory::Buffer::auto_grow::yes};
     return !mid_q->way_get(id, &outbuf);
 }
 
+} // anonymous namespace
+
 TEMPLATE_TEST_CASE("middle: add, delete and update way", "",
                    options_slim_default, options_flat_node_cache)
 {
@@ -762,12 +769,14 @@ TEMPLATE_TEST_CASE("middle: add way with attributes", "", options_slim_default,
     }
 }
 
+namespace {
+
 /**
  * Check that the relation is in the mid with the right attributes, members
  * and tags. Only checks the relation, does not recurse into members.
  */
-static void check_relation(std::shared_ptr<middle_pgsql_t> const &mid,
-                           osmium::Relation const &orig_relation)
+void check_relation(std::shared_ptr<middle_pgsql_t> const &mid,
+                    osmium::Relation const &orig_relation)
 {
     auto const mid_q = mid->get_query_instance();
 
@@ -807,13 +816,15 @@ static void check_relation(std::shared_ptr<middle_pgsql_t> const &mid,
 }
 
 /// Return true if the relation with the specified id is not in the mid.
-static bool no_relation(std::shared_ptr<middle_pgsql_t> const &mid, osmid_t id)
+bool no_relation(std::shared_ptr<middle_pgsql_t> const &mid, osmid_t id)
 {
     auto const mid_q = mid->get_query_instance();
     osmium::memory::Buffer outbuf{4096, osmium::memory::Buffer::auto_grow::yes};
     return !mid_q->relation_get(id, &outbuf);
 }
 
+} // anonymous namespace
+
 TEMPLATE_TEST_CASE("middle: add, delete and update relation", "",
                    options_slim_default, options_flat_node_cache)
 {
diff --git a/tests/test-options-parse.cpp b/tests/test-options-parse.cpp
index 69283cf89..c8b8b9ab5 100644
--- a/tests/test-options-parse.cpp
+++ b/tests/test-options-parse.cpp
@@ -15,9 +15,11 @@
 #include "taginfo-impl.hpp"
 #include "tagtransform.hpp"
 
-static char const *const TEST_PBF = "foo.pbf";
+namespace {
 
-static void bad_opt(std::vector<char const *> opts, char const *msg)
+char const *const TEST_PBF = "foo.pbf";
+
+void bad_opt(std::vector<char const *> opts, char const *msg)
 {
     opts.insert(opts.begin(), "osm2pgsql");
     opts.push_back(TEST_PBF);
@@ -27,7 +29,7 @@ static void bad_opt(std::vector<char const *> opts, char const *msg)
         Catch::Matchers::Contains(msg));
 }
 
-static options_t opt(std::vector<char const *> opts)
+options_t opt(std::vector<char const *> opts)
 {
     opts.insert(opts.begin(), "osm2pgsql");
     opts.push_back(TEST_PBF);
@@ -35,6 +37,8 @@ static options_t opt(std::vector<char const *> opts)
     return parse_command_line((int)opts.size(), (char **)opts.data());
 }
 
+} // anonymous namespace
+
 TEST_CASE("Insufficient arguments", "[NoDB]")
 {
     std::vector<char const *> opts = {"osm2pgsql", "-c", "--slim"};
diff --git a/tests/test-options-projection.cpp b/tests/test-options-projection.cpp
index 906623a48..0c4154f1c 100644
--- a/tests/test-options-projection.cpp
+++ b/tests/test-options-projection.cpp
@@ -16,7 +16,11 @@
 #include "command-line-parser.hpp"
 #include "reprojection.hpp"
 
-static testing::db::import_t db;
+namespace {
+
+testing::db::import_t db;
+
+} // anonymous namespace
 
 TEST_CASE("Projection setup")
 {
diff --git a/tests/test-output-flex-example-configs.cpp b/tests/test-output-flex-example-configs.cpp
index c9616e2ea..d0004ba56 100644
--- a/tests/test-output-flex-example-configs.cpp
+++ b/tests/test-output-flex-example-configs.cpp
@@ -19,9 +19,13 @@
 #include <string>
 #include <vector>
 
-static testing::db::import_t db;
+namespace {
 
-static char const *const data_file = "liechtenstein-2013-08-03.osm.pbf";
+testing::db::import_t db;
+
+char const *const data_file = "liechtenstein-2013-08-03.osm.pbf";
+
+} // anonymous namespace
 
 std::vector<std::string> get_files() {
     // NOLINTNEXTLINE(concurrency-mt-unsafe)
diff --git a/tests/test-output-flex-multi-input.cpp b/tests/test-output-flex-multi-input.cpp
index 18933f95d..3e235ef37 100644
--- a/tests/test-output-flex-multi-input.cpp
+++ b/tests/test-output-flex-multi-input.cpp
@@ -12,11 +12,15 @@
 #include "common-import.hpp"
 #include "common-options.hpp"
 
-static testing::db::import_t db;
+namespace {
 
-static char const *const conf_file = "test_output_flex.lua";
-static char const *const points = "osm2pgsql_test_point";
-static char const *const lines = "osm2pgsql_test_line";
+testing::db::import_t db;
+
+char const *const conf_file = "test_output_flex.lua";
+char const *const points = "osm2pgsql_test_point";
+char const *const lines = "osm2pgsql_test_line";
+
+} // anonymous namespace
 
 TEST_CASE("with three input files")
 {
diff --git a/tests/test-output-flex-nodes.cpp b/tests/test-output-flex-nodes.cpp
index 4a8e6a95c..9afdf3d5a 100644
--- a/tests/test-output-flex-nodes.cpp
+++ b/tests/test-output-flex-nodes.cpp
@@ -12,9 +12,13 @@
 #include "common-import.hpp"
 #include "common-options.hpp"
 
-static testing::db::import_t db;
+namespace {
 
-static char const *const conf_file = "test_output_flex_nodes.lua";
+testing::db::import_t db;
+
+char const *const conf_file = "test_output_flex_nodes.lua";
+
+} // anonymous namespace
 
 TEST_CASE("add nodes")
 {
diff --git a/tests/test-output-flex-relation-combinations.cpp b/tests/test-output-flex-relation-combinations.cpp
index 6917463e3..83527ac9e 100644
--- a/tests/test-output-flex-relation-combinations.cpp
+++ b/tests/test-output-flex-relation-combinations.cpp
@@ -12,10 +12,13 @@
 #include "common-import.hpp"
 #include "common-options.hpp"
 
-static testing::db::import_t db;
+namespace {
 
-static char const *const conf_file =
-    "test_output_flex_relation_combinations.lua";
+testing::db::import_t db;
+
+char const *const conf_file = "test_output_flex_relation_combinations.lua";
+
+} // anonymous namespace
 
 TEST_CASE("adding common way to relation")
 {
diff --git a/tests/test-output-flex-relations.cpp b/tests/test-output-flex-relations.cpp
index 17bf47908..6606db8d9 100644
--- a/tests/test-output-flex-relations.cpp
+++ b/tests/test-output-flex-relations.cpp
@@ -12,9 +12,13 @@
 #include "common-import.hpp"
 #include "common-options.hpp"
 
-static testing::db::import_t db;
+namespace {
 
-static char const *const conf_file = "test_output_flex_relations.lua";
+testing::db::import_t db;
+
+char const *const conf_file = "test_output_flex_relations.lua";
+
+} // anonymous namespace
 
 TEST_CASE("add relations")
 {
diff --git a/tests/test-output-flex-schema.cpp b/tests/test-output-flex-schema.cpp
index 60b2dd62a..6cefd28fa 100644
--- a/tests/test-output-flex-schema.cpp
+++ b/tests/test-output-flex-schema.cpp
@@ -12,10 +12,14 @@
 #include "common-import.hpp"
 #include "common-options.hpp"
 
-static testing::db::import_t db;
+namespace {
 
-static char const *const conf_file = "test_output_flex_schema.lua";
-static char const *const data_file = "liechtenstein-2013-08-03.osm.pbf";
+testing::db::import_t db;
+
+char const *const conf_file = "test_output_flex_schema.lua";
+char const *const data_file = "liechtenstein-2013-08-03.osm.pbf";
+
+} // anonymous namespace
 
 TEST_CASE("config with schema should work")
 {
diff --git a/tests/test-output-flex-stage2.cpp b/tests/test-output-flex-stage2.cpp
index 30561d4d6..2ec31a48f 100644
--- a/tests/test-output-flex-stage2.cpp
+++ b/tests/test-output-flex-stage2.cpp
@@ -12,9 +12,13 @@
 #include "common-import.hpp"
 #include "common-options.hpp"
 
-static testing::db::import_t db;
+namespace {
 
-static char const *const conf_file = "test_output_flex_stage2.lua";
+testing::db::import_t db;
+
+char const *const conf_file = "test_output_flex_stage2.lua";
+
+} // anonymous namespace
 
 TEST_CASE("nodes and ways")
 {
diff --git a/tests/test-output-flex-tablespace.cpp b/tests/test-output-flex-tablespace.cpp
index 848394295..69451df8d 100644
--- a/tests/test-output-flex-tablespace.cpp
+++ b/tests/test-output-flex-tablespace.cpp
@@ -12,9 +12,13 @@
 #include "common-import.hpp"
 #include "common-options.hpp"
 
-static testing::db::import_t db;
+namespace {
 
-static char const *const conf_file = "test_output_flex.lua";
+testing::db::import_t db;
+
+char const *const conf_file = "test_output_flex.lua";
+
+} // anonymous namespace
 
 TEST_CASE("simple import with tablespaces for middle")
 {
diff --git a/tests/test-output-flex-types.cpp b/tests/test-output-flex-types.cpp
index 3c04d0235..7ab13564f 100644
--- a/tests/test-output-flex-types.cpp
+++ b/tests/test-output-flex-types.cpp
@@ -14,9 +14,13 @@
 
 #include <array>
 
-static testing::db::import_t db;
+namespace {
 
-static char const *const conf_file = "test_output_flex_types.lua";
+testing::db::import_t db;
+
+char const *const conf_file = "test_output_flex_types.lua";
+
+} // anonymous namespace
 
 TEST_CASE("type nil")
 {
diff --git a/tests/test-output-flex-uni.cpp b/tests/test-output-flex-uni.cpp
index 9f44ca3a0..28cdd668e 100644
--- a/tests/test-output-flex-uni.cpp
+++ b/tests/test-output-flex-uni.cpp
@@ -12,9 +12,13 @@
 #include "common-import.hpp"
 #include "common-options.hpp"
 
-static testing::db::import_t db;
+namespace {
 
-static char const *const conf_file = "test_output_flex_uni.lua";
+testing::db::import_t db;
+
+char const *const conf_file = "test_output_flex_uni.lua";
+
+} // anonymous namespace
 
 struct options_slim_default
 {
diff --git a/tests/test-output-flex-update.cpp b/tests/test-output-flex-update.cpp
index 615a753ed..2b111ec1a 100644
--- a/tests/test-output-flex-update.cpp
+++ b/tests/test-output-flex-update.cpp
@@ -12,9 +12,13 @@
 #include "common-import.hpp"
 #include "common-options.hpp"
 
-static testing::db::import_t db;
+namespace {
 
-static char const *const conf_file = "test_output_flex.lua";
+testing::db::import_t db;
+
+char const *const conf_file = "test_output_flex.lua";
+
+} // anonymous namespace
 
 struct options_slim_default
 {
diff --git a/tests/test-output-flex-validgeom.cpp b/tests/test-output-flex-validgeom.cpp
index 982361b3f..f40ed459c 100644
--- a/tests/test-output-flex-validgeom.cpp
+++ b/tests/test-output-flex-validgeom.cpp
@@ -12,10 +12,14 @@
 #include "common-import.hpp"
 #include "common-options.hpp"
 
-static testing::db::import_t db;
+namespace {
 
-static char const *const conf_file = "test_output_flex_validgeom.lua";
-static char const *const data_file = "test_output_pgsql_validgeom.osm";
+testing::db::import_t db;
+
+char const *const conf_file = "test_output_flex_validgeom.lua";
+char const *const data_file = "test_output_pgsql_validgeom.osm";
+
+} // anonymous namespace
 
 TEST_CASE("no invalid geometries should end up in the database")
 {
diff --git a/tests/test-output-flex.cpp b/tests/test-output-flex.cpp
index 0cf424a12..83fe5b8cb 100644
--- a/tests/test-output-flex.cpp
+++ b/tests/test-output-flex.cpp
@@ -12,9 +12,13 @@
 #include "common-import.hpp"
 #include "common-options.hpp"
 
-static testing::db::import_t db;
+namespace {
 
-static char const *const conf_file = "test_output_flex.lua";
+testing::db::import_t db;
+
+char const *const conf_file = "test_output_flex.lua";
+
+} // anonymous namespace
 
 struct options_slim_default
 {
diff --git a/tests/test-output-pgsql-area.cpp b/tests/test-output-pgsql-area.cpp
index 043c4fd1b..c04466843 100644
--- a/tests/test-output-pgsql-area.cpp
+++ b/tests/test-output-pgsql-area.cpp
@@ -12,7 +12,11 @@
 #include "common-import.hpp"
 #include "common-options.hpp"
 
-static testing::db::import_t db;
+namespace {
+
+testing::db::import_t db;
+
+} // anonymous namespace
 
 TEST_CASE("default projection")
 {
diff --git a/tests/test-output-pgsql-hstore-match-only.cpp b/tests/test-output-pgsql-hstore-match-only.cpp
index e188043d1..be08b75bb 100644
--- a/tests/test-output-pgsql-hstore-match-only.cpp
+++ b/tests/test-output-pgsql-hstore-match-only.cpp
@@ -12,7 +12,11 @@
 #include "common-import.hpp"
 #include "common-options.hpp"
 
-static testing::db::import_t db;
+namespace {
+
+testing::db::import_t db;
+
+} // anonymous namespace
 
 TEST_CASE("hstore match only import")
 {
diff --git a/tests/test-output-pgsql-int4.cpp b/tests/test-output-pgsql-int4.cpp
index 85ed3afe2..f41715a0b 100644
--- a/tests/test-output-pgsql-int4.cpp
+++ b/tests/test-output-pgsql-int4.cpp
@@ -14,14 +14,18 @@
 
 #include <string>
 
-static testing::db::import_t db;
+namespace {
 
-static std::string population(osmid_t id)
+testing::db::import_t db;
+
+std::string population(osmid_t id)
 {
     return "SELECT population FROM osm2pgsql_test_point WHERE osm_id = " +
            std::to_string(id);
 }
 
+} // anonymous namespace
+
 TEST_CASE("int4 conversion")
 {
     options_t const options =
diff --git a/tests/test-output-pgsql-schema.cpp b/tests/test-output-pgsql-schema.cpp
index 593a32a39..83799e38a 100644
--- a/tests/test-output-pgsql-schema.cpp
+++ b/tests/test-output-pgsql-schema.cpp
@@ -12,7 +12,11 @@
 #include "common-import.hpp"
 #include "common-options.hpp"
 
-static testing::db::import_t db;
+namespace {
+
+testing::db::import_t db;
+
+} // anonymous namespace
 
 TEST_CASE("schema separation")
 {
diff --git a/tests/test-output-pgsql-tablespace.cpp b/tests/test-output-pgsql-tablespace.cpp
index 989bfdc80..5d750f1c7 100644
--- a/tests/test-output-pgsql-tablespace.cpp
+++ b/tests/test-output-pgsql-tablespace.cpp
@@ -12,9 +12,11 @@
 #include "common-import.hpp"
 #include "common-options.hpp"
 
-static testing::db::import_t db;
+namespace {
 
-static void require_tables(testing::pg::conn_t const &conn)
+testing::db::import_t db;
+
+void require_tables(testing::pg::conn_t const &conn)
 {
     conn.require_has_table("osm2pgsql_test_point");
     conn.require_has_table("osm2pgsql_test_line");
@@ -22,6 +24,8 @@ static void require_tables(testing::pg::conn_t const &conn)
     conn.require_has_table("osm2pgsql_test_roads");
 }
 
+} // anonymous namespace
+
 TEST_CASE("simple import with tables spaces")
 {
     {
diff --git a/tests/test-output-pgsql-validgeom.cpp b/tests/test-output-pgsql-validgeom.cpp
index 6512d4519..496b2b562 100644
--- a/tests/test-output-pgsql-validgeom.cpp
+++ b/tests/test-output-pgsql-validgeom.cpp
@@ -12,7 +12,11 @@
 #include "common-import.hpp"
 #include "common-options.hpp"
 
-static testing::db::import_t db;
+namespace {
+
+testing::db::import_t db;
+
+} // anonymous namespace
 
 TEST_CASE("no invalid geometries")
 {
diff --git a/tests/test-output-pgsql-z_order.cpp b/tests/test-output-pgsql-z_order.cpp
index 0aaa4c7e0..ac568ebf2 100644
--- a/tests/test-output-pgsql-z_order.cpp
+++ b/tests/test-output-pgsql-z_order.cpp
@@ -14,7 +14,11 @@
 
 #include <array>
 
-static testing::db::import_t db;
+namespace {
+
+testing::db::import_t db;
+
+} // anonymous namespace
 
 TEST_CASE("compute Z order")
 {
diff --git a/tests/test-output-pgsql.cpp b/tests/test-output-pgsql.cpp
index 675522326..b8d45578d 100644
--- a/tests/test-output-pgsql.cpp
+++ b/tests/test-output-pgsql.cpp
@@ -12,9 +12,11 @@
 #include "common-import.hpp"
 #include "common-options.hpp"
 
-static testing::db::import_t db;
+namespace {
 
-static void require_tables(testing::pg::conn_t const &conn)
+testing::db::import_t db;
+
+void require_tables(testing::pg::conn_t const &conn)
 {
     conn.require_has_table("osm2pgsql_test_point");
     conn.require_has_table("osm2pgsql_test_line");
@@ -22,6 +24,8 @@ static void require_tables(testing::pg::conn_t const &conn)
     conn.require_has_table("osm2pgsql_test_roads");
 }
 
+} // anonymous namespace
+
 TEST_CASE("liechtenstein slim regression simple")
 {
     REQUIRE_NOTHROW(db.run_file(testing::opt_t().slim(),
diff --git a/tests/test-persistent-cache.cpp b/tests/test-persistent-cache.cpp
index 35a63e3e3..621267438 100644
--- a/tests/test-persistent-cache.cpp
+++ b/tests/test-persistent-cache.cpp
@@ -13,25 +13,29 @@
 
 #include "common-cleanup.hpp"
 
-static void write_and_read_location(node_persistent_cache *cache, osmid_t id,
-                                    double x, double y)
+namespace {
+
+void write_and_read_location(node_persistent_cache *cache, osmid_t id, double x,
+                             double y)
 {
     cache->set(id, osmium::Location{x, y});
     REQUIRE(osmium::Location(x, y) == cache->get(id));
 }
 
-static void read_location(node_persistent_cache const &cache, osmid_t id,
-                          double x, double y)
+void read_location(node_persistent_cache const &cache, osmid_t id, double x,
+                   double y)
 {
     REQUIRE(osmium::Location(x, y) == cache.get(id));
 }
 
-static void delete_location(node_persistent_cache *cache, osmid_t id)
+void delete_location(node_persistent_cache *cache, osmid_t id)
 {
     cache->set(id, osmium::Location{});
     REQUIRE(osmium::Location{} == cache->get(id));
 }
 
+} // anonymous namespace
+
 TEST_CASE("Persistent cache", "[NoDB]")
 {
     std::string const flat_node_file = "test_middle_flat.flat.nodes.bin";
diff --git a/tests/test-pgsql-capabilities.cpp b/tests/test-pgsql-capabilities.cpp
index 3cf8448fd..6cab471ae 100644
--- a/tests/test-pgsql-capabilities.cpp
+++ b/tests/test-pgsql-capabilities.cpp
@@ -13,7 +13,11 @@
 
 #include "pgsql-capabilities.hpp"
 
-static testing::db::import_t const db;
+namespace {
+
+testing::db::import_t db;
+
+} // anonymous namespace
 
 TEST_CASE("has_extension() should work")
 {
diff --git a/tests/test-pgsql.cpp b/tests/test-pgsql.cpp
index 12429a73b..2724a2b0a 100644
--- a/tests/test-pgsql.cpp
+++ b/tests/test-pgsql.cpp
@@ -12,7 +12,11 @@
 #include "common-import.hpp"
 #include "pgsql.hpp"
 
-static testing::db::import_t const db;
+namespace {
+
+testing::db::import_t db;
+
+} // anonymous namespace
 
 TEST_CASE("Tablespace clause with no tablespace")
 {

From 84fa52c091e53dfee147b9316475ef846c220867 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 16 Aug 2024 09:33:40 +0200
Subject: [PATCH 178/430] Remove leftover unused app_mark_way() function
 declaration

---
 src/output-flex.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index 4ca5f733e..b9760f9ba 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -161,7 +161,6 @@ class output_flex_t : public output_t
     int app_define_table();
     int app_define_expire_output();
     int app_get_bbox();
-    int app_mark_way();
 
     int table_tostring();
     int table_insert();

From a57d79a59a0906fe3ce0338a177de2a4c3581e80 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 16 Aug 2024 16:15:26 +0200
Subject: [PATCH 179/430] Add warning when --cache is used in non-slim mode

The option -C/--cache does nothing when used in non-slim mode, print a
warning.

See #1501
---
 src/command-line-parser.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index dab9e4070..24f3451ea 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -136,8 +136,11 @@ void parse_expire_tiles_param(char const *arg, uint32_t *expire_tiles_zoom_min,
 void check_options_non_slim(CLI::App const &app)
 {
     std::vector<std::string> const slim_options = {
-        "--middle-schema", "--middle-with-nodes",
-        "--middle-way-node-index-id-shift", "--tablespace-slim-data",
+        "--cache",
+        "--middle-schema",
+        "--middle-with-nodes",
+        "--middle-way-node-index-id-shift",
+        "--tablespace-slim-data",
         "--tablespace-slim-index"};
 
     for (auto const &opt : slim_options) {

From 0c7b201b768c9dd76168742a7e918670350ab96c Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 16 Aug 2024 14:30:35 +0200
Subject: [PATCH 180/430] Make attributes of OSM objects always available to
 Lua

I did some benchmarking and it turns out there is real no measurable
difference between putting the data in there and not doing it. So
we'll just always do it. This means that it doesn't depend on the
-x/--extra-attributes command line option any more.

Note that the attributes will still be nil when coming from the
middle in update mode if -x/--extra-attributes was not used on import.
---
 src/init.lua                            | 12 -------
 src/output-flex.cpp                     | 48 +++++++++++--------------
 tests/bdd/flex/extra-attributes.feature |  4 +--
 3 files changed, 23 insertions(+), 41 deletions(-)

diff --git a/src/init.lua b/src/init.lua
index cb46b6004..26571cb5f 100644
--- a/src/init.lua
+++ b/src/init.lua
@@ -168,16 +168,6 @@ end
 
 -- This will be the metatable for the OSM objects given to the process callback
 -- functions.
-local inner_metatable = {
-    __index = function(table, key)
-        if key == 'version' or key == 'timestamp' or
-           key == 'changeset' or key == 'uid' or key == 'user' then
-            return nil
-        end
-        error("unknown field '" .. key .. "'", 2)
-    end
-}
-
 object_metatable = {
     __index =  {
         grab_tag = function(data, tag)
@@ -191,8 +181,6 @@ object_metatable = {
     }
 }
 
-setmetatable(object_metatable.__index, inner_metatable)
-
 -- This is used to iterate over (multi)geometries.
 function osm2pgsql.Geometry.geometries(geom)
     local i = 0
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 80a6bb029..4044e34a7 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -126,15 +126,14 @@ prepared_lua_function_t::prepared_lua_function_t(lua_State *lua_state,
 namespace {
 
 void push_osm_object_to_lua_stack(lua_State *lua_state,
-                                  osmium::OSMObject const &object,
-                                  bool with_attributes)
+                                  osmium::OSMObject const &object)
 {
     assert(lua_state);
 
     /**
-     * Table will always have at least 3 fields (id, type, tags). And 5 more if
-     * with_attributes is true (version, timestamp, changeset, uid, user). For
-     * ways there are 2 more (is_closed, nodes), for relations 1 more (members).
+     * Table will always have at least 8 fields (id, type, tags, version,
+     * timestamp, changeset, uid, user). For ways there are 2 more (is_closed,
+     * nodes), for relations 1 more (members).
      */
     constexpr int const max_table_size = 10;
 
@@ -145,23 +144,21 @@ void push_osm_object_to_lua_stack(lua_State *lua_state,
     luaX_add_table_str(lua_state, "type",
                        osmium::item_type_to_name(object.type()));
 
-    if (with_attributes) {
-        if (object.version() != 0U) {
-            luaX_add_table_int(lua_state, "version", object.version());
-        }
-        if (object.timestamp().valid()) {
-            luaX_add_table_int(lua_state, "timestamp",
-                               object.timestamp().seconds_since_epoch());
-        }
-        if (object.changeset() != 0U) {
-            luaX_add_table_int(lua_state, "changeset", object.changeset());
-        }
-        if (object.uid() != 0U) {
-            luaX_add_table_int(lua_state, "uid", object.uid());
-        }
-        if (object.user()[0] != '\0') {
-            luaX_add_table_str(lua_state, "user", object.user());
-        }
+    if (object.version() != 0U) {
+        luaX_add_table_int(lua_state, "version", object.version());
+    }
+    if (object.timestamp().valid()) {
+        luaX_add_table_int(lua_state, "timestamp",
+                           object.timestamp().seconds_since_epoch());
+    }
+    if (object.changeset() != 0U) {
+        luaX_add_table_int(lua_state, "changeset", object.changeset());
+    }
+    if (object.uid() != 0U) {
+        luaX_add_table_int(lua_state, "uid", object.uid());
+    }
+    if (object.user()[0] != '\0') {
+        luaX_add_table_str(lua_state, "user", object.user());
     }
 
     if (object.type() == osmium::item_type::way) {
@@ -692,8 +689,7 @@ int output_flex_t::table_insert()
         lua_pushboolean(lua_state(), false);
         lua_pushstring(lua_state(), "null value in not null column.");
         lua_pushstring(lua_state(), e.column().name().c_str());
-        push_osm_object_to_lua_stack(lua_state(), object,
-                                     get_options()->extra_attributes);
+        push_osm_object_to_lua_stack(lua_state(), object);
         table_connection.increment_not_null_error_counter();
         return 4;
     }
@@ -820,9 +816,7 @@ void output_flex_t::call_lua_function(prepared_lua_function_t func,
     m_calling_context = func.context();
 
     lua_pushvalue(lua_state(), func.index()); // the function to call
-    push_osm_object_to_lua_stack(
-        lua_state(), object,
-        get_options()->extra_attributes); // the single argument
+    push_osm_object_to_lua_stack(lua_state(), object); // the single argument
 
     luaX_set_context(lua_state(), this);
     if (luaX_pcall(lua_state(), 1, func.nresults())) {
diff --git a/tests/bdd/flex/extra-attributes.feature b/tests/bdd/flex/extra-attributes.feature
index d885dbbe2..c0185aeb0 100644
--- a/tests/bdd/flex/extra-attributes.feature
+++ b/tests/bdd/flex/extra-attributes.feature
@@ -36,8 +36,8 @@ Feature: Tests for including extra attributes
             | --slim |
 
         Then table osm2pgsql_test_attr contains
-            | type | way_id | tags->'highway' | tags->'osm_version' |  version | changeset | timestamp | uid  | "user" |
-            | way  | 20     | primary         | NULL                |  NULL    | NULL      | NULL      | NULL | NULL   |
+            | type | way_id | tags->'highway' | tags->'osm_version' | version | changeset | timestamp  | uid  | "user" |
+            | way  | 20     | primary         | NULL                | 1       | 31        | 1578832496 | 17   | test   |
 
         Given the grid
             |    |    |

From bc87ea2c8b4ea0bcac09975627e78765fda8927e Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 16 Aug 2024 14:20:50 +0200
Subject: [PATCH 181/430] Flex: Process untagged objects in their own callbacks

This happens regardless of whether the -x/--extra-attributes option is
set.
---
 .luacheckrc              |  9 ++++++++
 flex-config/untagged.lua | 44 ++++++++++++++++++++++++++++++++++++++++
 src/osmdata.cpp          |  4 +++-
 src/output-flex.cpp      | 34 +++++++++++++++++++++++++------
 src/output-flex.hpp      |  6 ++++++
 5 files changed, 90 insertions(+), 7 deletions(-)
 create mode 100644 flex-config/untagged.lua

diff --git a/.luacheckrc b/.luacheckrc
index 659458e07..515ded21b 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -20,6 +20,15 @@ stds.osm2pgsql = {
                 process_relation = {
                     read_only = false
                 },
+                process_untagged_node = {
+                    read_only = false
+                },
+                process_untagged_way = {
+                    read_only = false
+                },
+                process_untagged_relation = {
+                    read_only = false
+                },
                 select_relation_members = {
                     read_only = false
                 },
diff --git a/flex-config/untagged.lua b/flex-config/untagged.lua
new file mode 100644
index 000000000..b88955e39
--- /dev/null
+++ b/flex-config/untagged.lua
@@ -0,0 +1,44 @@
+-- This config example file is released into the Public Domain.
+--
+-- Most of the time we are only interested in nodes, ways, and relations that
+-- have tags. But we can also get the untagged ones if necessary by using
+-- the processing functions 'process_untagged_node', 'process_untagged_way',
+-- and 'process_untagged_relation', respectively.
+
+local nodes = osm2pgsql.define_node_table('nodes', {
+    { column = 'tags', type = 'jsonb' },
+    { column = 'geom', type = 'point' },
+})
+
+local ways = osm2pgsql.define_way_table('ways', {
+    { column = 'tags', type = 'jsonb' },
+    { column = 'geom', type = 'linestring' },
+})
+
+function osm2pgsql.process_node(object)
+    nodes:insert({
+        tags = object.tags,
+        geom = object:as_point(),
+    })
+end
+
+function osm2pgsql.process_untagged_node(object)
+    nodes:insert({
+        geom = object:as_point(),
+    })
+end
+
+-- If you want to use the same function in both cases, that's also quite easy.
+-- For instance like this:
+
+local function do_way(object)
+    ways:insert({
+        tags = object.tags,
+        geom = object:as_linestring(),
+    })
+end
+
+osm2pgsql.process_way = do_way
+osm2pgsql.process_untagged_way = do_way
+
+
diff --git a/src/osmdata.cpp b/src/osmdata.cpp
index ae2ae05cb..06aaf4bdf 100644
--- a/src/osmdata.cpp
+++ b/src/osmdata.cpp
@@ -31,7 +31,9 @@ osmdata_t::osmdata_t(std::shared_ptr<middle_t> mid,
 : m_mid(std::move(mid)), m_output(std::move(output)),
   m_connection_params(options.connection_params), m_bbox(options.bbox),
   m_num_procs(options.num_procs), m_append(options.append),
-  m_droptemp(options.droptemp), m_with_extra_attrs(options.extra_attributes)
+  m_droptemp(options.droptemp),
+  m_with_extra_attrs(options.extra_attributes ||
+                     options.output_backend == "flex")
 {
     assert(m_mid);
     assert(m_output);
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 4044e34a7..8b3f7ff31 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -1047,12 +1047,15 @@ void output_flex_t::wait()
 
 void output_flex_t::node_add(osmium::Node const &node)
 {
-    if (!m_process_node) {
+    auto const &func =
+        node.tags().empty() ? m_process_untagged_node : m_process_node;
+
+    if (!func) {
         return;
     }
 
     m_context_node = &node;
-    get_mutex_and_call_lua_function(m_process_node, node);
+    get_mutex_and_call_lua_function(func, node);
     m_context_node = nullptr;
 }
 
@@ -1060,23 +1063,29 @@ void output_flex_t::way_add(osmium::Way *way)
 {
     assert(way);
 
-    if (!m_process_way) {
+    auto const &func =
+        way->tags().empty() ? m_process_untagged_way : m_process_way;
+
+    if (!func) {
         return;
     }
 
     m_way_cache.init(way);
-    get_mutex_and_call_lua_function(m_process_way, m_way_cache.get());
+    get_mutex_and_call_lua_function(func, m_way_cache.get());
 }
 
 void output_flex_t::relation_add(osmium::Relation const &relation)
 {
-    if (!m_process_relation) {
+    auto const &func = relation.tags().empty() ? m_process_untagged_relation
+                                               : m_process_relation;
+
+    if (!func) {
         return;
     }
 
     m_relation_cache.init(relation);
     select_relation_members();
-    get_mutex_and_call_lua_function(m_process_relation, relation);
+    get_mutex_and_call_lua_function(func, relation);
 }
 
 void output_flex_t::delete_from_table(table_connection_t *table_connection,
@@ -1171,6 +1180,9 @@ output_flex_t::output_flex_t(output_flex_t const *other,
   m_area_buffer(1024, osmium::memory::Buffer::auto_grow::yes),
   m_process_node(other->m_process_node), m_process_way(other->m_process_way),
   m_process_relation(other->m_process_relation),
+  m_process_untagged_node(other->m_process_untagged_node),
+  m_process_untagged_way(other->m_process_untagged_way),
+  m_process_untagged_relation(other->m_process_untagged_relation),
   m_select_relation_members(other->m_select_relation_members),
   m_after_nodes(other->m_after_nodes), m_after_ways(other->m_after_ways),
   m_after_relations(other->m_after_relations)
@@ -1402,9 +1414,19 @@ void output_flex_t::init_lua(std::string const &filename,
         lua_state(), calling_context::process_way, "process_way"};
     m_process_relation = prepared_lua_function_t{
         lua_state(), calling_context::process_relation, "process_relation"};
+
+    m_process_untagged_node = prepared_lua_function_t{
+        lua_state(), calling_context::process_node, "process_untagged_node"};
+    m_process_untagged_way = prepared_lua_function_t{
+        lua_state(), calling_context::process_way, "process_untagged_way"};
+    m_process_untagged_relation =
+        prepared_lua_function_t{lua_state(), calling_context::process_relation,
+                                "process_untagged_relation"};
+
     m_select_relation_members = prepared_lua_function_t{
         lua_state(), calling_context::select_relation_members,
         "select_relation_members", 1};
+
     m_after_nodes = prepared_lua_function_t{lua_state(), calling_context::main,
                                             "after_nodes"};
     m_after_ways = prepared_lua_function_t{lua_state(), calling_context::main,
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index b9760f9ba..48fbb560a 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -301,7 +301,13 @@ class output_flex_t : public output_t
     prepared_lua_function_t m_process_node{};
     prepared_lua_function_t m_process_way{};
     prepared_lua_function_t m_process_relation{};
+
+    prepared_lua_function_t m_process_untagged_node{};
+    prepared_lua_function_t m_process_untagged_way{};
+    prepared_lua_function_t m_process_untagged_relation{};
+
     prepared_lua_function_t m_select_relation_members{};
+
     prepared_lua_function_t m_after_nodes{};
     prepared_lua_function_t m_after_ways{};
     prepared_lua_function_t m_after_relations{};

From daac3538afa2468a4392029bf3d5e992917a96db Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 19 Aug 2024 09:14:49 +0200
Subject: [PATCH 182/430] Amend error message so it also mentions new
 process_untagged_* funcs

---
 src/output-flex.cpp | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 8b3f7ff31..e253a7122 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -305,8 +305,10 @@ void output_flex_t::check_context_and_state(char const *name,
                                             char const *context, bool condition)
 {
     if (condition) {
-        throw fmt_error("The function {}() can only be called from the {}.",
-                        name, context);
+        throw fmt_error(
+            "The function {}() can only be called (directly or indirectly) "
+            "from the process_[untagged]_{}() functions.",
+            name, context);
     }
 
     if (lua_gettop(lua_state()) > 1) {
@@ -317,7 +319,7 @@ void output_flex_t::check_context_and_state(char const *name,
 int output_flex_t::app_get_bbox()
 {
     check_context_and_state(
-        "get_bbox", "process_node/way/relation() functions",
+        "get_bbox", "node/way/relation",
         m_calling_context != calling_context::process_node &&
             m_calling_context != calling_context::process_way &&
             m_calling_context != calling_context::process_relation);
@@ -367,7 +369,7 @@ int output_flex_t::app_get_bbox()
 
 int output_flex_t::app_as_point()
 {
-    check_context_and_state("as_point", "process_node() function",
+    check_context_and_state("as_point", "node",
                             m_calling_context != calling_context::process_node);
 
     auto *geom = create_lua_geometry_object(lua_state());
@@ -378,7 +380,7 @@ int output_flex_t::app_as_point()
 
 int output_flex_t::app_as_linestring()
 {
-    check_context_and_state("as_linestring", "process_way() function",
+    check_context_and_state("as_linestring", "way",
                             m_calling_context != calling_context::process_way);
 
     m_way_cache.add_nodes(middle());
@@ -391,7 +393,7 @@ int output_flex_t::app_as_linestring()
 
 int output_flex_t::app_as_polygon()
 {
-    check_context_and_state("as_polygon", "process_way() function",
+    check_context_and_state("as_polygon", "way",
                             m_calling_context != calling_context::process_way);
 
     m_way_cache.add_nodes(middle());
@@ -405,7 +407,7 @@ int output_flex_t::app_as_polygon()
 int output_flex_t::app_as_multipoint()
 {
     check_context_and_state(
-        "as_multipoint", "process_node/relation() functions",
+        "as_multipoint", "node/relation",
         m_calling_context != calling_context::process_node &&
             m_calling_context != calling_context::process_relation);
 
@@ -423,10 +425,10 @@ int output_flex_t::app_as_multipoint()
 
 int output_flex_t::app_as_multilinestring()
 {
-    check_context_and_state(
-        "as_multilinestring", "process_way/relation() functions",
-        m_calling_context != calling_context::process_way &&
-            m_calling_context != calling_context::process_relation);
+    check_context_and_state("as_multilinestring", "way/relation",
+                            m_calling_context != calling_context::process_way &&
+                                m_calling_context !=
+                                    calling_context::process_relation);
 
     if (m_calling_context == calling_context::process_way) {
         m_way_cache.add_nodes(middle());
@@ -447,10 +449,10 @@ int output_flex_t::app_as_multilinestring()
 
 int output_flex_t::app_as_multipolygon()
 {
-    check_context_and_state(
-        "as_multipolygon", "process_way/relation() functions",
-        m_calling_context != calling_context::process_way &&
-            m_calling_context != calling_context::process_relation);
+    check_context_and_state("as_multipolygon", "way/relation",
+                            m_calling_context != calling_context::process_way &&
+                                m_calling_context !=
+                                    calling_context::process_relation);
 
     if (m_calling_context == calling_context::process_way) {
         m_way_cache.add_nodes(middle());
@@ -473,9 +475,9 @@ int output_flex_t::app_as_multipolygon()
 
 int output_flex_t::app_as_geometrycollection()
 {
-    check_context_and_state(
-        "as_geometrycollection", "process_relation() function",
-        m_calling_context != calling_context::process_relation);
+    check_context_and_state("as_geometrycollection", "relation",
+                            m_calling_context !=
+                                calling_context::process_relation);
 
     m_relation_cache.add_members(middle());
 

From b328d3bfada961ac127db362ea7e9b5b01388a02 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 18 Aug 2024 09:47:35 +0200
Subject: [PATCH 183/430] Remove flat node file using std::filesystem::remove()

Use standard function instead of old unlink() function. Also add some
error reporting.
---
 src/node-persistent-cache.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/node-persistent-cache.cpp b/src/node-persistent-cache.cpp
index 6cb3beae1..4d2dabbdd 100644
--- a/src/node-persistent-cache.cpp
+++ b/src/node-persistent-cache.cpp
@@ -7,11 +7,13 @@
  * For a full list of authors see the git log.
  */
 
-#include "logging.hpp"
 #include "node-persistent-cache.hpp"
 
+#include "logging.hpp"
+
 #include <cassert>
 #include <cerrno>
+#include <filesystem>
 #include <system_error>
 #include <utility>
 
@@ -55,9 +57,14 @@ node_persistent_cache::~node_persistent_cache() noexcept
     if (m_remove_file) {
         try {
             log_debug("Removing persistent node cache at '{}'.", m_file_name);
+            std::error_code ec{};
+            std::filesystem::remove(m_file_name, ec);
+            if (ec) {
+                log_warn("Failed to remove persistent node cache at '{}': {}.",
+                         m_file_name, ec.message());
+            }
         } catch (...) {
             // exception ignored on purpose
         }
-        unlink(m_file_name.c_str());
     }
 }

From 03191b4af116206014a5cb62a1eaeee751afe8c1 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 16 Aug 2024 17:07:21 +0200
Subject: [PATCH 184/430] Remove forgotten code still supporting old middle
 format

It seems removing thise code was forgotten in
515dfb25e900fa781f97145246fb280e0d93f187
---
 src/middle-pgsql.cpp | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index 83e229cd9..99b81a8c3 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -703,22 +703,12 @@ INSERT INTO osm2pgsql_changed_ways
         )");
     }
 
-    if (m_options->middle_database_format == 1) {
-        queries.emplace_back(R"(
-INSERT INTO osm2pgsql_changed_relations
-  SELECT r.id
-    FROM {schema}"{prefix}_rels" r, osm2pgsql_changed_nodes n
-    WHERE r.parts && ARRAY[n.id]
-      AND r.parts[1:way_off] && ARRAY[n.id]
-        )");
-    } else {
-        queries.emplace_back(R"(
+    queries.emplace_back(R"(
 INSERT INTO osm2pgsql_changed_relations
   SELECT r.id
     FROM {schema}"{prefix}_rels" r, osm2pgsql_changed_nodes c
     WHERE {schema}"{prefix}_member_ids"(r.members, 'N'::char) && ARRAY[c.id];
-        )");
-    }
+    )");
 
     for (auto const &query : queries) {
         m_db_connection.exec(build_sql(*m_options, query));
@@ -755,22 +745,12 @@ void middle_pgsql_t::get_way_parents(idlist_t const &changed_ways,
 
     m_db_connection.exec("ANALYZE osm2pgsql_changed_ways");
 
-    if (m_options->middle_database_format == 1) {
-        m_db_connection.exec(build_sql(*m_options, R"(
-INSERT INTO osm2pgsql_changed_relations
-  SELECT DISTINCT r.id
-    FROM {schema}"{prefix}_rels" r, osm2pgsql_changed_ways w
-    WHERE r.parts && ARRAY[w.id]
-      AND r.parts[way_off+1:rel_off] && ARRAY[w.id]
-        )"));
-    } else {
-        m_db_connection.exec(build_sql(*m_options, R"(
+    m_db_connection.exec(build_sql(*m_options, R"(
 INSERT INTO osm2pgsql_changed_relations
   SELECT DISTINCT r.id
     FROM {schema}"{prefix}_rels" r, osm2pgsql_changed_ways c
     WHERE {schema}"{prefix}_member_ids"(r.members, 'W'::char) && ARRAY[c.id];
-        )"));
-    }
+    )"));
 
     load_id_list(m_db_connection, "osm2pgsql_changed_relations",
                  parent_relations);

From effc556aa3a021136b74e191b9fda106f1929f0b Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 17 Aug 2024 10:04:43 +0200
Subject: [PATCH 185/430] We are not planning to litter the code with
 [[nodiscard]]

Reflect that in the comment in the clang-tidy config.
---
 .clang-tidy | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index 8364f24af..0dc6ec8c0 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -69,8 +69,9 @@ Checks: '*,-abseil-*,-altera-*,-android-cloexec-*,-bugprone-easily-swappable-par
 #    Lots of these, need some time to fix. (TODO)
 #
 #  modernize-use-nodiscard
-#    We have a lot of these. Remove it for the time being because there are
-#    too many to fix quickly. (TODO)
+#    Doesn't really make the code clearer if it is all littered with
+#    [[nodiscard]]. Looks like this warning is more suited for a library
+#    than for normal code.
 #
 #  modernize-use-trailing-return-type
 #    We are not that modern...

From 95b9f8190907a60737a4fef8c447f08389c76945 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 18 Aug 2024 14:35:02 +0200
Subject: [PATCH 186/430] New helper function luaX_pushstring()

---
 src/lua-utils.cpp   |  5 +++++
 src/lua-utils.hpp   |  3 +++
 src/output-flex.cpp | 20 ++++++++++----------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/lua-utils.cpp b/src/lua-utils.cpp
index ee047f9b5..9ebabf7eb 100644
--- a/src/lua-utils.cpp
+++ b/src/lua-utils.cpp
@@ -58,6 +58,11 @@ void *luaX_get_context(lua_State *lua_state) noexcept
 
 #endif
 
+void luaX_pushstring(lua_State *lua_state, std::string_view str) noexcept
+{
+    lua_pushlstring(lua_state, str.data(), str.size());
+}
+
 void luaX_add_table_str(lua_State *lua_state, char const *key,
                         char const *value) noexcept
 {
diff --git a/src/lua-utils.hpp b/src/lua-utils.hpp
index b6830971a..ec41587e6 100644
--- a/src/lua-utils.hpp
+++ b/src/lua-utils.hpp
@@ -17,11 +17,14 @@
 
 #include <cassert>
 #include <cstdint>
+#include <string_view>
 #include <utility>
 
 void luaX_set_context(lua_State *lua_state, void *ptr) noexcept;
 void *luaX_get_context(lua_State *lua_state) noexcept;
 
+void luaX_pushstring(lua_State *lua_state, std::string_view str) noexcept;
+
 void luaX_add_table_str(lua_State *lua_state, char const *key,
                         char const *value) noexcept;
 void luaX_add_table_str(lua_State *lua_state, char const *key,
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index e253a7122..45187a1ed 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -530,7 +530,7 @@ int output_flex_t::table_tostring()
     auto const &table = get_table_from_param();
 
     std::string const str{fmt::format("osm2pgsql.Table[{}]", table.name())};
-    lua_pushstring(lua_state(), str.c_str());
+    luaX_pushstring(lua_state(), str);
 
     return 1;
 }
@@ -689,8 +689,8 @@ int output_flex_t::table_insert()
     } catch (not_null_exception const &e) {
         copy_mgr->rollback_line();
         lua_pushboolean(lua_state(), false);
-        lua_pushstring(lua_state(), "null value in not null column.");
-        lua_pushstring(lua_state(), e.column().name().c_str());
+        lua_pushliteral(lua_state(), "null value in not null column.");
+        luaX_pushstring(lua_state(), e.column().name());
         push_osm_object_to_lua_stack(lua_state(), object);
         table_connection.increment_not_null_error_counter();
         return 4;
@@ -730,14 +730,14 @@ int output_flex_t::table_columns()
 int output_flex_t::table_name()
 {
     auto const &table = get_table_from_param();
-    lua_pushstring(lua_state(), table.name().c_str());
+    luaX_pushstring(lua_state(), table.name());
     return 1;
 }
 
 int output_flex_t::table_schema()
 {
     auto const &table = get_table_from_param();
-    lua_pushstring(lua_state(), table.schema().c_str());
+    luaX_pushstring(lua_state(), table.schema());
     return 1;
 }
 
@@ -758,7 +758,7 @@ int output_flex_t::expire_output_tostring()
                     expire_output.minzoom(), expire_output.maxzoom(),
                     expire_output.filename(), expire_output.schema(),
                     expire_output.table());
-    lua_pushstring(lua_state(), str.c_str());
+    luaX_pushstring(lua_state(), str);
 
     return 1;
 }
@@ -783,7 +783,7 @@ int output_flex_t::expire_output_filename()
 {
     auto const &expire_output = get_expire_output_from_param();
 
-    lua_pushstring(lua_state(), expire_output.filename().c_str());
+    luaX_pushstring(lua_state(), expire_output.filename());
     return 1;
 }
 
@@ -791,7 +791,7 @@ int output_flex_t::expire_output_schema()
 {
     auto const &expire_output = get_expire_output_from_param();
 
-    lua_pushstring(lua_state(), expire_output.schema().c_str());
+    luaX_pushstring(lua_state(), expire_output.schema());
     return 1;
 }
 
@@ -799,7 +799,7 @@ int output_flex_t::expire_output_table()
 {
     auto const &expire_output = get_expire_output_from_param();
 
-    lua_pushstring(lua_state(), expire_output.table().c_str());
+    luaX_pushstring(lua_state(), expire_output.table());
     return 1;
 }
 
@@ -1338,7 +1338,7 @@ void output_flex_t::init_lua(std::string const &filename,
 
     luaX_add_table_int(lua_state(), "stage", 1);
 
-    lua_pushstring(lua_state(), "properties");
+    lua_pushliteral(lua_state(), "properties");
     lua_createtable(lua_state(), 0, (int)properties.size());
     for (auto const &property : properties) {
         luaX_add_table_str(lua_state(), property.first.c_str(),

From c337135831293395ab610cfaaa8462ce187433fc Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 18 Aug 2024 14:56:51 +0200
Subject: [PATCH 187/430] Use string instead of userdata to set metatable name

Also store the name in the __name field of the metadata table
as the luaL_newmetatable() function from Lua does it.
---
 src/output-flex.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 45187a1ed..0efa2fec5 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -47,6 +47,7 @@
 #include <mutex>
 #include <stdexcept>
 #include <string>
+#include <string_view>
 
 // Mutex used to coordinate access to Lua code
 static std::mutex lua_mutex;
@@ -97,9 +98,6 @@ TRAMPOLINE(expire_output_schema, schema)
 TRAMPOLINE(expire_output_table, table)
 TRAMPOLINE(expire_output_tostring, __tostring)
 
-static char const *const osm2pgsql_object_metatable =
-    "osm2pgsql.object_metatable";
-
 prepared_lua_function_t::prepared_lua_function_t(lua_State *lua_state,
                                                  calling_context context,
                                                  char const *name, int nresults)
@@ -125,6 +123,8 @@ prepared_lua_function_t::prepared_lua_function_t(lua_State *lua_state,
 
 namespace {
 
+std::string_view const osm2pgsql_object_metatable = "osm2pgsql.OSMObject";
+
 void push_osm_object_to_lua_stack(lua_State *lua_state,
                                   osmium::OSMObject const &object)
 {
@@ -191,7 +191,7 @@ void push_osm_object_to_lua_stack(lua_State *lua_state,
     lua_rawset(lua_state, -3);
 
     // Set the metatable of this object
-    lua_pushlightuserdata(lua_state, (void *)osm2pgsql_object_metatable);
+    luaX_pushstring(lua_state, osm2pgsql_object_metatable);
     lua_gettable(lua_state, LUA_REGISTRYINDEX);
     lua_setmetatable(lua_state, -2);
 }
@@ -1370,6 +1370,8 @@ void output_flex_t::init_lua(std::string const &filename,
 
     // Store the methods on OSM objects in its metatable.
     lua_getglobal(lua_state(), "object_metatable");
+    luaX_pushstring(lua_state(), osm2pgsql_object_metatable);
+    lua_setfield(lua_state(), -2, "__name");
     lua_getfield(lua_state(), -1, "__index");
     luaX_add_table_func(lua_state(), "get_bbox", lua_trampoline_app_get_bbox);
     luaX_add_table_func(lua_state(), "as_linestring",
@@ -1391,7 +1393,7 @@ void output_flex_t::init_lua(std::string const &filename,
     // Store the global object "object_metatable" defined in the init.lua
     // script in the registry and then remove the global object. It will
     // later be used as metatable for OSM objects.
-    lua_pushlightuserdata(lua_state(), (void *)osm2pgsql_object_metatable);
+    luaX_pushstring(lua_state(), osm2pgsql_object_metatable);
     lua_getglobal(lua_state(), "object_metatable");
     lua_settable(lua_state(), LUA_REGISTRYINDEX);
     lua_pushnil(lua_state());

From ddf5f2428b01a3ff236596c759e16c1947923d0b Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 18 Aug 2024 09:59:29 +0200
Subject: [PATCH 188/430] Extend the docs in flex-config/README.md

---
 flex-config/README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/flex-config/README.md b/flex-config/README.md
index 6997cadb5..5bd85e61b 100644
--- a/flex-config/README.md
+++ b/flex-config/README.md
@@ -34,6 +34,22 @@ pgsql (C transform) output:
 
 * [compatible.lua](compatible.lua)
 
+The other files demonstrate some specific functionality, look at these if
+and when you need that functionality.
+
+* [addresses.lua](addresses.lua) -- Get all objects with addresses and store
+  as point objects in the database
+* [bbox.lua](bbox.lua) -- Use of the `get_bbox()` function to get the bounding
+  boxes of features
+* [expire.lua](expire.lua) -- Tile expiry configuration
+* [indexes.lua](indexes.lua) -- Various options around index creation
+* [labelpoint.lua](labelpoint.lua) -- How to get good labelling points using
+  the `centroid()` and `pole_of_inaccessibility()` functions.
+* [untagged](untagged.lua) -- How to access untagged objects.
+
+The subdirectory [gen](gen/) contains example configurations for
+generalization support.
+
 ## Dependencies
 
 Some of the example files use the `inspect` Lua library to show debugging

From 1200f1b84e4c5c23300534baf7f49ca93bd88ef9 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 18 Aug 2024 10:12:44 +0200
Subject: [PATCH 189/430] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 56 +++++++++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 921faf2c8..448f42ed9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,20 +6,20 @@ We operate the "Fork & Pull" model explained at
 
 https://help.github.com/articles/using-pull-requests
 
-You should fork the project into your own repo, create a topic branch
-there and then make one or more pull requests back to the OpenStreetMap repository.
-Your pull requests will then be reviewed and discussed.
+You should fork the project into your own repo, create a topic branch there and
+then make one or more pull requests back to the OpenStreetMap repository. Your
+pull requests will then be reviewed and discussed.
 
 ## History
 
-To understand the osm2pgsql code, it helps to know some history on it. Osm2pgsql
-was written in C in 2007 as a port of an older Python utility. In 2014 it was
-ported to C++ by MapQuest and the last C version was released as 0.86.0. In it's
-time, it has had varying contribution activity, including times with no
-maintainer or active developers.
+To understand the osm2pgsql code, it helps to know some history on it.
+Osm2pgsql was written in C in 2007 as a port of an older Python utility. In
+2014 it was ported to C++ by MapQuest and the last C version was released as
+0.86.0. In its time, it has had varying contribution activity, including times
+with no maintainer or active developers.
 
-Parts of the codebase still clearly show their C origin and could use rewriting
-in modern C++, making use of data structures in the standard library.
+Very few parts of the code now show their C origin, most has been transformed
+to modern C++. We are currently targeting C++17.
 
 ## Versioning
 
@@ -35,15 +35,20 @@ Code must be written in the
 4 spaces indentation. Tabs should never be used in the C++ code. Braces must
 always be used for code blocks, even one-liners.
 
-Names should use underscores, not camel case, with class/struct names ending in `_t`.
-Template parameters must use all upper case.
+Names should use underscores, not camel case, with class/struct names ending in
+`_t`. Template parameters must use all upper case.
 
-Headers should be included in the order C++ standard library headers,
-C library headers, Boost headers, and last osm2pgsql files.
+Header files should be included in the following order, each group in their own
+block:
 
-There is a .clang-format configuration available and all code must be run through
-clang-format before submitting. You can use git-clang-format after staging all
-your changes:
+* The corresponding .hpp file (in .cpp files only)
+* Other osm2pgsql header files
+* Header files from external libraries, each in their own block
+* C++/C C++ standard library header files
+
+There is a .clang-format configuration available and all code must be run
+through clang-format before submitting. You can use git-clang-format after
+staging all your changes:
 
     git-clang-format src/*pp tests/*pp
 
@@ -74,12 +79,18 @@ Results should be checked into the repository.
 
 ## Platforms targeted
 
-Ideally osm2pgsql should compile on Linux, OS X, FreeBSD and Windows. It is
-actively tested on Debian, Ubuntu and FreeBSD by the maintainers.
+Osm2pgsql must compile and pass all tests at least on Linux, OS X and Windows.
+Tests run on Github action to make sure that it does.
+
+On Linux the latest stable versions of popular distributions and the stable
+version before that are supported if possible.
+
+All maintained versions of PostgreSQL are supported.
 
 ## Testing
 
-osm2pgsql is tested with two types of tests: Classic tests written in C++ and BDD (Behavior Driven Development) tests written in Python.
+osm2pgsql is tested with two types of tests: Classic tests written in C++ and
+BDD (Behavior Driven Development) tests written in Python.
 
 ### Classic Tests
 
@@ -187,11 +198,6 @@ stderr_capture=False
 log_capture=False
 ```
 
-### Performance testing
-
-If performance testing with a full planet import is required, indicate what
-needs testing in a pull request.
-
 ## Coverage reports
 
 To create coverage reports, set `BUILD_COVERAGE` in the CMake config to `ON`,

From 183983514308cdf44d3276c8bb3a893931131c9c Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 19 Aug 2024 09:41:29 +0200
Subject: [PATCH 190/430] Use anonymous namespace instead of static in more
 places

---
 src/gen/osm2pgsql-gen.cpp | 2 +-
 src/lua-utils.cpp         | 6 +++++-
 src/output-flex.cpp       | 8 ++++++--
 src/properties.cpp        | 6 +++++-
 src/wkb.cpp               | 6 +++++-
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index 165f40271..7ec3634fa 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -60,7 +60,7 @@
 // context object.
 // NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
 #define TRAMPOLINE(func_name, lua_name)                                        \
-    static int lua_trampoline_##func_name(lua_State *lua_state)                \
+    int lua_trampoline_##func_name(lua_State *lua_state)                       \
     {                                                                          \
         try {                                                                  \
             return static_cast<genproc_t *>(luaX_get_context(lua_state))       \
diff --git a/src/lua-utils.cpp b/src/lua-utils.cpp
index 9ebabf7eb..029cb8cb2 100644
--- a/src/lua-utils.cpp
+++ b/src/lua-utils.cpp
@@ -33,8 +33,12 @@ void *luaX_get_context(lua_State *lua_state) noexcept
 
 #else
 
+namespace {
+
 // Unique key for lua registry
-static char const *osm2pgsql_output_flex = "osm2pgsql_output_flex";
+constexpr char const *const osm2pgsql_output_flex = "osm2pgsql_output_flex";
+
+} // anonymous namespace
 
 void luaX_set_context(lua_State *lua_state, void *ptr) noexcept
 {
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 0efa2fec5..362938ca8 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -49,8 +49,10 @@
 #include <string>
 #include <string_view>
 
+namespace {
+
 // Mutex used to coordinate access to Lua code
-static std::mutex lua_mutex;
+std::mutex lua_mutex;
 
 // Lua can't call functions on C++ objects directly. This macro defines simple
 // C "trampoline" functions which are called from Lua which get the current
@@ -58,7 +60,7 @@ static std::mutex lua_mutex;
 // context object.
 // NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
 #define TRAMPOLINE(func_name, lua_name)                                        \
-    static int lua_trampoline_##func_name(lua_State *lua_state)                \
+    int lua_trampoline_##func_name(lua_State *lua_state)                       \
     {                                                                          \
         try {                                                                  \
             return static_cast<output_flex_t *>(luaX_get_context(lua_state))   \
@@ -98,6 +100,8 @@ TRAMPOLINE(expire_output_schema, schema)
 TRAMPOLINE(expire_output_table, table)
 TRAMPOLINE(expire_output_tostring, __tostring)
 
+} // anonymous namespace
+
 prepared_lua_function_t::prepared_lua_function_t(lua_State *lua_state,
                                                  calling_context context,
                                                  char const *name, int nresults)
diff --git a/src/properties.cpp b/src/properties.cpp
index f443eccca..b52f0cde0 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -17,7 +17,11 @@
 #include <cassert>
 #include <cstdlib>
 
-static constexpr char const *const properties_table = "osm2pgsql_properties";
+namespace {
+
+constexpr char const *const properties_table = "osm2pgsql_properties";
+
+} // anonymous namespace
 
 properties_t::properties_t(connection_params_t connection_params,
                            std::string schema)
diff --git a/src/wkb.cpp b/src/wkb.cpp
index 36963cdd4..aee24688b 100644
--- a/src/wkb.cpp
+++ b/src/wkb.cpp
@@ -576,7 +576,9 @@ geom::geometry_t ewkb_to_geom(std::string_view wkb)
     return geom;
 }
 
-static constexpr std::array<char, 256> const hex_table = {
+namespace {
+
+constexpr std::array<char, 256> const hex_table = {
     0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
     0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
     0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
@@ -587,6 +589,8 @@ static constexpr std::array<char, 256> const hex_table = {
     0, 10, 11, 12,   13, 14, 15, 0,   0, 0, 0, 0,   0, 0, 0, 0,
 };
 
+} // anonymous namespace
+
 unsigned char decode_hex_char(char c) noexcept
 {
     // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-constant-array-index)

From d2e58a0935e5a2d5deec89afc45a3e9dcd056373 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 19 Aug 2024 12:02:46 +0200
Subject: [PATCH 191/430] Enable misc-use-anonymous-namespace check in
 clang-tidy

---
 .clang-tidy | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index 0dc6ec8c0..1bae03965 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,5 +1,5 @@
 ---
-Checks: '*,-abseil-*,-altera-*,-android-cloexec-*,-bugprone-easily-swappable-parameters,-cert-err58-cpp,-cppcoreguidelines-avoid-do-while,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-cstyle-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-vararg,-fuchsia-*,-google-readability-casting,-google-readability-todo,-hicpp-named-parameter,-hicpp-no-array-decay,-hicpp-vararg,-llvm-include-order,-llvm-header-guard,-llvmlibc-*,-misc-include-cleaner,-misc-no-recursion,-misc-use-anonymous-namespace,-modernize-use-nodiscard,-modernize-use-trailing-return-type,-readability-identifier-length,-readability-implicit-bool-conversion,-readability-named-parameter,-readability-magic-numbers'
+Checks: '*,-abseil-*,-altera-*,-android-cloexec-*,-bugprone-easily-swappable-parameters,-cert-err58-cpp,-cppcoreguidelines-avoid-do-while,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-cstyle-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-vararg,-fuchsia-*,-google-readability-casting,-google-readability-todo,-hicpp-named-parameter,-hicpp-no-array-decay,-hicpp-vararg,-llvm-include-order,-llvm-header-guard,-llvmlibc-*,-misc-include-cleaner,-misc-no-recursion,-modernize-use-nodiscard,-modernize-use-trailing-return-type,-readability-identifier-length,-readability-implicit-bool-conversion,-readability-named-parameter,-readability-magic-numbers'
 #
 #  cppcoreguidelines-pro-type-cstyle-cast
 #  google-build-using-namespace
@@ -65,9 +65,6 @@ Checks: '*,-abseil-*,-altera-*,-android-cloexec-*,-bugprone-easily-swappable-par
 #  misc-no-recursion
 #    Nothing wrong with recursion
 #
-#  misc-use-anonymous-namespace (new in clang-tidy-16)
-#    Lots of these, need some time to fix. (TODO)
-#
 #  modernize-use-nodiscard
 #    Doesn't really make the code clearer if it is all littered with
 #    [[nodiscard]]. Looks like this warning is more suited for a library

From 28c4dc2eca4eb9634018c63f718c6ce3afd54086 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 18 Aug 2024 15:19:14 +0200
Subject: [PATCH 192/430] Check that Lua functions on OSM object are called
 correctly

The code that deals with functions called on the Lua OSM object given as
parameter to the process callbacks is somewhat strange. The result is
that calling "object.as_point()" etc. will work, but the correct Lua way
to do this is "object:as_point()". This adds a check to all the
functions that detects this case and prints a warning. It will also
check that those functions are not called with any additional arguments.

Checking for this now, users will hopefully fix this. This gives us the
opportunity later to change or code to be more in line with usual Lua
syntax.

This will only print a warning once per function.
---
 src/output-flex.cpp | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 0efa2fec5..771c43778 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -45,6 +45,7 @@
 #include <limits>
 #include <memory>
 #include <mutex>
+#include <set>
 #include <stdexcept>
 #include <string>
 #include <string_view>
@@ -295,6 +296,40 @@ void create_expire_tables(std::vector<expire_output_t> const &expire_outputs,
     }
 }
 
+void check_for_object(lua_State *lua_state, char const *const function_name)
+{
+    // This is used to make sure we are printing warnings only once per
+    // function name.
+    static std::set<std::string> message_shown;
+    if (message_shown.count(function_name)) {
+        return;
+    }
+
+    int const num_params = lua_gettop(lua_state);
+    if (num_params == 0) {
+        log_warn("You should use the syntax 'object:{}()' (with the colon, not "
+                 "a point) to call functions on the OSM object.",
+                 function_name);
+
+        message_shown.emplace(function_name);
+        return;
+    }
+
+    if (lua_getmetatable(lua_state, 1)) {
+        luaL_getmetatable(lua_state, osm2pgsql_object_metatable.data());
+        if (lua_rawequal(lua_state, -1, -2)) {
+            lua_pop(lua_state, 2); // remove the two metatables
+            return;
+        }
+        lua_pop(lua_state, 2); // remove the two metatables
+    }
+
+    message_shown.emplace(function_name);
+    log_warn("First and only parameter for {0}() must be the OSM object. Call "
+             "it like this: 'object:{0}()'.",
+             function_name);
+}
+
 } // anonymous namespace
 
 /**
@@ -304,6 +339,8 @@ void create_expire_tables(std::vector<expire_output_t> const &expire_outputs,
 void output_flex_t::check_context_and_state(char const *name,
                                             char const *context, bool condition)
 {
+    check_for_object(lua_state(), name);
+
     if (condition) {
         throw fmt_error(
             "The function {}() can only be called (directly or indirectly) "

From 89c24b2f948747178d28468377928a792a1126ce Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 17 Aug 2024 10:20:57 +0200
Subject: [PATCH 193/430] Remove support for non-bucket index on middle way
 table

Only supports bucket index which has been the default for a long time
and works much better than the old one.

Also removes the command line option --middle-way-node-index-id-shift.
The id shift can not be changed any more, it is hardcoded to 5 which
was the default.

This is a potentially breaking change: Users with incompatible indexes
have to do a reimport (or at least create the new index).
---
 man/osm2pgsql.md            |  4 --
 src/command-line-parser.cpp | 15 +------
 src/middle-pgsql.cpp        | 85 ++++++++++---------------------------
 src/middle-pgsql.hpp        |  3 --
 src/options.hpp             |  8 ----
 5 files changed, 25 insertions(+), 90 deletions(-)

diff --git a/man/osm2pgsql.md b/man/osm2pgsql.md
index 833b62e02..7c1733185 100644
--- a/man/osm2pgsql.md
+++ b/man/osm2pgsql.md
@@ -173,10 +173,6 @@ mandatory for short options too.
     database user. By default the schema set with `--schema` is used, or
     `public` if that is not set.
 
-\--middle-way-node-index-id-shift=SHIFT
-:   Set ID shift for way node bucket index in middle. Experts only. See
-    documentation for details.
-
 \--middle-with-nodes
 :   Used together with the **new** middle database format when a flat nodes
     file is used to force storing nodes with tags in the database, too.
diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index 24f3451ea..a10eec3b9 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -136,12 +136,8 @@ void parse_expire_tiles_param(char const *arg, uint32_t *expire_tiles_zoom_min,
 void check_options_non_slim(CLI::App const &app)
 {
     std::vector<std::string> const slim_options = {
-        "--cache",
-        "--middle-schema",
-        "--middle-with-nodes",
-        "--middle-way-node-index-id-shift",
-        "--tablespace-slim-data",
-        "--tablespace-slim-index"};
+        "--cache", "--middle-schema", "--middle-with-nodes",
+        "--tablespace-slim-data", "--tablespace-slim-index"};
 
     for (auto const &opt : slim_options) {
         if (app.count(opt) > 0) {
@@ -575,13 +571,6 @@ options_t parse_command_line(int argc, char *argv[])
         ->description("Disable concurrent index creation.")
         ->group("Advanced options");
 
-    // --middle-way-node-index-id-shift
-    app.add_option("--middle-way-node-index-id-shift",
-                   options.way_node_index_id_shift)
-        ->description("Set ID shift for bucket index.")
-        ->type_name("N")
-        ->group("Advanced options");
-
     // --number-processes
     app.add_option("--number-processes", options.num_procs)
         // The threads will open up database connections which will
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index 99b81a8c3..34a2ae9d3 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -46,17 +46,6 @@
 
 namespace {
 
-bool check_bucket_index(pg_conn_t const *db_connection,
-                        std::string const &prefix)
-{
-    auto const res =
-        db_connection->exec("SELECT relname FROM pg_class"
-                            " WHERE relkind='i'"
-                            " AND relname = '{}_ways_nodes_bucket_idx'",
-                            prefix);
-    return res.num_tuples() > 0;
-}
-
 void send_id_list(pg_conn_t const &db_connection,
                          std::string const &table, idlist_t const &ids)
 {
@@ -97,7 +86,7 @@ std::string build_sql(options_t const &options, std::string const &templ)
         fmt::arg("using_tablespace", using_tablespace),
         fmt::arg("data_tablespace", tablespace_clause(options.tblsslim_data)),
         fmt::arg("index_tablespace", tablespace_clause(options.tblsslim_index)),
-        fmt::arg("way_node_index_id_shift", options.way_node_index_id_shift),
+        fmt::arg("way_node_index_id_shift", 5),
         fmt::arg("attribute_columns_definition",
                  options.extra_attributes ? " created timestamp with time zone,"
                                             " version int4,"
@@ -663,17 +652,13 @@ void middle_pgsql_t::get_node_parents(idlist_t const &changed_nodes,
 
     queries.emplace_back("ANALYZE osm2pgsql_changed_nodes");
 
-    bool const has_bucket_index =
-        check_bucket_index(&m_db_connection, m_options->prefix);
-
-    if (has_bucket_index) {
-        // The query to get the parent ways of changed nodes is "hidden"
-        // inside a PL/pgSQL function so that the query planner only sees
-        // a single node id that is being queried for. If we ask for all
-        // nodes at the same time the query planner sometimes thinks it is
-        // better to do a full table scan which totally destroys performance.
-        // This is due to the PostgreSQL statistics on ARRAYs being way off.
-        queries.emplace_back(R"(
+    // The query to get the parent ways of changed nodes is "hidden"
+    // inside a PL/pgSQL function so that the query planner only sees
+    // a single node id that is being queried for. If we ask for all
+    // nodes at the same time the query planner sometimes thinks it is
+    // better to do a full table scan which totally destroys performance.
+    // This is due to the PostgreSQL statistics on ARRAYs being way off.
+    queries.emplace_back(R"(
 CREATE OR REPLACE FUNCTION osm2pgsql_find_changed_ways() RETURNS void AS $$
 DECLARE
   changed_buckets RECORD;
@@ -692,16 +677,8 @@ BEGIN
 END;
 $$ LANGUAGE plpgsql
 )");
-        queries.emplace_back("SELECT osm2pgsql_find_changed_ways()");
-        queries.emplace_back("DROP FUNCTION osm2pgsql_find_changed_ways()");
-    } else {
-        queries.emplace_back(R"(
-INSERT INTO osm2pgsql_changed_ways
-  SELECT w.id
-    FROM {schema}"{prefix}_ways" w, osm2pgsql_changed_nodes n
-    WHERE w.nodes && ARRAY[n.id]
-        )");
-    }
+    queries.emplace_back("SELECT osm2pgsql_find_changed_ways()");
+    queries.emplace_back("DROP FUNCTION osm2pgsql_find_changed_ways()");
 
     queries.emplace_back(R"(
 INSERT INTO osm2pgsql_changed_relations
@@ -1176,7 +1153,7 @@ table_sql sql_for_nodes(middle_pgsql_options const &options)
     return sql;
 }
 
-table_sql sql_for_ways(middle_pgsql_options const &options)
+table_sql sql_for_ways()
 {
     table_sql sql{};
 
@@ -1200,23 +1177,17 @@ table_sql sql_for_ways(middle_pgsql_options const &options)
                            "  {users_table_access}"
                            " WHERE o.id = ANY($1::int8[])"};
 
-    if (options.way_node_index_id_shift == 0) {
-        sql.create_fw_dep_indexes = {
-            "CREATE INDEX ON {schema}\"{prefix}_ways\" USING GIN (nodes)"
-            "  WITH (fastupdate = off) {index_tablespace}"};
-    } else {
-        sql.create_fw_dep_indexes = {
-            "CREATE OR REPLACE FUNCTION"
-            "    {schema}\"{prefix}_index_bucket\"(int8[])"
-            "  RETURNS int8[] AS $$"
-            "  SELECT ARRAY(SELECT DISTINCT"
-            "    unnest($1) >> {way_node_index_id_shift})"
-            "$$ LANGUAGE SQL IMMUTABLE",
-            "CREATE INDEX \"{prefix}_ways_nodes_bucket_idx\""
-            "  ON {schema}\"{prefix}_ways\""
-            "  USING GIN ({schema}\"{prefix}_index_bucket\"(nodes))"
-            "  WITH (fastupdate = off) {index_tablespace}"};
-    }
+    sql.create_fw_dep_indexes = {
+        "CREATE OR REPLACE FUNCTION"
+        "    {schema}\"{prefix}_index_bucket\"(int8[])"
+        "  RETURNS int8[] AS $$"
+        "  SELECT ARRAY(SELECT DISTINCT"
+        "    unnest($1) >> {way_node_index_id_shift})"
+        "$$ LANGUAGE SQL IMMUTABLE",
+        "CREATE INDEX \"{prefix}_ways_nodes_bucket_idx\""
+        "  ON {schema}\"{prefix}_ways\""
+        "  USING GIN ({schema}\"{prefix}_index_bucket\"(nodes))"
+        "  WITH (fastupdate = off) {index_tablespace}"};
 
     return sql;
 }
@@ -1272,7 +1243,6 @@ middle_pgsql_t::middle_pgsql_t(std::shared_ptr<thread_pool_t> thread_pool,
   m_db_copy(m_copy_thread), m_append(options->append)
 {
     m_store_options.with_attributes = options->extra_attributes;
-    m_store_options.way_node_index_id_shift = options->way_node_index_id_shift;
 
     if (options->middle_with_nodes) {
         m_store_options.nodes = true;
@@ -1289,15 +1259,8 @@ middle_pgsql_t::middle_pgsql_t(std::shared_ptr<thread_pool_t> thread_pool,
 
     log_debug("Mid: pgsql, cache={}", options->cache);
 
-    bool const has_bucket_index =
-        check_bucket_index(&m_db_connection, options->prefix);
-
-    if (!has_bucket_index && options->append) {
-        log_debug("You don't have a bucket index. See manual for details.");
-    }
-
     m_tables.nodes() = table_desc{*options, sql_for_nodes(m_store_options)};
-    m_tables.ways() = table_desc{*options, sql_for_ways(m_store_options)};
+    m_tables.ways() = table_desc{*options, sql_for_ways()};
     m_tables.relations() = table_desc{*options, sql_for_relations()};
 
     m_users_table = table_desc{*options, sql_for_users(m_store_options)};
@@ -1310,8 +1273,6 @@ void middle_pgsql_t::set_requirements(
     log_debug("  nodes: {}", m_store_options.nodes);
     log_debug("  untagged_nodes: {}", m_store_options.untagged_nodes);
     log_debug("  use_flat_node_file: {}", m_store_options.use_flat_node_file);
-    log_debug("  way_node_index_id_shift: {}",
-              m_store_options.way_node_index_id_shift);
     log_debug("  with_attributes: {}", m_store_options.with_attributes);
 }
 
diff --git a/src/middle-pgsql.hpp b/src/middle-pgsql.hpp
index 15d91bc76..fc01f2ebc 100644
--- a/src/middle-pgsql.hpp
+++ b/src/middle-pgsql.hpp
@@ -39,9 +39,6 @@ struct middle_pgsql_options
     // Store untagged nodes also (set in addition to nodes=true).
     bool untagged_nodes = false;
 
-    // Bit shift used in way node index
-    uint8_t way_node_index_id_shift = 5;
-
     // Use a flat node file
     bool use_flat_node_file = false;
 
diff --git a/src/options.hpp b/src/options.hpp
index c0acd0890..80ee36a31 100644
--- a/src/options.hpp
+++ b/src/options.hpp
@@ -107,14 +107,6 @@ struct options_t
 
     unsigned int num_procs = 1;
 
-    /**
-     * How many bits should the node id be shifted for the way node index?
-     * The result is a lossy index which is significantly smaller.
-     * See https://osm2pgsql.org/doc/manual.html#bucket-index-for-slim-mode
-     * Use 0 to use a classic loss-less GIN index.
-     */
-    uint8_t way_node_index_id_shift = 5;
-
     /**
      * Middle database format:
      * 0 = non-slim mode, no database middle (ram middle)

From 62f77d3f469807ac81f3c78a402160f44b1bdd31 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 30 Aug 2024 18:58:12 +0200
Subject: [PATCH 194/430] Add missing return in version output

This was broken in 2449b294735c7cc59e4ee9acc4ef0473391175d4
---
 src/command-line-parser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index 24f3451ea..e0d907e3b 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -259,7 +259,7 @@ void check_options_expire(options_t *options) {
 
 void print_version()
 {
-    fmt::print(stderr, "osm2pgsql version {}", get_osm2pgsql_version());
+    fmt::print(stderr, "osm2pgsql version {}\n", get_osm2pgsql_version());
     fmt::print(stderr, "Build: {}\n", get_build_type());
     fmt::print(stderr, "Compiled using the following library versions:\n");
     fmt::print(stderr, "Libosmium {}\n", LIBOSMIUM_VERSION_STRING);

From 271cfe1865ac5fff22dd550c454047e30d254159 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 17 Aug 2024 10:38:10 +0200
Subject: [PATCH 195/430] Update man page, there is no old/new middle db format
 any more

---
 man/osm2pgsql.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/osm2pgsql.md b/man/osm2pgsql.md
index 7c1733185..19ea5b9c8 100644
--- a/man/osm2pgsql.md
+++ b/man/osm2pgsql.md
@@ -174,8 +174,8 @@ mandatory for short options too.
     `public` if that is not set.
 
 \--middle-with-nodes
-:   Used together with the **new** middle database format when a flat nodes
-    file is used to force storing nodes with tags in the database, too.
+:   When a flat nodes file is used, nodes are not stored in the database. Use
+    this option to force storing nodes with tags in the database, too.
 
 # OUTPUT OPTIONS
 

From f50039822c9a7727ead73af823073d2aa62b9d14 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 16 Sep 2024 12:09:06 +0200
Subject: [PATCH 196/430] CI: Set PROJ_DATA env var so proj finds proj.db on
 Windows

---
 .github/actions/win-test/action.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/actions/win-test/action.yml b/.github/actions/win-test/action.yml
index aca176018..5cf2dffda 100644
--- a/.github/actions/win-test/action.yml
+++ b/.github/actions/win-test/action.yml
@@ -8,6 +8,7 @@ runs:
       run: ctest --output-on-failure -C Release
       env:
         PYTHONUTF8: 1
+        PROJ_DATA: c:/vcpkg/installed/x64-windows/share/proj/ # so proj finds proj.db
       shell: bash
       working-directory: build
 

From 02673cdbb00409c2c3be5d2e5ac35ed3becbbf7a Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 15 Sep 2024 16:20:21 +0200
Subject: [PATCH 197/430] Simplify property handling and do updates all at once

Property changes were reflected piece by piece in the database. This
changes it so they are only done in one go after all the changes have
been made. So if something fails before we get to the point where we
write all properties to the database, no updates are actually done.

And the code is simpler because we keep track of necessary database
updates automatically and do them the next time the store() function is
called.
---
 src/osm2pgsql.cpp         |  9 +++--
 src/properties.cpp        | 69 ++++++++++++++++-----------------------
 src/properties.hpp        | 29 +++++++++-------
 tests/test-properties.cpp | 19 +++++++----
 4 files changed, 64 insertions(+), 62 deletions(-)

diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
index b3178e1e6..1db3a623e 100644
--- a/src/osm2pgsql.cpp
+++ b/src/osm2pgsql.cpp
@@ -206,7 +206,7 @@ void check_and_update_flat_node_file(properties_t *properties,
                 "Using the flat node file you specified on the command line"
                 " ('{}') instead of the one used on import ('{}').",
                 absolute_path, flat_node_file_from_import);
-            properties->set_string("flat_node_file", absolute_path, true);
+            properties->set_string("flat_node_file", absolute_path);
         }
     }
 }
@@ -291,7 +291,7 @@ void check_and_update_style_file(properties_t *properties, options_t *options)
     log_info("Using the style file you specified on the command line"
              " ('{}') instead of the one used on import ('{}').",
              absolute_path, style_file_from_import);
-    properties->set_string("style", absolute_path, true);
+    properties->set_string("style", absolute_path);
 }
 
 // This is called in "append" mode to check that the command line options are
@@ -356,6 +356,7 @@ int main(int argc, char *argv[])
             }
 
             check_and_update_properties(&properties, &options);
+            properties.store();
 
             auto const finfo = run(options, properties);
 
@@ -367,10 +368,12 @@ int main(int argc, char *argv[])
                     (finfo.last_timestamp >
                      osmium::Timestamp{current_timestamp})) {
                     properties.set_string("current_timestamp",
-                                          finfo.last_timestamp.to_iso(), true);
+                                          finfo.last_timestamp.to_iso());
+                    properties.store();
                 }
             }
         } else {
+            properties.init_table();
             set_option_defaults(&options);
             store_properties(&properties, options);
             auto const finfo = run(options, properties);
diff --git a/src/properties.cpp b/src/properties.cpp
index b52f0cde0..563e5029e 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -83,66 +83,55 @@ bool properties_t::get_bool(std::string const &property,
                     property);
 }
 
-void properties_t::set_string(std::string property, std::string value,
-                              bool update_database)
+void properties_t::set_string(std::string property, std::string value)
 {
-    auto const r =
-        m_properties.insert_or_assign(std::move(property), std::move(value));
-
-    if (!update_database || !m_has_properties_table) {
-        return;
-    }
-
-    auto const &inserted = *(r.first);
-    log_debug("  Storing {}='{}'", inserted.first, inserted.second);
+    m_properties[property] = value;
+    m_to_update[property] = value;
+}
 
-    pg_conn_t const db_connection{m_connection_params, "prop.set"};
-    db_connection.exec(
-        "PREPARE set_property(text, text) AS"
-        " INSERT INTO {} (property, value) VALUES ($1, $2)"
-        " ON CONFLICT (property) DO UPDATE SET value = EXCLUDED.value",
-        table_name());
-    db_connection.exec_prepared("set_property", inserted.first,
-                                inserted.second);
+void properties_t::set_int(std::string property, int64_t value)
+{
+    set_string(std::move(property), std::to_string(value));
 }
 
-void properties_t::set_int(std::string property, int64_t value,
-                           bool update_database)
+void properties_t::set_bool(std::string property, bool value)
 {
-    set_string(std::move(property), std::to_string(value), update_database);
+    set_string(std::move(property), value ? "true" : "false");
 }
 
-void properties_t::set_bool(std::string property, bool value,
-                            bool update_database)
+void properties_t::init_table()
 {
-    set_string(std::move(property), value ? "true" : "false", update_database);
+    auto const table = table_name();
+    log_info("Initializing properties table '{}'.", table);
+
+    pg_conn_t const db_connection{m_connection_params, "prop.store"};
+    db_connection.exec("CREATE TABLE IF NOT EXISTS {} ("
+                       " property TEXT NOT NULL PRIMARY KEY,"
+                       " value TEXT NOT NULL)",
+                       table);
+    db_connection.exec("TRUNCATE {}", table);
+    m_has_properties_table = true;
 }
 
 void properties_t::store()
 {
     auto const table = table_name();
-
     log_info("Storing properties to table '{}'.", table);
-    pg_conn_t const db_connection{m_connection_params, "prop.store"};
 
-    if (m_has_properties_table) {
-        db_connection.exec("TRUNCATE {}", table);
-    } else {
-        db_connection.exec("CREATE TABLE {} ("
-                           " property TEXT NOT NULL PRIMARY KEY,"
-                           " value TEXT NOT NULL)",
-                           table);
-        m_has_properties_table = true;
-    }
+    pg_conn_t const db_connection{m_connection_params, "prop.store"};
 
-    db_connection.exec("PREPARE set_property(text, text) AS"
-                       " INSERT INTO {} (property, value) VALUES ($1, $2)",
-                       table);
+    db_connection.exec(
+        "PREPARE set_property(text, text) AS"
+        " INSERT INTO {} (property, value) VALUES ($1, $2)"
+        " ON CONFLICT (property) DO UPDATE SET value = EXCLUDED.value",
+        table);
 
-    for (auto const &[k, v] : m_properties) {
+    for (auto const &[k, v] : m_to_update) {
         log_debug("  Storing {}='{}'", k, v);
         db_connection.exec_prepared("set_property", k, v);
     }
+
+    m_to_update.clear();
 }
 
 bool properties_t::load()
diff --git a/src/properties.hpp b/src/properties.hpp
index 3828628be..74f907553 100644
--- a/src/properties.hpp
+++ b/src/properties.hpp
@@ -53,10 +53,8 @@ class properties_t
      *
      * \param property Name of the property
      * \param value Value of the property
-     * \param update_database Update database with this value immediately.
      */
-    void set_string(std::string property, std::string value,
-                    bool update_database = false);
+    void set_string(std::string property, std::string value);
 
     /**
      * Set property to integer value. The integer will be converted to a string
@@ -64,10 +62,8 @@ class properties_t
      *
      * \param property Name of the property
      * \param value Value of the property
-     * \param update_database Update database with this value immediately.
      */
-    void set_int(std::string property, int64_t value,
-                 bool update_database = false);
+    void set_int(std::string property, int64_t value);
 
     /**
      * Set property to boolean value. In the database this will show up as the
@@ -75,15 +71,18 @@ class properties_t
      *
      * \param property Name of the property
      * \param value Value of the property
-     * \param update_database Update database with this value immediately.
      */
-    void set_bool(std::string property, bool value,
-                  bool update_database = false);
+    void set_bool(std::string property, bool value);
 
     /**
-     * Store all properties in the database. Creates the properties table in
-     * the database if needed. Removes any properties that might already be
-     * stored in the database.
+     * Initialize the database table 'osm2pgsql_properties'. It is created if
+     * it does not exist and truncated.
+     */
+    void init_table();
+
+    /**
+     * Store all properties in the database that changed since the last store.
+     * Overwrites any properties that might already be stored in the database.
      */
     void store();
 
@@ -102,7 +101,13 @@ class properties_t
 private:
     std::string table_name() const;
 
+    // The properties
     std::map<std::string, std::string> m_properties;
+
+    // Temporary storage of all properties that need to be updated in the
+    // database.
+    std::map<std::string, std::string> m_to_update;
+
     connection_params_t m_connection_params;
     std::string m_schema;
     bool m_has_properties_table;
diff --git a/tests/test-properties.cpp b/tests/test-properties.cpp
index 1e1aa5b91..f0e11ffa3 100644
--- a/tests/test-properties.cpp
+++ b/tests/test-properties.cpp
@@ -46,13 +46,15 @@ TEST_CASE("Store and retrieve properties (with database)")
 {
     for (std::string const schema : {"public", "middleschema"}) {
         testing::pg::tempdb_t const db;
-        auto conn = db.connect();
+        auto const conn = db.connect();
+
         if (schema != "public") {
             conn.exec("CREATE SCHEMA IF NOT EXISTS {};", schema);
         }
 
         {
             properties_t properties{db.connection_params(), schema};
+            properties.init_table();
 
             properties.set_string("foo", "bar");
             properties.set_string("empty", "");
@@ -103,10 +105,11 @@ TEST_CASE("Store and retrieve properties (with database)")
 TEST_CASE("Update existing properties in database")
 {
     testing::pg::tempdb_t const db;
-    auto conn = db.connect();
+    auto const conn = db.connect();
 
     {
         properties_t properties{db.connection_params(), "public"};
+        properties.init_table();
 
         properties.set_string("a", "xxx");
         properties.set_string("b", "yyy");
@@ -124,12 +127,14 @@ TEST_CASE("Update existing properties in database")
         REQUIRE(properties.get_string("a", "def") == "xxx");
         REQUIRE(properties.get_string("b", "def") == "yyy");
 
-        properties.set_string("a", "zzz", false);
-        properties.set_string("b", "zzz", true);
+        properties.set_string("a", "zzz");
+        properties.set_string("b", "zzz");
 
         // both are updated in memory
         REQUIRE(properties.get_string("a", "def") == "zzz");
         REQUIRE(properties.get_string("b", "def") == "zzz");
+
+        properties.store();
     }
 
     {
@@ -138,8 +143,8 @@ TEST_CASE("Update existing properties in database")
         properties_t properties{db.connection_params(), "public"};
         REQUIRE(properties.load());
 
-        // only "b" was updated in the database
-        REQUIRE(properties.get_string("a", "def") == "xxx");
+        // both are updated in the database
+        REQUIRE(properties.get_string("a", "def") == "zzz");
         REQUIRE(properties.get_string("b", "def") == "zzz");
     }
 }
@@ -147,7 +152,7 @@ TEST_CASE("Update existing properties in database")
 TEST_CASE("Load returns false if there are no properties in database")
 {
     testing::pg::tempdb_t const db;
-    auto conn = db.connect();
+    auto const conn = db.connect();
     init_database_capabilities(conn);
 
     properties_t properties{db.connection_params(), "public"};

From fbd3bfa24957775d16713d354649fe0ebccf9a4e Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 15 Sep 2024 16:20:21 +0200
Subject: [PATCH 198/430] Check that properties can be loaded in osmp2glsq-gen

---
 src/gen/osm2pgsql-gen.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index 7ec3634fa..f4f7f8ec4 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -730,7 +730,11 @@ int main(int argc, char *argv[])
         }
 
         properties_t properties{connection_params, middle_dbschema};
-        properties.load();
+        if (!properties.load()) {
+            throw std::runtime_error{
+                "Did not find table 'osm2pgsql_properties' in database. "
+                "Database too old? Wrong schema?"};
+        }
 
         if (style.empty()) {
             style = properties.get_string("style", "");

From 7b77762c02eadf05abdba633b4eecbf9a9f2e016 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 15 Sep 2024 16:20:21 +0200
Subject: [PATCH 199/430] Store properties in database only later after more
 checks

If osm2pgsql fails during initialization, for instance because the input
file or the style file was not found, it had already initialized the
osm2pgsql_properties table in the database. We now write the properties
table later to reduce the chances that a small error on the command line
destroys an existing database this way.
---
 src/osm2pgsql.cpp | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
index 1db3a623e..ee0b6976f 100644
--- a/src/osm2pgsql.cpp
+++ b/src/osm2pgsql.cpp
@@ -44,7 +44,7 @@ void show_memory_usage()
     }
 }
 
-file_info run(options_t const &options, properties_t const &properties)
+file_info run(options_t const &options, properties_t *properties)
 {
     auto const files = prepare_input_files(
         options.input_files, options.input_format, options.append);
@@ -57,10 +57,15 @@ file_info run(options_t const &options, properties_t const &properties)
     middle->start();
 
     auto output = output_t::create_output(middle->get_query_instance(),
-                                          thread_pool, options, properties);
+                                          thread_pool, options, *properties);
 
     middle->set_requirements(output->get_requirements());
 
+    if (!options.append) {
+        properties->init_table();
+    }
+    properties->store();
+
     osmdata_t osmdata{middle, output, options};
 
     // Processing: In this phase the input file(s) are read and parsed,
@@ -93,8 +98,8 @@ void check_db(options_t const &options)
     check_schema(options.output_dbschema);
 }
 
-// This is called in "create" mode to store properties into the database.
-void store_properties(properties_t *properties, options_t const &options)
+// This is called in "create" mode to initialize properties.
+void set_up_properties(properties_t *properties, options_t const &options)
 {
     properties->set_bool("attributes", options.extra_attributes);
 
@@ -121,8 +126,6 @@ void store_properties(properties_t *properties, options_t const &options)
             std::filesystem::absolute(std::filesystem::path{options.style})
                 .string());
     }
-
-    properties->store();
 }
 
 void store_data_properties(properties_t *properties, file_info const &finfo)
@@ -139,8 +142,6 @@ void store_data_properties(properties_t *properties, file_info const &finfo)
             properties->set_string("replication_" + s, value);
         }
     }
-
-    properties->store();
 }
 
 void check_updatable(properties_t const &properties)
@@ -348,6 +349,7 @@ int main(int argc, char *argv[])
 
         properties_t properties{options.connection_params,
                                 options.middle_dbschema};
+
         if (options.append) {
             if (!properties.load()) {
                 throw std::runtime_error{
@@ -358,7 +360,7 @@ int main(int argc, char *argv[])
             check_and_update_properties(&properties, &options);
             properties.store();
 
-            auto const finfo = run(options, properties);
+            auto const finfo = run(options, &properties);
 
             if (finfo.last_timestamp.valid()) {
                 auto const current_timestamp =
@@ -369,17 +371,17 @@ int main(int argc, char *argv[])
                      osmium::Timestamp{current_timestamp})) {
                     properties.set_string("current_timestamp",
                                           finfo.last_timestamp.to_iso());
-                    properties.store();
                 }
             }
         } else {
-            properties.init_table();
             set_option_defaults(&options);
-            store_properties(&properties, options);
-            auto const finfo = run(options, properties);
+            set_up_properties(&properties, options);
+            auto const finfo = run(options, &properties);
             store_data_properties(&properties, finfo);
         }
 
+        properties.store();
+
         show_memory_usage();
         log_info("osm2pgsql took {} overall.",
                  util::human_readable_duration(timer_overall.stop()));

From f4eedc5f630fd3ba4a04a00b157893cfa09c20de Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 16 Sep 2024 10:55:54 +0200
Subject: [PATCH 200/430] Update included CLI11 library to version 2.4.2

---
 contrib/CLI11/LICENSE                         |  2 +-
 contrib/CLI11/README.contrib                  |  2 +-
 contrib/CLI11/README.md                       | 45 +++++++++++--------
 contrib/CLI11/include/CLI/App.hpp             | 15 +++++--
 contrib/CLI11/include/CLI/Argv.hpp            |  6 ++-
 contrib/CLI11/include/CLI/CLI.hpp             |  4 ++
 contrib/CLI11/include/CLI/Config.hpp          |  4 +-
 contrib/CLI11/include/CLI/ConfigFwd.hpp       |  2 +
 contrib/CLI11/include/CLI/Encoding.hpp        |  5 ++-
 contrib/CLI11/include/CLI/Error.hpp           | 12 ++---
 contrib/CLI11/include/CLI/Formatter.hpp       |  4 +-
 contrib/CLI11/include/CLI/FormatterFwd.hpp    |  2 +
 contrib/CLI11/include/CLI/Macros.hpp          |  2 +
 contrib/CLI11/include/CLI/Option.hpp          |  4 +-
 contrib/CLI11/include/CLI/Split.hpp           |  4 +-
 contrib/CLI11/include/CLI/StringTools.hpp     |  4 +-
 contrib/CLI11/include/CLI/Timer.hpp           |  2 +
 contrib/CLI11/include/CLI/TypeTools.hpp       | 42 ++++++++++++++---
 contrib/CLI11/include/CLI/Validators.hpp      |  4 +-
 contrib/CLI11/include/CLI/Version.hpp         |  6 ++-
 contrib/CLI11/include/CLI/impl/App_inl.hpp    | 41 ++++++++---------
 contrib/CLI11/include/CLI/impl/Argv_inl.hpp   |  6 ++-
 contrib/CLI11/include/CLI/impl/Config_inl.hpp |  4 +-
 .../CLI11/include/CLI/impl/Encoding_inl.hpp   |  6 ++-
 .../CLI11/include/CLI/impl/Formatter_inl.hpp  |  4 +-
 contrib/CLI11/include/CLI/impl/Option_inl.hpp |  4 +-
 contrib/CLI11/include/CLI/impl/Split_inl.hpp  |  8 ++--
 .../include/CLI/impl/StringTools_inl.hpp      |  4 +-
 .../CLI11/include/CLI/impl/Validators_inl.hpp | 11 ++---
 29 files changed, 175 insertions(+), 84 deletions(-)

diff --git a/contrib/CLI11/LICENSE b/contrib/CLI11/LICENSE
index aae15855e..715be0bb4 100644
--- a/contrib/CLI11/LICENSE
+++ b/contrib/CLI11/LICENSE
@@ -1,4 +1,4 @@
-CLI11 2.2 Copyright (c) 2017-2023 University of Cincinnati, developed by Henry
+CLI11 2.2 Copyright (c) 2017-2024 University of Cincinnati, developed by Henry
 Schreiner under NSF AWARD 1414736. All rights reserved.
 
 Redistribution and use in source and binary forms of CLI11, with or without
diff --git a/contrib/CLI11/README.contrib b/contrib/CLI11/README.contrib
index 04e057e2d..304172b0d 100644
--- a/contrib/CLI11/README.contrib
+++ b/contrib/CLI11/README.contrib
@@ -1,2 +1,2 @@
 Source: https://github.com/CLIUtils/CLI11
-Revision: v2.4.1
+Revision: v2.4.2
diff --git a/contrib/CLI11/README.md b/contrib/CLI11/README.md
index 7a26fb251..0f3229913 100644
--- a/contrib/CLI11/README.md
+++ b/contrib/CLI11/README.md
@@ -1663,92 +1663,99 @@ thanks to all the contributors
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/SX91"><img src="https://avatars2.githubusercontent.com/u/754754?v=4?s=100" width="100px;" alt="Anton"/><br /><sub><b>Anton</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=SX91" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/trokhymchuk"><img src="https://avatars.githubusercontent.com/u/66204814?v=4?s=100" width="100px;" alt="Artem Trokhymchuk "/><br /><sub><b>Artem Trokhymchuk </b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=trokhymchuk" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/BenjaminBeichler"><img src="https://avatars.githubusercontent.com/u/1441492?v=4?s=100" width="100px;" alt="Benjamin Beichler"/><br /><sub><b>Benjamin Beichler</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=BenjaminBeichler" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/cbachhuber/"><img src="https://avatars0.githubusercontent.com/u/27212661?v=4?s=100" width="100px;" alt="Christoph Bachhuber"/><br /><sub><b>Christoph Bachhuber</b></sub></a><br /><a href="#example-cbachhuber" title="Examples">💡</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=cbachhuber" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/calebzulawski"><img src="https://avatars.githubusercontent.com/u/563826?v=4?s=100" width="100px;" alt="Caleb Zulawski"/><br /><sub><b>Caleb Zulawski</b></sub></a><br /><a href="#platform-calebzulawski" title="Packaging/porting to new platform">📦</a></td>
     </tr>
     <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/krico"><img src="https://avatars.githubusercontent.com/u/6952185?v=4?s=100" width="100px;" alt="Christian Asmussen"/><br /><sub><b>Christian Asmussen</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=krico" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/cbachhuber/"><img src="https://avatars0.githubusercontent.com/u/27212661?v=4?s=100" width="100px;" alt="Christoph Bachhuber"/><br /><sub><b>Christoph Bachhuber</b></sub></a><br /><a href="#example-cbachhuber" title="Examples">💡</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=cbachhuber" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/dfleury2"><img src="https://avatars1.githubusercontent.com/u/4805384?v=4?s=100" width="100px;" alt="D. Fleury"/><br /><sub><b>D. Fleury</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=dfleury2" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/dbarowy"><img src="https://avatars3.githubusercontent.com/u/573142?v=4?s=100" width="100px;" alt="Dan Barowy"/><br /><sub><b>Dan Barowy</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=dbarowy" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/mensinda"><img src="https://avatars3.githubusercontent.com/u/3407462?v=4?s=100" width="100px;" alt="Daniel Mensinger"/><br /><sub><b>Daniel Mensinger</b></sub></a><br /><a href="#platform-mensinda" title="Packaging/porting to new platform">📦</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/DarkWingMcQuack"><img src="https://avatars.githubusercontent.com/u/38857302?v=4?s=100" width="100px;" alt="DarkWingMcQuack"/><br /><sub><b>DarkWingMcQuack</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=DarkWingMcQuack" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ZeeD26"><img src="https://avatars2.githubusercontent.com/u/2487468?v=4?s=100" width="100px;" alt="Dominik Steinberger"/><br /><sub><b>Dominik Steinberger</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=ZeeD26" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dvj"><img src="https://avatars2.githubusercontent.com/u/77217?v=4?s=100" width="100px;" alt="Doug Johnston"/><br /><sub><b>Doug Johnston</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Advj" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=dvj" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/eli-schwartz"><img src="https://avatars.githubusercontent.com/u/6551424?v=4?s=100" width="100px;" alt="Eli Schwartz"/><br /><sub><b>Eli Schwartz</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=eli-schwartz" title="Code">💻</a></td>
     </tr>
     <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dvj"><img src="https://avatars2.githubusercontent.com/u/77217?v=4?s=100" width="100px;" alt="Doug Johnston"/><br /><sub><b>Doug Johnston</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Advj" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=dvj" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://recursiveascent.blogspot.com/"><img src="https://avatars.githubusercontent.com/u/1779595?v=4?s=100" width="100px;" alt="Dylan Baker"/><br /><sub><b>Dylan Baker</b></sub></a><br /><a href="#platform-dcbaker" title="Packaging/porting to new platform">📦</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/eli-schwartz"><img src="https://avatars.githubusercontent.com/u/6551424?v=4?s=100" width="100px;" alt="Eli Schwartz"/><br /><sub><b>Eli Schwartz</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=eli-schwartz" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/sifferman"><img src="https://avatars.githubusercontent.com/u/43790149?v=4?s=100" width="100px;" alt="Ethan Sifferman"/><br /><sub><b>Ethan Sifferman</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=sifferman" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/helmesjo"><img src="https://avatars0.githubusercontent.com/u/2501070?v=4?s=100" width="100px;" alt="Fred Helmesjö"/><br /><sub><b>Fred Helmesjö</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Ahelmesjo" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=helmesjo" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://iscinumpy.gitlab.io"><img src="https://avatars1.githubusercontent.com/u/4616906?v=4?s=100" width="100px;" alt="Henry Schreiner"/><br /><sub><b>Henry Schreiner</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Ahenryiii" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=henryiii" title="Documentation">📖</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=henryiii" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://izzys.casa"><img src="https://avatars0.githubusercontent.com/u/63051?v=4?s=100" width="100px;" alt="Isabella Muerte"/><br /><sub><b>Isabella Muerte</b></sub></a><br /><a href="#platform-slurps-mad-rips" title="Packaging/porting to new platform">📦</a></td>
+    </tr>
+    <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://izzys.casa/"><img src="https://avatars.githubusercontent.com/u/63051?v=4?s=100" width="100px;" alt="Izzy Muerte"/><br /><sub><b>Izzy Muerte</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=bruxisma" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/jakoblover"><img src="https://avatars0.githubusercontent.com/u/14160441?v=4?s=100" width="100px;" alt="Jakob Lover"/><br /><sub><b>Jakob Lover</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=jakoblover" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/jgerityneurala"><img src="https://avatars2.githubusercontent.com/u/57360646?v=4?s=100" width="100px;" alt="James Gerity"/><br /><sub><b>James Gerity</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=jgerityneurala" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/jbriales"><img src="https://avatars1.githubusercontent.com/u/6850478?v=4?s=100" width="100px;" alt="Jesus Briales"/><br /><sub><b>Jesus Briales</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=jbriales" title="Code">💻</a> <a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Ajbriales" title="Bug reports">🐛</a></td>
-    </tr>
-    <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/SkyToGround"><img src="https://avatars1.githubusercontent.com/u/58835?v=4?s=100" width="100px;" alt="Jonas Nilsson"/><br /><sub><b>Jonas Nilsson</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3ASkyToGround" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=SkyToGround" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/j-rivero"><img src="https://avatars.githubusercontent.com/u/2098802?v=4?s=100" width="100px;" alt="Jose Luis Rivero"/><br /><sub><b>Jose Luis Rivero</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=j-rivero" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/jsoref"><img src="https://avatars0.githubusercontent.com/u/2119212?v=4?s=100" width="100px;" alt="Josh Soref"/><br /><sub><b>Josh Soref</b></sub></a><br /><a href="#tool-jsoref" title="Tools">🔧</a></td>
+    </tr>
+    <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/KOLANICH"><img src="https://avatars1.githubusercontent.com/u/240344?v=4?s=100" width="100px;" alt="KOLANICH"/><br /><sub><b>KOLANICH</b></sub></a><br /><a href="#platform-KOLANICH" title="Packaging/porting to new platform">📦</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/skannan89"><img src="https://avatars0.githubusercontent.com/u/11918764?v=4?s=100" width="100px;" alt="Kannan"/><br /><sub><b>Kannan</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Askannan89" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=skannan89" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://himvis.com"><img src="https://avatars3.githubusercontent.com/u/465279?v=4?s=100" width="100px;" alt="Khem Raj"/><br /><sub><b>Khem Raj</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=kraj" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/looopTools"><img src="https://avatars.githubusercontent.com/u/1943536?v=4?s=100" width="100px;" alt="Lars Nielsen"/><br /><sub><b>Lars Nielsen</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=looopTools" title="Code">💻</a></td>
-    </tr>
-    <tr>
       <td align="center" valign="top" width="14.28%"><a href="http://lucas-czech.de"><img src="https://avatars0.githubusercontent.com/u/4741887?v=4?s=100" width="100px;" alt="Lucas Czech"/><br /><sub><b>Lucas Czech</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Alczech" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=lczech" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://www.mogigoma.com/"><img src="https://avatars2.githubusercontent.com/u/130862?v=4?s=100" width="100px;" alt="Mak Kolybabi"/><br /><sub><b>Mak Kolybabi</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=mogigoma" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/cetius"><img src="https://avatars.githubusercontent.com/u/6552472?v=4?s=100" width="100px;" alt="Marcin Ropa"/><br /><sub><b>Marcin Ropa</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=cetius" title="Code">💻</a></td>
+    </tr>
+    <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://lambdafu.net/"><img src="https://avatars1.githubusercontent.com/u/1138455?v=4?s=100" width="100px;" alt="Marcus Brinkmann"/><br /><sub><b>Marcus Brinkmann</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Alambdafu" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=lambdafu" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://msoeken.github.io"><img src="https://avatars0.githubusercontent.com/u/1998245?v=4?s=100" width="100px;" alt="Mathias Soeken"/><br /><sub><b>Mathias Soeken</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=msoeken" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://www.mmmccormick.com/"><img src="https://avatars.githubusercontent.com/u/25432?v=4?s=100" width="100px;" alt="Matt McCormick"/><br /><sub><b>Matt McCormick</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=thewtex" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/AnticliMaxtic"><img src="https://avatars.githubusercontent.com/u/43995389?v=4?s=100" width="100px;" alt="Max"/><br /><sub><b>Max</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=AnticliMaxtic" title="Code">💻</a></td>
-    </tr>
-    <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://mbh.sh"><img src="https://avatars3.githubusercontent.com/u/20403931?v=4?s=100" width="100px;" alt="Michael Hall"/><br /><sub><b>Michael Hall</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=mbhall88" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/nathanhourt"><img src="https://avatars2.githubusercontent.com/u/271977?v=4?s=100" width="100px;" alt="Nathan Hourt"/><br /><sub><b>Nathan Hourt</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Anathanhourt" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=nathanhourt" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/nathanielhourt"><img src="https://avatars.githubusercontent.com/u/271977?v=4?s=100" width="100px;" alt="Nathaniel Hourt"/><br /><sub><b>Nathaniel Hourt</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=nathanielhourt" title="Code">💻</a></td>
+    </tr>
+    <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/paddy-hack"><img src="https://avatars.githubusercontent.com/u/6804372?v=4?s=100" width="100px;" alt="Olaf Meeuwissen"/><br /><sub><b>Olaf Meeuwissen</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=paddy-hack" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://ondrejcertik.com/"><img src="https://avatars3.githubusercontent.com/u/20568?v=4?s=100" width="100px;" alt="Ondřej Čertík"/><br /><sub><b>Ondřej Čertík</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Acertik" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/pleroux0"><img src="https://avatars2.githubusercontent.com/u/39619854?v=4?s=100" width="100px;" alt="Paul le Roux"/><br /><sub><b>Paul le Roux</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=pleroux0" title="Code">💻</a> <a href="#platform-pleroux0" title="Packaging/porting to new platform">📦</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/chfast"><img src="https://avatars1.githubusercontent.com/u/573380?v=4?s=100" width="100px;" alt="Paweł Bylica"/><br /><sub><b>Paweł Bylica</b></sub></a><br /><a href="#platform-chfast" title="Packaging/porting to new platform">📦</a></td>
-    </tr>
-    <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/PeteAudinate"><img src="https://avatars.githubusercontent.com/u/99274874?v=4?s=100" width="100px;" alt="PeteAudinate"/><br /><sub><b>PeteAudinate</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=PeteAudinate" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/peterazmanov"><img src="https://avatars0.githubusercontent.com/u/15322318?v=4?s=100" width="100px;" alt="Peter Azmanov"/><br /><sub><b>Peter Azmanov</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=peterazmanov" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/peterh"><img src="https://avatars.githubusercontent.com/u/79339?v=4?s=100" width="100px;" alt="Peter Harris"/><br /><sub><b>Peter Harris</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=peterh" title="Code">💻</a></td>
+    </tr>
+    <tr>
       <td align="center" valign="top" width="14.28%"><a href="http://ptheywood.uk/"><img src="https://avatars.githubusercontent.com/u/628937?v=4?s=100" width="100px;" alt="Peter Heywood"/><br /><sub><b>Peter Heywood</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=ptheywood" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/phlptp"><img src="https://avatars0.githubusercontent.com/u/20667153?v=4?s=100" width="100px;" alt="Philip Top"/><br /><sub><b>Philip Top</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Aphlptp" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=phlptp" title="Documentation">📖</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=phlptp" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/rafiw"><img src="https://avatars3.githubusercontent.com/u/3034707?v=4?s=100" width="100px;" alt="Rafi Wiener"/><br /><sub><b>Rafi Wiener</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Arafiw" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=rafiw" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/RangeMachine"><img src="https://avatars.githubusercontent.com/u/11577601?v=4?s=100" width="100px;" alt="RangeMachine"/><br /><sub><b>RangeMachine</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=RangeMachine" title="Code">💻</a></td>
-    </tr>
-    <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Krzmbrzl"><img src="https://avatars.githubusercontent.com/u/12751591?v=4?s=100" width="100px;" alt="Robert Adam"/><br /><sub><b>Robert Adam</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=Krzmbrzl" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://www.ratml.org/"><img src="https://avatars0.githubusercontent.com/u/1845039?v=4?s=100" width="100px;" alt="Ryan Curtin"/><br /><sub><b>Ryan Curtin</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=rcurtin" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/SherlockInSpace"><img src="https://avatars.githubusercontent.com/u/5507786?v=4?s=100" width="100px;" alt="Ryan Sherlock"/><br /><sub><b>Ryan Sherlock</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=SherlockInSpace" title="Code">💻</a></td>
+    </tr>
+    <tr>
       <td align="center" valign="top" width="14.28%"><a href="http://sam.hocevar.net/"><img src="https://avatars2.githubusercontent.com/u/245089?v=4?s=100" width="100px;" alt="Sam Hocevar"/><br /><sub><b>Sam Hocevar</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=samhocevar" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://seanfisk.com/"><img src="https://avatars0.githubusercontent.com/u/410322?v=4?s=100" width="100px;" alt="Sean Fisk"/><br /><sub><b>Sean Fisk</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/issues?q=author%3Aseanfisk" title="Bug reports">🐛</a> <a href="https://github.com/CLIUtils/CLI11/commits?author=seanfisk" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/delpinux"><img src="https://avatars0.githubusercontent.com/u/35096584?v=4?s=100" width="100px;" alt="Stéphane Del Pino"/><br /><sub><b>Stéphane Del Pino</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=delpinux" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/metopa"><img src="https://avatars2.githubusercontent.com/u/3974178?v=4?s=100" width="100px;" alt="Viacheslav Kroilov"/><br /><sub><b>Viacheslav Kroilov</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=metopa" title="Code">💻</a></td>
-    </tr>
-    <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/VolkerChristian"><img src="https://avatars.githubusercontent.com/u/18554540?v=4?s=100" width="100px;" alt="Volker Christian"/><br /><sub><b>Volker Christian</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=VolkerChristian" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/almikhayl"><img src="https://avatars2.githubusercontent.com/u/6747040?v=4?s=100" width="100px;" alt="almikhayl"/><br /><sub><b>almikhayl</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=almikhayl" title="Code">💻</a> <a href="#platform-almikhayl" title="Packaging/porting to new platform">📦</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ayum"><img src="https://avatars.githubusercontent.com/u/6747040?v=4?s=100" width="100px;" alt="ayum"/><br /><sub><b>ayum</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=ayum" title="Code">💻</a></td>
+    </tr>
+    <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/captainurist"><img src="https://avatars.githubusercontent.com/u/73941350?v=4?s=100" width="100px;" alt="captainurist"/><br /><sub><b>captainurist</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=captainurist" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://cs.odu.edu/~ctsolakis"><img src="https://avatars0.githubusercontent.com/u/6725596?v=4?s=100" width="100px;" alt="christos"/><br /><sub><b>christos</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=ChristosT" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/deining"><img src="https://avatars3.githubusercontent.com/u/18169566?v=4?s=100" width="100px;" alt="deining"/><br /><sub><b>deining</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=deining" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/dherrera-fb"><img src="https://avatars.githubusercontent.com/u/89840711?v=4?s=100" width="100px;" alt="dherrera-fb"/><br /><sub><b>dherrera-fb</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=dherrera-fb" title="Code">💻</a></td>
-    </tr>
-    <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/djerius"><img src="https://avatars.githubusercontent.com/u/196875?v=4?s=100" width="100px;" alt="djerius"/><br /><sub><b>djerius</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=djerius" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/dryleev"><img src="https://avatars.githubusercontent.com/u/83670813?v=4?s=100" width="100px;" alt="dryleev"/><br /><sub><b>dryleev</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=dryleev" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/elszon"><img src="https://avatars0.githubusercontent.com/u/2971495?v=4?s=100" width="100px;" alt="elszon"/><br /><sub><b>elszon</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=elszon" title="Code">💻</a></td>
+    </tr>
+    <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ferdymercury"><img src="https://avatars3.githubusercontent.com/u/10653970?v=4?s=100" width="100px;" alt="ferdymercury"/><br /><sub><b>ferdymercury</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=ferdymercury" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/fpeng1985"><img src="https://avatars1.githubusercontent.com/u/87981?v=4?s=100" width="100px;" alt="fpeng1985"/><br /><sub><b>fpeng1985</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=fpeng1985" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/geir-t"><img src="https://avatars3.githubusercontent.com/u/35292136?v=4?s=100" width="100px;" alt="geir-t"/><br /><sub><b>geir-t</b></sub></a><br /><a href="#platform-geir-t" title="Packaging/porting to new platform">📦</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gostefan"><img src="https://avatars.githubusercontent.com/u/2479455?v=4?s=100" width="100px;" alt="gostefan"/><br /><sub><b>gostefan</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=gostefan" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ncihnegn"><img src="https://avatars3.githubusercontent.com/u/12021721?v=4?s=100" width="100px;" alt="ncihnegn"/><br /><sub><b>ncihnegn</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=ncihnegn" title="Code">💻</a></td>
-    </tr>
-    <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/nurelin"><img src="https://avatars3.githubusercontent.com/u/5276274?v=4?s=100" width="100px;" alt="nurelin"/><br /><sub><b>nurelin</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=nurelin" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://polistern.i2p/"><img src="https://avatars.githubusercontent.com/u/55511995?v=4?s=100" width="100px;" alt="polistern"/><br /><sub><b>polistern</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=polistern" title="Code">💻</a></td>
+    </tr>
+    <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ryan4729"><img src="https://avatars3.githubusercontent.com/u/40183301?v=4?s=100" width="100px;" alt="ryan4729"/><br /><sub><b>ryan4729</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=ryan4729" title="Tests">⚠️</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/shameekganguly"><img src="https://avatars.githubusercontent.com/u/2412842?v=4?s=100" width="100px;" alt="shameekganguly"/><br /><sub><b>shameekganguly</b></sub></a><br /><a href="https://github.com/CLIUtils/CLI11/commits?author=shameekganguly" title="Code">💻</a></td>
     </tr>
diff --git a/contrib/CLI11/include/CLI/App.hpp b/contrib/CLI11/include/CLI/App.hpp
index 5d7761608..940b858bd 100644
--- a/contrib/CLI11/include/CLI/App.hpp
+++ b/contrib/CLI11/include/CLI/App.hpp
@@ -6,6 +6,8 @@
 
 #pragma once
 
+// IWYU pragma: private, include "CLI/CLI.hpp"
+
 // [CLI11:public_includes:set]
 #include <algorithm>
 #include <cstdint>
@@ -733,6 +735,10 @@ class App {
     /// Check to see if a subcommand is part of this command (text version)
     CLI11_NODISCARD App *get_subcommand(std::string subcom) const;
 
+    /// Get a subcommand by name (noexcept non-const version)
+    /// returns null if subcommand doesn't exist
+    CLI11_NODISCARD App *get_subcommand_no_throw(std::string subcom) const noexcept;
+
     /// Get a pointer to subcommand by index
     CLI11_NODISCARD App *get_subcommand(int index = 0) const;
 
@@ -907,8 +913,9 @@ class App {
     }
 
     /// Check with name instead of pointer to see if subcommand was selected
-    CLI11_NODISCARD bool got_subcommand(std::string subcommand_name) const {
-        return get_subcommand(subcommand_name)->parsed_ > 0;
+    CLI11_NODISCARD bool got_subcommand(std::string subcommand_name) const noexcept {
+        App *sub = get_subcommand_no_throw(subcommand_name);
+        return (sub != nullptr) ? (sub->parsed_ > 0) : false;
     }
 
     /// Sets excluded options for the subcommand
@@ -1038,7 +1045,7 @@ class App {
     std::vector<Option *> get_options(const std::function<bool(Option *)> filter = {});
 
     /// Get an option by name (noexcept non-const version)
-    Option *get_option_no_throw(std::string option_name) noexcept;
+    CLI11_NODISCARD Option *get_option_no_throw(std::string option_name) noexcept;
 
     /// Get an option by name (noexcept const version)
     CLI11_NODISCARD const Option *get_option_no_throw(std::string option_name) const noexcept;
@@ -1437,5 +1444,5 @@ struct AppFriend {
 }  // namespace CLI
 
 #ifndef CLI11_COMPILE
-#include "impl/App_inl.hpp"
+#include "impl/App_inl.hpp"  // IWYU pragma: export
 #endif
diff --git a/contrib/CLI11/include/CLI/Argv.hpp b/contrib/CLI11/include/CLI/Argv.hpp
index 619a7abf9..16aa88488 100644
--- a/contrib/CLI11/include/CLI/Argv.hpp
+++ b/contrib/CLI11/include/CLI/Argv.hpp
@@ -6,12 +6,14 @@
 
 #pragma once
 
+// IWYU pragma: private, include "CLI/CLI.hpp"
+
 // [CLI11:public_includes:set]
 #include <string>
 #include <vector>
 // [CLI11:public_includes:end]
 
-#include <CLI/Macros.hpp>
+#include "Macros.hpp"
 
 namespace CLI {
 // [CLI11:argv_hpp:verbatim]
@@ -25,5 +27,5 @@ CLI11_INLINE std::vector<std::string> compute_win32_argv();
 }  // namespace CLI
 
 #ifndef CLI11_COMPILE
-#include "impl/Argv_inl.hpp"
+#include "impl/Argv_inl.hpp"  // IWYU pragma: export
 #endif
diff --git a/contrib/CLI11/include/CLI/CLI.hpp b/contrib/CLI11/include/CLI/CLI.hpp
index df401e003..f8607ea4d 100644
--- a/contrib/CLI11/include/CLI/CLI.hpp
+++ b/contrib/CLI11/include/CLI/CLI.hpp
@@ -9,6 +9,8 @@
 // CLI Library includes
 // Order is important for combiner script
 
+// IWYU pragma: begin_exports
+
 #include "Version.hpp"
 
 #include "Macros.hpp"
@@ -38,3 +40,5 @@
 #include "Config.hpp"
 
 #include "Formatter.hpp"
+
+// IWYU pragma: end_exports
diff --git a/contrib/CLI11/include/CLI/Config.hpp b/contrib/CLI11/include/CLI/Config.hpp
index 942c43f40..8384e977a 100644
--- a/contrib/CLI11/include/CLI/Config.hpp
+++ b/contrib/CLI11/include/CLI/Config.hpp
@@ -6,6 +6,8 @@
 
 #pragma once
 
+// IWYU pragma: private, include "CLI/CLI.hpp"
+
 // [CLI11:public_includes:set]
 #include <algorithm>
 #include <cctype>
@@ -49,5 +51,5 @@ void checkParentSegments(std::vector<ConfigItem> &output, const std::string &cur
 }  // namespace CLI
 
 #ifndef CLI11_COMPILE
-#include "impl/Config_inl.hpp"
+#include "impl/Config_inl.hpp"  // IWYU pragma: export
 #endif
diff --git a/contrib/CLI11/include/CLI/ConfigFwd.hpp b/contrib/CLI11/include/CLI/ConfigFwd.hpp
index fabf84dce..3db801027 100644
--- a/contrib/CLI11/include/CLI/ConfigFwd.hpp
+++ b/contrib/CLI11/include/CLI/ConfigFwd.hpp
@@ -6,6 +6,8 @@
 
 #pragma once
 
+// IWYU pragma: private, include "CLI/CLI.hpp"
+
 // [CLI11:public_includes:set]
 #include <algorithm>
 #include <fstream>
diff --git a/contrib/CLI11/include/CLI/Encoding.hpp b/contrib/CLI11/include/CLI/Encoding.hpp
index d723878f3..42e24909e 100644
--- a/contrib/CLI11/include/CLI/Encoding.hpp
+++ b/contrib/CLI11/include/CLI/Encoding.hpp
@@ -6,7 +6,8 @@
 
 #pragma once
 
-#include <CLI/Macros.hpp>
+// IWYU pragma: private, include "CLI/CLI.hpp"
+#include "Macros.hpp"
 
 // [CLI11:public_includes:set]
 #include <string>
@@ -50,5 +51,5 @@ CLI11_INLINE std::filesystem::path to_path(std::string_view str);
 }  // namespace CLI
 
 #ifndef CLI11_COMPILE
-#include "impl/Encoding_inl.hpp"
+#include "impl/Encoding_inl.hpp"  // IWYU pragma: export
 #endif
diff --git a/contrib/CLI11/include/CLI/Error.hpp b/contrib/CLI11/include/CLI/Error.hpp
index 2d6f673e9..84dcef5e8 100644
--- a/contrib/CLI11/include/CLI/Error.hpp
+++ b/contrib/CLI11/include/CLI/Error.hpp
@@ -6,6 +6,8 @@
 
 #pragma once
 
+// IWYU pragma: private, include "CLI/CLI.hpp"
+
 // [CLI11:public_includes:set]
 #include <exception>
 #include <stdexcept>
@@ -237,22 +239,22 @@ class RequiredError : public ParseError {
         if((min_option == 1) && (max_option == 1) && (used == 0))
             return RequiredError("Exactly 1 option from [" + option_list + "]");
         if((min_option == 1) && (max_option == 1) && (used > 1)) {
-            return {"Exactly 1 option from [" + option_list + "] is required and " + std::to_string(used) +
+            return {"Exactly 1 option from [" + option_list + "] is required but " + std::to_string(used) +
                         " were given",
                     ExitCodes::RequiredError};
         }
         if((min_option == 1) && (used == 0))
             return RequiredError("At least 1 option from [" + option_list + "]");
         if(used < min_option) {
-            return {"Requires at least " + std::to_string(min_option) + " options used and only " +
-                        std::to_string(used) + "were given from [" + option_list + "]",
+            return {"Requires at least " + std::to_string(min_option) + " options used but only " +
+                        std::to_string(used) + " were given from [" + option_list + "]",
                     ExitCodes::RequiredError};
         }
         if(max_option == 1)
             return {"Requires at most 1 options be given from [" + option_list + "]", ExitCodes::RequiredError};
 
-        return {"Requires at most " + std::to_string(max_option) + " options be used and " + std::to_string(used) +
-                    "were given from [" + option_list + "]",
+        return {"Requires at most " + std::to_string(max_option) + " options be used but " + std::to_string(used) +
+                    " were given from [" + option_list + "]",
                 ExitCodes::RequiredError};
     }
 };
diff --git a/contrib/CLI11/include/CLI/Formatter.hpp b/contrib/CLI11/include/CLI/Formatter.hpp
index bc54caf55..c5da1ef9d 100644
--- a/contrib/CLI11/include/CLI/Formatter.hpp
+++ b/contrib/CLI11/include/CLI/Formatter.hpp
@@ -6,6 +6,8 @@
 
 #pragma once
 
+// IWYU pragma: private, include "CLI/CLI.hpp"
+
 // [CLI11:public_includes:set]
 #include <algorithm>
 #include <string>
@@ -21,5 +23,5 @@ namespace CLI {
 }  // namespace CLI
 
 #ifndef CLI11_COMPILE
-#include "impl/Formatter_inl.hpp"
+#include "impl/Formatter_inl.hpp"  // IWYU pragma: export
 #endif
diff --git a/contrib/CLI11/include/CLI/FormatterFwd.hpp b/contrib/CLI11/include/CLI/FormatterFwd.hpp
index a0949b49d..ad3f49c30 100644
--- a/contrib/CLI11/include/CLI/FormatterFwd.hpp
+++ b/contrib/CLI11/include/CLI/FormatterFwd.hpp
@@ -6,6 +6,8 @@
 
 #pragma once
 
+// IWYU pragma: private, include "CLI/CLI.hpp"
+
 // [CLI11:public_includes:set]
 #include <functional>
 #include <map>
diff --git a/contrib/CLI11/include/CLI/Macros.hpp b/contrib/CLI11/include/CLI/Macros.hpp
index 3fd26475e..73fbf87d7 100644
--- a/contrib/CLI11/include/CLI/Macros.hpp
+++ b/contrib/CLI11/include/CLI/Macros.hpp
@@ -6,6 +6,8 @@
 
 #pragma once
 
+// IWYU pragma: private, include "CLI/CLI.hpp"
+
 // [CLI11:macros_hpp:verbatim]
 
 // The following version macro is very similar to the one in pybind11
diff --git a/contrib/CLI11/include/CLI/Option.hpp b/contrib/CLI11/include/CLI/Option.hpp
index a0fa7ceac..40b7f6f63 100644
--- a/contrib/CLI11/include/CLI/Option.hpp
+++ b/contrib/CLI11/include/CLI/Option.hpp
@@ -6,6 +6,8 @@
 
 #pragma once
 
+// IWYU pragma: private, include "CLI/CLI.hpp"
+
 // [CLI11:public_includes:set]
 #include <algorithm>
 #include <functional>
@@ -804,5 +806,5 @@ class Option : public OptionBase<Option> {
 }  // namespace CLI
 
 #ifndef CLI11_COMPILE
-#include "impl/Option_inl.hpp"
+#include "impl/Option_inl.hpp"  // IWYU pragma: export
 #endif
diff --git a/contrib/CLI11/include/CLI/Split.hpp b/contrib/CLI11/include/CLI/Split.hpp
index 165575393..02a1f2676 100644
--- a/contrib/CLI11/include/CLI/Split.hpp
+++ b/contrib/CLI11/include/CLI/Split.hpp
@@ -6,6 +6,8 @@
 
 #pragma once
 
+// IWYU pragma: private, include "CLI/CLI.hpp"
+
 // [CLI11:public_includes:set]
 #include <string>
 #include <tuple>
@@ -44,5 +46,5 @@ get_names(const std::vector<std::string> &input);
 }  // namespace CLI
 
 #ifndef CLI11_COMPILE
-#include "impl/Split_inl.hpp"
+#include "impl/Split_inl.hpp"  // IWYU pragma: export
 #endif
diff --git a/contrib/CLI11/include/CLI/StringTools.hpp b/contrib/CLI11/include/CLI/StringTools.hpp
index fb0069b71..3c134c9ba 100644
--- a/contrib/CLI11/include/CLI/StringTools.hpp
+++ b/contrib/CLI11/include/CLI/StringTools.hpp
@@ -6,6 +6,8 @@
 
 #pragma once
 
+// IWYU pragma: private, include "CLI/CLI.hpp"
+
 // [CLI11:public_includes:set]
 #include <algorithm>
 #include <iomanip>
@@ -263,5 +265,5 @@ CLI11_INLINE bool process_quoted_string(std::string &str, char string_char = '\"
 }  // namespace CLI
 
 #ifndef CLI11_COMPILE
-#include "impl/StringTools_inl.hpp"
+#include "impl/StringTools_inl.hpp"  // IWYU pragma: export
 #endif
diff --git a/contrib/CLI11/include/CLI/Timer.hpp b/contrib/CLI11/include/CLI/Timer.hpp
index 7ffc2d9b2..b51c6a2e7 100644
--- a/contrib/CLI11/include/CLI/Timer.hpp
+++ b/contrib/CLI11/include/CLI/Timer.hpp
@@ -6,6 +6,8 @@
 
 #pragma once
 
+// IWYU pragma: private, include "CLI/CLI.hpp"
+
 // On GCC < 4.8, the following define is often missing. Due to the
 // fact that this library only uses sleep_for, this should be safe
 #if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 5 && __GNUC_MINOR__ < 8
diff --git a/contrib/CLI11/include/CLI/TypeTools.hpp b/contrib/CLI11/include/CLI/TypeTools.hpp
index 7e66c6adc..780bd2f44 100644
--- a/contrib/CLI11/include/CLI/TypeTools.hpp
+++ b/contrib/CLI11/include/CLI/TypeTools.hpp
@@ -6,6 +6,8 @@
 
 #pragma once
 
+// IWYU pragma: private, include "CLI/CLI.hpp"
+
 // [CLI11:public_includes:set]
 #include <algorithm>
 #include <cmath>
@@ -85,6 +87,23 @@ template <> struct IsMemberType<const char *> {
     using type = std::string;
 };
 
+namespace adl_detail {
+/// Check for existence of user-supplied lexical_cast.
+///
+/// This struct has to be in a separate namespace so that it doesn't see our lexical_cast overloads in CLI::detail.
+/// Standard says it shouldn't see them if it's defined before the corresponding lexical_cast declarations, but this
+/// requires a working implementation of two-phase lookup, and not all compilers can boast that (msvc, ahem).
+template <typename T, typename S = std::string> class is_lexical_castable {
+    template <typename TT, typename SS>
+    static auto test(int) -> decltype(lexical_cast(std::declval<const SS &>(), std::declval<TT &>()), std::true_type());
+
+    template <typename, typename> static auto test(...) -> std::false_type;
+
+  public:
+    static constexpr bool value = decltype(test<T, S>(0))::value;
+};
+}  // namespace adl_detail
+
 namespace detail {
 
 // These are utilities for IsMember and other transforming objects
@@ -166,7 +185,7 @@ template <typename T, typename C> class is_direct_constructible {
 #pragma diag_suppress 2361
 #endif
 #endif
-        TT{std::declval<CC>()}
+                                              TT{std::declval<CC>()}
 #ifdef __CUDACC__
 #ifdef __NVCC_DIAG_PRAGMA_SUPPORT__
 #pragma nv_diag_default 2361
@@ -174,8 +193,8 @@ template <typename T, typename C> class is_direct_constructible {
 #pragma diag_default 2361
 #endif
 #endif
-        ,
-        std::is_move_assignable<TT>());
+                                              ,
+                                              std::is_move_assignable<TT>());
 
     template <typename TT, typename CC> static auto test(int, std::false_type) -> std::false_type;
 
@@ -1245,13 +1264,24 @@ bool lexical_cast(const std::string &input, T &output) {
 
 /// Non-string parsable by a stream
 template <typename T,
-          enable_if_t<classify_object<T>::value == object_category::other && !std::is_assignable<T &, int>::value,
+          enable_if_t<classify_object<T>::value == object_category::other && !std::is_assignable<T &, int>::value &&
+                          is_istreamable<T>::value,
                       detail::enabler> = detail::dummy>
 bool lexical_cast(const std::string &input, T &output) {
-    static_assert(is_istreamable<T>::value,
+    return from_stream(input, output);
+}
+
+/// Fallback overload that prints a human-readable error for types that we don't recognize and that don't have a
+/// user-supplied lexical_cast overload.
+template <typename T,
+          enable_if_t<classify_object<T>::value == object_category::other && !std::is_assignable<T &, int>::value &&
+                          !is_istreamable<T>::value && !adl_detail::is_lexical_castable<T>::value,
+                      detail::enabler> = detail::dummy>
+bool lexical_cast(const std::string & /*input*/, T & /*output*/) {
+    static_assert(!std::is_same<T, T>::value,  // Can't just write false here.
                   "option object type must have a lexical cast overload or streaming input operator(>>) defined, if it "
                   "is convertible from another type use the add_option<T, XC>(...) with XC being the known type");
-    return from_stream(input, output);
+    return false;
 }
 
 /// Assign a value through lexical cast operations
diff --git a/contrib/CLI11/include/CLI/Validators.hpp b/contrib/CLI11/include/CLI/Validators.hpp
index bdddeb84f..068d33f06 100644
--- a/contrib/CLI11/include/CLI/Validators.hpp
+++ b/contrib/CLI11/include/CLI/Validators.hpp
@@ -6,6 +6,8 @@
 
 #pragma once
 
+// IWYU pragma: private, include "CLI/CLI.hpp"
+
 #include "Error.hpp"
 #include "Macros.hpp"
 #include "StringTools.hpp"
@@ -892,5 +894,5 @@ CLI11_INLINE std::pair<std::string, std::string> split_program_name(std::string
 }  // namespace CLI
 
 #ifndef CLI11_COMPILE
-#include "impl/Validators_inl.hpp"
+#include "impl/Validators_inl.hpp"  // IWYU pragma: export
 #endif
diff --git a/contrib/CLI11/include/CLI/Version.hpp b/contrib/CLI11/include/CLI/Version.hpp
index 2008e91d8..2c4247b26 100644
--- a/contrib/CLI11/include/CLI/Version.hpp
+++ b/contrib/CLI11/include/CLI/Version.hpp
@@ -6,11 +6,13 @@
 
 #pragma once
 
+// IWYU pragma: private, include "CLI/CLI.hpp"
+
 // [CLI11:version_hpp:verbatim]
 
 #define CLI11_VERSION_MAJOR 2
 #define CLI11_VERSION_MINOR 4
-#define CLI11_VERSION_PATCH 1
-#define CLI11_VERSION "2.4.1"
+#define CLI11_VERSION_PATCH 2
+#define CLI11_VERSION "2.4.2"
 
 // [CLI11:version_hpp:end]
diff --git a/contrib/CLI11/include/CLI/impl/App_inl.hpp b/contrib/CLI11/include/CLI/impl/App_inl.hpp
index a732cbc67..43b9dfe4c 100644
--- a/contrib/CLI11/include/CLI/impl/App_inl.hpp
+++ b/contrib/CLI11/include/CLI/impl/App_inl.hpp
@@ -6,11 +6,13 @@
 
 #pragma once
 
+// IWYU pragma: private, include "CLI/CLI.hpp"
+
 // This include is only needed for IDEs to discover symbols
-#include <CLI/App.hpp>
+#include "../App.hpp"
 
-#include <CLI/Argv.hpp>
-#include <CLI/Encoding.hpp>
+#include "../Argv.hpp"
+#include "../Encoding.hpp"
 
 // [CLI11:public_includes:set]
 #include <algorithm>
@@ -279,8 +281,8 @@ App::set_version_flag(std::string flag_name, std::function<std::string()> vfunc,
 
     // Empty name will simply remove the version flag
     if(!flag_name.empty()) {
-        version_ptr_ = add_flag_callback(
-            flag_name, [vfunc]() { throw(CLI::CallForVersion(vfunc(), 0)); }, version_help);
+        version_ptr_ =
+            add_flag_callback(flag_name, [vfunc]() { throw(CLI::CallForVersion(vfunc(), 0)); }, version_help);
         version_ptr_->configurable(false);
     }
 
@@ -457,6 +459,10 @@ CLI11_NODISCARD CLI11_INLINE App *App::get_subcommand(std::string subcom) const
     return subc;
 }
 
+CLI11_NODISCARD CLI11_INLINE App *App::get_subcommand_no_throw(std::string subcom) const noexcept {
+    return _find_subcommand(subcom, false, false);
+}
+
 CLI11_NODISCARD CLI11_INLINE App *App::get_subcommand(int index) const {
     if(index >= 0) {
         auto uindex = static_cast<unsigned>(index);
@@ -796,7 +802,7 @@ CLI11_INLINE std::vector<Option *> App::get_options(const std::function<bool(Opt
     return options;
 }
 
-CLI11_INLINE Option *App::get_option_no_throw(std::string option_name) noexcept {
+CLI11_NODISCARD CLI11_INLINE Option *App::get_option_no_throw(std::string option_name) noexcept {
     for(Option_p &opt : options_) {
         if(opt->check_name(option_name)) {
             return opt.get();
@@ -1136,11 +1142,9 @@ CLI11_INLINE void App::_process_env() {
     }
 
     for(App_p &sub : subcommands_) {
-        if(sub->get_name().empty() || !sub->parse_complete_callback_) {
-            if(sub->count_all() > 0) {
-                // only process environment variables if the callback has actually been triggered already
-                sub->_process_env();
-            }
+        if(sub->get_name().empty() || (sub->count_all() > 0 && !sub->parse_complete_callback_)) {
+            // only process environment variables if the callback has actually been triggered already
+            sub->_process_env();
         }
     }
 }
@@ -1443,12 +1447,8 @@ CLI11_INLINE void App::_parse_config(const std::vector<ConfigItem> &args) {
 CLI11_INLINE bool App::_parse_single_config(const ConfigItem &item, std::size_t level) {
 
     if(level < item.parents.size()) {
-        try {
-            auto *subcom = get_subcommand(item.parents.at(level));
-            return subcom->_parse_single_config(item, level + 1);
-        } catch(const OptionNotFound &) {
-            return false;
-        }
+        auto *subcom = get_subcommand_no_throw(item.parents.at(level));
+        return (subcom != nullptr) ? subcom->_parse_single_config(item, level + 1) : false;
     }
     // check for section open
     if(item.name == "++") {
@@ -1482,11 +1482,12 @@ CLI11_INLINE bool App::_parse_single_config(const ConfigItem &item, std::size_t
 
     if(op == nullptr) {
         // If the option was not present
-        if(get_allow_config_extras() == config_extras_mode::capture)
+        if(get_allow_config_extras() == config_extras_mode::capture) {
             // Should we worry about classifying the extras properly?
             missing_.emplace_back(detail::Classifier::NONE, item.fullname());
-        for(const auto &input : item.inputs) {
-            missing_.emplace_back(detail::Classifier::NONE, input);
+            for(const auto &input : item.inputs) {
+                missing_.emplace_back(detail::Classifier::NONE, input);
+            }
         }
         return false;
     }
diff --git a/contrib/CLI11/include/CLI/impl/Argv_inl.hpp b/contrib/CLI11/include/CLI/impl/Argv_inl.hpp
index b3c328b1a..96750a483 100644
--- a/contrib/CLI11/include/CLI/impl/Argv_inl.hpp
+++ b/contrib/CLI11/include/CLI/impl/Argv_inl.hpp
@@ -6,10 +6,12 @@
 
 #pragma once
 
+// IWYU pragma: private, include "CLI/CLI.hpp"
+
 // This include is only needed for IDEs to discover symbols
-#include <CLI/Argv.hpp>
+#include "../Argv.hpp"
 
-#include <CLI/Encoding.hpp>
+#include "../Encoding.hpp"
 
 // [CLI11:public_includes:set]
 #include <algorithm>
diff --git a/contrib/CLI11/include/CLI/impl/Config_inl.hpp b/contrib/CLI11/include/CLI/impl/Config_inl.hpp
index 92537c0e8..24df7a756 100644
--- a/contrib/CLI11/include/CLI/impl/Config_inl.hpp
+++ b/contrib/CLI11/include/CLI/impl/Config_inl.hpp
@@ -6,8 +6,10 @@
 
 #pragma once
 
+// IWYU pragma: private, include "CLI/CLI.hpp"
+
 // This include is only needed for IDEs to discover symbols
-#include <CLI/Config.hpp>
+#include "../Config.hpp"
 
 // [CLI11:public_includes:set]
 #include <algorithm>
diff --git a/contrib/CLI11/include/CLI/impl/Encoding_inl.hpp b/contrib/CLI11/include/CLI/impl/Encoding_inl.hpp
index 1c82f4fc5..79ad9c543 100644
--- a/contrib/CLI11/include/CLI/impl/Encoding_inl.hpp
+++ b/contrib/CLI11/include/CLI/impl/Encoding_inl.hpp
@@ -6,9 +6,11 @@
 
 #pragma once
 
+// IWYU pragma: private, include "CLI/CLI.hpp"
+
 // This include is only needed for IDEs to discover symbols
-#include <CLI/Encoding.hpp>
-#include <CLI/Macros.hpp>
+#include "../Encoding.hpp"
+#include "../Macros.hpp"
 
 // [CLI11:public_includes:set]
 #include <array>
diff --git a/contrib/CLI11/include/CLI/impl/Formatter_inl.hpp b/contrib/CLI11/include/CLI/impl/Formatter_inl.hpp
index 3b1c8c288..31697e1c8 100644
--- a/contrib/CLI11/include/CLI/impl/Formatter_inl.hpp
+++ b/contrib/CLI11/include/CLI/impl/Formatter_inl.hpp
@@ -6,8 +6,10 @@
 
 #pragma once
 
+// IWYU pragma: private, include "CLI/CLI.hpp"
+
 // This include is only needed for IDEs to discover symbols
-#include <CLI/Formatter.hpp>
+#include "../Formatter.hpp"
 
 // [CLI11:public_includes:set]
 #include <algorithm>
diff --git a/contrib/CLI11/include/CLI/impl/Option_inl.hpp b/contrib/CLI11/include/CLI/impl/Option_inl.hpp
index aa6f4657d..1b51000b0 100644
--- a/contrib/CLI11/include/CLI/impl/Option_inl.hpp
+++ b/contrib/CLI11/include/CLI/impl/Option_inl.hpp
@@ -6,8 +6,10 @@
 
 #pragma once
 
+// IWYU pragma: private, include "CLI/CLI.hpp"
+
 // This include is only needed for IDEs to discover symbols
-#include <CLI/Option.hpp>
+#include "../Option.hpp"
 
 // [CLI11:public_includes:set]
 #include <algorithm>
diff --git a/contrib/CLI11/include/CLI/impl/Split_inl.hpp b/contrib/CLI11/include/CLI/impl/Split_inl.hpp
index 7cd8e5b37..4afdb120b 100644
--- a/contrib/CLI11/include/CLI/impl/Split_inl.hpp
+++ b/contrib/CLI11/include/CLI/impl/Split_inl.hpp
@@ -6,8 +6,10 @@
 
 #pragma once
 
+// IWYU pragma: private, include "CLI/CLI.hpp"
+
 // This include is only needed for IDEs to discover symbols
-#include <CLI/Split.hpp>
+#include "../Split.hpp"
 
 // [CLI11:public_includes:set]
 #include <string>
@@ -16,8 +18,8 @@
 #include <vector>
 // [CLI11:public_includes:end]
 
-#include <CLI/Error.hpp>
-#include <CLI/StringTools.hpp>
+#include "../Error.hpp"
+#include "../StringTools.hpp"
 
 namespace CLI {
 // [CLI11:split_inl_hpp:verbatim]
diff --git a/contrib/CLI11/include/CLI/impl/StringTools_inl.hpp b/contrib/CLI11/include/CLI/impl/StringTools_inl.hpp
index bab79a37e..c92711758 100644
--- a/contrib/CLI11/include/CLI/impl/StringTools_inl.hpp
+++ b/contrib/CLI11/include/CLI/impl/StringTools_inl.hpp
@@ -6,8 +6,10 @@
 
 #pragma once
 
+// IWYU pragma: private, include "CLI/CLI.hpp"
+
 // This include is only needed for IDEs to discover symbols
-#include <CLI/StringTools.hpp>
+#include "../StringTools.hpp"
 
 // [CLI11:public_includes:set]
 #include <cstdint>
diff --git a/contrib/CLI11/include/CLI/impl/Validators_inl.hpp b/contrib/CLI11/include/CLI/impl/Validators_inl.hpp
index bf73e21a9..277e33793 100644
--- a/contrib/CLI11/include/CLI/impl/Validators_inl.hpp
+++ b/contrib/CLI11/include/CLI/impl/Validators_inl.hpp
@@ -6,12 +6,13 @@
 
 #pragma once
 
-#include <CLI/Validators.hpp>
+// IWYU pragma: private, include "CLI/CLI.hpp"
+#include "../Validators.hpp"
 
-#include <CLI/Encoding.hpp>
-#include <CLI/Macros.hpp>
-#include <CLI/StringTools.hpp>
-#include <CLI/TypeTools.hpp>
+#include "../Encoding.hpp"
+#include "../Macros.hpp"
+#include "../StringTools.hpp"
+#include "../TypeTools.hpp"
 
 // [CLI11:public_includes:set]
 #include <map>

From 9f6aaac4fb7eab0aac432504c16b8e64305c2cac Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 16 Sep 2024 16:33:13 +0200
Subject: [PATCH 201/430] Simplify code showing timers in generalization code

No reason to use dynamically created format strings here.
---
 src/gen/osm2pgsql-gen.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index 7ec3634fa..afbb0f80d 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -327,10 +327,9 @@ class genproc_t
 
         log_debug("Timers:");
         for (auto const &timer : generalizer->timers()) {
-            log_debug(fmt::format(
-                "  {:10} {:>10L}", timer.name() + ":",
-                std::chrono::duration_cast<std::chrono::milliseconds>(
-                    timer.elapsed())));
+            log_debug("  {:10} {:>10L}", timer.name() + ":",
+                      std::chrono::duration_cast<std::chrono::milliseconds>(
+                          timer.elapsed()));
         }
         log_info("Finished generalizer '{}' in {}.", generalizer->name(),
                  util::human_readable_duration(timer_gen.stop()));

From a62ab085871adbe4c2af142137c12141a872ca0c Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 16 Sep 2024 16:43:45 +0200
Subject: [PATCH 202/430] CMake config: Update the clang-tidy versions we are
 looking for

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5da692841..12936a09b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -278,7 +278,7 @@ endif()
 
 message(STATUS "Looking for clang-tidy")
 find_program(CLANG_TIDY
-             NAMES clang-tidy clang-tidy-16 clang-tidy-15 clang-tidy-14 clang-tidy-13 clang-tidy-12 clang-tidy-11)
+             NAMES clang-tidy clang-tidy-19 clang-tidy-18 clang-tidy-17 clang-tidy-16 clang-tidy-15)
 
 if (CLANG_TIDY)
     message(STATUS "Looking for clang-tidy - found ${CLANG_TIDY}")

From c9c1edd71b7d526aae68c604de8d49ee1f20ded1 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 16 Sep 2024 16:45:01 +0200
Subject: [PATCH 203/430] CMake config: Also look for PostgresSQL versions 16
 and 17

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12936a09b..93467b749 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,7 +67,7 @@ endif()
 set(MINIMUM_POSTGRESQL_SERVER_VERSION "9.6")
 set(MINIMUM_POSTGRESQL_SERVER_VERSION_NUM "90600")
 
-set(PostgreSQL_ADDITIONAL_VERSIONS "15" "14" "13" "12" "11" "10" "9.6")
+set(PostgreSQL_ADDITIONAL_VERSIONS "17" "16" "15" "14" "13" "12" "11" "10" "9.6")
 
 #############################################################
 # Version

From fb8640cc6fd738ed36c7c48849bb1537a85ac392 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 16 Sep 2024 15:44:54 +0200
Subject: [PATCH 204/430] Use /utf-8 compiler option for MSVC (needed for newer
 fmt lib versions)

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93467b749..1c73bf341 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,7 +46,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 
 if (MSVC)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS -DNOMINMAX)
-    add_compile_options(-wd4996)
+    add_compile_options(-wd4996 -utf-8)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ignore:4099")
 else()
     add_compile_options(-Wall)

From 86594bf42ab46a7898663745473bc48cf7b6f48c Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 16 Sep 2024 11:09:34 +0200
Subject: [PATCH 205/430] Update included fmt library to version 11.0.2

---
 contrib/fmt/{LICENSE.rst => LICENSE} |    0
 contrib/fmt/README.contrib           |    2 +-
 contrib/fmt/README.md                |   80 +-
 contrib/fmt/include/fmt/args.h       |  115 +-
 contrib/fmt/include/fmt/base.h       | 3077 ++++++++++++++++++++++++++
 contrib/fmt/include/fmt/chrono.h     |  478 ++--
 contrib/fmt/include/fmt/color.h      |  193 +-
 contrib/fmt/include/fmt/compile.h    |  110 +-
 contrib/fmt/include/fmt/core.h       | 2972 +------------------------
 contrib/fmt/include/fmt/format-inl.h |  304 ++-
 contrib/fmt/include/fmt/format.h     | 1356 ++++++------
 contrib/fmt/include/fmt/os.h         |  188 +-
 contrib/fmt/include/fmt/ostream.h    |   84 +-
 contrib/fmt/include/fmt/printf.h     |  253 +--
 contrib/fmt/include/fmt/ranges.h     |  484 ++--
 contrib/fmt/include/fmt/std.h        |  394 +++-
 contrib/fmt/include/fmt/xchar.h      |  155 +-
 17 files changed, 5471 insertions(+), 4774 deletions(-)
 rename contrib/fmt/{LICENSE.rst => LICENSE} (100%)
 create mode 100644 contrib/fmt/include/fmt/base.h

diff --git a/contrib/fmt/LICENSE.rst b/contrib/fmt/LICENSE
similarity index 100%
rename from contrib/fmt/LICENSE.rst
rename to contrib/fmt/LICENSE
diff --git a/contrib/fmt/README.contrib b/contrib/fmt/README.contrib
index 5284da3cf..7a86cb77c 100644
--- a/contrib/fmt/README.contrib
+++ b/contrib/fmt/README.contrib
@@ -1,2 +1,2 @@
 Source: https://github.com/fmtlib/fmt
-Revision: v10.2.1
+Revision: v11.0.2
diff --git a/contrib/fmt/README.md b/contrib/fmt/README.md
index dcfb16ec2..5f9249d4b 100644
--- a/contrib/fmt/README.md
+++ b/contrib/fmt/README.md
@@ -20,16 +20,16 @@ that help victims of the war in Ukraine: <https://www.stopputin.net/>.
 Q&A: ask questions on [StackOverflow with the tag
 fmt](https://stackoverflow.com/questions/tagged/fmt).
 
-Try {fmt} in [Compiler Explorer](https://godbolt.org/z/Eq5763).
+Try {fmt} in [Compiler Explorer](https://godbolt.org/z/8Mx1EW73v).
 
 # Features
 
-- Simple [format API](https://fmt.dev/latest/api.html) with positional
+- Simple [format API](https://fmt.dev/latest/api/) with positional
   arguments for localization
 - Implementation of [C++20
   std::format](https://en.cppreference.com/w/cpp/utility/format) and
   [C++23 std::print](https://en.cppreference.com/w/cpp/io/print)
-- [Format string syntax](https://fmt.dev/latest/syntax.html) similar
+- [Format string syntax](https://fmt.dev/latest/syntax/) similar
   to Python\'s
   [format](https://docs.python.org/3/library/stdtypes.html#str.format)
 - Fast IEEE 754 floating-point formatter with correct rounding,
@@ -37,10 +37,10 @@ Try {fmt} in [Compiler Explorer](https://godbolt.org/z/Eq5763).
   [Dragonbox](https://github.com/jk-jeon/dragonbox) algorithm
 - Portable Unicode support
 - Safe [printf
-  implementation](https://fmt.dev/latest/api.html#printf-formatting)
+  implementation](https://fmt.dev/latest/api/#printf-formatting)
   including the POSIX extension for positional arguments
 - Extensibility: [support for user-defined
-  types](https://fmt.dev/latest/api.html#formatting-user-defined-types)
+  types](https://fmt.dev/latest/api/#formatting-user-defined-types)
 - High performance: faster than common standard library
   implementations of `(s)printf`, iostreams, `to_string` and
   `to_chars`, see [Speed tests](#speed-tests) and [Converting a
@@ -58,8 +58,8 @@ Try {fmt} in [Compiler Explorer](https://godbolt.org/z/Eq5763).
   buffer overflow errors
 - Ease of use: small self-contained code base, no external
   dependencies, permissive MIT
-  [license](https://github.com/fmtlib/fmt/blob/master/LICENSE.rst)
-- [Portability](https://fmt.dev/latest/index.html#portability) with
+  [license](https://github.com/fmtlib/fmt/blob/master/LICENSE)
+- [Portability](https://fmt.dev/latest/#portability) with
   consistent output across platforms and support for older compilers
 - Clean warning-free codebase even on high warning levels such as
   `-Wall -Wextra -pedantic`
@@ -203,43 +203,38 @@ and [ryu](https://github.com/ulfjack/ryu):
 
 ## Compile time and code bloat
 
-The script
-[bloat-test.py](https://github.com/fmtlib/format-benchmark/blob/master/bloat-test.py)
-from [format-benchmark](https://github.com/fmtlib/format-benchmark)
-tests compile time and code bloat for nontrivial projects. It generates
-100 translation units and uses `printf()` or its alternative five times
-in each to simulate a medium-sized project. The resulting executable
-size and compile time (Apple LLVM version 8.1.0 (clang-802.0.42), macOS
-Sierra, best of three) is shown in the following tables.
+The script [bloat-test.py][test] from [format-benchmark][bench] tests compile
+time and code bloat for nontrivial projects. It generates 100 translation units
+and uses `printf()` or its alternative five times in each to simulate a
+medium-sized project. The resulting executable size and compile time (Apple
+clang version 15.0.0 (clang-1500.1.0.2.5), macOS Sonoma, best of three) is shown
+in the following tables.
+
+[test]: https://github.com/fmtlib/format-benchmark/blob/master/bloat-test.py
+[bench]: https://github.com/fmtlib/format-benchmark
 
 **Optimized build (-O3)**
 
 | Method        | Compile Time, s | Executable size, KiB | Stripped size, KiB |
 |---------------|-----------------|----------------------|--------------------|
-| printf        |   2.6           |   29                 |   26               |
-| printf+string |   16.4          |   29                 |   26               |
-| iostreams     |   31.1          |   59                 |   55               |
-| {fmt}         |   19.0          |   37                 |   34               |
-| Boost Format  |   91.9          |   226                |   203              |
-| Folly Format  |   115.7         |   101                |   88               |
-
-As you can see, {fmt} has 60% less overhead in terms of resulting binary
-code size compared to iostreams and comes pretty close to `printf`.
-Boost Format and Folly Format have the largest overheads.
+| printf        |             1.6 |                   54 |                 50 |
+| IOStreams     |            25.9 |                   98 |                 84 |
+| fmt 83652df   |             4.8 |                   54 |                 50 |
+| tinyformat    |            29.1 |                  161 |                136 |
+| Boost Format  |            55.0 |                  530 |                317 |
 
-`printf+string` is the same as `printf` but with an extra `<string>`
-include to measure the overhead of the latter.
+{fmt} is fast to compile and is comparable to `printf` in terms of per-call
+binary size (within a rounding error on this system).
 
 **Non-optimized build**
 
 | Method        | Compile Time, s | Executable size, KiB | Stripped size, KiB |
 |---------------|-----------------|----------------------|--------------------|
-| printf        |   2.2           |   33                 |   30               |
-| printf+string |   16.0          |   33                 |   30               |
-| iostreams     |   28.3          |   56                 |   52               |
-| {fmt}         |   18.2          |   59                 |   50               |
-| Boost Format  |   54.1          |   365                |   303              |
-| Folly Format  |   79.9          |   445                |   430              |
+| printf        |             1.4 |                   54 |                 50 |
+| IOStreams     |            23.4 |                   92 |                 68 |
+| {fmt} 83652df |             4.4 |                   89 |                 85 |
+| tinyformat    |            24.5 |                  204 |                161 |
+| Boost Format  |            36.4 |                  831 |                462 |
 
 `libc`, `lib(std)c++`, and `libfmt` are all linked as shared libraries
 to compare formatting function overhead only. Boost Format is a
@@ -248,7 +243,7 @@ header-only library so it doesn\'t provide any linkage options.
 ## Running the tests
 
 Please refer to [Building the
-library](https://fmt.dev/latest/usage.html#building-the-library) for
+library](https://fmt.dev/latest/get-started/#building-from-source) for
 instructions on how to build the library and run the unit tests.
 
 Benchmarks reside in a separate repository,
@@ -270,8 +265,7 @@ or the bloat test:
 
 # Migrating code
 
-[clang-tidy](https://clang.llvm.org/extra/clang-tidy/) v17 (not yet
-released) provides the
+[clang-tidy](https://clang.llvm.org/extra/clang-tidy/) v18 provides the
 [modernize-use-std-print](https://clang.llvm.org/extra/clang-tidy/checks/modernize/use-std-print.html)
 check that is capable of converting occurrences of `printf` and
 `fprintf` to `fmt::print` if configured to do so. (By default it
@@ -303,7 +297,7 @@ converts to `std::print`.)
   underwater vehicle
 - [Drake](https://drake.mit.edu/): a planning, control, and analysis
   toolbox for nonlinear dynamical systems (MIT)
-- [Envoy](https://lyft.github.io/envoy/): C++ L7 proxy and
+- [Envoy](https://github.com/envoyproxy/envoy): C++ L7 proxy and
   communication bus (Lyft)
 - [FiveM](https://fivem.net/): a modification framework for GTA V
 - [fmtlog](https://github.com/MengRao/fmtlog): a performant
@@ -343,7 +337,7 @@ converts to `std::print`.)
 - [Quill](https://github.com/odygrd/quill): asynchronous low-latency
   logging library
 - [QKW](https://github.com/ravijanjam/qkw): generalizing aliasing to
-  simplify navigation, and executing complex multi-line terminal
+  simplify navigation, and execute complex multi-line terminal
   command sequences
 - [redis-cerberus](https://github.com/HunanTV/redis-cerberus): a Redis
   cluster proxy
@@ -432,7 +426,7 @@ code bloat issues (see [Benchmarks](#benchmarks)).
 
 ## FastFormat
 
-This is an interesting library that is fast, safe, and has positional
+This is an interesting library that is fast, safe and has positional
 arguments. However, it has significant limitations, citing its author:
 
 > Three features that have no hope of being accommodated within the
@@ -442,8 +436,8 @@ arguments. However, it has significant limitations, citing its author:
 > - Octal/hexadecimal encoding
 > - Runtime width/alignment specification
 
-It is also quite big and has a heavy dependency, STLSoft, which might be
-too restrictive for using it in some projects.
+It is also quite big and has a heavy dependency, on STLSoft, which might be
+too restrictive for use in some projects.
 
 ## Boost Spirit.Karma
 
@@ -462,7 +456,7 @@ second](http://www.zverovich.net/2020/06/13/fast-int-to-string-revisited.html).
 
 # Documentation License
 
-The [Format String Syntax](https://fmt.dev/latest/syntax.html) section
+The [Format String Syntax](https://fmt.dev/latest/syntax/) section
 in the documentation is based on the one from Python [string module
 documentation](https://docs.python.org/3/library/string.html#module-string).
 For this reason, the documentation is distributed under the Python
@@ -486,5 +480,5 @@ To report a security issue, please disclose it at [security
 advisory](https://github.com/fmtlib/fmt/security/advisories/new).
 
 This project is maintained by a team of volunteers on a
-reasonable-effort basis. As such, please give us at least 90 days to
+reasonable-effort basis. As such, please give us at least *90* days to
 work on a fix before public exposure.
diff --git a/contrib/fmt/include/fmt/args.h b/contrib/fmt/include/fmt/args.h
index ad1654bbb..31a60e8fa 100644
--- a/contrib/fmt/include/fmt/args.h
+++ b/contrib/fmt/include/fmt/args.h
@@ -8,11 +8,13 @@
 #ifndef FMT_ARGS_H_
 #define FMT_ARGS_H_
 
-#include <functional>  // std::reference_wrapper
-#include <memory>      // std::unique_ptr
-#include <vector>
+#ifndef FMT_MODULE
+#  include <functional>  // std::reference_wrapper
+#  include <memory>      // std::unique_ptr
+#  include <vector>
+#endif
 
-#include "core.h"
+#include "format.h"  // std_string_view
 
 FMT_BEGIN_NAMESPACE
 
@@ -28,15 +30,18 @@ auto unwrap(const std::reference_wrapper<T>& v) -> const T& {
   return static_cast<const T&>(v);
 }
 
-class dynamic_arg_list {
-  // Workaround for clang's -Wweak-vtables. Unlike for regular classes, for
-  // templates it doesn't complain about inability to deduce single translation
-  // unit for placing vtable. So storage_node_base is made a fake template.
-  template <typename = void> struct node {
-    virtual ~node() = default;
-    std::unique_ptr<node<>> next;
-  };
+// node is defined outside dynamic_arg_list to workaround a C2504 bug in MSVC
+// 2022 (v17.10.0).
+//
+// Workaround for clang's -Wweak-vtables. Unlike for regular classes, for
+// templates it doesn't complain about inability to deduce single translation
+// unit for placing vtable. So node is made a fake template.
+template <typename = void> struct node {
+  virtual ~node() = default;
+  std::unique_ptr<node<>> next;
+};
 
+class dynamic_arg_list {
   template <typename T> struct typed_node : node<> {
     T value;
 
@@ -62,14 +67,10 @@ class dynamic_arg_list {
 }  // namespace detail
 
 /**
-  \rst
-  A dynamic version of `fmt::format_arg_store`.
-  It's equipped with a storage to potentially temporary objects which lifetimes
-  could be shorter than the format arguments object.
-
-  It can be implicitly converted into `~fmt::basic_format_args` for passing
-  into type-erased formatting functions such as `~fmt::vformat`.
-  \endrst
+ * A dynamic list of formatting arguments with storage.
+ *
+ * It can be implicitly converted into `fmt::basic_format_args` for passing
+ * into type-erased formatting functions such as `fmt::vformat`.
  */
 template <typename Context>
 class dynamic_format_arg_store
@@ -147,22 +148,20 @@ class dynamic_format_arg_store
   constexpr dynamic_format_arg_store() = default;
 
   /**
-    \rst
-    Adds an argument into the dynamic store for later passing to a formatting
-    function.
-
-    Note that custom types and string types (but not string views) are copied
-    into the store dynamically allocating memory if necessary.
-
-    **Example**::
-
-      fmt::dynamic_format_arg_store<fmt::format_context> store;
-      store.push_back(42);
-      store.push_back("abc");
-      store.push_back(1.5f);
-      std::string result = fmt::vformat("{} and {} and {}", store);
-    \endrst
-  */
+   * Adds an argument into the dynamic store for later passing to a formatting
+   * function.
+   *
+   * Note that custom types and string types (but not string views) are copied
+   * into the store dynamically allocating memory if necessary.
+   *
+   * **Example**:
+   *
+   *     fmt::dynamic_format_arg_store<fmt::format_context> store;
+   *     store.push_back(42);
+   *     store.push_back("abc");
+   *     store.push_back(1.5f);
+   *     std::string result = fmt::vformat("{} and {} and {}", store);
+   */
   template <typename T> void push_back(const T& arg) {
     if (detail::const_check(need_copy<T>::value))
       emplace_arg(dynamic_args_.push<stored_type<T>>(arg));
@@ -171,20 +170,18 @@ class dynamic_format_arg_store
   }
 
   /**
-    \rst
-    Adds a reference to the argument into the dynamic store for later passing to
-    a formatting function.
-
-    **Example**::
-
-      fmt::dynamic_format_arg_store<fmt::format_context> store;
-      char band[] = "Rolling Stones";
-      store.push_back(std::cref(band));
-      band[9] = 'c'; // Changing str affects the output.
-      std::string result = fmt::vformat("{}", store);
-      // result == "Rolling Scones"
-    \endrst
-  */
+   * Adds a reference to the argument into the dynamic store for later passing
+   * to a formatting function.
+   *
+   * **Example**:
+   *
+   *     fmt::dynamic_format_arg_store<fmt::format_context> store;
+   *     char band[] = "Rolling Stones";
+   *     store.push_back(std::cref(band));
+   *     band[9] = 'c'; // Changing str affects the output.
+   *     std::string result = fmt::vformat("{}", store);
+   *     // result == "Rolling Scones"
+   */
   template <typename T> void push_back(std::reference_wrapper<T> arg) {
     static_assert(
         need_copy<T>::value,
@@ -193,10 +190,10 @@ class dynamic_format_arg_store
   }
 
   /**
-    Adds named argument into the dynamic store for later passing to a formatting
-    function. ``std::reference_wrapper`` is supported to avoid copying of the
-    argument. The name is always copied into the store.
-  */
+   * Adds named argument into the dynamic store for later passing to a
+   * formatting function. `std::reference_wrapper` is supported to avoid
+   * copying of the argument. The name is always copied into the store.
+   */
   template <typename T>
   void push_back(const detail::named_arg<char_type, T>& arg) {
     const char_type* arg_name =
@@ -209,19 +206,15 @@ class dynamic_format_arg_store
     }
   }
 
-  /** Erase all elements from the store */
+  /// Erase all elements from the store.
   void clear() {
     data_.clear();
     named_info_.clear();
     dynamic_args_ = detail::dynamic_arg_list();
   }
 
-  /**
-    \rst
-    Reserves space to store at least *new_cap* arguments including
-    *new_cap_named* named arguments.
-    \endrst
-  */
+  /// Reserves space to store at least `new_cap` arguments including
+  /// `new_cap_named` named arguments.
   void reserve(size_t new_cap, size_t new_cap_named) {
     FMT_ASSERT(new_cap >= new_cap_named,
                "Set of arguments includes set of named arguments");
diff --git a/contrib/fmt/include/fmt/base.h b/contrib/fmt/include/fmt/base.h
new file mode 100644
index 000000000..627649425
--- /dev/null
+++ b/contrib/fmt/include/fmt/base.h
@@ -0,0 +1,3077 @@
+// Formatting library for C++ - the base API for char/UTF-8
+//
+// Copyright (c) 2012 - present, Victor Zverovich
+// All rights reserved.
+//
+// For the license information refer to format.h.
+
+#ifndef FMT_BASE_H_
+#define FMT_BASE_H_
+
+#if defined(FMT_IMPORT_STD) && !defined(FMT_MODULE)
+#  define FMT_MODULE
+#endif
+
+#ifndef FMT_MODULE
+#  include <limits.h>  // CHAR_BIT
+#  include <stdio.h>   // FILE
+#  include <string.h>  // strlen
+
+// <cstddef> is also included transitively from <type_traits>.
+#  include <cstddef>      // std::byte
+#  include <type_traits>  // std::enable_if
+#endif
+
+// The fmt library version in the form major * 10000 + minor * 100 + patch.
+#define FMT_VERSION 110002
+
+// Detect compiler versions.
+#if defined(__clang__) && !defined(__ibmxl__)
+#  define FMT_CLANG_VERSION (__clang_major__ * 100 + __clang_minor__)
+#else
+#  define FMT_CLANG_VERSION 0
+#endif
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER)
+#  define FMT_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
+#else
+#  define FMT_GCC_VERSION 0
+#endif
+#if defined(__ICL)
+#  define FMT_ICC_VERSION __ICL
+#elif defined(__INTEL_COMPILER)
+#  define FMT_ICC_VERSION __INTEL_COMPILER
+#else
+#  define FMT_ICC_VERSION 0
+#endif
+#if defined(_MSC_VER)
+#  define FMT_MSC_VERSION _MSC_VER
+#else
+#  define FMT_MSC_VERSION 0
+#endif
+
+// Detect standard library versions.
+#ifdef _GLIBCXX_RELEASE
+#  define FMT_GLIBCXX_RELEASE _GLIBCXX_RELEASE
+#else
+#  define FMT_GLIBCXX_RELEASE 0
+#endif
+#ifdef _LIBCPP_VERSION
+#  define FMT_LIBCPP_VERSION _LIBCPP_VERSION
+#else
+#  define FMT_LIBCPP_VERSION 0
+#endif
+
+#ifdef _MSVC_LANG
+#  define FMT_CPLUSPLUS _MSVC_LANG
+#else
+#  define FMT_CPLUSPLUS __cplusplus
+#endif
+
+// Detect __has_*.
+#ifdef __has_feature
+#  define FMT_HAS_FEATURE(x) __has_feature(x)
+#else
+#  define FMT_HAS_FEATURE(x) 0
+#endif
+#ifdef __has_include
+#  define FMT_HAS_INCLUDE(x) __has_include(x)
+#else
+#  define FMT_HAS_INCLUDE(x) 0
+#endif
+#ifdef __has_cpp_attribute
+#  define FMT_HAS_CPP_ATTRIBUTE(x) __has_cpp_attribute(x)
+#else
+#  define FMT_HAS_CPP_ATTRIBUTE(x) 0
+#endif
+
+#define FMT_HAS_CPP14_ATTRIBUTE(attribute) \
+  (FMT_CPLUSPLUS >= 201402L && FMT_HAS_CPP_ATTRIBUTE(attribute))
+
+#define FMT_HAS_CPP17_ATTRIBUTE(attribute) \
+  (FMT_CPLUSPLUS >= 201703L && FMT_HAS_CPP_ATTRIBUTE(attribute))
+
+// Detect C++14 relaxed constexpr.
+#ifdef FMT_USE_CONSTEXPR
+// Use the provided definition.
+#elif FMT_GCC_VERSION >= 600 && FMT_CPLUSPLUS >= 201402L
+// GCC only allows throw in constexpr since version 6:
+// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67371.
+#  define FMT_USE_CONSTEXPR 1
+#elif FMT_ICC_VERSION
+#  define FMT_USE_CONSTEXPR 0  // https://github.com/fmtlib/fmt/issues/1628
+#elif FMT_HAS_FEATURE(cxx_relaxed_constexpr) || FMT_MSC_VERSION >= 1912
+#  define FMT_USE_CONSTEXPR 1
+#else
+#  define FMT_USE_CONSTEXPR 0
+#endif
+#if FMT_USE_CONSTEXPR
+#  define FMT_CONSTEXPR constexpr
+#else
+#  define FMT_CONSTEXPR
+#endif
+
+// Detect consteval, C++20 constexpr extensions and std::is_constant_evaluated.
+#if !defined(__cpp_lib_is_constant_evaluated)
+#  define FMT_USE_CONSTEVAL 0
+#elif FMT_CPLUSPLUS < 201709L
+#  define FMT_USE_CONSTEVAL 0
+#elif FMT_GLIBCXX_RELEASE && FMT_GLIBCXX_RELEASE < 10
+#  define FMT_USE_CONSTEVAL 0
+#elif FMT_LIBCPP_VERSION && FMT_LIBCPP_VERSION < 10000
+#  define FMT_USE_CONSTEVAL 0
+#elif defined(__apple_build_version__) && __apple_build_version__ < 14000029L
+#  define FMT_USE_CONSTEVAL 0  // consteval is broken in Apple clang < 14.
+#elif FMT_MSC_VERSION && FMT_MSC_VERSION < 1929
+#  define FMT_USE_CONSTEVAL 0  // consteval is broken in MSVC VS2019 < 16.10.
+#elif defined(__cpp_consteval)
+#  define FMT_USE_CONSTEVAL 1
+#elif FMT_GCC_VERSION >= 1002 || FMT_CLANG_VERSION >= 1101
+#  define FMT_USE_CONSTEVAL 1
+#else
+#  define FMT_USE_CONSTEVAL 0
+#endif
+#if FMT_USE_CONSTEVAL
+#  define FMT_CONSTEVAL consteval
+#  define FMT_CONSTEXPR20 constexpr
+#else
+#  define FMT_CONSTEVAL
+#  define FMT_CONSTEXPR20
+#endif
+
+#if defined(FMT_USE_NONTYPE_TEMPLATE_ARGS)
+// Use the provided definition.
+#elif defined(__NVCOMPILER)
+#  define FMT_USE_NONTYPE_TEMPLATE_ARGS 0
+#elif FMT_GCC_VERSION >= 903 && FMT_CPLUSPLUS >= 201709L
+#  define FMT_USE_NONTYPE_TEMPLATE_ARGS 1
+#elif defined(__cpp_nontype_template_args) && \
+    __cpp_nontype_template_args >= 201911L
+#  define FMT_USE_NONTYPE_TEMPLATE_ARGS 1
+#elif FMT_CLANG_VERSION >= 1200 && FMT_CPLUSPLUS >= 202002L
+#  define FMT_USE_NONTYPE_TEMPLATE_ARGS 1
+#else
+#  define FMT_USE_NONTYPE_TEMPLATE_ARGS 0
+#endif
+
+#ifdef FMT_USE_CONCEPTS
+// Use the provided definition.
+#elif defined(__cpp_concepts)
+#  define FMT_USE_CONCEPTS 1
+#else
+#  define FMT_USE_CONCEPTS 0
+#endif
+
+// Check if exceptions are disabled.
+#ifdef FMT_EXCEPTIONS
+// Use the provided definition.
+#elif defined(__GNUC__) && !defined(__EXCEPTIONS)
+#  define FMT_EXCEPTIONS 0
+#elif FMT_MSC_VERSION && !_HAS_EXCEPTIONS
+#  define FMT_EXCEPTIONS 0
+#else
+#  define FMT_EXCEPTIONS 1
+#endif
+#if FMT_EXCEPTIONS
+#  define FMT_TRY try
+#  define FMT_CATCH(x) catch (x)
+#else
+#  define FMT_TRY if (true)
+#  define FMT_CATCH(x) if (false)
+#endif
+
+#if FMT_HAS_CPP17_ATTRIBUTE(fallthrough)
+#  define FMT_FALLTHROUGH [[fallthrough]]
+#elif defined(__clang__)
+#  define FMT_FALLTHROUGH [[clang::fallthrough]]
+#elif FMT_GCC_VERSION >= 700 && \
+    (!defined(__EDG_VERSION__) || __EDG_VERSION__ >= 520)
+#  define FMT_FALLTHROUGH [[gnu::fallthrough]]
+#else
+#  define FMT_FALLTHROUGH
+#endif
+
+// Disable [[noreturn]] on MSVC/NVCC because of bogus unreachable code warnings.
+#if FMT_HAS_CPP_ATTRIBUTE(noreturn) && !FMT_MSC_VERSION && !defined(__NVCC__)
+#  define FMT_NORETURN [[noreturn]]
+#else
+#  define FMT_NORETURN
+#endif
+
+#ifndef FMT_NODISCARD
+#  if FMT_HAS_CPP17_ATTRIBUTE(nodiscard)
+#    define FMT_NODISCARD [[nodiscard]]
+#  else
+#    define FMT_NODISCARD
+#  endif
+#endif
+
+#ifdef FMT_DEPRECATED
+// Use the provided definition.
+#elif FMT_HAS_CPP14_ATTRIBUTE(deprecated)
+#  define FMT_DEPRECATED [[deprecated]]
+#else
+#  define FMT_DEPRECATED /* deprecated */
+#endif
+
+#ifdef FMT_INLINE
+// Use the provided definition.
+#elif FMT_GCC_VERSION || FMT_CLANG_VERSION
+#  define FMT_ALWAYS_INLINE inline __attribute__((always_inline))
+#else
+#  define FMT_ALWAYS_INLINE inline
+#endif
+// A version of FMT_INLINE to prevent code bloat in debug mode.
+#ifdef NDEBUG
+#  define FMT_INLINE FMT_ALWAYS_INLINE
+#else
+#  define FMT_INLINE inline
+#endif
+
+#if FMT_GCC_VERSION || FMT_CLANG_VERSION
+#  define FMT_VISIBILITY(value) __attribute__((visibility(value)))
+#else
+#  define FMT_VISIBILITY(value)
+#endif
+
+#ifndef FMT_GCC_PRAGMA
+// Workaround a _Pragma bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59884
+// and an nvhpc warning: https://github.com/fmtlib/fmt/pull/2582.
+#  if FMT_GCC_VERSION >= 504 && !defined(__NVCOMPILER)
+#    define FMT_GCC_PRAGMA(arg) _Pragma(arg)
+#  else
+#    define FMT_GCC_PRAGMA(arg)
+#  endif
+#endif
+
+// GCC < 5 requires this-> in decltype.
+#if FMT_GCC_VERSION && FMT_GCC_VERSION < 500
+#  define FMT_DECLTYPE_THIS this->
+#else
+#  define FMT_DECLTYPE_THIS
+#endif
+
+#if FMT_MSC_VERSION
+#  define FMT_MSC_WARNING(...) __pragma(warning(__VA_ARGS__))
+#  define FMT_UNCHECKED_ITERATOR(It) \
+    using _Unchecked_type = It  // Mark iterator as checked.
+#else
+#  define FMT_MSC_WARNING(...)
+#  define FMT_UNCHECKED_ITERATOR(It) using unchecked_type = It
+#endif
+
+#ifndef FMT_BEGIN_NAMESPACE
+#  define FMT_BEGIN_NAMESPACE \
+    namespace fmt {           \
+    inline namespace v11 {
+#  define FMT_END_NAMESPACE \
+    }                       \
+    }
+#endif
+
+#ifndef FMT_EXPORT
+#  define FMT_EXPORT
+#  define FMT_BEGIN_EXPORT
+#  define FMT_END_EXPORT
+#endif
+
+#if !defined(FMT_HEADER_ONLY) && defined(_WIN32)
+#  if defined(FMT_LIB_EXPORT)
+#    define FMT_API __declspec(dllexport)
+#  elif defined(FMT_SHARED)
+#    define FMT_API __declspec(dllimport)
+#  endif
+#elif defined(FMT_LIB_EXPORT) || defined(FMT_SHARED)
+#  define FMT_API FMT_VISIBILITY("default")
+#endif
+#ifndef FMT_API
+#  define FMT_API
+#endif
+
+#ifndef FMT_UNICODE
+#  define FMT_UNICODE 1
+#endif
+
+// Check if rtti is available.
+#ifndef FMT_USE_RTTI
+// __RTTI is for EDG compilers. _CPPRTTI is for MSVC.
+#  if defined(__GXX_RTTI) || FMT_HAS_FEATURE(cxx_rtti) || defined(_CPPRTTI) || \
+      defined(__INTEL_RTTI__) || defined(__RTTI)
+#    define FMT_USE_RTTI 1
+#  else
+#    define FMT_USE_RTTI 0
+#  endif
+#endif
+
+#define FMT_FWD(...) static_cast<decltype(__VA_ARGS__)&&>(__VA_ARGS__)
+
+// Enable minimal optimizations for more compact code in debug mode.
+FMT_GCC_PRAGMA("GCC push_options")
+#if !defined(__OPTIMIZE__) && !defined(__CUDACC__)
+FMT_GCC_PRAGMA("GCC optimize(\"Og\")")
+#endif
+
+FMT_BEGIN_NAMESPACE
+
+// Implementations of enable_if_t and other metafunctions for older systems.
+template <bool B, typename T = void>
+using enable_if_t = typename std::enable_if<B, T>::type;
+template <bool B, typename T, typename F>
+using conditional_t = typename std::conditional<B, T, F>::type;
+template <bool B> using bool_constant = std::integral_constant<bool, B>;
+template <typename T>
+using remove_reference_t = typename std::remove_reference<T>::type;
+template <typename T>
+using remove_const_t = typename std::remove_const<T>::type;
+template <typename T>
+using remove_cvref_t = typename std::remove_cv<remove_reference_t<T>>::type;
+template <typename T> struct type_identity {
+  using type = T;
+};
+template <typename T> using type_identity_t = typename type_identity<T>::type;
+template <typename T>
+using make_unsigned_t = typename std::make_unsigned<T>::type;
+template <typename T>
+using underlying_t = typename std::underlying_type<T>::type;
+
+#if FMT_GCC_VERSION && FMT_GCC_VERSION < 500
+// A workaround for gcc 4.8 to make void_t work in a SFINAE context.
+template <typename...> struct void_t_impl {
+  using type = void;
+};
+template <typename... T> using void_t = typename void_t_impl<T...>::type;
+#else
+template <typename...> using void_t = void;
+#endif
+
+struct monostate {
+  constexpr monostate() {}
+};
+
+// An enable_if helper to be used in template parameters which results in much
+// shorter symbols: https://godbolt.org/z/sWw4vP. Extra parentheses are needed
+// to workaround a bug in MSVC 2019 (see #1140 and #1186).
+#ifdef FMT_DOC
+#  define FMT_ENABLE_IF(...)
+#else
+#  define FMT_ENABLE_IF(...) fmt::enable_if_t<(__VA_ARGS__), int> = 0
+#endif
+
+// This is defined in base.h instead of format.h to avoid injecting in std.
+// It is a template to avoid undesirable implicit conversions to std::byte.
+#ifdef __cpp_lib_byte
+template <typename T, FMT_ENABLE_IF(std::is_same<T, std::byte>::value)>
+inline auto format_as(T b) -> unsigned char {
+  return static_cast<unsigned char>(b);
+}
+#endif
+
+namespace detail {
+// Suppresses "unused variable" warnings with the method described in
+// https://herbsutter.com/2009/10/18/mailbag-shutting-up-compiler-warnings/.
+// (void)var does not work on many Intel compilers.
+template <typename... T> FMT_CONSTEXPR void ignore_unused(const T&...) {}
+
+constexpr auto is_constant_evaluated(bool default_value = false) noexcept
+    -> bool {
+// Workaround for incompatibility between libstdc++ consteval-based
+// std::is_constant_evaluated() implementation and clang-14:
+// https://github.com/fmtlib/fmt/issues/3247.
+#if FMT_CPLUSPLUS >= 202002L && FMT_GLIBCXX_RELEASE >= 12 && \
+    (FMT_CLANG_VERSION >= 1400 && FMT_CLANG_VERSION < 1500)
+  ignore_unused(default_value);
+  return __builtin_is_constant_evaluated();
+#elif defined(__cpp_lib_is_constant_evaluated)
+  ignore_unused(default_value);
+  return std::is_constant_evaluated();
+#else
+  return default_value;
+#endif
+}
+
+// Suppresses "conditional expression is constant" warnings.
+template <typename T> constexpr auto const_check(T value) -> T { return value; }
+
+FMT_NORETURN FMT_API void assert_fail(const char* file, int line,
+                                      const char* message);
+
+#if defined(FMT_ASSERT)
+// Use the provided definition.
+#elif defined(NDEBUG)
+// FMT_ASSERT is not empty to avoid -Wempty-body.
+#  define FMT_ASSERT(condition, message) \
+    fmt::detail::ignore_unused((condition), (message))
+#else
+#  define FMT_ASSERT(condition, message)                                    \
+    ((condition) /* void() fails with -Winvalid-constexpr on clang 4.0.1 */ \
+         ? (void)0                                                          \
+         : fmt::detail::assert_fail(__FILE__, __LINE__, (message)))
+#endif
+
+#ifdef FMT_USE_INT128
+// Do nothing.
+#elif defined(__SIZEOF_INT128__) && !defined(__NVCC__) && \
+    !(FMT_CLANG_VERSION && FMT_MSC_VERSION)
+#  define FMT_USE_INT128 1
+using int128_opt = __int128_t;  // An optional native 128-bit integer.
+using uint128_opt = __uint128_t;
+template <typename T> inline auto convert_for_visit(T value) -> T {
+  return value;
+}
+#else
+#  define FMT_USE_INT128 0
+#endif
+#if !FMT_USE_INT128
+enum class int128_opt {};
+enum class uint128_opt {};
+// Reduce template instantiations.
+template <typename T> auto convert_for_visit(T) -> monostate { return {}; }
+#endif
+
+// Casts a nonnegative integer to unsigned.
+template <typename Int>
+FMT_CONSTEXPR auto to_unsigned(Int value) -> make_unsigned_t<Int> {
+  FMT_ASSERT(std::is_unsigned<Int>::value || value >= 0, "negative value");
+  return static_cast<make_unsigned_t<Int>>(value);
+}
+
+// A heuristic to detect std::string and std::[experimental::]string_view.
+// It is mainly used to avoid dependency on <[experimental/]string_view>.
+template <typename T, typename Enable = void>
+struct is_std_string_like : std::false_type {};
+template <typename T>
+struct is_std_string_like<T, void_t<decltype(std::declval<T>().find_first_of(
+                                 typename T::value_type(), 0))>>
+    : std::is_convertible<decltype(std::declval<T>().data()),
+                          const typename T::value_type*> {};
+
+// Returns true iff the literal encoding is UTF-8.
+constexpr auto is_utf8_enabled() -> bool {
+  // Avoid an MSVC sign extension bug: https://github.com/fmtlib/fmt/pull/2297.
+  using uchar = unsigned char;
+  return sizeof("\u00A7") == 3 && uchar("\u00A7"[0]) == 0xC2 &&
+         uchar("\u00A7"[1]) == 0xA7;
+}
+constexpr auto use_utf8() -> bool {
+  return !FMT_MSC_VERSION || is_utf8_enabled();
+}
+
+static_assert(!FMT_UNICODE || use_utf8(),
+              "Unicode support requires compiling with /utf-8");
+
+template <typename Char> FMT_CONSTEXPR auto length(const Char* s) -> size_t {
+  size_t len = 0;
+  while (*s++) ++len;
+  return len;
+}
+
+template <typename Char>
+FMT_CONSTEXPR auto compare(const Char* s1, const Char* s2, std::size_t n)
+    -> int {
+  if (!is_constant_evaluated() && sizeof(Char) == 1) return memcmp(s1, s2, n);
+  for (; n != 0; ++s1, ++s2, --n) {
+    if (*s1 < *s2) return -1;
+    if (*s1 > *s2) return 1;
+  }
+  return 0;
+}
+
+namespace adl {
+using namespace std;
+
+template <typename Container>
+auto invoke_back_inserter()
+    -> decltype(back_inserter(std::declval<Container&>()));
+}  // namespace adl
+
+template <typename It, typename Enable = std::true_type>
+struct is_back_insert_iterator : std::false_type {};
+
+template <typename It>
+struct is_back_insert_iterator<
+    It, bool_constant<std::is_same<
+            decltype(adl::invoke_back_inserter<typename It::container_type>()),
+            It>::value>> : std::true_type {};
+
+// Extracts a reference to the container from *insert_iterator.
+template <typename OutputIt>
+inline auto get_container(OutputIt it) -> typename OutputIt::container_type& {
+  struct accessor : OutputIt {
+    accessor(OutputIt base) : OutputIt(base) {}
+    using OutputIt::container;
+  };
+  return *accessor(it).container;
+}
+}  // namespace detail
+
+// Checks whether T is a container with contiguous storage.
+template <typename T> struct is_contiguous : std::false_type {};
+
+/**
+ * An implementation of `std::basic_string_view` for pre-C++17. It provides a
+ * subset of the API. `fmt::basic_string_view` is used for format strings even
+ * if `std::basic_string_view` is available to prevent issues when a library is
+ * compiled with a different `-std` option than the client code (which is not
+ * recommended).
+ */
+FMT_EXPORT
+template <typename Char> class basic_string_view {
+ private:
+  const Char* data_;
+  size_t size_;
+
+ public:
+  using value_type = Char;
+  using iterator = const Char*;
+
+  constexpr basic_string_view() noexcept : data_(nullptr), size_(0) {}
+
+  /// Constructs a string reference object from a C string and a size.
+  constexpr basic_string_view(const Char* s, size_t count) noexcept
+      : data_(s), size_(count) {}
+
+  constexpr basic_string_view(std::nullptr_t) = delete;
+
+  /// Constructs a string reference object from a C string.
+  FMT_CONSTEXPR20
+  basic_string_view(const Char* s)
+      : data_(s),
+        size_(detail::const_check(std::is_same<Char, char>::value &&
+                                  !detail::is_constant_evaluated(false))
+                  ? strlen(reinterpret_cast<const char*>(s))
+                  : detail::length(s)) {}
+
+  /// Constructs a string reference from a `std::basic_string` or a
+  /// `std::basic_string_view` object.
+  template <typename S,
+            FMT_ENABLE_IF(detail::is_std_string_like<S>::value&& std::is_same<
+                          typename S::value_type, Char>::value)>
+  FMT_CONSTEXPR basic_string_view(const S& s) noexcept
+      : data_(s.data()), size_(s.size()) {}
+
+  /// Returns a pointer to the string data.
+  constexpr auto data() const noexcept -> const Char* { return data_; }
+
+  /// Returns the string size.
+  constexpr auto size() const noexcept -> size_t { return size_; }
+
+  constexpr auto begin() const noexcept -> iterator { return data_; }
+  constexpr auto end() const noexcept -> iterator { return data_ + size_; }
+
+  constexpr auto operator[](size_t pos) const noexcept -> const Char& {
+    return data_[pos];
+  }
+
+  FMT_CONSTEXPR void remove_prefix(size_t n) noexcept {
+    data_ += n;
+    size_ -= n;
+  }
+
+  FMT_CONSTEXPR auto starts_with(basic_string_view<Char> sv) const noexcept
+      -> bool {
+    return size_ >= sv.size_ && detail::compare(data_, sv.data_, sv.size_) == 0;
+  }
+  FMT_CONSTEXPR auto starts_with(Char c) const noexcept -> bool {
+    return size_ >= 1 && *data_ == c;
+  }
+  FMT_CONSTEXPR auto starts_with(const Char* s) const -> bool {
+    return starts_with(basic_string_view<Char>(s));
+  }
+
+  // Lexicographically compare this string reference to other.
+  FMT_CONSTEXPR auto compare(basic_string_view other) const -> int {
+    size_t str_size = size_ < other.size_ ? size_ : other.size_;
+    int result = detail::compare(data_, other.data_, str_size);
+    if (result == 0)
+      result = size_ == other.size_ ? 0 : (size_ < other.size_ ? -1 : 1);
+    return result;
+  }
+
+  FMT_CONSTEXPR friend auto operator==(basic_string_view lhs,
+                                       basic_string_view rhs) -> bool {
+    return lhs.compare(rhs) == 0;
+  }
+  friend auto operator!=(basic_string_view lhs, basic_string_view rhs) -> bool {
+    return lhs.compare(rhs) != 0;
+  }
+  friend auto operator<(basic_string_view lhs, basic_string_view rhs) -> bool {
+    return lhs.compare(rhs) < 0;
+  }
+  friend auto operator<=(basic_string_view lhs, basic_string_view rhs) -> bool {
+    return lhs.compare(rhs) <= 0;
+  }
+  friend auto operator>(basic_string_view lhs, basic_string_view rhs) -> bool {
+    return lhs.compare(rhs) > 0;
+  }
+  friend auto operator>=(basic_string_view lhs, basic_string_view rhs) -> bool {
+    return lhs.compare(rhs) >= 0;
+  }
+};
+
+FMT_EXPORT
+using string_view = basic_string_view<char>;
+
+/// Specifies if `T` is a character type. Can be specialized by users.
+FMT_EXPORT
+template <typename T> struct is_char : std::false_type {};
+template <> struct is_char<char> : std::true_type {};
+
+namespace detail {
+
+// Constructs fmt::basic_string_view<Char> from types implicitly convertible
+// to it, deducing Char. Explicitly convertible types such as the ones returned
+// from FMT_STRING are intentionally excluded.
+template <typename Char, FMT_ENABLE_IF(is_char<Char>::value)>
+constexpr auto to_string_view(const Char* s) -> basic_string_view<Char> {
+  return s;
+}
+template <typename T, FMT_ENABLE_IF(is_std_string_like<T>::value)>
+constexpr auto to_string_view(const T& s)
+    -> basic_string_view<typename T::value_type> {
+  return s;
+}
+template <typename Char>
+constexpr auto to_string_view(basic_string_view<Char> s)
+    -> basic_string_view<Char> {
+  return s;
+}
+
+template <typename T, typename Enable = void>
+struct has_to_string_view : std::false_type {};
+// detail:: is intentional since to_string_view is not an extension point.
+template <typename T>
+struct has_to_string_view<
+    T, void_t<decltype(detail::to_string_view(std::declval<T>()))>>
+    : std::true_type {};
+
+template <typename Char, Char... C> struct string_literal {
+  static constexpr Char value[sizeof...(C)] = {C...};
+  constexpr operator basic_string_view<Char>() const {
+    return {value, sizeof...(C)};
+  }
+};
+#if FMT_CPLUSPLUS < 201703L
+template <typename Char, Char... C>
+constexpr Char string_literal<Char, C...>::value[sizeof...(C)];
+#endif
+
+enum class type {
+  none_type,
+  // Integer types should go first,
+  int_type,
+  uint_type,
+  long_long_type,
+  ulong_long_type,
+  int128_type,
+  uint128_type,
+  bool_type,
+  char_type,
+  last_integer_type = char_type,
+  // followed by floating-point types.
+  float_type,
+  double_type,
+  long_double_type,
+  last_numeric_type = long_double_type,
+  cstring_type,
+  string_type,
+  pointer_type,
+  custom_type
+};
+
+// Maps core type T to the corresponding type enum constant.
+template <typename T, typename Char>
+struct type_constant : std::integral_constant<type, type::custom_type> {};
+
+#define FMT_TYPE_CONSTANT(Type, constant) \
+  template <typename Char>                \
+  struct type_constant<Type, Char>        \
+      : std::integral_constant<type, type::constant> {}
+
+FMT_TYPE_CONSTANT(int, int_type);
+FMT_TYPE_CONSTANT(unsigned, uint_type);
+FMT_TYPE_CONSTANT(long long, long_long_type);
+FMT_TYPE_CONSTANT(unsigned long long, ulong_long_type);
+FMT_TYPE_CONSTANT(int128_opt, int128_type);
+FMT_TYPE_CONSTANT(uint128_opt, uint128_type);
+FMT_TYPE_CONSTANT(bool, bool_type);
+FMT_TYPE_CONSTANT(Char, char_type);
+FMT_TYPE_CONSTANT(float, float_type);
+FMT_TYPE_CONSTANT(double, double_type);
+FMT_TYPE_CONSTANT(long double, long_double_type);
+FMT_TYPE_CONSTANT(const Char*, cstring_type);
+FMT_TYPE_CONSTANT(basic_string_view<Char>, string_type);
+FMT_TYPE_CONSTANT(const void*, pointer_type);
+
+constexpr auto is_integral_type(type t) -> bool {
+  return t > type::none_type && t <= type::last_integer_type;
+}
+constexpr auto is_arithmetic_type(type t) -> bool {
+  return t > type::none_type && t <= type::last_numeric_type;
+}
+
+constexpr auto set(type rhs) -> int { return 1 << static_cast<int>(rhs); }
+constexpr auto in(type t, int set) -> bool {
+  return ((set >> static_cast<int>(t)) & 1) != 0;
+}
+
+// Bitsets of types.
+enum {
+  sint_set =
+      set(type::int_type) | set(type::long_long_type) | set(type::int128_type),
+  uint_set = set(type::uint_type) | set(type::ulong_long_type) |
+             set(type::uint128_type),
+  bool_set = set(type::bool_type),
+  char_set = set(type::char_type),
+  float_set = set(type::float_type) | set(type::double_type) |
+              set(type::long_double_type),
+  string_set = set(type::string_type),
+  cstring_set = set(type::cstring_type),
+  pointer_set = set(type::pointer_type)
+};
+}  // namespace detail
+
+/// Reports a format error at compile time or, via a `format_error` exception,
+/// at runtime.
+// This function is intentionally not constexpr to give a compile-time error.
+FMT_NORETURN FMT_API void report_error(const char* message);
+
+FMT_DEPRECATED FMT_NORETURN inline void throw_format_error(
+    const char* message) {
+  report_error(message);
+}
+
+/// String's character (code unit) type.
+template <typename S,
+          typename V = decltype(detail::to_string_view(std::declval<S>()))>
+using char_t = typename V::value_type;
+
+/**
+ * Parsing context consisting of a format string range being parsed and an
+ * argument counter for automatic indexing.
+ * You can use the `format_parse_context` type alias for `char` instead.
+ */
+FMT_EXPORT
+template <typename Char> class basic_format_parse_context {
+ private:
+  basic_string_view<Char> format_str_;
+  int next_arg_id_;
+
+  FMT_CONSTEXPR void do_check_arg_id(int id);
+
+ public:
+  using char_type = Char;
+  using iterator = const Char*;
+
+  explicit constexpr basic_format_parse_context(
+      basic_string_view<Char> format_str, int next_arg_id = 0)
+      : format_str_(format_str), next_arg_id_(next_arg_id) {}
+
+  /// Returns an iterator to the beginning of the format string range being
+  /// parsed.
+  constexpr auto begin() const noexcept -> iterator {
+    return format_str_.begin();
+  }
+
+  /// Returns an iterator past the end of the format string range being parsed.
+  constexpr auto end() const noexcept -> iterator { return format_str_.end(); }
+
+  /// Advances the begin iterator to `it`.
+  FMT_CONSTEXPR void advance_to(iterator it) {
+    format_str_.remove_prefix(detail::to_unsigned(it - begin()));
+  }
+
+  /// Reports an error if using the manual argument indexing; otherwise returns
+  /// the next argument index and switches to the automatic indexing.
+  FMT_CONSTEXPR auto next_arg_id() -> int {
+    if (next_arg_id_ < 0) {
+      report_error("cannot switch from manual to automatic argument indexing");
+      return 0;
+    }
+    int id = next_arg_id_++;
+    do_check_arg_id(id);
+    return id;
+  }
+
+  /// Reports an error if using the automatic argument indexing; otherwise
+  /// switches to the manual indexing.
+  FMT_CONSTEXPR void check_arg_id(int id) {
+    if (next_arg_id_ > 0) {
+      report_error("cannot switch from automatic to manual argument indexing");
+      return;
+    }
+    next_arg_id_ = -1;
+    do_check_arg_id(id);
+  }
+  FMT_CONSTEXPR void check_arg_id(basic_string_view<Char>) {
+    next_arg_id_ = -1;
+  }
+  FMT_CONSTEXPR void check_dynamic_spec(int arg_id);
+};
+
+FMT_EXPORT
+using format_parse_context = basic_format_parse_context<char>;
+
+namespace detail {
+// A parse context with extra data used only in compile-time checks.
+template <typename Char>
+class compile_parse_context : public basic_format_parse_context<Char> {
+ private:
+  int num_args_;
+  const type* types_;
+  using base = basic_format_parse_context<Char>;
+
+ public:
+  explicit FMT_CONSTEXPR compile_parse_context(
+      basic_string_view<Char> format_str, int num_args, const type* types,
+      int next_arg_id = 0)
+      : base(format_str, next_arg_id), num_args_(num_args), types_(types) {}
+
+  constexpr auto num_args() const -> int { return num_args_; }
+  constexpr auto arg_type(int id) const -> type { return types_[id]; }
+
+  FMT_CONSTEXPR auto next_arg_id() -> int {
+    int id = base::next_arg_id();
+    if (id >= num_args_) report_error("argument not found");
+    return id;
+  }
+
+  FMT_CONSTEXPR void check_arg_id(int id) {
+    base::check_arg_id(id);
+    if (id >= num_args_) report_error("argument not found");
+  }
+  using base::check_arg_id;
+
+  FMT_CONSTEXPR void check_dynamic_spec(int arg_id) {
+    detail::ignore_unused(arg_id);
+    if (arg_id < num_args_ && types_ && !is_integral_type(types_[arg_id]))
+      report_error("width/precision is not integer");
+  }
+};
+
+/// A contiguous memory buffer with an optional growing ability. It is an
+/// internal class and shouldn't be used directly, only via `memory_buffer`.
+template <typename T> class buffer {
+ private:
+  T* ptr_;
+  size_t size_;
+  size_t capacity_;
+
+  using grow_fun = void (*)(buffer& buf, size_t capacity);
+  grow_fun grow_;
+
+ protected:
+  // Don't initialize ptr_ since it is not accessed to save a few cycles.
+  FMT_MSC_WARNING(suppress : 26495)
+  FMT_CONSTEXPR20 buffer(grow_fun grow, size_t sz) noexcept
+      : size_(sz), capacity_(sz), grow_(grow) {}
+
+  constexpr buffer(grow_fun grow, T* p = nullptr, size_t sz = 0,
+                   size_t cap = 0) noexcept
+      : ptr_(p), size_(sz), capacity_(cap), grow_(grow) {}
+
+  FMT_CONSTEXPR20 ~buffer() = default;
+  buffer(buffer&&) = default;
+
+  /// Sets the buffer data and capacity.
+  FMT_CONSTEXPR void set(T* buf_data, size_t buf_capacity) noexcept {
+    ptr_ = buf_data;
+    capacity_ = buf_capacity;
+  }
+
+ public:
+  using value_type = T;
+  using const_reference = const T&;
+
+  buffer(const buffer&) = delete;
+  void operator=(const buffer&) = delete;
+
+  auto begin() noexcept -> T* { return ptr_; }
+  auto end() noexcept -> T* { return ptr_ + size_; }
+
+  auto begin() const noexcept -> const T* { return ptr_; }
+  auto end() const noexcept -> const T* { return ptr_ + size_; }
+
+  /// Returns the size of this buffer.
+  constexpr auto size() const noexcept -> size_t { return size_; }
+
+  /// Returns the capacity of this buffer.
+  constexpr auto capacity() const noexcept -> size_t { return capacity_; }
+
+  /// Returns a pointer to the buffer data (not null-terminated).
+  FMT_CONSTEXPR auto data() noexcept -> T* { return ptr_; }
+  FMT_CONSTEXPR auto data() const noexcept -> const T* { return ptr_; }
+
+  /// Clears this buffer.
+  void clear() { size_ = 0; }
+
+  // Tries resizing the buffer to contain `count` elements. If T is a POD type
+  // the new elements may not be initialized.
+  FMT_CONSTEXPR void try_resize(size_t count) {
+    try_reserve(count);
+    size_ = count <= capacity_ ? count : capacity_;
+  }
+
+  // Tries increasing the buffer capacity to `new_capacity`. It can increase the
+  // capacity by a smaller amount than requested but guarantees there is space
+  // for at least one additional element either by increasing the capacity or by
+  // flushing the buffer if it is full.
+  FMT_CONSTEXPR void try_reserve(size_t new_capacity) {
+    if (new_capacity > capacity_) grow_(*this, new_capacity);
+  }
+
+  FMT_CONSTEXPR void push_back(const T& value) {
+    try_reserve(size_ + 1);
+    ptr_[size_++] = value;
+  }
+
+  /// Appends data to the end of the buffer.
+  template <typename U> void append(const U* begin, const U* end) {
+    while (begin != end) {
+      auto count = to_unsigned(end - begin);
+      try_reserve(size_ + count);
+      auto free_cap = capacity_ - size_;
+      if (free_cap < count) count = free_cap;
+      // A loop is faster than memcpy on small sizes.
+      T* out = ptr_ + size_;
+      for (size_t i = 0; i < count; ++i) out[i] = begin[i];
+      size_ += count;
+      begin += count;
+    }
+  }
+
+  template <typename Idx> FMT_CONSTEXPR auto operator[](Idx index) -> T& {
+    return ptr_[index];
+  }
+  template <typename Idx>
+  FMT_CONSTEXPR auto operator[](Idx index) const -> const T& {
+    return ptr_[index];
+  }
+};
+
+struct buffer_traits {
+  explicit buffer_traits(size_t) {}
+  auto count() const -> size_t { return 0; }
+  auto limit(size_t size) -> size_t { return size; }
+};
+
+class fixed_buffer_traits {
+ private:
+  size_t count_ = 0;
+  size_t limit_;
+
+ public:
+  explicit fixed_buffer_traits(size_t limit) : limit_(limit) {}
+  auto count() const -> size_t { return count_; }
+  auto limit(size_t size) -> size_t {
+    size_t n = limit_ > count_ ? limit_ - count_ : 0;
+    count_ += size;
+    return size < n ? size : n;
+  }
+};
+
+// A buffer that writes to an output iterator when flushed.
+template <typename OutputIt, typename T, typename Traits = buffer_traits>
+class iterator_buffer : public Traits, public buffer<T> {
+ private:
+  OutputIt out_;
+  enum { buffer_size = 256 };
+  T data_[buffer_size];
+
+  static FMT_CONSTEXPR void grow(buffer<T>& buf, size_t) {
+    if (buf.size() == buffer_size) static_cast<iterator_buffer&>(buf).flush();
+  }
+
+  void flush() {
+    auto size = this->size();
+    this->clear();
+    const T* begin = data_;
+    const T* end = begin + this->limit(size);
+    while (begin != end) *out_++ = *begin++;
+  }
+
+ public:
+  explicit iterator_buffer(OutputIt out, size_t n = buffer_size)
+      : Traits(n), buffer<T>(grow, data_, 0, buffer_size), out_(out) {}
+  iterator_buffer(iterator_buffer&& other) noexcept
+      : Traits(other),
+        buffer<T>(grow, data_, 0, buffer_size),
+        out_(other.out_) {}
+  ~iterator_buffer() {
+    // Don't crash if flush fails during unwinding.
+    FMT_TRY { flush(); }
+    FMT_CATCH(...) {}
+  }
+
+  auto out() -> OutputIt {
+    flush();
+    return out_;
+  }
+  auto count() const -> size_t { return Traits::count() + this->size(); }
+};
+
+template <typename T>
+class iterator_buffer<T*, T, fixed_buffer_traits> : public fixed_buffer_traits,
+                                                    public buffer<T> {
+ private:
+  T* out_;
+  enum { buffer_size = 256 };
+  T data_[buffer_size];
+
+  static FMT_CONSTEXPR void grow(buffer<T>& buf, size_t) {
+    if (buf.size() == buf.capacity())
+      static_cast<iterator_buffer&>(buf).flush();
+  }
+
+  void flush() {
+    size_t n = this->limit(this->size());
+    if (this->data() == out_) {
+      out_ += n;
+      this->set(data_, buffer_size);
+    }
+    this->clear();
+  }
+
+ public:
+  explicit iterator_buffer(T* out, size_t n = buffer_size)
+      : fixed_buffer_traits(n), buffer<T>(grow, out, 0, n), out_(out) {}
+  iterator_buffer(iterator_buffer&& other) noexcept
+      : fixed_buffer_traits(other),
+        buffer<T>(static_cast<iterator_buffer&&>(other)),
+        out_(other.out_) {
+    if (this->data() != out_) {
+      this->set(data_, buffer_size);
+      this->clear();
+    }
+  }
+  ~iterator_buffer() { flush(); }
+
+  auto out() -> T* {
+    flush();
+    return out_;
+  }
+  auto count() const -> size_t {
+    return fixed_buffer_traits::count() + this->size();
+  }
+};
+
+template <typename T> class iterator_buffer<T*, T> : public buffer<T> {
+ public:
+  explicit iterator_buffer(T* out, size_t = 0)
+      : buffer<T>([](buffer<T>&, size_t) {}, out, 0, ~size_t()) {}
+
+  auto out() -> T* { return &*this->end(); }
+};
+
+// A buffer that writes to a container with the contiguous storage.
+template <typename OutputIt>
+class iterator_buffer<
+    OutputIt,
+    enable_if_t<detail::is_back_insert_iterator<OutputIt>::value &&
+                    is_contiguous<typename OutputIt::container_type>::value,
+                typename OutputIt::container_type::value_type>>
+    : public buffer<typename OutputIt::container_type::value_type> {
+ private:
+  using container_type = typename OutputIt::container_type;
+  using value_type = typename container_type::value_type;
+  container_type& container_;
+
+  static FMT_CONSTEXPR void grow(buffer<value_type>& buf, size_t capacity) {
+    auto& self = static_cast<iterator_buffer&>(buf);
+    self.container_.resize(capacity);
+    self.set(&self.container_[0], capacity);
+  }
+
+ public:
+  explicit iterator_buffer(container_type& c)
+      : buffer<value_type>(grow, c.size()), container_(c) {}
+  explicit iterator_buffer(OutputIt out, size_t = 0)
+      : iterator_buffer(get_container(out)) {}
+
+  auto out() -> OutputIt { return back_inserter(container_); }
+};
+
+// A buffer that counts the number of code units written discarding the output.
+template <typename T = char> class counting_buffer : public buffer<T> {
+ private:
+  enum { buffer_size = 256 };
+  T data_[buffer_size];
+  size_t count_ = 0;
+
+  static FMT_CONSTEXPR void grow(buffer<T>& buf, size_t) {
+    if (buf.size() != buffer_size) return;
+    static_cast<counting_buffer&>(buf).count_ += buf.size();
+    buf.clear();
+  }
+
+ public:
+  counting_buffer() : buffer<T>(grow, data_, 0, buffer_size) {}
+
+  auto count() -> size_t { return count_ + this->size(); }
+};
+}  // namespace detail
+
+template <typename Char>
+FMT_CONSTEXPR void basic_format_parse_context<Char>::do_check_arg_id(int id) {
+  // Argument id is only checked at compile-time during parsing because
+  // formatting has its own validation.
+  if (detail::is_constant_evaluated() &&
+      (!FMT_GCC_VERSION || FMT_GCC_VERSION >= 1200)) {
+    using context = detail::compile_parse_context<Char>;
+    if (id >= static_cast<context*>(this)->num_args())
+      report_error("argument not found");
+  }
+}
+
+template <typename Char>
+FMT_CONSTEXPR void basic_format_parse_context<Char>::check_dynamic_spec(
+    int arg_id) {
+  if (detail::is_constant_evaluated() &&
+      (!FMT_GCC_VERSION || FMT_GCC_VERSION >= 1200)) {
+    using context = detail::compile_parse_context<Char>;
+    static_cast<context*>(this)->check_dynamic_spec(arg_id);
+  }
+}
+
+FMT_EXPORT template <typename Context> class basic_format_arg;
+FMT_EXPORT template <typename Context> class basic_format_args;
+FMT_EXPORT template <typename Context> class dynamic_format_arg_store;
+
+// A formatter for objects of type T.
+FMT_EXPORT
+template <typename T, typename Char = char, typename Enable = void>
+struct formatter {
+  // A deleted default constructor indicates a disabled formatter.
+  formatter() = delete;
+};
+
+// Specifies if T has an enabled formatter specialization. A type can be
+// formattable even if it doesn't have a formatter e.g. via a conversion.
+template <typename T, typename Context>
+using has_formatter =
+    std::is_constructible<typename Context::template formatter_type<T>>;
+
+// An output iterator that appends to a buffer. It is used instead of
+// back_insert_iterator to reduce symbol sizes and avoid <iterator> dependency.
+template <typename T> class basic_appender {
+ private:
+  detail::buffer<T>* buffer_;
+
+  friend auto get_container(basic_appender app) -> detail::buffer<T>& {
+    return *app.buffer_;
+  }
+
+ public:
+  using iterator_category = int;
+  using value_type = T;
+  using difference_type = ptrdiff_t;
+  using pointer = T*;
+  using reference = T&;
+  using container_type = detail::buffer<T>;
+  FMT_UNCHECKED_ITERATOR(basic_appender);
+
+  FMT_CONSTEXPR basic_appender(detail::buffer<T>& buf) : buffer_(&buf) {}
+
+  auto operator=(T c) -> basic_appender& {
+    buffer_->push_back(c);
+    return *this;
+  }
+  auto operator*() -> basic_appender& { return *this; }
+  auto operator++() -> basic_appender& { return *this; }
+  auto operator++(int) -> basic_appender { return *this; }
+};
+
+using appender = basic_appender<char>;
+
+namespace detail {
+template <typename T>
+struct is_back_insert_iterator<basic_appender<T>> : std::true_type {};
+
+template <typename T, typename Enable = void>
+struct locking : std::true_type {};
+template <typename T>
+struct locking<T, void_t<typename formatter<remove_cvref_t<T>>::nonlocking>>
+    : std::false_type {};
+
+template <typename T = int> FMT_CONSTEXPR inline auto is_locking() -> bool {
+  return locking<T>::value;
+}
+template <typename T1, typename T2, typename... Tail>
+FMT_CONSTEXPR inline auto is_locking() -> bool {
+  return locking<T1>::value || is_locking<T2, Tail...>();
+}
+
+// An optimized version of std::copy with the output value type (T).
+template <typename T, typename InputIt, typename OutputIt,
+          FMT_ENABLE_IF(is_back_insert_iterator<OutputIt>::value)>
+auto copy(InputIt begin, InputIt end, OutputIt out) -> OutputIt {
+  get_container(out).append(begin, end);
+  return out;
+}
+
+template <typename T, typename InputIt, typename OutputIt,
+          FMT_ENABLE_IF(!is_back_insert_iterator<OutputIt>::value)>
+FMT_CONSTEXPR auto copy(InputIt begin, InputIt end, OutputIt out) -> OutputIt {
+  while (begin != end) *out++ = static_cast<T>(*begin++);
+  return out;
+}
+
+template <typename T, typename V, typename OutputIt>
+FMT_CONSTEXPR auto copy(basic_string_view<V> s, OutputIt out) -> OutputIt {
+  return copy<T>(s.begin(), s.end(), out);
+}
+
+template <typename Context, typename T>
+constexpr auto has_const_formatter_impl(T*)
+    -> decltype(typename Context::template formatter_type<T>().format(
+                    std::declval<const T&>(), std::declval<Context&>()),
+                true) {
+  return true;
+}
+template <typename Context>
+constexpr auto has_const_formatter_impl(...) -> bool {
+  return false;
+}
+template <typename T, typename Context>
+constexpr auto has_const_formatter() -> bool {
+  return has_const_formatter_impl<Context>(static_cast<T*>(nullptr));
+}
+
+template <typename It, typename Enable = std::true_type>
+struct is_buffer_appender : std::false_type {};
+template <typename It>
+struct is_buffer_appender<
+    It, bool_constant<
+            is_back_insert_iterator<It>::value &&
+            std::is_base_of<buffer<typename It::container_type::value_type>,
+                            typename It::container_type>::value>>
+    : std::true_type {};
+
+// Maps an output iterator to a buffer.
+template <typename T, typename OutputIt,
+          FMT_ENABLE_IF(!is_buffer_appender<OutputIt>::value)>
+auto get_buffer(OutputIt out) -> iterator_buffer<OutputIt, T> {
+  return iterator_buffer<OutputIt, T>(out);
+}
+template <typename T, typename OutputIt,
+          FMT_ENABLE_IF(is_buffer_appender<OutputIt>::value)>
+auto get_buffer(OutputIt out) -> buffer<T>& {
+  return get_container(out);
+}
+
+template <typename Buf, typename OutputIt>
+auto get_iterator(Buf& buf, OutputIt) -> decltype(buf.out()) {
+  return buf.out();
+}
+template <typename T, typename OutputIt>
+auto get_iterator(buffer<T>&, OutputIt out) -> OutputIt {
+  return out;
+}
+
+struct view {};
+
+template <typename Char, typename T> struct named_arg : view {
+  const Char* name;
+  const T& value;
+  named_arg(const Char* n, const T& v) : name(n), value(v) {}
+};
+
+template <typename Char> struct named_arg_info {
+  const Char* name;
+  int id;
+};
+
+template <typename T> struct is_named_arg : std::false_type {};
+template <typename T> struct is_statically_named_arg : std::false_type {};
+
+template <typename T, typename Char>
+struct is_named_arg<named_arg<Char, T>> : std::true_type {};
+
+template <bool B = false> constexpr auto count() -> size_t { return B ? 1 : 0; }
+template <bool B1, bool B2, bool... Tail> constexpr auto count() -> size_t {
+  return (B1 ? 1 : 0) + count<B2, Tail...>();
+}
+
+template <typename... Args> constexpr auto count_named_args() -> size_t {
+  return count<is_named_arg<Args>::value...>();
+}
+
+template <typename... Args>
+constexpr auto count_statically_named_args() -> size_t {
+  return count<is_statically_named_arg<Args>::value...>();
+}
+
+struct unformattable {};
+struct unformattable_char : unformattable {};
+struct unformattable_pointer : unformattable {};
+
+template <typename Char> struct string_value {
+  const Char* data;
+  size_t size;
+};
+
+template <typename Char> struct named_arg_value {
+  const named_arg_info<Char>* data;
+  size_t size;
+};
+
+template <typename Context> struct custom_value {
+  using parse_context = typename Context::parse_context_type;
+  void* value;
+  void (*format)(void* arg, parse_context& parse_ctx, Context& ctx);
+};
+
+// A formatting argument value.
+template <typename Context> class value {
+ public:
+  using char_type = typename Context::char_type;
+
+  union {
+    monostate no_value;
+    int int_value;
+    unsigned uint_value;
+    long long long_long_value;
+    unsigned long long ulong_long_value;
+    int128_opt int128_value;
+    uint128_opt uint128_value;
+    bool bool_value;
+    char_type char_value;
+    float float_value;
+    double double_value;
+    long double long_double_value;
+    const void* pointer;
+    string_value<char_type> string;
+    custom_value<Context> custom;
+    named_arg_value<char_type> named_args;
+  };
+
+  constexpr FMT_ALWAYS_INLINE value() : no_value() {}
+  constexpr FMT_ALWAYS_INLINE value(int val) : int_value(val) {}
+  constexpr FMT_ALWAYS_INLINE value(unsigned val) : uint_value(val) {}
+  constexpr FMT_ALWAYS_INLINE value(long long val) : long_long_value(val) {}
+  constexpr FMT_ALWAYS_INLINE value(unsigned long long val)
+      : ulong_long_value(val) {}
+  FMT_ALWAYS_INLINE value(int128_opt val) : int128_value(val) {}
+  FMT_ALWAYS_INLINE value(uint128_opt val) : uint128_value(val) {}
+  constexpr FMT_ALWAYS_INLINE value(float val) : float_value(val) {}
+  constexpr FMT_ALWAYS_INLINE value(double val) : double_value(val) {}
+  FMT_ALWAYS_INLINE value(long double val) : long_double_value(val) {}
+  constexpr FMT_ALWAYS_INLINE value(bool val) : bool_value(val) {}
+  constexpr FMT_ALWAYS_INLINE value(char_type val) : char_value(val) {}
+  FMT_CONSTEXPR FMT_ALWAYS_INLINE value(const char_type* val) {
+    string.data = val;
+    if (is_constant_evaluated()) string.size = {};
+  }
+  FMT_CONSTEXPR FMT_ALWAYS_INLINE value(basic_string_view<char_type> val) {
+    string.data = val.data();
+    string.size = val.size();
+  }
+  FMT_ALWAYS_INLINE value(const void* val) : pointer(val) {}
+  FMT_ALWAYS_INLINE value(const named_arg_info<char_type>* args, size_t size)
+      : named_args{args, size} {}
+
+  template <typename T> FMT_CONSTEXPR20 FMT_ALWAYS_INLINE value(T& val) {
+    using value_type = remove_const_t<T>;
+    // T may overload operator& e.g. std::vector<bool>::reference in libc++.
+#if defined(__cpp_if_constexpr)
+    if constexpr (std::is_same<decltype(&val), T*>::value)
+      custom.value = const_cast<value_type*>(&val);
+#endif
+    if (!is_constant_evaluated())
+      custom.value = const_cast<char*>(&reinterpret_cast<const char&>(val));
+    // Get the formatter type through the context to allow different contexts
+    // have different extension points, e.g. `formatter<T>` for `format` and
+    // `printf_formatter<T>` for `printf`.
+    custom.format = format_custom_arg<
+        value_type, typename Context::template formatter_type<value_type>>;
+  }
+  value(unformattable);
+  value(unformattable_char);
+  value(unformattable_pointer);
+
+ private:
+  // Formats an argument of a custom type, such as a user-defined class.
+  template <typename T, typename Formatter>
+  static void format_custom_arg(void* arg,
+                                typename Context::parse_context_type& parse_ctx,
+                                Context& ctx) {
+    auto f = Formatter();
+    parse_ctx.advance_to(f.parse(parse_ctx));
+    using qualified_type =
+        conditional_t<has_const_formatter<T, Context>(), const T, T>;
+    // format must be const for compatibility with std::format and compilation.
+    const auto& cf = f;
+    ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+  }
+};
+
+// To minimize the number of types we need to deal with, long is translated
+// either to int or to long long depending on its size.
+enum { long_short = sizeof(long) == sizeof(int) };
+using long_type = conditional_t<long_short, int, long long>;
+using ulong_type = conditional_t<long_short, unsigned, unsigned long long>;
+
+template <typename T> struct format_as_result {
+  template <typename U,
+            FMT_ENABLE_IF(std::is_enum<U>::value || std::is_class<U>::value)>
+  static auto map(U*) -> remove_cvref_t<decltype(format_as(std::declval<U>()))>;
+  static auto map(...) -> void;
+
+  using type = decltype(map(static_cast<T*>(nullptr)));
+};
+template <typename T> using format_as_t = typename format_as_result<T>::type;
+
+template <typename T>
+struct has_format_as
+    : bool_constant<!std::is_same<format_as_t<T>, void>::value> {};
+
+#define FMT_MAP_API FMT_CONSTEXPR FMT_ALWAYS_INLINE
+
+// Maps formatting arguments to core types.
+// arg_mapper reports errors by returning unformattable instead of using
+// static_assert because it's used in the is_formattable trait.
+template <typename Context> struct arg_mapper {
+  using char_type = typename Context::char_type;
+
+  FMT_MAP_API auto map(signed char val) -> int { return val; }
+  FMT_MAP_API auto map(unsigned char val) -> unsigned { return val; }
+  FMT_MAP_API auto map(short val) -> int { return val; }
+  FMT_MAP_API auto map(unsigned short val) -> unsigned { return val; }
+  FMT_MAP_API auto map(int val) -> int { return val; }
+  FMT_MAP_API auto map(unsigned val) -> unsigned { return val; }
+  FMT_MAP_API auto map(long val) -> long_type { return val; }
+  FMT_MAP_API auto map(unsigned long val) -> ulong_type { return val; }
+  FMT_MAP_API auto map(long long val) -> long long { return val; }
+  FMT_MAP_API auto map(unsigned long long val) -> unsigned long long {
+    return val;
+  }
+  FMT_MAP_API auto map(int128_opt val) -> int128_opt { return val; }
+  FMT_MAP_API auto map(uint128_opt val) -> uint128_opt { return val; }
+  FMT_MAP_API auto map(bool val) -> bool { return val; }
+
+  template <typename T, FMT_ENABLE_IF(std::is_same<T, char>::value ||
+                                      std::is_same<T, char_type>::value)>
+  FMT_MAP_API auto map(T val) -> char_type {
+    return val;
+  }
+  template <typename T, enable_if_t<(std::is_same<T, wchar_t>::value ||
+#ifdef __cpp_char8_t
+                                     std::is_same<T, char8_t>::value ||
+#endif
+                                     std::is_same<T, char16_t>::value ||
+                                     std::is_same<T, char32_t>::value) &&
+                                        !std::is_same<T, char_type>::value,
+                                    int> = 0>
+  FMT_MAP_API auto map(T) -> unformattable_char {
+    return {};
+  }
+
+  FMT_MAP_API auto map(float val) -> float { return val; }
+  FMT_MAP_API auto map(double val) -> double { return val; }
+  FMT_MAP_API auto map(long double val) -> long double { return val; }
+
+  FMT_MAP_API auto map(char_type* val) -> const char_type* { return val; }
+  FMT_MAP_API auto map(const char_type* val) -> const char_type* { return val; }
+  template <typename T, typename Char = char_t<T>,
+            FMT_ENABLE_IF(std::is_same<Char, char_type>::value &&
+                          !std::is_pointer<T>::value)>
+  FMT_MAP_API auto map(const T& val) -> basic_string_view<Char> {
+    return to_string_view(val);
+  }
+  template <typename T, typename Char = char_t<T>,
+            FMT_ENABLE_IF(!std::is_same<Char, char_type>::value &&
+                          !std::is_pointer<T>::value)>
+  FMT_MAP_API auto map(const T&) -> unformattable_char {
+    return {};
+  }
+
+  FMT_MAP_API auto map(void* val) -> const void* { return val; }
+  FMT_MAP_API auto map(const void* val) -> const void* { return val; }
+  FMT_MAP_API auto map(volatile void* val) -> const void* {
+    return const_cast<const void*>(val);
+  }
+  FMT_MAP_API auto map(const volatile void* val) -> const void* {
+    return const_cast<const void*>(val);
+  }
+  FMT_MAP_API auto map(std::nullptr_t val) -> const void* { return val; }
+
+  // Use SFINAE instead of a const T* parameter to avoid a conflict with the
+  // array overload.
+  template <
+      typename T,
+      FMT_ENABLE_IF(
+          std::is_pointer<T>::value || std::is_member_pointer<T>::value ||
+          std::is_function<typename std::remove_pointer<T>::type>::value ||
+          (std::is_array<T>::value &&
+           !std::is_convertible<T, const char_type*>::value))>
+  FMT_CONSTEXPR auto map(const T&) -> unformattable_pointer {
+    return {};
+  }
+
+  template <typename T, std::size_t N,
+            FMT_ENABLE_IF(!std::is_same<T, wchar_t>::value)>
+  FMT_MAP_API auto map(const T (&values)[N]) -> const T (&)[N] {
+    return values;
+  }
+
+  // Only map owning types because mapping views can be unsafe.
+  template <typename T, typename U = format_as_t<T>,
+            FMT_ENABLE_IF(std::is_arithmetic<U>::value)>
+  FMT_MAP_API auto map(const T& val) -> decltype(FMT_DECLTYPE_THIS map(U())) {
+    return map(format_as(val));
+  }
+
+  template <typename T, typename U = remove_const_t<T>>
+  struct formattable : bool_constant<has_const_formatter<U, Context>() ||
+                                     (has_formatter<U, Context>::value &&
+                                      !std::is_const<T>::value)> {};
+
+  template <typename T, FMT_ENABLE_IF(formattable<T>::value)>
+  FMT_MAP_API auto do_map(T& val) -> T& {
+    return val;
+  }
+  template <typename T, FMT_ENABLE_IF(!formattable<T>::value)>
+  FMT_MAP_API auto do_map(T&) -> unformattable {
+    return {};
+  }
+
+  // is_fundamental is used to allow formatters for extended FP types.
+  template <typename T, typename U = remove_const_t<T>,
+            FMT_ENABLE_IF(
+                (std::is_class<U>::value || std::is_enum<U>::value ||
+                 std::is_union<U>::value || std::is_fundamental<U>::value) &&
+                !has_to_string_view<U>::value && !is_char<U>::value &&
+                !is_named_arg<U>::value && !std::is_integral<U>::value &&
+                !std::is_arithmetic<format_as_t<U>>::value)>
+  FMT_MAP_API auto map(T& val) -> decltype(FMT_DECLTYPE_THIS do_map(val)) {
+    return do_map(val);
+  }
+
+  template <typename T, FMT_ENABLE_IF(is_named_arg<T>::value)>
+  FMT_MAP_API auto map(const T& named_arg)
+      -> decltype(FMT_DECLTYPE_THIS map(named_arg.value)) {
+    return map(named_arg.value);
+  }
+
+  auto map(...) -> unformattable { return {}; }
+};
+
+// A type constant after applying arg_mapper<Context>.
+template <typename T, typename Context>
+using mapped_type_constant =
+    type_constant<decltype(arg_mapper<Context>().map(std::declval<const T&>())),
+                  typename Context::char_type>;
+
+enum { packed_arg_bits = 4 };
+// Maximum number of arguments with packed types.
+enum { max_packed_args = 62 / packed_arg_bits };
+enum : unsigned long long { is_unpacked_bit = 1ULL << 63 };
+enum : unsigned long long { has_named_args_bit = 1ULL << 62 };
+
+template <typename It, typename T, typename Enable = void>
+struct is_output_iterator : std::false_type {};
+
+template <> struct is_output_iterator<appender, char> : std::true_type {};
+
+template <typename It, typename T>
+struct is_output_iterator<
+    It, T, void_t<decltype(*std::declval<It&>()++ = std::declval<T>())>>
+    : std::true_type {};
+
+// A type-erased reference to an std::locale to avoid a heavy <locale> include.
+class locale_ref {
+ private:
+  const void* locale_;  // A type-erased pointer to std::locale.
+
+ public:
+  constexpr locale_ref() : locale_(nullptr) {}
+  template <typename Locale> explicit locale_ref(const Locale& loc);
+
+  explicit operator bool() const noexcept { return locale_ != nullptr; }
+
+  template <typename Locale> auto get() const -> Locale;
+};
+
+template <typename> constexpr auto encode_types() -> unsigned long long {
+  return 0;
+}
+
+template <typename Context, typename Arg, typename... Args>
+constexpr auto encode_types() -> unsigned long long {
+  return static_cast<unsigned>(mapped_type_constant<Arg, Context>::value) |
+         (encode_types<Context, Args...>() << packed_arg_bits);
+}
+
+template <typename Context, typename... T, size_t NUM_ARGS = sizeof...(T)>
+constexpr unsigned long long make_descriptor() {
+  return NUM_ARGS <= max_packed_args ? encode_types<Context, T...>()
+                                     : is_unpacked_bit | NUM_ARGS;
+}
+
+// This type is intentionally undefined, only used for errors.
+template <typename T, typename Char>
+#if FMT_CLANG_VERSION && FMT_CLANG_VERSION <= 1500
+// https://github.com/fmtlib/fmt/issues/3796
+struct type_is_unformattable_for {
+};
+#else
+struct type_is_unformattable_for;
+#endif
+
+template <bool PACKED, typename Context, typename T, FMT_ENABLE_IF(PACKED)>
+FMT_CONSTEXPR auto make_arg(T& val) -> value<Context> {
+  using arg_type = remove_cvref_t<decltype(arg_mapper<Context>().map(val))>;
+
+  // Use enum instead of constexpr because the latter may generate code.
+  enum {
+    formattable_char = !std::is_same<arg_type, unformattable_char>::value
+  };
+  static_assert(formattable_char, "Mixing character types is disallowed.");
+
+  // Formatting of arbitrary pointers is disallowed. If you want to format a
+  // pointer cast it to `void*` or `const void*`. In particular, this forbids
+  // formatting of `[const] volatile char*` printed as bool by iostreams.
+  enum {
+    formattable_pointer = !std::is_same<arg_type, unformattable_pointer>::value
+  };
+  static_assert(formattable_pointer,
+                "Formatting of non-void pointers is disallowed.");
+
+  enum { formattable = !std::is_same<arg_type, unformattable>::value };
+#if defined(__cpp_if_constexpr)
+  if constexpr (!formattable)
+    type_is_unformattable_for<T, typename Context::char_type> _;
+#endif
+  static_assert(
+      formattable,
+      "Cannot format an argument. To make type T formattable provide a "
+      "formatter<T> specialization: https://fmt.dev/latest/api.html#udt");
+  return {arg_mapper<Context>().map(val)};
+}
+
+template <typename Context, typename T>
+FMT_CONSTEXPR auto make_arg(T& val) -> basic_format_arg<Context> {
+  auto arg = basic_format_arg<Context>();
+  arg.type_ = mapped_type_constant<T, Context>::value;
+  arg.value_ = make_arg<true, Context>(val);
+  return arg;
+}
+
+template <bool PACKED, typename Context, typename T, FMT_ENABLE_IF(!PACKED)>
+FMT_CONSTEXPR inline auto make_arg(T& val) -> basic_format_arg<Context> {
+  return make_arg<Context>(val);
+}
+
+template <typename Context, size_t NUM_ARGS>
+using arg_t = conditional_t<NUM_ARGS <= max_packed_args, value<Context>,
+                            basic_format_arg<Context>>;
+
+template <typename Char, typename T, FMT_ENABLE_IF(!is_named_arg<T>::value)>
+void init_named_arg(named_arg_info<Char>*, int& arg_index, int&, const T&) {
+  ++arg_index;
+}
+template <typename Char, typename T, FMT_ENABLE_IF(is_named_arg<T>::value)>
+void init_named_arg(named_arg_info<Char>* named_args, int& arg_index,
+                    int& named_arg_index, const T& arg) {
+  named_args[named_arg_index++] = {arg.name, arg_index++};
+}
+
+// An array of references to arguments. It can be implicitly converted to
+// `fmt::basic_format_args` for passing into type-erased formatting functions
+// such as `fmt::vformat`.
+template <typename Context, size_t NUM_ARGS, size_t NUM_NAMED_ARGS,
+          unsigned long long DESC>
+struct format_arg_store {
+  // args_[0].named_args points to named_args to avoid bloating format_args.
+  // +1 to workaround a bug in gcc 7.5 that causes duplicated-branches warning.
+  static constexpr size_t ARGS_ARR_SIZE = 1 + (NUM_ARGS != 0 ? NUM_ARGS : +1);
+
+  arg_t<Context, NUM_ARGS> args[ARGS_ARR_SIZE];
+  named_arg_info<typename Context::char_type> named_args[NUM_NAMED_ARGS];
+
+  template <typename... T>
+  FMT_MAP_API format_arg_store(T&... values)
+      : args{{named_args, NUM_NAMED_ARGS},
+             make_arg<NUM_ARGS <= max_packed_args, Context>(values)...} {
+    using dummy = int[];
+    int arg_index = 0, named_arg_index = 0;
+    (void)dummy{
+        0,
+        (init_named_arg(named_args, arg_index, named_arg_index, values), 0)...};
+  }
+
+  format_arg_store(format_arg_store&& rhs) {
+    args[0] = {named_args, NUM_NAMED_ARGS};
+    for (size_t i = 1; i < ARGS_ARR_SIZE; ++i) args[i] = rhs.args[i];
+    for (size_t i = 0; i < NUM_NAMED_ARGS; ++i)
+      named_args[i] = rhs.named_args[i];
+  }
+
+  format_arg_store(const format_arg_store& rhs) = delete;
+  format_arg_store& operator=(const format_arg_store& rhs) = delete;
+  format_arg_store& operator=(format_arg_store&& rhs) = delete;
+};
+
+// A specialization of format_arg_store without named arguments.
+// It is a plain struct to reduce binary size in debug mode.
+template <typename Context, size_t NUM_ARGS, unsigned long long DESC>
+struct format_arg_store<Context, NUM_ARGS, 0, DESC> {
+  // +1 to workaround a bug in gcc 7.5 that causes duplicated-branches warning.
+  arg_t<Context, NUM_ARGS> args[NUM_ARGS != 0 ? NUM_ARGS : +1];
+};
+
+}  // namespace detail
+FMT_BEGIN_EXPORT
+
+// A formatting argument. Context is a template parameter for the compiled API
+// where output can be unbuffered.
+template <typename Context> class basic_format_arg {
+ private:
+  detail::value<Context> value_;
+  detail::type type_;
+
+  template <typename ContextType, typename T>
+  friend FMT_CONSTEXPR auto detail::make_arg(T& value)
+      -> basic_format_arg<ContextType>;
+
+  friend class basic_format_args<Context>;
+  friend class dynamic_format_arg_store<Context>;
+
+  using char_type = typename Context::char_type;
+
+  template <typename, size_t, size_t, unsigned long long>
+  friend struct detail::format_arg_store;
+
+  basic_format_arg(const detail::named_arg_info<char_type>* args, size_t size)
+      : value_(args, size) {}
+
+ public:
+  class handle {
+   public:
+    explicit handle(detail::custom_value<Context> custom) : custom_(custom) {}
+
+    void format(typename Context::parse_context_type& parse_ctx,
+                Context& ctx) const {
+      custom_.format(custom_.value, parse_ctx, ctx);
+    }
+
+   private:
+    detail::custom_value<Context> custom_;
+  };
+
+  constexpr basic_format_arg() : type_(detail::type::none_type) {}
+
+  constexpr explicit operator bool() const noexcept {
+    return type_ != detail::type::none_type;
+  }
+
+  auto type() const -> detail::type { return type_; }
+
+  auto is_integral() const -> bool { return detail::is_integral_type(type_); }
+  auto is_arithmetic() const -> bool {
+    return detail::is_arithmetic_type(type_);
+  }
+
+  /**
+   * Visits an argument dispatching to the appropriate visit method based on
+   * the argument type. For example, if the argument type is `double` then
+   * `vis(value)` will be called with the value of type `double`.
+   */
+  template <typename Visitor>
+  FMT_CONSTEXPR FMT_INLINE auto visit(Visitor&& vis) const -> decltype(vis(0)) {
+    switch (type_) {
+    case detail::type::none_type:
+      break;
+    case detail::type::int_type:
+      return vis(value_.int_value);
+    case detail::type::uint_type:
+      return vis(value_.uint_value);
+    case detail::type::long_long_type:
+      return vis(value_.long_long_value);
+    case detail::type::ulong_long_type:
+      return vis(value_.ulong_long_value);
+    case detail::type::int128_type:
+      return vis(detail::convert_for_visit(value_.int128_value));
+    case detail::type::uint128_type:
+      return vis(detail::convert_for_visit(value_.uint128_value));
+    case detail::type::bool_type:
+      return vis(value_.bool_value);
+    case detail::type::char_type:
+      return vis(value_.char_value);
+    case detail::type::float_type:
+      return vis(value_.float_value);
+    case detail::type::double_type:
+      return vis(value_.double_value);
+    case detail::type::long_double_type:
+      return vis(value_.long_double_value);
+    case detail::type::cstring_type:
+      return vis(value_.string.data);
+    case detail::type::string_type:
+      using sv = basic_string_view<typename Context::char_type>;
+      return vis(sv(value_.string.data, value_.string.size));
+    case detail::type::pointer_type:
+      return vis(value_.pointer);
+    case detail::type::custom_type:
+      return vis(typename basic_format_arg<Context>::handle(value_.custom));
+    }
+    return vis(monostate());
+  }
+
+  auto format_custom(const char_type* parse_begin,
+                     typename Context::parse_context_type& parse_ctx,
+                     Context& ctx) -> bool {
+    if (type_ != detail::type::custom_type) return false;
+    parse_ctx.advance_to(parse_begin);
+    value_.custom.format(value_.custom.value, parse_ctx, ctx);
+    return true;
+  }
+};
+
+template <typename Visitor, typename Context>
+FMT_DEPRECATED FMT_CONSTEXPR auto visit_format_arg(
+    Visitor&& vis, const basic_format_arg<Context>& arg) -> decltype(vis(0)) {
+  return arg.visit(static_cast<Visitor&&>(vis));
+}
+
+/**
+ * A view of a collection of formatting arguments. To avoid lifetime issues it
+ * should only be used as a parameter type in type-erased functions such as
+ * `vformat`:
+ *
+ *     void vlog(fmt::string_view fmt, fmt::format_args args);  // OK
+ *     fmt::format_args args = fmt::make_format_args();  // Dangling reference
+ */
+template <typename Context> class basic_format_args {
+ public:
+  using size_type = int;
+  using format_arg = basic_format_arg<Context>;
+
+ private:
+  // A descriptor that contains information about formatting arguments.
+  // If the number of arguments is less or equal to max_packed_args then
+  // argument types are passed in the descriptor. This reduces binary code size
+  // per formatting function call.
+  unsigned long long desc_;
+  union {
+    // If is_packed() returns true then argument values are stored in values_;
+    // otherwise they are stored in args_. This is done to improve cache
+    // locality and reduce compiled code size since storing larger objects
+    // may require more code (at least on x86-64) even if the same amount of
+    // data is actually copied to stack. It saves ~10% on the bloat test.
+    const detail::value<Context>* values_;
+    const format_arg* args_;
+  };
+
+  constexpr auto is_packed() const -> bool {
+    return (desc_ & detail::is_unpacked_bit) == 0;
+  }
+  constexpr auto has_named_args() const -> bool {
+    return (desc_ & detail::has_named_args_bit) != 0;
+  }
+
+  FMT_CONSTEXPR auto type(int index) const -> detail::type {
+    int shift = index * detail::packed_arg_bits;
+    unsigned int mask = (1 << detail::packed_arg_bits) - 1;
+    return static_cast<detail::type>((desc_ >> shift) & mask);
+  }
+
+ public:
+  constexpr basic_format_args() : desc_(0), args_(nullptr) {}
+
+  /// Constructs a `basic_format_args` object from `format_arg_store`.
+  template <size_t NUM_ARGS, size_t NUM_NAMED_ARGS, unsigned long long DESC,
+            FMT_ENABLE_IF(NUM_ARGS <= detail::max_packed_args)>
+  constexpr FMT_ALWAYS_INLINE basic_format_args(
+      const detail::format_arg_store<Context, NUM_ARGS, NUM_NAMED_ARGS, DESC>&
+          store)
+      : desc_(DESC), values_(store.args + (NUM_NAMED_ARGS != 0 ? 1 : 0)) {}
+
+  template <size_t NUM_ARGS, size_t NUM_NAMED_ARGS, unsigned long long DESC,
+            FMT_ENABLE_IF(NUM_ARGS > detail::max_packed_args)>
+  constexpr basic_format_args(
+      const detail::format_arg_store<Context, NUM_ARGS, NUM_NAMED_ARGS, DESC>&
+          store)
+      : desc_(DESC), args_(store.args + (NUM_NAMED_ARGS != 0 ? 1 : 0)) {}
+
+  /// Constructs a `basic_format_args` object from `dynamic_format_arg_store`.
+  constexpr basic_format_args(const dynamic_format_arg_store<Context>& store)
+      : desc_(store.get_types()), args_(store.data()) {}
+
+  /// Constructs a `basic_format_args` object from a dynamic list of arguments.
+  constexpr basic_format_args(const format_arg* args, int count)
+      : desc_(detail::is_unpacked_bit | detail::to_unsigned(count)),
+        args_(args) {}
+
+  /// Returns the argument with the specified id.
+  FMT_CONSTEXPR auto get(int id) const -> format_arg {
+    format_arg arg;
+    if (!is_packed()) {
+      if (id < max_size()) arg = args_[id];
+      return arg;
+    }
+    if (static_cast<unsigned>(id) >= detail::max_packed_args) return arg;
+    arg.type_ = type(id);
+    if (arg.type_ == detail::type::none_type) return arg;
+    arg.value_ = values_[id];
+    return arg;
+  }
+
+  template <typename Char>
+  auto get(basic_string_view<Char> name) const -> format_arg {
+    int id = get_id(name);
+    return id >= 0 ? get(id) : format_arg();
+  }
+
+  template <typename Char>
+  FMT_CONSTEXPR auto get_id(basic_string_view<Char> name) const -> int {
+    if (!has_named_args()) return -1;
+    const auto& named_args =
+        (is_packed() ? values_[-1] : args_[-1].value_).named_args;
+    for (size_t i = 0; i < named_args.size; ++i) {
+      if (named_args.data[i].name == name) return named_args.data[i].id;
+    }
+    return -1;
+  }
+
+  auto max_size() const -> int {
+    unsigned long long max_packed = detail::max_packed_args;
+    return static_cast<int>(is_packed() ? max_packed
+                                        : desc_ & ~detail::is_unpacked_bit);
+  }
+};
+
+// A formatting context.
+class context {
+ private:
+  appender out_;
+  basic_format_args<context> args_;
+  detail::locale_ref loc_;
+
+ public:
+  /// The character type for the output.
+  using char_type = char;
+
+  using iterator = appender;
+  using format_arg = basic_format_arg<context>;
+  using parse_context_type = basic_format_parse_context<char>;
+  template <typename T> using formatter_type = formatter<T, char>;
+
+  /// Constructs a `basic_format_context` object. References to the arguments
+  /// are stored in the object so make sure they have appropriate lifetimes.
+  FMT_CONSTEXPR context(iterator out, basic_format_args<context> ctx_args,
+                        detail::locale_ref loc = {})
+      : out_(out), args_(ctx_args), loc_(loc) {}
+  context(context&&) = default;
+  context(const context&) = delete;
+  void operator=(const context&) = delete;
+
+  FMT_CONSTEXPR auto arg(int id) const -> format_arg { return args_.get(id); }
+  auto arg(string_view name) -> format_arg { return args_.get(name); }
+  FMT_CONSTEXPR auto arg_id(string_view name) -> int {
+    return args_.get_id(name);
+  }
+  auto args() const -> const basic_format_args<context>& { return args_; }
+
+  // Returns an iterator to the beginning of the output range.
+  FMT_CONSTEXPR auto out() -> iterator { return out_; }
+
+  // Advances the begin iterator to `it`.
+  void advance_to(iterator) {}
+
+  FMT_CONSTEXPR auto locale() -> detail::locale_ref { return loc_; }
+};
+
+template <typename OutputIt, typename Char> class generic_context;
+
+// Longer aliases for C++20 compatibility.
+template <typename OutputIt, typename Char>
+using basic_format_context =
+    conditional_t<std::is_same<OutputIt, appender>::value, context,
+                  generic_context<OutputIt, Char>>;
+using format_context = context;
+
+template <typename Char>
+using buffered_context = basic_format_context<basic_appender<Char>, Char>;
+
+template <typename T, typename Char = char>
+using is_formattable = bool_constant<!std::is_base_of<
+    detail::unformattable, decltype(detail::arg_mapper<buffered_context<Char>>()
+                                        .map(std::declval<T&>()))>::value>;
+
+#if FMT_USE_CONCEPTS
+template <typename T, typename Char = char>
+concept formattable = is_formattable<remove_reference_t<T>, Char>::value;
+#endif
+
+/**
+ * Constructs an object that stores references to arguments and can be
+ * implicitly converted to `format_args`. `Context` can be omitted in which case
+ * it defaults to `format_context`. See `arg` for lifetime considerations.
+ */
+// Take arguments by lvalue references to avoid some lifetime issues, e.g.
+//   auto args = make_format_args(std::string());
+template <typename Context = format_context, typename... T,
+          size_t NUM_ARGS = sizeof...(T),
+          size_t NUM_NAMED_ARGS = detail::count_named_args<T...>(),
+          unsigned long long DESC = detail::make_descriptor<Context, T...>(),
+          FMT_ENABLE_IF(NUM_NAMED_ARGS == 0)>
+constexpr FMT_ALWAYS_INLINE auto make_format_args(T&... args)
+    -> detail::format_arg_store<Context, NUM_ARGS, 0, DESC> {
+  return {{detail::make_arg<NUM_ARGS <= detail::max_packed_args, Context>(
+      args)...}};
+}
+
+#ifndef FMT_DOC
+template <typename Context = format_context, typename... T,
+          size_t NUM_NAMED_ARGS = detail::count_named_args<T...>(),
+          unsigned long long DESC =
+              detail::make_descriptor<Context, T...>() |
+              static_cast<unsigned long long>(detail::has_named_args_bit),
+          FMT_ENABLE_IF(NUM_NAMED_ARGS != 0)>
+constexpr auto make_format_args(T&... args)
+    -> detail::format_arg_store<Context, sizeof...(T), NUM_NAMED_ARGS, DESC> {
+  return {args...};
+}
+#endif
+
+/**
+ * Returns a named argument to be used in a formatting function.
+ * It should only be used in a call to a formatting function or
+ * `dynamic_format_arg_store::push_back`.
+ *
+ * **Example**:
+ *
+ *     fmt::print("The answer is {answer}.", fmt::arg("answer", 42));
+ */
+template <typename Char, typename T>
+inline auto arg(const Char* name, const T& arg) -> detail::named_arg<Char, T> {
+  static_assert(!detail::is_named_arg<T>(), "nested named arguments");
+  return {name, arg};
+}
+FMT_END_EXPORT
+
+/// An alias for `basic_format_args<format_context>`.
+// A separate type would result in shorter symbols but break ABI compatibility
+// between clang and gcc on ARM (#1919).
+FMT_EXPORT using format_args = basic_format_args<format_context>;
+
+// We cannot use enum classes as bit fields because of a gcc bug, so we put them
+// in namespaces instead (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61414).
+// Additionally, if an underlying type is specified, older gcc incorrectly warns
+// that the type is too small. Both bugs are fixed in gcc 9.3.
+#if FMT_GCC_VERSION && FMT_GCC_VERSION < 903
+#  define FMT_ENUM_UNDERLYING_TYPE(type)
+#else
+#  define FMT_ENUM_UNDERLYING_TYPE(type) : type
+#endif
+namespace align {
+enum type FMT_ENUM_UNDERLYING_TYPE(unsigned char){none, left, right, center,
+                                                  numeric};
+}
+using align_t = align::type;
+namespace sign {
+enum type FMT_ENUM_UNDERLYING_TYPE(unsigned char){none, minus, plus, space};
+}
+using sign_t = sign::type;
+
+namespace detail {
+
+template <typename Char>
+using unsigned_char = typename conditional_t<std::is_integral<Char>::value,
+                                             std::make_unsigned<Char>,
+                                             type_identity<unsigned>>::type;
+
+// Character (code unit) type is erased to prevent template bloat.
+struct fill_t {
+ private:
+  enum { max_size = 4 };
+  char data_[max_size] = {' '};
+  unsigned char size_ = 1;
+
+ public:
+  template <typename Char>
+  FMT_CONSTEXPR void operator=(basic_string_view<Char> s) {
+    auto size = s.size();
+    size_ = static_cast<unsigned char>(size);
+    if (size == 1) {
+      unsigned uchar = static_cast<unsigned_char<Char>>(s[0]);
+      data_[0] = static_cast<char>(uchar);
+      data_[1] = static_cast<char>(uchar >> 8);
+      return;
+    }
+    FMT_ASSERT(size <= max_size, "invalid fill");
+    for (size_t i = 0; i < size; ++i) data_[i] = static_cast<char>(s[i]);
+  }
+
+  FMT_CONSTEXPR void operator=(char c) {
+    data_[0] = c;
+    size_ = 1;
+  }
+
+  constexpr auto size() const -> size_t { return size_; }
+
+  template <typename Char> constexpr auto get() const -> Char {
+    using uchar = unsigned char;
+    return static_cast<Char>(static_cast<uchar>(data_[0]) |
+                             (static_cast<uchar>(data_[1]) << 8));
+  }
+
+  template <typename Char, FMT_ENABLE_IF(std::is_same<Char, char>::value)>
+  constexpr auto data() const -> const Char* {
+    return data_;
+  }
+  template <typename Char, FMT_ENABLE_IF(!std::is_same<Char, char>::value)>
+  constexpr auto data() const -> const Char* {
+    return nullptr;
+  }
+};
+}  // namespace detail
+
+enum class presentation_type : unsigned char {
+  // Common specifiers:
+  none = 0,
+  debug = 1,   // '?'
+  string = 2,  // 's' (string, bool)
+
+  // Integral, bool and character specifiers:
+  dec = 3,  // 'd'
+  hex,      // 'x' or 'X'
+  oct,      // 'o'
+  bin,      // 'b' or 'B'
+  chr,      // 'c'
+
+  // String and pointer specifiers:
+  pointer = 3,  // 'p'
+
+  // Floating-point specifiers:
+  exp = 1,  // 'e' or 'E' (1 since there is no FP debug presentation)
+  fixed,    // 'f' or 'F'
+  general,  // 'g' or 'G'
+  hexfloat  // 'a' or 'A'
+};
+
+// Format specifiers for built-in and string types.
+struct format_specs {
+  int width;
+  int precision;
+  presentation_type type;
+  align_t align : 4;
+  sign_t sign : 3;
+  bool upper : 1;  // An uppercase version e.g. 'X' for 'x'.
+  bool alt : 1;    // Alternate form ('#').
+  bool localized : 1;
+  detail::fill_t fill;
+
+  constexpr format_specs()
+      : width(0),
+        precision(-1),
+        type(presentation_type::none),
+        align(align::none),
+        sign(sign::none),
+        upper(false),
+        alt(false),
+        localized(false) {}
+};
+
+namespace detail {
+
+enum class arg_id_kind { none, index, name };
+
+// An argument reference.
+template <typename Char> struct arg_ref {
+  FMT_CONSTEXPR arg_ref() : kind(arg_id_kind::none), val() {}
+
+  FMT_CONSTEXPR explicit arg_ref(int index)
+      : kind(arg_id_kind::index), val(index) {}
+  FMT_CONSTEXPR explicit arg_ref(basic_string_view<Char> name)
+      : kind(arg_id_kind::name), val(name) {}
+
+  FMT_CONSTEXPR auto operator=(int idx) -> arg_ref& {
+    kind = arg_id_kind::index;
+    val.index = idx;
+    return *this;
+  }
+
+  arg_id_kind kind;
+  union value {
+    FMT_CONSTEXPR value(int idx = 0) : index(idx) {}
+    FMT_CONSTEXPR value(basic_string_view<Char> n) : name(n) {}
+
+    int index;
+    basic_string_view<Char> name;
+  } val;
+};
+
+// Format specifiers with width and precision resolved at formatting rather
+// than parsing time to allow reusing the same parsed specifiers with
+// different sets of arguments (precompilation of format strings).
+template <typename Char = char> struct dynamic_format_specs : format_specs {
+  arg_ref<Char> width_ref;
+  arg_ref<Char> precision_ref;
+};
+
+// Converts a character to ASCII. Returns '\0' on conversion failure.
+template <typename Char, FMT_ENABLE_IF(std::is_integral<Char>::value)>
+constexpr auto to_ascii(Char c) -> char {
+  return c <= 0xff ? static_cast<char>(c) : '\0';
+}
+
+// Returns the number of code units in a code point or 1 on error.
+template <typename Char>
+FMT_CONSTEXPR auto code_point_length(const Char* begin) -> int {
+  if (const_check(sizeof(Char) != 1)) return 1;
+  auto c = static_cast<unsigned char>(*begin);
+  return static_cast<int>((0x3a55000000000000ull >> (2 * (c >> 3))) & 0x3) + 1;
+}
+
+// Return the result via the out param to workaround gcc bug 77539.
+template <bool IS_CONSTEXPR, typename T, typename Ptr = const T*>
+FMT_CONSTEXPR auto find(Ptr first, Ptr last, T value, Ptr& out) -> bool {
+  for (out = first; out != last; ++out) {
+    if (*out == value) return true;
+  }
+  return false;
+}
+
+template <>
+inline auto find<false, char>(const char* first, const char* last, char value,
+                              const char*& out) -> bool {
+  out =
+      static_cast<const char*>(memchr(first, value, to_unsigned(last - first)));
+  return out != nullptr;
+}
+
+// Parses the range [begin, end) as an unsigned integer. This function assumes
+// that the range is non-empty and the first character is a digit.
+template <typename Char>
+FMT_CONSTEXPR auto parse_nonnegative_int(const Char*& begin, const Char* end,
+                                         int error_value) noexcept -> int {
+  FMT_ASSERT(begin != end && '0' <= *begin && *begin <= '9', "");
+  unsigned value = 0, prev = 0;
+  auto p = begin;
+  do {
+    prev = value;
+    value = value * 10 + unsigned(*p - '0');
+    ++p;
+  } while (p != end && '0' <= *p && *p <= '9');
+  auto num_digits = p - begin;
+  begin = p;
+  int digits10 = static_cast<int>(sizeof(int) * CHAR_BIT * 3 / 10);
+  if (num_digits <= digits10) return static_cast<int>(value);
+  // Check for overflow.
+  unsigned max = INT_MAX;
+  return num_digits == digits10 + 1 &&
+                 prev * 10ull + unsigned(p[-1] - '0') <= max
+             ? static_cast<int>(value)
+             : error_value;
+}
+
+FMT_CONSTEXPR inline auto parse_align(char c) -> align_t {
+  switch (c) {
+  case '<':
+    return align::left;
+  case '>':
+    return align::right;
+  case '^':
+    return align::center;
+  }
+  return align::none;
+}
+
+template <typename Char> constexpr auto is_name_start(Char c) -> bool {
+  return ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || c == '_';
+}
+
+template <typename Char, typename Handler>
+FMT_CONSTEXPR auto do_parse_arg_id(const Char* begin, const Char* end,
+                                   Handler&& handler) -> const Char* {
+  Char c = *begin;
+  if (c >= '0' && c <= '9') {
+    int index = 0;
+    if (c != '0')
+      index = parse_nonnegative_int(begin, end, INT_MAX);
+    else
+      ++begin;
+    if (begin == end || (*begin != '}' && *begin != ':'))
+      report_error("invalid format string");
+    else
+      handler.on_index(index);
+    return begin;
+  }
+  if (!is_name_start(c)) {
+    report_error("invalid format string");
+    return begin;
+  }
+  auto it = begin;
+  do {
+    ++it;
+  } while (it != end && (is_name_start(*it) || ('0' <= *it && *it <= '9')));
+  handler.on_name({begin, to_unsigned(it - begin)});
+  return it;
+}
+
+template <typename Char, typename Handler>
+FMT_CONSTEXPR auto parse_arg_id(const Char* begin, const Char* end,
+                                Handler&& handler) -> const Char* {
+  FMT_ASSERT(begin != end, "");
+  Char c = *begin;
+  if (c != '}' && c != ':') return do_parse_arg_id(begin, end, handler);
+  handler.on_auto();
+  return begin;
+}
+
+template <typename Char> struct dynamic_spec_id_handler {
+  basic_format_parse_context<Char>& ctx;
+  arg_ref<Char>& ref;
+
+  FMT_CONSTEXPR void on_auto() {
+    int id = ctx.next_arg_id();
+    ref = arg_ref<Char>(id);
+    ctx.check_dynamic_spec(id);
+  }
+  FMT_CONSTEXPR void on_index(int id) {
+    ref = arg_ref<Char>(id);
+    ctx.check_arg_id(id);
+    ctx.check_dynamic_spec(id);
+  }
+  FMT_CONSTEXPR void on_name(basic_string_view<Char> id) {
+    ref = arg_ref<Char>(id);
+    ctx.check_arg_id(id);
+  }
+};
+
+// Parses [integer | "{" [arg_id] "}"].
+template <typename Char>
+FMT_CONSTEXPR auto parse_dynamic_spec(const Char* begin, const Char* end,
+                                      int& value, arg_ref<Char>& ref,
+                                      basic_format_parse_context<Char>& ctx)
+    -> const Char* {
+  FMT_ASSERT(begin != end, "");
+  if ('0' <= *begin && *begin <= '9') {
+    int val = parse_nonnegative_int(begin, end, -1);
+    if (val != -1)
+      value = val;
+    else
+      report_error("number is too big");
+  } else if (*begin == '{') {
+    ++begin;
+    auto handler = dynamic_spec_id_handler<Char>{ctx, ref};
+    if (begin != end) begin = parse_arg_id(begin, end, handler);
+    if (begin != end && *begin == '}') return ++begin;
+    report_error("invalid format string");
+  }
+  return begin;
+}
+
+template <typename Char>
+FMT_CONSTEXPR auto parse_precision(const Char* begin, const Char* end,
+                                   int& value, arg_ref<Char>& ref,
+                                   basic_format_parse_context<Char>& ctx)
+    -> const Char* {
+  ++begin;
+  if (begin == end || *begin == '}') {
+    report_error("invalid precision");
+    return begin;
+  }
+  return parse_dynamic_spec(begin, end, value, ref, ctx);
+}
+
+enum class state { start, align, sign, hash, zero, width, precision, locale };
+
+// Parses standard format specifiers.
+template <typename Char>
+FMT_CONSTEXPR auto parse_format_specs(const Char* begin, const Char* end,
+                                      dynamic_format_specs<Char>& specs,
+                                      basic_format_parse_context<Char>& ctx,
+                                      type arg_type) -> const Char* {
+  auto c = '\0';
+  if (end - begin > 1) {
+    auto next = to_ascii(begin[1]);
+    c = parse_align(next) == align::none ? to_ascii(*begin) : '\0';
+  } else {
+    if (begin == end) return begin;
+    c = to_ascii(*begin);
+  }
+
+  struct {
+    state current_state = state::start;
+    FMT_CONSTEXPR void operator()(state s, bool valid = true) {
+      if (current_state >= s || !valid)
+        report_error("invalid format specifier");
+      current_state = s;
+    }
+  } enter_state;
+
+  using pres = presentation_type;
+  constexpr auto integral_set = sint_set | uint_set | bool_set | char_set;
+  struct {
+    const Char*& begin;
+    dynamic_format_specs<Char>& specs;
+    type arg_type;
+
+    FMT_CONSTEXPR auto operator()(pres pres_type, int set) -> const Char* {
+      if (!in(arg_type, set)) {
+        if (arg_type == type::none_type) return begin;
+        report_error("invalid format specifier");
+      }
+      specs.type = pres_type;
+      return begin + 1;
+    }
+  } parse_presentation_type{begin, specs, arg_type};
+
+  for (;;) {
+    switch (c) {
+    case '<':
+    case '>':
+    case '^':
+      enter_state(state::align);
+      specs.align = parse_align(c);
+      ++begin;
+      break;
+    case '+':
+    case '-':
+    case ' ':
+      if (arg_type == type::none_type) return begin;
+      enter_state(state::sign, in(arg_type, sint_set | float_set));
+      switch (c) {
+      case '+':
+        specs.sign = sign::plus;
+        break;
+      case '-':
+        specs.sign = sign::minus;
+        break;
+      case ' ':
+        specs.sign = sign::space;
+        break;
+      }
+      ++begin;
+      break;
+    case '#':
+      if (arg_type == type::none_type) return begin;
+      enter_state(state::hash, is_arithmetic_type(arg_type));
+      specs.alt = true;
+      ++begin;
+      break;
+    case '0':
+      enter_state(state::zero);
+      if (!is_arithmetic_type(arg_type)) {
+        if (arg_type == type::none_type) return begin;
+        report_error("format specifier requires numeric argument");
+      }
+      if (specs.align == align::none) {
+        // Ignore 0 if align is specified for compatibility with std::format.
+        specs.align = align::numeric;
+        specs.fill = '0';
+      }
+      ++begin;
+      break;
+    case '1':
+    case '2':
+    case '3':
+    case '4':
+    case '5':
+    case '6':
+    case '7':
+    case '8':
+    case '9':
+    case '{':
+      enter_state(state::width);
+      begin = parse_dynamic_spec(begin, end, specs.width, specs.width_ref, ctx);
+      break;
+    case '.':
+      if (arg_type == type::none_type) return begin;
+      enter_state(state::precision,
+                  in(arg_type, float_set | string_set | cstring_set));
+      begin = parse_precision(begin, end, specs.precision, specs.precision_ref,
+                              ctx);
+      break;
+    case 'L':
+      if (arg_type == type::none_type) return begin;
+      enter_state(state::locale, is_arithmetic_type(arg_type));
+      specs.localized = true;
+      ++begin;
+      break;
+    case 'd':
+      return parse_presentation_type(pres::dec, integral_set);
+    case 'X':
+      specs.upper = true;
+      FMT_FALLTHROUGH;
+    case 'x':
+      return parse_presentation_type(pres::hex, integral_set);
+    case 'o':
+      return parse_presentation_type(pres::oct, integral_set);
+    case 'B':
+      specs.upper = true;
+      FMT_FALLTHROUGH;
+    case 'b':
+      return parse_presentation_type(pres::bin, integral_set);
+    case 'E':
+      specs.upper = true;
+      FMT_FALLTHROUGH;
+    case 'e':
+      return parse_presentation_type(pres::exp, float_set);
+    case 'F':
+      specs.upper = true;
+      FMT_FALLTHROUGH;
+    case 'f':
+      return parse_presentation_type(pres::fixed, float_set);
+    case 'G':
+      specs.upper = true;
+      FMT_FALLTHROUGH;
+    case 'g':
+      return parse_presentation_type(pres::general, float_set);
+    case 'A':
+      specs.upper = true;
+      FMT_FALLTHROUGH;
+    case 'a':
+      return parse_presentation_type(pres::hexfloat, float_set);
+    case 'c':
+      if (arg_type == type::bool_type) report_error("invalid format specifier");
+      return parse_presentation_type(pres::chr, integral_set);
+    case 's':
+      return parse_presentation_type(pres::string,
+                                     bool_set | string_set | cstring_set);
+    case 'p':
+      return parse_presentation_type(pres::pointer, pointer_set | cstring_set);
+    case '?':
+      return parse_presentation_type(pres::debug,
+                                     char_set | string_set | cstring_set);
+    case '}':
+      return begin;
+    default: {
+      if (*begin == '}') return begin;
+      // Parse fill and alignment.
+      auto fill_end = begin + code_point_length(begin);
+      if (end - fill_end <= 0) {
+        report_error("invalid format specifier");
+        return begin;
+      }
+      if (*begin == '{') {
+        report_error("invalid fill character '{'");
+        return begin;
+      }
+      auto align = parse_align(to_ascii(*fill_end));
+      enter_state(state::align, align != align::none);
+      specs.fill =
+          basic_string_view<Char>(begin, to_unsigned(fill_end - begin));
+      specs.align = align;
+      begin = fill_end + 1;
+    }
+    }
+    if (begin == end) return begin;
+    c = to_ascii(*begin);
+  }
+}
+
+template <typename Char, typename Handler>
+FMT_CONSTEXPR auto parse_replacement_field(const Char* begin, const Char* end,
+                                           Handler&& handler) -> const Char* {
+  struct id_adapter {
+    Handler& handler;
+    int arg_id;
+
+    FMT_CONSTEXPR void on_auto() { arg_id = handler.on_arg_id(); }
+    FMT_CONSTEXPR void on_index(int id) { arg_id = handler.on_arg_id(id); }
+    FMT_CONSTEXPR void on_name(basic_string_view<Char> id) {
+      arg_id = handler.on_arg_id(id);
+    }
+  };
+
+  ++begin;
+  if (begin == end) return handler.on_error("invalid format string"), end;
+  if (*begin == '}') {
+    handler.on_replacement_field(handler.on_arg_id(), begin);
+  } else if (*begin == '{') {
+    handler.on_text(begin, begin + 1);
+  } else {
+    auto adapter = id_adapter{handler, 0};
+    begin = parse_arg_id(begin, end, adapter);
+    Char c = begin != end ? *begin : Char();
+    if (c == '}') {
+      handler.on_replacement_field(adapter.arg_id, begin);
+    } else if (c == ':') {
+      begin = handler.on_format_specs(adapter.arg_id, begin + 1, end);
+      if (begin == end || *begin != '}')
+        return handler.on_error("unknown format specifier"), end;
+    } else {
+      return handler.on_error("missing '}' in format string"), end;
+    }
+  }
+  return begin + 1;
+}
+
+template <bool IS_CONSTEXPR, typename Char, typename Handler>
+FMT_CONSTEXPR void parse_format_string(basic_string_view<Char> format_str,
+                                       Handler&& handler) {
+  auto begin = format_str.data();
+  auto end = begin + format_str.size();
+  if (end - begin < 32) {
+    // Use a simple loop instead of memchr for small strings.
+    const Char* p = begin;
+    while (p != end) {
+      auto c = *p++;
+      if (c == '{') {
+        handler.on_text(begin, p - 1);
+        begin = p = parse_replacement_field(p - 1, end, handler);
+      } else if (c == '}') {
+        if (p == end || *p != '}')
+          return handler.on_error("unmatched '}' in format string");
+        handler.on_text(begin, p);
+        begin = ++p;
+      }
+    }
+    handler.on_text(begin, end);
+    return;
+  }
+  struct writer {
+    FMT_CONSTEXPR void operator()(const Char* from, const Char* to) {
+      if (from == to) return;
+      for (;;) {
+        const Char* p = nullptr;
+        if (!find<IS_CONSTEXPR>(from, to, Char('}'), p))
+          return handler_.on_text(from, to);
+        ++p;
+        if (p == to || *p != '}')
+          return handler_.on_error("unmatched '}' in format string");
+        handler_.on_text(from, p);
+        from = p + 1;
+      }
+    }
+    Handler& handler_;
+  } write = {handler};
+  while (begin != end) {
+    // Doing two passes with memchr (one for '{' and another for '}') is up to
+    // 2.5x faster than the naive one-pass implementation on big format strings.
+    const Char* p = begin;
+    if (*begin != '{' && !find<IS_CONSTEXPR>(begin + 1, end, Char('{'), p))
+      return write(begin, end);
+    write(begin, p);
+    begin = parse_replacement_field(p, end, handler);
+  }
+}
+
+template <typename T, bool = is_named_arg<T>::value> struct strip_named_arg {
+  using type = T;
+};
+template <typename T> struct strip_named_arg<T, true> {
+  using type = remove_cvref_t<decltype(T::value)>;
+};
+
+template <typename T, typename ParseContext>
+FMT_VISIBILITY("hidden")  // Suppress an ld warning on macOS (#3769).
+FMT_CONSTEXPR auto parse_format_specs(ParseContext& ctx)
+    -> decltype(ctx.begin()) {
+  using char_type = typename ParseContext::char_type;
+  using context = buffered_context<char_type>;
+  using mapped_type = conditional_t<
+      mapped_type_constant<T, context>::value != type::custom_type,
+      decltype(arg_mapper<context>().map(std::declval<const T&>())),
+      typename strip_named_arg<T>::type>;
+#if defined(__cpp_if_constexpr)
+  if constexpr (std::is_default_constructible<
+                    formatter<mapped_type, char_type>>::value) {
+    return formatter<mapped_type, char_type>().parse(ctx);
+  } else {
+    type_is_unformattable_for<T, char_type> _;
+    return ctx.begin();
+  }
+#else
+  return formatter<mapped_type, char_type>().parse(ctx);
+#endif
+}
+
+// Checks char specs and returns true iff the presentation type is char-like.
+FMT_CONSTEXPR inline auto check_char_specs(const format_specs& specs) -> bool {
+  if (specs.type != presentation_type::none &&
+      specs.type != presentation_type::chr &&
+      specs.type != presentation_type::debug) {
+    return false;
+  }
+  if (specs.align == align::numeric || specs.sign != sign::none || specs.alt)
+    report_error("invalid format specifier for char");
+  return true;
+}
+
+#if FMT_USE_NONTYPE_TEMPLATE_ARGS
+template <int N, typename T, typename... Args, typename Char>
+constexpr auto get_arg_index_by_name(basic_string_view<Char> name) -> int {
+  if constexpr (is_statically_named_arg<T>()) {
+    if (name == T::name) return N;
+  }
+  if constexpr (sizeof...(Args) > 0)
+    return get_arg_index_by_name<N + 1, Args...>(name);
+  (void)name;  // Workaround an MSVC bug about "unused" parameter.
+  return -1;
+}
+#endif
+
+template <typename... Args, typename Char>
+FMT_CONSTEXPR auto get_arg_index_by_name(basic_string_view<Char> name) -> int {
+#if FMT_USE_NONTYPE_TEMPLATE_ARGS
+  if constexpr (sizeof...(Args) > 0)
+    return get_arg_index_by_name<0, Args...>(name);
+#endif
+  (void)name;
+  return -1;
+}
+
+template <typename Char, typename... Args> class format_string_checker {
+ private:
+  using parse_context_type = compile_parse_context<Char>;
+  static constexpr int num_args = sizeof...(Args);
+
+  // Format specifier parsing function.
+  // In the future basic_format_parse_context will replace compile_parse_context
+  // here and will use is_constant_evaluated and downcasting to access the data
+  // needed for compile-time checks: https://godbolt.org/z/GvWzcTjh1.
+  using parse_func = const Char* (*)(parse_context_type&);
+
+  type types_[num_args > 0 ? static_cast<size_t>(num_args) : 1];
+  parse_context_type context_;
+  parse_func parse_funcs_[num_args > 0 ? static_cast<size_t>(num_args) : 1];
+
+ public:
+  explicit FMT_CONSTEXPR format_string_checker(basic_string_view<Char> fmt)
+      : types_{mapped_type_constant<Args, buffered_context<Char>>::value...},
+        context_(fmt, num_args, types_),
+        parse_funcs_{&parse_format_specs<Args, parse_context_type>...} {}
+
+  FMT_CONSTEXPR void on_text(const Char*, const Char*) {}
+
+  FMT_CONSTEXPR auto on_arg_id() -> int { return context_.next_arg_id(); }
+  FMT_CONSTEXPR auto on_arg_id(int id) -> int {
+    return context_.check_arg_id(id), id;
+  }
+  FMT_CONSTEXPR auto on_arg_id(basic_string_view<Char> id) -> int {
+#if FMT_USE_NONTYPE_TEMPLATE_ARGS
+    auto index = get_arg_index_by_name<Args...>(id);
+    if (index < 0) on_error("named argument is not found");
+    return index;
+#else
+    (void)id;
+    on_error("compile-time checks for named arguments require C++20 support");
+    return 0;
+#endif
+  }
+
+  FMT_CONSTEXPR void on_replacement_field(int id, const Char* begin) {
+    on_format_specs(id, begin, begin);  // Call parse() on empty specs.
+  }
+
+  FMT_CONSTEXPR auto on_format_specs(int id, const Char* begin, const Char*)
+      -> const Char* {
+    context_.advance_to(begin);
+    // id >= 0 check is a workaround for gcc 10 bug (#2065).
+    return id >= 0 && id < num_args ? parse_funcs_[id](context_) : begin;
+  }
+
+  FMT_NORETURN FMT_CONSTEXPR void on_error(const char* message) {
+    report_error(message);
+  }
+};
+
+// A base class for compile-time strings.
+struct compile_string {};
+
+template <typename S>
+using is_compile_string = std::is_base_of<compile_string, S>;
+
+// Reports a compile-time error if S is not a valid format string.
+template <typename..., typename S, FMT_ENABLE_IF(!is_compile_string<S>::value)>
+FMT_ALWAYS_INLINE void check_format_string(const S&) {
+#ifdef FMT_ENFORCE_COMPILE_STRING
+  static_assert(is_compile_string<S>::value,
+                "FMT_ENFORCE_COMPILE_STRING requires all format strings to use "
+                "FMT_STRING.");
+#endif
+}
+template <typename... Args, typename S,
+          FMT_ENABLE_IF(is_compile_string<S>::value)>
+void check_format_string(S format_str) {
+  using char_t = typename S::char_type;
+  FMT_CONSTEXPR auto s = basic_string_view<char_t>(format_str);
+  using checker = format_string_checker<char_t, remove_cvref_t<Args>...>;
+  FMT_CONSTEXPR bool error = (parse_format_string<true>(s, checker(s)), true);
+  ignore_unused(error);
+}
+
+// Report truncation to prevent silent data loss.
+inline void report_truncation(bool truncated) {
+  if (truncated) report_error("output is truncated");
+}
+
+// Use vformat_args and avoid type_identity to keep symbols short and workaround
+// a GCC <= 4.8 bug.
+template <typename Char = char> struct vformat_args {
+  using type = basic_format_args<buffered_context<Char>>;
+};
+template <> struct vformat_args<char> {
+  using type = format_args;
+};
+
+template <typename Char>
+void vformat_to(buffer<Char>& buf, basic_string_view<Char> fmt,
+                typename vformat_args<Char>::type args, locale_ref loc = {});
+
+FMT_API void vprint_mojibake(FILE*, string_view, format_args, bool = false);
+#ifndef _WIN32
+inline void vprint_mojibake(FILE*, string_view, format_args, bool) {}
+#endif
+
+template <typename T, typename Char, type TYPE> struct native_formatter {
+ private:
+  dynamic_format_specs<Char> specs_;
+
+ public:
+  using nonlocking = void;
+
+  template <typename ParseContext>
+  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> const Char* {
+    if (ctx.begin() == ctx.end() || *ctx.begin() == '}') return ctx.begin();
+    auto end = parse_format_specs(ctx.begin(), ctx.end(), specs_, ctx, TYPE);
+    if (const_check(TYPE == type::char_type)) check_char_specs(specs_);
+    return end;
+  }
+
+  template <type U = TYPE,
+            FMT_ENABLE_IF(U == type::string_type || U == type::cstring_type ||
+                          U == type::char_type)>
+  FMT_CONSTEXPR void set_debug_format(bool set = true) {
+    specs_.type = set ? presentation_type::debug : presentation_type::none;
+  }
+
+  template <typename FormatContext>
+  FMT_CONSTEXPR auto format(const T& val, FormatContext& ctx) const
+      -> decltype(ctx.out());
+};
+}  // namespace detail
+
+FMT_BEGIN_EXPORT
+
+// A formatter specialization for natively supported types.
+template <typename T, typename Char>
+struct formatter<T, Char,
+                 enable_if_t<detail::type_constant<T, Char>::value !=
+                             detail::type::custom_type>>
+    : detail::native_formatter<T, Char, detail::type_constant<T, Char>::value> {
+};
+
+template <typename Char = char> struct runtime_format_string {
+  basic_string_view<Char> str;
+};
+
+/// A compile-time format string.
+template <typename Char, typename... Args> class basic_format_string {
+ private:
+  basic_string_view<Char> str_;
+
+ public:
+  template <
+      typename S,
+      FMT_ENABLE_IF(
+          std::is_convertible<const S&, basic_string_view<Char>>::value ||
+          (detail::is_compile_string<S>::value &&
+           std::is_constructible<basic_string_view<Char>, const S&>::value))>
+  FMT_CONSTEVAL FMT_ALWAYS_INLINE basic_format_string(const S& s) : str_(s) {
+    static_assert(
+        detail::count<
+            (std::is_base_of<detail::view, remove_reference_t<Args>>::value &&
+             std::is_reference<Args>::value)...>() == 0,
+        "passing views as lvalues is disallowed");
+#if FMT_USE_CONSTEVAL
+    if constexpr (detail::count_named_args<Args...>() ==
+                  detail::count_statically_named_args<Args...>()) {
+      using checker =
+          detail::format_string_checker<Char, remove_cvref_t<Args>...>;
+      detail::parse_format_string<true>(str_, checker(s));
+    }
+#else
+    detail::check_format_string<Args...>(s);
+#endif
+  }
+  basic_format_string(runtime_format_string<Char> fmt) : str_(fmt.str) {}
+
+  FMT_ALWAYS_INLINE operator basic_string_view<Char>() const { return str_; }
+  auto get() const -> basic_string_view<Char> { return str_; }
+};
+
+#if FMT_GCC_VERSION && FMT_GCC_VERSION < 409
+// Workaround broken conversion on older gcc.
+template <typename...> using format_string = string_view;
+inline auto runtime(string_view s) -> string_view { return s; }
+#else
+template <typename... Args>
+using format_string = basic_format_string<char, type_identity_t<Args>...>;
+/**
+ * Creates a runtime format string.
+ *
+ * **Example**:
+ *
+ *     // Check format string at runtime instead of compile-time.
+ *     fmt::print(fmt::runtime("{:d}"), "I am not a number");
+ */
+inline auto runtime(string_view s) -> runtime_format_string<> { return {{s}}; }
+#endif
+
+/// Formats a string and writes the output to `out`.
+template <typename OutputIt,
+          FMT_ENABLE_IF(detail::is_output_iterator<remove_cvref_t<OutputIt>,
+                                                   char>::value)>
+auto vformat_to(OutputIt&& out, string_view fmt, format_args args)
+    -> remove_cvref_t<OutputIt> {
+  auto&& buf = detail::get_buffer<char>(out);
+  detail::vformat_to(buf, fmt, args, {});
+  return detail::get_iterator(buf, out);
+}
+
+/**
+ * Formats `args` according to specifications in `fmt`, writes the result to
+ * the output iterator `out` and returns the iterator past the end of the output
+ * range. `format_to` does not append a terminating null character.
+ *
+ * **Example**:
+ *
+ *     auto out = std::vector<char>();
+ *     fmt::format_to(std::back_inserter(out), "{}", 42);
+ */
+template <typename OutputIt, typename... T,
+          FMT_ENABLE_IF(detail::is_output_iterator<remove_cvref_t<OutputIt>,
+                                                   char>::value)>
+FMT_INLINE auto format_to(OutputIt&& out, format_string<T...> fmt, T&&... args)
+    -> remove_cvref_t<OutputIt> {
+  return vformat_to(FMT_FWD(out), fmt, fmt::make_format_args(args...));
+}
+
+template <typename OutputIt> struct format_to_n_result {
+  /// Iterator past the end of the output range.
+  OutputIt out;
+  /// Total (not truncated) output size.
+  size_t size;
+};
+
+template <typename OutputIt, typename... T,
+          FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, char>::value)>
+auto vformat_to_n(OutputIt out, size_t n, string_view fmt, format_args args)
+    -> format_to_n_result<OutputIt> {
+  using traits = detail::fixed_buffer_traits;
+  auto buf = detail::iterator_buffer<OutputIt, char, traits>(out, n);
+  detail::vformat_to(buf, fmt, args, {});
+  return {buf.out(), buf.count()};
+}
+
+/**
+ * Formats `args` according to specifications in `fmt`, writes up to `n`
+ * characters of the result to the output iterator `out` and returns the total
+ * (not truncated) output size and the iterator past the end of the output
+ * range. `format_to_n` does not append a terminating null character.
+ */
+template <typename OutputIt, typename... T,
+          FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, char>::value)>
+FMT_INLINE auto format_to_n(OutputIt out, size_t n, format_string<T...> fmt,
+                            T&&... args) -> format_to_n_result<OutputIt> {
+  return vformat_to_n(out, n, fmt, fmt::make_format_args(args...));
+}
+
+template <typename OutputIt, typename Sentinel = OutputIt>
+struct format_to_result {
+  /// Iterator pointing to just after the last successful write in the range.
+  OutputIt out;
+  /// Specifies if the output was truncated.
+  bool truncated;
+
+  FMT_CONSTEXPR operator OutputIt&() & {
+    detail::report_truncation(truncated);
+    return out;
+  }
+  FMT_CONSTEXPR operator const OutputIt&() const& {
+    detail::report_truncation(truncated);
+    return out;
+  }
+  FMT_CONSTEXPR operator OutputIt&&() && {
+    detail::report_truncation(truncated);
+    return static_cast<OutputIt&&>(out);
+  }
+};
+
+template <size_t N>
+auto vformat_to(char (&out)[N], string_view fmt, format_args args)
+    -> format_to_result<char*> {
+  auto result = vformat_to_n(out, N, fmt, args);
+  return {result.out, result.size > N};
+}
+
+template <size_t N, typename... T>
+FMT_INLINE auto format_to(char (&out)[N], format_string<T...> fmt, T&&... args)
+    -> format_to_result<char*> {
+  auto result = fmt::format_to_n(out, N, fmt, static_cast<T&&>(args)...);
+  return {result.out, result.size > N};
+}
+
+/// Returns the number of chars in the output of `format(fmt, args...)`.
+template <typename... T>
+FMT_NODISCARD FMT_INLINE auto formatted_size(format_string<T...> fmt,
+                                             T&&... args) -> size_t {
+  auto buf = detail::counting_buffer<>();
+  detail::vformat_to<char>(buf, fmt, fmt::make_format_args(args...), {});
+  return buf.count();
+}
+
+FMT_API void vprint(string_view fmt, format_args args);
+FMT_API void vprint(FILE* f, string_view fmt, format_args args);
+FMT_API void vprint_buffered(FILE* f, string_view fmt, format_args args);
+FMT_API void vprintln(FILE* f, string_view fmt, format_args args);
+
+/**
+ * Formats `args` according to specifications in `fmt` and writes the output
+ * to `stdout`.
+ *
+ * **Example**:
+ *
+ *     fmt::print("The answer is {}.", 42);
+ */
+template <typename... T>
+FMT_INLINE void print(format_string<T...> fmt, T&&... args) {
+  const auto& vargs = fmt::make_format_args(args...);
+  if (!detail::use_utf8()) return detail::vprint_mojibake(stdout, fmt, vargs);
+  return detail::is_locking<T...>() ? vprint_buffered(stdout, fmt, vargs)
+                                    : vprint(fmt, vargs);
+}
+
+/**
+ * Formats `args` according to specifications in `fmt` and writes the
+ * output to the file `f`.
+ *
+ * **Example**:
+ *
+ *     fmt::print(stderr, "Don't {}!", "panic");
+ */
+template <typename... T>
+FMT_INLINE void print(FILE* f, format_string<T...> fmt, T&&... args) {
+  const auto& vargs = fmt::make_format_args(args...);
+  if (!detail::use_utf8()) return detail::vprint_mojibake(f, fmt, vargs);
+  return detail::is_locking<T...>() ? vprint_buffered(f, fmt, vargs)
+                                    : vprint(f, fmt, vargs);
+}
+
+/// Formats `args` according to specifications in `fmt` and writes the output
+/// to the file `f` followed by a newline.
+template <typename... T>
+FMT_INLINE void println(FILE* f, format_string<T...> fmt, T&&... args) {
+  const auto& vargs = fmt::make_format_args(args...);
+  return detail::use_utf8() ? vprintln(f, fmt, vargs)
+                            : detail::vprint_mojibake(f, fmt, vargs, true);
+}
+
+/// Formats `args` according to specifications in `fmt` and writes the output
+/// to `stdout` followed by a newline.
+template <typename... T>
+FMT_INLINE void println(format_string<T...> fmt, T&&... args) {
+  return fmt::println(stdout, fmt, static_cast<T&&>(args)...);
+}
+
+FMT_END_EXPORT
+FMT_GCC_PRAGMA("GCC pop_options")
+FMT_END_NAMESPACE
+
+#ifdef FMT_HEADER_ONLY
+#  include "format.h"
+#endif
+#endif  // FMT_BASE_H_
diff --git a/contrib/fmt/include/fmt/chrono.h b/contrib/fmt/include/fmt/chrono.h
index 9d54574e1..c93123fd3 100644
--- a/contrib/fmt/include/fmt/chrono.h
+++ b/contrib/fmt/include/fmt/chrono.h
@@ -8,17 +8,19 @@
 #ifndef FMT_CHRONO_H_
 #define FMT_CHRONO_H_
 
-#include <algorithm>
-#include <chrono>
-#include <cmath>    // std::isfinite
-#include <cstring>  // std::memcpy
-#include <ctime>
-#include <iterator>
-#include <locale>
-#include <ostream>
-#include <type_traits>
-
-#include "ostream.h"  // formatbuf
+#ifndef FMT_MODULE
+#  include <algorithm>
+#  include <chrono>
+#  include <cmath>    // std::isfinite
+#  include <cstring>  // std::memcpy
+#  include <ctime>
+#  include <iterator>
+#  include <locale>
+#  include <ostream>
+#  include <type_traits>
+#endif
+
+#include "format.h"
 
 FMT_BEGIN_NAMESPACE
 
@@ -94,10 +96,8 @@ FMT_CONSTEXPR auto lossless_integral_conversion(const From from, int& ec)
   return static_cast<To>(from);
 }
 
-/**
- * converts From to To, without loss. If the dynamic value of from
- * can't be converted to To without loss, ec is set.
- */
+/// Converts From to To, without loss. If the dynamic value of from
+/// can't be converted to To without loss, ec is set.
 template <typename To, typename From,
           FMT_ENABLE_IF(!std::is_same<From, To>::value &&
                         std::numeric_limits<From>::is_signed !=
@@ -185,9 +185,7 @@ FMT_CONSTEXPR auto safe_float_conversion(const From from, int& ec) -> To {
   return from;
 }
 
-/**
- * safe duration cast between integral durations
- */
+/// Safe duration cast between integral durations
 template <typename To, typename FromRep, typename FromPeriod,
           FMT_ENABLE_IF(std::is_integral<FromRep>::value),
           FMT_ENABLE_IF(std::is_integral<typename To::rep>::value)>
@@ -237,9 +235,7 @@ auto safe_duration_cast(std::chrono::duration<FromRep, FromPeriod> from,
   return ec ? To() : To(tocount);
 }
 
-/**
- * safe duration_cast between floating point durations
- */
+/// Safe duration_cast between floating point durations
 template <typename To, typename FromRep, typename FromPeriod,
           FMT_ENABLE_IF(std::is_floating_point<FromRep>::value),
           FMT_ENABLE_IF(std::is_floating_point<typename To::rep>::value)>
@@ -329,6 +325,39 @@ inline auto localtime_s(...) -> null<> { return null<>(); }
 inline auto gmtime_r(...) -> null<> { return null<>(); }
 inline auto gmtime_s(...) -> null<> { return null<>(); }
 
+// It is defined here and not in ostream.h because the latter has expensive
+// includes.
+template <typename Streambuf> class formatbuf : public Streambuf {
+ private:
+  using char_type = typename Streambuf::char_type;
+  using streamsize = decltype(std::declval<Streambuf>().sputn(nullptr, 0));
+  using int_type = typename Streambuf::int_type;
+  using traits_type = typename Streambuf::traits_type;
+
+  buffer<char_type>& buffer_;
+
+ public:
+  explicit formatbuf(buffer<char_type>& buf) : buffer_(buf) {}
+
+ protected:
+  // The put area is always empty. This makes the implementation simpler and has
+  // the advantage that the streambuf and the buffer are always in sync and
+  // sputc never writes into uninitialized memory. A disadvantage is that each
+  // call to sputc always results in a (virtual) call to overflow. There is no
+  // disadvantage here for sputn since this always results in a call to xsputn.
+
+  auto overflow(int_type ch) -> int_type override {
+    if (!traits_type::eq_int_type(ch, traits_type::eof()))
+      buffer_.push_back(static_cast<char_type>(ch));
+    return ch;
+  }
+
+  auto xsputn(const char_type* s, streamsize count) -> streamsize override {
+    buffer_.append(s, s + count);
+    return count;
+  }
+};
+
 inline auto get_classic_locale() -> const std::locale& {
   static const auto& locale = std::locale::classic();
   return locale;
@@ -362,11 +391,12 @@ void write_codecvt(codecvt_result<CodeUnit>& out, string_view in_buf,
 template <typename OutputIt>
 auto write_encoded_tm_str(OutputIt out, string_view in, const std::locale& loc)
     -> OutputIt {
-  if (detail::is_utf8() && loc != get_classic_locale()) {
+  if (detail::use_utf8() && loc != get_classic_locale()) {
     // char16_t and char32_t codecvts are broken in MSVC (linkage errors) and
     // gcc-4.
-#if FMT_MSC_VERSION != 0 || \
-    (defined(__GLIBCXX__) && !defined(_GLIBCXX_USE_DUAL_ABI))
+#if FMT_MSC_VERSION != 0 ||  \
+    (defined(__GLIBCXX__) && \
+     (!defined(_GLIBCXX_USE_DUAL_ABI) || _GLIBCXX_USE_DUAL_ABI == 0))
     // The _GLIBCXX_USE_DUAL_ABI macro is always defined in libstdc++ from gcc-5
     // and newer.
     using code_unit = wchar_t;
@@ -382,9 +412,9 @@ auto write_encoded_tm_str(OutputIt out, string_view in, const std::locale& loc)
         to_utf8<code_unit, basic_memory_buffer<char, unit_t::max_size * 4>>();
     if (!u.convert({unit.buf, to_unsigned(unit.end - unit.buf)}))
       FMT_THROW(format_error("failed to format time"));
-    return copy_str<char>(u.c_str(), u.c_str() + u.size(), out);
+    return copy<char>(u.c_str(), u.c_str() + u.size(), out);
   }
-  return copy_str<char>(in.data(), in.data() + in.size(), out);
+  return copy<char>(in.data(), in.data() + in.size(), out);
 }
 
 template <typename Char, typename OutputIt,
@@ -393,7 +423,7 @@ auto write_tm_str(OutputIt out, string_view sv, const std::locale& loc)
     -> OutputIt {
   codecvt_result<Char> unit;
   write_codecvt(unit, sv, loc);
-  return copy_str<Char>(unit.buf, unit.end, out);
+  return copy<Char>(unit.buf, unit.end, out);
 }
 
 template <typename Char, typename OutputIt,
@@ -482,9 +512,9 @@ auto to_time_t(
 FMT_BEGIN_EXPORT
 
 /**
-  Converts given time since epoch as ``std::time_t`` value into calendar time,
-  expressed in local time. Unlike ``std::localtime``, this function is
-  thread-safe on most platforms.
+ * Converts given time since epoch as `std::time_t` value into calendar time,
+ * expressed in local time. Unlike `std::localtime`, this function is
+ * thread-safe on most platforms.
  */
 inline auto localtime(std::time_t time) -> std::tm {
   struct dispatcher {
@@ -531,9 +561,9 @@ inline auto localtime(std::chrono::local_time<Duration> time) -> std::tm {
 #endif
 
 /**
-  Converts given time since epoch as ``std::time_t`` value into calendar time,
-  expressed in Coordinated Universal Time (UTC). Unlike ``std::gmtime``, this
-  function is thread-safe on most platforms.
+ * Converts given time since epoch as `std::time_t` value into calendar time,
+ * expressed in Coordinated Universal Time (UTC). Unlike `std::gmtime`, this
+ * function is thread-safe on most platforms.
  */
 inline auto gmtime(std::time_t time) -> std::tm {
   struct dispatcher {
@@ -646,12 +676,10 @@ enum class numeric_system {
 
 // Glibc extensions for formatting numeric values.
 enum class pad_type {
-  unspecified,
+  // Pad a numeric result string with zeros (the default).
+  zero,
   // Do not pad a numeric result string.
   none,
-  // Pad a numeric result string with zeros even if the conversion specifier
-  // character uses space-padding by default.
-  zero,
   // Pad a numeric result string with spaces.
   space,
 };
@@ -659,7 +687,7 @@ enum class pad_type {
 template <typename OutputIt>
 auto write_padding(OutputIt out, pad_type pad, int width) -> OutputIt {
   if (pad == pad_type::none) return out;
-  return std::fill_n(out, width, pad == pad_type::space ? ' ' : '0');
+  return detail::fill_n(out, width, pad == pad_type::space ? ' ' : '0');
 }
 
 template <typename OutputIt>
@@ -675,8 +703,8 @@ FMT_CONSTEXPR auto parse_chrono_format(const Char* begin, const Char* end,
   if (begin == end || *begin == '}') return begin;
   if (*begin != '%') FMT_THROW(format_error("invalid format"));
   auto ptr = begin;
-  pad_type pad = pad_type::unspecified;
   while (ptr != end) {
+    pad_type pad = pad_type::zero;
     auto c = *ptr;
     if (c == '}') break;
     if (c != '%') {
@@ -696,10 +724,6 @@ FMT_CONSTEXPR auto parse_chrono_format(const Char* begin, const Char* end,
       pad = pad_type::none;
       ++ptr;
       break;
-    case '0':
-      pad = pad_type::zero;
-      ++ptr;
-      break;
     }
     if (ptr == end) FMT_THROW(format_error("invalid format"));
     c = *ptr++;
@@ -759,22 +783,22 @@ FMT_CONSTEXPR auto parse_chrono_format(const Char* begin, const Char* end,
       break;
     // Day of the year/month:
     case 'U':
-      handler.on_dec0_week_of_year(numeric_system::standard);
+      handler.on_dec0_week_of_year(numeric_system::standard, pad);
       break;
     case 'W':
-      handler.on_dec1_week_of_year(numeric_system::standard);
+      handler.on_dec1_week_of_year(numeric_system::standard, pad);
       break;
     case 'V':
-      handler.on_iso_week_of_year(numeric_system::standard);
+      handler.on_iso_week_of_year(numeric_system::standard, pad);
       break;
     case 'j':
       handler.on_day_of_year();
       break;
     case 'd':
-      handler.on_day_of_month(numeric_system::standard);
+      handler.on_day_of_month(numeric_system::standard, pad);
       break;
     case 'e':
-      handler.on_day_of_month_space(numeric_system::standard);
+      handler.on_day_of_month(numeric_system::standard, pad_type::space);
       break;
     // Hour, minute, second:
     case 'H':
@@ -871,19 +895,19 @@ FMT_CONSTEXPR auto parse_chrono_format(const Char* begin, const Char* end,
         handler.on_dec_month(numeric_system::alternative);
         break;
       case 'U':
-        handler.on_dec0_week_of_year(numeric_system::alternative);
+        handler.on_dec0_week_of_year(numeric_system::alternative, pad);
         break;
       case 'W':
-        handler.on_dec1_week_of_year(numeric_system::alternative);
+        handler.on_dec1_week_of_year(numeric_system::alternative, pad);
         break;
       case 'V':
-        handler.on_iso_week_of_year(numeric_system::alternative);
+        handler.on_iso_week_of_year(numeric_system::alternative, pad);
         break;
       case 'd':
-        handler.on_day_of_month(numeric_system::alternative);
+        handler.on_day_of_month(numeric_system::alternative, pad);
         break;
       case 'e':
-        handler.on_day_of_month_space(numeric_system::alternative);
+        handler.on_day_of_month(numeric_system::alternative, pad_type::space);
         break;
       case 'w':
         handler.on_dec0_weekday(numeric_system::alternative);
@@ -936,12 +960,19 @@ template <typename Derived> struct null_chrono_spec_handler {
   FMT_CONSTEXPR void on_abbr_month() { unsupported(); }
   FMT_CONSTEXPR void on_full_month() { unsupported(); }
   FMT_CONSTEXPR void on_dec_month(numeric_system) { unsupported(); }
-  FMT_CONSTEXPR void on_dec0_week_of_year(numeric_system) { unsupported(); }
-  FMT_CONSTEXPR void on_dec1_week_of_year(numeric_system) { unsupported(); }
-  FMT_CONSTEXPR void on_iso_week_of_year(numeric_system) { unsupported(); }
+  FMT_CONSTEXPR void on_dec0_week_of_year(numeric_system, pad_type) {
+    unsupported();
+  }
+  FMT_CONSTEXPR void on_dec1_week_of_year(numeric_system, pad_type) {
+    unsupported();
+  }
+  FMT_CONSTEXPR void on_iso_week_of_year(numeric_system, pad_type) {
+    unsupported();
+  }
   FMT_CONSTEXPR void on_day_of_year() { unsupported(); }
-  FMT_CONSTEXPR void on_day_of_month(numeric_system) { unsupported(); }
-  FMT_CONSTEXPR void on_day_of_month_space(numeric_system) { unsupported(); }
+  FMT_CONSTEXPR void on_day_of_month(numeric_system, pad_type) {
+    unsupported();
+  }
   FMT_CONSTEXPR void on_24_hour(numeric_system) { unsupported(); }
   FMT_CONSTEXPR void on_12_hour(numeric_system) { unsupported(); }
   FMT_CONSTEXPR void on_minute(numeric_system) { unsupported(); }
@@ -979,12 +1010,11 @@ struct tm_format_checker : null_chrono_spec_handler<tm_format_checker> {
   FMT_CONSTEXPR void on_abbr_month() {}
   FMT_CONSTEXPR void on_full_month() {}
   FMT_CONSTEXPR void on_dec_month(numeric_system) {}
-  FMT_CONSTEXPR void on_dec0_week_of_year(numeric_system) {}
-  FMT_CONSTEXPR void on_dec1_week_of_year(numeric_system) {}
-  FMT_CONSTEXPR void on_iso_week_of_year(numeric_system) {}
+  FMT_CONSTEXPR void on_dec0_week_of_year(numeric_system, pad_type) {}
+  FMT_CONSTEXPR void on_dec1_week_of_year(numeric_system, pad_type) {}
+  FMT_CONSTEXPR void on_iso_week_of_year(numeric_system, pad_type) {}
   FMT_CONSTEXPR void on_day_of_year() {}
-  FMT_CONSTEXPR void on_day_of_month(numeric_system) {}
-  FMT_CONSTEXPR void on_day_of_month_space(numeric_system) {}
+  FMT_CONSTEXPR void on_day_of_month(numeric_system, pad_type) {}
   FMT_CONSTEXPR void on_24_hour(numeric_system, pad_type) {}
   FMT_CONSTEXPR void on_12_hour(numeric_system, pad_type) {}
   FMT_CONSTEXPR void on_minute(numeric_system, pad_type) {}
@@ -1061,9 +1091,10 @@ inline auto to_nonnegative_int(T value, Int upper) -> Int {
 }
 template <typename T, typename Int, FMT_ENABLE_IF(!std::is_integral<T>::value)>
 inline auto to_nonnegative_int(T value, Int upper) -> Int {
-  if (value < 0 || value > static_cast<T>(upper))
+  auto int_value = static_cast<Int>(value);
+  if (int_value < 0 || value > static_cast<T>(upper))
     FMT_THROW(format_error("invalid value"));
-  return static_cast<Int>(value);
+  return int_value;
 }
 
 constexpr auto pow10(std::uint32_t n) -> long long {
@@ -1115,22 +1146,27 @@ void write_fractional_seconds(OutputIt& out, Duration d, int precision = -1) {
     if (std::ratio_less<typename subsecond_precision::period,
                         std::chrono::seconds::period>::value) {
       *out++ = '.';
-      out = std::fill_n(out, leading_zeroes, '0');
+      out = detail::fill_n(out, leading_zeroes, '0');
       out = format_decimal<Char>(out, n, num_digits).end;
     }
-  } else {
+  } else if (precision > 0) {
     *out++ = '.';
     leading_zeroes = (std::min)(leading_zeroes, precision);
-    out = std::fill_n(out, leading_zeroes, '0');
     int remaining = precision - leading_zeroes;
-    if (remaining != 0 && remaining < num_digits) {
-      n /= to_unsigned(detail::pow10(to_unsigned(num_digits - remaining)));
-      out = format_decimal<Char>(out, n, remaining).end;
+    out = detail::fill_n(out, leading_zeroes, '0');
+    if (remaining < num_digits) {
+      int num_truncated_digits = num_digits - remaining;
+      n /= to_unsigned(detail::pow10(to_unsigned(num_truncated_digits)));
+      if (n) {
+        out = format_decimal<Char>(out, n, remaining).end;
+      }
       return;
     }
-    out = format_decimal<Char>(out, n, num_digits).end;
-    remaining -= num_digits;
-    out = std::fill_n(out, remaining, '0');
+    if (n) {
+      out = format_decimal<Char>(out, n, num_digits).end;
+      remaining -= num_digits;
+    }
+    out = detail::fill_n(out, remaining, '0');
   }
 }
 
@@ -1281,7 +1317,8 @@ class tm_writer {
     }
     uint32_or_64_or_128_t<long long> n = to_unsigned(year);
     const int num_digits = count_digits(n);
-    if (width > num_digits) out_ = std::fill_n(out_, width - num_digits, '0');
+    if (width > num_digits)
+      out_ = detail::fill_n(out_, width - num_digits, '0');
     out_ = format_decimal<Char>(out_, n, num_digits).end;
   }
   void write_year(long long year) {
@@ -1364,7 +1401,7 @@ class tm_writer {
   auto out() const -> OutputIt { return out_; }
 
   FMT_CONSTEXPR void on_text(const Char* begin, const Char* end) {
-    out_ = copy_str<Char>(begin, end, out_);
+    out_ = copy<Char>(begin, end, out_);
   }
 
   void on_abbr_weekday() {
@@ -1411,7 +1448,7 @@ class tm_writer {
       *out_++ = ' ';
       on_abbr_month();
       *out_++ = ' ';
-      on_day_of_month_space(numeric_system::standard);
+      on_day_of_month(numeric_system::standard, pad_type::space);
       *out_++ = ' ';
       on_iso_time();
       *out_++ = ' ';
@@ -1437,7 +1474,7 @@ class tm_writer {
     write_digit2_separated(buf, to_unsigned(tm_mon() + 1),
                            to_unsigned(tm_mday()),
                            to_unsigned(split_year_lower(tm_year())), '/');
-    out_ = copy_str<Char>(std::begin(buf), std::end(buf), out_);
+    out_ = copy<Char>(std::begin(buf), std::end(buf), out_);
   }
   void on_iso_date() {
     auto year = tm_year();
@@ -1453,7 +1490,7 @@ class tm_writer {
     write_digit2_separated(buf + 2, static_cast<unsigned>(year % 100),
                            to_unsigned(tm_mon() + 1), to_unsigned(tm_mday()),
                            '-');
-    out_ = copy_str<Char>(std::begin(buf) + offset, std::end(buf), out_);
+    out_ = copy<Char>(std::begin(buf) + offset, std::end(buf), out_);
   }
 
   void on_utc_offset(numeric_system ns) { format_utc_offset_impl(tm_, ns); }
@@ -1498,24 +1535,26 @@ class tm_writer {
     format_localized('m', 'O');
   }
 
-  void on_dec0_week_of_year(numeric_system ns) {
+  void on_dec0_week_of_year(numeric_system ns, pad_type pad) {
     if (is_classic_ || ns == numeric_system::standard)
-      return write2((tm_yday() + days_per_week - tm_wday()) / days_per_week);
+      return write2((tm_yday() + days_per_week - tm_wday()) / days_per_week,
+                    pad);
     format_localized('U', 'O');
   }
-  void on_dec1_week_of_year(numeric_system ns) {
+  void on_dec1_week_of_year(numeric_system ns, pad_type pad) {
     if (is_classic_ || ns == numeric_system::standard) {
       auto wday = tm_wday();
       write2((tm_yday() + days_per_week -
               (wday == 0 ? (days_per_week - 1) : (wday - 1))) /
-             days_per_week);
+                 days_per_week,
+             pad);
     } else {
       format_localized('W', 'O');
     }
   }
-  void on_iso_week_of_year(numeric_system ns) {
+  void on_iso_week_of_year(numeric_system ns, pad_type pad) {
     if (is_classic_ || ns == numeric_system::standard)
-      return write2(tm_iso_week_of_year());
+      return write2(tm_iso_week_of_year(), pad);
     format_localized('V', 'O');
   }
 
@@ -1529,20 +1568,11 @@ class tm_writer {
     write1(yday / 100);
     write2(yday % 100);
   }
-  void on_day_of_month(numeric_system ns) {
-    if (is_classic_ || ns == numeric_system::standard) return write2(tm_mday());
+  void on_day_of_month(numeric_system ns, pad_type pad) {
+    if (is_classic_ || ns == numeric_system::standard)
+      return write2(tm_mday(), pad);
     format_localized('d', 'O');
   }
-  void on_day_of_month_space(numeric_system ns) {
-    if (is_classic_ || ns == numeric_system::standard) {
-      auto mday = to_unsigned(tm_mday()) % 100;
-      const char* d2 = digits2(mday);
-      *out_++ = mday < 10 ? ' ' : d2[0];
-      *out_++ = d2[1];
-    } else {
-      format_localized('e', 'O');
-    }
-  }
 
   void on_24_hour(numeric_system ns, pad_type pad) {
     if (is_classic_ || ns == numeric_system::standard)
@@ -1586,7 +1616,7 @@ class tm_writer {
       char buf[8];
       write_digit2_separated(buf, to_unsigned(tm_hour12()),
                              to_unsigned(tm_min()), to_unsigned(tm_sec()), ':');
-      out_ = copy_str<Char>(std::begin(buf), std::end(buf), out_);
+      out_ = copy<Char>(std::begin(buf), std::end(buf), out_);
       *out_++ = ' ';
       on_am_pm();
     } else {
@@ -1601,7 +1631,7 @@ class tm_writer {
   void on_iso_time() {
     on_24_hour_time();
     *out_++ = ':';
-    on_second(numeric_system::standard, pad_type::unspecified);
+    on_second(numeric_system::standard, pad_type::zero);
   }
 
   void on_am_pm() {
@@ -1700,10 +1730,10 @@ auto format_duration_value(OutputIt out, Rep val, int) -> OutputIt {
 template <typename Char, typename Rep, typename OutputIt,
           FMT_ENABLE_IF(std::is_floating_point<Rep>::value)>
 auto format_duration_value(OutputIt out, Rep val, int precision) -> OutputIt {
-  auto specs = format_specs<Char>();
+  auto specs = format_specs();
   specs.precision = precision;
-  specs.type = precision >= 0 ? presentation_type::fixed_lower
-                              : presentation_type::general_lower;
+  specs.type =
+      precision >= 0 ? presentation_type::fixed : presentation_type::general;
   return write<Char>(out, val, specs);
 }
 
@@ -1744,8 +1774,10 @@ class get_locale {
 
  public:
   get_locale(bool localized, locale_ref loc) : has_locale_(localized) {
+#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
     if (localized)
       ::new (&locale_) std::locale(loc.template get<std::locale>());
+#endif
   }
   ~get_locale() {
     if (has_locale_) locale_.~locale();
@@ -1840,7 +1872,7 @@ struct chrono_formatter {
     }
   }
 
-  void write(Rep value, int width, pad_type pad = pad_type::unspecified) {
+  void write(Rep value, int width, pad_type pad = pad_type::zero) {
     write_sign();
     if (isnan(value)) return write_nan();
     uint32_or_64_or_128_t<int> n =
@@ -1890,11 +1922,10 @@ struct chrono_formatter {
   void on_iso_week_based_year() {}
   void on_iso_week_based_short_year() {}
   void on_dec_month(numeric_system) {}
-  void on_dec0_week_of_year(numeric_system) {}
-  void on_dec1_week_of_year(numeric_system) {}
-  void on_iso_week_of_year(numeric_system) {}
-  void on_day_of_month(numeric_system) {}
-  void on_day_of_month_space(numeric_system) {}
+  void on_dec0_week_of_year(numeric_system, pad_type) {}
+  void on_dec1_week_of_year(numeric_system, pad_type) {}
+  void on_iso_week_of_year(numeric_system, pad_type) {}
+  void on_day_of_month(numeric_system, pad_type) {}
 
   void on_day_of_year() {
     if (handle_nan_inf()) return;
@@ -1974,7 +2005,7 @@ struct chrono_formatter {
     on_24_hour_time();
     *out++ = ':';
     if (handle_nan_inf()) return;
-    on_second(numeric_system::standard, pad_type::unspecified);
+    on_second(numeric_system::standard, pad_type::zero);
   }
 
   void on_am_pm() {
@@ -1997,53 +2028,215 @@ struct chrono_formatter {
 
 #if defined(__cpp_lib_chrono) && __cpp_lib_chrono >= 201907
 using weekday = std::chrono::weekday;
+using day = std::chrono::day;
+using month = std::chrono::month;
+using year = std::chrono::year;
+using year_month_day = std::chrono::year_month_day;
 #else
 // A fallback version of weekday.
 class weekday {
  private:
-  unsigned char value;
+  unsigned char value_;
 
  public:
   weekday() = default;
-  explicit constexpr weekday(unsigned wd) noexcept
-      : value(static_cast<unsigned char>(wd != 7 ? wd : 0)) {}
-  constexpr auto c_encoding() const noexcept -> unsigned { return value; }
+  constexpr explicit weekday(unsigned wd) noexcept
+      : value_(static_cast<unsigned char>(wd != 7 ? wd : 0)) {}
+  constexpr auto c_encoding() const noexcept -> unsigned { return value_; }
+};
+
+class day {
+ private:
+  unsigned char value_;
+
+ public:
+  day() = default;
+  constexpr explicit day(unsigned d) noexcept
+      : value_(static_cast<unsigned char>(d)) {}
+  constexpr explicit operator unsigned() const noexcept { return value_; }
+};
+
+class month {
+ private:
+  unsigned char value_;
+
+ public:
+  month() = default;
+  constexpr explicit month(unsigned m) noexcept
+      : value_(static_cast<unsigned char>(m)) {}
+  constexpr explicit operator unsigned() const noexcept { return value_; }
+};
+
+class year {
+ private:
+  int value_;
+
+ public:
+  year() = default;
+  constexpr explicit year(int y) noexcept : value_(y) {}
+  constexpr explicit operator int() const noexcept { return value_; }
 };
 
-class year_month_day {};
+class year_month_day {
+ private:
+  fmt::year year_;
+  fmt::month month_;
+  fmt::day day_;
+
+ public:
+  year_month_day() = default;
+  constexpr year_month_day(const year& y, const month& m, const day& d) noexcept
+      : year_(y), month_(m), day_(d) {}
+  constexpr auto year() const noexcept -> fmt::year { return year_; }
+  constexpr auto month() const noexcept -> fmt::month { return month_; }
+  constexpr auto day() const noexcept -> fmt::day { return day_; }
+};
 #endif
 
-// A rudimentary weekday formatter.
-template <typename Char> struct formatter<weekday, Char> {
+template <typename Char>
+struct formatter<weekday, Char> : private formatter<std::tm, Char> {
  private:
-  bool localized = false;
+  bool localized_ = false;
+  bool use_tm_formatter_ = false;
 
  public:
   FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
       -> decltype(ctx.begin()) {
-    auto begin = ctx.begin(), end = ctx.end();
-    if (begin != end && *begin == 'L') {
-      ++begin;
-      localized = true;
+    auto it = ctx.begin(), end = ctx.end();
+    if (it != end && *it == 'L') {
+      ++it;
+      localized_ = true;
+      return it;
     }
-    return begin;
+    use_tm_formatter_ = it != end && *it != '}';
+    return use_tm_formatter_ ? formatter<std::tm, Char>::parse(ctx) : it;
   }
 
   template <typename FormatContext>
   auto format(weekday wd, FormatContext& ctx) const -> decltype(ctx.out()) {
     auto time = std::tm();
     time.tm_wday = static_cast<int>(wd.c_encoding());
-    detail::get_locale loc(localized, ctx.locale());
+    if (use_tm_formatter_) return formatter<std::tm, Char>::format(time, ctx);
+    detail::get_locale loc(localized_, ctx.locale());
     auto w = detail::tm_writer<decltype(ctx.out()), Char>(loc, ctx.out(), time);
     w.on_abbr_weekday();
     return w.out();
   }
 };
 
+template <typename Char>
+struct formatter<day, Char> : private formatter<std::tm, Char> {
+ private:
+  bool use_tm_formatter_ = false;
+
+ public:
+  FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
+      -> decltype(ctx.begin()) {
+    auto it = ctx.begin(), end = ctx.end();
+    use_tm_formatter_ = it != end && *it != '}';
+    return use_tm_formatter_ ? formatter<std::tm, Char>::parse(ctx) : it;
+  }
+
+  template <typename FormatContext>
+  auto format(day d, FormatContext& ctx) const -> decltype(ctx.out()) {
+    auto time = std::tm();
+    time.tm_mday = static_cast<int>(static_cast<unsigned>(d));
+    if (use_tm_formatter_) return formatter<std::tm, Char>::format(time, ctx);
+    detail::get_locale loc(false, ctx.locale());
+    auto w = detail::tm_writer<decltype(ctx.out()), Char>(loc, ctx.out(), time);
+    w.on_day_of_month(detail::numeric_system::standard, detail::pad_type::zero);
+    return w.out();
+  }
+};
+
+template <typename Char>
+struct formatter<month, Char> : private formatter<std::tm, Char> {
+ private:
+  bool localized_ = false;
+  bool use_tm_formatter_ = false;
+
+ public:
+  FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
+      -> decltype(ctx.begin()) {
+    auto it = ctx.begin(), end = ctx.end();
+    if (it != end && *it == 'L') {
+      ++it;
+      localized_ = true;
+      return it;
+    }
+    use_tm_formatter_ = it != end && *it != '}';
+    return use_tm_formatter_ ? formatter<std::tm, Char>::parse(ctx) : it;
+  }
+
+  template <typename FormatContext>
+  auto format(month m, FormatContext& ctx) const -> decltype(ctx.out()) {
+    auto time = std::tm();
+    time.tm_mon = static_cast<int>(static_cast<unsigned>(m)) - 1;
+    if (use_tm_formatter_) return formatter<std::tm, Char>::format(time, ctx);
+    detail::get_locale loc(localized_, ctx.locale());
+    auto w = detail::tm_writer<decltype(ctx.out()), Char>(loc, ctx.out(), time);
+    w.on_abbr_month();
+    return w.out();
+  }
+};
+
+template <typename Char>
+struct formatter<year, Char> : private formatter<std::tm, Char> {
+ private:
+  bool use_tm_formatter_ = false;
+
+ public:
+  FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
+      -> decltype(ctx.begin()) {
+    auto it = ctx.begin(), end = ctx.end();
+    use_tm_formatter_ = it != end && *it != '}';
+    return use_tm_formatter_ ? formatter<std::tm, Char>::parse(ctx) : it;
+  }
+
+  template <typename FormatContext>
+  auto format(year y, FormatContext& ctx) const -> decltype(ctx.out()) {
+    auto time = std::tm();
+    time.tm_year = static_cast<int>(y) - 1900;
+    if (use_tm_formatter_) return formatter<std::tm, Char>::format(time, ctx);
+    detail::get_locale loc(false, ctx.locale());
+    auto w = detail::tm_writer<decltype(ctx.out()), Char>(loc, ctx.out(), time);
+    w.on_year(detail::numeric_system::standard);
+    return w.out();
+  }
+};
+
+template <typename Char>
+struct formatter<year_month_day, Char> : private formatter<std::tm, Char> {
+ private:
+  bool use_tm_formatter_ = false;
+
+ public:
+  FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
+      -> decltype(ctx.begin()) {
+    auto it = ctx.begin(), end = ctx.end();
+    use_tm_formatter_ = it != end && *it != '}';
+    return use_tm_formatter_ ? formatter<std::tm, Char>::parse(ctx) : it;
+  }
+
+  template <typename FormatContext>
+  auto format(year_month_day val, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    auto time = std::tm();
+    time.tm_year = static_cast<int>(val.year()) - 1900;
+    time.tm_mon = static_cast<int>(static_cast<unsigned>(val.month())) - 1;
+    time.tm_mday = static_cast<int>(static_cast<unsigned>(val.day()));
+    if (use_tm_formatter_) return formatter<std::tm, Char>::format(time, ctx);
+    detail::get_locale loc(true, ctx.locale());
+    auto w = detail::tm_writer<decltype(ctx.out()), Char>(loc, ctx.out(), time);
+    w.on_iso_date();
+    return w.out();
+  }
+};
+
 template <typename Rep, typename Period, typename Char>
 struct formatter<std::chrono::duration<Rep, Period>, Char> {
  private:
-  format_specs<Char> specs_;
+  format_specs specs_;
   detail::arg_ref<Char> width_ref_;
   detail::arg_ref<Char> precision_ref_;
   bool localized_ = false;
@@ -2117,27 +2310,26 @@ struct formatter<std::chrono::time_point<std::chrono::system_clock, Duration>,
   template <typename FormatContext>
   auto format(std::chrono::time_point<std::chrono::system_clock, Duration> val,
               FormatContext& ctx) const -> decltype(ctx.out()) {
+    std::tm tm = gmtime(val);
     using period = typename Duration::period;
     if (detail::const_check(
-            period::num != 1 || period::den != 1 ||
-            std::is_floating_point<typename Duration::rep>::value)) {
-      const auto epoch = val.time_since_epoch();
-      auto subsecs = detail::fmt_duration_cast<Duration>(
-          epoch - detail::fmt_duration_cast<std::chrono::seconds>(epoch));
-
-      if (subsecs.count() < 0) {
-        auto second =
-            detail::fmt_duration_cast<Duration>(std::chrono::seconds(1));
-        if (epoch.count() < ((Duration::min)() + second).count())
-          FMT_THROW(format_error("duration is too small"));
-        subsecs += second;
-        val -= second;
-      }
-
-      return formatter<std::tm, Char>::do_format(gmtime(val), ctx, &subsecs);
+            period::num == 1 && period::den == 1 &&
+            !std::is_floating_point<typename Duration::rep>::value)) {
+      return formatter<std::tm, Char>::format(tm, ctx);
     }
-
-    return formatter<std::tm, Char>::format(gmtime(val), ctx);
+    Duration epoch = val.time_since_epoch();
+    Duration subsecs = detail::fmt_duration_cast<Duration>(
+        epoch - detail::fmt_duration_cast<std::chrono::seconds>(epoch));
+    if (subsecs.count() < 0) {
+      auto second =
+          detail::fmt_duration_cast<Duration>(std::chrono::seconds(1));
+      if (tm.tm_sec != 0)
+        --tm.tm_sec;
+      else
+        tm = gmtime(val - second);
+      subsecs += detail::fmt_duration_cast<Duration>(std::chrono::seconds(1));
+    }
+    return formatter<std::tm, Char>::do_format(tm, ctx, &subsecs);
   }
 };
 
@@ -2185,7 +2377,7 @@ struct formatter<std::chrono::time_point<std::chrono::utc_clock, Duration>,
 
 template <typename Char> struct formatter<std::tm, Char> {
  private:
-  format_specs<Char> specs_;
+  format_specs specs_;
   detail::arg_ref<Char> width_ref_;
 
  protected:
diff --git a/contrib/fmt/include/fmt/color.h b/contrib/fmt/include/fmt/color.h
index 367849a86..f0e9dd94e 100644
--- a/contrib/fmt/include/fmt/color.h
+++ b/contrib/fmt/include/fmt/color.h
@@ -227,7 +227,7 @@ struct color_type {
 };
 }  // namespace detail
 
-/** A text style consisting of foreground and background colors and emphasis. */
+/// A text style consisting of foreground and background colors and emphasis.
 class text_style {
  public:
   FMT_CONSTEXPR text_style(emphasis em = emphasis()) noexcept
@@ -239,7 +239,7 @@ class text_style {
       foreground_color = rhs.foreground_color;
     } else if (rhs.set_foreground_color) {
       if (!foreground_color.is_rgb || !rhs.foreground_color.is_rgb)
-        FMT_THROW(format_error("can't OR a terminal color"));
+        report_error("can't OR a terminal color");
       foreground_color.value.rgb_color |= rhs.foreground_color.value.rgb_color;
     }
 
@@ -248,7 +248,7 @@ class text_style {
       background_color = rhs.background_color;
     } else if (rhs.set_background_color) {
       if (!background_color.is_rgb || !rhs.background_color.is_rgb)
-        FMT_THROW(format_error("can't OR a terminal color"));
+        report_error("can't OR a terminal color");
       background_color.value.rgb_color |= rhs.background_color.value.rgb_color;
     }
 
@@ -310,13 +310,13 @@ class text_style {
   emphasis ems;
 };
 
-/** Creates a text style from the foreground (text) color. */
+/// Creates a text style from the foreground (text) color.
 FMT_CONSTEXPR inline auto fg(detail::color_type foreground) noexcept
     -> text_style {
   return text_style(true, foreground);
 }
 
-/** Creates a text style from the background color. */
+/// Creates a text style from the background color.
 FMT_CONSTEXPR inline auto bg(detail::color_type background) noexcept
     -> text_style {
   return text_style(false, background);
@@ -390,8 +390,8 @@ template <typename Char> struct ansi_color_escape {
   FMT_CONSTEXPR operator const Char*() const noexcept { return buffer; }
 
   FMT_CONSTEXPR auto begin() const noexcept -> const Char* { return buffer; }
-  FMT_CONSTEXPR_CHAR_TRAITS auto end() const noexcept -> const Char* {
-    return buffer + std::char_traits<Char>::length(buffer);
+  FMT_CONSTEXPR20 auto end() const noexcept -> const Char* {
+    return buffer + basic_string_view<Char>(buffer).size();
   }
 
  private:
@@ -441,9 +441,9 @@ template <typename T> struct styled_arg : detail::view {
 };
 
 template <typename Char>
-void vformat_to(buffer<Char>& buf, const text_style& ts,
-                basic_string_view<Char> format_str,
-                basic_format_args<buffer_context<type_identity_t<Char>>> args) {
+void vformat_to(
+    buffer<Char>& buf, const text_style& ts, basic_string_view<Char> format_str,
+    basic_format_args<buffered_context<type_identity_t<Char>>> args) {
   bool has_style = false;
   if (ts.has_emphasis()) {
     has_style = true;
@@ -466,121 +466,92 @@ void vformat_to(buffer<Char>& buf, const text_style& ts,
 
 }  // namespace detail
 
-inline void vprint(std::FILE* f, const text_style& ts, string_view fmt,
+inline void vprint(FILE* f, const text_style& ts, string_view fmt,
                    format_args args) {
-  // Legacy wide streams are not supported.
   auto buf = memory_buffer();
   detail::vformat_to(buf, ts, fmt, args);
-  if (detail::is_utf8()) {
-    detail::print(f, string_view(buf.begin(), buf.size()));
-    return;
-  }
-  buf.push_back('\0');
-  int result = std::fputs(buf.data(), f);
-  if (result < 0)
-    FMT_THROW(system_error(errno, FMT_STRING("cannot write to file")));
+  print(f, FMT_STRING("{}"), string_view(buf.begin(), buf.size()));
 }
 
 /**
-  \rst
-  Formats a string and prints it to the specified file stream using ANSI
-  escape sequences to specify text formatting.
-
-  **Example**::
-
-    fmt::print(fmt::emphasis::bold | fg(fmt::color::red),
-               "Elapsed time: {0:.2f} seconds", 1.23);
-  \endrst
+ * Formats a string and prints it to the specified file stream using ANSI
+ * escape sequences to specify text formatting.
+ *
+ * **Example**:
+ *
+ *     fmt::print(fmt::emphasis::bold | fg(fmt::color::red),
+ *                "Elapsed time: {0:.2f} seconds", 1.23);
  */
-template <typename S, typename... Args,
-          FMT_ENABLE_IF(detail::is_string<S>::value)>
-void print(std::FILE* f, const text_style& ts, const S& format_str,
-           const Args&... args) {
-  vprint(f, ts, format_str,
-         fmt::make_format_args<buffer_context<char_t<S>>>(args...));
+template <typename... T>
+void print(FILE* f, const text_style& ts, format_string<T...> fmt,
+           T&&... args) {
+  vprint(f, ts, fmt, fmt::make_format_args(args...));
 }
 
 /**
-  \rst
-  Formats a string and prints it to stdout using ANSI escape sequences to
-  specify text formatting.
-
-  **Example**::
-
-    fmt::print(fmt::emphasis::bold | fg(fmt::color::red),
-               "Elapsed time: {0:.2f} seconds", 1.23);
-  \endrst
+ * Formats a string and prints it to stdout using ANSI escape sequences to
+ * specify text formatting.
+ *
+ * **Example**:
+ *
+ *     fmt::print(fmt::emphasis::bold | fg(fmt::color::red),
+ *                "Elapsed time: {0:.2f} seconds", 1.23);
  */
-template <typename S, typename... Args,
-          FMT_ENABLE_IF(detail::is_string<S>::value)>
-void print(const text_style& ts, const S& format_str, const Args&... args) {
-  return print(stdout, ts, format_str, args...);
+template <typename... T>
+void print(const text_style& ts, format_string<T...> fmt, T&&... args) {
+  return print(stdout, ts, fmt, std::forward<T>(args)...);
 }
 
-template <typename S, typename Char = char_t<S>>
-inline auto vformat(
-    const text_style& ts, const S& format_str,
-    basic_format_args<buffer_context<type_identity_t<Char>>> args)
-    -> std::basic_string<Char> {
-  basic_memory_buffer<Char> buf;
-  detail::vformat_to(buf, ts, detail::to_string_view(format_str), args);
+inline auto vformat(const text_style& ts, string_view fmt, format_args args)
+    -> std::string {
+  auto buf = memory_buffer();
+  detail::vformat_to(buf, ts, fmt, args);
   return fmt::to_string(buf);
 }
 
 /**
-  \rst
-  Formats arguments and returns the result as a string using ANSI
-  escape sequences to specify text formatting.
-
-  **Example**::
-
-    #include <fmt/color.h>
-    std::string message = fmt::format(fmt::emphasis::bold | fg(fmt::color::red),
-                                      "The answer is {}", 42);
-  \endrst
-*/
-template <typename S, typename... Args, typename Char = char_t<S>>
-inline auto format(const text_style& ts, const S& format_str,
-                   const Args&... args) -> std::basic_string<Char> {
-  return fmt::vformat(ts, detail::to_string_view(format_str),
-                      fmt::make_format_args<buffer_context<Char>>(args...));
+ * Formats arguments and returns the result as a string using ANSI escape
+ * sequences to specify text formatting.
+ *
+ * **Example**:
+ *
+ * ```
+ * #include <fmt/color.h>
+ * std::string message = fmt::format(fmt::emphasis::bold | fg(fmt::color::red),
+ *                                   "The answer is {}", 42);
+ * ```
+ */
+template <typename... T>
+inline auto format(const text_style& ts, format_string<T...> fmt, T&&... args)
+    -> std::string {
+  return fmt::vformat(ts, fmt, fmt::make_format_args(args...));
 }
 
-/**
-  Formats a string with the given text_style and writes the output to ``out``.
- */
-template <typename OutputIt, typename Char,
-          FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value)>
-auto vformat_to(OutputIt out, const text_style& ts,
-                basic_string_view<Char> format_str,
-                basic_format_args<buffer_context<type_identity_t<Char>>> args)
-    -> OutputIt {
-  auto&& buf = detail::get_buffer<Char>(out);
-  detail::vformat_to(buf, ts, format_str, args);
+/// Formats a string with the given text_style and writes the output to `out`.
+template <typename OutputIt,
+          FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, char>::value)>
+auto vformat_to(OutputIt out, const text_style& ts, string_view fmt,
+                format_args args) -> OutputIt {
+  auto&& buf = detail::get_buffer<char>(out);
+  detail::vformat_to(buf, ts, fmt, args);
   return detail::get_iterator(buf, out);
 }
 
 /**
-  \rst
-  Formats arguments with the given text_style, writes the result to the output
-  iterator ``out`` and returns the iterator past the end of the output range.
-
-  **Example**::
-
-    std::vector<char> out;
-    fmt::format_to(std::back_inserter(out),
-                   fmt::emphasis::bold | fg(fmt::color::red), "{}", 42);
-  \endrst
-*/
-template <
-    typename OutputIt, typename S, typename... Args,
-    bool enable = detail::is_output_iterator<OutputIt, char_t<S>>::value &&
-                  detail::is_string<S>::value>
-inline auto format_to(OutputIt out, const text_style& ts, const S& format_str,
-                      Args&&... args) ->
-    typename std::enable_if<enable, OutputIt>::type {
-  return vformat_to(out, ts, detail::to_string_view(format_str),
-                    fmt::make_format_args<buffer_context<char_t<S>>>(args...));
+ * Formats arguments with the given text style, writes the result to the output
+ * iterator `out` and returns the iterator past the end of the output range.
+ *
+ * **Example**:
+ *
+ *     std::vector<char> out;
+ *     fmt::format_to(std::back_inserter(out),
+ *                    fmt::emphasis::bold | fg(fmt::color::red), "{}", 42);
+ */
+template <typename OutputIt, typename... T,
+          FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, char>::value)>
+inline auto format_to(OutputIt out, const text_style& ts,
+                      format_string<T...> fmt, T&&... args) -> OutputIt {
+  return vformat_to(out, ts, fmt, fmt::make_format_args(args...));
 }
 
 template <typename T, typename Char>
@@ -620,16 +591,14 @@ struct formatter<detail::styled_arg<T>, Char> : formatter<T, Char> {
 };
 
 /**
-  \rst
-  Returns an argument that will be formatted using ANSI escape sequences,
-  to be used in a formatting function.
-
-  **Example**::
-
-    fmt::print("Elapsed time: {0:.2f} seconds",
-               fmt::styled(1.23, fmt::fg(fmt::color::green) |
-                                 fmt::bg(fmt::color::blue)));
-  \endrst
+ * Returns an argument that will be formatted using ANSI escape sequences,
+ * to be used in a formatting function.
+ *
+ * **Example**:
+ *
+ *     fmt::print("Elapsed time: {0:.2f} seconds",
+ *                fmt::styled(1.23, fmt::fg(fmt::color::green) |
+ *                                  fmt::bg(fmt::color::blue)));
  */
 template <typename T>
 FMT_CONSTEXPR auto styled(const T& value, text_style ts)
diff --git a/contrib/fmt/include/fmt/compile.h b/contrib/fmt/include/fmt/compile.h
index 3b3f166e0..b2afc2c30 100644
--- a/contrib/fmt/include/fmt/compile.h
+++ b/contrib/fmt/include/fmt/compile.h
@@ -8,39 +8,41 @@
 #ifndef FMT_COMPILE_H_
 #define FMT_COMPILE_H_
 
+#ifndef FMT_MODULE
+#  include <iterator>  // std::back_inserter
+#endif
+
 #include "format.h"
 
 FMT_BEGIN_NAMESPACE
+
+// A compile-time string which is compiled into fast formatting code.
+FMT_EXPORT class compiled_string {};
+
 namespace detail {
 
-template <typename Char, typename InputIt>
-FMT_CONSTEXPR inline auto copy_str(InputIt begin, InputIt end,
-                                   counting_iterator it) -> counting_iterator {
+template <typename T, typename InputIt>
+FMT_CONSTEXPR inline auto copy(InputIt begin, InputIt end, counting_iterator it)
+    -> counting_iterator {
   return it + (end - begin);
 }
 
-// A compile-time string which is compiled into fast formatting code.
-class compiled_string {};
-
 template <typename S>
 struct is_compiled_string : std::is_base_of<compiled_string, S> {};
 
 /**
-  \rst
-  Converts a string literal *s* into a format string that will be parsed at
-  compile time and converted into efficient formatting code. Requires C++17
-  ``constexpr if`` compiler support.
-
-  **Example**::
-
-    // Converts 42 into std::string using the most efficient method and no
-    // runtime format string processing.
-    std::string s = fmt::format(FMT_COMPILE("{}"), 42);
-  \endrst
+ * Converts a string literal `s` into a format string that will be parsed at
+ * compile time and converted into efficient formatting code. Requires C++17
+ * `constexpr if` compiler support.
+ *
+ * **Example**:
+ *
+ *     // Converts 42 into std::string using the most efficient method and no
+ *     // runtime format string processing.
+ *     std::string s = fmt::format(FMT_COMPILE("{}"), 42);
  */
 #if defined(__cpp_if_constexpr) && defined(__cpp_return_type_deduction)
-#  define FMT_COMPILE(s) \
-    FMT_STRING_IMPL(s, fmt::detail::compiled_string, explicit)
+#  define FMT_COMPILE(s) FMT_STRING_IMPL(s, fmt::compiled_string, explicit)
 #else
 #  define FMT_COMPILE(s) FMT_STRING(s)
 #endif
@@ -144,9 +146,9 @@ template <typename Char, typename T, int N> struct field {
   template <typename OutputIt, typename... Args>
   constexpr OutputIt format(OutputIt out, const Args&... args) const {
     const T& arg = get_arg_checked<T, N>(args...);
-    if constexpr (std::is_convertible_v<T, basic_string_view<Char>>) {
+    if constexpr (std::is_convertible<T, basic_string_view<Char>>::value) {
       auto s = basic_string_view<Char>(arg);
-      return copy_str<Char>(s.begin(), s.end(), out);
+      return copy<Char>(s.begin(), s.end(), out);
     }
     return write<Char>(out, arg);
   }
@@ -236,13 +238,12 @@ constexpr size_t parse_text(basic_string_view<Char> str, size_t pos) {
 }
 
 template <typename Args, size_t POS, int ID, typename S>
-constexpr auto compile_format_string(S format_str);
+constexpr auto compile_format_string(S fmt);
 
 template <typename Args, size_t POS, int ID, typename T, typename S>
-constexpr auto parse_tail(T head, S format_str) {
-  if constexpr (POS !=
-                basic_string_view<typename S::char_type>(format_str).size()) {
-    constexpr auto tail = compile_format_string<Args, POS, ID>(format_str);
+constexpr auto parse_tail(T head, S fmt) {
+  if constexpr (POS != basic_string_view<typename S::char_type>(fmt).size()) {
+    constexpr auto tail = compile_format_string<Args, POS, ID>(fmt);
     if constexpr (std::is_same<remove_cvref_t<decltype(tail)>,
                                unknown_format>())
       return tail;
@@ -313,14 +314,13 @@ struct field_type<T, enable_if_t<detail::is_named_arg<T>::value>> {
 
 template <typename T, typename Args, size_t END_POS, int ARG_INDEX, int NEXT_ID,
           typename S>
-constexpr auto parse_replacement_field_then_tail(S format_str) {
+constexpr auto parse_replacement_field_then_tail(S fmt) {
   using char_type = typename S::char_type;
-  constexpr auto str = basic_string_view<char_type>(format_str);
+  constexpr auto str = basic_string_view<char_type>(fmt);
   constexpr char_type c = END_POS != str.size() ? str[END_POS] : char_type();
   if constexpr (c == '}') {
     return parse_tail<Args, END_POS + 1, NEXT_ID>(
-        field<char_type, typename field_type<T>::type, ARG_INDEX>(),
-        format_str);
+        field<char_type, typename field_type<T>::type, ARG_INDEX>(), fmt);
   } else if constexpr (c != ':') {
     FMT_THROW(format_error("expected ':'"));
   } else {
@@ -333,7 +333,7 @@ constexpr auto parse_replacement_field_then_tail(S format_str) {
       return parse_tail<Args, result.end + 1, result.next_arg_id>(
           spec_field<char_type, typename field_type<T>::type, ARG_INDEX>{
               result.fmt},
-          format_str);
+          fmt);
     }
   }
 }
@@ -341,22 +341,21 @@ constexpr auto parse_replacement_field_then_tail(S format_str) {
 // Compiles a non-empty format string and returns the compiled representation
 // or unknown_format() on unrecognized input.
 template <typename Args, size_t POS, int ID, typename S>
-constexpr auto compile_format_string(S format_str) {
+constexpr auto compile_format_string(S fmt) {
   using char_type = typename S::char_type;
-  constexpr auto str = basic_string_view<char_type>(format_str);
+  constexpr auto str = basic_string_view<char_type>(fmt);
   if constexpr (str[POS] == '{') {
     if constexpr (POS + 1 == str.size())
       FMT_THROW(format_error("unmatched '{' in format string"));
     if constexpr (str[POS + 1] == '{') {
-      return parse_tail<Args, POS + 2, ID>(make_text(str, POS, 1), format_str);
+      return parse_tail<Args, POS + 2, ID>(make_text(str, POS, 1), fmt);
     } else if constexpr (str[POS + 1] == '}' || str[POS + 1] == ':') {
       static_assert(ID != manual_indexing_id,
                     "cannot switch from manual to automatic argument indexing");
       constexpr auto next_id =
           ID != manual_indexing_id ? ID + 1 : manual_indexing_id;
       return parse_replacement_field_then_tail<get_type<ID, Args>, Args,
-                                               POS + 1, ID, next_id>(
-          format_str);
+                                               POS + 1, ID, next_id>(fmt);
     } else {
       constexpr auto arg_id_result =
           parse_arg_id<ID>(str.data() + POS + 1, str.data() + str.size());
@@ -372,7 +371,7 @@ constexpr auto compile_format_string(S format_str) {
         return parse_replacement_field_then_tail<get_type<arg_index, Args>,
                                                  Args, arg_id_end_pos,
                                                  arg_index, manual_indexing_id>(
-            format_str);
+            fmt);
       } else if constexpr (arg_id_result.arg_id.kind == arg_id_kind::name) {
         constexpr auto arg_index =
             get_arg_index_by_name(arg_id_result.arg_id.val.name, Args{});
@@ -381,11 +380,11 @@ constexpr auto compile_format_string(S format_str) {
               ID != manual_indexing_id ? ID + 1 : manual_indexing_id;
           return parse_replacement_field_then_tail<
               decltype(get_type<arg_index, Args>::value), Args, arg_id_end_pos,
-              arg_index, next_id>(format_str);
+              arg_index, next_id>(fmt);
         } else if constexpr (c == '}') {
           return parse_tail<Args, arg_id_end_pos + 1, ID>(
               runtime_named_field<char_type>{arg_id_result.arg_id.val.name},
-              format_str);
+              fmt);
         } else if constexpr (c == ':') {
           return unknown_format();  // no type info for specs parsing
         }
@@ -394,29 +393,26 @@ constexpr auto compile_format_string(S format_str) {
   } else if constexpr (str[POS] == '}') {
     if constexpr (POS + 1 == str.size())
       FMT_THROW(format_error("unmatched '}' in format string"));
-    return parse_tail<Args, POS + 2, ID>(make_text(str, POS, 1), format_str);
+    return parse_tail<Args, POS + 2, ID>(make_text(str, POS, 1), fmt);
   } else {
     constexpr auto end = parse_text(str, POS + 1);
     if constexpr (end - POS > 1) {
-      return parse_tail<Args, end, ID>(make_text(str, POS, end - POS),
-                                       format_str);
+      return parse_tail<Args, end, ID>(make_text(str, POS, end - POS), fmt);
     } else {
-      return parse_tail<Args, end, ID>(code_unit<char_type>{str[POS]},
-                                       format_str);
+      return parse_tail<Args, end, ID>(code_unit<char_type>{str[POS]}, fmt);
     }
   }
 }
 
 template <typename... Args, typename S,
           FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
-constexpr auto compile(S format_str) {
-  constexpr auto str = basic_string_view<typename S::char_type>(format_str);
+constexpr auto compile(S fmt) {
+  constexpr auto str = basic_string_view<typename S::char_type>(fmt);
   if constexpr (str.size() == 0) {
     return detail::make_text(str, 0, 0);
   } else {
     constexpr auto result =
-        detail::compile_format_string<detail::type_list<Args...>, 0, 0>(
-            format_str);
+        detail::compile_format_string<detail::type_list<Args...>, 0, 0>(fmt);
     return result;
   }
 }
@@ -488,35 +484,33 @@ FMT_CONSTEXPR OutputIt format_to(OutputIt out, const S&, Args&&... args) {
 
 template <typename OutputIt, typename S, typename... Args,
           FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
-auto format_to_n(OutputIt out, size_t n, const S& format_str, Args&&... args)
+auto format_to_n(OutputIt out, size_t n, const S& fmt, Args&&... args)
     -> format_to_n_result<OutputIt> {
   using traits = detail::fixed_buffer_traits;
   auto buf = detail::iterator_buffer<OutputIt, char, traits>(out, n);
-  fmt::format_to(std::back_inserter(buf), format_str,
-                 std::forward<Args>(args)...);
+  fmt::format_to(std::back_inserter(buf), fmt, std::forward<Args>(args)...);
   return {buf.out(), buf.count()};
 }
 
 template <typename S, typename... Args,
           FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
-FMT_CONSTEXPR20 auto formatted_size(const S& format_str, const Args&... args)
+FMT_CONSTEXPR20 auto formatted_size(const S& fmt, const Args&... args)
     -> size_t {
-  return fmt::format_to(detail::counting_iterator(), format_str, args...)
-      .count();
+  return fmt::format_to(detail::counting_iterator(), fmt, args...).count();
 }
 
 template <typename S, typename... Args,
           FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
-void print(std::FILE* f, const S& format_str, const Args&... args) {
+void print(std::FILE* f, const S& fmt, const Args&... args) {
   memory_buffer buffer;
-  fmt::format_to(std::back_inserter(buffer), format_str, args...);
+  fmt::format_to(std::back_inserter(buffer), fmt, args...);
   detail::print(f, {buffer.data(), buffer.size()});
 }
 
 template <typename S, typename... Args,
           FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
-void print(const S& format_str, const Args&... args) {
-  print(stdout, format_str, args...);
+void print(const S& fmt, const Args&... args) {
+  print(stdout, fmt, args...);
 }
 
 #if FMT_USE_NONTYPE_TEMPLATE_ARGS
diff --git a/contrib/fmt/include/fmt/core.h b/contrib/fmt/include/fmt/core.h
index b51c1406a..8ca735f0c 100644
--- a/contrib/fmt/include/fmt/core.h
+++ b/contrib/fmt/include/fmt/core.h
@@ -1,2969 +1,5 @@
-// Formatting library for C++ - the core API for char/UTF-8
-//
-// Copyright (c) 2012 - present, Victor Zverovich
-// All rights reserved.
-//
-// For the license information refer to format.h.
+// This file is only provided for compatibility and may be removed in future
+// versions. Use fmt/base.h if you don't need fmt::format and fmt/format.h
+// otherwise.
 
-#ifndef FMT_CORE_H_
-#define FMT_CORE_H_
-
-#include <cstddef>  // std::byte
-#include <cstdio>   // std::FILE
-#include <cstring>  // std::strlen
-#include <iterator>
-#include <limits>
-#include <memory>  // std::addressof
-#include <string>
-#include <type_traits>
-
-// The fmt library version in the form major * 10000 + minor * 100 + patch.
-#define FMT_VERSION 100201
-
-#if defined(__clang__) && !defined(__ibmxl__)
-#  define FMT_CLANG_VERSION (__clang_major__ * 100 + __clang_minor__)
-#else
-#  define FMT_CLANG_VERSION 0
-#endif
-
-#if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && \
-    !defined(__NVCOMPILER)
-#  define FMT_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
-#else
-#  define FMT_GCC_VERSION 0
-#endif
-
-#ifndef FMT_GCC_PRAGMA
-// Workaround _Pragma bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59884.
-#  if FMT_GCC_VERSION >= 504
-#    define FMT_GCC_PRAGMA(arg) _Pragma(arg)
-#  else
-#    define FMT_GCC_PRAGMA(arg)
-#  endif
-#endif
-
-#ifdef __ICL
-#  define FMT_ICC_VERSION __ICL
-#elif defined(__INTEL_COMPILER)
-#  define FMT_ICC_VERSION __INTEL_COMPILER
-#else
-#  define FMT_ICC_VERSION 0
-#endif
-
-#ifdef _MSC_VER
-#  define FMT_MSC_VERSION _MSC_VER
-#  define FMT_MSC_WARNING(...) __pragma(warning(__VA_ARGS__))
-#else
-#  define FMT_MSC_VERSION 0
-#  define FMT_MSC_WARNING(...)
-#endif
-
-#ifdef _MSVC_LANG
-#  define FMT_CPLUSPLUS _MSVC_LANG
-#else
-#  define FMT_CPLUSPLUS __cplusplus
-#endif
-
-#ifdef __has_feature
-#  define FMT_HAS_FEATURE(x) __has_feature(x)
-#else
-#  define FMT_HAS_FEATURE(x) 0
-#endif
-
-#if defined(__has_include) || FMT_ICC_VERSION >= 1600 || FMT_MSC_VERSION > 1900
-#  define FMT_HAS_INCLUDE(x) __has_include(x)
-#else
-#  define FMT_HAS_INCLUDE(x) 0
-#endif
-
-#ifdef __has_cpp_attribute
-#  define FMT_HAS_CPP_ATTRIBUTE(x) __has_cpp_attribute(x)
-#else
-#  define FMT_HAS_CPP_ATTRIBUTE(x) 0
-#endif
-
-#define FMT_HAS_CPP14_ATTRIBUTE(attribute) \
-  (FMT_CPLUSPLUS >= 201402L && FMT_HAS_CPP_ATTRIBUTE(attribute))
-
-#define FMT_HAS_CPP17_ATTRIBUTE(attribute) \
-  (FMT_CPLUSPLUS >= 201703L && FMT_HAS_CPP_ATTRIBUTE(attribute))
-
-// Check if relaxed C++14 constexpr is supported.
-// GCC doesn't allow throw in constexpr until version 6 (bug 67371).
-#ifndef FMT_USE_CONSTEXPR
-#  if (FMT_HAS_FEATURE(cxx_relaxed_constexpr) || FMT_MSC_VERSION >= 1912 || \
-       (FMT_GCC_VERSION >= 600 && FMT_CPLUSPLUS >= 201402L)) &&             \
-      !FMT_ICC_VERSION && (!defined(__NVCC__) || FMT_CPLUSPLUS >= 202002L)
-#    define FMT_USE_CONSTEXPR 1
-#  else
-#    define FMT_USE_CONSTEXPR 0
-#  endif
-#endif
-#if FMT_USE_CONSTEXPR
-#  define FMT_CONSTEXPR constexpr
-#else
-#  define FMT_CONSTEXPR
-#endif
-
-#if (FMT_CPLUSPLUS >= 202002L ||                                \
-     (FMT_CPLUSPLUS >= 201709L && FMT_GCC_VERSION >= 1002)) &&  \
-    ((!defined(_GLIBCXX_RELEASE) || _GLIBCXX_RELEASE >= 10) &&  \
-     (!defined(_LIBCPP_VERSION) || _LIBCPP_VERSION >= 10000) && \
-     (!FMT_MSC_VERSION || FMT_MSC_VERSION >= 1928)) &&          \
-    defined(__cpp_lib_is_constant_evaluated)
-#  define FMT_CONSTEXPR20 constexpr
-#else
-#  define FMT_CONSTEXPR20
-#endif
-
-// Check if constexpr std::char_traits<>::{compare,length} are supported.
-#if defined(__GLIBCXX__)
-#  if FMT_CPLUSPLUS >= 201703L && defined(_GLIBCXX_RELEASE) && \
-      _GLIBCXX_RELEASE >= 7  // GCC 7+ libstdc++ has _GLIBCXX_RELEASE.
-#    define FMT_CONSTEXPR_CHAR_TRAITS constexpr
-#  endif
-#elif defined(_LIBCPP_VERSION) && FMT_CPLUSPLUS >= 201703L && \
-    _LIBCPP_VERSION >= 4000
-#  define FMT_CONSTEXPR_CHAR_TRAITS constexpr
-#elif FMT_MSC_VERSION >= 1914 && FMT_CPLUSPLUS >= 201703L
-#  define FMT_CONSTEXPR_CHAR_TRAITS constexpr
-#endif
-#ifndef FMT_CONSTEXPR_CHAR_TRAITS
-#  define FMT_CONSTEXPR_CHAR_TRAITS
-#endif
-
-// Check if exceptions are disabled.
-#ifndef FMT_EXCEPTIONS
-#  if (defined(__GNUC__) && !defined(__EXCEPTIONS)) || \
-      (FMT_MSC_VERSION && !_HAS_EXCEPTIONS)
-#    define FMT_EXCEPTIONS 0
-#  else
-#    define FMT_EXCEPTIONS 1
-#  endif
-#endif
-
-// Disable [[noreturn]] on MSVC/NVCC because of bogus unreachable code warnings.
-#if FMT_EXCEPTIONS && FMT_HAS_CPP_ATTRIBUTE(noreturn) && !FMT_MSC_VERSION && \
-    !defined(__NVCC__)
-#  define FMT_NORETURN [[noreturn]]
-#else
-#  define FMT_NORETURN
-#endif
-
-#ifndef FMT_NODISCARD
-#  if FMT_HAS_CPP17_ATTRIBUTE(nodiscard)
-#    define FMT_NODISCARD [[nodiscard]]
-#  else
-#    define FMT_NODISCARD
-#  endif
-#endif
-
-#ifndef FMT_INLINE
-#  if FMT_GCC_VERSION || FMT_CLANG_VERSION
-#    define FMT_INLINE inline __attribute__((always_inline))
-#  else
-#    define FMT_INLINE inline
-#  endif
-#endif
-
-#ifdef _MSC_VER
-#  define FMT_UNCHECKED_ITERATOR(It) \
-    using _Unchecked_type = It  // Mark iterator as checked.
-#else
-#  define FMT_UNCHECKED_ITERATOR(It) using unchecked_type = It
-#endif
-
-#ifndef FMT_BEGIN_NAMESPACE
-#  define FMT_BEGIN_NAMESPACE \
-    namespace fmt {           \
-    inline namespace v10 {
-#  define FMT_END_NAMESPACE \
-    }                       \
-    }
-#endif
-
-#ifndef FMT_EXPORT
-#  define FMT_EXPORT
-#  define FMT_BEGIN_EXPORT
-#  define FMT_END_EXPORT
-#endif
-
-#if FMT_GCC_VERSION || FMT_CLANG_VERSION
-#  define FMT_VISIBILITY(value) __attribute__((visibility(value)))
-#else
-#  define FMT_VISIBILITY(value)
-#endif
-
-#if !defined(FMT_HEADER_ONLY) && defined(_WIN32)
-#  if defined(FMT_LIB_EXPORT)
-#    define FMT_API __declspec(dllexport)
-#  elif defined(FMT_SHARED)
-#    define FMT_API __declspec(dllimport)
-#  endif
-#elif defined(FMT_LIB_EXPORT) || defined(FMT_SHARED)
-#  define FMT_API FMT_VISIBILITY("default")
-#endif
-#ifndef FMT_API
-#  define FMT_API
-#endif
-
-// libc++ supports string_view in pre-c++17.
-#if FMT_HAS_INCLUDE(<string_view>) && \
-    (FMT_CPLUSPLUS >= 201703L || defined(_LIBCPP_VERSION))
-#  include <string_view>
-#  define FMT_USE_STRING_VIEW
-#elif FMT_HAS_INCLUDE("experimental/string_view") && FMT_CPLUSPLUS >= 201402L
-#  include <experimental/string_view>
-#  define FMT_USE_EXPERIMENTAL_STRING_VIEW
-#endif
-
-#ifndef FMT_UNICODE
-#  define FMT_UNICODE !FMT_MSC_VERSION
-#endif
-
-#ifndef FMT_CONSTEVAL
-#  if ((FMT_GCC_VERSION >= 1000 || FMT_CLANG_VERSION >= 1101) && \
-       (!defined(__apple_build_version__) ||                     \
-        __apple_build_version__ >= 14000029L) &&                 \
-       FMT_CPLUSPLUS >= 202002L) ||                              \
-      (defined(__cpp_consteval) &&                               \
-       (!FMT_MSC_VERSION || FMT_MSC_VERSION >= 1929))
-// consteval is broken in MSVC before VS2019 version 16.10 and Apple clang
-// before 14.
-#    define FMT_CONSTEVAL consteval
-#    define FMT_HAS_CONSTEVAL
-#  else
-#    define FMT_CONSTEVAL
-#  endif
-#endif
-
-#ifndef FMT_USE_NONTYPE_TEMPLATE_ARGS
-#  if defined(__cpp_nontype_template_args) &&                  \
-      ((FMT_GCC_VERSION >= 903 && FMT_CPLUSPLUS >= 201709L) || \
-       __cpp_nontype_template_args >= 201911L) &&              \
-      !defined(__NVCOMPILER) && !defined(__LCC__)
-#    define FMT_USE_NONTYPE_TEMPLATE_ARGS 1
-#  else
-#    define FMT_USE_NONTYPE_TEMPLATE_ARGS 0
-#  endif
-#endif
-
-// GCC < 5 requires this-> in decltype
-#ifndef FMT_DECLTYPE_THIS
-#  if FMT_GCC_VERSION && FMT_GCC_VERSION < 500
-#    define FMT_DECLTYPE_THIS this->
-#  else
-#    define FMT_DECLTYPE_THIS
-#  endif
-#endif
-
-// Enable minimal optimizations for more compact code in debug mode.
-FMT_GCC_PRAGMA("GCC push_options")
-#if !defined(__OPTIMIZE__) && !defined(__NVCOMPILER) && !defined(__LCC__) && \
-    !defined(__CUDACC__)
-FMT_GCC_PRAGMA("GCC optimize(\"Og\")")
-#endif
-
-FMT_BEGIN_NAMESPACE
-
-// Implementations of enable_if_t and other metafunctions for older systems.
-template <bool B, typename T = void>
-using enable_if_t = typename std::enable_if<B, T>::type;
-template <bool B, typename T, typename F>
-using conditional_t = typename std::conditional<B, T, F>::type;
-template <bool B> using bool_constant = std::integral_constant<bool, B>;
-template <typename T>
-using remove_reference_t = typename std::remove_reference<T>::type;
-template <typename T>
-using remove_const_t = typename std::remove_const<T>::type;
-template <typename T>
-using remove_cvref_t = typename std::remove_cv<remove_reference_t<T>>::type;
-template <typename T> struct type_identity {
-  using type = T;
-};
-template <typename T> using type_identity_t = typename type_identity<T>::type;
-template <typename T>
-using underlying_t = typename std::underlying_type<T>::type;
-
-// Checks whether T is a container with contiguous storage.
-template <typename T> struct is_contiguous : std::false_type {};
-template <typename Char>
-struct is_contiguous<std::basic_string<Char>> : std::true_type {};
-
-struct monostate {
-  constexpr monostate() {}
-};
-
-// An enable_if helper to be used in template parameters which results in much
-// shorter symbols: https://godbolt.org/z/sWw4vP. Extra parentheses are needed
-// to workaround a bug in MSVC 2019 (see #1140 and #1186).
-#ifdef FMT_DOC
-#  define FMT_ENABLE_IF(...)
-#else
-#  define FMT_ENABLE_IF(...) fmt::enable_if_t<(__VA_ARGS__), int> = 0
-#endif
-
-// This is defined in core.h instead of format.h to avoid injecting in std.
-// It is a template to avoid undesirable implicit conversions to std::byte.
-#ifdef __cpp_lib_byte
-template <typename T, FMT_ENABLE_IF(std::is_same<T, std::byte>::value)>
-inline auto format_as(T b) -> unsigned char {
-  return static_cast<unsigned char>(b);
-}
-#endif
-
-namespace detail {
-// Suppresses "unused variable" warnings with the method described in
-// https://herbsutter.com/2009/10/18/mailbag-shutting-up-compiler-warnings/.
-// (void)var does not work on many Intel compilers.
-template <typename... T> FMT_CONSTEXPR void ignore_unused(const T&...) {}
-
-constexpr FMT_INLINE auto is_constant_evaluated(
-    bool default_value = false) noexcept -> bool {
-// Workaround for incompatibility between libstdc++ consteval-based
-// std::is_constant_evaluated() implementation and clang-14.
-// https://github.com/fmtlib/fmt/issues/3247
-#if FMT_CPLUSPLUS >= 202002L && defined(_GLIBCXX_RELEASE) && \
-    _GLIBCXX_RELEASE >= 12 &&                                \
-    (FMT_CLANG_VERSION >= 1400 && FMT_CLANG_VERSION < 1500)
-  ignore_unused(default_value);
-  return __builtin_is_constant_evaluated();
-#elif defined(__cpp_lib_is_constant_evaluated)
-  ignore_unused(default_value);
-  return std::is_constant_evaluated();
-#else
-  return default_value;
-#endif
-}
-
-// Suppresses "conditional expression is constant" warnings.
-template <typename T> constexpr FMT_INLINE auto const_check(T value) -> T {
-  return value;
-}
-
-FMT_NORETURN FMT_API void assert_fail(const char* file, int line,
-                                      const char* message);
-
-#ifndef FMT_ASSERT
-#  ifdef NDEBUG
-// FMT_ASSERT is not empty to avoid -Wempty-body.
-#    define FMT_ASSERT(condition, message) \
-      fmt::detail::ignore_unused((condition), (message))
-#  else
-#    define FMT_ASSERT(condition, message)                                    \
-      ((condition) /* void() fails with -Winvalid-constexpr on clang 4.0.1 */ \
-           ? (void)0                                                          \
-           : fmt::detail::assert_fail(__FILE__, __LINE__, (message)))
-#  endif
-#endif
-
-#if defined(FMT_USE_STRING_VIEW)
-template <typename Char> using std_string_view = std::basic_string_view<Char>;
-#elif defined(FMT_USE_EXPERIMENTAL_STRING_VIEW)
-template <typename Char>
-using std_string_view = std::experimental::basic_string_view<Char>;
-#else
-template <typename T> struct std_string_view {};
-#endif
-
-#ifdef FMT_USE_INT128
-// Do nothing.
-#elif defined(__SIZEOF_INT128__) && !defined(__NVCC__) && \
-    !(FMT_CLANG_VERSION && FMT_MSC_VERSION)
-#  define FMT_USE_INT128 1
-using int128_opt = __int128_t;  // An optional native 128-bit integer.
-using uint128_opt = __uint128_t;
-template <typename T> inline auto convert_for_visit(T value) -> T {
-  return value;
-}
-#else
-#  define FMT_USE_INT128 0
-#endif
-#if !FMT_USE_INT128
-enum class int128_opt {};
-enum class uint128_opt {};
-// Reduce template instantiations.
-template <typename T> auto convert_for_visit(T) -> monostate { return {}; }
-#endif
-
-// Casts a nonnegative integer to unsigned.
-template <typename Int>
-FMT_CONSTEXPR auto to_unsigned(Int value) ->
-    typename std::make_unsigned<Int>::type {
-  FMT_ASSERT(std::is_unsigned<Int>::value || value >= 0, "negative value");
-  return static_cast<typename std::make_unsigned<Int>::type>(value);
-}
-
-FMT_CONSTEXPR inline auto is_utf8() -> bool {
-  FMT_MSC_WARNING(suppress : 4566) constexpr unsigned char section[] = "\u00A7";
-
-  // Avoid buggy sign extensions in MSVC's constant evaluation mode (#2297).
-  using uchar = unsigned char;
-  return FMT_UNICODE || (sizeof(section) == 3 && uchar(section[0]) == 0xC2 &&
-                         uchar(section[1]) == 0xA7);
-}
-}  // namespace detail
-
-/**
-  An implementation of ``std::basic_string_view`` for pre-C++17. It provides a
-  subset of the API. ``fmt::basic_string_view`` is used for format strings even
-  if ``std::string_view`` is available to prevent issues when a library is
-  compiled with a different ``-std`` option than the client code (which is not
-  recommended).
- */
-FMT_EXPORT
-template <typename Char> class basic_string_view {
- private:
-  const Char* data_;
-  size_t size_;
-
- public:
-  using value_type = Char;
-  using iterator = const Char*;
-
-  constexpr basic_string_view() noexcept : data_(nullptr), size_(0) {}
-
-  /** Constructs a string reference object from a C string and a size. */
-  constexpr basic_string_view(const Char* s, size_t count) noexcept
-      : data_(s), size_(count) {}
-
-  /**
-    \rst
-    Constructs a string reference object from a C string computing
-    the size with ``std::char_traits<Char>::length``.
-    \endrst
-   */
-  FMT_CONSTEXPR_CHAR_TRAITS
-  FMT_INLINE
-  basic_string_view(const Char* s)
-      : data_(s),
-        size_(detail::const_check(std::is_same<Char, char>::value &&
-                                  !detail::is_constant_evaluated(true))
-                  ? std::strlen(reinterpret_cast<const char*>(s))
-                  : std::char_traits<Char>::length(s)) {}
-
-  /** Constructs a string reference from a ``std::basic_string`` object. */
-  template <typename Traits, typename Alloc>
-  FMT_CONSTEXPR basic_string_view(
-      const std::basic_string<Char, Traits, Alloc>& s) noexcept
-      : data_(s.data()), size_(s.size()) {}
-
-  template <typename S, FMT_ENABLE_IF(std::is_same<
-                                      S, detail::std_string_view<Char>>::value)>
-  FMT_CONSTEXPR basic_string_view(S s) noexcept
-      : data_(s.data()), size_(s.size()) {}
-
-  /** Returns a pointer to the string data. */
-  constexpr auto data() const noexcept -> const Char* { return data_; }
-
-  /** Returns the string size. */
-  constexpr auto size() const noexcept -> size_t { return size_; }
-
-  constexpr auto begin() const noexcept -> iterator { return data_; }
-  constexpr auto end() const noexcept -> iterator { return data_ + size_; }
-
-  constexpr auto operator[](size_t pos) const noexcept -> const Char& {
-    return data_[pos];
-  }
-
-  FMT_CONSTEXPR void remove_prefix(size_t n) noexcept {
-    data_ += n;
-    size_ -= n;
-  }
-
-  FMT_CONSTEXPR_CHAR_TRAITS auto starts_with(
-      basic_string_view<Char> sv) const noexcept -> bool {
-    return size_ >= sv.size_ &&
-           std::char_traits<Char>::compare(data_, sv.data_, sv.size_) == 0;
-  }
-  FMT_CONSTEXPR_CHAR_TRAITS auto starts_with(Char c) const noexcept -> bool {
-    return size_ >= 1 && std::char_traits<Char>::eq(*data_, c);
-  }
-  FMT_CONSTEXPR_CHAR_TRAITS auto starts_with(const Char* s) const -> bool {
-    return starts_with(basic_string_view<Char>(s));
-  }
-
-  // Lexicographically compare this string reference to other.
-  FMT_CONSTEXPR_CHAR_TRAITS auto compare(basic_string_view other) const -> int {
-    size_t str_size = size_ < other.size_ ? size_ : other.size_;
-    int result = std::char_traits<Char>::compare(data_, other.data_, str_size);
-    if (result == 0)
-      result = size_ == other.size_ ? 0 : (size_ < other.size_ ? -1 : 1);
-    return result;
-  }
-
-  FMT_CONSTEXPR_CHAR_TRAITS friend auto operator==(basic_string_view lhs,
-                                                   basic_string_view rhs)
-      -> bool {
-    return lhs.compare(rhs) == 0;
-  }
-  friend auto operator!=(basic_string_view lhs, basic_string_view rhs) -> bool {
-    return lhs.compare(rhs) != 0;
-  }
-  friend auto operator<(basic_string_view lhs, basic_string_view rhs) -> bool {
-    return lhs.compare(rhs) < 0;
-  }
-  friend auto operator<=(basic_string_view lhs, basic_string_view rhs) -> bool {
-    return lhs.compare(rhs) <= 0;
-  }
-  friend auto operator>(basic_string_view lhs, basic_string_view rhs) -> bool {
-    return lhs.compare(rhs) > 0;
-  }
-  friend auto operator>=(basic_string_view lhs, basic_string_view rhs) -> bool {
-    return lhs.compare(rhs) >= 0;
-  }
-};
-
-FMT_EXPORT
-using string_view = basic_string_view<char>;
-
-/** Specifies if ``T`` is a character type. Can be specialized by users. */
-FMT_EXPORT
-template <typename T> struct is_char : std::false_type {};
-template <> struct is_char<char> : std::true_type {};
-
-namespace detail {
-
-// A base class for compile-time strings.
-struct compile_string {};
-
-template <typename S>
-struct is_compile_string : std::is_base_of<compile_string, S> {};
-
-template <typename Char, FMT_ENABLE_IF(is_char<Char>::value)>
-FMT_INLINE auto to_string_view(const Char* s) -> basic_string_view<Char> {
-  return s;
-}
-template <typename Char, typename Traits, typename Alloc>
-inline auto to_string_view(const std::basic_string<Char, Traits, Alloc>& s)
-    -> basic_string_view<Char> {
-  return s;
-}
-template <typename Char>
-constexpr auto to_string_view(basic_string_view<Char> s)
-    -> basic_string_view<Char> {
-  return s;
-}
-template <typename Char,
-          FMT_ENABLE_IF(!std::is_empty<std_string_view<Char>>::value)>
-inline auto to_string_view(std_string_view<Char> s) -> basic_string_view<Char> {
-  return s;
-}
-template <typename S, FMT_ENABLE_IF(is_compile_string<S>::value)>
-constexpr auto to_string_view(const S& s)
-    -> basic_string_view<typename S::char_type> {
-  return basic_string_view<typename S::char_type>(s);
-}
-void to_string_view(...);
-
-// Specifies whether S is a string type convertible to fmt::basic_string_view.
-// It should be a constexpr function but MSVC 2017 fails to compile it in
-// enable_if and MSVC 2015 fails to compile it as an alias template.
-// ADL is intentionally disabled as to_string_view is not an extension point.
-template <typename S>
-struct is_string
-    : std::is_class<decltype(detail::to_string_view(std::declval<S>()))> {};
-
-template <typename S, typename = void> struct char_t_impl {};
-template <typename S> struct char_t_impl<S, enable_if_t<is_string<S>::value>> {
-  using result = decltype(to_string_view(std::declval<S>()));
-  using type = typename result::value_type;
-};
-
-enum class type {
-  none_type,
-  // Integer types should go first,
-  int_type,
-  uint_type,
-  long_long_type,
-  ulong_long_type,
-  int128_type,
-  uint128_type,
-  bool_type,
-  char_type,
-  last_integer_type = char_type,
-  // followed by floating-point types.
-  float_type,
-  double_type,
-  long_double_type,
-  last_numeric_type = long_double_type,
-  cstring_type,
-  string_type,
-  pointer_type,
-  custom_type
-};
-
-// Maps core type T to the corresponding type enum constant.
-template <typename T, typename Char>
-struct type_constant : std::integral_constant<type, type::custom_type> {};
-
-#define FMT_TYPE_CONSTANT(Type, constant) \
-  template <typename Char>                \
-  struct type_constant<Type, Char>        \
-      : std::integral_constant<type, type::constant> {}
-
-FMT_TYPE_CONSTANT(int, int_type);
-FMT_TYPE_CONSTANT(unsigned, uint_type);
-FMT_TYPE_CONSTANT(long long, long_long_type);
-FMT_TYPE_CONSTANT(unsigned long long, ulong_long_type);
-FMT_TYPE_CONSTANT(int128_opt, int128_type);
-FMT_TYPE_CONSTANT(uint128_opt, uint128_type);
-FMT_TYPE_CONSTANT(bool, bool_type);
-FMT_TYPE_CONSTANT(Char, char_type);
-FMT_TYPE_CONSTANT(float, float_type);
-FMT_TYPE_CONSTANT(double, double_type);
-FMT_TYPE_CONSTANT(long double, long_double_type);
-FMT_TYPE_CONSTANT(const Char*, cstring_type);
-FMT_TYPE_CONSTANT(basic_string_view<Char>, string_type);
-FMT_TYPE_CONSTANT(const void*, pointer_type);
-
-constexpr auto is_integral_type(type t) -> bool {
-  return t > type::none_type && t <= type::last_integer_type;
-}
-constexpr auto is_arithmetic_type(type t) -> bool {
-  return t > type::none_type && t <= type::last_numeric_type;
-}
-
-constexpr auto set(type rhs) -> int { return 1 << static_cast<int>(rhs); }
-constexpr auto in(type t, int set) -> bool {
-  return ((set >> static_cast<int>(t)) & 1) != 0;
-}
-
-// Bitsets of types.
-enum {
-  sint_set =
-      set(type::int_type) | set(type::long_long_type) | set(type::int128_type),
-  uint_set = set(type::uint_type) | set(type::ulong_long_type) |
-             set(type::uint128_type),
-  bool_set = set(type::bool_type),
-  char_set = set(type::char_type),
-  float_set = set(type::float_type) | set(type::double_type) |
-              set(type::long_double_type),
-  string_set = set(type::string_type),
-  cstring_set = set(type::cstring_type),
-  pointer_set = set(type::pointer_type)
-};
-
-// DEPRECATED!
-FMT_NORETURN FMT_API void throw_format_error(const char* message);
-
-struct error_handler {
-  constexpr error_handler() = default;
-
-  // This function is intentionally not constexpr to give a compile-time error.
-  FMT_NORETURN void on_error(const char* message) {
-    throw_format_error(message);
-  }
-};
-}  // namespace detail
-
-/** Throws ``format_error`` with a given message. */
-using detail::throw_format_error;
-
-/** String's character type. */
-template <typename S> using char_t = typename detail::char_t_impl<S>::type;
-
-/**
-  \rst
-  Parsing context consisting of a format string range being parsed and an
-  argument counter for automatic indexing.
-  You can use the ``format_parse_context`` type alias for ``char`` instead.
-  \endrst
- */
-FMT_EXPORT
-template <typename Char> class basic_format_parse_context {
- private:
-  basic_string_view<Char> format_str_;
-  int next_arg_id_;
-
-  FMT_CONSTEXPR void do_check_arg_id(int id);
-
- public:
-  using char_type = Char;
-  using iterator = const Char*;
-
-  explicit constexpr basic_format_parse_context(
-      basic_string_view<Char> format_str, int next_arg_id = 0)
-      : format_str_(format_str), next_arg_id_(next_arg_id) {}
-
-  /**
-    Returns an iterator to the beginning of the format string range being
-    parsed.
-   */
-  constexpr auto begin() const noexcept -> iterator {
-    return format_str_.begin();
-  }
-
-  /**
-    Returns an iterator past the end of the format string range being parsed.
-   */
-  constexpr auto end() const noexcept -> iterator { return format_str_.end(); }
-
-  /** Advances the begin iterator to ``it``. */
-  FMT_CONSTEXPR void advance_to(iterator it) {
-    format_str_.remove_prefix(detail::to_unsigned(it - begin()));
-  }
-
-  /**
-    Reports an error if using the manual argument indexing; otherwise returns
-    the next argument index and switches to the automatic indexing.
-   */
-  FMT_CONSTEXPR auto next_arg_id() -> int {
-    if (next_arg_id_ < 0) {
-      detail::throw_format_error(
-          "cannot switch from manual to automatic argument indexing");
-      return 0;
-    }
-    int id = next_arg_id_++;
-    do_check_arg_id(id);
-    return id;
-  }
-
-  /**
-    Reports an error if using the automatic argument indexing; otherwise
-    switches to the manual indexing.
-   */
-  FMT_CONSTEXPR void check_arg_id(int id) {
-    if (next_arg_id_ > 0) {
-      detail::throw_format_error(
-          "cannot switch from automatic to manual argument indexing");
-      return;
-    }
-    next_arg_id_ = -1;
-    do_check_arg_id(id);
-  }
-  FMT_CONSTEXPR void check_arg_id(basic_string_view<Char>) {}
-  FMT_CONSTEXPR void check_dynamic_spec(int arg_id);
-};
-
-FMT_EXPORT
-using format_parse_context = basic_format_parse_context<char>;
-
-namespace detail {
-// A parse context with extra data used only in compile-time checks.
-template <typename Char>
-class compile_parse_context : public basic_format_parse_context<Char> {
- private:
-  int num_args_;
-  const type* types_;
-  using base = basic_format_parse_context<Char>;
-
- public:
-  explicit FMT_CONSTEXPR compile_parse_context(
-      basic_string_view<Char> format_str, int num_args, const type* types,
-      int next_arg_id = 0)
-      : base(format_str, next_arg_id), num_args_(num_args), types_(types) {}
-
-  constexpr auto num_args() const -> int { return num_args_; }
-  constexpr auto arg_type(int id) const -> type { return types_[id]; }
-
-  FMT_CONSTEXPR auto next_arg_id() -> int {
-    int id = base::next_arg_id();
-    if (id >= num_args_) throw_format_error("argument not found");
-    return id;
-  }
-
-  FMT_CONSTEXPR void check_arg_id(int id) {
-    base::check_arg_id(id);
-    if (id >= num_args_) throw_format_error("argument not found");
-  }
-  using base::check_arg_id;
-
-  FMT_CONSTEXPR void check_dynamic_spec(int arg_id) {
-    detail::ignore_unused(arg_id);
-#if !defined(__LCC__)
-    if (arg_id < num_args_ && types_ && !is_integral_type(types_[arg_id]))
-      throw_format_error("width/precision is not integer");
-#endif
-  }
-};
-
-// Extracts a reference to the container from back_insert_iterator.
-template <typename Container>
-inline auto get_container(std::back_insert_iterator<Container> it)
-    -> Container& {
-  using base = std::back_insert_iterator<Container>;
-  struct accessor : base {
-    accessor(base b) : base(b) {}
-    using base::container;
-  };
-  return *accessor(it).container;
-}
-
-template <typename Char, typename InputIt, typename OutputIt>
-FMT_CONSTEXPR auto copy_str(InputIt begin, InputIt end, OutputIt out)
-    -> OutputIt {
-  while (begin != end) *out++ = static_cast<Char>(*begin++);
-  return out;
-}
-
-template <typename Char, typename T, typename U,
-          FMT_ENABLE_IF(
-              std::is_same<remove_const_t<T>, U>::value&& is_char<U>::value)>
-FMT_CONSTEXPR auto copy_str(T* begin, T* end, U* out) -> U* {
-  if (is_constant_evaluated()) return copy_str<Char, T*, U*>(begin, end, out);
-  auto size = to_unsigned(end - begin);
-  if (size > 0) memcpy(out, begin, size * sizeof(U));
-  return out + size;
-}
-
-/**
-  \rst
-  A contiguous memory buffer with an optional growing ability. It is an internal
-  class and shouldn't be used directly, only via `~fmt::basic_memory_buffer`.
-  \endrst
- */
-template <typename T> class buffer {
- private:
-  T* ptr_;
-  size_t size_;
-  size_t capacity_;
-
- protected:
-  // Don't initialize ptr_ since it is not accessed to save a few cycles.
-  FMT_MSC_WARNING(suppress : 26495)
-  FMT_CONSTEXPR buffer(size_t sz) noexcept : size_(sz), capacity_(sz) {}
-
-  FMT_CONSTEXPR20 buffer(T* p = nullptr, size_t sz = 0, size_t cap = 0) noexcept
-      : ptr_(p), size_(sz), capacity_(cap) {}
-
-  FMT_CONSTEXPR20 ~buffer() = default;
-  buffer(buffer&&) = default;
-
-  /** Sets the buffer data and capacity. */
-  FMT_CONSTEXPR void set(T* buf_data, size_t buf_capacity) noexcept {
-    ptr_ = buf_data;
-    capacity_ = buf_capacity;
-  }
-
-  /** Increases the buffer capacity to hold at least *capacity* elements. */
-  // DEPRECATED!
-  virtual FMT_CONSTEXPR20 void grow(size_t capacity) = 0;
-
- public:
-  using value_type = T;
-  using const_reference = const T&;
-
-  buffer(const buffer&) = delete;
-  void operator=(const buffer&) = delete;
-
-  FMT_INLINE auto begin() noexcept -> T* { return ptr_; }
-  FMT_INLINE auto end() noexcept -> T* { return ptr_ + size_; }
-
-  FMT_INLINE auto begin() const noexcept -> const T* { return ptr_; }
-  FMT_INLINE auto end() const noexcept -> const T* { return ptr_ + size_; }
-
-  /** Returns the size of this buffer. */
-  constexpr auto size() const noexcept -> size_t { return size_; }
-
-  /** Returns the capacity of this buffer. */
-  constexpr auto capacity() const noexcept -> size_t { return capacity_; }
-
-  /** Returns a pointer to the buffer data (not null-terminated). */
-  FMT_CONSTEXPR auto data() noexcept -> T* { return ptr_; }
-  FMT_CONSTEXPR auto data() const noexcept -> const T* { return ptr_; }
-
-  /** Clears this buffer. */
-  void clear() { size_ = 0; }
-
-  // Tries resizing the buffer to contain *count* elements. If T is a POD type
-  // the new elements may not be initialized.
-  FMT_CONSTEXPR20 void try_resize(size_t count) {
-    try_reserve(count);
-    size_ = count <= capacity_ ? count : capacity_;
-  }
-
-  // Tries increasing the buffer capacity to *new_capacity*. It can increase the
-  // capacity by a smaller amount than requested but guarantees there is space
-  // for at least one additional element either by increasing the capacity or by
-  // flushing the buffer if it is full.
-  FMT_CONSTEXPR20 void try_reserve(size_t new_capacity) {
-    if (new_capacity > capacity_) grow(new_capacity);
-  }
-
-  FMT_CONSTEXPR20 void push_back(const T& value) {
-    try_reserve(size_ + 1);
-    ptr_[size_++] = value;
-  }
-
-  /** Appends data to the end of the buffer. */
-  template <typename U> void append(const U* begin, const U* end);
-
-  template <typename Idx> FMT_CONSTEXPR auto operator[](Idx index) -> T& {
-    return ptr_[index];
-  }
-  template <typename Idx>
-  FMT_CONSTEXPR auto operator[](Idx index) const -> const T& {
-    return ptr_[index];
-  }
-};
-
-struct buffer_traits {
-  explicit buffer_traits(size_t) {}
-  auto count() const -> size_t { return 0; }
-  auto limit(size_t size) -> size_t { return size; }
-};
-
-class fixed_buffer_traits {
- private:
-  size_t count_ = 0;
-  size_t limit_;
-
- public:
-  explicit fixed_buffer_traits(size_t limit) : limit_(limit) {}
-  auto count() const -> size_t { return count_; }
-  auto limit(size_t size) -> size_t {
-    size_t n = limit_ > count_ ? limit_ - count_ : 0;
-    count_ += size;
-    return size < n ? size : n;
-  }
-};
-
-// A buffer that writes to an output iterator when flushed.
-template <typename OutputIt, typename T, typename Traits = buffer_traits>
-class iterator_buffer final : public Traits, public buffer<T> {
- private:
-  OutputIt out_;
-  enum { buffer_size = 256 };
-  T data_[buffer_size];
-
- protected:
-  FMT_CONSTEXPR20 void grow(size_t) override {
-    if (this->size() == buffer_size) flush();
-  }
-
-  void flush() {
-    auto size = this->size();
-    this->clear();
-    out_ = copy_str<T>(data_, data_ + this->limit(size), out_);
-  }
-
- public:
-  explicit iterator_buffer(OutputIt out, size_t n = buffer_size)
-      : Traits(n), buffer<T>(data_, 0, buffer_size), out_(out) {}
-  iterator_buffer(iterator_buffer&& other)
-      : Traits(other), buffer<T>(data_, 0, buffer_size), out_(other.out_) {}
-  ~iterator_buffer() { flush(); }
-
-  auto out() -> OutputIt {
-    flush();
-    return out_;
-  }
-  auto count() const -> size_t { return Traits::count() + this->size(); }
-};
-
-template <typename T>
-class iterator_buffer<T*, T, fixed_buffer_traits> final
-    : public fixed_buffer_traits,
-      public buffer<T> {
- private:
-  T* out_;
-  enum { buffer_size = 256 };
-  T data_[buffer_size];
-
- protected:
-  FMT_CONSTEXPR20 void grow(size_t) override {
-    if (this->size() == this->capacity()) flush();
-  }
-
-  void flush() {
-    size_t n = this->limit(this->size());
-    if (this->data() == out_) {
-      out_ += n;
-      this->set(data_, buffer_size);
-    }
-    this->clear();
-  }
-
- public:
-  explicit iterator_buffer(T* out, size_t n = buffer_size)
-      : fixed_buffer_traits(n), buffer<T>(out, 0, n), out_(out) {}
-  iterator_buffer(iterator_buffer&& other)
-      : fixed_buffer_traits(other),
-        buffer<T>(std::move(other)),
-        out_(other.out_) {
-    if (this->data() != out_) {
-      this->set(data_, buffer_size);
-      this->clear();
-    }
-  }
-  ~iterator_buffer() { flush(); }
-
-  auto out() -> T* {
-    flush();
-    return out_;
-  }
-  auto count() const -> size_t {
-    return fixed_buffer_traits::count() + this->size();
-  }
-};
-
-template <typename T> class iterator_buffer<T*, T> final : public buffer<T> {
- protected:
-  FMT_CONSTEXPR20 void grow(size_t) override {}
-
- public:
-  explicit iterator_buffer(T* out, size_t = 0) : buffer<T>(out, 0, ~size_t()) {}
-
-  auto out() -> T* { return &*this->end(); }
-};
-
-// A buffer that writes to a container with the contiguous storage.
-template <typename Container>
-class iterator_buffer<std::back_insert_iterator<Container>,
-                      enable_if_t<is_contiguous<Container>::value,
-                                  typename Container::value_type>>
-    final : public buffer<typename Container::value_type> {
- private:
-  Container& container_;
-
- protected:
-  FMT_CONSTEXPR20 void grow(size_t capacity) override {
-    container_.resize(capacity);
-    this->set(&container_[0], capacity);
-  }
-
- public:
-  explicit iterator_buffer(Container& c)
-      : buffer<typename Container::value_type>(c.size()), container_(c) {}
-  explicit iterator_buffer(std::back_insert_iterator<Container> out, size_t = 0)
-      : iterator_buffer(get_container(out)) {}
-
-  auto out() -> std::back_insert_iterator<Container> {
-    return std::back_inserter(container_);
-  }
-};
-
-// A buffer that counts the number of code units written discarding the output.
-template <typename T = char> class counting_buffer final : public buffer<T> {
- private:
-  enum { buffer_size = 256 };
-  T data_[buffer_size];
-  size_t count_ = 0;
-
- protected:
-  FMT_CONSTEXPR20 void grow(size_t) override {
-    if (this->size() != buffer_size) return;
-    count_ += this->size();
-    this->clear();
-  }
-
- public:
-  counting_buffer() : buffer<T>(data_, 0, buffer_size) {}
-
-  auto count() -> size_t { return count_ + this->size(); }
-};
-}  // namespace detail
-
-template <typename Char>
-FMT_CONSTEXPR void basic_format_parse_context<Char>::do_check_arg_id(int id) {
-  // Argument id is only checked at compile-time during parsing because
-  // formatting has its own validation.
-  if (detail::is_constant_evaluated() &&
-      (!FMT_GCC_VERSION || FMT_GCC_VERSION >= 1200)) {
-    using context = detail::compile_parse_context<Char>;
-    if (id >= static_cast<context*>(this)->num_args())
-      detail::throw_format_error("argument not found");
-  }
-}
-
-template <typename Char>
-FMT_CONSTEXPR void basic_format_parse_context<Char>::check_dynamic_spec(
-    int arg_id) {
-  if (detail::is_constant_evaluated() &&
-      (!FMT_GCC_VERSION || FMT_GCC_VERSION >= 1200)) {
-    using context = detail::compile_parse_context<Char>;
-    static_cast<context*>(this)->check_dynamic_spec(arg_id);
-  }
-}
-
-FMT_EXPORT template <typename Context> class basic_format_arg;
-FMT_EXPORT template <typename Context> class basic_format_args;
-FMT_EXPORT template <typename Context> class dynamic_format_arg_store;
-
-// A formatter for objects of type T.
-FMT_EXPORT
-template <typename T, typename Char = char, typename Enable = void>
-struct formatter {
-  // A deleted default constructor indicates a disabled formatter.
-  formatter() = delete;
-};
-
-// Specifies if T has an enabled formatter specialization. A type can be
-// formattable even if it doesn't have a formatter e.g. via a conversion.
-template <typename T, typename Context>
-using has_formatter =
-    std::is_constructible<typename Context::template formatter_type<T>>;
-
-// An output iterator that appends to a buffer.
-// It is used to reduce symbol sizes for the common case.
-class appender : public std::back_insert_iterator<detail::buffer<char>> {
-  using base = std::back_insert_iterator<detail::buffer<char>>;
-
- public:
-  using std::back_insert_iterator<detail::buffer<char>>::back_insert_iterator;
-  appender(base it) noexcept : base(it) {}
-  FMT_UNCHECKED_ITERATOR(appender);
-
-  auto operator++() noexcept -> appender& { return *this; }
-  auto operator++(int) noexcept -> appender { return *this; }
-};
-
-namespace detail {
-
-template <typename Context, typename T>
-constexpr auto has_const_formatter_impl(T*)
-    -> decltype(typename Context::template formatter_type<T>().format(
-                    std::declval<const T&>(), std::declval<Context&>()),
-                true) {
-  return true;
-}
-template <typename Context>
-constexpr auto has_const_formatter_impl(...) -> bool {
-  return false;
-}
-template <typename T, typename Context>
-constexpr auto has_const_formatter() -> bool {
-  return has_const_formatter_impl<Context>(static_cast<T*>(nullptr));
-}
-
-template <typename T>
-using buffer_appender = conditional_t<std::is_same<T, char>::value, appender,
-                                      std::back_insert_iterator<buffer<T>>>;
-
-// Maps an output iterator to a buffer.
-template <typename T, typename OutputIt>
-auto get_buffer(OutputIt out) -> iterator_buffer<OutputIt, T> {
-  return iterator_buffer<OutputIt, T>(out);
-}
-template <typename T, typename Buf,
-          FMT_ENABLE_IF(std::is_base_of<buffer<char>, Buf>::value)>
-auto get_buffer(std::back_insert_iterator<Buf> out) -> buffer<char>& {
-  return get_container(out);
-}
-
-template <typename Buf, typename OutputIt>
-FMT_INLINE auto get_iterator(Buf& buf, OutputIt) -> decltype(buf.out()) {
-  return buf.out();
-}
-template <typename T, typename OutputIt>
-auto get_iterator(buffer<T>&, OutputIt out) -> OutputIt {
-  return out;
-}
-
-struct view {};
-
-template <typename Char, typename T> struct named_arg : view {
-  const Char* name;
-  const T& value;
-  named_arg(const Char* n, const T& v) : name(n), value(v) {}
-};
-
-template <typename Char> struct named_arg_info {
-  const Char* name;
-  int id;
-};
-
-template <typename T, typename Char, size_t NUM_ARGS, size_t NUM_NAMED_ARGS>
-struct arg_data {
-  // args_[0].named_args points to named_args_ to avoid bloating format_args.
-  // +1 to workaround a bug in gcc 7.5 that causes duplicated-branches warning.
-  T args_[1 + (NUM_ARGS != 0 ? NUM_ARGS : +1)];
-  named_arg_info<Char> named_args_[NUM_NAMED_ARGS];
-
-  template <typename... U>
-  arg_data(const U&... init) : args_{T(named_args_, NUM_NAMED_ARGS), init...} {}
-  arg_data(const arg_data& other) = delete;
-  auto args() const -> const T* { return args_ + 1; }
-  auto named_args() -> named_arg_info<Char>* { return named_args_; }
-};
-
-template <typename T, typename Char, size_t NUM_ARGS>
-struct arg_data<T, Char, NUM_ARGS, 0> {
-  // +1 to workaround a bug in gcc 7.5 that causes duplicated-branches warning.
-  T args_[NUM_ARGS != 0 ? NUM_ARGS : +1];
-
-  template <typename... U>
-  FMT_CONSTEXPR FMT_INLINE arg_data(const U&... init) : args_{init...} {}
-  FMT_CONSTEXPR FMT_INLINE auto args() const -> const T* { return args_; }
-  FMT_CONSTEXPR FMT_INLINE auto named_args() -> std::nullptr_t {
-    return nullptr;
-  }
-};
-
-template <typename Char>
-inline void init_named_args(named_arg_info<Char>*, int, int) {}
-
-template <typename T> struct is_named_arg : std::false_type {};
-template <typename T> struct is_statically_named_arg : std::false_type {};
-
-template <typename T, typename Char>
-struct is_named_arg<named_arg<Char, T>> : std::true_type {};
-
-template <typename Char, typename T, typename... Tail,
-          FMT_ENABLE_IF(!is_named_arg<T>::value)>
-void init_named_args(named_arg_info<Char>* named_args, int arg_count,
-                     int named_arg_count, const T&, const Tail&... args) {
-  init_named_args(named_args, arg_count + 1, named_arg_count, args...);
-}
-
-template <typename Char, typename T, typename... Tail,
-          FMT_ENABLE_IF(is_named_arg<T>::value)>
-void init_named_args(named_arg_info<Char>* named_args, int arg_count,
-                     int named_arg_count, const T& arg, const Tail&... args) {
-  named_args[named_arg_count++] = {arg.name, arg_count};
-  init_named_args(named_args, arg_count + 1, named_arg_count, args...);
-}
-
-template <typename... Args>
-FMT_CONSTEXPR FMT_INLINE void init_named_args(std::nullptr_t, int, int,
-                                              const Args&...) {}
-
-template <bool B = false> constexpr auto count() -> size_t { return B ? 1 : 0; }
-template <bool B1, bool B2, bool... Tail> constexpr auto count() -> size_t {
-  return (B1 ? 1 : 0) + count<B2, Tail...>();
-}
-
-template <typename... Args> constexpr auto count_named_args() -> size_t {
-  return count<is_named_arg<Args>::value...>();
-}
-
-template <typename... Args>
-constexpr auto count_statically_named_args() -> size_t {
-  return count<is_statically_named_arg<Args>::value...>();
-}
-
-struct unformattable {};
-struct unformattable_char : unformattable {};
-struct unformattable_pointer : unformattable {};
-
-template <typename Char> struct string_value {
-  const Char* data;
-  size_t size;
-};
-
-template <typename Char> struct named_arg_value {
-  const named_arg_info<Char>* data;
-  size_t size;
-};
-
-template <typename Context> struct custom_value {
-  using parse_context = typename Context::parse_context_type;
-  void* value;
-  void (*format)(void* arg, parse_context& parse_ctx, Context& ctx);
-};
-
-// A formatting argument value.
-template <typename Context> class value {
- public:
-  using char_type = typename Context::char_type;
-
-  union {
-    monostate no_value;
-    int int_value;
-    unsigned uint_value;
-    long long long_long_value;
-    unsigned long long ulong_long_value;
-    int128_opt int128_value;
-    uint128_opt uint128_value;
-    bool bool_value;
-    char_type char_value;
-    float float_value;
-    double double_value;
-    long double long_double_value;
-    const void* pointer;
-    string_value<char_type> string;
-    custom_value<Context> custom;
-    named_arg_value<char_type> named_args;
-  };
-
-  constexpr FMT_INLINE value() : no_value() {}
-  constexpr FMT_INLINE value(int val) : int_value(val) {}
-  constexpr FMT_INLINE value(unsigned val) : uint_value(val) {}
-  constexpr FMT_INLINE value(long long val) : long_long_value(val) {}
-  constexpr FMT_INLINE value(unsigned long long val) : ulong_long_value(val) {}
-  FMT_INLINE value(int128_opt val) : int128_value(val) {}
-  FMT_INLINE value(uint128_opt val) : uint128_value(val) {}
-  constexpr FMT_INLINE value(float val) : float_value(val) {}
-  constexpr FMT_INLINE value(double val) : double_value(val) {}
-  FMT_INLINE value(long double val) : long_double_value(val) {}
-  constexpr FMT_INLINE value(bool val) : bool_value(val) {}
-  constexpr FMT_INLINE value(char_type val) : char_value(val) {}
-  FMT_CONSTEXPR FMT_INLINE value(const char_type* val) {
-    string.data = val;
-    if (is_constant_evaluated()) string.size = {};
-  }
-  FMT_CONSTEXPR FMT_INLINE value(basic_string_view<char_type> val) {
-    string.data = val.data();
-    string.size = val.size();
-  }
-  FMT_INLINE value(const void* val) : pointer(val) {}
-  FMT_INLINE value(const named_arg_info<char_type>* args, size_t size)
-      : named_args{args, size} {}
-
-  template <typename T> FMT_CONSTEXPR20 FMT_INLINE value(T& val) {
-    using value_type = remove_const_t<T>;
-    custom.value = const_cast<value_type*>(std::addressof(val));
-    // Get the formatter type through the context to allow different contexts
-    // have different extension points, e.g. `formatter<T>` for `format` and
-    // `printf_formatter<T>` for `printf`.
-    custom.format = format_custom_arg<
-        value_type, typename Context::template formatter_type<value_type>>;
-  }
-  value(unformattable);
-  value(unformattable_char);
-  value(unformattable_pointer);
-
- private:
-  // Formats an argument of a custom type, such as a user-defined class.
-  template <typename T, typename Formatter>
-  static void format_custom_arg(void* arg,
-                                typename Context::parse_context_type& parse_ctx,
-                                Context& ctx) {
-    auto f = Formatter();
-    parse_ctx.advance_to(f.parse(parse_ctx));
-    using qualified_type =
-        conditional_t<has_const_formatter<T, Context>(), const T, T>;
-    // Calling format through a mutable reference is deprecated.
-    ctx.advance_to(f.format(*static_cast<qualified_type*>(arg), ctx));
-  }
-};
-
-// To minimize the number of types we need to deal with, long is translated
-// either to int or to long long depending on its size.
-enum { long_short = sizeof(long) == sizeof(int) };
-using long_type = conditional_t<long_short, int, long long>;
-using ulong_type = conditional_t<long_short, unsigned, unsigned long long>;
-
-template <typename T> struct format_as_result {
-  template <typename U,
-            FMT_ENABLE_IF(std::is_enum<U>::value || std::is_class<U>::value)>
-  static auto map(U*) -> remove_cvref_t<decltype(format_as(std::declval<U>()))>;
-  static auto map(...) -> void;
-
-  using type = decltype(map(static_cast<T*>(nullptr)));
-};
-template <typename T> using format_as_t = typename format_as_result<T>::type;
-
-template <typename T>
-struct has_format_as
-    : bool_constant<!std::is_same<format_as_t<T>, void>::value> {};
-
-// Maps formatting arguments to core types.
-// arg_mapper reports errors by returning unformattable instead of using
-// static_assert because it's used in the is_formattable trait.
-template <typename Context> struct arg_mapper {
-  using char_type = typename Context::char_type;
-
-  FMT_CONSTEXPR FMT_INLINE auto map(signed char val) -> int { return val; }
-  FMT_CONSTEXPR FMT_INLINE auto map(unsigned char val) -> unsigned {
-    return val;
-  }
-  FMT_CONSTEXPR FMT_INLINE auto map(short val) -> int { return val; }
-  FMT_CONSTEXPR FMT_INLINE auto map(unsigned short val) -> unsigned {
-    return val;
-  }
-  FMT_CONSTEXPR FMT_INLINE auto map(int val) -> int { return val; }
-  FMT_CONSTEXPR FMT_INLINE auto map(unsigned val) -> unsigned { return val; }
-  FMT_CONSTEXPR FMT_INLINE auto map(long val) -> long_type { return val; }
-  FMT_CONSTEXPR FMT_INLINE auto map(unsigned long val) -> ulong_type {
-    return val;
-  }
-  FMT_CONSTEXPR FMT_INLINE auto map(long long val) -> long long { return val; }
-  FMT_CONSTEXPR FMT_INLINE auto map(unsigned long long val)
-      -> unsigned long long {
-    return val;
-  }
-  FMT_CONSTEXPR FMT_INLINE auto map(int128_opt val) -> int128_opt {
-    return val;
-  }
-  FMT_CONSTEXPR FMT_INLINE auto map(uint128_opt val) -> uint128_opt {
-    return val;
-  }
-  FMT_CONSTEXPR FMT_INLINE auto map(bool val) -> bool { return val; }
-
-  template <typename T, FMT_ENABLE_IF(std::is_same<T, char>::value ||
-                                      std::is_same<T, char_type>::value)>
-  FMT_CONSTEXPR FMT_INLINE auto map(T val) -> char_type {
-    return val;
-  }
-  template <typename T, enable_if_t<(std::is_same<T, wchar_t>::value ||
-#ifdef __cpp_char8_t
-                                     std::is_same<T, char8_t>::value ||
-#endif
-                                     std::is_same<T, char16_t>::value ||
-                                     std::is_same<T, char32_t>::value) &&
-                                        !std::is_same<T, char_type>::value,
-                                    int> = 0>
-  FMT_CONSTEXPR FMT_INLINE auto map(T) -> unformattable_char {
-    return {};
-  }
-
-  FMT_CONSTEXPR FMT_INLINE auto map(float val) -> float { return val; }
-  FMT_CONSTEXPR FMT_INLINE auto map(double val) -> double { return val; }
-  FMT_CONSTEXPR FMT_INLINE auto map(long double val) -> long double {
-    return val;
-  }
-
-  FMT_CONSTEXPR FMT_INLINE auto map(char_type* val) -> const char_type* {
-    return val;
-  }
-  FMT_CONSTEXPR FMT_INLINE auto map(const char_type* val) -> const char_type* {
-    return val;
-  }
-  template <typename T,
-            FMT_ENABLE_IF(is_string<T>::value && !std::is_pointer<T>::value &&
-                          std::is_same<char_type, char_t<T>>::value)>
-  FMT_CONSTEXPR FMT_INLINE auto map(const T& val)
-      -> basic_string_view<char_type> {
-    return to_string_view(val);
-  }
-  template <typename T,
-            FMT_ENABLE_IF(is_string<T>::value && !std::is_pointer<T>::value &&
-                          !std::is_same<char_type, char_t<T>>::value)>
-  FMT_CONSTEXPR FMT_INLINE auto map(const T&) -> unformattable_char {
-    return {};
-  }
-
-  FMT_CONSTEXPR FMT_INLINE auto map(void* val) -> const void* { return val; }
-  FMT_CONSTEXPR FMT_INLINE auto map(const void* val) -> const void* {
-    return val;
-  }
-  FMT_CONSTEXPR FMT_INLINE auto map(std::nullptr_t val) -> const void* {
-    return val;
-  }
-
-  // Use SFINAE instead of a const T* parameter to avoid a conflict with the
-  // array overload.
-  template <
-      typename T,
-      FMT_ENABLE_IF(
-          std::is_pointer<T>::value || std::is_member_pointer<T>::value ||
-          std::is_function<typename std::remove_pointer<T>::type>::value ||
-          (std::is_array<T>::value &&
-           !std::is_convertible<T, const char_type*>::value))>
-  FMT_CONSTEXPR auto map(const T&) -> unformattable_pointer {
-    return {};
-  }
-
-  template <typename T, std::size_t N,
-            FMT_ENABLE_IF(!std::is_same<T, wchar_t>::value)>
-  FMT_CONSTEXPR FMT_INLINE auto map(const T (&values)[N]) -> const T (&)[N] {
-    return values;
-  }
-
-  // Only map owning types because mapping views can be unsafe.
-  template <typename T, typename U = format_as_t<T>,
-            FMT_ENABLE_IF(std::is_arithmetic<U>::value)>
-  FMT_CONSTEXPR FMT_INLINE auto map(const T& val)
-      -> decltype(FMT_DECLTYPE_THIS map(U())) {
-    return map(format_as(val));
-  }
-
-  template <typename T, typename U = remove_const_t<T>>
-  struct formattable : bool_constant<has_const_formatter<U, Context>() ||
-                                     (has_formatter<U, Context>::value &&
-                                      !std::is_const<T>::value)> {};
-
-  template <typename T, FMT_ENABLE_IF(formattable<T>::value)>
-  FMT_CONSTEXPR FMT_INLINE auto do_map(T& val) -> T& {
-    return val;
-  }
-  template <typename T, FMT_ENABLE_IF(!formattable<T>::value)>
-  FMT_CONSTEXPR FMT_INLINE auto do_map(T&) -> unformattable {
-    return {};
-  }
-
-  template <typename T, typename U = remove_const_t<T>,
-            FMT_ENABLE_IF((std::is_class<U>::value || std::is_enum<U>::value ||
-                           std::is_union<U>::value) &&
-                          !is_string<U>::value && !is_char<U>::value &&
-                          !is_named_arg<U>::value &&
-                          !std::is_arithmetic<format_as_t<U>>::value)>
-  FMT_CONSTEXPR FMT_INLINE auto map(T& val)
-      -> decltype(FMT_DECLTYPE_THIS do_map(val)) {
-    return do_map(val);
-  }
-
-  template <typename T, FMT_ENABLE_IF(is_named_arg<T>::value)>
-  FMT_CONSTEXPR FMT_INLINE auto map(const T& named_arg)
-      -> decltype(FMT_DECLTYPE_THIS map(named_arg.value)) {
-    return map(named_arg.value);
-  }
-
-  auto map(...) -> unformattable { return {}; }
-};
-
-// A type constant after applying arg_mapper<Context>.
-template <typename T, typename Context>
-using mapped_type_constant =
-    type_constant<decltype(arg_mapper<Context>().map(std::declval<const T&>())),
-                  typename Context::char_type>;
-
-enum { packed_arg_bits = 4 };
-// Maximum number of arguments with packed types.
-enum { max_packed_args = 62 / packed_arg_bits };
-enum : unsigned long long { is_unpacked_bit = 1ULL << 63 };
-enum : unsigned long long { has_named_args_bit = 1ULL << 62 };
-
-template <typename Char, typename InputIt>
-auto copy_str(InputIt begin, InputIt end, appender out) -> appender {
-  get_container(out).append(begin, end);
-  return out;
-}
-template <typename Char, typename InputIt>
-auto copy_str(InputIt begin, InputIt end,
-              std::back_insert_iterator<std::string> out)
-    -> std::back_insert_iterator<std::string> {
-  get_container(out).append(begin, end);
-  return out;
-}
-
-template <typename Char, typename R, typename OutputIt>
-FMT_CONSTEXPR auto copy_str(R&& rng, OutputIt out) -> OutputIt {
-  return detail::copy_str<Char>(rng.begin(), rng.end(), out);
-}
-
-#if FMT_GCC_VERSION && FMT_GCC_VERSION < 500
-// A workaround for gcc 4.8 to make void_t work in a SFINAE context.
-template <typename...> struct void_t_impl {
-  using type = void;
-};
-template <typename... T> using void_t = typename void_t_impl<T...>::type;
-#else
-template <typename...> using void_t = void;
-#endif
-
-template <typename It, typename T, typename Enable = void>
-struct is_output_iterator : std::false_type {};
-
-template <typename It, typename T>
-struct is_output_iterator<
-    It, T,
-    void_t<typename std::iterator_traits<It>::iterator_category,
-           decltype(*std::declval<It>() = std::declval<T>())>>
-    : std::true_type {};
-
-template <typename It> struct is_back_insert_iterator : std::false_type {};
-template <typename Container>
-struct is_back_insert_iterator<std::back_insert_iterator<Container>>
-    : std::true_type {};
-
-// A type-erased reference to an std::locale to avoid a heavy <locale> include.
-class locale_ref {
- private:
-  const void* locale_;  // A type-erased pointer to std::locale.
-
- public:
-  constexpr FMT_INLINE locale_ref() : locale_(nullptr) {}
-  template <typename Locale> explicit locale_ref(const Locale& loc);
-
-  explicit operator bool() const noexcept { return locale_ != nullptr; }
-
-  template <typename Locale> auto get() const -> Locale;
-};
-
-template <typename> constexpr auto encode_types() -> unsigned long long {
-  return 0;
-}
-
-template <typename Context, typename Arg, typename... Args>
-constexpr auto encode_types() -> unsigned long long {
-  return static_cast<unsigned>(mapped_type_constant<Arg, Context>::value) |
-         (encode_types<Context, Args...>() << packed_arg_bits);
-}
-
-#if defined(__cpp_if_constexpr)
-// This type is intentionally undefined, only used for errors
-template <typename T, typename Char> struct type_is_unformattable_for;
-#endif
-
-template <bool PACKED, typename Context, typename T, FMT_ENABLE_IF(PACKED)>
-FMT_CONSTEXPR FMT_INLINE auto make_arg(T& val) -> value<Context> {
-  using arg_type = remove_cvref_t<decltype(arg_mapper<Context>().map(val))>;
-
-  constexpr bool formattable_char =
-      !std::is_same<arg_type, unformattable_char>::value;
-  static_assert(formattable_char, "Mixing character types is disallowed.");
-
-  // Formatting of arbitrary pointers is disallowed. If you want to format a
-  // pointer cast it to `void*` or `const void*`. In particular, this forbids
-  // formatting of `[const] volatile char*` printed as bool by iostreams.
-  constexpr bool formattable_pointer =
-      !std::is_same<arg_type, unformattable_pointer>::value;
-  static_assert(formattable_pointer,
-                "Formatting of non-void pointers is disallowed.");
-
-  constexpr bool formattable = !std::is_same<arg_type, unformattable>::value;
-#if defined(__cpp_if_constexpr)
-  if constexpr (!formattable) {
-    type_is_unformattable_for<T, typename Context::char_type> _;
-  }
-#endif
-  static_assert(
-      formattable,
-      "Cannot format an argument. To make type T formattable provide a "
-      "formatter<T> specialization: https://fmt.dev/latest/api.html#udt");
-  return {arg_mapper<Context>().map(val)};
-}
-
-template <typename Context, typename T>
-FMT_CONSTEXPR auto make_arg(T& val) -> basic_format_arg<Context> {
-  auto arg = basic_format_arg<Context>();
-  arg.type_ = mapped_type_constant<T, Context>::value;
-  arg.value_ = make_arg<true, Context>(val);
-  return arg;
-}
-
-template <bool PACKED, typename Context, typename T, FMT_ENABLE_IF(!PACKED)>
-FMT_CONSTEXPR inline auto make_arg(T& val) -> basic_format_arg<Context> {
-  return make_arg<Context>(val);
-}
-}  // namespace detail
-FMT_BEGIN_EXPORT
-
-// A formatting argument. Context is a template parameter for the compiled API
-// where output can be unbuffered.
-template <typename Context> class basic_format_arg {
- private:
-  detail::value<Context> value_;
-  detail::type type_;
-
-  template <typename ContextType, typename T>
-  friend FMT_CONSTEXPR auto detail::make_arg(T& value)
-      -> basic_format_arg<ContextType>;
-
-  template <typename Visitor, typename Ctx>
-  friend FMT_CONSTEXPR auto visit_format_arg(Visitor&& vis,
-                                             const basic_format_arg<Ctx>& arg)
-      -> decltype(vis(0));
-
-  friend class basic_format_args<Context>;
-  friend class dynamic_format_arg_store<Context>;
-
-  using char_type = typename Context::char_type;
-
-  template <typename T, typename Char, size_t NUM_ARGS, size_t NUM_NAMED_ARGS>
-  friend struct detail::arg_data;
-
-  basic_format_arg(const detail::named_arg_info<char_type>* args, size_t size)
-      : value_(args, size) {}
-
- public:
-  class handle {
-   public:
-    explicit handle(detail::custom_value<Context> custom) : custom_(custom) {}
-
-    void format(typename Context::parse_context_type& parse_ctx,
-                Context& ctx) const {
-      custom_.format(custom_.value, parse_ctx, ctx);
-    }
-
-   private:
-    detail::custom_value<Context> custom_;
-  };
-
-  constexpr basic_format_arg() : type_(detail::type::none_type) {}
-
-  constexpr explicit operator bool() const noexcept {
-    return type_ != detail::type::none_type;
-  }
-
-  auto type() const -> detail::type { return type_; }
-
-  auto is_integral() const -> bool { return detail::is_integral_type(type_); }
-  auto is_arithmetic() const -> bool {
-    return detail::is_arithmetic_type(type_);
-  }
-
-  FMT_INLINE auto format_custom(const char_type* parse_begin,
-                                typename Context::parse_context_type& parse_ctx,
-                                Context& ctx) -> bool {
-    if (type_ != detail::type::custom_type) return false;
-    parse_ctx.advance_to(parse_begin);
-    value_.custom.format(value_.custom.value, parse_ctx, ctx);
-    return true;
-  }
-};
-
-/**
-  \rst
-  Visits an argument dispatching to the appropriate visit method based on
-  the argument type. For example, if the argument type is ``double`` then
-  ``vis(value)`` will be called with the value of type ``double``.
-  \endrst
- */
-// DEPRECATED!
-template <typename Visitor, typename Context>
-FMT_CONSTEXPR FMT_INLINE auto visit_format_arg(
-    Visitor&& vis, const basic_format_arg<Context>& arg) -> decltype(vis(0)) {
-  switch (arg.type_) {
-  case detail::type::none_type:
-    break;
-  case detail::type::int_type:
-    return vis(arg.value_.int_value);
-  case detail::type::uint_type:
-    return vis(arg.value_.uint_value);
-  case detail::type::long_long_type:
-    return vis(arg.value_.long_long_value);
-  case detail::type::ulong_long_type:
-    return vis(arg.value_.ulong_long_value);
-  case detail::type::int128_type:
-    return vis(detail::convert_for_visit(arg.value_.int128_value));
-  case detail::type::uint128_type:
-    return vis(detail::convert_for_visit(arg.value_.uint128_value));
-  case detail::type::bool_type:
-    return vis(arg.value_.bool_value);
-  case detail::type::char_type:
-    return vis(arg.value_.char_value);
-  case detail::type::float_type:
-    return vis(arg.value_.float_value);
-  case detail::type::double_type:
-    return vis(arg.value_.double_value);
-  case detail::type::long_double_type:
-    return vis(arg.value_.long_double_value);
-  case detail::type::cstring_type:
-    return vis(arg.value_.string.data);
-  case detail::type::string_type:
-    using sv = basic_string_view<typename Context::char_type>;
-    return vis(sv(arg.value_.string.data, arg.value_.string.size));
-  case detail::type::pointer_type:
-    return vis(arg.value_.pointer);
-  case detail::type::custom_type:
-    return vis(typename basic_format_arg<Context>::handle(arg.value_.custom));
-  }
-  return vis(monostate());
-}
-
-// Formatting context.
-template <typename OutputIt, typename Char> class basic_format_context {
- private:
-  OutputIt out_;
-  basic_format_args<basic_format_context> args_;
-  detail::locale_ref loc_;
-
- public:
-  using iterator = OutputIt;
-  using format_arg = basic_format_arg<basic_format_context>;
-  using format_args = basic_format_args<basic_format_context>;
-  using parse_context_type = basic_format_parse_context<Char>;
-  template <typename T> using formatter_type = formatter<T, Char>;
-
-  /** The character type for the output. */
-  using char_type = Char;
-
-  basic_format_context(basic_format_context&&) = default;
-  basic_format_context(const basic_format_context&) = delete;
-  void operator=(const basic_format_context&) = delete;
-  /**
-    Constructs a ``basic_format_context`` object. References to the arguments
-    are stored in the object so make sure they have appropriate lifetimes.
-   */
-  constexpr basic_format_context(OutputIt out, format_args ctx_args,
-                                 detail::locale_ref loc = {})
-      : out_(out), args_(ctx_args), loc_(loc) {}
-
-  constexpr auto arg(int id) const -> format_arg { return args_.get(id); }
-  FMT_CONSTEXPR auto arg(basic_string_view<Char> name) -> format_arg {
-    return args_.get(name);
-  }
-  FMT_CONSTEXPR auto arg_id(basic_string_view<Char> name) -> int {
-    return args_.get_id(name);
-  }
-  auto args() const -> const format_args& { return args_; }
-
-  // DEPRECATED!
-  FMT_CONSTEXPR auto error_handler() -> detail::error_handler { return {}; }
-  void on_error(const char* message) { error_handler().on_error(message); }
-
-  // Returns an iterator to the beginning of the output range.
-  FMT_CONSTEXPR auto out() -> iterator { return out_; }
-
-  // Advances the begin iterator to ``it``.
-  void advance_to(iterator it) {
-    if (!detail::is_back_insert_iterator<iterator>()) out_ = it;
-  }
-
-  FMT_CONSTEXPR auto locale() -> detail::locale_ref { return loc_; }
-};
-
-template <typename Char>
-using buffer_context =
-    basic_format_context<detail::buffer_appender<Char>, Char>;
-using format_context = buffer_context<char>;
-
-template <typename T, typename Char = char>
-using is_formattable = bool_constant<!std::is_base_of<
-    detail::unformattable, decltype(detail::arg_mapper<buffer_context<Char>>()
-                                        .map(std::declval<T&>()))>::value>;
-
-/**
-  \rst
-  An array of references to arguments. It can be implicitly converted into
-  `~fmt::basic_format_args` for passing into type-erased formatting functions
-  such as `~fmt::vformat`.
-  \endrst
- */
-template <typename Context, typename... Args>
-class format_arg_store
-#if FMT_GCC_VERSION && FMT_GCC_VERSION < 409
-    // Workaround a GCC template argument substitution bug.
-    : public basic_format_args<Context>
-#endif
-{
- private:
-  static const size_t num_args = sizeof...(Args);
-  static constexpr size_t num_named_args = detail::count_named_args<Args...>();
-  static const bool is_packed = num_args <= detail::max_packed_args;
-
-  using value_type = conditional_t<is_packed, detail::value<Context>,
-                                   basic_format_arg<Context>>;
-
-  detail::arg_data<value_type, typename Context::char_type, num_args,
-                   num_named_args>
-      data_;
-
-  friend class basic_format_args<Context>;
-
-  static constexpr unsigned long long desc =
-      (is_packed ? detail::encode_types<Context, Args...>()
-                 : detail::is_unpacked_bit | num_args) |
-      (num_named_args != 0
-           ? static_cast<unsigned long long>(detail::has_named_args_bit)
-           : 0);
-
- public:
-  template <typename... T>
-  FMT_CONSTEXPR FMT_INLINE format_arg_store(T&... args)
-      :
-#if FMT_GCC_VERSION && FMT_GCC_VERSION < 409
-        basic_format_args<Context>(*this),
-#endif
-        data_{detail::make_arg<is_packed, Context>(args)...} {
-    if (detail::const_check(num_named_args != 0))
-      detail::init_named_args(data_.named_args(), 0, 0, args...);
-  }
-};
-
-/**
-  \rst
-  Constructs a `~fmt::format_arg_store` object that contains references to
-  arguments and can be implicitly converted to `~fmt::format_args`. `Context`
-  can be omitted in which case it defaults to `~fmt::format_context`.
-  See `~fmt::arg` for lifetime considerations.
-  \endrst
- */
-// Arguments are taken by lvalue references to avoid some lifetime issues.
-template <typename Context = format_context, typename... T>
-constexpr auto make_format_args(T&... args)
-    -> format_arg_store<Context, remove_cvref_t<T>...> {
-  return {args...};
-}
-
-/**
-  \rst
-  Returns a named argument to be used in a formatting function.
-  It should only be used in a call to a formatting function or
-  `dynamic_format_arg_store::push_back`.
-
-  **Example**::
-
-    fmt::print("Elapsed time: {s:.2f} seconds", fmt::arg("s", 1.23));
-  \endrst
- */
-template <typename Char, typename T>
-inline auto arg(const Char* name, const T& arg) -> detail::named_arg<Char, T> {
-  static_assert(!detail::is_named_arg<T>(), "nested named arguments");
-  return {name, arg};
-}
-FMT_END_EXPORT
-
-/**
-  \rst
-  A view of a collection of formatting arguments. To avoid lifetime issues it
-  should only be used as a parameter type in type-erased functions such as
-  ``vformat``::
-
-    void vlog(string_view format_str, format_args args);  // OK
-    format_args args = make_format_args();  // Error: dangling reference
-  \endrst
- */
-template <typename Context> class basic_format_args {
- public:
-  using size_type = int;
-  using format_arg = basic_format_arg<Context>;
-
- private:
-  // A descriptor that contains information about formatting arguments.
-  // If the number of arguments is less or equal to max_packed_args then
-  // argument types are passed in the descriptor. This reduces binary code size
-  // per formatting function call.
-  unsigned long long desc_;
-  union {
-    // If is_packed() returns true then argument values are stored in values_;
-    // otherwise they are stored in args_. This is done to improve cache
-    // locality and reduce compiled code size since storing larger objects
-    // may require more code (at least on x86-64) even if the same amount of
-    // data is actually copied to stack. It saves ~10% on the bloat test.
-    const detail::value<Context>* values_;
-    const format_arg* args_;
-  };
-
-  constexpr auto is_packed() const -> bool {
-    return (desc_ & detail::is_unpacked_bit) == 0;
-  }
-  auto has_named_args() const -> bool {
-    return (desc_ & detail::has_named_args_bit) != 0;
-  }
-
-  FMT_CONSTEXPR auto type(int index) const -> detail::type {
-    int shift = index * detail::packed_arg_bits;
-    unsigned int mask = (1 << detail::packed_arg_bits) - 1;
-    return static_cast<detail::type>((desc_ >> shift) & mask);
-  }
-
-  constexpr FMT_INLINE basic_format_args(unsigned long long desc,
-                                         const detail::value<Context>* values)
-      : desc_(desc), values_(values) {}
-  constexpr basic_format_args(unsigned long long desc, const format_arg* args)
-      : desc_(desc), args_(args) {}
-
- public:
-  constexpr basic_format_args() : desc_(0), args_(nullptr) {}
-
-  /**
-   \rst
-   Constructs a `basic_format_args` object from `~fmt::format_arg_store`.
-   \endrst
-   */
-  template <typename... Args>
-  constexpr FMT_INLINE basic_format_args(
-      const format_arg_store<Context, Args...>& store)
-      : basic_format_args(format_arg_store<Context, Args...>::desc,
-                          store.data_.args()) {}
-
-  /**
-   \rst
-   Constructs a `basic_format_args` object from
-   `~fmt::dynamic_format_arg_store`.
-   \endrst
-   */
-  constexpr FMT_INLINE basic_format_args(
-      const dynamic_format_arg_store<Context>& store)
-      : basic_format_args(store.get_types(), store.data()) {}
-
-  /**
-   \rst
-   Constructs a `basic_format_args` object from a dynamic set of arguments.
-   \endrst
-   */
-  constexpr basic_format_args(const format_arg* args, int count)
-      : basic_format_args(detail::is_unpacked_bit | detail::to_unsigned(count),
-                          args) {}
-
-  /** Returns the argument with the specified id. */
-  FMT_CONSTEXPR auto get(int id) const -> format_arg {
-    format_arg arg;
-    if (!is_packed()) {
-      if (id < max_size()) arg = args_[id];
-      return arg;
-    }
-    if (id >= detail::max_packed_args) return arg;
-    arg.type_ = type(id);
-    if (arg.type_ == detail::type::none_type) return arg;
-    arg.value_ = values_[id];
-    return arg;
-  }
-
-  template <typename Char>
-  auto get(basic_string_view<Char> name) const -> format_arg {
-    int id = get_id(name);
-    return id >= 0 ? get(id) : format_arg();
-  }
-
-  template <typename Char>
-  auto get_id(basic_string_view<Char> name) const -> int {
-    if (!has_named_args()) return -1;
-    const auto& named_args =
-        (is_packed() ? values_[-1] : args_[-1].value_).named_args;
-    for (size_t i = 0; i < named_args.size; ++i) {
-      if (named_args.data[i].name == name) return named_args.data[i].id;
-    }
-    return -1;
-  }
-
-  auto max_size() const -> int {
-    unsigned long long max_packed = detail::max_packed_args;
-    return static_cast<int>(is_packed() ? max_packed
-                                        : desc_ & ~detail::is_unpacked_bit);
-  }
-};
-
-/** An alias to ``basic_format_args<format_context>``. */
-// A separate type would result in shorter symbols but break ABI compatibility
-// between clang and gcc on ARM (#1919).
-FMT_EXPORT using format_args = basic_format_args<format_context>;
-
-// We cannot use enum classes as bit fields because of a gcc bug, so we put them
-// in namespaces instead (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61414).
-// Additionally, if an underlying type is specified, older gcc incorrectly warns
-// that the type is too small. Both bugs are fixed in gcc 9.3.
-#if FMT_GCC_VERSION && FMT_GCC_VERSION < 903
-#  define FMT_ENUM_UNDERLYING_TYPE(type)
-#else
-#  define FMT_ENUM_UNDERLYING_TYPE(type) : type
-#endif
-namespace align {
-enum type FMT_ENUM_UNDERLYING_TYPE(unsigned char){none, left, right, center,
-                                                  numeric};
-}
-using align_t = align::type;
-namespace sign {
-enum type FMT_ENUM_UNDERLYING_TYPE(unsigned char){none, minus, plus, space};
-}
-using sign_t = sign::type;
-
-namespace detail {
-
-// Workaround an array initialization issue in gcc 4.8.
-template <typename Char> struct fill_t {
- private:
-  enum { max_size = 4 };
-  Char data_[max_size] = {Char(' '), Char(0), Char(0), Char(0)};
-  unsigned char size_ = 1;
-
- public:
-  FMT_CONSTEXPR void operator=(basic_string_view<Char> s) {
-    auto size = s.size();
-    FMT_ASSERT(size <= max_size, "invalid fill");
-    for (size_t i = 0; i < size; ++i) data_[i] = s[i];
-    size_ = static_cast<unsigned char>(size);
-  }
-
-  constexpr auto size() const -> size_t { return size_; }
-  constexpr auto data() const -> const Char* { return data_; }
-
-  FMT_CONSTEXPR auto operator[](size_t index) -> Char& { return data_[index]; }
-  FMT_CONSTEXPR auto operator[](size_t index) const -> const Char& {
-    return data_[index];
-  }
-};
-}  // namespace detail
-
-enum class presentation_type : unsigned char {
-  none,
-  dec,             // 'd'
-  oct,             // 'o'
-  hex_lower,       // 'x'
-  hex_upper,       // 'X'
-  bin_lower,       // 'b'
-  bin_upper,       // 'B'
-  hexfloat_lower,  // 'a'
-  hexfloat_upper,  // 'A'
-  exp_lower,       // 'e'
-  exp_upper,       // 'E'
-  fixed_lower,     // 'f'
-  fixed_upper,     // 'F'
-  general_lower,   // 'g'
-  general_upper,   // 'G'
-  chr,             // 'c'
-  string,          // 's'
-  pointer,         // 'p'
-  debug            // '?'
-};
-
-// Format specifiers for built-in and string types.
-template <typename Char = char> struct format_specs {
-  int width;
-  int precision;
-  presentation_type type;
-  align_t align : 4;
-  sign_t sign : 3;
-  bool alt : 1;  // Alternate form ('#').
-  bool localized : 1;
-  detail::fill_t<Char> fill;
-
-  constexpr format_specs()
-      : width(0),
-        precision(-1),
-        type(presentation_type::none),
-        align(align::none),
-        sign(sign::none),
-        alt(false),
-        localized(false) {}
-};
-
-namespace detail {
-
-enum class arg_id_kind { none, index, name };
-
-// An argument reference.
-template <typename Char> struct arg_ref {
-  FMT_CONSTEXPR arg_ref() : kind(arg_id_kind::none), val() {}
-
-  FMT_CONSTEXPR explicit arg_ref(int index)
-      : kind(arg_id_kind::index), val(index) {}
-  FMT_CONSTEXPR explicit arg_ref(basic_string_view<Char> name)
-      : kind(arg_id_kind::name), val(name) {}
-
-  FMT_CONSTEXPR auto operator=(int idx) -> arg_ref& {
-    kind = arg_id_kind::index;
-    val.index = idx;
-    return *this;
-  }
-
-  arg_id_kind kind;
-  union value {
-    FMT_CONSTEXPR value(int idx = 0) : index(idx) {}
-    FMT_CONSTEXPR value(basic_string_view<Char> n) : name(n) {}
-
-    int index;
-    basic_string_view<Char> name;
-  } val;
-};
-
-// Format specifiers with width and precision resolved at formatting rather
-// than parsing time to allow reusing the same parsed specifiers with
-// different sets of arguments (precompilation of format strings).
-template <typename Char = char>
-struct dynamic_format_specs : format_specs<Char> {
-  arg_ref<Char> width_ref;
-  arg_ref<Char> precision_ref;
-};
-
-// Converts a character to ASCII. Returns '\0' on conversion failure.
-template <typename Char, FMT_ENABLE_IF(std::is_integral<Char>::value)>
-constexpr auto to_ascii(Char c) -> char {
-  return c <= 0xff ? static_cast<char>(c) : '\0';
-}
-template <typename Char, FMT_ENABLE_IF(std::is_enum<Char>::value)>
-constexpr auto to_ascii(Char c) -> char {
-  return c <= 0xff ? static_cast<char>(c) : '\0';
-}
-
-// Returns the number of code units in a code point or 1 on error.
-template <typename Char>
-FMT_CONSTEXPR auto code_point_length(const Char* begin) -> int {
-  if (const_check(sizeof(Char) != 1)) return 1;
-  auto c = static_cast<unsigned char>(*begin);
-  return static_cast<int>((0x3a55000000000000ull >> (2 * (c >> 3))) & 0x3) + 1;
-}
-
-// Return the result via the out param to workaround gcc bug 77539.
-template <bool IS_CONSTEXPR, typename T, typename Ptr = const T*>
-FMT_CONSTEXPR auto find(Ptr first, Ptr last, T value, Ptr& out) -> bool {
-  for (out = first; out != last; ++out) {
-    if (*out == value) return true;
-  }
-  return false;
-}
-
-template <>
-inline auto find<false, char>(const char* first, const char* last, char value,
-                              const char*& out) -> bool {
-  out = static_cast<const char*>(
-      std::memchr(first, value, to_unsigned(last - first)));
-  return out != nullptr;
-}
-
-// Parses the range [begin, end) as an unsigned integer. This function assumes
-// that the range is non-empty and the first character is a digit.
-template <typename Char>
-FMT_CONSTEXPR auto parse_nonnegative_int(const Char*& begin, const Char* end,
-                                         int error_value) noexcept -> int {
-  FMT_ASSERT(begin != end && '0' <= *begin && *begin <= '9', "");
-  unsigned value = 0, prev = 0;
-  auto p = begin;
-  do {
-    prev = value;
-    value = value * 10 + unsigned(*p - '0');
-    ++p;
-  } while (p != end && '0' <= *p && *p <= '9');
-  auto num_digits = p - begin;
-  begin = p;
-  if (num_digits <= std::numeric_limits<int>::digits10)
-    return static_cast<int>(value);
-  // Check for overflow.
-  const unsigned max = to_unsigned((std::numeric_limits<int>::max)());
-  return num_digits == std::numeric_limits<int>::digits10 + 1 &&
-                 prev * 10ull + unsigned(p[-1] - '0') <= max
-             ? static_cast<int>(value)
-             : error_value;
-}
-
-FMT_CONSTEXPR inline auto parse_align(char c) -> align_t {
-  switch (c) {
-  case '<':
-    return align::left;
-  case '>':
-    return align::right;
-  case '^':
-    return align::center;
-  }
-  return align::none;
-}
-
-template <typename Char> constexpr auto is_name_start(Char c) -> bool {
-  return ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || c == '_';
-}
-
-template <typename Char, typename Handler>
-FMT_CONSTEXPR auto do_parse_arg_id(const Char* begin, const Char* end,
-                                   Handler&& handler) -> const Char* {
-  Char c = *begin;
-  if (c >= '0' && c <= '9') {
-    int index = 0;
-    constexpr int max = (std::numeric_limits<int>::max)();
-    if (c != '0')
-      index = parse_nonnegative_int(begin, end, max);
-    else
-      ++begin;
-    if (begin == end || (*begin != '}' && *begin != ':'))
-      throw_format_error("invalid format string");
-    else
-      handler.on_index(index);
-    return begin;
-  }
-  if (!is_name_start(c)) {
-    throw_format_error("invalid format string");
-    return begin;
-  }
-  auto it = begin;
-  do {
-    ++it;
-  } while (it != end && (is_name_start(*it) || ('0' <= *it && *it <= '9')));
-  handler.on_name({begin, to_unsigned(it - begin)});
-  return it;
-}
-
-template <typename Char, typename Handler>
-FMT_CONSTEXPR FMT_INLINE auto parse_arg_id(const Char* begin, const Char* end,
-                                           Handler&& handler) -> const Char* {
-  FMT_ASSERT(begin != end, "");
-  Char c = *begin;
-  if (c != '}' && c != ':') return do_parse_arg_id(begin, end, handler);
-  handler.on_auto();
-  return begin;
-}
-
-template <typename Char> struct dynamic_spec_id_handler {
-  basic_format_parse_context<Char>& ctx;
-  arg_ref<Char>& ref;
-
-  FMT_CONSTEXPR void on_auto() {
-    int id = ctx.next_arg_id();
-    ref = arg_ref<Char>(id);
-    ctx.check_dynamic_spec(id);
-  }
-  FMT_CONSTEXPR void on_index(int id) {
-    ref = arg_ref<Char>(id);
-    ctx.check_arg_id(id);
-    ctx.check_dynamic_spec(id);
-  }
-  FMT_CONSTEXPR void on_name(basic_string_view<Char> id) {
-    ref = arg_ref<Char>(id);
-    ctx.check_arg_id(id);
-  }
-};
-
-// Parses [integer | "{" [arg_id] "}"].
-template <typename Char>
-FMT_CONSTEXPR auto parse_dynamic_spec(const Char* begin, const Char* end,
-                                      int& value, arg_ref<Char>& ref,
-                                      basic_format_parse_context<Char>& ctx)
-    -> const Char* {
-  FMT_ASSERT(begin != end, "");
-  if ('0' <= *begin && *begin <= '9') {
-    int val = parse_nonnegative_int(begin, end, -1);
-    if (val != -1)
-      value = val;
-    else
-      throw_format_error("number is too big");
-  } else if (*begin == '{') {
-    ++begin;
-    auto handler = dynamic_spec_id_handler<Char>{ctx, ref};
-    if (begin != end) begin = parse_arg_id(begin, end, handler);
-    if (begin != end && *begin == '}') return ++begin;
-    throw_format_error("invalid format string");
-  }
-  return begin;
-}
-
-template <typename Char>
-FMT_CONSTEXPR auto parse_precision(const Char* begin, const Char* end,
-                                   int& value, arg_ref<Char>& ref,
-                                   basic_format_parse_context<Char>& ctx)
-    -> const Char* {
-  ++begin;
-  if (begin == end || *begin == '}') {
-    throw_format_error("invalid precision");
-    return begin;
-  }
-  return parse_dynamic_spec(begin, end, value, ref, ctx);
-}
-
-enum class state { start, align, sign, hash, zero, width, precision, locale };
-
-// Parses standard format specifiers.
-template <typename Char>
-FMT_CONSTEXPR FMT_INLINE auto parse_format_specs(
-    const Char* begin, const Char* end, dynamic_format_specs<Char>& specs,
-    basic_format_parse_context<Char>& ctx, type arg_type) -> const Char* {
-  auto c = '\0';
-  if (end - begin > 1) {
-    auto next = to_ascii(begin[1]);
-    c = parse_align(next) == align::none ? to_ascii(*begin) : '\0';
-  } else {
-    if (begin == end) return begin;
-    c = to_ascii(*begin);
-  }
-
-  struct {
-    state current_state = state::start;
-    FMT_CONSTEXPR void operator()(state s, bool valid = true) {
-      if (current_state >= s || !valid)
-        throw_format_error("invalid format specifier");
-      current_state = s;
-    }
-  } enter_state;
-
-  using pres = presentation_type;
-  constexpr auto integral_set = sint_set | uint_set | bool_set | char_set;
-  struct {
-    const Char*& begin;
-    dynamic_format_specs<Char>& specs;
-    type arg_type;
-
-    FMT_CONSTEXPR auto operator()(pres pres_type, int set) -> const Char* {
-      if (!in(arg_type, set)) {
-        if (arg_type == type::none_type) return begin;
-        throw_format_error("invalid format specifier");
-      }
-      specs.type = pres_type;
-      return begin + 1;
-    }
-  } parse_presentation_type{begin, specs, arg_type};
-
-  for (;;) {
-    switch (c) {
-    case '<':
-    case '>':
-    case '^':
-      enter_state(state::align);
-      specs.align = parse_align(c);
-      ++begin;
-      break;
-    case '+':
-    case '-':
-    case ' ':
-      if (arg_type == type::none_type) return begin;
-      enter_state(state::sign, in(arg_type, sint_set | float_set));
-      switch (c) {
-      case '+':
-        specs.sign = sign::plus;
-        break;
-      case '-':
-        specs.sign = sign::minus;
-        break;
-      case ' ':
-        specs.sign = sign::space;
-        break;
-      }
-      ++begin;
-      break;
-    case '#':
-      if (arg_type == type::none_type) return begin;
-      enter_state(state::hash, is_arithmetic_type(arg_type));
-      specs.alt = true;
-      ++begin;
-      break;
-    case '0':
-      enter_state(state::zero);
-      if (!is_arithmetic_type(arg_type)) {
-        if (arg_type == type::none_type) return begin;
-        throw_format_error("format specifier requires numeric argument");
-      }
-      if (specs.align == align::none) {
-        // Ignore 0 if align is specified for compatibility with std::format.
-        specs.align = align::numeric;
-        specs.fill[0] = Char('0');
-      }
-      ++begin;
-      break;
-    case '1':
-    case '2':
-    case '3':
-    case '4':
-    case '5':
-    case '6':
-    case '7':
-    case '8':
-    case '9':
-    case '{':
-      enter_state(state::width);
-      begin = parse_dynamic_spec(begin, end, specs.width, specs.width_ref, ctx);
-      break;
-    case '.':
-      if (arg_type == type::none_type) return begin;
-      enter_state(state::precision,
-                  in(arg_type, float_set | string_set | cstring_set));
-      begin = parse_precision(begin, end, specs.precision, specs.precision_ref,
-                              ctx);
-      break;
-    case 'L':
-      if (arg_type == type::none_type) return begin;
-      enter_state(state::locale, is_arithmetic_type(arg_type));
-      specs.localized = true;
-      ++begin;
-      break;
-    case 'd':
-      return parse_presentation_type(pres::dec, integral_set);
-    case 'o':
-      return parse_presentation_type(pres::oct, integral_set);
-    case 'x':
-      return parse_presentation_type(pres::hex_lower, integral_set);
-    case 'X':
-      return parse_presentation_type(pres::hex_upper, integral_set);
-    case 'b':
-      return parse_presentation_type(pres::bin_lower, integral_set);
-    case 'B':
-      return parse_presentation_type(pres::bin_upper, integral_set);
-    case 'a':
-      return parse_presentation_type(pres::hexfloat_lower, float_set);
-    case 'A':
-      return parse_presentation_type(pres::hexfloat_upper, float_set);
-    case 'e':
-      return parse_presentation_type(pres::exp_lower, float_set);
-    case 'E':
-      return parse_presentation_type(pres::exp_upper, float_set);
-    case 'f':
-      return parse_presentation_type(pres::fixed_lower, float_set);
-    case 'F':
-      return parse_presentation_type(pres::fixed_upper, float_set);
-    case 'g':
-      return parse_presentation_type(pres::general_lower, float_set);
-    case 'G':
-      return parse_presentation_type(pres::general_upper, float_set);
-    case 'c':
-      if (arg_type == type::bool_type)
-        throw_format_error("invalid format specifier");
-      return parse_presentation_type(pres::chr, integral_set);
-    case 's':
-      return parse_presentation_type(pres::string,
-                                     bool_set | string_set | cstring_set);
-    case 'p':
-      return parse_presentation_type(pres::pointer, pointer_set | cstring_set);
-    case '?':
-      return parse_presentation_type(pres::debug,
-                                     char_set | string_set | cstring_set);
-    case '}':
-      return begin;
-    default: {
-      if (*begin == '}') return begin;
-      // Parse fill and alignment.
-      auto fill_end = begin + code_point_length(begin);
-      if (end - fill_end <= 0) {
-        throw_format_error("invalid format specifier");
-        return begin;
-      }
-      if (*begin == '{') {
-        throw_format_error("invalid fill character '{'");
-        return begin;
-      }
-      auto align = parse_align(to_ascii(*fill_end));
-      enter_state(state::align, align != align::none);
-      specs.fill = {begin, to_unsigned(fill_end - begin)};
-      specs.align = align;
-      begin = fill_end + 1;
-    }
-    }
-    if (begin == end) return begin;
-    c = to_ascii(*begin);
-  }
-}
-
-template <typename Char, typename Handler>
-FMT_CONSTEXPR auto parse_replacement_field(const Char* begin, const Char* end,
-                                           Handler&& handler) -> const Char* {
-  struct id_adapter {
-    Handler& handler;
-    int arg_id;
-
-    FMT_CONSTEXPR void on_auto() { arg_id = handler.on_arg_id(); }
-    FMT_CONSTEXPR void on_index(int id) { arg_id = handler.on_arg_id(id); }
-    FMT_CONSTEXPR void on_name(basic_string_view<Char> id) {
-      arg_id = handler.on_arg_id(id);
-    }
-  };
-
-  ++begin;
-  if (begin == end) return handler.on_error("invalid format string"), end;
-  if (*begin == '}') {
-    handler.on_replacement_field(handler.on_arg_id(), begin);
-  } else if (*begin == '{') {
-    handler.on_text(begin, begin + 1);
-  } else {
-    auto adapter = id_adapter{handler, 0};
-    begin = parse_arg_id(begin, end, adapter);
-    Char c = begin != end ? *begin : Char();
-    if (c == '}') {
-      handler.on_replacement_field(adapter.arg_id, begin);
-    } else if (c == ':') {
-      begin = handler.on_format_specs(adapter.arg_id, begin + 1, end);
-      if (begin == end || *begin != '}')
-        return handler.on_error("unknown format specifier"), end;
-    } else {
-      return handler.on_error("missing '}' in format string"), end;
-    }
-  }
-  return begin + 1;
-}
-
-template <bool IS_CONSTEXPR, typename Char, typename Handler>
-FMT_CONSTEXPR FMT_INLINE void parse_format_string(
-    basic_string_view<Char> format_str, Handler&& handler) {
-  auto begin = format_str.data();
-  auto end = begin + format_str.size();
-  if (end - begin < 32) {
-    // Use a simple loop instead of memchr for small strings.
-    const Char* p = begin;
-    while (p != end) {
-      auto c = *p++;
-      if (c == '{') {
-        handler.on_text(begin, p - 1);
-        begin = p = parse_replacement_field(p - 1, end, handler);
-      } else if (c == '}') {
-        if (p == end || *p != '}')
-          return handler.on_error("unmatched '}' in format string");
-        handler.on_text(begin, p);
-        begin = ++p;
-      }
-    }
-    handler.on_text(begin, end);
-    return;
-  }
-  struct writer {
-    FMT_CONSTEXPR void operator()(const Char* from, const Char* to) {
-      if (from == to) return;
-      for (;;) {
-        const Char* p = nullptr;
-        if (!find<IS_CONSTEXPR>(from, to, Char('}'), p))
-          return handler_.on_text(from, to);
-        ++p;
-        if (p == to || *p != '}')
-          return handler_.on_error("unmatched '}' in format string");
-        handler_.on_text(from, p);
-        from = p + 1;
-      }
-    }
-    Handler& handler_;
-  } write = {handler};
-  while (begin != end) {
-    // Doing two passes with memchr (one for '{' and another for '}') is up to
-    // 2.5x faster than the naive one-pass implementation on big format strings.
-    const Char* p = begin;
-    if (*begin != '{' && !find<IS_CONSTEXPR>(begin + 1, end, Char('{'), p))
-      return write(begin, end);
-    write(begin, p);
-    begin = parse_replacement_field(p, end, handler);
-  }
-}
-
-template <typename T, bool = is_named_arg<T>::value> struct strip_named_arg {
-  using type = T;
-};
-template <typename T> struct strip_named_arg<T, true> {
-  using type = remove_cvref_t<decltype(T::value)>;
-};
-
-template <typename T, typename ParseContext>
-FMT_CONSTEXPR auto parse_format_specs(ParseContext& ctx)
-    -> decltype(ctx.begin()) {
-  using char_type = typename ParseContext::char_type;
-  using context = buffer_context<char_type>;
-  using mapped_type = conditional_t<
-      mapped_type_constant<T, context>::value != type::custom_type,
-      decltype(arg_mapper<context>().map(std::declval<const T&>())),
-      typename strip_named_arg<T>::type>;
-#if defined(__cpp_if_constexpr)
-  if constexpr (std::is_default_constructible<
-                    formatter<mapped_type, char_type>>::value) {
-    return formatter<mapped_type, char_type>().parse(ctx);
-  } else {
-    type_is_unformattable_for<T, char_type> _;
-    return ctx.begin();
-  }
-#else
-  return formatter<mapped_type, char_type>().parse(ctx);
-#endif
-}
-
-// Checks char specs and returns true iff the presentation type is char-like.
-template <typename Char>
-FMT_CONSTEXPR auto check_char_specs(const format_specs<Char>& specs) -> bool {
-  if (specs.type != presentation_type::none &&
-      specs.type != presentation_type::chr &&
-      specs.type != presentation_type::debug) {
-    return false;
-  }
-  if (specs.align == align::numeric || specs.sign != sign::none || specs.alt)
-    throw_format_error("invalid format specifier for char");
-  return true;
-}
-
-#if FMT_USE_NONTYPE_TEMPLATE_ARGS
-template <int N, typename T, typename... Args, typename Char>
-constexpr auto get_arg_index_by_name(basic_string_view<Char> name) -> int {
-  if constexpr (is_statically_named_arg<T>()) {
-    if (name == T::name) return N;
-  }
-  if constexpr (sizeof...(Args) > 0)
-    return get_arg_index_by_name<N + 1, Args...>(name);
-  (void)name;  // Workaround an MSVC bug about "unused" parameter.
-  return -1;
-}
-#endif
-
-template <typename... Args, typename Char>
-FMT_CONSTEXPR auto get_arg_index_by_name(basic_string_view<Char> name) -> int {
-#if FMT_USE_NONTYPE_TEMPLATE_ARGS
-  if constexpr (sizeof...(Args) > 0)
-    return get_arg_index_by_name<0, Args...>(name);
-#endif
-  (void)name;
-  return -1;
-}
-
-template <typename Char, typename... Args> class format_string_checker {
- private:
-  using parse_context_type = compile_parse_context<Char>;
-  static constexpr int num_args = sizeof...(Args);
-
-  // Format specifier parsing function.
-  // In the future basic_format_parse_context will replace compile_parse_context
-  // here and will use is_constant_evaluated and downcasting to access the data
-  // needed for compile-time checks: https://godbolt.org/z/GvWzcTjh1.
-  using parse_func = const Char* (*)(parse_context_type&);
-
-  type types_[num_args > 0 ? static_cast<size_t>(num_args) : 1];
-  parse_context_type context_;
-  parse_func parse_funcs_[num_args > 0 ? static_cast<size_t>(num_args) : 1];
-
- public:
-  explicit FMT_CONSTEXPR format_string_checker(basic_string_view<Char> fmt)
-      : types_{mapped_type_constant<Args, buffer_context<Char>>::value...},
-        context_(fmt, num_args, types_),
-        parse_funcs_{&parse_format_specs<Args, parse_context_type>...} {}
-
-  FMT_CONSTEXPR void on_text(const Char*, const Char*) {}
-
-  FMT_CONSTEXPR auto on_arg_id() -> int { return context_.next_arg_id(); }
-  FMT_CONSTEXPR auto on_arg_id(int id) -> int {
-    return context_.check_arg_id(id), id;
-  }
-  FMT_CONSTEXPR auto on_arg_id(basic_string_view<Char> id) -> int {
-#if FMT_USE_NONTYPE_TEMPLATE_ARGS
-    auto index = get_arg_index_by_name<Args...>(id);
-    if (index < 0) on_error("named argument is not found");
-    return index;
-#else
-    (void)id;
-    on_error("compile-time checks for named arguments require C++20 support");
-    return 0;
-#endif
-  }
-
-  FMT_CONSTEXPR void on_replacement_field(int id, const Char* begin) {
-    on_format_specs(id, begin, begin);  // Call parse() on empty specs.
-  }
-
-  FMT_CONSTEXPR auto on_format_specs(int id, const Char* begin, const Char*)
-      -> const Char* {
-    context_.advance_to(begin);
-    // id >= 0 check is a workaround for gcc 10 bug (#2065).
-    return id >= 0 && id < num_args ? parse_funcs_[id](context_) : begin;
-  }
-
-  FMT_CONSTEXPR void on_error(const char* message) {
-    throw_format_error(message);
-  }
-};
-
-// Reports a compile-time error if S is not a valid format string.
-template <typename..., typename S, FMT_ENABLE_IF(!is_compile_string<S>::value)>
-FMT_INLINE void check_format_string(const S&) {
-#ifdef FMT_ENFORCE_COMPILE_STRING
-  static_assert(is_compile_string<S>::value,
-                "FMT_ENFORCE_COMPILE_STRING requires all format strings to use "
-                "FMT_STRING.");
-#endif
-}
-template <typename... Args, typename S,
-          FMT_ENABLE_IF(is_compile_string<S>::value)>
-void check_format_string(S format_str) {
-  using char_t = typename S::char_type;
-  FMT_CONSTEXPR auto s = basic_string_view<char_t>(format_str);
-  using checker = format_string_checker<char_t, remove_cvref_t<Args>...>;
-  FMT_CONSTEXPR bool error = (parse_format_string<true>(s, checker(s)), true);
-  ignore_unused(error);
-}
-
-template <typename Char = char> struct vformat_args {
-  using type = basic_format_args<
-      basic_format_context<std::back_insert_iterator<buffer<Char>>, Char>>;
-};
-template <> struct vformat_args<char> {
-  using type = format_args;
-};
-
-// Use vformat_args and avoid type_identity to keep symbols short.
-template <typename Char>
-void vformat_to(buffer<Char>& buf, basic_string_view<Char> fmt,
-                typename vformat_args<Char>::type args, locale_ref loc = {});
-
-FMT_API void vprint_mojibake(std::FILE*, string_view, format_args);
-#ifndef _WIN32
-inline void vprint_mojibake(std::FILE*, string_view, format_args) {}
-#endif
-}  // namespace detail
-
-FMT_BEGIN_EXPORT
-
-// A formatter specialization for natively supported types.
-template <typename T, typename Char>
-struct formatter<T, Char,
-                 enable_if_t<detail::type_constant<T, Char>::value !=
-                             detail::type::custom_type>> {
- private:
-  detail::dynamic_format_specs<Char> specs_;
-
- public:
-  template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> const Char* {
-    auto type = detail::type_constant<T, Char>::value;
-    auto end =
-        detail::parse_format_specs(ctx.begin(), ctx.end(), specs_, ctx, type);
-    if (type == detail::type::char_type) detail::check_char_specs(specs_);
-    return end;
-  }
-
-  template <detail::type U = detail::type_constant<T, Char>::value,
-            FMT_ENABLE_IF(U == detail::type::string_type ||
-                          U == detail::type::cstring_type ||
-                          U == detail::type::char_type)>
-  FMT_CONSTEXPR void set_debug_format(bool set = true) {
-    specs_.type = set ? presentation_type::debug : presentation_type::none;
-  }
-
-  template <typename FormatContext>
-  FMT_CONSTEXPR auto format(const T& val, FormatContext& ctx) const
-      -> decltype(ctx.out());
-};
-
-template <typename Char = char> struct runtime_format_string {
-  basic_string_view<Char> str;
-};
-
-/** A compile-time format string. */
-template <typename Char, typename... Args> class basic_format_string {
- private:
-  basic_string_view<Char> str_;
-
- public:
-  template <typename S,
-            FMT_ENABLE_IF(
-                std::is_convertible<const S&, basic_string_view<Char>>::value)>
-  FMT_CONSTEVAL FMT_INLINE basic_format_string(const S& s) : str_(s) {
-    static_assert(
-        detail::count<
-            (std::is_base_of<detail::view, remove_reference_t<Args>>::value &&
-             std::is_reference<Args>::value)...>() == 0,
-        "passing views as lvalues is disallowed");
-#ifdef FMT_HAS_CONSTEVAL
-    if constexpr (detail::count_named_args<Args...>() ==
-                  detail::count_statically_named_args<Args...>()) {
-      using checker =
-          detail::format_string_checker<Char, remove_cvref_t<Args>...>;
-      detail::parse_format_string<true>(str_, checker(s));
-    }
-#else
-    detail::check_format_string<Args...>(s);
-#endif
-  }
-  basic_format_string(runtime_format_string<Char> fmt) : str_(fmt.str) {}
-
-  FMT_INLINE operator basic_string_view<Char>() const { return str_; }
-  FMT_INLINE auto get() const -> basic_string_view<Char> { return str_; }
-};
-
-#if FMT_GCC_VERSION && FMT_GCC_VERSION < 409
-// Workaround broken conversion on older gcc.
-template <typename...> using format_string = string_view;
-inline auto runtime(string_view s) -> string_view { return s; }
-#else
-template <typename... Args>
-using format_string = basic_format_string<char, type_identity_t<Args>...>;
-/**
-  \rst
-  Creates a runtime format string.
-
-  **Example**::
-
-    // Check format string at runtime instead of compile-time.
-    fmt::print(fmt::runtime("{:d}"), "I am not a number");
-  \endrst
- */
-inline auto runtime(string_view s) -> runtime_format_string<> { return {{s}}; }
-#endif
-
-FMT_API auto vformat(string_view fmt, format_args args) -> std::string;
-
-/**
-  \rst
-  Formats ``args`` according to specifications in ``fmt`` and returns the result
-  as a string.
-
-  **Example**::
-
-    #include <fmt/core.h>
-    std::string message = fmt::format("The answer is {}.", 42);
-  \endrst
-*/
-template <typename... T>
-FMT_NODISCARD FMT_INLINE auto format(format_string<T...> fmt, T&&... args)
-    -> std::string {
-  return vformat(fmt, fmt::make_format_args(args...));
-}
-
-/** Formats a string and writes the output to ``out``. */
-template <typename OutputIt,
-          FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, char>::value)>
-auto vformat_to(OutputIt out, string_view fmt, format_args args) -> OutputIt {
-  auto&& buf = detail::get_buffer<char>(out);
-  detail::vformat_to(buf, fmt, args, {});
-  return detail::get_iterator(buf, out);
-}
-
-/**
- \rst
- Formats ``args`` according to specifications in ``fmt``, writes the result to
- the output iterator ``out`` and returns the iterator past the end of the output
- range. `format_to` does not append a terminating null character.
-
- **Example**::
-
-   auto out = std::vector<char>();
-   fmt::format_to(std::back_inserter(out), "{}", 42);
- \endrst
- */
-template <typename OutputIt, typename... T,
-          FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, char>::value)>
-FMT_INLINE auto format_to(OutputIt out, format_string<T...> fmt, T&&... args)
-    -> OutputIt {
-  return vformat_to(out, fmt, fmt::make_format_args(args...));
-}
-
-template <typename OutputIt> struct format_to_n_result {
-  /** Iterator past the end of the output range. */
-  OutputIt out;
-  /** Total (not truncated) output size. */
-  size_t size;
-};
-
-template <typename OutputIt, typename... T,
-          FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, char>::value)>
-auto vformat_to_n(OutputIt out, size_t n, string_view fmt, format_args args)
-    -> format_to_n_result<OutputIt> {
-  using traits = detail::fixed_buffer_traits;
-  auto buf = detail::iterator_buffer<OutputIt, char, traits>(out, n);
-  detail::vformat_to(buf, fmt, args, {});
-  return {buf.out(), buf.count()};
-}
-
-/**
-  \rst
-  Formats ``args`` according to specifications in ``fmt``, writes up to ``n``
-  characters of the result to the output iterator ``out`` and returns the total
-  (not truncated) output size and the iterator past the end of the output range.
-  `format_to_n` does not append a terminating null character.
-  \endrst
- */
-template <typename OutputIt, typename... T,
-          FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, char>::value)>
-FMT_INLINE auto format_to_n(OutputIt out, size_t n, format_string<T...> fmt,
-                            T&&... args) -> format_to_n_result<OutputIt> {
-  return vformat_to_n(out, n, fmt, fmt::make_format_args(args...));
-}
-
-/** Returns the number of chars in the output of ``format(fmt, args...)``. */
-template <typename... T>
-FMT_NODISCARD FMT_INLINE auto formatted_size(format_string<T...> fmt,
-                                             T&&... args) -> size_t {
-  auto buf = detail::counting_buffer<>();
-  detail::vformat_to<char>(buf, fmt, fmt::make_format_args(args...), {});
-  return buf.count();
-}
-
-FMT_API void vprint(string_view fmt, format_args args);
-FMT_API void vprint(std::FILE* f, string_view fmt, format_args args);
-
-/**
-  \rst
-  Formats ``args`` according to specifications in ``fmt`` and writes the output
-  to ``stdout``.
-
-  **Example**::
-
-    fmt::print("Elapsed time: {0:.2f} seconds", 1.23);
-  \endrst
- */
-template <typename... T>
-FMT_INLINE void print(format_string<T...> fmt, T&&... args) {
-  const auto& vargs = fmt::make_format_args(args...);
-  return detail::is_utf8() ? vprint(fmt, vargs)
-                           : detail::vprint_mojibake(stdout, fmt, vargs);
-}
-
-/**
-  \rst
-  Formats ``args`` according to specifications in ``fmt`` and writes the
-  output to the file ``f``.
-
-  **Example**::
-
-    fmt::print(stderr, "Don't {}!", "panic");
-  \endrst
- */
-template <typename... T>
-FMT_INLINE void print(std::FILE* f, format_string<T...> fmt, T&&... args) {
-  const auto& vargs = fmt::make_format_args(args...);
-  return detail::is_utf8() ? vprint(f, fmt, vargs)
-                           : detail::vprint_mojibake(f, fmt, vargs);
-}
-
-/**
-  Formats ``args`` according to specifications in ``fmt`` and writes the
-  output to the file ``f`` followed by a newline.
- */
-template <typename... T>
-FMT_INLINE void println(std::FILE* f, format_string<T...> fmt, T&&... args) {
-  return fmt::print(f, "{}\n", fmt::format(fmt, std::forward<T>(args)...));
-}
-
-/**
-  Formats ``args`` according to specifications in ``fmt`` and writes the output
-  to ``stdout`` followed by a newline.
- */
-template <typename... T>
-FMT_INLINE void println(format_string<T...> fmt, T&&... args) {
-  return fmt::println(stdout, fmt, std::forward<T>(args)...);
-}
-
-FMT_END_EXPORT
-FMT_GCC_PRAGMA("GCC pop_options")
-FMT_END_NAMESPACE
-
-#ifdef FMT_HEADER_ONLY
-#  include "format.h"
-#endif
-#endif  // FMT_CORE_H_
+#include "format.h"
diff --git a/contrib/fmt/include/fmt/format-inl.h b/contrib/fmt/include/fmt/format-inl.h
index efac5d1f8..a887483b6 100644
--- a/contrib/fmt/include/fmt/format-inl.h
+++ b/contrib/fmt/include/fmt/format-inl.h
@@ -8,17 +8,19 @@
 #ifndef FMT_FORMAT_INL_H_
 #define FMT_FORMAT_INL_H_
 
-#include <algorithm>
-#include <cerrno>  // errno
-#include <climits>
-#include <cmath>
-#include <exception>
-
-#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
-#  include <locale>
+#ifndef FMT_MODULE
+#  include <algorithm>
+#  include <cerrno>  // errno
+#  include <climits>
+#  include <cmath>
+#  include <exception>
+
+#  if !defined(FMT_STATIC_THOUSANDS_SEPARATOR)
+#    include <locale>
+#  endif
 #endif
 
-#if defined(_WIN32) && !defined(FMT_WINDOWS_NO_WCHAR)
+#if defined(_WIN32) && !defined(FMT_USE_WRITE_CONSOLE)
 #  include <io.h>  // _isatty
 #endif
 
@@ -36,10 +38,6 @@ FMT_FUNC void assert_fail(const char* file, int line, const char* message) {
   std::terminate();
 }
 
-FMT_FUNC void throw_format_error(const char* message) {
-  FMT_THROW(format_error(message));
-}
-
 FMT_FUNC void format_error_code(detail::buffer<char>& out, int error_code,
                                 string_view message) noexcept {
   // Report error code making sure that the output fits into
@@ -56,7 +54,7 @@ FMT_FUNC void format_error_code(detail::buffer<char>& out, int error_code,
     ++error_code_size;
   }
   error_code_size += detail::to_unsigned(detail::count_digits(abs_value));
-  auto it = buffer_appender<char>(out);
+  auto it = appender(out);
   if (message.size() <= inline_buffer_size - error_code_size)
     fmt::format_to(it, FMT_STRING("{}{}"), message, SEP);
   fmt::format_to(it, FMT_STRING("{}{}"), ERROR_STR, error_code);
@@ -113,8 +111,12 @@ template <typename Char> FMT_FUNC Char decimal_point_impl(locale_ref) {
 #endif
 
 FMT_FUNC auto write_loc(appender out, loc_value value,
-                        const format_specs<>& specs, locale_ref loc) -> bool {
-#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
+                        const format_specs& specs, locale_ref loc) -> bool {
+#ifdef FMT_STATIC_THOUSANDS_SEPARATOR
+  value.visit(loc_writer<>{
+      out, specs, std::string(1, FMT_STATIC_THOUSANDS_SEPARATOR), "\3", "."});
+  return true;
+#else
   auto locale = loc.get<std::locale>();
   // We cannot use the num_put<char> facet because it may produce output in
   // a wrong encoding.
@@ -123,10 +125,13 @@ FMT_FUNC auto write_loc(appender out, loc_value value,
     return std::use_facet<facet>(locale).put(out, value, specs);
   return facet(locale).put(out, value, specs);
 #endif
-  return false;
 }
 }  // namespace detail
 
+FMT_FUNC void report_error(const char* message) {
+  FMT_THROW(format_error(message));
+}
+
 template <typename Locale> typename Locale::id format_facet<Locale>::id;
 
 #ifndef FMT_STATIC_THOUSANDS_SEPARATOR
@@ -138,7 +143,7 @@ template <typename Locale> format_facet<Locale>::format_facet(Locale& loc) {
 
 template <>
 FMT_API FMT_FUNC auto format_facet<std::locale>::do_put(
-    appender out, loc_value val, const format_specs<>& specs) const -> bool {
+    appender out, loc_value val, const format_specs& specs) const -> bool {
   return val.visit(
       detail::loc_writer<>{out, specs, separator_, grouping_, decimal_point_});
 }
@@ -1411,7 +1416,7 @@ FMT_FUNC void format_system_error(detail::buffer<char>& out, int error_code,
                                   const char* message) noexcept {
   FMT_TRY {
     auto ec = std::error_code(error_code, std::generic_category());
-    write(std::back_inserter(out), std::system_error(ec, message).what());
+    detail::write(appender(out), std::system_error(ec, message).what());
     return;
   }
   FMT_CATCH(...) {}
@@ -1432,9 +1437,242 @@ FMT_FUNC auto vformat(string_view fmt, format_args args) -> std::string {
 }
 
 namespace detail {
-#if !defined(_WIN32) || defined(FMT_WINDOWS_NO_WCHAR)
+
+template <typename T> struct span {
+  T* data;
+  size_t size;
+};
+
+template <typename F> auto flockfile(F* f) -> decltype(_lock_file(f)) {
+  _lock_file(f);
+}
+template <typename F> auto funlockfile(F* f) -> decltype(_unlock_file(f)) {
+  _unlock_file(f);
+}
+
+#ifndef getc_unlocked
+template <typename F> auto getc_unlocked(F* f) -> decltype(_fgetc_nolock(f)) {
+  return _fgetc_nolock(f);
+}
+#endif
+
+template <typename F = FILE, typename Enable = void>
+struct has_flockfile : std::false_type {};
+
+template <typename F>
+struct has_flockfile<F, void_t<decltype(flockfile(&std::declval<F&>()))>>
+    : std::true_type {};
+
+// A FILE wrapper. F is FILE defined as a template parameter to make system API
+// detection work.
+template <typename F> class file_base {
+ public:
+  F* file_;
+
+ public:
+  file_base(F* file) : file_(file) {}
+  operator F*() const { return file_; }
+
+  // Reads a code unit from the stream.
+  auto get() -> int {
+    int result = getc_unlocked(file_);
+    if (result == EOF && ferror(file_) != 0)
+      FMT_THROW(system_error(errno, FMT_STRING("getc failed")));
+    return result;
+  }
+
+  // Puts the code unit back into the stream buffer.
+  void unget(char c) {
+    if (ungetc(c, file_) == EOF)
+      FMT_THROW(system_error(errno, FMT_STRING("ungetc failed")));
+  }
+
+  void flush() { fflush(this->file_); }
+};
+
+// A FILE wrapper for glibc.
+template <typename F> class glibc_file : public file_base<F> {
+ private:
+  enum {
+    line_buffered = 0x200,  // _IO_LINE_BUF
+    unbuffered = 2          // _IO_UNBUFFERED
+  };
+
+ public:
+  using file_base<F>::file_base;
+
+  auto is_buffered() const -> bool {
+    return (this->file_->_flags & unbuffered) == 0;
+  }
+
+  void init_buffer() {
+    if (this->file_->_IO_write_ptr) return;
+    // Force buffer initialization by placing and removing a char in a buffer.
+    putc_unlocked(0, this->file_);
+    --this->file_->_IO_write_ptr;
+  }
+
+  // Returns the file's read buffer.
+  auto get_read_buffer() const -> span<const char> {
+    auto ptr = this->file_->_IO_read_ptr;
+    return {ptr, to_unsigned(this->file_->_IO_read_end - ptr)};
+  }
+
+  // Returns the file's write buffer.
+  auto get_write_buffer() const -> span<char> {
+    auto ptr = this->file_->_IO_write_ptr;
+    return {ptr, to_unsigned(this->file_->_IO_buf_end - ptr)};
+  }
+
+  void advance_write_buffer(size_t size) { this->file_->_IO_write_ptr += size; }
+
+  bool needs_flush() const {
+    if ((this->file_->_flags & line_buffered) == 0) return false;
+    char* end = this->file_->_IO_write_end;
+    return memchr(end, '\n', to_unsigned(this->file_->_IO_write_ptr - end));
+  }
+
+  void flush() { fflush_unlocked(this->file_); }
+};
+
+// A FILE wrapper for Apple's libc.
+template <typename F> class apple_file : public file_base<F> {
+ private:
+  enum {
+    line_buffered = 1,  // __SNBF
+    unbuffered = 2      // __SLBF
+  };
+
+ public:
+  using file_base<F>::file_base;
+
+  auto is_buffered() const -> bool {
+    return (this->file_->_flags & unbuffered) == 0;
+  }
+
+  void init_buffer() {
+    if (this->file_->_p) return;
+    // Force buffer initialization by placing and removing a char in a buffer.
+    putc_unlocked(0, this->file_);
+    --this->file_->_p;
+    ++this->file_->_w;
+  }
+
+  auto get_read_buffer() const -> span<const char> {
+    return {reinterpret_cast<char*>(this->file_->_p),
+            to_unsigned(this->file_->_r)};
+  }
+
+  auto get_write_buffer() const -> span<char> {
+    return {reinterpret_cast<char*>(this->file_->_p),
+            to_unsigned(this->file_->_bf._base + this->file_->_bf._size -
+                        this->file_->_p)};
+  }
+
+  void advance_write_buffer(size_t size) {
+    this->file_->_p += size;
+    this->file_->_w -= size;
+  }
+
+  bool needs_flush() const {
+    if ((this->file_->_flags & line_buffered) == 0) return false;
+    return memchr(this->file_->_p + this->file_->_w, '\n',
+                  to_unsigned(-this->file_->_w));
+  }
+};
+
+// A fallback FILE wrapper.
+template <typename F> class fallback_file : public file_base<F> {
+ private:
+  char next_;  // The next unconsumed character in the buffer.
+  bool has_next_ = false;
+
+ public:
+  using file_base<F>::file_base;
+
+  auto is_buffered() const -> bool { return false; }
+  auto needs_flush() const -> bool { return false; }
+  void init_buffer() {}
+
+  auto get_read_buffer() const -> span<const char> {
+    return {&next_, has_next_ ? 1u : 0u};
+  }
+
+  auto get_write_buffer() const -> span<char> { return {nullptr, 0}; }
+
+  void advance_write_buffer(size_t) {}
+
+  auto get() -> int {
+    has_next_ = false;
+    return file_base<F>::get();
+  }
+
+  void unget(char c) {
+    file_base<F>::unget(c);
+    next_ = c;
+    has_next_ = true;
+  }
+};
+
+#ifndef FMT_USE_FALLBACK_FILE
+#  define FMT_USE_FALLBACK_FILE 1
+#endif
+
+template <typename F,
+          FMT_ENABLE_IF(sizeof(F::_p) != 0 && !FMT_USE_FALLBACK_FILE)>
+auto get_file(F* f, int) -> apple_file<F> {
+  return f;
+}
+template <typename F,
+          FMT_ENABLE_IF(sizeof(F::_IO_read_ptr) != 0 && !FMT_USE_FALLBACK_FILE)>
+inline auto get_file(F* f, int) -> glibc_file<F> {
+  return f;
+}
+
+inline auto get_file(FILE* f, ...) -> fallback_file<FILE> { return f; }
+
+using file_ref = decltype(get_file(static_cast<FILE*>(nullptr), 0));
+
+template <typename F = FILE, typename Enable = void>
+class file_print_buffer : public buffer<char> {
+ public:
+  explicit file_print_buffer(F*) : buffer(nullptr, size_t()) {}
+};
+
+template <typename F>
+class file_print_buffer<F, enable_if_t<has_flockfile<F>::value>>
+    : public buffer<char> {
+ private:
+  file_ref file_;
+
+  static void grow(buffer<char>& base, size_t) {
+    auto& self = static_cast<file_print_buffer&>(base);
+    self.file_.advance_write_buffer(self.size());
+    if (self.file_.get_write_buffer().size == 0) self.file_.flush();
+    auto buf = self.file_.get_write_buffer();
+    FMT_ASSERT(buf.size > 0, "");
+    self.set(buf.data, buf.size);
+    self.clear();
+  }
+
+ public:
+  explicit file_print_buffer(F* f) : buffer(grow, size_t()), file_(f) {
+    flockfile(f);
+    file_.init_buffer();
+    auto buf = file_.get_write_buffer();
+    set(buf.data, buf.size);
+  }
+  ~file_print_buffer() {
+    file_.advance_write_buffer(size());
+    bool flush = file_.needs_flush();
+    F* f = file_;    // Make funlockfile depend on the template parameter F
+    funlockfile(f);  // for the system API detection to work.
+    if (flush) fflush(file_);
+  }
+};
+
+#if !defined(_WIN32) || defined(FMT_USE_WRITE_CONSOLE)
 FMT_FUNC auto write_console(int, string_view) -> bool { return false; }
-FMT_FUNC auto write_console(std::FILE*, string_view) -> bool { return false; }
 #else
 using dword = conditional_t<sizeof(long) == 4, unsigned long, unsigned>;
 extern "C" __declspec(dllimport) int __stdcall WriteConsoleW(  //
@@ -1445,23 +1683,21 @@ FMT_FUNC bool write_console(int fd, string_view text) {
   return WriteConsoleW(reinterpret_cast<void*>(_get_osfhandle(fd)), u16.c_str(),
                        static_cast<dword>(u16.size()), nullptr, nullptr) != 0;
 }
-
-FMT_FUNC auto write_console(std::FILE* f, string_view text) -> bool {
-  return write_console(_fileno(f), text);
-}
 #endif
 
 #ifdef _WIN32
 // Print assuming legacy (non-Unicode) encoding.
-FMT_FUNC void vprint_mojibake(std::FILE* f, string_view fmt, format_args args) {
+FMT_FUNC void vprint_mojibake(std::FILE* f, string_view fmt, format_args args,
+                              bool newline) {
   auto buffer = memory_buffer();
   detail::vformat_to(buffer, fmt, args);
+  if (newline) buffer.push_back('\n');
   fwrite_fully(buffer.data(), buffer.size(), f);
 }
 #endif
 
 FMT_FUNC void print(std::FILE* f, string_view text) {
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(FMT_USE_WRITE_CONSOLE)
   int fd = _fileno(f);
   if (_isatty(fd)) {
     std::fflush(f);
@@ -1472,9 +1708,23 @@ FMT_FUNC void print(std::FILE* f, string_view text) {
 }
 }  // namespace detail
 
+FMT_FUNC void vprint_buffered(std::FILE* f, string_view fmt, format_args args) {
+  auto buffer = memory_buffer();
+  detail::vformat_to(buffer, fmt, args);
+  detail::print(f, {buffer.data(), buffer.size()});
+}
+
 FMT_FUNC void vprint(std::FILE* f, string_view fmt, format_args args) {
+  if (!detail::file_ref(f).is_buffered() || !detail::has_flockfile<>())
+    return vprint_buffered(f, fmt, args);
+  auto&& buffer = detail::file_print_buffer<>(f);
+  return detail::vformat_to(buffer, fmt, args);
+}
+
+FMT_FUNC void vprintln(std::FILE* f, string_view fmt, format_args args) {
   auto buffer = memory_buffer();
   detail::vformat_to(buffer, fmt, args);
+  buffer.push_back('\n');
   detail::print(f, {buffer.data(), buffer.size()});
 }
 
diff --git a/contrib/fmt/include/fmt/format.h b/contrib/fmt/include/fmt/format.h
index 7637c8a0d..67f0ab739 100644
--- a/contrib/fmt/include/fmt/format.h
+++ b/contrib/fmt/include/fmt/format.h
@@ -33,20 +33,39 @@
 #ifndef FMT_FORMAT_H_
 #define FMT_FORMAT_H_
 
-#include <cmath>             // std::signbit
-#include <cstdint>           // uint32_t
-#include <cstring>           // std::memcpy
-#include <initializer_list>  // std::initializer_list
-#include <limits>            // std::numeric_limits
-#include <memory>            // std::uninitialized_copy
-#include <stdexcept>         // std::runtime_error
-#include <system_error>      // std::system_error
-
-#ifdef __cpp_lib_bit_cast
-#  include <bit>  // std::bit_cast
+#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
+#  define _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
+#  define FMT_REMOVE_TRANSITIVE_INCLUDES
 #endif
 
-#include "core.h"
+#include "base.h"
+
+#ifndef FMT_MODULE
+#  include <cmath>             // std::signbit
+#  include <cstdint>           // uint32_t
+#  include <cstring>           // std::memcpy
+#  include <initializer_list>  // std::initializer_list
+#  include <limits>            // std::numeric_limits
+#  if defined(__GLIBCXX__) && !defined(_GLIBCXX_USE_DUAL_ABI)
+// Workaround for pre gcc 5 libstdc++.
+#    include <memory>  // std::allocator_traits
+#  endif
+#  include <stdexcept>     // std::runtime_error
+#  include <string>        // std::string
+#  include <system_error>  // std::system_error
+
+// Checking FMT_CPLUSPLUS for warning suppression in MSVC.
+#  if FMT_HAS_INCLUDE(<bit>) && FMT_CPLUSPLUS > 201703L
+#    include <bit>  // std::bit_cast
+#  endif
+
+// libc++ supports string_view in pre-c++17.
+#  if FMT_HAS_INCLUDE(<string_view>) && \
+      (FMT_CPLUSPLUS >= 201703L || defined(_LIBCPP_VERSION))
+#    include <string_view>
+#    define FMT_USE_STRING_VIEW
+#  endif
+#endif  // FMT_MODULE
 
 #if defined __cpp_inline_variables && __cpp_inline_variables >= 201606L
 #  define FMT_INLINE_VARIABLE inline
@@ -54,36 +73,11 @@
 #  define FMT_INLINE_VARIABLE
 #endif
 
-#if FMT_HAS_CPP17_ATTRIBUTE(fallthrough)
-#  define FMT_FALLTHROUGH [[fallthrough]]
-#elif defined(__clang__)
-#  define FMT_FALLTHROUGH [[clang::fallthrough]]
-#elif FMT_GCC_VERSION >= 700 && \
-    (!defined(__EDG_VERSION__) || __EDG_VERSION__ >= 520)
-#  define FMT_FALLTHROUGH [[gnu::fallthrough]]
-#else
-#  define FMT_FALLTHROUGH
-#endif
-
-#ifndef FMT_DEPRECATED
-#  if FMT_HAS_CPP14_ATTRIBUTE(deprecated) || FMT_MSC_VERSION >= 1900
-#    define FMT_DEPRECATED [[deprecated]]
-#  else
-#    if (defined(__GNUC__) && !defined(__LCC__)) || defined(__clang__)
-#      define FMT_DEPRECATED __attribute__((deprecated))
-#    elif FMT_MSC_VERSION
-#      define FMT_DEPRECATED __declspec(deprecated)
-#    else
-#      define FMT_DEPRECATED /* deprecated */
-#    endif
-#  endif
-#endif
-
 #ifndef FMT_NO_UNIQUE_ADDRESS
 #  if FMT_CPLUSPLUS >= 202002L
 #    if FMT_HAS_CPP_ATTRIBUTE(no_unique_address)
 #      define FMT_NO_UNIQUE_ADDRESS [[no_unique_address]]
-// VS2019 v16.10 and later except clang-cl (https://reviews.llvm.org/D110485)
+// VS2019 v16.10 and later except clang-cl (https://reviews.llvm.org/D110485).
 #    elif (FMT_MSC_VERSION >= 1929) && !FMT_CLANG_VERSION
 #      define FMT_NO_UNIQUE_ADDRESS [[msvc::no_unique_address]]
 #    endif
@@ -112,6 +106,13 @@
 #  define FMT_NOINLINE
 #endif
 
+namespace std {
+template <> struct iterator_traits<fmt::appender> {
+  using iterator_category = output_iterator_tag;
+  using value_type = char;
+};
+}  // namespace std
+
 #ifndef FMT_THROW
 #  if FMT_EXCEPTIONS
 #    if FMT_MSC_VERSION || defined(__NVCC__)
@@ -135,14 +136,6 @@ FMT_END_NAMESPACE
 #  endif
 #endif
 
-#if FMT_EXCEPTIONS
-#  define FMT_TRY try
-#  define FMT_CATCH(x) catch (x)
-#else
-#  define FMT_TRY if (true)
-#  define FMT_CATCH(x) if (false)
-#endif
-
 #ifndef FMT_MAYBE_UNUSED
 #  if FMT_HAS_CPP17_ATTRIBUTE(maybe_unused)
 #    define FMT_MAYBE_UNUSED [[maybe_unused]]
@@ -277,6 +270,11 @@ FMT_END_NAMESPACE
 #endif
 
 FMT_BEGIN_NAMESPACE
+
+template <typename Char, typename Traits, typename Allocator>
+struct is_contiguous<std::basic_string<Char, Traits, Allocator>>
+    : std::true_type {};
+
 namespace detail {
 
 FMT_CONSTEXPR inline void abort_fuzzing_if(bool condition) {
@@ -286,16 +284,10 @@ FMT_CONSTEXPR inline void abort_fuzzing_if(bool condition) {
 #endif
 }
 
-template <typename CharT, CharT... C> struct string_literal {
-  static constexpr CharT value[sizeof...(C)] = {C...};
-  constexpr operator basic_string_view<CharT>() const {
-    return {value, sizeof...(C)};
-  }
-};
-
-#if FMT_CPLUSPLUS < 201703L
-template <typename CharT, CharT... C>
-constexpr CharT string_literal<CharT, C...>::value[sizeof...(C)];
+#if defined(FMT_USE_STRING_VIEW)
+template <typename Char> using std_string_view = std::basic_string_view<Char>;
+#else
+template <typename T> struct std_string_view {};
 #endif
 
 // Implementation of std::bit_cast for pre-C++20.
@@ -454,7 +446,8 @@ template <typename T> constexpr auto num_bits() -> int {
 }
 // std::numeric_limits<T>::digits may return 0 for 128-bit ints.
 template <> constexpr auto num_bits<int128_opt>() -> int { return 128; }
-template <> constexpr auto num_bits<uint128_t>() -> int { return 128; }
+template <> constexpr auto num_bits<uint128_opt>() -> int { return 128; }
+template <> constexpr auto num_bits<uint128_fallback>() -> int { return 128; }
 
 // A heterogeneous bit_cast used for converting 96-bit long double to uint128_t
 // and 128-bit pointers to uint128_fallback.
@@ -523,21 +516,22 @@ inline auto get_data(Container& c) -> typename Container::value_type* {
 
 // Attempts to reserve space for n extra characters in the output range.
 // Returns a pointer to the reserved range or a reference to it.
-template <typename Container, FMT_ENABLE_IF(is_contiguous<Container>::value)>
+template <typename OutputIt,
+          FMT_ENABLE_IF(is_back_insert_iterator<OutputIt>::value&&
+                            is_contiguous<typename OutputIt::container>::value)>
 #if FMT_CLANG_VERSION >= 307 && !FMT_ICC_VERSION
 __attribute__((no_sanitize("undefined")))
 #endif
 inline auto
-reserve(std::back_insert_iterator<Container> it, size_t n) ->
-    typename Container::value_type* {
-  Container& c = get_container(it);
+reserve(OutputIt it, size_t n) -> typename OutputIt::value_type* {
+  auto& c = get_container(it);
   size_t size = c.size();
   c.resize(size + n);
   return get_data(c) + size;
 }
 
 template <typename T>
-inline auto reserve(buffer_appender<T> it, size_t n) -> buffer_appender<T> {
+inline auto reserve(basic_appender<T> it, size_t n) -> basic_appender<T> {
   buffer<T>& buf = get_container(it);
   buf.try_reserve(buf.size() + n);
   return it;
@@ -556,18 +550,21 @@ template <typename T, typename OutputIt>
 constexpr auto to_pointer(OutputIt, size_t) -> T* {
   return nullptr;
 }
-template <typename T> auto to_pointer(buffer_appender<T> it, size_t n) -> T* {
+template <typename T> auto to_pointer(basic_appender<T> it, size_t n) -> T* {
   buffer<T>& buf = get_container(it);
   auto size = buf.size();
+  buf.try_reserve(size + n);
   if (buf.capacity() < size + n) return nullptr;
   buf.try_resize(size + n);
   return buf.data() + size;
 }
 
-template <typename Container, FMT_ENABLE_IF(is_contiguous<Container>::value)>
-inline auto base_iterator(std::back_insert_iterator<Container> it,
-                          typename Container::value_type*)
-    -> std::back_insert_iterator<Container> {
+template <typename OutputIt,
+          FMT_ENABLE_IF(is_back_insert_iterator<OutputIt>::value&&
+                            is_contiguous<typename OutputIt::container>::value)>
+inline auto base_iterator(OutputIt it,
+                          typename OutputIt::container_type::value_type*)
+    -> OutputIt {
   return it;
 }
 
@@ -593,16 +590,10 @@ FMT_CONSTEXPR20 auto fill_n(T* out, Size count, char value) -> T* {
   return out + count;
 }
 
-#ifdef __cpp_char8_t
-using char8_type = char8_t;
-#else
-enum char8_type : unsigned char {};
-#endif
-
 template <typename OutChar, typename InputIt, typename OutputIt>
-FMT_CONSTEXPR FMT_NOINLINE auto copy_str_noinline(InputIt begin, InputIt end,
-                                                  OutputIt out) -> OutputIt {
-  return copy_str<OutChar>(begin, end, out);
+FMT_CONSTEXPR FMT_NOINLINE auto copy_noinline(InputIt begin, InputIt end,
+                                              OutputIt out) -> OutputIt {
+  return copy<OutChar>(begin, end, out);
 }
 
 // A public domain branchless UTF-8 decoder by Christopher Wellons:
@@ -683,7 +674,7 @@ FMT_CONSTEXPR void for_each_codepoint(string_view s, F f) {
   }
   if (auto num_chars_left = s.data() + s.size() - p) {
     char buf[2 * block_size - 1] = {};
-    copy_str<char>(p, p + num_chars_left, buf);
+    copy<char>(p, p + num_chars_left, buf);
     const char* buf_ptr = buf;
     do {
       auto end = decode(buf_ptr, p);
@@ -734,11 +725,6 @@ FMT_CONSTEXPR inline auto compute_width(string_view s) -> size_t {
   return num_code_points;
 }
 
-inline auto compute_width(basic_string_view<char8_type> s) -> size_t {
-  return compute_width(
-      string_view(reinterpret_cast<const char*>(s.data()), s.size()));
-}
-
 template <typename Char>
 inline auto code_point_index(basic_string_view<Char> s, size_t n) -> size_t {
   size_t size = s.size();
@@ -760,12 +746,6 @@ inline auto code_point_index(string_view s, size_t n) -> size_t {
   return result;
 }
 
-inline auto code_point_index(basic_string_view<char8_type> s, size_t n)
-    -> size_t {
-  return code_point_index(
-      string_view(reinterpret_cast<const char*>(s.data()), s.size()), n);
-}
-
 template <typename T> struct is_integral : std::is_integral<T> {};
 template <> struct is_integral<int128_opt> : std::true_type {};
 template <> struct is_integral<uint128_t> : std::true_type {};
@@ -791,28 +771,22 @@ using is_integer =
 #  define FMT_USE_LONG_DOUBLE 1
 #endif
 
-#ifndef FMT_USE_FLOAT128
-#  ifdef __clang__
-// Clang emulates GCC, so it has to appear early.
-#    if FMT_HAS_INCLUDE(<quadmath.h>)
-#      define FMT_USE_FLOAT128 1
-#    endif
-#  elif defined(__GNUC__)
-// GNU C++:
-#    if defined(_GLIBCXX_USE_FLOAT128) && !defined(__STRICT_ANSI__)
-#      define FMT_USE_FLOAT128 1
-#    endif
-#  endif
-#  ifndef FMT_USE_FLOAT128
-#    define FMT_USE_FLOAT128 0
-#  endif
+#if defined(FMT_USE_FLOAT128)
+// Use the provided definition.
+#elif FMT_CLANG_VERSION && FMT_HAS_INCLUDE(<quadmath.h>)
+#  define FMT_USE_FLOAT128 1
+#elif FMT_GCC_VERSION && defined(_GLIBCXX_USE_FLOAT128) && \
+    !defined(__STRICT_ANSI__)
+#  define FMT_USE_FLOAT128 1
+#else
+#  define FMT_USE_FLOAT128 0
 #endif
-
 #if FMT_USE_FLOAT128
 using float128 = __float128;
 #else
 using float128 = void;
 #endif
+
 template <typename T> using is_float128 = std::is_same<T, float128>;
 
 template <typename T>
@@ -831,20 +805,6 @@ using is_double_double = bool_constant<std::numeric_limits<T>::digits == 106>;
 #  define FMT_USE_FULL_CACHE_DRAGONBOX 0
 #endif
 
-template <typename T>
-template <typename U>
-void buffer<T>::append(const U* begin, const U* end) {
-  while (begin != end) {
-    auto count = to_unsigned(end - begin);
-    try_reserve(size_ + count);
-    auto free_cap = capacity_ - size_;
-    if (free_cap < count) count = free_cap;
-    std::uninitialized_copy_n(begin, count, ptr_ + size_);
-    size_ += count;
-    begin += count;
-  }
-}
-
 template <typename T, typename Enable = void>
 struct is_locale : std::false_type {};
 template <typename T>
@@ -858,29 +818,21 @@ FMT_BEGIN_EXPORT
 enum { inline_buffer_size = 500 };
 
 /**
-  \rst
-  A dynamically growing memory buffer for trivially copyable/constructible types
-  with the first ``SIZE`` elements stored in the object itself.
-
-  You can use the ``memory_buffer`` type alias for ``char`` instead.
-
-  **Example**::
-
-     auto out = fmt::memory_buffer();
-     fmt::format_to(std::back_inserter(out), "The answer is {}.", 42);
-
-  This will append the following output to the ``out`` object:
-
-  .. code-block:: none
-
-     The answer is 42.
-
-  The output can be converted to an ``std::string`` with ``to_string(out)``.
-  \endrst
+ * A dynamically growing memory buffer for trivially copyable/constructible
+ * types with the first `SIZE` elements stored in the object itself. Most
+ * commonly used via the `memory_buffer` alias for `char`.
+ *
+ * **Example**:
+ *
+ *     auto out = fmt::memory_buffer();
+ *     fmt::format_to(std::back_inserter(out), "The answer is {}.", 42);
+ *
+ * This will append "The answer is 42." to `out`. The buffer content can be
+ * converted to `std::string` with `to_string(out)`.
  */
 template <typename T, size_t SIZE = inline_buffer_size,
           typename Allocator = std::allocator<T>>
-class basic_memory_buffer final : public detail::buffer<T> {
+class basic_memory_buffer : public detail::buffer<T> {
  private:
   T store_[SIZE];
 
@@ -893,28 +845,28 @@ class basic_memory_buffer final : public detail::buffer<T> {
     if (data != store_) alloc_.deallocate(data, this->capacity());
   }
 
- protected:
-  FMT_CONSTEXPR20 void grow(size_t size) override {
+  static FMT_CONSTEXPR20 void grow(detail::buffer<T>& buf, size_t size) {
     detail::abort_fuzzing_if(size > 5000);
-    const size_t max_size = std::allocator_traits<Allocator>::max_size(alloc_);
-    size_t old_capacity = this->capacity();
+    auto& self = static_cast<basic_memory_buffer&>(buf);
+    const size_t max_size =
+        std::allocator_traits<Allocator>::max_size(self.alloc_);
+    size_t old_capacity = buf.capacity();
     size_t new_capacity = old_capacity + old_capacity / 2;
     if (size > new_capacity)
       new_capacity = size;
     else if (new_capacity > max_size)
       new_capacity = size > max_size ? size : max_size;
-    T* old_data = this->data();
-    T* new_data =
-        std::allocator_traits<Allocator>::allocate(alloc_, new_capacity);
+    T* old_data = buf.data();
+    T* new_data = self.alloc_.allocate(new_capacity);
     // Suppress a bogus -Wstringop-overflow in gcc 13.1 (#3481).
-    detail::assume(this->size() <= new_capacity);
+    detail::assume(buf.size() <= new_capacity);
     // The following code doesn't throw, so the raw pointer above doesn't leak.
-    std::uninitialized_copy_n(old_data, this->size(), new_data);
-    this->set(new_data, new_capacity);
+    memcpy(new_data, old_data, buf.size() * sizeof(T));
+    self.set(new_data, new_capacity);
     // deallocate must not throw according to the standard, but even if it does,
     // the buffer already uses the new storage and will deallocate it in
     // destructor.
-    if (old_data != store_) alloc_.deallocate(old_data, old_capacity);
+    if (old_data != self.store_) self.alloc_.deallocate(old_data, old_capacity);
   }
 
  public:
@@ -923,7 +875,7 @@ class basic_memory_buffer final : public detail::buffer<T> {
 
   FMT_CONSTEXPR20 explicit basic_memory_buffer(
       const Allocator& alloc = Allocator())
-      : alloc_(alloc) {
+      : detail::buffer<T>(grow), alloc_(alloc) {
     this->set(store_, SIZE);
     if (detail::is_constant_evaluated()) detail::fill_n(store_, SIZE, T());
   }
@@ -937,7 +889,7 @@ class basic_memory_buffer final : public detail::buffer<T> {
     size_t size = other.size(), capacity = other.capacity();
     if (data == other.store_) {
       this->set(store_, capacity);
-      detail::copy_str<T>(other.store_, other.store_ + size, store_);
+      detail::copy<T>(other.store_, other.store_ + size, store_);
     } else {
       this->set(data, capacity);
       // Set pointer to the inline array so that delete is not called
@@ -949,21 +901,14 @@ class basic_memory_buffer final : public detail::buffer<T> {
   }
 
  public:
-  /**
-    \rst
-    Constructs a :class:`fmt::basic_memory_buffer` object moving the content
-    of the other object to it.
-    \endrst
-   */
-  FMT_CONSTEXPR20 basic_memory_buffer(basic_memory_buffer&& other) noexcept {
+  /// Constructs a `basic_memory_buffer` object moving the content of the other
+  /// object to it.
+  FMT_CONSTEXPR20 basic_memory_buffer(basic_memory_buffer&& other) noexcept
+      : detail::buffer<T>(grow) {
     move(other);
   }
 
-  /**
-    \rst
-    Moves the content of the other ``basic_memory_buffer`` object to this one.
-    \endrst
-   */
+  /// Moves the content of the other `basic_memory_buffer` object to this one.
   auto operator=(basic_memory_buffer&& other) noexcept -> basic_memory_buffer& {
     FMT_ASSERT(this != &other, "");
     deallocate();
@@ -974,13 +919,11 @@ class basic_memory_buffer final : public detail::buffer<T> {
   // Returns a copy of the allocator associated with this buffer.
   auto get_allocator() const -> Allocator { return alloc_; }
 
-  /**
-    Resizes the buffer to contain *count* elements. If T is a POD type new
-    elements may not be initialized.
-   */
+  /// Resizes the buffer to contain `count` elements. If T is a POD type new
+  /// elements may not be initialized.
   FMT_CONSTEXPR20 void resize(size_t count) { this->try_resize(count); }
 
-  /** Increases the buffer capacity to *new_capacity*. */
+  /// Increases the buffer capacity to `new_capacity`.
   void reserve(size_t new_capacity) { this->try_reserve(new_capacity); }
 
   using detail::buffer<T>::append;
@@ -999,7 +942,6 @@ struct is_contiguous<basic_memory_buffer<T, SIZE, Allocator>> : std::true_type {
 FMT_END_EXPORT
 namespace detail {
 FMT_API auto write_console(int fd, string_view text) -> bool;
-FMT_API auto write_console(std::FILE* f, string_view text) -> bool;
 FMT_API void print(std::FILE*, string_view);
 }  // namespace detail
 
@@ -1010,7 +952,7 @@ FMT_BEGIN_EXPORT
 #  pragma clang diagnostic ignored "-Wweak-vtables"
 #endif
 
-/** An error reported from a formatting function. */
+/// An error reported from a formatting function.
 class FMT_SO_VISIBILITY("default") format_error : public std::runtime_error {
  public:
   using std::runtime_error::runtime_error;
@@ -1020,8 +962,8 @@ namespace detail_exported {
 #if FMT_USE_NONTYPE_TEMPLATE_ARGS
 template <typename Char, size_t N> struct fixed_string {
   constexpr fixed_string(const Char (&str)[N]) {
-    detail::copy_str<Char, const Char*, Char*>(static_cast<const Char*>(str),
-                                               str + N, data);
+    detail::copy<Char, const Char*, Char*>(static_cast<const Char*>(str),
+                                           str + N, data);
   }
   Char data[N] = {};
 };
@@ -1036,12 +978,57 @@ constexpr auto compile_string_to_view(const Char (&s)[N])
   return {s, N - (std::char_traits<Char>::to_int_type(s[N - 1]) == 0 ? 1 : 0)};
 }
 template <typename Char>
-constexpr auto compile_string_to_view(detail::std_string_view<Char> s)
+constexpr auto compile_string_to_view(basic_string_view<Char> s)
     -> basic_string_view<Char> {
-  return {s.data(), s.size()};
+  return s;
 }
 }  // namespace detail_exported
 
+// A generic formatting context with custom output iterator and character
+// (code unit) support. Char is the format string code unit type which can be
+// different from OutputIt::value_type.
+template <typename OutputIt, typename Char> class generic_context {
+ private:
+  OutputIt out_;
+  basic_format_args<generic_context> args_;
+  detail::locale_ref loc_;
+
+ public:
+  using char_type = Char;
+  using iterator = OutputIt;
+  using parse_context_type = basic_format_parse_context<Char>;
+  template <typename T> using formatter_type = formatter<T, Char>;
+
+  constexpr generic_context(OutputIt out,
+                            basic_format_args<generic_context> ctx_args,
+                            detail::locale_ref loc = {})
+      : out_(out), args_(ctx_args), loc_(loc) {}
+  generic_context(generic_context&&) = default;
+  generic_context(const generic_context&) = delete;
+  void operator=(const generic_context&) = delete;
+
+  constexpr auto arg(int id) const -> basic_format_arg<generic_context> {
+    return args_.get(id);
+  }
+  auto arg(basic_string_view<Char> name) -> basic_format_arg<generic_context> {
+    return args_.get(name);
+  }
+  FMT_CONSTEXPR auto arg_id(basic_string_view<Char> name) -> int {
+    return args_.get_id(name);
+  }
+  auto args() const -> const basic_format_args<generic_context>& {
+    return args_;
+  }
+
+  FMT_CONSTEXPR auto out() -> iterator { return out_; }
+
+  void advance_to(iterator it) {
+    if (!detail::is_back_insert_iterator<iterator>()) out_ = it;
+  }
+
+  FMT_CONSTEXPR auto locale() -> detail::locale_ref { return loc_; }
+};
+
 class loc_value {
  private:
   basic_format_arg<format_context> value_;
@@ -1054,7 +1041,7 @@ class loc_value {
   loc_value(T) {}
 
   template <typename Visitor> auto visit(Visitor&& vis) -> decltype(vis(0)) {
-    return visit_format_arg(vis, value_);
+    return value_.visit(vis);
   }
 };
 
@@ -1068,7 +1055,7 @@ template <typename Locale> class format_facet : public Locale::facet {
 
  protected:
   virtual auto do_put(appender out, loc_value val,
-                      const format_specs<>& specs) const -> bool;
+                      const format_specs& specs) const -> bool;
 
  public:
   static FMT_API typename Locale::id id;
@@ -1081,12 +1068,14 @@ template <typename Locale> class format_facet : public Locale::facet {
         grouping_(g.begin(), g.end()),
         decimal_point_(decimal_point) {}
 
-  auto put(appender out, loc_value val, const format_specs<>& specs) const
+  auto put(appender out, loc_value val, const format_specs& specs) const
       -> bool {
     return do_put(out, val, specs);
   }
 };
 
+FMT_END_EXPORT
+
 namespace detail {
 
 // Returns true if value is negative, false otherwise.
@@ -1138,7 +1127,7 @@ template <typename Char, typename Sign> constexpr auto sign(Sign s) -> Char {
 #if !FMT_GCC_VERSION || FMT_GCC_VERSION >= 604
   static_assert(std::is_same<Sign, sign_t>::value, "");
 #endif
-  return static_cast<Char>("\0-+ "[s]);
+  return static_cast<char>(((' ' << 24) | ('+' << 16) | ('-' << 8)) >> (s * 8));
 }
 
 template <typename T> FMT_CONSTEXPR auto count_digits_fallback(T n) -> int {
@@ -1186,9 +1175,7 @@ inline auto do_count_digits(uint64_t n) -> int {
 // except for n == 0 in which case count_digits returns 1.
 FMT_CONSTEXPR20 inline auto count_digits(uint64_t n) -> int {
 #ifdef FMT_BUILTIN_CLZLL
-  if (!is_constant_evaluated()) {
-    return do_count_digits(n);
-  }
+  if (!is_constant_evaluated()) return do_count_digits(n);
 #endif
   return count_digits_fallback(n);
 }
@@ -1334,7 +1321,7 @@ FMT_CONSTEXPR inline auto format_decimal(Iterator out, UInt value, int size)
   // Buffer is large enough to hold all digits (digits10 + 1).
   Char buffer[digits10<UInt>() + 1] = {};
   auto end = format_decimal(buffer, value, size).end;
-  return {out, detail::copy_str_noinline<Char>(buffer, end, out)};
+  return {out, detail::copy_noinline<Char>(buffer, end, out)};
 }
 
 template <unsigned BASE_BITS, typename Char, typename UInt>
@@ -1361,7 +1348,7 @@ FMT_CONSTEXPR inline auto format_uint(It out, UInt value, int num_digits,
   // Buffer should be large enough to hold all digits (digits / BASE_BITS + 1).
   char buffer[num_bits<UInt>() / BASE_BITS + 1] = {};
   format_uint<BASE_BITS>(buffer, value, num_digits, upper);
-  return detail::copy_str_noinline<Char>(buffer, buffer + num_digits, out);
+  return detail::copy_noinline<Char>(buffer, buffer + num_digits, out);
 }
 
 // A converter from UTF-8 to UTF-16.
@@ -1711,23 +1698,23 @@ constexpr auto convert_float(T value) -> convert_float_result<T> {
   return static_cast<convert_float_result<T>>(value);
 }
 
-template <typename OutputIt, typename Char>
-FMT_NOINLINE FMT_CONSTEXPR auto fill(OutputIt it, size_t n,
-                                     const fill_t<Char>& fill) -> OutputIt {
+template <typename Char, typename OutputIt>
+FMT_NOINLINE FMT_CONSTEXPR auto fill(OutputIt it, size_t n, const fill_t& fill)
+    -> OutputIt {
   auto fill_size = fill.size();
-  if (fill_size == 1) return detail::fill_n(it, n, fill[0]);
-  auto data = fill.data();
-  for (size_t i = 0; i < n; ++i)
-    it = copy_str<Char>(data, data + fill_size, it);
+  if (fill_size == 1) return detail::fill_n(it, n, fill.template get<Char>());
+  if (const Char* data = fill.template data<Char>()) {
+    for (size_t i = 0; i < n; ++i) it = copy<Char>(data, data + fill_size, it);
+  }
   return it;
 }
 
 // Writes the output of f, padded according to format specifications in specs.
 // size: output size in code units.
 // width: output display width in (terminal) column positions.
-template <align::type align = align::left, typename OutputIt, typename Char,
+template <typename Char, align::type align = align::left, typename OutputIt,
           typename F>
-FMT_CONSTEXPR auto write_padded(OutputIt out, const format_specs<Char>& specs,
+FMT_CONSTEXPR auto write_padded(OutputIt out, const format_specs& specs,
                                 size_t size, size_t width, F&& f) -> OutputIt {
   static_assert(align == align::left || align == align::right, "");
   unsigned spec_width = to_unsigned(specs.width);
@@ -1738,31 +1725,31 @@ FMT_CONSTEXPR auto write_padded(OutputIt out, const format_specs<Char>& specs,
   size_t left_padding = padding >> shifts[specs.align];
   size_t right_padding = padding - left_padding;
   auto it = reserve(out, size + padding * specs.fill.size());
-  if (left_padding != 0) it = fill(it, left_padding, specs.fill);
+  if (left_padding != 0) it = fill<Char>(it, left_padding, specs.fill);
   it = f(it);
-  if (right_padding != 0) it = fill(it, right_padding, specs.fill);
+  if (right_padding != 0) it = fill<Char>(it, right_padding, specs.fill);
   return base_iterator(out, it);
 }
 
-template <align::type align = align::left, typename OutputIt, typename Char,
+template <typename Char, align::type align = align::left, typename OutputIt,
           typename F>
-constexpr auto write_padded(OutputIt out, const format_specs<Char>& specs,
+constexpr auto write_padded(OutputIt out, const format_specs& specs,
                             size_t size, F&& f) -> OutputIt {
-  return write_padded<align>(out, specs, size, size, f);
+  return write_padded<Char, align>(out, specs, size, size, f);
 }
 
-template <align::type align = align::left, typename Char, typename OutputIt>
+template <typename Char, align::type align = align::left, typename OutputIt>
 FMT_CONSTEXPR auto write_bytes(OutputIt out, string_view bytes,
-                               const format_specs<Char>& specs) -> OutputIt {
-  return write_padded<align>(
+                               const format_specs& specs = {}) -> OutputIt {
+  return write_padded<Char, align>(
       out, specs, bytes.size(), [bytes](reserve_iterator<OutputIt> it) {
         const char* data = bytes.data();
-        return copy_str<Char>(data, data + bytes.size(), it);
+        return copy<Char>(data, data + bytes.size(), it);
       });
 }
 
 template <typename Char, typename OutputIt, typename UIntPtr>
-auto write_ptr(OutputIt out, UIntPtr value, const format_specs<Char>* specs)
+auto write_ptr(OutputIt out, UIntPtr value, const format_specs* specs)
     -> OutputIt {
   int num_digits = count_digits<4>(value);
   auto size = to_unsigned(num_digits) + size_t(2);
@@ -1771,7 +1758,7 @@ auto write_ptr(OutputIt out, UIntPtr value, const format_specs<Char>* specs)
     *it++ = static_cast<Char>('x');
     return format_uint<4, Char>(it, value, num_digits);
   };
-  return specs ? write_padded<align::right>(out, *specs, size, write)
+  return specs ? write_padded<Char, align::right>(out, *specs, size, write)
                : base_iterator(out, write(reserve(out, size)));
 }
 
@@ -1789,17 +1776,11 @@ template <typename Char> struct find_escape_result {
   uint32_t cp;
 };
 
-template <typename Char>
-using make_unsigned_char =
-    typename conditional_t<std::is_integral<Char>::value,
-                           std::make_unsigned<Char>,
-                           type_identity<uint32_t>>::type;
-
 template <typename Char>
 auto find_escape(const Char* begin, const Char* end)
     -> find_escape_result<Char> {
   for (; begin != end; ++begin) {
-    uint32_t cp = static_cast<make_unsigned_char<Char>>(*begin);
+    uint32_t cp = static_cast<unsigned_char<Char>>(*begin);
     if (const_check(sizeof(Char) == 1) && cp >= 0x80) continue;
     if (needs_escape(cp)) return {begin, begin + 1, cp};
   }
@@ -1808,7 +1789,7 @@ auto find_escape(const Char* begin, const Char* end)
 
 inline auto find_escape(const char* begin, const char* end)
     -> find_escape_result<char> {
-  if (!is_utf8()) return find_escape<char>(begin, end);
+  if (!use_utf8()) return find_escape<char>(begin, end);
   auto result = find_escape_result<char>{end, nullptr, 0};
   for_each_codepoint(string_view(begin, to_unsigned(end - begin)),
                      [&](uint32_t cp, string_view sv) {
@@ -1836,14 +1817,12 @@ inline auto find_escape(const char* begin, const char* end)
   }()
 
 /**
-  \rst
-  Constructs a compile-time format string from a string literal *s*.
-
-  **Example**::
-
-    // A compile-time error because 'd' is an invalid specifier for strings.
-    std::string s = fmt::format(FMT_STRING("{:d}"), "foo");
-  \endrst
+ * Constructs a compile-time format string from a string literal `s`.
+ *
+ * **Example**:
+ *
+ *     // A compile-time error because 'd' is an invalid specifier for strings.
+ *     std::string s = fmt::format(FMT_STRING("{:d}"), "foo");
  */
 #define FMT_STRING(s) FMT_STRING_IMPL(s, fmt::detail::compile_string, )
 
@@ -1854,7 +1833,7 @@ auto write_codepoint(OutputIt out, char prefix, uint32_t cp) -> OutputIt {
   Char buf[width];
   fill_n(buf, width, static_cast<Char>('0'));
   format_uint<4>(buf, cp, width);
-  return copy_str<Char>(buf, buf + width, out);
+  return copy<Char>(buf, buf + width, out);
 }
 
 template <typename OutputIt, typename Char>
@@ -1882,15 +1861,11 @@ auto write_escaped_cp(OutputIt out, const find_escape_result<Char>& escape)
     *out++ = static_cast<Char>('\\');
     break;
   default:
-    if (escape.cp < 0x100) {
-      return write_codepoint<2, Char>(out, 'x', escape.cp);
-    }
-    if (escape.cp < 0x10000) {
+    if (escape.cp < 0x100) return write_codepoint<2, Char>(out, 'x', escape.cp);
+    if (escape.cp < 0x10000)
       return write_codepoint<4, Char>(out, 'u', escape.cp);
-    }
-    if (escape.cp < 0x110000) {
+    if (escape.cp < 0x110000)
       return write_codepoint<8, Char>(out, 'U', escape.cp);
-    }
     for (Char escape_char : basic_string_view<Char>(
              escape.begin, to_unsigned(escape.end - escape.begin))) {
       out = write_codepoint<2, Char>(out, 'x',
@@ -1909,7 +1884,7 @@ auto write_escaped_string(OutputIt out, basic_string_view<Char> str)
   auto begin = str.begin(), end = str.end();
   do {
     auto escape = find_escape(begin, end);
-    out = copy_str<Char>(begin, escape.begin, out);
+    out = copy<Char>(begin, escape.begin, out);
     begin = escape.end;
     if (!begin) break;
     out = write_escaped_cp<OutputIt, Char>(out, escape);
@@ -1936,24 +1911,23 @@ auto write_escaped_char(OutputIt out, Char v) -> OutputIt {
 
 template <typename Char, typename OutputIt>
 FMT_CONSTEXPR auto write_char(OutputIt out, Char value,
-                              const format_specs<Char>& specs) -> OutputIt {
+                              const format_specs& specs) -> OutputIt {
   bool is_debug = specs.type == presentation_type::debug;
-  return write_padded(out, specs, 1, [=](reserve_iterator<OutputIt> it) {
+  return write_padded<Char>(out, specs, 1, [=](reserve_iterator<OutputIt> it) {
     if (is_debug) return write_escaped_char(it, value);
     *it++ = value;
     return it;
   });
 }
 template <typename Char, typename OutputIt>
-FMT_CONSTEXPR auto write(OutputIt out, Char value,
-                         const format_specs<Char>& specs, locale_ref loc = {})
-    -> OutputIt {
+FMT_CONSTEXPR auto write(OutputIt out, Char value, const format_specs& specs,
+                         locale_ref loc = {}) -> OutputIt {
   // char is formatted as unsigned char for consistency across platforms.
   using unsigned_type =
       conditional_t<std::is_same<Char, char>::value, unsigned char, unsigned>;
   return check_char_specs(specs)
-             ? write_char(out, value, specs)
-             : write(out, static_cast<unsigned_type>(value), specs, loc);
+             ? write_char<Char>(out, value, specs)
+             : write<Char>(out, static_cast<unsigned_type>(value), specs, loc);
 }
 
 // Data for write_int that doesn't depend on output iterator type. It is used to
@@ -1963,7 +1937,7 @@ template <typename Char> struct write_int_data {
   size_t padding;
 
   FMT_CONSTEXPR write_int_data(int num_digits, unsigned prefix,
-                               const format_specs<Char>& specs)
+                               const format_specs& specs)
       : size((prefix >> 24) + to_unsigned(num_digits)), padding(0) {
     if (specs.align == align::numeric) {
       auto width = to_unsigned(specs.width);
@@ -1982,10 +1956,10 @@ template <typename Char> struct write_int_data {
 //   <left-padding><prefix><numeric-padding><digits><right-padding>
 // where <digits> are written by write_digits(it).
 // prefix contains chars in three lower bytes and the size in the fourth byte.
-template <typename OutputIt, typename Char, typename W>
+template <typename Char, typename OutputIt, typename W>
 FMT_CONSTEXPR FMT_INLINE auto write_int(OutputIt out, int num_digits,
                                         unsigned prefix,
-                                        const format_specs<Char>& specs,
+                                        const format_specs& specs,
                                         W write_digits) -> OutputIt {
   // Slightly faster check for specs.width == 0 && specs.precision == -1.
   if ((specs.width | (specs.precision + 1)) == 0) {
@@ -1997,7 +1971,7 @@ FMT_CONSTEXPR FMT_INLINE auto write_int(OutputIt out, int num_digits,
     return base_iterator(out, write_digits(it));
   }
   auto data = write_int_data<Char>(num_digits, prefix, specs);
-  return write_padded<align::right>(
+  return write_padded<Char, align::right>(
       out, specs, data.size, [=](reserve_iterator<OutputIt> it) {
         for (unsigned p = prefix & 0xffffff; p != 0; p >>= 8)
           *it++ = static_cast<Char>(p & 0xff);
@@ -2060,9 +2034,8 @@ template <typename Char> class digit_grouping {
     for (int i = 0, sep_index = static_cast<int>(separators.size() - 1);
          i < num_digits; ++i) {
       if (num_digits - i == separators[sep_index]) {
-        out =
-            copy_str<Char>(thousands_sep_.data(),
-                           thousands_sep_.data() + thousands_sep_.size(), out);
+        out = copy<Char>(thousands_sep_.data(),
+                         thousands_sep_.data() + thousands_sep_.size(), out);
         --sep_index;
       }
       *out++ = static_cast<Char>(digits[to_unsigned(i)]);
@@ -2079,37 +2052,27 @@ FMT_CONSTEXPR inline void prefix_append(unsigned& prefix, unsigned value) {
 // Writes a decimal integer with digit grouping.
 template <typename OutputIt, typename UInt, typename Char>
 auto write_int(OutputIt out, UInt value, unsigned prefix,
-               const format_specs<Char>& specs,
-               const digit_grouping<Char>& grouping) -> OutputIt {
+               const format_specs& specs, const digit_grouping<Char>& grouping)
+    -> OutputIt {
   static_assert(std::is_same<uint64_or_128_t<UInt>, UInt>::value, "");
   int num_digits = 0;
   auto buffer = memory_buffer();
   switch (specs.type) {
+  default:
+    FMT_ASSERT(false, "");
+    FMT_FALLTHROUGH;
   case presentation_type::none:
-  case presentation_type::dec: {
+  case presentation_type::dec:
     num_digits = count_digits(value);
     format_decimal<char>(appender(buffer), value, num_digits);
     break;
-  }
-  case presentation_type::hex_lower:
-  case presentation_type::hex_upper: {
-    bool upper = specs.type == presentation_type::hex_upper;
+  case presentation_type::hex:
     if (specs.alt)
-      prefix_append(prefix, unsigned(upper ? 'X' : 'x') << 8 | '0');
+      prefix_append(prefix, unsigned(specs.upper ? 'X' : 'x') << 8 | '0');
     num_digits = count_digits<4>(value);
-    format_uint<4, char>(appender(buffer), value, num_digits, upper);
-    break;
-  }
-  case presentation_type::bin_lower:
-  case presentation_type::bin_upper: {
-    bool upper = specs.type == presentation_type::bin_upper;
-    if (specs.alt)
-      prefix_append(prefix, unsigned(upper ? 'B' : 'b') << 8 | '0');
-    num_digits = count_digits<1>(value);
-    format_uint<1, char>(appender(buffer), value, num_digits);
+    format_uint<4, char>(appender(buffer), value, num_digits, specs.upper);
     break;
-  }
-  case presentation_type::oct: {
+  case presentation_type::oct:
     num_digits = count_digits<3>(value);
     // Octal prefix '0' is counted as a digit, so only add it if precision
     // is not greater than the number of digits.
@@ -2117,16 +2080,19 @@ auto write_int(OutputIt out, UInt value, unsigned prefix,
       prefix_append(prefix, '0');
     format_uint<3, char>(appender(buffer), value, num_digits);
     break;
-  }
+  case presentation_type::bin:
+    if (specs.alt)
+      prefix_append(prefix, unsigned(specs.upper ? 'B' : 'b') << 8 | '0');
+    num_digits = count_digits<1>(value);
+    format_uint<1, char>(appender(buffer), value, num_digits);
+    break;
   case presentation_type::chr:
-    return write_char(out, static_cast<Char>(value), specs);
-  default:
-    throw_format_error("invalid format specifier");
+    return write_char<Char>(out, static_cast<Char>(value), specs);
   }
 
   unsigned size = (prefix != 0 ? prefix >> 24 : 0) + to_unsigned(num_digits) +
                   to_unsigned(grouping.count_separators(num_digits));
-  return write_padded<align::right>(
+  return write_padded<Char, align::right>(
       out, specs, size, size, [&](reserve_iterator<OutputIt> it) {
         for (unsigned p = prefix & 0xffffff; p != 0; p >>= 8)
           *it++ = static_cast<Char>(p & 0xff);
@@ -2135,11 +2101,11 @@ auto write_int(OutputIt out, UInt value, unsigned prefix,
 }
 
 // Writes a localized value.
-FMT_API auto write_loc(appender out, loc_value value,
-                       const format_specs<>& specs, locale_ref loc) -> bool;
-template <typename OutputIt, typename Char>
-inline auto write_loc(OutputIt, loc_value, const format_specs<Char>&,
-                      locale_ref) -> bool {
+FMT_API auto write_loc(appender out, loc_value value, const format_specs& specs,
+                       locale_ref loc) -> bool;
+template <typename OutputIt>
+inline auto write_loc(OutputIt, loc_value, const format_specs&, locale_ref)
+    -> bool {
   return false;
 }
 
@@ -2165,8 +2131,8 @@ FMT_CONSTEXPR auto make_write_int_arg(T value, sign_t sign)
 }
 
 template <typename Char = char> struct loc_writer {
-  buffer_appender<Char> out;
-  const format_specs<Char>& specs;
+  basic_appender<Char> out;
+  const format_specs& specs;
   std::basic_string<Char> sep;
   std::string grouping;
   std::basic_string<Char> decimal_point;
@@ -2187,87 +2153,86 @@ template <typename Char = char> struct loc_writer {
 
 template <typename Char, typename OutputIt, typename T>
 FMT_CONSTEXPR FMT_INLINE auto write_int(OutputIt out, write_int_arg<T> arg,
-                                        const format_specs<Char>& specs,
-                                        locale_ref) -> OutputIt {
+                                        const format_specs& specs, locale_ref)
+    -> OutputIt {
   static_assert(std::is_same<T, uint32_or_64_or_128_t<T>>::value, "");
   auto abs_value = arg.abs_value;
   auto prefix = arg.prefix;
   switch (specs.type) {
+  default:
+    FMT_ASSERT(false, "");
+    FMT_FALLTHROUGH;
   case presentation_type::none:
   case presentation_type::dec: {
-    auto num_digits = count_digits(abs_value);
-    return write_int(
+    int num_digits = count_digits(abs_value);
+    return write_int<Char>(
         out, num_digits, prefix, specs, [=](reserve_iterator<OutputIt> it) {
           return format_decimal<Char>(it, abs_value, num_digits).end;
         });
   }
-  case presentation_type::hex_lower:
-  case presentation_type::hex_upper: {
-    bool upper = specs.type == presentation_type::hex_upper;
+  case presentation_type::hex: {
     if (specs.alt)
-      prefix_append(prefix, unsigned(upper ? 'X' : 'x') << 8 | '0');
+      prefix_append(prefix, unsigned(specs.upper ? 'X' : 'x') << 8 | '0');
     int num_digits = count_digits<4>(abs_value);
-    return write_int(
+    return write_int<Char>(
         out, num_digits, prefix, specs, [=](reserve_iterator<OutputIt> it) {
-          return format_uint<4, Char>(it, abs_value, num_digits, upper);
+          return format_uint<4, Char>(it, abs_value, num_digits, specs.upper);
         });
   }
-  case presentation_type::bin_lower:
-  case presentation_type::bin_upper: {
-    bool upper = specs.type == presentation_type::bin_upper;
-    if (specs.alt)
-      prefix_append(prefix, unsigned(upper ? 'B' : 'b') << 8 | '0');
-    int num_digits = count_digits<1>(abs_value);
-    return write_int(out, num_digits, prefix, specs,
-                     [=](reserve_iterator<OutputIt> it) {
-                       return format_uint<1, Char>(it, abs_value, num_digits);
-                     });
-  }
   case presentation_type::oct: {
     int num_digits = count_digits<3>(abs_value);
     // Octal prefix '0' is counted as a digit, so only add it if precision
     // is not greater than the number of digits.
     if (specs.alt && specs.precision <= num_digits && abs_value != 0)
       prefix_append(prefix, '0');
-    return write_int(out, num_digits, prefix, specs,
-                     [=](reserve_iterator<OutputIt> it) {
-                       return format_uint<3, Char>(it, abs_value, num_digits);
-                     });
+    return write_int<Char>(
+        out, num_digits, prefix, specs, [=](reserve_iterator<OutputIt> it) {
+          return format_uint<3, Char>(it, abs_value, num_digits);
+        });
+  }
+  case presentation_type::bin: {
+    if (specs.alt)
+      prefix_append(prefix, unsigned(specs.upper ? 'B' : 'b') << 8 | '0');
+    int num_digits = count_digits<1>(abs_value);
+    return write_int<Char>(
+        out, num_digits, prefix, specs, [=](reserve_iterator<OutputIt> it) {
+          return format_uint<1, Char>(it, abs_value, num_digits);
+        });
   }
   case presentation_type::chr:
-    return write_char(out, static_cast<Char>(abs_value), specs);
-  default:
-    throw_format_error("invalid format specifier");
+    return write_char<Char>(out, static_cast<Char>(abs_value), specs);
   }
-  return out;
 }
 template <typename Char, typename OutputIt, typename T>
-FMT_CONSTEXPR FMT_NOINLINE auto write_int_noinline(
-    OutputIt out, write_int_arg<T> arg, const format_specs<Char>& specs,
-    locale_ref loc) -> OutputIt {
-  return write_int(out, arg, specs, loc);
+FMT_CONSTEXPR FMT_NOINLINE auto write_int_noinline(OutputIt out,
+                                                   write_int_arg<T> arg,
+                                                   const format_specs& specs,
+                                                   locale_ref loc) -> OutputIt {
+  return write_int<Char>(out, arg, specs, loc);
 }
-template <typename Char, typename OutputIt, typename T,
+template <typename Char, typename T,
           FMT_ENABLE_IF(is_integral<T>::value &&
                         !std::is_same<T, bool>::value &&
-                        std::is_same<OutputIt, buffer_appender<Char>>::value)>
-FMT_CONSTEXPR FMT_INLINE auto write(OutputIt out, T value,
-                                    const format_specs<Char>& specs,
-                                    locale_ref loc) -> OutputIt {
+                        !std::is_same<T, Char>::value)>
+FMT_CONSTEXPR FMT_INLINE auto write(basic_appender<Char> out, T value,
+                                    const format_specs& specs, locale_ref loc)
+    -> basic_appender<Char> {
   if (specs.localized && write_loc(out, value, specs, loc)) return out;
-  return write_int_noinline(out, make_write_int_arg(value, specs.sign), specs,
-                            loc);
+  return write_int_noinline<Char>(out, make_write_int_arg(value, specs.sign),
+                                  specs, loc);
 }
 // An inlined version of write used in format string compilation.
 template <typename Char, typename OutputIt, typename T,
           FMT_ENABLE_IF(is_integral<T>::value &&
                         !std::is_same<T, bool>::value &&
-                        !std::is_same<OutputIt, buffer_appender<Char>>::value)>
+                        !std::is_same<T, Char>::value &&
+                        !std::is_same<OutputIt, basic_appender<Char>>::value)>
 FMT_CONSTEXPR FMT_INLINE auto write(OutputIt out, T value,
-                                    const format_specs<Char>& specs,
-                                    locale_ref loc) -> OutputIt {
+                                    const format_specs& specs, locale_ref loc)
+    -> OutputIt {
   if (specs.localized && write_loc(out, value, specs, loc)) return out;
-  return write_int(out, make_write_int_arg(value, specs.sign), specs, loc);
+  return write_int<Char>(out, make_write_int_arg(value, specs.sign), specs,
+                         loc);
 }
 
 // An output iterator that counts the number of objects written to it and
@@ -2312,40 +2277,41 @@ class counting_iterator {
 
 template <typename Char, typename OutputIt>
 FMT_CONSTEXPR auto write(OutputIt out, basic_string_view<Char> s,
-                         const format_specs<Char>& specs) -> OutputIt {
+                         const format_specs& specs) -> OutputIt {
   auto data = s.data();
   auto size = s.size();
   if (specs.precision >= 0 && to_unsigned(specs.precision) < size)
     size = code_point_index(s, to_unsigned(specs.precision));
   bool is_debug = specs.type == presentation_type::debug;
   size_t width = 0;
+
+  if (is_debug) size = write_escaped_string(counting_iterator{}, s).count();
+
   if (specs.width != 0) {
     if (is_debug)
-      width = write_escaped_string(counting_iterator{}, s).count();
+      width = size;
     else
       width = compute_width(basic_string_view<Char>(data, size));
   }
-  return write_padded(out, specs, size, width,
-                      [=](reserve_iterator<OutputIt> it) {
-                        if (is_debug) return write_escaped_string(it, s);
-                        return copy_str<Char>(data, data + size, it);
-                      });
+  return write_padded<Char>(out, specs, size, width,
+                            [=](reserve_iterator<OutputIt> it) {
+                              if (is_debug) return write_escaped_string(it, s);
+                              return copy<Char>(data, data + size, it);
+                            });
 }
 template <typename Char, typename OutputIt>
 FMT_CONSTEXPR auto write(OutputIt out,
                          basic_string_view<type_identity_t<Char>> s,
-                         const format_specs<Char>& specs, locale_ref)
-    -> OutputIt {
-  return write(out, s, specs);
+                         const format_specs& specs, locale_ref) -> OutputIt {
+  return write<Char>(out, s, specs);
 }
 template <typename Char, typename OutputIt>
-FMT_CONSTEXPR auto write(OutputIt out, const Char* s,
-                         const format_specs<Char>& specs, locale_ref)
-    -> OutputIt {
+FMT_CONSTEXPR auto write(OutputIt out, const Char* s, const format_specs& specs,
+                         locale_ref) -> OutputIt {
   if (specs.type == presentation_type::pointer)
     return write_ptr<Char>(out, bit_cast<uintptr_t>(s), &specs);
-  if (!s) throw_format_error("string pointer is null");
-  return write(out, basic_string_view<Char>(s), specs, {});
+  if (!s) report_error("string pointer is null");
+  return write<Char>(out, basic_string_view<Char>(s), specs, {});
 }
 
 template <typename Char, typename OutputIt, typename T,
@@ -2359,21 +2325,19 @@ FMT_CONSTEXPR auto write(OutputIt out, T value) -> OutputIt {
   if (negative) abs_value = ~abs_value + 1;
   int num_digits = count_digits(abs_value);
   auto size = (negative ? 1 : 0) + static_cast<size_t>(num_digits);
-  auto it = reserve(out, size);
-  if (auto ptr = to_pointer<Char>(it, size)) {
+  if (auto ptr = to_pointer<Char>(out, size)) {
     if (negative) *ptr++ = static_cast<Char>('-');
     format_decimal<Char>(ptr, abs_value, num_digits);
     return out;
   }
-  if (negative) *it++ = static_cast<Char>('-');
-  it = format_decimal<Char>(it, abs_value, num_digits).end;
-  return base_iterator(out, it);
+  if (negative) *out++ = static_cast<Char>('-');
+  return format_decimal<Char>(out, abs_value, num_digits).end;
 }
 
 // DEPRECATED!
 template <typename Char>
 FMT_CONSTEXPR auto parse_align(const Char* begin, const Char* end,
-                               format_specs<Char>& specs) -> const Char* {
+                               format_specs& specs) -> const Char* {
   FMT_ASSERT(begin != end, "");
   auto align = align::none;
   auto p = begin + code_point_length(begin);
@@ -2395,10 +2359,10 @@ FMT_CONSTEXPR auto parse_align(const Char* begin, const Char* end,
         auto c = *begin;
         if (c == '}') return begin;
         if (c == '{') {
-          throw_format_error("invalid fill character '{'");
+          report_error("invalid fill character '{'");
           return begin;
         }
-        specs.fill = {begin, to_unsigned(p - begin)};
+        specs.fill = basic_string_view<Char>(begin, to_unsigned(p - begin));
         begin = p + 1;
       } else {
         ++begin;
@@ -2417,58 +2381,40 @@ FMT_CONSTEXPR auto parse_align(const Char* begin, const Char* end,
 enum class float_format : unsigned char {
   general,  // General: exponent notation or fixed point based on magnitude.
   exp,      // Exponent notation with the default precision of 6, e.g. 1.2e-3.
-  fixed,    // Fixed point with the default precision of 6, e.g. 0.0012.
-  hex
+  fixed     // Fixed point with the default precision of 6, e.g. 0.0012.
 };
 
 struct float_specs {
   int precision;
   float_format format : 8;
   sign_t sign : 8;
-  bool upper : 1;
   bool locale : 1;
   bool binary32 : 1;
   bool showpoint : 1;
 };
 
-template <typename Char>
-FMT_CONSTEXPR auto parse_float_type_spec(const format_specs<Char>& specs)
+// DEPRECATED!
+FMT_CONSTEXPR inline auto parse_float_type_spec(const format_specs& specs)
     -> float_specs {
   auto result = float_specs();
   result.showpoint = specs.alt;
   result.locale = specs.localized;
   switch (specs.type) {
-  case presentation_type::none:
-    result.format = float_format::general;
-    break;
-  case presentation_type::general_upper:
-    result.upper = true;
+  default:
     FMT_FALLTHROUGH;
-  case presentation_type::general_lower:
+  case presentation_type::none:
     result.format = float_format::general;
     break;
-  case presentation_type::exp_upper:
-    result.upper = true;
-    FMT_FALLTHROUGH;
-  case presentation_type::exp_lower:
+  case presentation_type::exp:
     result.format = float_format::exp;
     result.showpoint |= specs.precision != 0;
     break;
-  case presentation_type::fixed_upper:
-    result.upper = true;
-    FMT_FALLTHROUGH;
-  case presentation_type::fixed_lower:
+  case presentation_type::fixed:
     result.format = float_format::fixed;
     result.showpoint |= specs.precision != 0;
     break;
-  case presentation_type::hexfloat_upper:
-    result.upper = true;
-    FMT_FALLTHROUGH;
-  case presentation_type::hexfloat_lower:
-    result.format = float_format::hex;
-    break;
-  default:
-    throw_format_error("invalid format specifier");
+  case presentation_type::general:
+    result.format = float_format::general;
     break;
   }
   return result;
@@ -2476,21 +2422,21 @@ FMT_CONSTEXPR auto parse_float_type_spec(const format_specs<Char>& specs)
 
 template <typename Char, typename OutputIt>
 FMT_CONSTEXPR20 auto write_nonfinite(OutputIt out, bool isnan,
-                                     format_specs<Char> specs,
-                                     const float_specs& fspecs) -> OutputIt {
+                                     format_specs specs, sign_t sign)
+    -> OutputIt {
   auto str =
-      isnan ? (fspecs.upper ? "NAN" : "nan") : (fspecs.upper ? "INF" : "inf");
+      isnan ? (specs.upper ? "NAN" : "nan") : (specs.upper ? "INF" : "inf");
   constexpr size_t str_size = 3;
-  auto sign = fspecs.sign;
   auto size = str_size + (sign ? 1 : 0);
   // Replace '0'-padding with space for non-finite values.
   const bool is_zero_fill =
-      specs.fill.size() == 1 && *specs.fill.data() == static_cast<Char>('0');
-  if (is_zero_fill) specs.fill[0] = static_cast<Char>(' ');
-  return write_padded(out, specs, size, [=](reserve_iterator<OutputIt> it) {
-    if (sign) *it++ = detail::sign<Char>(sign);
-    return copy_str<Char>(str, str + str_size, it);
-  });
+      specs.fill.size() == 1 && specs.fill.template get<Char>() == '0';
+  if (is_zero_fill) specs.fill = ' ';
+  return write_padded<Char>(out, specs, size,
+                            [=](reserve_iterator<OutputIt> it) {
+                              if (sign) *it++ = detail::sign<Char>(sign);
+                              return copy<Char>(str, str + str_size, it);
+                            });
 }
 
 // A decimal floating-point number significand * pow(10, exp).
@@ -2511,7 +2457,7 @@ inline auto get_significand_size(const dragonbox::decimal_fp<T>& f) -> int {
 template <typename Char, typename OutputIt>
 constexpr auto write_significand(OutputIt out, const char* significand,
                                  int significand_size) -> OutputIt {
-  return copy_str<Char>(significand, significand + significand_size, out);
+  return copy<Char>(significand, significand + significand_size, out);
 }
 template <typename Char, typename OutputIt, typename UInt>
 inline auto write_significand(OutputIt out, UInt significand,
@@ -2564,19 +2510,19 @@ inline auto write_significand(OutputIt out, UInt significand,
   Char buffer[digits10<UInt>() + 2];
   auto end = write_significand(buffer, significand, significand_size,
                                integral_size, decimal_point);
-  return detail::copy_str_noinline<Char>(buffer, end, out);
+  return detail::copy_noinline<Char>(buffer, end, out);
 }
 
 template <typename OutputIt, typename Char>
 FMT_CONSTEXPR auto write_significand(OutputIt out, const char* significand,
                                      int significand_size, int integral_size,
                                      Char decimal_point) -> OutputIt {
-  out = detail::copy_str_noinline<Char>(significand,
-                                        significand + integral_size, out);
+  out = detail::copy_noinline<Char>(significand, significand + integral_size,
+                                    out);
   if (!decimal_point) return out;
   *out++ = decimal_point;
-  return detail::copy_str_noinline<Char>(significand + integral_size,
-                                         significand + significand_size, out);
+  return detail::copy_noinline<Char>(significand + integral_size,
+                                     significand + significand_size, out);
 }
 
 template <typename OutputIt, typename Char, typename T, typename Grouping>
@@ -2589,18 +2535,18 @@ FMT_CONSTEXPR20 auto write_significand(OutputIt out, T significand,
                              decimal_point);
   }
   auto buffer = basic_memory_buffer<Char>();
-  write_significand(buffer_appender<Char>(buffer), significand,
-                    significand_size, integral_size, decimal_point);
+  write_significand(basic_appender<Char>(buffer), significand, significand_size,
+                    integral_size, decimal_point);
   grouping.apply(
       out, basic_string_view<Char>(buffer.data(), to_unsigned(integral_size)));
-  return detail::copy_str_noinline<Char>(buffer.data() + integral_size,
-                                         buffer.end(), out);
+  return detail::copy_noinline<Char>(buffer.data() + integral_size,
+                                     buffer.end(), out);
 }
 
-template <typename OutputIt, typename DecimalFP, typename Char,
+template <typename Char, typename OutputIt, typename DecimalFP,
           typename Grouping = digit_grouping<Char>>
 FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& f,
-                                    const format_specs<Char>& specs,
+                                    const format_specs& specs,
                                     float_specs fspecs, locale_ref loc)
     -> OutputIt {
   auto significand = f.significand;
@@ -2637,7 +2583,7 @@ FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& f,
     if (abs_output_exp >= 100) exp_digits = abs_output_exp >= 1000 ? 4 : 3;
 
     size += to_unsigned((decimal_point ? 1 : 0) + 2 + exp_digits);
-    char exp_char = fspecs.upper ? 'E' : 'e';
+    char exp_char = specs.upper ? 'E' : 'e';
     auto write = [=](iterator it) {
       if (sign) *it++ = detail::sign<Char>(sign);
       // Insert a decimal point after the first digit and add an exponent.
@@ -2647,8 +2593,9 @@ FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& f,
       *it++ = static_cast<Char>(exp_char);
       return write_exponent<Char>(output_exp, it);
     };
-    return specs.width > 0 ? write_padded<align::right>(out, specs, size, write)
-                           : base_iterator(out, write(reserve(out, size)));
+    return specs.width > 0
+               ? write_padded<Char, align::right>(out, specs, size, write)
+               : base_iterator(out, write(reserve(out, size)));
   }
 
   int exp = f.exponent + significand_size;
@@ -2664,7 +2611,7 @@ FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& f,
     }
     auto grouping = Grouping(loc, fspecs.locale);
     size += to_unsigned(grouping.count_separators(exp));
-    return write_padded<align::right>(out, specs, size, [&](iterator it) {
+    return write_padded<Char, align::right>(out, specs, size, [&](iterator it) {
       if (sign) *it++ = detail::sign<Char>(sign);
       it = write_significand<Char>(it, significand, significand_size,
                                    f.exponent, grouping);
@@ -2678,7 +2625,7 @@ FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& f,
     size += 1 + to_unsigned(num_zeros > 0 ? num_zeros : 0);
     auto grouping = Grouping(loc, fspecs.locale);
     size += to_unsigned(grouping.count_separators(exp));
-    return write_padded<align::right>(out, specs, size, [&](iterator it) {
+    return write_padded<Char, align::right>(out, specs, size, [&](iterator it) {
       if (sign) *it++ = detail::sign<Char>(sign);
       it = write_significand(it, significand, significand_size, exp,
                              decimal_point, grouping);
@@ -2693,7 +2640,7 @@ FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& f,
   }
   bool pointy = num_zeros != 0 || significand_size != 0 || fspecs.showpoint;
   size += 1 + (pointy ? 1 : 0) + to_unsigned(num_zeros);
-  return write_padded<align::right>(out, specs, size, [&](iterator it) {
+  return write_padded<Char, align::right>(out, specs, size, [&](iterator it) {
     if (sign) *it++ = detail::sign<Char>(sign);
     *it++ = zero;
     if (!pointy) return it;
@@ -2717,22 +2664,21 @@ template <typename Char> class fallback_digit_grouping {
   }
 };
 
-template <typename OutputIt, typename DecimalFP, typename Char>
+template <typename Char, typename OutputIt, typename DecimalFP>
 FMT_CONSTEXPR20 auto write_float(OutputIt out, const DecimalFP& f,
-                                 const format_specs<Char>& specs,
-                                 float_specs fspecs, locale_ref loc)
-    -> OutputIt {
+                                 const format_specs& specs, float_specs fspecs,
+                                 locale_ref loc) -> OutputIt {
   if (is_constant_evaluated()) {
-    return do_write_float<OutputIt, DecimalFP, Char,
+    return do_write_float<Char, OutputIt, DecimalFP,
                           fallback_digit_grouping<Char>>(out, f, specs, fspecs,
                                                          loc);
   } else {
-    return do_write_float(out, f, specs, fspecs, loc);
+    return do_write_float<Char>(out, f, specs, fspecs, loc);
   }
 }
 
 template <typename T> constexpr auto isnan(T value) -> bool {
-  return !(value >= value);  // std::isnan doesn't support __float128.
+  return value != value;  // std::isnan doesn't support __float128.
 }
 
 template <typename T, typename Enable = void>
@@ -2878,7 +2824,7 @@ class bigint {
     auto size = other.bigits_.size();
     bigits_.resize(size);
     auto data = other.bigits_.data();
-    copy_str<bigit>(data, data + size, bigits_.data());
+    copy<bigit>(data, data + size, bigits_.data());
     exp_ = other.exp_;
   }
 
@@ -3014,7 +2960,7 @@ class bigint {
     bigits_.resize(to_unsigned(num_bigits + exp_difference));
     for (int i = num_bigits - 1, j = i + exp_difference; i >= 0; --i, --j)
       bigits_[j] = bigits_[i];
-    std::uninitialized_fill_n(bigits_.data(), exp_difference, 0u);
+    memset(bigits_.data(), 0, to_unsigned(exp_difference) * sizeof(bigit));
     exp_ -= exp_difference;
   }
 
@@ -3139,8 +3085,11 @@ FMT_CONSTEXPR20 inline void format_dragon(basic_fp<uint128_t> value,
   // Generate the given number of digits.
   exp10 -= num_digits - 1;
   if (num_digits <= 0) {
-    denominator *= 10;
-    auto digit = add_compare(numerator, numerator, denominator) > 0 ? '1' : '0';
+    auto digit = '0';
+    if (num_digits == 0) {
+      denominator *= 10;
+      digit = add_compare(numerator, numerator, denominator) > 0 ? '1' : '0';
+    }
     buf.push_back(digit);
     return;
   }
@@ -3177,8 +3126,8 @@ FMT_CONSTEXPR20 inline void format_dragon(basic_fp<uint128_t> value,
 
 // Formats a floating-point number using the hexfloat format.
 template <typename Float, FMT_ENABLE_IF(!is_double_double<Float>::value)>
-FMT_CONSTEXPR20 void format_hexfloat(Float value, int precision,
-                                     float_specs specs, buffer<char>& buf) {
+FMT_CONSTEXPR20 void format_hexfloat(Float value, format_specs specs,
+                                     buffer<char>& buf) {
   // float is passed as double to reduce the number of instantiations and to
   // simplify implementation.
   static_assert(!std::is_same<Float, float>::value, "");
@@ -3206,8 +3155,8 @@ FMT_CONSTEXPR20 void format_hexfloat(Float value, int precision,
   if (leading_xdigit > 1) f.e -= (32 - countl_zero(leading_xdigit) - 1);
 
   int print_xdigits = num_xdigits - 1;
-  if (precision >= 0 && print_xdigits > precision) {
-    const int shift = ((print_xdigits - precision - 1) * 4);
+  if (specs.precision >= 0 && print_xdigits > specs.precision) {
+    const int shift = ((print_xdigits - specs.precision - 1) * 4);
     const auto mask = carrier_uint(0xF) << shift;
     const auto v = static_cast<uint32_t>((f.f & mask) >> shift);
 
@@ -3226,7 +3175,7 @@ FMT_CONSTEXPR20 void format_hexfloat(Float value, int precision,
       }
     }
 
-    print_xdigits = precision;
+    print_xdigits = specs.precision;
   }
 
   char xdigits[num_bits<carrier_uint>() / 4];
@@ -3239,10 +3188,10 @@ FMT_CONSTEXPR20 void format_hexfloat(Float value, int precision,
   buf.push_back('0');
   buf.push_back(specs.upper ? 'X' : 'x');
   buf.push_back(xdigits[0]);
-  if (specs.showpoint || print_xdigits > 0 || print_xdigits < precision)
+  if (specs.alt || print_xdigits > 0 || print_xdigits < specs.precision)
     buf.push_back('.');
   buf.append(xdigits + 1, xdigits + 1 + print_xdigits);
-  for (; print_xdigits < precision; ++print_xdigits) buf.push_back('0');
+  for (; print_xdigits < specs.precision; ++print_xdigits) buf.push_back('0');
 
   buf.push_back(specs.upper ? 'P' : 'p');
 
@@ -3258,9 +3207,9 @@ FMT_CONSTEXPR20 void format_hexfloat(Float value, int precision,
 }
 
 template <typename Float, FMT_ENABLE_IF(is_double_double<Float>::value)>
-FMT_CONSTEXPR20 void format_hexfloat(Float value, int precision,
-                                     float_specs specs, buffer<char>& buf) {
-  format_hexfloat(static_cast<double>(value), precision, specs, buf);
+FMT_CONSTEXPR20 void format_hexfloat(Float value, format_specs specs,
+                                     buffer<char>& buf) {
+  format_hexfloat(static_cast<double>(value), specs, buf);
 }
 
 constexpr auto fractional_part_rounding_thresholds(int index) -> uint32_t {
@@ -3312,11 +3261,11 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
     // Use Dragonbox for the shortest format.
     if (specs.binary32) {
       auto dec = dragonbox::to_decimal(static_cast<float>(value));
-      write<char>(buffer_appender<char>(buf), dec.significand);
+      write<char>(appender(buf), dec.significand);
       return dec.exponent;
     }
     auto dec = dragonbox::to_decimal(static_cast<double>(value));
-    write<char>(buffer_appender<char>(buf), dec.significand);
+    write<char>(appender(buf), dec.significand);
     return dec.exponent;
   } else {
     // Extract significand bits and exponent bits.
@@ -3583,97 +3532,101 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
   }
   return exp;
 }
+
 template <typename Char, typename OutputIt, typename T>
-FMT_CONSTEXPR20 auto write_float(OutputIt out, T value,
-                                 format_specs<Char> specs, locale_ref loc)
-    -> OutputIt {
-  float_specs fspecs = parse_float_type_spec(specs);
-  fspecs.sign = specs.sign;
+FMT_CONSTEXPR20 auto write_float(OutputIt out, T value, format_specs specs,
+                                 locale_ref loc) -> OutputIt {
+  sign_t sign = specs.sign;
   if (detail::signbit(value)) {  // value < 0 is false for NaN so use signbit.
-    fspecs.sign = sign::minus;
+    sign = sign::minus;
     value = -value;
-  } else if (fspecs.sign == sign::minus) {
-    fspecs.sign = sign::none;
+  } else if (sign == sign::minus) {
+    sign = sign::none;
   }
 
   if (!detail::isfinite(value))
-    return write_nonfinite(out, detail::isnan(value), specs, fspecs);
+    return write_nonfinite<Char>(out, detail::isnan(value), specs, sign);
 
-  if (specs.align == align::numeric && fspecs.sign) {
+  if (specs.align == align::numeric && sign) {
     auto it = reserve(out, 1);
-    *it++ = detail::sign<Char>(fspecs.sign);
+    *it++ = detail::sign<Char>(sign);
     out = base_iterator(out, it);
-    fspecs.sign = sign::none;
+    sign = sign::none;
     if (specs.width != 0) --specs.width;
   }
 
   memory_buffer buffer;
-  if (fspecs.format == float_format::hex) {
-    if (fspecs.sign) buffer.push_back(detail::sign<char>(fspecs.sign));
-    format_hexfloat(convert_float(value), specs.precision, fspecs, buffer);
-    return write_bytes<align::right>(out, {buffer.data(), buffer.size()},
-                                     specs);
+  if (specs.type == presentation_type::hexfloat) {
+    if (sign) buffer.push_back(detail::sign<char>(sign));
+    format_hexfloat(convert_float(value), specs, buffer);
+    return write_bytes<Char, align::right>(out, {buffer.data(), buffer.size()},
+                                           specs);
   }
+
   int precision = specs.precision >= 0 || specs.type == presentation_type::none
                       ? specs.precision
                       : 6;
-  if (fspecs.format == float_format::exp) {
+  if (specs.type == presentation_type::exp) {
     if (precision == max_value<int>())
-      throw_format_error("number is too big");
+      report_error("number is too big");
     else
       ++precision;
-  } else if (fspecs.format != float_format::fixed && precision == 0) {
+  } else if (specs.type != presentation_type::fixed && precision == 0) {
     precision = 1;
   }
+  float_specs fspecs = parse_float_type_spec(specs);
+  fspecs.sign = sign;
   if (const_check(std::is_same<T, float>())) fspecs.binary32 = true;
   int exp = format_float(convert_float(value), precision, fspecs, buffer);
   fspecs.precision = precision;
   auto f = big_decimal_fp{buffer.data(), static_cast<int>(buffer.size()), exp};
-  return write_float(out, f, specs, fspecs, loc);
+  return write_float<Char>(out, f, specs, fspecs, loc);
 }
 
 template <typename Char, typename OutputIt, typename T,
           FMT_ENABLE_IF(is_floating_point<T>::value)>
-FMT_CONSTEXPR20 auto write(OutputIt out, T value, format_specs<Char> specs,
+FMT_CONSTEXPR20 auto write(OutputIt out, T value, format_specs specs,
                            locale_ref loc = {}) -> OutputIt {
   if (const_check(!is_supported_floating_point(value))) return out;
   return specs.localized && write_loc(out, value, specs, loc)
              ? out
-             : write_float(out, value, specs, loc);
+             : write_float<Char>(out, value, specs, loc);
 }
 
 template <typename Char, typename OutputIt, typename T,
           FMT_ENABLE_IF(is_fast_float<T>::value)>
 FMT_CONSTEXPR20 auto write(OutputIt out, T value) -> OutputIt {
-  if (is_constant_evaluated()) return write(out, value, format_specs<Char>());
+  if (is_constant_evaluated()) return write<Char>(out, value, format_specs());
   if (const_check(!is_supported_floating_point(value))) return out;
 
-  auto fspecs = float_specs();
+  auto sign = sign_t::none;
   if (detail::signbit(value)) {
-    fspecs.sign = sign::minus;
+    sign = sign::minus;
     value = -value;
   }
 
-  constexpr auto specs = format_specs<Char>();
+  constexpr auto specs = format_specs();
   using floaty = conditional_t<std::is_same<T, long double>::value, double, T>;
   using floaty_uint = typename dragonbox::float_info<floaty>::carrier_uint;
   floaty_uint mask = exponent_mask<floaty>();
   if ((bit_cast<floaty_uint>(value) & mask) == mask)
-    return write_nonfinite(out, std::isnan(value), specs, fspecs);
+    return write_nonfinite<Char>(out, std::isnan(value), specs, sign);
 
+  auto fspecs = float_specs();
+  fspecs.sign = sign;
   auto dec = dragonbox::to_decimal(static_cast<floaty>(value));
-  return write_float(out, dec, specs, fspecs, {});
+  return write_float<Char>(out, dec, specs, fspecs, {});
 }
 
 template <typename Char, typename OutputIt, typename T,
           FMT_ENABLE_IF(is_floating_point<T>::value &&
                         !is_fast_float<T>::value)>
 inline auto write(OutputIt out, T value) -> OutputIt {
-  return write(out, value, format_specs<Char>());
+  return write<Char>(out, value, format_specs());
 }
 
 template <typename Char, typename OutputIt>
-auto write(OutputIt out, monostate, format_specs<Char> = {}, locale_ref = {})
+auto write(OutputIt out, monostate, format_specs = {}, locale_ref = {})
     -> OutputIt {
   FMT_ASSERT(false, "");
   return out;
@@ -3682,13 +3635,11 @@ auto write(OutputIt out, monostate, format_specs<Char> = {}, locale_ref = {})
 template <typename Char, typename OutputIt>
 FMT_CONSTEXPR auto write(OutputIt out, basic_string_view<Char> value)
     -> OutputIt {
-  auto it = reserve(out, value.size());
-  it = copy_str_noinline<Char>(value.begin(), value.end(), it);
-  return base_iterator(out, it);
+  return copy_noinline<Char>(value.begin(), value.end(), out);
 }
 
 template <typename Char, typename OutputIt, typename T,
-          FMT_ENABLE_IF(is_string<T>::value)>
+          FMT_ENABLE_IF(has_to_string_view<T>::value)>
 constexpr auto write(OutputIt out, const T& value) -> OutputIt {
   return write<Char>(out, to_string_view(value));
 }
@@ -3707,13 +3658,12 @@ FMT_CONSTEXPR auto write(OutputIt out, T value) -> OutputIt {
 
 template <typename Char, typename OutputIt, typename T,
           FMT_ENABLE_IF(std::is_same<T, bool>::value)>
-FMT_CONSTEXPR auto write(OutputIt out, T value,
-                         const format_specs<Char>& specs = {}, locale_ref = {})
-    -> OutputIt {
+FMT_CONSTEXPR auto write(OutputIt out, T value, const format_specs& specs = {},
+                         locale_ref = {}) -> OutputIt {
   return specs.type != presentation_type::none &&
                  specs.type != presentation_type::string
-             ? write(out, value ? 1 : 0, specs, {})
-             : write_bytes(out, value ? "true" : "false", specs);
+             ? write<Char>(out, value ? 1 : 0, specs, {})
+             : write_bytes<Char>(out, value ? "true" : "false", specs);
 }
 
 template <typename Char, typename OutputIt>
@@ -3724,16 +3674,15 @@ FMT_CONSTEXPR auto write(OutputIt out, Char value) -> OutputIt {
 }
 
 template <typename Char, typename OutputIt>
-FMT_CONSTEXPR_CHAR_TRAITS auto write(OutputIt out, const Char* value)
-    -> OutputIt {
+FMT_CONSTEXPR20 auto write(OutputIt out, const Char* value) -> OutputIt {
   if (value) return write(out, basic_string_view<Char>(value));
-  throw_format_error("string pointer is null");
+  report_error("string pointer is null");
   return out;
 }
 
 template <typename Char, typename OutputIt, typename T,
           FMT_ENABLE_IF(std::is_same<T, void>::value)>
-auto write(OutputIt out, const T* value, const format_specs<Char>& specs = {},
+auto write(OutputIt out, const T* value, const format_specs& specs = {},
            locale_ref = {}) -> OutputIt {
   return write_ptr<Char>(out, bit_cast<uintptr_t>(value), &specs);
 }
@@ -3742,7 +3691,7 @@ auto write(OutputIt out, const T* value, const format_specs<Char>& specs = {},
 template <typename Char, typename OutputIt, typename T,
           typename Context = basic_format_context<OutputIt, Char>>
 FMT_CONSTEXPR auto write(OutputIt out, const T& value) -> enable_if_t<
-    std::is_class<T>::value && !is_string<T>::value &&
+    std::is_class<T>::value && !has_to_string_view<T>::value &&
         !is_floating_point<T>::value && !std::is_same<T, Char>::value &&
         !std::is_same<T, remove_cvref_t<decltype(arg_mapper<Context>().map(
                              value))>>::value,
@@ -3753,7 +3702,9 @@ FMT_CONSTEXPR auto write(OutputIt out, const T& value) -> enable_if_t<
 template <typename Char, typename OutputIt, typename T,
           typename Context = basic_format_context<OutputIt, Char>>
 FMT_CONSTEXPR auto write(OutputIt out, const T& value)
-    -> enable_if_t<mapped_type_constant<T, Context>::value == type::custom_type,
+    -> enable_if_t<mapped_type_constant<T, Context>::value ==
+                           type::custom_type &&
+                       !std::is_fundamental<T>::value,
                    OutputIt> {
   auto formatter = typename Context::template formatter_type<T>();
   auto parse_ctx = typename Context::parse_context_type({});
@@ -3765,8 +3716,8 @@ FMT_CONSTEXPR auto write(OutputIt out, const T& value)
 // An argument visitor that formats the argument and writes it via the output
 // iterator. It's a class and not a generic lambda for compatibility with C++11.
 template <typename Char> struct default_arg_formatter {
-  using iterator = buffer_appender<Char>;
-  using context = buffer_context<Char>;
+  using iterator = basic_appender<Char>;
+  using context = buffered_context<Char>;
 
   iterator out;
   basic_format_args<context> args;
@@ -3784,16 +3735,16 @@ template <typename Char> struct default_arg_formatter {
 };
 
 template <typename Char> struct arg_formatter {
-  using iterator = buffer_appender<Char>;
-  using context = buffer_context<Char>;
+  using iterator = basic_appender<Char>;
+  using context = buffered_context<Char>;
 
   iterator out;
-  const format_specs<Char>& specs;
+  const format_specs& specs;
   locale_ref locale;
 
   template <typename T>
   FMT_CONSTEXPR FMT_INLINE auto operator()(T value) -> iterator {
-    return detail::write(out, value, specs, locale);
+    return detail::write<Char>(out, value, specs, locale);
   }
   auto operator()(typename basic_format_arg<context>::handle) -> iterator {
     // User-defined types are handled separately because they require access
@@ -3805,13 +3756,13 @@ template <typename Char> struct arg_formatter {
 struct width_checker {
   template <typename T, FMT_ENABLE_IF(is_integer<T>::value)>
   FMT_CONSTEXPR auto operator()(T value) -> unsigned long long {
-    if (is_negative(value)) throw_format_error("negative width");
+    if (is_negative(value)) report_error("negative width");
     return static_cast<unsigned long long>(value);
   }
 
   template <typename T, FMT_ENABLE_IF(!is_integer<T>::value)>
   FMT_CONSTEXPR auto operator()(T) -> unsigned long long {
-    throw_format_error("width is not integer");
+    report_error("width is not integer");
     return 0;
   }
 };
@@ -3819,29 +3770,28 @@ struct width_checker {
 struct precision_checker {
   template <typename T, FMT_ENABLE_IF(is_integer<T>::value)>
   FMT_CONSTEXPR auto operator()(T value) -> unsigned long long {
-    if (is_negative(value)) throw_format_error("negative precision");
+    if (is_negative(value)) report_error("negative precision");
     return static_cast<unsigned long long>(value);
   }
 
   template <typename T, FMT_ENABLE_IF(!is_integer<T>::value)>
   FMT_CONSTEXPR auto operator()(T) -> unsigned long long {
-    throw_format_error("precision is not integer");
+    report_error("precision is not integer");
     return 0;
   }
 };
 
 template <typename Handler, typename FormatArg>
 FMT_CONSTEXPR auto get_dynamic_spec(FormatArg arg) -> int {
-  unsigned long long value = visit_format_arg(Handler(), arg);
-  if (value > to_unsigned(max_value<int>()))
-    throw_format_error("number is too big");
+  unsigned long long value = arg.visit(Handler());
+  if (value > to_unsigned(max_value<int>())) report_error("number is too big");
   return static_cast<int>(value);
 }
 
 template <typename Context, typename ID>
 FMT_CONSTEXPR auto get_arg(Context& ctx, ID id) -> decltype(ctx.arg(id)) {
   auto arg = ctx.arg(id);
-  if (!arg) ctx.on_error("argument not found");
+  if (!arg) report_error("argument not found");
   return arg;
 }
 
@@ -3901,7 +3851,7 @@ template <typename Char> struct udl_arg {
 
 template <typename Locale, typename Char>
 auto vformat(const Locale& loc, basic_string_view<Char> fmt,
-             basic_format_args<buffer_context<type_identity_t<Char>>> args)
+             typename detail::vformat_args<Char>::type args)
     -> std::basic_string<Char> {
   auto buf = basic_memory_buffer<Char>();
   detail::vformat_to(buf, fmt, args, detail::locale_ref(loc));
@@ -3913,29 +3863,29 @@ using format_func = void (*)(detail::buffer<char>&, int, const char*);
 FMT_API void format_error_code(buffer<char>& out, int error_code,
                                string_view message) noexcept;
 
+using fmt::report_error;
 FMT_API void report_error(format_func func, int error_code,
                           const char* message) noexcept;
 }  // namespace detail
 
+FMT_BEGIN_EXPORT
 FMT_API auto vsystem_error(int error_code, string_view format_str,
                            format_args args) -> std::system_error;
 
 /**
-  \rst
-  Constructs :class:`std::system_error` with a message formatted with
-  ``fmt::format(fmt, args...)``.
-  *error_code* is a system error code as given by ``errno``.
-
-  **Example**::
-
-    // This throws std::system_error with the description
-    //   cannot open file 'madeup': No such file or directory
-    // or similar (system message may vary).
-    const char* filename = "madeup";
-    std::FILE* file = std::fopen(filename, "r");
-    if (!file)
-      throw fmt::system_error(errno, "cannot open file '{}'", filename);
-  \endrst
+ * Constructs `std::system_error` with a message formatted with
+ * `fmt::format(fmt, args...)`.
+ * `error_code` is a system error code as given by `errno`.
+ *
+ * **Example**:
+ *
+ *     // This throws std::system_error with the description
+ *     //   cannot open file 'madeup': No such file or directory
+ *     // or similar (system message may vary).
+ *     const char* filename = "madeup";
+ *     std::FILE* file = std::fopen(filename, "r");
+ *     if (!file)
+ *       throw fmt::system_error(errno, "cannot open file '{}'", filename);
  */
 template <typename... T>
 auto system_error(int error_code, format_string<T...> fmt, T&&... args)
@@ -3944,20 +3894,17 @@ auto system_error(int error_code, format_string<T...> fmt, T&&... args)
 }
 
 /**
-  \rst
-  Formats an error message for an error returned by an operating system or a
-  language runtime, for example a file opening error, and writes it to *out*.
-  The format is the same as the one used by ``std::system_error(ec, message)``
-  where ``ec`` is ``std::error_code(error_code, std::generic_category()})``.
-  It is implementation-defined but normally looks like:
-
-  .. parsed-literal::
-     *<message>*: *<system-message>*
-
-  where *<message>* is the passed message and *<system-message>* is the system
-  message corresponding to the error code.
-  *error_code* is a system error code as given by ``errno``.
-  \endrst
+ * Formats an error message for an error returned by an operating system or a
+ * language runtime, for example a file opening error, and writes it to `out`.
+ * The format is the same as the one used by `std::system_error(ec, message)`
+ * where `ec` is `std::error_code(error_code, std::generic_category())`.
+ * It is implementation-defined but normally looks like:
+ *
+ *     <message>: <system-message>
+ *
+ * where `<message>` is the passed message and `<system-message>` is the system
+ * message corresponding to the error code.
+ * `error_code` is a system error code as given by `errno`.
  */
 FMT_API void format_system_error(detail::buffer<char>& out, int error_code,
                                  const char* message) noexcept;
@@ -3966,7 +3913,7 @@ FMT_API void format_system_error(detail::buffer<char>& out, int error_code,
 // Can be used to report errors from destructors.
 FMT_API void report_system_error(int error_code, const char* message) noexcept;
 
-/** Fast integer formatter. */
+/// A fast integer formatter.
 class format_int {
  private:
   // Buffer should be large enough to hold all digits (digits10 + 1),
@@ -3975,12 +3922,14 @@ class format_int {
   mutable char buffer_[buffer_size];
   char* str_;
 
-  template <typename UInt> auto format_unsigned(UInt value) -> char* {
+  template <typename UInt>
+  FMT_CONSTEXPR20 auto format_unsigned(UInt value) -> char* {
     auto n = static_cast<detail::uint32_or_64_or_128_t<UInt>>(value);
     return detail::format_decimal(buffer_, n, buffer_size - 1).begin;
   }
 
-  template <typename Int> auto format_signed(Int value) -> char* {
+  template <typename Int>
+  FMT_CONSTEXPR20 auto format_signed(Int value) -> char* {
     auto abs_value = static_cast<detail::uint32_or_64_or_128_t<Int>>(value);
     bool negative = value < 0;
     if (negative) abs_value = 0 - abs_value;
@@ -3990,39 +3939,35 @@ class format_int {
   }
 
  public:
-  explicit format_int(int value) : str_(format_signed(value)) {}
-  explicit format_int(long value) : str_(format_signed(value)) {}
-  explicit format_int(long long value) : str_(format_signed(value)) {}
-  explicit format_int(unsigned value) : str_(format_unsigned(value)) {}
-  explicit format_int(unsigned long value) : str_(format_unsigned(value)) {}
-  explicit format_int(unsigned long long value)
+  explicit FMT_CONSTEXPR20 format_int(int value) : str_(format_signed(value)) {}
+  explicit FMT_CONSTEXPR20 format_int(long value)
+      : str_(format_signed(value)) {}
+  explicit FMT_CONSTEXPR20 format_int(long long value)
+      : str_(format_signed(value)) {}
+  explicit FMT_CONSTEXPR20 format_int(unsigned value)
+      : str_(format_unsigned(value)) {}
+  explicit FMT_CONSTEXPR20 format_int(unsigned long value)
+      : str_(format_unsigned(value)) {}
+  explicit FMT_CONSTEXPR20 format_int(unsigned long long value)
       : str_(format_unsigned(value)) {}
 
-  /** Returns the number of characters written to the output buffer. */
-  auto size() const -> size_t {
+  /// Returns the number of characters written to the output buffer.
+  FMT_CONSTEXPR20 auto size() const -> size_t {
     return detail::to_unsigned(buffer_ - str_ + buffer_size - 1);
   }
 
-  /**
-    Returns a pointer to the output buffer content. No terminating null
-    character is appended.
-   */
-  auto data() const -> const char* { return str_; }
+  /// Returns a pointer to the output buffer content. No terminating null
+  /// character is appended.
+  FMT_CONSTEXPR20 auto data() const -> const char* { return str_; }
 
-  /**
-    Returns a pointer to the output buffer content with terminating null
-    character appended.
-   */
-  auto c_str() const -> const char* {
+  /// Returns a pointer to the output buffer content with terminating null
+  /// character appended.
+  FMT_CONSTEXPR20 auto c_str() const -> const char* {
     buffer_[buffer_size - 1] = '\0';
     return str_;
   }
 
-  /**
-    \rst
-    Returns the content of the output buffer as an ``std::string``.
-    \endrst
-   */
+  /// Returns the content of the output buffer as an `std::string`.
   auto str() const -> std::string { return std::string(str_, size()); }
 };
 
@@ -4031,14 +3976,19 @@ struct formatter<T, Char, enable_if_t<detail::has_format_as<T>::value>>
     : formatter<detail::format_as_t<T>, Char> {
   template <typename FormatContext>
   auto format(const T& value, FormatContext& ctx) const -> decltype(ctx.out()) {
-    using base = formatter<detail::format_as_t<T>, Char>;
-    return base::format(format_as(value), ctx);
+    auto&& val = format_as(value);  // Make an lvalue reference for format.
+    return formatter<detail::format_as_t<T>, Char>::format(val, ctx);
   }
 };
 
-#define FMT_FORMAT_AS(Type, Base) \
-  template <typename Char>        \
-  struct formatter<Type, Char> : formatter<Base, Char> {}
+#define FMT_FORMAT_AS(Type, Base)                                              \
+  template <typename Char>                                                     \
+  struct formatter<Type, Char> : formatter<Base, Char> {                       \
+    template <typename FormatContext>                                          \
+    auto format(Type value, FormatContext& ctx) const -> decltype(ctx.out()) { \
+      return formatter<Base, Char>::format(value, ctx);                        \
+    }                                                                          \
+  }
 
 FMT_FORMAT_AS(signed char, int);
 FMT_FORMAT_AS(unsigned char, unsigned);
@@ -4047,44 +3997,36 @@ FMT_FORMAT_AS(unsigned short, unsigned);
 FMT_FORMAT_AS(long, detail::long_type);
 FMT_FORMAT_AS(unsigned long, detail::ulong_type);
 FMT_FORMAT_AS(Char*, const Char*);
-FMT_FORMAT_AS(std::basic_string<Char>, basic_string_view<Char>);
 FMT_FORMAT_AS(std::nullptr_t, const void*);
 FMT_FORMAT_AS(detail::std_string_view<Char>, basic_string_view<Char>);
 FMT_FORMAT_AS(void*, const void*);
 
+template <typename Char, typename Traits, typename Allocator>
+class formatter<std::basic_string<Char, Traits, Allocator>, Char>
+    : public formatter<basic_string_view<Char>, Char> {};
+
 template <typename Char, size_t N>
 struct formatter<Char[N], Char> : formatter<basic_string_view<Char>, Char> {};
 
 /**
-  \rst
-  Converts ``p`` to ``const void*`` for pointer formatting.
-
-  **Example**::
-
-    auto s = fmt::format("{}", fmt::ptr(p));
-  \endrst
+ * Converts `p` to `const void*` for pointer formatting.
+ *
+ * **Example**:
+ *
+ *     auto s = fmt::format("{}", fmt::ptr(p));
  */
 template <typename T> auto ptr(T p) -> const void* {
   static_assert(std::is_pointer<T>::value, "");
   return detail::bit_cast<const void*>(p);
 }
-template <typename T, typename Deleter>
-auto ptr(const std::unique_ptr<T, Deleter>& p) -> const void* {
-  return p.get();
-}
-template <typename T> auto ptr(const std::shared_ptr<T>& p) -> const void* {
-  return p.get();
-}
 
 /**
-  \rst
-  Converts ``e`` to the underlying type.
-
-  **Example**::
-
-    enum class color { red, green, blue };
-    auto s = fmt::format("{}", fmt::underlying(color::red));
-  \endrst
+ * Converts `e` to the underlying type.
+ *
+ * **Example**:
+ *
+ *     enum class color { red, green, blue };
+ *     auto s = fmt::format("{}", fmt::underlying(color::red));
  */
 template <typename Enum>
 constexpr auto underlying(Enum e) noexcept -> underlying_t<Enum> {
@@ -4119,12 +4061,13 @@ template <> struct formatter<bytes> {
   }
 
   template <typename FormatContext>
-  auto format(bytes b, FormatContext& ctx) -> decltype(ctx.out()) {
-    detail::handle_dynamic_spec<detail::width_checker>(specs_.width,
-                                                       specs_.width_ref, ctx);
+  auto format(bytes b, FormatContext& ctx) const -> decltype(ctx.out()) {
+    auto specs = specs_;
+    detail::handle_dynamic_spec<detail::width_checker>(specs.width,
+                                                       specs.width_ref, ctx);
     detail::handle_dynamic_spec<detail::precision_checker>(
-        specs_.precision, specs_.precision_ref, ctx);
-    return detail::write_bytes(ctx.out(), b.data_, specs_);
+        specs.precision, specs.precision_ref, ctx);
+    return detail::write_bytes<char>(ctx.out(), b.data_, specs);
   }
 };
 
@@ -4134,15 +4077,13 @@ template <typename T> struct group_digits_view {
 };
 
 /**
-  \rst
-  Returns a view that formats an integer value using ',' as a locale-independent
-  thousands separator.
-
-  **Example**::
-
-    fmt::print("{}", fmt::group_digits(12345));
-    // Output: "12,345"
-  \endrst
+ * Returns a view that formats an integer value using ',' as a
+ * locale-independent thousands separator.
+ *
+ * **Example**:
+ *
+ *     fmt::print("{}", fmt::group_digits(12345));
+ *     // Output: "12,345"
  */
 template <typename T> auto group_digits(T value) -> group_digits_view<T> {
   return {value};
@@ -4160,45 +4101,51 @@ template <typename T> struct formatter<group_digits_view<T>> : formatter<T> {
   }
 
   template <typename FormatContext>
-  auto format(group_digits_view<T> t, FormatContext& ctx)
+  auto format(group_digits_view<T> t, FormatContext& ctx) const
       -> decltype(ctx.out()) {
-    detail::handle_dynamic_spec<detail::width_checker>(specs_.width,
-                                                       specs_.width_ref, ctx);
+    auto specs = specs_;
+    detail::handle_dynamic_spec<detail::width_checker>(specs.width,
+                                                       specs.width_ref, ctx);
     detail::handle_dynamic_spec<detail::precision_checker>(
-        specs_.precision, specs_.precision_ref, ctx);
+        specs.precision, specs.precision_ref, ctx);
+    auto arg = detail::make_write_int_arg(t.value, specs.sign);
     return detail::write_int(
-        ctx.out(), static_cast<detail::uint64_or_128_t<T>>(t.value), 0, specs_,
-        detail::digit_grouping<char>("\3", ","));
+        ctx.out(), static_cast<detail::uint64_or_128_t<T>>(arg.abs_value),
+        arg.prefix, specs, detail::digit_grouping<char>("\3", ","));
   }
 };
 
-template <typename T> struct nested_view {
-  const formatter<T>* fmt;
+template <typename T, typename Char> struct nested_view {
+  const formatter<T, Char>* fmt;
   const T* value;
 };
 
-template <typename T> struct formatter<nested_view<T>> {
-  FMT_CONSTEXPR auto parse(format_parse_context& ctx) -> const char* {
+template <typename T, typename Char>
+struct formatter<nested_view<T, Char>, Char> {
+  template <typename ParseContext>
+  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
     return ctx.begin();
   }
-  auto format(nested_view<T> view, format_context& ctx) const
+  template <typename FormatContext>
+  auto format(nested_view<T, Char> view, FormatContext& ctx) const
       -> decltype(ctx.out()) {
     return view.fmt->format(*view.value, ctx);
   }
 };
 
-template <typename T> struct nested_formatter {
+template <typename T, typename Char = char> struct nested_formatter {
  private:
   int width_;
-  detail::fill_t<char> fill_;
+  detail::fill_t fill_;
   align_t align_ : 4;
-  formatter<T> formatter_;
+  formatter<T, Char> formatter_;
 
  public:
   constexpr nested_formatter() : width_(0), align_(align_t::none) {}
 
-  FMT_CONSTEXPR auto parse(format_parse_context& ctx) -> const char* {
-    auto specs = detail::dynamic_format_specs<char>();
+  FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
+      -> decltype(ctx.begin()) {
+    auto specs = detail::dynamic_format_specs<Char>();
     auto it = parse_format_specs(ctx.begin(), ctx.end(), specs, ctx,
                                  detail::type::none_type);
     width_ = specs.width;
@@ -4208,111 +4155,30 @@ template <typename T> struct nested_formatter {
     return formatter_.parse(ctx);
   }
 
-  template <typename F>
-  auto write_padded(format_context& ctx, F write) const -> decltype(ctx.out()) {
+  template <typename FormatContext, typename F>
+  auto write_padded(FormatContext& ctx, F write) const -> decltype(ctx.out()) {
     if (width_ == 0) return write(ctx.out());
-    auto buf = memory_buffer();
-    write(std::back_inserter(buf));
-    auto specs = format_specs<>();
+    auto buf = basic_memory_buffer<Char>();
+    write(basic_appender<Char>(buf));
+    auto specs = format_specs();
     specs.width = width_;
     specs.fill = fill_;
     specs.align = align_;
-    return detail::write(ctx.out(), string_view(buf.data(), buf.size()), specs);
+    return detail::write<Char>(
+        ctx.out(), basic_string_view<Char>(buf.data(), buf.size()), specs);
   }
 
-  auto nested(const T& value) const -> nested_view<T> {
-    return nested_view<T>{&formatter_, &value};
-  }
-};
-
-// DEPRECATED! join_view will be moved to ranges.h.
-template <typename It, typename Sentinel, typename Char = char>
-struct join_view : detail::view {
-  It begin;
-  Sentinel end;
-  basic_string_view<Char> sep;
-
-  join_view(It b, Sentinel e, basic_string_view<Char> s)
-      : begin(b), end(e), sep(s) {}
-};
-
-template <typename It, typename Sentinel, typename Char>
-struct formatter<join_view<It, Sentinel, Char>, Char> {
- private:
-  using value_type =
-#ifdef __cpp_lib_ranges
-      std::iter_value_t<It>;
-#else
-      typename std::iterator_traits<It>::value_type;
-#endif
-  formatter<remove_cvref_t<value_type>, Char> value_formatter_;
-
- public:
-  template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> const Char* {
-    return value_formatter_.parse(ctx);
-  }
-
-  template <typename FormatContext>
-  auto format(const join_view<It, Sentinel, Char>& value,
-              FormatContext& ctx) const -> decltype(ctx.out()) {
-    auto it = value.begin;
-    auto out = ctx.out();
-    if (it != value.end) {
-      out = value_formatter_.format(*it, ctx);
-      ++it;
-      while (it != value.end) {
-        out = detail::copy_str<Char>(value.sep.begin(), value.sep.end(), out);
-        ctx.advance_to(out);
-        out = value_formatter_.format(*it, ctx);
-        ++it;
-      }
-    }
-    return out;
+  auto nested(const T& value) const -> nested_view<T, Char> {
+    return nested_view<T, Char>{&formatter_, &value};
   }
 };
 
 /**
-  Returns a view that formats the iterator range `[begin, end)` with elements
-  separated by `sep`.
- */
-template <typename It, typename Sentinel>
-auto join(It begin, Sentinel end, string_view sep) -> join_view<It, Sentinel> {
-  return {begin, end, sep};
-}
-
-/**
-  \rst
-  Returns a view that formats `range` with elements separated by `sep`.
-
-  **Example**::
-
-    std::vector<int> v = {1, 2, 3};
-    fmt::print("{}", fmt::join(v, ", "));
-    // Output: "1, 2, 3"
-
-  ``fmt::join`` applies passed format specifiers to the range elements::
-
-    fmt::print("{:02}", fmt::join(v, ", "));
-    // Output: "01, 02, 03"
-  \endrst
- */
-template <typename Range>
-auto join(Range&& range, string_view sep)
-    -> join_view<detail::iterator_t<Range>, detail::sentinel_t<Range>> {
-  return join(std::begin(range), std::end(range), sep);
-}
-
-/**
-  \rst
-  Converts *value* to ``std::string`` using the default format for type *T*.
-
-  **Example**::
-
-    #include <fmt/format.h>
-
-    std::string answer = fmt::to_string(42);
-  \endrst
+ * Converts `value` to `std::string` using the default format for type `T`.
+ *
+ * **Example**:
+ *
+ *     std::string answer = fmt::to_string(42);
  */
 template <typename T, FMT_ENABLE_IF(!std::is_integral<T>::value &&
                                     !detail::has_format_as<T>::value)>
@@ -4353,20 +4219,20 @@ namespace detail {
 template <typename Char>
 void vformat_to(buffer<Char>& buf, basic_string_view<Char> fmt,
                 typename vformat_args<Char>::type args, locale_ref loc) {
-  auto out = buffer_appender<Char>(buf);
+  auto out = basic_appender<Char>(buf);
   if (fmt.size() == 2 && equal2(fmt.data(), "{}")) {
     auto arg = args.get(0);
-    if (!arg) throw_format_error("argument not found");
-    visit_format_arg(default_arg_formatter<Char>{out, args, loc}, arg);
+    if (!arg) report_error("argument not found");
+    arg.visit(default_arg_formatter<Char>{out, args, loc});
     return;
   }
 
-  struct format_handler : error_handler {
+  struct format_handler {
     basic_format_parse_context<Char> parse_context;
-    buffer_context<Char> context;
+    buffered_context<Char> context;
 
-    format_handler(buffer_appender<Char> p_out, basic_string_view<Char> str,
-                   basic_format_args<buffer_context<Char>> p_args,
+    format_handler(basic_appender<Char> p_out, basic_string_view<Char> str,
+                   basic_format_args<buffered_context<Char>> p_args,
                    locale_ref p_loc)
         : parse_context(str), context(p_out, p_args, p_loc) {}
 
@@ -4379,20 +4245,20 @@ void vformat_to(buffer<Char>& buf, basic_string_view<Char> fmt,
       return parse_context.next_arg_id();
     }
     FMT_CONSTEXPR auto on_arg_id(int id) -> int {
-      return parse_context.check_arg_id(id), id;
+      parse_context.check_arg_id(id);
+      return id;
     }
     FMT_CONSTEXPR auto on_arg_id(basic_string_view<Char> id) -> int {
+      parse_context.check_arg_id(id);
       int arg_id = context.arg_id(id);
-      if (arg_id < 0) throw_format_error("argument not found");
+      if (arg_id < 0) report_error("argument not found");
       return arg_id;
     }
 
     FMT_INLINE void on_replacement_field(int id, const Char*) {
       auto arg = get_arg(context, id);
-      context.advance_to(visit_format_arg(
-          default_arg_formatter<Char>{context.out(), context.args(),
-                                      context.locale()},
-          arg));
+      context.advance_to(arg.visit(default_arg_formatter<Char>{
+          context.out(), context.args(), context.locale()}));
     }
 
     auto on_format_specs(int id, const Char* begin, const Char* end)
@@ -4408,11 +4274,13 @@ void vformat_to(buffer<Char>& buf, basic_string_view<Char> fmt,
       detail::handle_dynamic_spec<detail::precision_checker>(
           specs.precision, specs.precision_ref, context);
       if (begin == end || *begin != '}')
-        throw_format_error("missing '}' in format string");
-      auto f = arg_formatter<Char>{context.out(), specs, context.locale()};
-      context.advance_to(visit_format_arg(f, arg));
+        report_error("missing '}' in format string");
+      context.advance_to(arg.visit(
+          arg_formatter<Char>{context.out(), specs, context.locale()}));
       return begin;
     }
+
+    FMT_NORETURN void on_error(const char* message) { report_error(message); }
   };
   detail::parse_format_string<false>(fmt, format_handler(out, fmt, args, loc));
 }
@@ -4431,19 +4299,41 @@ extern template FMT_API auto decimal_point_impl(locale_ref) -> char;
 extern template FMT_API auto decimal_point_impl(locale_ref) -> wchar_t;
 #endif  // FMT_HEADER_ONLY
 
+FMT_END_EXPORT
+
+template <typename T, typename Char, type TYPE>
+template <typename FormatContext>
+FMT_CONSTEXPR FMT_INLINE auto native_formatter<T, Char, TYPE>::format(
+    const T& val, FormatContext& ctx) const -> decltype(ctx.out()) {
+  if (specs_.width_ref.kind == arg_id_kind::none &&
+      specs_.precision_ref.kind == arg_id_kind::none) {
+    return write<Char>(ctx.out(), val, specs_, ctx.locale());
+  }
+  auto specs = specs_;
+  handle_dynamic_spec<width_checker>(specs.width, specs.width_ref, ctx);
+  handle_dynamic_spec<precision_checker>(specs.precision, specs.precision_ref,
+                                         ctx);
+  return write<Char>(ctx.out(), val, specs, ctx.locale());
+}
+
 }  // namespace detail
 
+FMT_BEGIN_EXPORT
+
+template <typename Char>
+struct formatter<detail::float128, Char>
+    : detail::native_formatter<detail::float128, Char,
+                               detail::type::float_type> {};
+
 #if FMT_USE_USER_DEFINED_LITERALS
 inline namespace literals {
 /**
-  \rst
-  User-defined literal equivalent of :func:`fmt::arg`.
-
-  **Example**::
-
-    using namespace fmt::literals;
-    fmt::print("Elapsed time: {s:.2f} seconds", "s"_a=1.23);
-  \endrst
+ * User-defined literal equivalent of `fmt::arg`.
+ *
+ * **Example**:
+ *
+ *     using namespace fmt::literals;
+ *     fmt::print("The answer is {answer}.", "answer"_a=42);
  */
 #  if FMT_USE_NONTYPE_TEMPLATE_ARGS
 template <detail_exported::fixed_string Str> constexpr auto operator""_a() {
@@ -4458,6 +4348,23 @@ constexpr auto operator""_a(const char* s, size_t) -> detail::udl_arg<char> {
 }  // namespace literals
 #endif  // FMT_USE_USER_DEFINED_LITERALS
 
+FMT_API auto vformat(string_view fmt, format_args args) -> std::string;
+
+/**
+ * Formats `args` according to specifications in `fmt` and returns the result
+ * as a string.
+ *
+ * **Example**:
+ *
+ *     #include <fmt/format.h>
+ *     std::string message = fmt::format("The answer is {}.", 42);
+ */
+template <typename... T>
+FMT_NODISCARD FMT_INLINE auto format(format_string<T...> fmt, T&&... args)
+    -> std::string {
+  return vformat(fmt, fmt::make_format_args(args...));
+}
+
 template <typename Locale, FMT_ENABLE_IF(detail::is_locale<Locale>::value)>
 inline auto vformat(const Locale& loc, string_view fmt, format_args args)
     -> std::string {
@@ -4503,26 +4410,6 @@ FMT_NODISCARD FMT_INLINE auto formatted_size(const Locale& loc,
 
 FMT_END_EXPORT
 
-template <typename T, typename Char>
-template <typename FormatContext>
-FMT_CONSTEXPR FMT_INLINE auto
-formatter<T, Char,
-          enable_if_t<detail::type_constant<T, Char>::value !=
-                      detail::type::custom_type>>::format(const T& val,
-                                                          FormatContext& ctx)
-    const -> decltype(ctx.out()) {
-  if (specs_.width_ref.kind == detail::arg_id_kind::none &&
-      specs_.precision_ref.kind == detail::arg_id_kind::none) {
-    return detail::write<Char>(ctx.out(), val, specs_, ctx.locale());
-  }
-  auto specs = specs_;
-  detail::handle_dynamic_spec<detail::width_checker>(specs.width,
-                                                     specs.width_ref, ctx);
-  detail::handle_dynamic_spec<detail::precision_checker>(
-      specs.precision, specs.precision_ref, ctx);
-  return detail::write<Char>(ctx.out(), val, specs, ctx.locale());
-}
-
 FMT_END_NAMESPACE
 
 #ifdef FMT_HEADER_ONLY
@@ -4532,4 +4419,9 @@ FMT_END_NAMESPACE
 #  define FMT_FUNC
 #endif
 
+// Restore _LIBCPP_REMOVE_TRANSITIVE_INCLUDES.
+#ifdef FMT_REMOVE_TRANSITIVE_INCLUDES
+#  undef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
+#endif
+
 #endif  // FMT_FORMAT_H_
diff --git a/contrib/fmt/include/fmt/os.h b/contrib/fmt/include/fmt/os.h
index 3c7b3ccb4..5c85ea08f 100644
--- a/contrib/fmt/include/fmt/os.h
+++ b/contrib/fmt/include/fmt/os.h
@@ -8,18 +8,18 @@
 #ifndef FMT_OS_H_
 #define FMT_OS_H_
 
-#include <cerrno>
-#include <cstddef>
-#include <cstdio>
-#include <system_error>  // std::system_error
-
 #include "format.h"
 
-#if defined __APPLE__ || defined(__FreeBSD__)
+#ifndef FMT_MODULE
+#  include <cerrno>
+#  include <cstddef>
+#  include <cstdio>
+#  include <system_error>  // std::system_error
+
 #  if FMT_HAS_INCLUDE(<xlocale.h>)
-#    include <xlocale.h>  // for LC_NUMERIC_MASK on OS X
+#    include <xlocale.h>  // LC_NUMERIC_MASK on macOS
 #  endif
-#endif
+#endif  // FMT_MODULE
 
 #ifndef FMT_USE_FCNTL
 // UWP doesn't provide _pipe.
@@ -77,46 +77,33 @@ FMT_BEGIN_NAMESPACE
 FMT_BEGIN_EXPORT
 
 /**
-  \rst
-  A reference to a null-terminated string. It can be constructed from a C
-  string or ``std::string``.
-
-  You can use one of the following type aliases for common character types:
-
-  +---------------+-----------------------------+
-  | Type          | Definition                  |
-  +===============+=============================+
-  | cstring_view  | basic_cstring_view<char>    |
-  +---------------+-----------------------------+
-  | wcstring_view | basic_cstring_view<wchar_t> |
-  +---------------+-----------------------------+
-
-  This class is most useful as a parameter type to allow passing
-  different types of strings to a function, for example::
-
-    template <typename... Args>
-    std::string format(cstring_view format_str, const Args & ... args);
-
-    format("{}", 42);
-    format(std::string("{}"), 42);
-  \endrst
+ * A reference to a null-terminated string. It can be constructed from a C
+ * string or `std::string`.
+ *
+ * You can use one of the following type aliases for common character types:
+ *
+ * +---------------+-----------------------------+
+ * | Type          | Definition                  |
+ * +===============+=============================+
+ * | cstring_view  | basic_cstring_view<char>    |
+ * +---------------+-----------------------------+
+ * | wcstring_view | basic_cstring_view<wchar_t> |
+ * +---------------+-----------------------------+
+ *
+ * This class is most useful as a parameter type for functions that wrap C APIs.
  */
 template <typename Char> class basic_cstring_view {
  private:
   const Char* data_;
 
  public:
-  /** Constructs a string reference object from a C string. */
+  /// Constructs a string reference object from a C string.
   basic_cstring_view(const Char* s) : data_(s) {}
 
-  /**
-    \rst
-    Constructs a string reference from an ``std::string`` object.
-    \endrst
-   */
+  /// Constructs a string reference from an `std::string` object.
   basic_cstring_view(const std::basic_string<Char>& s) : data_(s.c_str()) {}
 
-  /** Returns the pointer to a C string. */
+  /// Returns the pointer to a C string.
   auto c_str() const -> const Char* { return data_; }
 };
 
@@ -135,33 +122,30 @@ FMT_API std::system_error vwindows_error(int error_code, string_view format_str,
                                          format_args args);
 
 /**
- \rst
- Constructs a :class:`std::system_error` object with the description
- of the form
-
- .. parsed-literal::
-   *<message>*: *<system-message>*
-
- where *<message>* is the formatted message and *<system-message>* is the
- system message corresponding to the error code.
- *error_code* is a Windows error code as given by ``GetLastError``.
- If *error_code* is not a valid error code such as -1, the system message
- will look like "error -1".
-
- **Example**::
-
-   // This throws a system_error with the description
-   //   cannot open file 'madeup': The system cannot find the file specified.
-   // or similar (system message may vary).
-   const char *filename = "madeup";
-   LPOFSTRUCT of = LPOFSTRUCT();
-   HFILE file = OpenFile(filename, &of, OF_READ);
-   if (file == HFILE_ERROR) {
-     throw fmt::windows_error(GetLastError(),
-                              "cannot open file '{}'", filename);
-   }
- \endrst
-*/
+ * Constructs a `std::system_error` object with the description of the form
+ *
+ *     <message>: <system-message>
+ *
+ * where `<message>` is the formatted message and `<system-message>` is the
+ * system message corresponding to the error code.
+ * `error_code` is a Windows error code as given by `GetLastError`.
+ * If `error_code` is not a valid error code such as -1, the system message
+ * will look like "error -1".
+ *
+ * **Example**:
+ *
+ *     // This throws a system_error with the description
+ *     //   cannot open file 'madeup': The system cannot find the file
+ * specified.
+ *     // or similar (system message may vary).
+ *     const char *filename = "madeup";
+ *     LPOFSTRUCT of = LPOFSTRUCT();
+ *     HFILE file = OpenFile(filename, &of, OF_READ);
+ *     if (file == HFILE_ERROR) {
+ *       throw fmt::windows_error(GetLastError(),
+ *                                "cannot open file '{}'", filename);
+ *     }
+ */
 template <typename... Args>
 std::system_error windows_error(int error_code, string_view message,
                                 const Args&... args) {
@@ -227,17 +211,16 @@ class buffered_file {
 
   FMT_API auto descriptor() const -> int;
 
-  void vprint(string_view format_str, format_args args) {
-    fmt::vprint(file_, format_str, args);
-  }
-
-  template <typename... Args>
-  inline void print(string_view format_str, const Args&... args) {
-    vprint(format_str, fmt::make_format_args(args...));
+  template <typename... T>
+  inline void print(string_view fmt, const T&... args) {
+    const auto& vargs = fmt::make_format_args(args...);
+    detail::is_locking<T...>() ? fmt::vprint_buffered(file_, fmt, vargs)
+                               : fmt::vprint(file_, fmt, vargs);
   }
 };
 
 #if FMT_USE_FCNTL
+
 // A file. Closed file is represented by a file object with descriptor -1.
 // Methods that are not declared with noexcept may throw
 // fmt::system_error in case of failure. Note that some errors such as
@@ -251,6 +234,8 @@ class FMT_API file {
   // Constructs a file object with a given descriptor.
   explicit file(int fd) : fd_(fd) {}
 
+  friend struct pipe;
+
  public:
   // Possible values for the oflag argument to the constructor.
   enum {
@@ -313,11 +298,6 @@ class FMT_API file {
   // necessary.
   void dup2(int fd, std::error_code& ec) noexcept;
 
-  // Creates a pipe setting up read_end and write_end file objects for reading
-  // and writing respectively.
-  // DEPRECATED! Taking files as out parameters is deprecated.
-  static void pipe(file& read_end, file& write_end);
-
   // Creates a buffered_file object associated with this file and detaches
   // this file object from the file.
   auto fdopen(const char* mode) -> buffered_file;
@@ -329,6 +309,15 @@ class FMT_API file {
 #  endif
 };
 
+struct FMT_API pipe {
+  file read_end;
+  file write_end;
+
+  // Creates a pipe setting up read_end and write_end file objects for reading
+  // and writing respectively.
+  pipe();
+};
+
 // Returns the memory page size.
 auto getpagesize() -> long;
 
@@ -370,13 +359,14 @@ struct ostream_params {
 };
 
 class file_buffer final : public buffer<char> {
+ private:
   file file_;
 
-  FMT_API void grow(size_t) override;
+  FMT_API static void grow(buffer<char>& buf, size_t);
 
  public:
   FMT_API file_buffer(cstring_view path, const ostream_params& params);
-  FMT_API file_buffer(file_buffer&& other);
+  FMT_API file_buffer(file_buffer&& other) noexcept;
   FMT_API ~file_buffer();
 
   void flush() {
@@ -393,11 +383,10 @@ class file_buffer final : public buffer<char> {
 
 }  // namespace detail
 
-// Added {} below to work around default constructor error known to
-// occur in Xcode versions 7.2.1 and 8.2.1.
-constexpr detail::buffer_size buffer_size{};
+constexpr auto buffer_size = detail::buffer_size();
 
-/** A fast output stream which is not thread-safe. */
+/// A fast output stream for writing from a single thread. Writing from
+/// multiple threads without external synchronization may result in a data race.
 class FMT_API ostream {
  private:
   FMT_MSC_WARNING(suppress : 4251)
@@ -418,30 +407,25 @@ class FMT_API ostream {
 
   void close() { buffer_.close(); }
 
-  /**
-    Formats ``args`` according to specifications in ``fmt`` and writes the
-    output to the file.
-   */
+  /// Formats `args` according to specifications in `fmt` and writes the
+  /// output to the file.
   template <typename... T> void print(format_string<T...> fmt, T&&... args) {
-    vformat_to(std::back_inserter(buffer_), fmt,
-               fmt::make_format_args(args...));
+    vformat_to(appender(buffer_), fmt, fmt::make_format_args(args...));
   }
 };
 
 /**
-  \rst
-  Opens a file for writing. Supported parameters passed in *params*:
-
-  * ``<integer>``: Flags passed to `open
-    <https://pubs.opengroup.org/onlinepubs/007904875/functions/open.html>`_
-    (``file::WRONLY | file::CREATE | file::TRUNC`` by default)
-  * ``buffer_size=<integer>``: Output buffer size
-
-  **Example**::
-
-    auto out = fmt::output_file("guide.txt");
-    out.print("Don't {}", "Panic");
-  \endrst
+ * Opens a file for writing. Supported parameters passed in `params`:
+ *
+ * - `<integer>`: Flags passed to [open](
+ *   https://pubs.opengroup.org/onlinepubs/007904875/functions/open.html)
+ *   (`file::WRONLY | file::CREATE | file::TRUNC` by default)
+ * - `buffer_size=<integer>`: Output buffer size
+ *
+ * **Example**:
+ *
+ *     auto out = fmt::output_file("guide.txt");
+ *     out.print("Don't {}", "Panic");
  */
 template <typename... T>
 inline auto output_file(cstring_view path, T... params) -> ostream {
diff --git a/contrib/fmt/include/fmt/ostream.h b/contrib/fmt/include/fmt/ostream.h
index 26fb3b5ac..98faef659 100644
--- a/contrib/fmt/include/fmt/ostream.h
+++ b/contrib/fmt/include/fmt/ostream.h
@@ -8,7 +8,9 @@
 #ifndef FMT_OSTREAM_H_
 #define FMT_OSTREAM_H_
 
-#include <fstream>  // std::filebuf
+#ifndef FMT_MODULE
+#  include <fstream>  // std::filebuf
+#endif
 
 #ifdef _WIN32
 #  ifdef __GLIBCXX__
@@ -18,42 +20,11 @@
 #  include <io.h>
 #endif
 
-#include "format.h"
+#include "chrono.h"  // formatbuf
 
 FMT_BEGIN_NAMESPACE
 namespace detail {
 
-template <typename Streambuf> class formatbuf : public Streambuf {
- private:
-  using char_type = typename Streambuf::char_type;
-  using streamsize = decltype(std::declval<Streambuf>().sputn(nullptr, 0));
-  using int_type = typename Streambuf::int_type;
-  using traits_type = typename Streambuf::traits_type;
-
-  buffer<char_type>& buffer_;
-
- public:
-  explicit formatbuf(buffer<char_type>& buf) : buffer_(buf) {}
-
- protected:
-  // The put area is always empty. This makes the implementation simpler and has
-  // the advantage that the streambuf and the buffer are always in sync and
-  // sputc never writes into uninitialized memory. A disadvantage is that each
-  // call to sputc always results in a (virtual) call to overflow. There is no
-  // disadvantage here for sputn since this always results in a call to xsputn.
-
-  auto overflow(int_type ch) -> int_type override {
-    if (!traits_type::eq_int_type(ch, traits_type::eof()))
-      buffer_.push_back(static_cast<char_type>(ch));
-    return ch;
-  }
-
-  auto xsputn(const char_type* s, streamsize count) -> streamsize override {
-    buffer_.append(s, s + count);
-    return count;
-  }
-};
-
 // Generate a unique explicit instantion in every translation unit using a tag
 // type in an anonymous namespace.
 namespace {
@@ -73,12 +44,12 @@ auto get_file(std::filebuf&) -> FILE*;
 inline auto write_ostream_unicode(std::ostream& os, fmt::string_view data)
     -> bool {
   FILE* f = nullptr;
-#if FMT_MSC_VERSION
+#if FMT_MSC_VERSION && FMT_USE_RTTI
   if (auto* buf = dynamic_cast<std::filebuf*>(os.rdbuf()))
     f = get_file(*buf);
   else
     return false;
-#elif defined(_WIN32) && defined(__GLIBCXX__)
+#elif defined(_WIN32) && defined(__GLIBCXX__) && FMT_USE_RTTI
   auto* rdbuf = os.rdbuf();
   if (auto* sfbuf = dynamic_cast<__gnu_cxx::stdio_sync_filebuf<char>*>(rdbuf))
     f = sfbuf->file();
@@ -143,9 +114,8 @@ template <typename Char>
 struct basic_ostream_formatter : formatter<basic_string_view<Char>, Char> {
   void set_debug_format() = delete;
 
-  template <typename T, typename OutputIt>
-  auto format(const T& value, basic_format_context<OutputIt, Char>& ctx) const
-      -> OutputIt {
+  template <typename T, typename Context>
+  auto format(const T& value, Context& ctx) const -> decltype(ctx.out()) {
     auto buffer = basic_memory_buffer<Char>();
     detail::format_value(buffer, value);
     return formatter<basic_string_view<Char>, Char>::format(
@@ -158,22 +128,20 @@ using ostream_formatter = basic_ostream_formatter<char>;
 template <typename T, typename Char>
 struct formatter<detail::streamed_view<T>, Char>
     : basic_ostream_formatter<Char> {
-  template <typename OutputIt>
-  auto format(detail::streamed_view<T> view,
-              basic_format_context<OutputIt, Char>& ctx) const -> OutputIt {
+  template <typename Context>
+  auto format(detail::streamed_view<T> view, Context& ctx) const
+      -> decltype(ctx.out()) {
     return basic_ostream_formatter<Char>::format(view.value, ctx);
   }
 };
 
 /**
-  \rst
-  Returns a view that formats `value` via an ostream ``operator<<``.
-
-  **Example**::
-
-    fmt::print("Current thread id: {}\n",
-               fmt::streamed(std::this_thread::get_id()));
-  \endrst
+ * Returns a view that formats `value` via an ostream `operator<<`.
+ *
+ * **Example**:
+ *
+ *     fmt::print("Current thread id: {}\n",
+ *                fmt::streamed(std::this_thread::get_id()));
  */
 template <typename T>
 constexpr auto streamed(const T& value) -> detail::streamed_view<T> {
@@ -194,7 +162,7 @@ inline void vprint_directly(std::ostream& os, string_view format_str,
 FMT_EXPORT template <typename Char>
 void vprint(std::basic_ostream<Char>& os,
             basic_string_view<type_identity_t<Char>> format_str,
-            basic_format_args<buffer_context<type_identity_t<Char>>> args) {
+            typename detail::vformat_args<Char>::type args) {
   auto buffer = basic_memory_buffer<Char>();
   detail::vformat_to(buffer, format_str, args);
   if (detail::write_ostream_unicode(os, {buffer.data(), buffer.size()})) return;
@@ -202,18 +170,16 @@ void vprint(std::basic_ostream<Char>& os,
 }
 
 /**
-  \rst
-  Prints formatted data to the stream *os*.
-
-  **Example**::
-
-    fmt::print(cerr, "Don't {}!", "panic");
-  \endrst
+ * Prints formatted data to the stream `os`.
+ *
+ * **Example**:
+ *
+ *     fmt::print(cerr, "Don't {}!", "panic");
  */
 FMT_EXPORT template <typename... T>
 void print(std::ostream& os, format_string<T...> fmt, T&&... args) {
   const auto& vargs = fmt::make_format_args(args...);
-  if (detail::is_utf8())
+  if (detail::use_utf8())
     vprint(os, fmt, vargs);
   else
     detail::vprint_directly(os, fmt, vargs);
@@ -224,7 +190,7 @@ template <typename... Args>
 void print(std::wostream& os,
            basic_format_string<wchar_t, type_identity_t<Args>...> fmt,
            Args&&... args) {
-  vprint(os, fmt, fmt::make_format_args<buffer_context<wchar_t>>(args...));
+  vprint(os, fmt, fmt::make_format_args<buffered_context<wchar_t>>(args...));
 }
 
 FMT_EXPORT template <typename... T>
diff --git a/contrib/fmt/include/fmt/printf.h b/contrib/fmt/include/fmt/printf.h
index 07e81577c..072cc6b30 100644
--- a/contrib/fmt/include/fmt/printf.h
+++ b/contrib/fmt/include/fmt/printf.h
@@ -8,8 +8,10 @@
 #ifndef FMT_PRINTF_H_
 #define FMT_PRINTF_H_
 
-#include <algorithm>  // std::max
-#include <limits>     // std::numeric_limits
+#ifndef FMT_MODULE
+#  include <algorithm>  // std::max
+#  include <limits>     // std::numeric_limits
+#endif
 
 #include "format.h"
 
@@ -22,7 +24,7 @@ template <typename T> struct printf_formatter {
 
 template <typename Char> class basic_printf_context {
  private:
-  detail::buffer_appender<Char> out_;
+  basic_appender<Char> out_;
   basic_format_args<basic_printf_context> args_;
 
   static_assert(std::is_same<Char, char>::value ||
@@ -34,28 +36,20 @@ template <typename Char> class basic_printf_context {
   using parse_context_type = basic_format_parse_context<Char>;
   template <typename T> using formatter_type = printf_formatter<T>;
 
-  /**
-    \rst
-    Constructs a ``printf_context`` object. References to the arguments are
-    stored in the context object so make sure they have appropriate lifetimes.
-    \endrst
-   */
-  basic_printf_context(detail::buffer_appender<Char> out,
+  /// Constructs a `printf_context` object. References to the arguments are
+  /// stored in the context object so make sure they have appropriate lifetimes.
+  basic_printf_context(basic_appender<Char> out,
                        basic_format_args<basic_printf_context> args)
       : out_(out), args_(args) {}
 
-  auto out() -> detail::buffer_appender<Char> { return out_; }
-  void advance_to(detail::buffer_appender<Char>) {}
+  auto out() -> basic_appender<Char> { return out_; }
+  void advance_to(basic_appender<Char>) {}
 
   auto locale() -> detail::locale_ref { return {}; }
 
   auto arg(int id) const -> basic_format_arg<basic_printf_context> {
     return args_.get(id);
   }
-
-  FMT_CONSTEXPR void on_error(const char* message) {
-    detail::error_handler().on_error(message);
-  }
 };
 
 namespace detail {
@@ -64,7 +58,7 @@ namespace detail {
 // signed and unsigned integers.
 template <bool IsSigned> struct int_checker {
   template <typename T> static auto fits_in_int(T value) -> bool {
-    unsigned max = max_value<int>();
+    unsigned max = to_unsigned(max_value<int>());
     return value <= max;
   }
   static auto fits_in_int(bool) -> bool { return true; }
@@ -82,13 +76,13 @@ struct printf_precision_handler {
   template <typename T, FMT_ENABLE_IF(std::is_integral<T>::value)>
   auto operator()(T value) -> int {
     if (!int_checker<std::numeric_limits<T>::is_signed>::fits_in_int(value))
-      throw_format_error("number is too big");
+      report_error("number is too big");
     return (std::max)(static_cast<int>(value), 0);
   }
 
   template <typename T, FMT_ENABLE_IF(!std::is_integral<T>::value)>
   auto operator()(T) -> int {
-    throw_format_error("precision is not integer");
+    report_error("precision is not integer");
     return 0;
   }
 };
@@ -165,7 +159,7 @@ template <typename T, typename Context> class arg_converter {
 // unsigned).
 template <typename T, typename Context, typename Char>
 void convert_arg(basic_format_arg<Context>& arg, Char type) {
-  visit_format_arg(arg_converter<T, Context>(arg, type), arg);
+  arg.visit(arg_converter<T, Context>(arg, type));
 }
 
 // Converts an integer argument to char for printf.
@@ -195,12 +189,12 @@ template <typename Char> struct get_cstring {
 
 // Checks if an argument is a valid printf width specifier and sets
 // left alignment if it is negative.
-template <typename Char> class printf_width_handler {
+class printf_width_handler {
  private:
-  format_specs<Char>& specs_;
+  format_specs& specs_;
 
  public:
-  explicit printf_width_handler(format_specs<Char>& specs) : specs_(specs) {}
+  explicit printf_width_handler(format_specs& specs) : specs_(specs) {}
 
   template <typename T, FMT_ENABLE_IF(std::is_integral<T>::value)>
   auto operator()(T value) -> unsigned {
@@ -209,14 +203,14 @@ template <typename Char> class printf_width_handler {
       specs_.align = align::left;
       width = 0 - width;
     }
-    unsigned int_max = max_value<int>();
-    if (width > int_max) throw_format_error("number is too big");
+    unsigned int_max = to_unsigned(max_value<int>());
+    if (width > int_max) report_error("number is too big");
     return static_cast<unsigned>(width);
   }
 
   template <typename T, FMT_ENABLE_IF(!std::is_integral<T>::value)>
   auto operator()(T) -> unsigned {
-    throw_format_error("width is not integer");
+    report_error("width is not integer");
     return 0;
   }
 };
@@ -224,12 +218,12 @@ template <typename Char> class printf_width_handler {
 // Workaround for a bug with the XL compiler when initializing
 // printf_arg_formatter's base class.
 template <typename Char>
-auto make_arg_formatter(buffer_appender<Char> iter, format_specs<Char>& s)
+auto make_arg_formatter(basic_appender<Char> iter, format_specs& s)
     -> arg_formatter<Char> {
   return {iter, s, locale_ref()};
 }
 
-// The ``printf`` argument formatter.
+// The `printf` argument formatter.
 template <typename Char>
 class printf_arg_formatter : public arg_formatter<Char> {
  private:
@@ -241,11 +235,11 @@ class printf_arg_formatter : public arg_formatter<Char> {
   void write_null_pointer(bool is_string = false) {
     auto s = this->specs;
     s.type = presentation_type::none;
-    write_bytes(this->out, is_string ? "(null)" : "(nil)", s);
+    write_bytes<Char>(this->out, is_string ? "(null)" : "(nil)", s);
   }
 
  public:
-  printf_arg_formatter(buffer_appender<Char> iter, format_specs<Char>& s,
+  printf_arg_formatter(basic_appender<Char> iter, format_specs& s,
                        context_type& ctx)
       : base(make_arg_formatter(iter, s)), context_(ctx) {}
 
@@ -259,19 +253,18 @@ class printf_arg_formatter : public arg_formatter<Char> {
       base::operator()(value);
       return;
     }
-    format_specs<Char> fmt_specs = this->specs;
-    if (fmt_specs.type != presentation_type::none &&
-        fmt_specs.type != presentation_type::chr) {
+    format_specs s = this->specs;
+    if (s.type != presentation_type::none && s.type != presentation_type::chr) {
       return (*this)(static_cast<int>(value));
     }
-    fmt_specs.sign = sign::none;
-    fmt_specs.alt = false;
-    fmt_specs.fill[0] = ' ';  // Ignore '0' flag for char types.
+    s.sign = sign::none;
+    s.alt = false;
+    s.fill = ' ';  // Ignore '0' flag for char types.
     // align::numeric needs to be overwritten here since the '0' flag is
     // ignored for non-numeric types
-    if (fmt_specs.align == align::none || fmt_specs.align == align::numeric)
-      fmt_specs.align = align::right;
-    write<Char>(this->out, static_cast<Char>(value), fmt_specs);
+    if (s.align == align::none || s.align == align::numeric)
+      s.align = align::right;
+    write<Char>(this->out, static_cast<Char>(value), s);
   }
 
   template <typename T, FMT_ENABLE_IF(std::is_floating_point<T>::value)>
@@ -279,7 +272,6 @@ class printf_arg_formatter : public arg_formatter<Char> {
     base::operator()(value);
   }
 
-  /** Formats a null-terminated C string. */
   void operator()(const char* value) {
     if (value)
       base::operator()(value);
@@ -287,7 +279,6 @@ class printf_arg_formatter : public arg_formatter<Char> {
       write_null_pointer(this->specs.type != presentation_type::pointer);
   }
 
-  /** Formats a null-terminated wide C string. */
   void operator()(const wchar_t* value) {
     if (value)
       base::operator()(value);
@@ -297,7 +288,6 @@ class printf_arg_formatter : public arg_formatter<Char> {
 
   void operator()(basic_string_view<Char> value) { base::operator()(value); }
 
-  /** Formats a pointer. */
   void operator()(const void* value) {
     if (value)
       base::operator()(value);
@@ -305,7 +295,6 @@ class printf_arg_formatter : public arg_formatter<Char> {
       write_null_pointer();
   }
 
-  /** Formats an argument of a custom (user-defined) type. */
   void operator()(typename basic_format_arg<context_type>::handle handle) {
     auto parse_ctx = basic_format_parse_context<Char>({});
     handle.format(parse_ctx, context_);
@@ -313,7 +302,7 @@ class printf_arg_formatter : public arg_formatter<Char> {
 };
 
 template <typename Char>
-void parse_flags(format_specs<Char>& specs, const Char*& it, const Char* end) {
+void parse_flags(format_specs& specs, const Char*& it, const Char* end) {
   for (; it != end; ++it) {
     switch (*it) {
     case '-':
@@ -323,7 +312,7 @@ void parse_flags(format_specs<Char>& specs, const Char*& it, const Char* end) {
       specs.sign = sign::plus;
       break;
     case '0':
-      specs.fill[0] = '0';
+      specs.fill = '0';
       break;
     case ' ':
       if (specs.sign != sign::plus) specs.sign = sign::space;
@@ -338,7 +327,7 @@ void parse_flags(format_specs<Char>& specs, const Char*& it, const Char* end) {
 }
 
 template <typename Char, typename GetArg>
-auto parse_header(const Char*& it, const Char* end, format_specs<Char>& specs,
+auto parse_header(const Char*& it, const Char* end, format_specs& specs,
                   GetArg get_arg) -> int {
   int arg_index = -1;
   Char c = *it;
@@ -350,11 +339,11 @@ auto parse_header(const Char*& it, const Char* end, format_specs<Char>& specs,
       ++it;
       arg_index = value != -1 ? value : max_value<int>();
     } else {
-      if (c == '0') specs.fill[0] = '0';
+      if (c == '0') specs.fill = '0';
       if (value != 0) {
         // Nonzero value means that we parsed width and don't need to
         // parse it or flags again, so return now.
-        if (value == -1) throw_format_error("number is too big");
+        if (value == -1) report_error("number is too big");
         specs.width = value;
         return arg_index;
       }
@@ -365,17 +354,17 @@ auto parse_header(const Char*& it, const Char* end, format_specs<Char>& specs,
   if (it != end) {
     if (*it >= '0' && *it <= '9') {
       specs.width = parse_nonnegative_int(it, end, -1);
-      if (specs.width == -1) throw_format_error("number is too big");
+      if (specs.width == -1) report_error("number is too big");
     } else if (*it == '*') {
       ++it;
-      specs.width = static_cast<int>(visit_format_arg(
-          detail::printf_width_handler<Char>(specs), get_arg(-1)));
+      specs.width = static_cast<int>(
+          get_arg(-1).visit(detail::printf_width_handler(specs)));
     }
   }
   return arg_index;
 }
 
-inline auto parse_printf_presentation_type(char c, type t)
+inline auto parse_printf_presentation_type(char c, type t, bool& upper)
     -> presentation_type {
   using pt = presentation_type;
   constexpr auto integral_set = sint_set | uint_set | bool_set | char_set;
@@ -384,26 +373,31 @@ inline auto parse_printf_presentation_type(char c, type t)
     return in(t, integral_set) ? pt::dec : pt::none;
   case 'o':
     return in(t, integral_set) ? pt::oct : pt::none;
-  case 'x':
-    return in(t, integral_set) ? pt::hex_lower : pt::none;
   case 'X':
-    return in(t, integral_set) ? pt::hex_upper : pt::none;
-  case 'a':
-    return in(t, float_set) ? pt::hexfloat_lower : pt::none;
-  case 'A':
-    return in(t, float_set) ? pt::hexfloat_upper : pt::none;
-  case 'e':
-    return in(t, float_set) ? pt::exp_lower : pt::none;
+    upper = true;
+    FMT_FALLTHROUGH;
+  case 'x':
+    return in(t, integral_set) ? pt::hex : pt::none;
   case 'E':
-    return in(t, float_set) ? pt::exp_upper : pt::none;
-  case 'f':
-    return in(t, float_set) ? pt::fixed_lower : pt::none;
+    upper = true;
+    FMT_FALLTHROUGH;
+  case 'e':
+    return in(t, float_set) ? pt::exp : pt::none;
   case 'F':
-    return in(t, float_set) ? pt::fixed_upper : pt::none;
-  case 'g':
-    return in(t, float_set) ? pt::general_lower : pt::none;
+    upper = true;
+    FMT_FALLTHROUGH;
+  case 'f':
+    return in(t, float_set) ? pt::fixed : pt::none;
   case 'G':
-    return in(t, float_set) ? pt::general_upper : pt::none;
+    upper = true;
+    FMT_FALLTHROUGH;
+  case 'g':
+    return in(t, float_set) ? pt::general : pt::none;
+  case 'A':
+    upper = true;
+    FMT_FALLTHROUGH;
+  case 'a':
+    return in(t, float_set) ? pt::hexfloat : pt::none;
   case 'c':
     return in(t, integral_set) ? pt::chr : pt::none;
   case 's':
@@ -418,7 +412,7 @@ inline auto parse_printf_presentation_type(char c, type t)
 template <typename Char, typename Context>
 void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
              basic_format_args<Context> args) {
-  using iterator = buffer_appender<Char>;
+  using iterator = basic_appender<Char>;
   auto out = iterator(buf);
   auto context = basic_printf_context<Char>(out, args);
   auto parse_ctx = basic_format_parse_context<Char>(format);
@@ -449,12 +443,12 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
     }
     write(out, basic_string_view<Char>(start, to_unsigned(it - 1 - start)));
 
-    auto specs = format_specs<Char>();
+    auto specs = format_specs();
     specs.align = align::right;
 
     // Parse argument index, flags and width.
     int arg_index = parse_header(it, end, specs, get_arg);
-    if (arg_index == 0) throw_format_error("argument not found");
+    if (arg_index == 0) report_error("argument not found");
 
     // Parse precision.
     if (it != end && *it == '.') {
@@ -464,8 +458,8 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
         specs.precision = parse_nonnegative_int(it, end, 0);
       } else if (c == '*') {
         ++it;
-        specs.precision = static_cast<int>(
-            visit_format_arg(printf_precision_handler(), get_arg(-1)));
+        specs.precision =
+            static_cast<int>(get_arg(-1).visit(printf_precision_handler()));
       } else {
         specs.precision = 0;
       }
@@ -476,23 +470,23 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
     // specified, the '0' flag is ignored
     if (specs.precision >= 0 && arg.is_integral()) {
       // Ignore '0' for non-numeric types or if '-' present.
-      specs.fill[0] = ' ';
+      specs.fill = ' ';
     }
     if (specs.precision >= 0 && arg.type() == type::cstring_type) {
-      auto str = visit_format_arg(get_cstring<Char>(), arg);
+      auto str = arg.visit(get_cstring<Char>());
       auto str_end = str + specs.precision;
       auto nul = std::find(str, str_end, Char());
       auto sv = basic_string_view<Char>(
           str, to_unsigned(nul != str_end ? nul - str : specs.precision));
       arg = make_arg<basic_printf_context<Char>>(sv);
     }
-    if (specs.alt && visit_format_arg(is_zero_int(), arg)) specs.alt = false;
-    if (specs.fill[0] == '0') {
+    if (specs.alt && arg.visit(is_zero_int())) specs.alt = false;
+    if (specs.fill.template get<Char>() == '0') {
       if (arg.is_arithmetic() && specs.align != align::left)
         specs.align = align::numeric;
       else
-        specs.fill[0] = ' ';  // Ignore '0' flag for non-numeric types or if '-'
-                              // flag is also present.
+        specs.fill = ' ';  // Ignore '0' flag for non-numeric types or if '-'
+                           // flag is also present.
     }
 
     // Parse length and convert the argument to the required type.
@@ -536,7 +530,7 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
     }
 
     // Parse type.
-    if (it == end) throw_format_error("invalid format string");
+    if (it == end) report_error("invalid format string");
     char type = static_cast<char>(*it++);
     if (arg.is_integral()) {
       // Normalize type.
@@ -546,18 +540,20 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
         type = 'd';
         break;
       case 'c':
-        visit_format_arg(char_converter<basic_printf_context<Char>>(arg), arg);
+        arg.visit(char_converter<basic_printf_context<Char>>(arg));
         break;
       }
     }
-    specs.type = parse_printf_presentation_type(type, arg.type());
+    bool upper = false;
+    specs.type = parse_printf_presentation_type(type, arg.type(), upper);
     if (specs.type == presentation_type::none)
-      throw_format_error("invalid format specifier");
+      report_error("invalid format specifier");
+    specs.upper = upper;
 
     start = it;
 
     // Format argument.
-    visit_format_arg(printf_arg_formatter<Char>(out, specs, context), arg);
+    arg.visit(printf_arg_formatter<Char>(out, specs, context));
   }
   write(out, basic_string_view<Char>(start, to_unsigned(it - start)));
 }
@@ -569,29 +565,21 @@ using wprintf_context = basic_printf_context<wchar_t>;
 using printf_args = basic_format_args<printf_context>;
 using wprintf_args = basic_format_args<wprintf_context>;
 
-/**
-  \rst
-  Constructs an `~fmt::format_arg_store` object that contains references to
-  arguments and can be implicitly converted to `~fmt::printf_args`.
-  \endrst
- */
-template <typename... T>
-inline auto make_printf_args(const T&... args)
-    -> format_arg_store<printf_context, T...> {
-  return {args...};
+/// Constructs an `format_arg_store` object that contains references to
+/// arguments and can be implicitly converted to `printf_args`.
+template <typename Char = char, typename... T>
+inline auto make_printf_args(T&... args)
+    -> decltype(fmt::make_format_args<basic_printf_context<Char>>(args...)) {
+  return fmt::make_format_args<basic_printf_context<Char>>(args...);
 }
 
-// DEPRECATED!
-template <typename... T>
-inline auto make_wprintf_args(const T&... args)
-    -> format_arg_store<wprintf_context, T...> {
-  return {args...};
-}
+template <typename Char> struct vprintf_args {
+  using type = basic_format_args<basic_printf_context<Char>>;
+};
 
 template <typename Char>
-inline auto vsprintf(
-    basic_string_view<Char> fmt,
-    basic_format_args<basic_printf_context<type_identity_t<Char>>> args)
+inline auto vsprintf(basic_string_view<Char> fmt,
+                     typename vprintf_args<Char>::type args)
     -> std::basic_string<Char> {
   auto buf = basic_memory_buffer<Char>();
   detail::vprintf(buf, fmt, args);
@@ -599,26 +587,22 @@ inline auto vsprintf(
 }
 
 /**
-  \rst
-  Formats arguments and returns the result as a string.
-
-  **Example**::
-
-    std::string message = fmt::sprintf("The answer is %d", 42);
-  \endrst
-*/
-template <typename S, typename... T,
-          typename Char = enable_if_t<detail::is_string<S>::value, char_t<S>>>
+ * Formats `args` according to specifications in `fmt` and returns the result
+ * as as string.
+ *
+ * **Example**:
+ *
+ *     std::string message = fmt::sprintf("The answer is %d", 42);
+ */
+template <typename S, typename... T, typename Char = char_t<S>>
 inline auto sprintf(const S& fmt, const T&... args) -> std::basic_string<Char> {
   return vsprintf(detail::to_string_view(fmt),
                   fmt::make_format_args<basic_printf_context<Char>>(args...));
 }
 
 template <typename Char>
-inline auto vfprintf(
-    std::FILE* f, basic_string_view<Char> fmt,
-    basic_format_args<basic_printf_context<type_identity_t<Char>>> args)
-    -> int {
+inline auto vfprintf(std::FILE* f, basic_string_view<Char> fmt,
+                     typename vprintf_args<Char>::type args) -> int {
   auto buf = basic_memory_buffer<Char>();
   detail::vprintf(buf, fmt, args);
   size_t size = buf.size();
@@ -628,36 +612,33 @@ inline auto vfprintf(
 }
 
 /**
-  \rst
-  Prints formatted data to the file *f*.
-
-  **Example**::
-
-    fmt::fprintf(stderr, "Don't %s!", "panic");
-  \endrst
+ * Formats `args` according to specifications in `fmt` and writes the output
+ * to `f`.
+ *
+ * **Example**:
+ *
+ *     fmt::fprintf(stderr, "Don't %s!", "panic");
  */
 template <typename S, typename... T, typename Char = char_t<S>>
 inline auto fprintf(std::FILE* f, const S& fmt, const T&... args) -> int {
   return vfprintf(f, detail::to_string_view(fmt),
-                  fmt::make_format_args<basic_printf_context<Char>>(args...));
+                  make_printf_args<Char>(args...));
 }
 
 template <typename Char>
-FMT_DEPRECATED inline auto vprintf(
-    basic_string_view<Char> fmt,
-    basic_format_args<basic_printf_context<type_identity_t<Char>>> args)
+FMT_DEPRECATED inline auto vprintf(basic_string_view<Char> fmt,
+                                   typename vprintf_args<Char>::type args)
     -> int {
   return vfprintf(stdout, fmt, args);
 }
 
 /**
-  \rst
-  Prints formatted data to ``stdout``.
-
-  **Example**::
-
-    fmt::printf("Elapsed time: %.2f seconds", 1.23);
-  \endrst
+ * Formats `args` according to specifications in `fmt` and writes the output
+ * to `stdout`.
+ *
+ * **Example**:
+ *
+ *   fmt::printf("Elapsed time: %.2f seconds", 1.23);
  */
 template <typename... T>
 inline auto printf(string_view fmt, const T&... args) -> int {
@@ -666,7 +647,7 @@ inline auto printf(string_view fmt, const T&... args) -> int {
 template <typename... T>
 FMT_DEPRECATED inline auto printf(basic_string_view<wchar_t> fmt,
                                   const T&... args) -> int {
-  return vfprintf(stdout, fmt, make_wprintf_args(args...));
+  return vfprintf(stdout, fmt, make_printf_args<wchar_t>(args...));
 }
 
 FMT_END_EXPORT
diff --git a/contrib/fmt/include/fmt/ranges.h b/contrib/fmt/include/fmt/ranges.h
index 3638fffb8..0d3dfbd8d 100644
--- a/contrib/fmt/include/fmt/ranges.h
+++ b/contrib/fmt/include/fmt/ranges.h
@@ -8,67 +8,31 @@
 #ifndef FMT_RANGES_H_
 #define FMT_RANGES_H_
 
-#include <initializer_list>
-#include <tuple>
-#include <type_traits>
+#ifndef FMT_MODULE
+#  include <initializer_list>
+#  include <iterator>
+#  include <string>
+#  include <tuple>
+#  include <type_traits>
+#  include <utility>
+#endif
 
 #include "format.h"
 
 FMT_BEGIN_NAMESPACE
 
-namespace detail {
-
-template <typename Range, typename OutputIt>
-auto copy(const Range& range, OutputIt out) -> OutputIt {
-  for (auto it = range.begin(), end = range.end(); it != end; ++it)
-    *out++ = *it;
-  return out;
-}
-
-template <typename OutputIt>
-auto copy(const char* str, OutputIt out) -> OutputIt {
-  while (*str) *out++ = *str++;
-  return out;
-}
-
-template <typename OutputIt> auto copy(char ch, OutputIt out) -> OutputIt {
-  *out++ = ch;
-  return out;
-}
-
-template <typename OutputIt> auto copy(wchar_t ch, OutputIt out) -> OutputIt {
-  *out++ = ch;
-  return out;
-}
-
-// Returns true if T has a std::string-like interface, like std::string_view.
-template <typename T> class is_std_string_like {
-  template <typename U>
-  static auto check(U* p)
-      -> decltype((void)p->find('a'), p->length(), (void)p->data(), int());
-  template <typename> static void check(...);
-
- public:
-  static constexpr const bool value =
-      is_string<T>::value ||
-      std::is_convertible<T, std_string_view<char>>::value ||
-      !std::is_void<decltype(check<T>(nullptr))>::value;
-};
+FMT_EXPORT
+enum class range_format { disabled, map, set, sequence, string, debug_string };
 
-template <typename Char>
-struct is_std_string_like<fmt::basic_string_view<Char>> : std::true_type {};
+namespace detail {
 
 template <typename T> class is_map {
   template <typename U> static auto check(U*) -> typename U::mapped_type;
   template <typename> static void check(...);
 
  public:
-#ifdef FMT_FORMAT_MAP_AS_LIST  // DEPRECATED!
-  static constexpr const bool value = false;
-#else
   static constexpr const bool value =
       !std::is_void<decltype(check<T>(nullptr))>::value;
-#endif
 };
 
 template <typename T> class is_set {
@@ -76,12 +40,8 @@ template <typename T> class is_set {
   template <typename> static void check(...);
 
  public:
-#ifdef FMT_FORMAT_SET_AS_LIST  // DEPRECATED!
-  static constexpr const bool value = false;
-#else
   static constexpr const bool value =
       !std::is_void<decltype(check<T>(nullptr))>::value && !is_map<T>::value;
-#endif
 };
 
 template <typename... Ts> struct conditional_helper {};
@@ -110,17 +70,17 @@ template <typename T, typename Enable = void>
 struct has_member_fn_begin_end_t : std::false_type {};
 
 template <typename T>
-struct has_member_fn_begin_end_t<T, void_t<decltype(std::declval<T>().begin()),
+struct has_member_fn_begin_end_t<T, void_t<decltype(*std::declval<T>().begin()),
                                            decltype(std::declval<T>().end())>>
     : std::true_type {};
 
-// Member function overload
+// Member function overloads.
 template <typename T>
 auto range_begin(T&& rng) FMT_DECLTYPE_RETURN(static_cast<T&&>(rng).begin());
 template <typename T>
 auto range_end(T&& rng) FMT_DECLTYPE_RETURN(static_cast<T&&>(rng).end());
 
-// ADL overload. Only participates in overload resolution if member functions
+// ADL overloads. Only participate in overload resolution if member functions
 // are not found.
 template <typename T>
 auto range_begin(T&& rng)
@@ -141,16 +101,16 @@ struct has_mutable_begin_end : std::false_type {};
 
 template <typename T>
 struct has_const_begin_end<
-    T,
-    void_t<
-        decltype(detail::range_begin(std::declval<const remove_cvref_t<T>&>())),
-        decltype(detail::range_end(std::declval<const remove_cvref_t<T>&>()))>>
+    T, void_t<decltype(*detail::range_begin(
+                  std::declval<const remove_cvref_t<T>&>())),
+              decltype(detail::range_end(
+                  std::declval<const remove_cvref_t<T>&>()))>>
     : std::true_type {};
 
 template <typename T>
 struct has_mutable_begin_end<
-    T, void_t<decltype(detail::range_begin(std::declval<T>())),
-              decltype(detail::range_end(std::declval<T>())),
+    T, void_t<decltype(*detail::range_begin(std::declval<T&>())),
+              decltype(detail::range_end(std::declval<T&>())),
               // the extra int here is because older versions of MSVC don't
               // SFINAE properly unless there are distinct types
               int>> : std::true_type {};
@@ -206,12 +166,13 @@ class is_tuple_formattable_ {
   static constexpr const bool value = false;
 };
 template <typename T, typename C> class is_tuple_formattable_<T, C, true> {
-  template <std::size_t... Is>
-  static auto check2(index_sequence<Is...>,
-                     integer_sequence<bool, (Is == Is)...>) -> std::true_type;
-  static auto check2(...) -> std::false_type;
-  template <std::size_t... Is>
-  static auto check(index_sequence<Is...>) -> decltype(check2(
+  template <size_t... Is>
+  static auto all_true(index_sequence<Is...>,
+                       integer_sequence<bool, (Is >= 0)...>) -> std::true_type;
+  static auto all_true(...) -> std::false_type;
+
+  template <size_t... Is>
+  static auto check(index_sequence<Is...>) -> decltype(all_true(
       index_sequence<Is...>{},
       integer_sequence<bool,
                        (is_formattable<typename std::tuple_element<Is, T>::type,
@@ -292,6 +253,18 @@ FMT_CONSTEXPR auto maybe_set_debug_format(Formatter& f, bool set)
 template <typename Formatter>
 FMT_CONSTEXPR void maybe_set_debug_format(Formatter&, ...) {}
 
+template <typename T>
+struct range_format_kind_
+    : std::integral_constant<range_format,
+                             std::is_same<uncvref_type<T>, T>::value
+                                 ? range_format::disabled
+                             : is_map<T>::value ? range_format::map
+                             : is_set<T>::value ? range_format::set
+                                                : range_format::sequence> {};
+
+template <range_format K>
+using range_format_constant = std::integral_constant<range_format, K>;
+
 // These are not generic lambdas for compatibility with C++11.
 template <typename ParseContext> struct parse_empty_specs {
   template <typename Formatter> FMT_CONSTEXPR void operator()(Formatter& f) {
@@ -305,8 +278,7 @@ template <typename FormatContext> struct format_tuple_element {
 
   template <typename T>
   void operator()(const formatter<T, char_type>& f, const T& v) {
-    if (i > 0)
-      ctx.advance_to(detail::copy_str<char_type>(separator, ctx.out()));
+    if (i > 0) ctx.advance_to(detail::copy<char_type>(separator, ctx.out()));
     ctx.advance_to(f.format(v, ctx));
     ++i;
   }
@@ -358,8 +330,7 @@ struct formatter<Tuple, Char,
   template <typename ParseContext>
   FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
     auto it = ctx.begin();
-    if (it != ctx.end() && *it != '}')
-      FMT_THROW(format_error("invalid format specifier"));
+    if (it != ctx.end() && *it != '}') report_error("invalid format specifier");
     detail::for_each(formatters_, detail::parse_empty_specs<ParseContext>{ctx});
     return it;
   }
@@ -367,19 +338,17 @@ struct formatter<Tuple, Char,
   template <typename FormatContext>
   auto format(const Tuple& value, FormatContext& ctx) const
       -> decltype(ctx.out()) {
-    ctx.advance_to(detail::copy_str<Char>(opening_bracket_, ctx.out()));
+    ctx.advance_to(detail::copy<Char>(opening_bracket_, ctx.out()));
     detail::for_each2(
         formatters_, value,
         detail::format_tuple_element<FormatContext>{0, ctx, separator_});
-    return detail::copy_str<Char>(closing_bracket_, ctx.out());
+    return detail::copy<Char>(closing_bracket_, ctx.out());
   }
 };
 
 template <typename T, typename Char> struct is_range {
   static constexpr const bool value =
-      detail::is_range_<T>::value && !detail::is_std_string_like<T>::value &&
-      !std::is_convertible<T, std::basic_string<Char>>::value &&
-      !std::is_convertible<T, detail::std_string_view<Char>>::value;
+      detail::is_range_<T>::value && !detail::has_to_string_view<T>::value;
 };
 
 namespace detail {
@@ -401,8 +370,8 @@ template <typename Context> struct range_mapper {
 
 template <typename Char, typename Element>
 using range_formatter_type =
-    formatter<remove_cvref_t<decltype(range_mapper<buffer_context<Char>>{}.map(
-                  std::declval<Element>()))>,
+    formatter<remove_cvref_t<decltype(range_mapper<buffered_context<Char>>{}
+                                          .map(std::declval<Element>()))>,
               Char>;
 
 template <typename R>
@@ -438,6 +407,24 @@ struct range_formatter<
       detail::string_literal<Char, '['>{};
   basic_string_view<Char> closing_bracket_ =
       detail::string_literal<Char, ']'>{};
+  bool is_debug = false;
+
+  template <typename Output, typename It, typename Sentinel, typename U = T,
+            FMT_ENABLE_IF(std::is_same<U, Char>::value)>
+  auto write_debug_string(Output& out, It it, Sentinel end) const -> Output {
+    auto buf = basic_memory_buffer<Char>();
+    for (; it != end; ++it) buf.push_back(*it);
+    auto specs = format_specs();
+    specs.type = presentation_type::debug;
+    return detail::write<Char>(
+        out, basic_string_view<Char>(buf.data(), buf.size()), specs);
+  }
+
+  template <typename Output, typename It, typename Sentinel, typename U = T,
+            FMT_ENABLE_IF(!std::is_same<U, Char>::value)>
+  auto write_debug_string(Output& out, It, Sentinel) const -> Output {
+    return out;
+  }
 
  public:
   FMT_CONSTEXPR range_formatter() {}
@@ -460,17 +447,37 @@ struct range_formatter<
   FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
     auto it = ctx.begin();
     auto end = ctx.end();
+    detail::maybe_set_debug_format(underlying_, true);
+    if (it == end) return underlying_.parse(ctx);
 
-    if (it != end && *it == 'n') {
+    switch (detail::to_ascii(*it)) {
+    case 'n':
       set_brackets({}, {});
       ++it;
+      break;
+    case '?':
+      is_debug = true;
+      set_brackets({}, {});
+      ++it;
+      if (it == end || *it != 's') report_error("invalid format specifier");
+      FMT_FALLTHROUGH;
+    case 's':
+      if (!std::is_same<T, Char>::value)
+        report_error("invalid format specifier");
+      if (!is_debug) {
+        set_brackets(detail::string_literal<Char, '"'>{},
+                     detail::string_literal<Char, '"'>{});
+        set_separator({});
+        detail::maybe_set_debug_format(underlying_, false);
+      }
+      ++it;
+      return it;
     }
 
     if (it != end && *it != '}') {
-      if (*it != ':') FMT_THROW(format_error("invalid format specifier"));
+      if (*it != ':') report_error("invalid format specifier");
+      detail::maybe_set_debug_format(underlying_, false);
       ++it;
-    } else {
-      detail::maybe_set_debug_format(underlying_, true);
     }
 
     ctx.advance_to(it);
@@ -479,67 +486,151 @@ struct range_formatter<
 
   template <typename R, typename FormatContext>
   auto format(R&& range, FormatContext& ctx) const -> decltype(ctx.out()) {
-    detail::range_mapper<buffer_context<Char>> mapper;
+    auto mapper = detail::range_mapper<buffered_context<Char>>();
     auto out = ctx.out();
-    out = detail::copy_str<Char>(opening_bracket_, out);
-    int i = 0;
     auto it = detail::range_begin(range);
     auto end = detail::range_end(range);
+    if (is_debug) return write_debug_string(out, std::move(it), end);
+
+    out = detail::copy<Char>(opening_bracket_, out);
+    int i = 0;
     for (; it != end; ++it) {
-      if (i > 0) out = detail::copy_str<Char>(separator_, out);
+      if (i > 0) out = detail::copy<Char>(separator_, out);
       ctx.advance_to(out);
-      auto&& item = *it;
+      auto&& item = *it;  // Need an lvalue
       out = underlying_.format(mapper.map(item), ctx);
       ++i;
     }
-    out = detail::copy_str<Char>(closing_bracket_, out);
+    out = detail::copy<Char>(closing_bracket_, out);
     return out;
   }
 };
 
-enum class range_format { disabled, map, set, sequence, string, debug_string };
+FMT_EXPORT
+template <typename T, typename Char, typename Enable = void>
+struct range_format_kind
+    : conditional_t<
+          is_range<T, Char>::value, detail::range_format_kind_<T>,
+          std::integral_constant<range_format, range_format::disabled>> {};
 
-namespace detail {
-template <typename T>
-struct range_format_kind_
-    : std::integral_constant<range_format,
-                             std::is_same<uncvref_type<T>, T>::value
-                                 ? range_format::disabled
-                             : is_map<T>::value ? range_format::map
-                             : is_set<T>::value ? range_format::set
-                                                : range_format::sequence> {};
+template <typename R, typename Char>
+struct formatter<
+    R, Char,
+    enable_if_t<conjunction<
+        bool_constant<
+            range_format_kind<R, Char>::value != range_format::disabled &&
+            range_format_kind<R, Char>::value != range_format::map &&
+            range_format_kind<R, Char>::value != range_format::string &&
+            range_format_kind<R, Char>::value != range_format::debug_string>
+// Workaround a bug in MSVC 2015 and earlier.
+#if !FMT_MSC_VERSION || FMT_MSC_VERSION >= 1910
+        ,
+        detail::is_formattable_delayed<R, Char>
+#endif
+        >::value>> {
+ private:
+  using range_type = detail::maybe_const_range<R>;
+  range_formatter<detail::uncvref_type<range_type>, Char> range_formatter_;
 
-template <range_format K, typename R, typename Char, typename Enable = void>
-struct range_default_formatter;
+ public:
+  using nonlocking = void;
+
+  FMT_CONSTEXPR formatter() {
+    if (detail::const_check(range_format_kind<R, Char>::value !=
+                            range_format::set))
+      return;
+    range_formatter_.set_brackets(detail::string_literal<Char, '{'>{},
+                                  detail::string_literal<Char, '}'>{});
+  }
 
-template <range_format K>
-using range_format_constant = std::integral_constant<range_format, K>;
+  template <typename ParseContext>
+  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
+    return range_formatter_.parse(ctx);
+  }
 
-template <range_format K, typename R, typename Char>
-struct range_default_formatter<
-    K, R, Char,
-    enable_if_t<(K == range_format::sequence || K == range_format::map ||
-                 K == range_format::set)>> {
-  using range_type = detail::maybe_const_range<R>;
-  range_formatter<detail::uncvref_type<range_type>, Char> underlying_;
+  template <typename FormatContext>
+  auto format(range_type& range, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    return range_formatter_.format(range, ctx);
+  }
+};
+
+// A map formatter.
+template <typename R, typename Char>
+struct formatter<
+    R, Char,
+    enable_if_t<range_format_kind<R, Char>::value == range_format::map>> {
+ private:
+  using map_type = detail::maybe_const_range<R>;
+  using element_type = detail::uncvref_type<map_type>;
 
-  FMT_CONSTEXPR range_default_formatter() { init(range_format_constant<K>()); }
+  decltype(detail::tuple::get_formatters<element_type, Char>(
+      detail::tuple_index_sequence<element_type>())) formatters_;
+  bool no_delimiters_ = false;
 
-  FMT_CONSTEXPR void init(range_format_constant<range_format::set>) {
-    underlying_.set_brackets(detail::string_literal<Char, '{'>{},
-                             detail::string_literal<Char, '}'>{});
+ public:
+  FMT_CONSTEXPR formatter() {}
+
+  template <typename ParseContext>
+  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
+    auto it = ctx.begin();
+    auto end = ctx.end();
+    if (it != end) {
+      if (detail::to_ascii(*it) == 'n') {
+        no_delimiters_ = true;
+        ++it;
+      }
+      if (it != end && *it != '}') {
+        if (*it != ':') report_error("invalid format specifier");
+        ++it;
+      }
+      ctx.advance_to(it);
+    }
+    detail::for_each(formatters_, detail::parse_empty_specs<ParseContext>{ctx});
+    return it;
   }
 
-  FMT_CONSTEXPR void init(range_format_constant<range_format::map>) {
-    underlying_.set_brackets(detail::string_literal<Char, '{'>{},
-                             detail::string_literal<Char, '}'>{});
-    underlying_.underlying().set_brackets({}, {});
-    underlying_.underlying().set_separator(
-        detail::string_literal<Char, ':', ' '>{});
+  template <typename FormatContext>
+  auto format(map_type& map, FormatContext& ctx) const -> decltype(ctx.out()) {
+    auto out = ctx.out();
+    basic_string_view<Char> open = detail::string_literal<Char, '{'>{};
+    if (!no_delimiters_) out = detail::copy<Char>(open, out);
+    int i = 0;
+    auto mapper = detail::range_mapper<buffered_context<Char>>();
+    basic_string_view<Char> sep = detail::string_literal<Char, ',', ' '>{};
+    for (auto&& value : map) {
+      if (i > 0) out = detail::copy<Char>(sep, out);
+      ctx.advance_to(out);
+      detail::for_each2(formatters_, mapper.map(value),
+                        detail::format_tuple_element<FormatContext>{
+                            0, ctx, detail::string_literal<Char, ':', ' '>{}});
+      ++i;
+    }
+    basic_string_view<Char> close = detail::string_literal<Char, '}'>{};
+    if (!no_delimiters_) out = detail::copy<Char>(close, out);
+    return out;
   }
+};
 
-  FMT_CONSTEXPR void init(range_format_constant<range_format::sequence>) {}
+// A (debug_)string formatter.
+template <typename R, typename Char>
+struct formatter<
+    R, Char,
+    enable_if_t<range_format_kind<R, Char>::value == range_format::string ||
+                range_format_kind<R, Char>::value ==
+                    range_format::debug_string>> {
+ private:
+  using range_type = detail::maybe_const_range<R>;
+  using string_type =
+      conditional_t<std::is_constructible<
+                        detail::std_string_view<Char>,
+                        decltype(detail::range_begin(std::declval<R>())),
+                        decltype(detail::range_end(std::declval<R>()))>::value,
+                    detail::std_string_view<Char>, std::basic_string<Char>>;
 
+  formatter<string_type, Char> underlying_;
+
+ public:
   template <typename ParseContext>
   FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
     return underlying_.parse(ctx);
@@ -548,32 +639,98 @@ struct range_default_formatter<
   template <typename FormatContext>
   auto format(range_type& range, FormatContext& ctx) const
       -> decltype(ctx.out()) {
-    return underlying_.format(range, ctx);
+    auto out = ctx.out();
+    if (detail::const_check(range_format_kind<R, Char>::value ==
+                            range_format::debug_string))
+      *out++ = '"';
+    out = underlying_.format(
+        string_type{detail::range_begin(range), detail::range_end(range)}, ctx);
+    if (detail::const_check(range_format_kind<R, Char>::value ==
+                            range_format::debug_string))
+      *out++ = '"';
+    return out;
   }
 };
-}  // namespace detail
 
-template <typename T, typename Char, typename Enable = void>
-struct range_format_kind
-    : conditional_t<
-          is_range<T, Char>::value, detail::range_format_kind_<T>,
-          std::integral_constant<range_format, range_format::disabled>> {};
+template <typename It, typename Sentinel, typename Char = char>
+struct join_view : detail::view {
+  It begin;
+  Sentinel end;
+  basic_string_view<Char> sep;
 
-template <typename R, typename Char>
-struct formatter<
-    R, Char,
-    enable_if_t<conjunction<bool_constant<range_format_kind<R, Char>::value !=
-                                          range_format::disabled>
-// Workaround a bug in MSVC 2015 and earlier.
-#if !FMT_MSC_VERSION || FMT_MSC_VERSION >= 1910
-                            ,
-                            detail::is_formattable_delayed<R, Char>
+  join_view(It b, Sentinel e, basic_string_view<Char> s)
+      : begin(std::move(b)), end(e), sep(s) {}
+};
+
+template <typename It, typename Sentinel, typename Char>
+struct formatter<join_view<It, Sentinel, Char>, Char> {
+ private:
+  using value_type =
+#ifdef __cpp_lib_ranges
+      std::iter_value_t<It>;
+#else
+      typename std::iterator_traits<It>::value_type;
 #endif
-                            >::value>>
-    : detail::range_default_formatter<range_format_kind<R, Char>::value, R,
-                                      Char> {
+  formatter<remove_cvref_t<value_type>, Char> value_formatter_;
+
+  using view_ref = conditional_t<std::is_copy_constructible<It>::value,
+                                 const join_view<It, Sentinel, Char>&,
+                                 join_view<It, Sentinel, Char>&&>;
+
+ public:
+  using nonlocking = void;
+
+  template <typename ParseContext>
+  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> const Char* {
+    return value_formatter_.parse(ctx);
+  }
+
+  template <typename FormatContext>
+  auto format(view_ref& value, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    auto it = std::forward<view_ref>(value).begin;
+    auto out = ctx.out();
+    if (it == value.end) return out;
+    out = value_formatter_.format(*it, ctx);
+    ++it;
+    while (it != value.end) {
+      out = detail::copy<Char>(value.sep.begin(), value.sep.end(), out);
+      ctx.advance_to(out);
+      out = value_formatter_.format(*it, ctx);
+      ++it;
+    }
+    return out;
+  }
 };
 
+/// Returns a view that formats the iterator range `[begin, end)` with elements
+/// separated by `sep`.
+template <typename It, typename Sentinel>
+auto join(It begin, Sentinel end, string_view sep) -> join_view<It, Sentinel> {
+  return {std::move(begin), end, sep};
+}
+
+/**
+ * Returns a view that formats `range` with elements separated by `sep`.
+ *
+ * **Example**:
+ *
+ *     auto v = std::vector<int>{1, 2, 3};
+ *     fmt::print("{}", fmt::join(v, ", "));
+ *     // Output: 1, 2, 3
+ *
+ * `fmt::join` applies passed format specifiers to the range elements:
+ *
+ *     fmt::print("{:02}", fmt::join(v, ", "));
+ *     // Output: 01, 02, 03
+ */
+template <typename Range>
+auto join(Range&& r, string_view sep)
+    -> join_view<decltype(detail::range_begin(r)),
+                 decltype(detail::range_end(r))> {
+  return {detail::range_begin(r), detail::range_end(r), sep};
+}
+
 template <typename Char, typename... T> struct tuple_join_view : detail::view {
   const std::tuple<T...>& tuple;
   basic_string_view<Char> sep;
@@ -623,7 +780,7 @@ struct formatter<tuple_join_view<Char, T...>, Char> {
     if (N > 1) {
       auto end1 = do_parse(ctx, std::integral_constant<size_t, N - 1>());
       if (end != end1)
-        FMT_THROW(format_error("incompatible format specs for tuple elements"));
+        report_error("incompatible format specs for tuple elements");
     }
 #endif
     return end;
@@ -642,12 +799,10 @@ struct formatter<tuple_join_view<Char, T...>, Char> {
       typename FormatContext::iterator {
     auto out = std::get<sizeof...(T) - N>(formatters_)
                    .format(std::get<sizeof...(T) - N>(value.tuple), ctx);
-    if (N > 1) {
-      out = std::copy(value.sep.begin(), value.sep.end(), out);
-      ctx.advance_to(out);
-      return do_format(value, ctx, std::integral_constant<size_t, N - 1>());
-    }
-    return out;
+    if (N <= 1) return out;
+    out = detail::copy<Char>(value.sep, out);
+    ctx.advance_to(out);
+    return do_format(value, ctx, std::integral_constant<size_t, N - 1>());
   }
 };
 
@@ -692,15 +847,13 @@ struct formatter<
 FMT_BEGIN_EXPORT
 
 /**
-  \rst
-  Returns an object that formats `tuple` with elements separated by `sep`.
-
-  **Example**::
-
-    std::tuple<int, char> t = {1, 'a'};
-    fmt::print("{}", fmt::join(t, ", "));
-    // Output: "1, a"
-  \endrst
+ * Returns an object that formats `std::tuple` with elements separated by `sep`.
+ *
+ * **Example**:
+ *
+ *     auto t = std::tuple<int, char>{1, 'a'};
+ *     fmt::print("{}", fmt::join(t, ", "));
+ *     // Output: 1, a
  */
 template <typename... T>
 FMT_CONSTEXPR auto join(const std::tuple<T...>& tuple, string_view sep)
@@ -708,23 +861,14 @@ FMT_CONSTEXPR auto join(const std::tuple<T...>& tuple, string_view sep)
   return {tuple, sep};
 }
 
-template <typename... T>
-FMT_CONSTEXPR auto join(const std::tuple<T...>& tuple,
-                        basic_string_view<wchar_t> sep)
-    -> tuple_join_view<wchar_t, T...> {
-  return {tuple, sep};
-}
-
 /**
-  \rst
-  Returns an object that formats `initializer_list` with elements separated by
-  `sep`.
-
-  **Example**::
-
-    fmt::print("{}", fmt::join({1, 2, 3}, ", "));
-    // Output: "1, 2, 3"
-  \endrst
+ * Returns an object that formats `std::initializer_list` with elements
+ * separated by `sep`.
+ *
+ * **Example**:
+ *
+ *     fmt::print("{}", fmt::join({1, 2, 3}, ", "));
+ *     // Output: "1, 2, 3"
  */
 template <typename T>
 auto join(std::initializer_list<T> list, string_view sep)
diff --git a/contrib/fmt/include/fmt/std.h b/contrib/fmt/include/fmt/std.h
index 7cff11592..fb43940bc 100644
--- a/contrib/fmt/include/fmt/std.h
+++ b/contrib/fmt/include/fmt/std.h
@@ -8,38 +8,46 @@
 #ifndef FMT_STD_H_
 #define FMT_STD_H_
 
-#include <atomic>
-#include <bitset>
-#include <cstdlib>
-#include <exception>
-#include <memory>
-#include <thread>
-#include <type_traits>
-#include <typeinfo>
-#include <utility>
-#include <vector>
-
 #include "format.h"
 #include "ostream.h"
 
-#if FMT_HAS_INCLUDE(<version>)
-#  include <version>
-#endif
-// Checking FMT_CPLUSPLUS for warning suppression in MSVC.
-#if FMT_CPLUSPLUS >= 201703L
-#  if FMT_HAS_INCLUDE(<filesystem>)
-#    include <filesystem>
+#ifndef FMT_MODULE
+#  include <atomic>
+#  include <bitset>
+#  include <complex>
+#  include <cstdlib>
+#  include <exception>
+#  include <memory>
+#  include <thread>
+#  include <type_traits>
+#  include <typeinfo>
+#  include <utility>
+#  include <vector>
+
+// Check FMT_CPLUSPLUS to suppress a bogus warning in MSVC.
+#  if FMT_CPLUSPLUS >= 201703L
+#    if FMT_HAS_INCLUDE(<filesystem>)
+#      include <filesystem>
+#    endif
+#    if FMT_HAS_INCLUDE(<variant>)
+#      include <variant>
+#    endif
+#    if FMT_HAS_INCLUDE(<optional>)
+#      include <optional>
+#    endif
 #  endif
-#  if FMT_HAS_INCLUDE(<variant>)
-#    include <variant>
+// Use > instead of >= in the version check because <source_location> may be
+// available after C++17 but before C++20 is marked as implemented.
+#  if FMT_CPLUSPLUS > 201703L && FMT_HAS_INCLUDE(<source_location>)
+#    include <source_location>
 #  endif
-#  if FMT_HAS_INCLUDE(<optional>)
-#    include <optional>
+#  if FMT_CPLUSPLUS > 202002L && FMT_HAS_INCLUDE(<expected>)
+#    include <expected>
 #  endif
-#endif
+#endif  // FMT_MODULE
 
-#if FMT_CPLUSPLUS > 201703L && FMT_HAS_INCLUDE(<source_location>)
-#  include <source_location>
+#if FMT_HAS_INCLUDE(<version>)
+#  include <version>
 #endif
 
 // GCC 4 does not support FMT_HAS_INCLUDE.
@@ -52,17 +60,6 @@
 #  endif
 #endif
 
-// Check if typeid is available.
-#ifndef FMT_USE_TYPEID
-// __RTTI is for EDG compilers. In MSVC typeid is available without RTTI.
-#  if defined(__GXX_RTTI) || FMT_HAS_FEATURE(cxx_rtti) || FMT_MSC_VERSION || \
-      defined(__INTEL_RTTI__) || defined(__RTTI)
-#    define FMT_USE_TYPEID 1
-#  else
-#    define FMT_USE_TYPEID 0
-#  endif
-#endif
-
 // For older Xcode versions, __cpp_lib_xxx flags are inaccurately defined.
 #ifndef FMT_CPP_LIB_FILESYSTEM
 #  ifdef __cpp_lib_filesystem
@@ -117,7 +114,7 @@ void write_escaped_path(basic_memory_buffer<Char>& quoted,
 FMT_EXPORT
 template <typename Char> struct formatter<std::filesystem::path, Char> {
  private:
-  format_specs<Char> specs_;
+  format_specs specs_;
   detail::arg_ref<Char> width_ref_;
   bool debug_ = false;
   char path_type_ = 0;
@@ -137,18 +134,16 @@ template <typename Char> struct formatter<std::filesystem::path, Char> {
       debug_ = true;
       ++it;
     }
-    if (it != end && (*it == 'g')) path_type_ = *it++;
+    if (it != end && (*it == 'g')) path_type_ = detail::to_ascii(*it++);
     return it;
   }
 
   template <typename FormatContext>
   auto format(const std::filesystem::path& p, FormatContext& ctx) const {
     auto specs = specs_;
-#  ifdef _WIN32
-    auto path_string = !path_type_ ? p.native() : p.generic_wstring();
-#  else
-    auto path_string = !path_type_ ? p.native() : p.generic_string();
-#  endif
+    auto path_string =
+        !path_type_ ? p.native()
+                    : p.generic_string<std::filesystem::path::value_type>();
 
     detail::handle_dynamic_spec<detail::width_checker>(specs.width, width_ref_,
                                                        ctx);
@@ -163,6 +158,22 @@ template <typename Char> struct formatter<std::filesystem::path, Char> {
                          specs);
   }
 };
+
+class path : public std::filesystem::path {
+ public:
+  auto display_string() const -> std::string {
+    const std::filesystem::path& base = *this;
+    return fmt::format(FMT_STRING("{}"), base);
+  }
+  auto system_string() const -> std::string { return string(); }
+
+  auto generic_display_string() const -> std::string {
+    const std::filesystem::path& base = *this;
+    return fmt::format(FMT_STRING("{:g}"), base);
+  }
+  auto generic_system_string() const -> std::string { return generic_string(); }
+};
+
 FMT_END_NAMESPACE
 #endif  // FMT_CPP_LIB_FILESYSTEM
 
@@ -242,6 +253,56 @@ struct formatter<std::optional<T>, Char,
 FMT_END_NAMESPACE
 #endif  // __cpp_lib_optional
 
+#if defined(__cpp_lib_expected) || FMT_CPP_LIB_VARIANT
+
+FMT_BEGIN_NAMESPACE
+namespace detail {
+
+template <typename Char, typename OutputIt, typename T>
+auto write_escaped_alternative(OutputIt out, const T& v) -> OutputIt {
+  if constexpr (has_to_string_view<T>::value)
+    return write_escaped_string<Char>(out, detail::to_string_view(v));
+  if constexpr (std::is_same_v<T, Char>) return write_escaped_char(out, v);
+  return write<Char>(out, v);
+}
+
+}  // namespace detail
+
+FMT_END_NAMESPACE
+#endif
+
+#ifdef __cpp_lib_expected
+FMT_BEGIN_NAMESPACE
+
+FMT_EXPORT
+template <typename T, typename E, typename Char>
+struct formatter<std::expected<T, E>, Char,
+                 std::enable_if_t<is_formattable<T, Char>::value &&
+                                  is_formattable<E, Char>::value>> {
+  template <typename ParseContext>
+  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
+    return ctx.begin();
+  }
+
+  template <typename FormatContext>
+  auto format(const std::expected<T, E>& value, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    auto out = ctx.out();
+
+    if (value.has_value()) {
+      out = detail::write<Char>(out, "expected(");
+      out = detail::write_escaped_alternative<Char>(out, *value);
+    } else {
+      out = detail::write<Char>(out, "unexpected(");
+      out = detail::write_escaped_alternative<Char>(out, value.error());
+    }
+    *out++ = ')';
+    return out;
+  }
+};
+FMT_END_NAMESPACE
+#endif  // __cpp_lib_expected
+
 #ifdef __cpp_lib_source_location
 FMT_BEGIN_NAMESPACE
 FMT_EXPORT
@@ -291,16 +352,6 @@ template <typename T, typename C> class is_variant_formattable_ {
       decltype(check(variant_index_sequence<T>{}))::value;
 };
 
-template <typename Char, typename OutputIt, typename T>
-auto write_variant_alternative(OutputIt out, const T& v) -> OutputIt {
-  if constexpr (is_string<T>::value)
-    return write_escaped_string<Char>(out, detail::to_string_view(v));
-  else if constexpr (std::is_same_v<T, Char>)
-    return write_escaped_char(out, v);
-  else
-    return write<Char>(out, v);
-}
-
 }  // namespace detail
 
 template <typename T> struct is_variant_like {
@@ -346,7 +397,7 @@ struct formatter<
     FMT_TRY {
       std::visit(
           [&](const auto& v) {
-            out = detail::write_variant_alternative<Char>(out, v);
+            out = detail::write_escaped_alternative<Char>(out, v);
           },
           value);
     }
@@ -372,13 +423,102 @@ template <typename Char> struct formatter<std::error_code, Char> {
   FMT_CONSTEXPR auto format(const std::error_code& ec, FormatContext& ctx) const
       -> decltype(ctx.out()) {
     auto out = ctx.out();
-    out = detail::write_bytes(out, ec.category().name(), format_specs<Char>());
+    out = detail::write_bytes<Char>(out, ec.category().name(), format_specs());
     out = detail::write<Char>(out, Char(':'));
     out = detail::write<Char>(out, ec.value());
     return out;
   }
 };
 
+#if FMT_USE_RTTI
+namespace detail {
+
+template <typename Char, typename OutputIt>
+auto write_demangled_name(OutputIt out, const std::type_info& ti) -> OutputIt {
+#  ifdef FMT_HAS_ABI_CXA_DEMANGLE
+  int status = 0;
+  std::size_t size = 0;
+  std::unique_ptr<char, void (*)(void*)> demangled_name_ptr(
+      abi::__cxa_demangle(ti.name(), nullptr, &size, &status), &std::free);
+
+  string_view demangled_name_view;
+  if (demangled_name_ptr) {
+    demangled_name_view = demangled_name_ptr.get();
+
+    // Normalization of stdlib inline namespace names.
+    // libc++ inline namespaces.
+    //  std::__1::*       -> std::*
+    //  std::__1::__fs::* -> std::*
+    // libstdc++ inline namespaces.
+    //  std::__cxx11::*             -> std::*
+    //  std::filesystem::__cxx11::* -> std::filesystem::*
+    if (demangled_name_view.starts_with("std::")) {
+      char* begin = demangled_name_ptr.get();
+      char* to = begin + 5;  // std::
+      for (char *from = to, *end = begin + demangled_name_view.size();
+           from < end;) {
+        // This is safe, because demangled_name is NUL-terminated.
+        if (from[0] == '_' && from[1] == '_') {
+          char* next = from + 1;
+          while (next < end && *next != ':') next++;
+          if (next[0] == ':' && next[1] == ':') {
+            from = next + 2;
+            continue;
+          }
+        }
+        *to++ = *from++;
+      }
+      demangled_name_view = {begin, detail::to_unsigned(to - begin)};
+    }
+  } else {
+    demangled_name_view = string_view(ti.name());
+  }
+  return detail::write_bytes<Char>(out, demangled_name_view);
+#  elif FMT_MSC_VERSION
+  const string_view demangled_name(ti.name());
+  for (std::size_t i = 0; i < demangled_name.size(); ++i) {
+    auto sub = demangled_name;
+    sub.remove_prefix(i);
+    if (sub.starts_with("enum ")) {
+      i += 4;
+      continue;
+    }
+    if (sub.starts_with("class ") || sub.starts_with("union ")) {
+      i += 5;
+      continue;
+    }
+    if (sub.starts_with("struct ")) {
+      i += 6;
+      continue;
+    }
+    if (*sub.begin() != ' ') *out++ = *sub.begin();
+  }
+  return out;
+#  else
+  return detail::write_bytes<Char>(out, string_view(ti.name()));
+#  endif
+}
+
+}  // namespace detail
+
+FMT_EXPORT
+template <typename Char>
+struct formatter<std::type_info, Char  // DEPRECATED! Mixing code unit types.
+                 > {
+ public:
+  FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
+      -> decltype(ctx.begin()) {
+    return ctx.begin();
+  }
+
+  template <typename Context>
+  auto format(const std::type_info& ti, Context& ctx) const
+      -> decltype(ctx.out()) {
+    return detail::write_demangled_name<Char>(ctx.out(), ti);
+  }
+};
+#endif
+
 FMT_EXPORT
 template <typename T, typename Char>
 struct formatter<
@@ -395,74 +535,23 @@ struct formatter<
     if (it == end || *it == '}') return it;
     if (*it == 't') {
       ++it;
-      with_typename_ = FMT_USE_TYPEID != 0;
+      with_typename_ = FMT_USE_RTTI != 0;
     }
     return it;
   }
 
-  template <typename OutputIt>
-  auto format(const std::exception& ex,
-              basic_format_context<OutputIt, Char>& ctx) const -> OutputIt {
-    format_specs<Char> spec;
+  template <typename Context>
+  auto format(const std::exception& ex, Context& ctx) const
+      -> decltype(ctx.out()) {
     auto out = ctx.out();
-    if (!with_typename_)
-      return detail::write_bytes(out, string_view(ex.what()), spec);
-
-#if FMT_USE_TYPEID
-    const std::type_info& ti = typeid(ex);
-#  ifdef FMT_HAS_ABI_CXA_DEMANGLE
-    int status = 0;
-    std::size_t size = 0;
-    std::unique_ptr<char, void (*)(void*)> demangled_name_ptr(
-        abi::__cxa_demangle(ti.name(), nullptr, &size, &status), &std::free);
-
-    string_view demangled_name_view;
-    if (demangled_name_ptr) {
-      demangled_name_view = demangled_name_ptr.get();
-
-      // Normalization of stdlib inline namespace names.
-      // libc++ inline namespaces.
-      //  std::__1::*       -> std::*
-      //  std::__1::__fs::* -> std::*
-      // libstdc++ inline namespaces.
-      //  std::__cxx11::*             -> std::*
-      //  std::filesystem::__cxx11::* -> std::filesystem::*
-      if (demangled_name_view.starts_with("std::")) {
-        char* begin = demangled_name_ptr.get();
-        char* to = begin + 5;  // std::
-        for (char *from = to, *end = begin + demangled_name_view.size();
-             from < end;) {
-          // This is safe, because demangled_name is NUL-terminated.
-          if (from[0] == '_' && from[1] == '_') {
-            char* next = from + 1;
-            while (next < end && *next != ':') next++;
-            if (next[0] == ':' && next[1] == ':') {
-              from = next + 2;
-              continue;
-            }
-          }
-          *to++ = *from++;
-        }
-        demangled_name_view = {begin, detail::to_unsigned(to - begin)};
-      }
-    } else {
-      demangled_name_view = string_view(ti.name());
+#if FMT_USE_RTTI
+    if (with_typename_) {
+      out = detail::write_demangled_name<Char>(out, typeid(ex));
+      *out++ = ':';
+      *out++ = ' ';
     }
-    out = detail::write_bytes(out, demangled_name_view, spec);
-#  elif FMT_MSC_VERSION
-    string_view demangled_name_view(ti.name());
-    if (demangled_name_view.starts_with("class "))
-      demangled_name_view.remove_prefix(6);
-    else if (demangled_name_view.starts_with("struct "))
-      demangled_name_view.remove_prefix(7);
-    out = detail::write_bytes(out, demangled_name_view, spec);
-#  else
-    out = detail::write_bytes(out, string_view(ti.name()), spec);
-#  endif
-    *out++ = ':';
-    *out++ = ' ';
-    return detail::write_bytes(out, string_view(ex.what()), spec);
 #endif
+    return detail::write_bytes<Char>(out, string_view(ex.what()));
   }
 };
 
@@ -509,6 +598,14 @@ struct formatter<BitRef, Char,
   }
 };
 
+template <typename T, typename Deleter>
+auto ptr(const std::unique_ptr<T, Deleter>& p) -> const void* {
+  return p.get();
+}
+template <typename T> auto ptr(const std::shared_ptr<T>& p) -> const void* {
+  return p.get();
+}
+
 FMT_EXPORT
 template <typename T, typename Char>
 struct formatter<std::atomic<T>, Char,
@@ -533,5 +630,70 @@ struct formatter<std::atomic_flag, Char> : formatter<bool, Char> {
 };
 #endif  // __cpp_lib_atomic_flag_test
 
+FMT_EXPORT
+template <typename T, typename Char> struct formatter<std::complex<T>, Char> {
+ private:
+  detail::dynamic_format_specs<Char> specs_;
+
+  template <typename FormatContext, typename OutputIt>
+  FMT_CONSTEXPR auto do_format(const std::complex<T>& c,
+                               detail::dynamic_format_specs<Char>& specs,
+                               FormatContext& ctx, OutputIt out) const
+      -> OutputIt {
+    if (c.real() != 0) {
+      *out++ = Char('(');
+      out = detail::write<Char>(out, c.real(), specs, ctx.locale());
+      specs.sign = sign::plus;
+      out = detail::write<Char>(out, c.imag(), specs, ctx.locale());
+      if (!detail::isfinite(c.imag())) *out++ = Char(' ');
+      *out++ = Char('i');
+      *out++ = Char(')');
+      return out;
+    }
+    out = detail::write<Char>(out, c.imag(), specs, ctx.locale());
+    if (!detail::isfinite(c.imag())) *out++ = Char(' ');
+    *out++ = Char('i');
+    return out;
+  }
+
+ public:
+  FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
+      -> decltype(ctx.begin()) {
+    if (ctx.begin() == ctx.end() || *ctx.begin() == '}') return ctx.begin();
+    return parse_format_specs(ctx.begin(), ctx.end(), specs_, ctx,
+                              detail::type_constant<T, Char>::value);
+  }
+
+  template <typename FormatContext>
+  auto format(const std::complex<T>& c, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    auto specs = specs_;
+    if (specs.width_ref.kind != detail::arg_id_kind::none ||
+        specs.precision_ref.kind != detail::arg_id_kind::none) {
+      detail::handle_dynamic_spec<detail::width_checker>(specs.width,
+                                                         specs.width_ref, ctx);
+      detail::handle_dynamic_spec<detail::precision_checker>(
+          specs.precision, specs.precision_ref, ctx);
+    }
+
+    if (specs.width == 0) return do_format(c, specs, ctx, ctx.out());
+    auto buf = basic_memory_buffer<Char>();
+
+    auto outer_specs = format_specs();
+    outer_specs.width = specs.width;
+    outer_specs.fill = specs.fill;
+    outer_specs.align = specs.align;
+
+    specs.width = 0;
+    specs.fill = {};
+    specs.align = align::none;
+
+    do_format(c, specs, ctx, basic_appender<Char>(buf));
+    return detail::write<Char>(ctx.out(),
+                               basic_string_view<Char>(buf.data(), buf.size()),
+                               outer_specs);
+  }
+};
+
 FMT_END_NAMESPACE
 #endif  // FMT_STD_H_
diff --git a/contrib/fmt/include/fmt/xchar.h b/contrib/fmt/include/fmt/xchar.h
index f609c5c41..b1f39ed22 100644
--- a/contrib/fmt/include/fmt/xchar.h
+++ b/contrib/fmt/include/fmt/xchar.h
@@ -8,12 +8,15 @@
 #ifndef FMT_XCHAR_H_
 #define FMT_XCHAR_H_
 
-#include <cwchar>
-
+#include "color.h"
 #include "format.h"
+#include "ranges.h"
 
-#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
-#  include <locale>
+#ifndef FMT_MODULE
+#  include <cwchar>
+#  if !defined(FMT_STATIC_THOUSANDS_SEPARATOR)
+#    include <locale>
+#  endif
 #endif
 
 FMT_BEGIN_NAMESPACE
@@ -22,9 +25,24 @@ namespace detail {
 template <typename T>
 using is_exotic_char = bool_constant<!std::is_same<T, char>::value>;
 
-inline auto write_loc(std::back_insert_iterator<detail::buffer<wchar_t>> out,
-                      loc_value value, const format_specs<wchar_t>& specs,
-                      locale_ref loc) -> bool {
+template <typename S, typename = void> struct format_string_char {};
+
+template <typename S>
+struct format_string_char<
+    S, void_t<decltype(sizeof(detail::to_string_view(std::declval<S>())))>> {
+  using type = char_t<S>;
+};
+
+template <typename S>
+struct format_string_char<S, enable_if_t<is_compile_string<S>::value>> {
+  using type = typename S::char_type;
+};
+
+template <typename S>
+using format_string_char_t = typename format_string_char<S>::type;
+
+inline auto write_loc(basic_appender<wchar_t> out, loc_value value,
+                      const format_specs& specs, locale_ref loc) -> bool {
 #ifndef FMT_STATIC_THOUSANDS_SEPARATOR
   auto& numpunct =
       std::use_facet<std::numpunct<wchar_t>>(loc.get<std::locale>());
@@ -41,7 +59,7 @@ FMT_BEGIN_EXPORT
 
 using wstring_view = basic_string_view<wchar_t>;
 using wformat_parse_context = basic_format_parse_context<wchar_t>;
-using wformat_context = buffer_context<wchar_t>;
+using wformat_context = buffered_context<wchar_t>;
 using wformat_args = basic_format_args<wformat_context>;
 using wmemory_buffer = basic_memory_buffer<wchar_t>;
 
@@ -58,14 +76,18 @@ inline auto runtime(wstring_view s) -> runtime_format_string<wchar_t> {
 #endif
 
 template <> struct is_char<wchar_t> : std::true_type {};
-template <> struct is_char<detail::char8_type> : std::true_type {};
 template <> struct is_char<char16_t> : std::true_type {};
 template <> struct is_char<char32_t> : std::true_type {};
 
+#ifdef __cpp_char8_t
+template <>
+struct is_char<char8_t> : bool_constant<detail::is_utf8_enabled()> {};
+#endif
+
 template <typename... T>
-constexpr auto make_wformat_args(const T&... args)
-    -> format_arg_store<wformat_context, T...> {
-  return {args...};
+constexpr auto make_wformat_args(T&... args)
+    -> decltype(fmt::make_format_args<wformat_context>(args...)) {
+  return fmt::make_format_args<wformat_context>(args...);
 }
 
 inline namespace literals {
@@ -96,9 +118,15 @@ auto join(std::initializer_list<T> list, wstring_view sep)
   return join(std::begin(list), std::end(list), sep);
 }
 
+template <typename... T>
+auto join(const std::tuple<T...>& tuple, basic_string_view<wchar_t> sep)
+    -> tuple_join_view<wchar_t, T...> {
+  return {tuple, sep};
+}
+
 template <typename Char, FMT_ENABLE_IF(!std::is_same<Char, char>::value)>
 auto vformat(basic_string_view<Char> format_str,
-             basic_format_args<buffer_context<type_identity_t<Char>>> args)
+             typename detail::vformat_args<Char>::type args)
     -> std::basic_string<Char> {
   auto buf = basic_memory_buffer<Char>();
   detail::vformat_to(buf, format_str, args);
@@ -110,63 +138,74 @@ auto format(wformat_string<T...> fmt, T&&... args) -> std::wstring {
   return vformat(fmt::wstring_view(fmt), fmt::make_wformat_args(args...));
 }
 
+template <typename OutputIt, typename... T>
+auto format_to(OutputIt out, wformat_string<T...> fmt, T&&... args)
+    -> OutputIt {
+  return vformat_to(out, fmt::wstring_view(fmt),
+                    fmt::make_wformat_args(args...));
+}
+
 // Pass char_t as a default template parameter instead of using
 // std::basic_string<char_t<S>> to reduce the symbol size.
-template <typename S, typename... T, typename Char = char_t<S>,
+template <typename S, typename... T,
+          typename Char = detail::format_string_char_t<S>,
           FMT_ENABLE_IF(!std::is_same<Char, char>::value &&
                         !std::is_same<Char, wchar_t>::value)>
 auto format(const S& format_str, T&&... args) -> std::basic_string<Char> {
   return vformat(detail::to_string_view(format_str),
-                 fmt::make_format_args<buffer_context<Char>>(args...));
+                 fmt::make_format_args<buffered_context<Char>>(args...));
 }
 
-template <typename Locale, typename S, typename Char = char_t<S>,
+template <typename Locale, typename S,
+          typename Char = detail::format_string_char_t<S>,
           FMT_ENABLE_IF(detail::is_locale<Locale>::value&&
                             detail::is_exotic_char<Char>::value)>
-inline auto vformat(
-    const Locale& loc, const S& format_str,
-    basic_format_args<buffer_context<type_identity_t<Char>>> args)
+inline auto vformat(const Locale& loc, const S& format_str,
+                    typename detail::vformat_args<Char>::type args)
     -> std::basic_string<Char> {
   return detail::vformat(loc, detail::to_string_view(format_str), args);
 }
 
-template <typename Locale, typename S, typename... T, typename Char = char_t<S>,
+template <typename Locale, typename S, typename... T,
+          typename Char = detail::format_string_char_t<S>,
           FMT_ENABLE_IF(detail::is_locale<Locale>::value&&
                             detail::is_exotic_char<Char>::value)>
 inline auto format(const Locale& loc, const S& format_str, T&&... args)
     -> std::basic_string<Char> {
-  return detail::vformat(loc, detail::to_string_view(format_str),
-                         fmt::make_format_args<buffer_context<Char>>(args...));
+  return detail::vformat(
+      loc, detail::to_string_view(format_str),
+      fmt::make_format_args<buffered_context<Char>>(args...));
 }
 
-template <typename OutputIt, typename S, typename Char = char_t<S>,
+template <typename OutputIt, typename S,
+          typename Char = detail::format_string_char_t<S>,
           FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value&&
                             detail::is_exotic_char<Char>::value)>
 auto vformat_to(OutputIt out, const S& format_str,
-                basic_format_args<buffer_context<type_identity_t<Char>>> args)
-    -> OutputIt {
+                typename detail::vformat_args<Char>::type args) -> OutputIt {
   auto&& buf = detail::get_buffer<Char>(out);
   detail::vformat_to(buf, detail::to_string_view(format_str), args);
   return detail::get_iterator(buf, out);
 }
 
 template <typename OutputIt, typename S, typename... T,
-          typename Char = char_t<S>,
-          FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value&&
-                            detail::is_exotic_char<Char>::value)>
+          typename Char = detail::format_string_char_t<S>,
+          FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value &&
+                        !std::is_same<Char, char>::value &&
+                        !std::is_same<Char, wchar_t>::value)>
 inline auto format_to(OutputIt out, const S& fmt, T&&... args) -> OutputIt {
   return vformat_to(out, detail::to_string_view(fmt),
-                    fmt::make_format_args<buffer_context<Char>>(args...));
+                    fmt::make_format_args<buffered_context<Char>>(args...));
 }
 
 template <typename Locale, typename S, typename OutputIt, typename... Args,
-          typename Char = char_t<S>,
+          typename Char = detail::format_string_char_t<S>,
           FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value&&
                             detail::is_locale<Locale>::value&&
                                 detail::is_exotic_char<Char>::value)>
-inline auto vformat_to(
-    OutputIt out, const Locale& loc, const S& format_str,
-    basic_format_args<buffer_context<type_identity_t<Char>>> args) -> OutputIt {
+inline auto vformat_to(OutputIt out, const Locale& loc, const S& format_str,
+                       typename detail::vformat_args<Char>::type args)
+    -> OutputIt {
   auto&& buf = detail::get_buffer<Char>(out);
   vformat_to(buf, detail::to_string_view(format_str), args,
              detail::locale_ref(loc));
@@ -174,7 +213,7 @@ inline auto vformat_to(
 }
 
 template <typename OutputIt, typename Locale, typename S, typename... T,
-          typename Char = char_t<S>,
+          typename Char = detail::format_string_char_t<S>,
           bool enable = detail::is_output_iterator<OutputIt, Char>::value &&
                         detail::is_locale<Locale>::value &&
                         detail::is_exotic_char<Char>::value>
@@ -182,15 +221,15 @@ inline auto format_to(OutputIt out, const Locale& loc, const S& format_str,
                       T&&... args) ->
     typename std::enable_if<enable, OutputIt>::type {
   return vformat_to(out, loc, detail::to_string_view(format_str),
-                    fmt::make_format_args<buffer_context<Char>>(args...));
+                    fmt::make_format_args<buffered_context<Char>>(args...));
 }
 
 template <typename OutputIt, typename Char, typename... Args,
           FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value&&
                             detail::is_exotic_char<Char>::value)>
-inline auto vformat_to_n(
-    OutputIt out, size_t n, basic_string_view<Char> format_str,
-    basic_format_args<buffer_context<type_identity_t<Char>>> args)
+inline auto vformat_to_n(OutputIt out, size_t n,
+                         basic_string_view<Char> format_str,
+                         typename detail::vformat_args<Char>::type args)
     -> format_to_n_result<OutputIt> {
   using traits = detail::fixed_buffer_traits;
   auto buf = detail::iterator_buffer<OutputIt, Char, traits>(out, n);
@@ -199,21 +238,22 @@ inline auto vformat_to_n(
 }
 
 template <typename OutputIt, typename S, typename... T,
-          typename Char = char_t<S>,
+          typename Char = detail::format_string_char_t<S>,
           FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value&&
                             detail::is_exotic_char<Char>::value)>
 inline auto format_to_n(OutputIt out, size_t n, const S& fmt, T&&... args)
     -> format_to_n_result<OutputIt> {
-  return vformat_to_n(out, n, detail::to_string_view(fmt),
-                      fmt::make_format_args<buffer_context<Char>>(args...));
+  return vformat_to_n(out, n, fmt::basic_string_view<Char>(fmt),
+                      fmt::make_format_args<buffered_context<Char>>(args...));
 }
 
-template <typename S, typename... T, typename Char = char_t<S>,
+template <typename S, typename... T,
+          typename Char = detail::format_string_char_t<S>,
           FMT_ENABLE_IF(detail::is_exotic_char<Char>::value)>
 inline auto formatted_size(const S& fmt, T&&... args) -> size_t {
   auto buf = detail::counting_buffer<Char>();
   detail::vformat_to(buf, detail::to_string_view(fmt),
-                     fmt::make_format_args<buffer_context<Char>>(args...));
+                     fmt::make_format_args<buffered_context<Char>>(args...));
   return buf.count();
 }
 
@@ -247,9 +287,32 @@ template <typename... T> void println(wformat_string<T...> fmt, T&&... args) {
   return print(L"{}\n", fmt::format(fmt, std::forward<T>(args)...));
 }
 
-/**
-  Converts *value* to ``std::wstring`` using the default format for type *T*.
- */
+inline auto vformat(const text_style& ts, wstring_view fmt, wformat_args args)
+    -> std::wstring {
+  auto buf = wmemory_buffer();
+  detail::vformat_to(buf, ts, fmt, args);
+  return fmt::to_string(buf);
+}
+
+template <typename... T>
+inline auto format(const text_style& ts, wformat_string<T...> fmt, T&&... args)
+    -> std::wstring {
+  return fmt::vformat(ts, fmt, fmt::make_wformat_args(args...));
+}
+
+template <typename... T>
+FMT_DEPRECATED void print(std::FILE* f, const text_style& ts,
+                          wformat_string<T...> fmt, const T&... args) {
+  vprint(f, ts, fmt, fmt::make_wformat_args(args...));
+}
+
+template <typename... T>
+FMT_DEPRECATED void print(const text_style& ts, wformat_string<T...> fmt,
+                          const T&... args) {
+  return print(stdout, ts, fmt, args...);
+}
+
+/// Converts `value` to `std::wstring` using the default format for type `T`.
 template <typename T> inline auto to_wstring(const T& value) -> std::wstring {
   return format(FMT_STRING(L"{}"), value);
 }

From e23dab3a32d91d7ea19e507ba3cdfbf147a92871 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 16 Sep 2024 15:57:34 +0200
Subject: [PATCH 206/430] Make our use of fmt library work with C++20

See also fab6473d6f5cbe060ff582331cee1adc091aa8bc
---
 src/gen/gen-base.hpp |  6 +++---
 src/gen/params.cpp   |  2 +-
 src/logging.hpp      | 29 +++++++++++++++--------------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/gen/gen-base.hpp b/src/gen/gen-base.hpp
index 90e8ae37f..b935d7652 100644
--- a/src/gen/gen-base.hpp
+++ b/src/gen/gen-base.hpp
@@ -60,11 +60,11 @@ class gen_base_t
 
     std::string context();
 
-    template <typename... ARGS>
-    void log_gen(ARGS... args)
+    template <typename... TArgs>
+    void log_gen(fmt::format_string<TArgs...> format_str, TArgs &&...args)
     {
         if (m_debug) {
-            log_debug(args...);
+            log_debug(format_str, std::forward<TArgs>(args)...);
         }
     }
 
diff --git a/src/gen/params.cpp b/src/gen/params.cpp
index f7dbaaf98..1806981cc 100644
--- a/src/gen/params.cpp
+++ b/src/gen/params.cpp
@@ -118,7 +118,7 @@ void write_to_debug_log(params_t const &params, char const *message)
     if (!get_logger().debug_enabled()) {
         return;
     }
-    log_debug(message);
+    log_debug("{}", message);
     for (auto const &[key, value] : params) {
         log_debug("  {}={}", key, to_string(value));
     }
diff --git a/src/logging.hpp b/src/logging.hpp
index 2c2e51838..04748b1f5 100644
--- a/src/logging.hpp
+++ b/src/logging.hpp
@@ -36,9 +36,10 @@ enum class log_level
 class logger
 {
 public:
-    template <typename S, typename... TArgs>
+    template <typename... TArgs>
     void log(log_level with_level, char const *prefix,
-             fmt::text_style const &style, S const &format_str, TArgs &&...args)
+             fmt::text_style const &style,
+             fmt::format_string<TArgs...> format_str, TArgs &&...args)
     {
         if (with_level < m_current_level) {
             return;
@@ -109,37 +110,37 @@ class logger
 
 logger &get_logger() noexcept;
 
-template <typename S, typename... TArgs>
-void log_debug(S const &format_str, TArgs &&... args)
+template <typename... TArgs>
+void log_debug(fmt::format_string<TArgs...> format_str, TArgs &&...args)
 {
     get_logger().log(log_level::debug, nullptr, {}, format_str,
                      std::forward<TArgs>(args)...);
 }
 
-template <typename S, typename... TArgs>
-void log_info(S const &format_str, TArgs &&... args)
+template <typename... TArgs>
+void log_info(fmt::format_string<TArgs...> format_str, TArgs &&...args)
 {
     get_logger().log(log_level::info, nullptr, {}, format_str,
                      std::forward<TArgs>(args)...);
 }
 
-template <typename S, typename... TArgs>
-void log_warn(S const &format_str, TArgs &&... args)
+template <typename... TArgs>
+void log_warn(fmt::format_string<TArgs...> format_str, TArgs &&...args)
 {
     get_logger().log(log_level::warn, "WARNING", fg(fmt::color::red),
                      format_str, std::forward<TArgs>(args)...);
 }
 
-template <typename S, typename... TArgs>
-void log_error(S const &format_str, TArgs &&... args)
+template <typename... TArgs>
+void log_error(fmt::format_string<TArgs...> format_str, TArgs &&...args)
 {
     get_logger().log(log_level::error, "ERROR",
                      fmt::emphasis::bold | fg(fmt::color::red), format_str,
                      std::forward<TArgs>(args)...);
 }
 
-template <typename S, typename... TArgs>
-void log_sql(S const &format_str, TArgs &&... args)
+template <typename... TArgs>
+void log_sql(fmt::format_string<TArgs...> format_str, TArgs &&...args)
 {
     auto &logger = get_logger();
     if (logger.log_sql()) {
@@ -148,8 +149,8 @@ void log_sql(S const &format_str, TArgs &&... args)
     }
 }
 
-template <typename S, typename... TArgs>
-void log_sql_data(S const &format_str, TArgs &&... args)
+template <typename... TArgs>
+void log_sql_data(fmt::format_string<TArgs...> format_str, TArgs &&...args)
 {
     auto &logger = get_logger();
     if (logger.log_sql_data()) {

From 57073c18ecbfdbcefd2030dbb197d0426c8f7264 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 17 Sep 2024 11:10:15 +0200
Subject: [PATCH 207/430] clang-tidy cleanup: remove redundant member inits

---
 src/input.cpp       |  6 +++---
 src/input.hpp       |  4 ++--
 src/options.hpp     | 16 ++++++++--------
 src/output-flex.hpp | 20 ++++++++++----------
 src/thread-pool.hpp |  2 +-
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/input.cpp b/src/input.cpp
index f23731034..96fb1d458 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -122,9 +122,9 @@ class data_source_t
     using iterator = osmium::memory::Buffer::t_iterator<osmium::OSMObject>;
 
     std::unique_ptr<osmium::io::Reader> m_reader;
-    osmium::memory::Buffer m_buffer{};
-    iterator m_it{};
-    iterator m_end{};
+    osmium::memory::Buffer m_buffer;
+    iterator m_it;
+    iterator m_end;
     type_id m_last = {osmium::item_type::node, 0};
 
 }; // class data_source_t
diff --git a/src/input.hpp b/src/input.hpp
index 37b841596..00a73e46a 100644
--- a/src/input.hpp
+++ b/src/input.hpp
@@ -35,8 +35,8 @@ struct type_id
 
 struct file_info
 {
-    osmium::io::Header header{};
-    osmium::Timestamp last_timestamp{};
+    osmium::io::Header header;
+    osmium::Timestamp last_timestamp;
 };
 
 /**
diff --git a/src/options.hpp b/src/options.hpp
index 80ee36a31..363f600af 100644
--- a/src/options.hpp
+++ b/src/options.hpp
@@ -53,30 +53,30 @@ struct options_t
     bool prefix_is_set = false;
 
     /// Pg Tablespace to store indexes on main tables (no default TABLESPACE)
-    std::string tblsmain_index{};
+    std::string tblsmain_index;
 
     /// Pg Tablespace to store indexes on slim tables (no default TABLESPACE)
-    std::string tblsslim_index{};
+    std::string tblsslim_index;
 
     /// Pg Tablespace to store main tables (no default TABLESPACE)
-    std::string tblsmain_data{};
+    std::string tblsmain_data;
 
     /// Pg Tablespace to store slim tables (no default TABLESPACE)
-    std::string tblsslim_data{};
+    std::string tblsslim_data;
 
     /// Default Pg schema.
     std::string dbschema{"public"};
 
     /// Pg schema to store middle tables in.
-    std::string middle_dbschema{};
+    std::string middle_dbschema;
 
     /// Pg schema to store output tables in.
-    std::string output_dbschema{};
+    std::string output_dbschema;
 
-    std::string style{}; ///< style file to use
+    std::string style; ///< style file to use
 
     /// Name of the flat node file used. Empty if flat node file is not enabled.
-    std::string flat_node_file{};
+    std::string flat_node_file;
 
     std::string tag_transform_script;
 
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index 48fbb560a..9a4ad92ff 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -298,19 +298,19 @@ class output_flex_t : public output_t
 
     osmium::memory::Buffer m_area_buffer;
 
-    prepared_lua_function_t m_process_node{};
-    prepared_lua_function_t m_process_way{};
-    prepared_lua_function_t m_process_relation{};
+    prepared_lua_function_t m_process_node;
+    prepared_lua_function_t m_process_way;
+    prepared_lua_function_t m_process_relation;
 
-    prepared_lua_function_t m_process_untagged_node{};
-    prepared_lua_function_t m_process_untagged_way{};
-    prepared_lua_function_t m_process_untagged_relation{};
+    prepared_lua_function_t m_process_untagged_node;
+    prepared_lua_function_t m_process_untagged_way;
+    prepared_lua_function_t m_process_untagged_relation;
 
-    prepared_lua_function_t m_select_relation_members{};
+    prepared_lua_function_t m_select_relation_members;
 
-    prepared_lua_function_t m_after_nodes{};
-    prepared_lua_function_t m_after_ways{};
-    prepared_lua_function_t m_after_relations{};
+    prepared_lua_function_t m_after_nodes;
+    prepared_lua_function_t m_after_ways;
+    prepared_lua_function_t m_after_relations;
 
     calling_context m_calling_context = calling_context::main;
 
diff --git a/src/thread-pool.hpp b/src/thread-pool.hpp
index e61b9a7b4..4680abbfa 100644
--- a/src/thread-pool.hpp
+++ b/src/thread-pool.hpp
@@ -60,7 +60,7 @@ class task_result_t
     std::chrono::microseconds runtime() const noexcept { return m_result; }
 
 private:
-    std::future<std::chrono::microseconds> m_future{};
+    std::future<std::chrono::microseconds> m_future;
     std::chrono::microseconds m_result{};
 }; // class task_result_t
 

From 91011cdba71ab9511f8b966e5d1e87121b19cc55 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 17 Sep 2024 11:22:35 +0200
Subject: [PATCH 208/430] clang-tidy: Put function definitions in cpp file
 where they belong

---
 src/middle.cpp | 4 ++++
 src/middle.hpp | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/middle.cpp b/src/middle.cpp
index e2b930f8c..5158c76af 100644
--- a/src/middle.cpp
+++ b/src/middle.cpp
@@ -12,6 +12,10 @@
 #include "middle.hpp"
 #include "options.hpp"
 
+middle_query_t::~middle_query_t() = default;
+
+middle_t::~middle_t() = default;
+
 std::shared_ptr<middle_t>
 create_middle(std::shared_ptr<thread_pool_t> thread_pool,
               options_t const &options)
diff --git a/src/middle.hpp b/src/middle.hpp
index 2edacfe5c..5d48372d7 100644
--- a/src/middle.hpp
+++ b/src/middle.hpp
@@ -89,8 +89,6 @@ struct middle_query_t : std::enable_shared_from_this<middle_query_t>
                               osmium::memory::Buffer *buffer) const = 0;
 };
 
-inline middle_query_t::~middle_query_t() = default;
-
 /**
  * Interface for storing "raw" OSM data in an intermediate object store and
  * getting it back.
@@ -191,8 +189,6 @@ class middle_t
     std::shared_ptr<thread_pool_t> m_thread_pool;
 }; // class middle_t
 
-inline middle_t::~middle_t() = default;
-
 /// Factory function: Instantiate the middle based on the command line options.
 std::shared_ptr<middle_t>
 create_middle(std::shared_ptr<thread_pool_t> thread_pool,

From 30a5cd2137a7a5363b19fa226767701a90f53e80 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 17 Sep 2024 11:52:44 +0200
Subject: [PATCH 209/430] Use smallest usable type (uint8_t) for some enums

---
 src/expire-config.hpp | 3 ++-
 src/flex-table.hpp    | 5 +++--
 src/logging.hpp       | 3 ++-
 src/middle.hpp        | 3 ++-
 src/options.hpp       | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/expire-config.hpp b/src/expire-config.hpp
index f2113fc2b..f0194eb89 100644
--- a/src/expire-config.hpp
+++ b/src/expire-config.hpp
@@ -10,9 +10,10 @@
  * For a full list of authors see the git log.
  */
 
+#include <cstdint>
 #include <cstdlib>
 
-enum class expire_mode
+enum class expire_mode : uint8_t
 {
     full_area,     // Expire all tiles covered by polygon.
     boundary_only, // Expire only tiles covered by polygon boundary.
diff --git a/src/flex-table.hpp b/src/flex-table.hpp
index f45b0057c..8332b0342 100644
--- a/src/flex-table.hpp
+++ b/src/flex-table.hpp
@@ -23,6 +23,7 @@
 #include <cassert>
 #include <chrono>
 #include <cstddef>
+#include <cstdint>
 #include <future>
 #include <limits>
 #include <memory>
@@ -35,7 +36,7 @@
  * output. This is not a real primary key, because the values are not
  * necessarily unique.
  */
-enum class flex_table_index_type {
+enum class flex_table_index_type : uint8_t {
     no_index,
     node, // index by node id
     way, // index by way id
@@ -57,7 +58,7 @@ class flex_table_t
      * Table creation type: interim tables are created as UNLOGGED and with
      * autovacuum disabled.
      */
-    enum class table_type {
+    enum class table_type : uint8_t {
         interim,
         permanent
     };
diff --git a/src/logging.hpp b/src/logging.hpp
index 04748b1f5..4504276f3 100644
--- a/src/logging.hpp
+++ b/src/logging.hpp
@@ -18,10 +18,11 @@
 #include <fmt/color.h>
 
 #include <atomic>
+#include <cstdint>
 #include <cstdio>
 #include <utility>
 
-enum class log_level
+enum class log_level : uint8_t
 {
     debug = 1,
     info = 2,
diff --git a/src/middle.hpp b/src/middle.hpp
index 5d48372d7..4b3499735 100644
--- a/src/middle.hpp
+++ b/src/middle.hpp
@@ -13,6 +13,7 @@
 #include <osmium/memory/buffer.hpp>
 #include <osmium/osm/entity_bits.hpp>
 
+#include <cstdint>
 #include <memory>
 
 #include "osmtypes.hpp"
@@ -171,7 +172,7 @@ class middle_t
     }
 
 #ifndef NDEBUG
-    enum class middle_state
+    enum class middle_state : uint8_t
     {
         constructed,
         started,
diff --git a/src/options.hpp b/src/options.hpp
index 363f600af..4fdbed059 100644
--- a/src/options.hpp
+++ b/src/options.hpp
@@ -21,7 +21,7 @@
 
 class reprojection;
 
-enum class command_t
+enum class command_t : uint8_t
 {
     help,
     version,

From 48299dabc9f84ed430306d44ec2e613632077c1c Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 17 Sep 2024 11:55:36 +0200
Subject: [PATCH 210/430] Use const ref instead of string copy

---
 src/properties.cpp | 3 ++-
 src/properties.hpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/properties.cpp b/src/properties.cpp
index 563e5029e..0f41995e7 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -83,7 +83,8 @@ bool properties_t::get_bool(std::string const &property,
                     property);
 }
 
-void properties_t::set_string(std::string property, std::string value)
+void properties_t::set_string(std::string const &property,
+                              std::string const &value)
 {
     m_properties[property] = value;
     m_to_update[property] = value;
diff --git a/src/properties.hpp b/src/properties.hpp
index 74f907553..ac27e9a3a 100644
--- a/src/properties.hpp
+++ b/src/properties.hpp
@@ -54,7 +54,7 @@ class properties_t
      * \param property Name of the property
      * \param value Value of the property
      */
-    void set_string(std::string property, std::string value);
+    void set_string(std::string const &property, std::string const &value);
 
     /**
      * Set property to integer value. The integer will be converted to a string

From c42e0f6c35135747b1b46687a07ba4e3f996dc2c Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 18 Sep 2024 09:26:11 +0200
Subject: [PATCH 211/430] Use const ref params in properties code

---
 src/properties.cpp | 8 ++++----
 src/properties.hpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/properties.cpp b/src/properties.cpp
index 0f41995e7..a2e454d94 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -90,14 +90,14 @@ void properties_t::set_string(std::string const &property,
     m_to_update[property] = value;
 }
 
-void properties_t::set_int(std::string property, int64_t value)
+void properties_t::set_int(std::string const &property, int64_t value)
 {
-    set_string(std::move(property), std::to_string(value));
+    set_string(property, std::to_string(value));
 }
 
-void properties_t::set_bool(std::string property, bool value)
+void properties_t::set_bool(std::string const &property, bool value)
 {
-    set_string(std::move(property), value ? "true" : "false");
+    set_string(property, value ? "true" : "false");
 }
 
 void properties_t::init_table()
diff --git a/src/properties.hpp b/src/properties.hpp
index ac27e9a3a..0aa51399b 100644
--- a/src/properties.hpp
+++ b/src/properties.hpp
@@ -63,7 +63,7 @@ class properties_t
      * \param property Name of the property
      * \param value Value of the property
      */
-    void set_int(std::string property, int64_t value);
+    void set_int(std::string const &property, int64_t value);
 
     /**
      * Set property to boolean value. In the database this will show up as the
@@ -72,7 +72,7 @@ class properties_t
      * \param property Name of the property
      * \param value Value of the property
      */
-    void set_bool(std::string property, bool value);
+    void set_bool(std::string const &property, bool value);
 
     /**
      * Initialize the database table 'osm2pgsql_properties'. It is created if

From 427c228ac0ed808f87d5cc3d6fd71cd5b021285d Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 19 Aug 2024 20:13:20 +0200
Subject: [PATCH 212/430] Add deprecation warning for pgsql output

---
 src/command-line-parser.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index ed2fdfb6f..b5b42e109 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -183,6 +183,10 @@ 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, "

From 3d52ea83d9d1bda5f7dd84652b7bee26811922b5 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 15 Sep 2024 16:30:06 +0200
Subject: [PATCH 213/430] Add support for node processing in second stage

This is completely analog to how way processing happens in the second
stage. So from the select_relation_member() function in the Lua config
file you can now also return a list of nodes that you request to process
again.

Note that this will only re-process the member nodes themselves, ways
which have these nodes as members are not re-processed. Also there is no
way to mark member nodes of ways, only member nodes of relations. So
this will allow processing, say, stop positions in public transport route
relations but not, say, barriers on roads.

This change is now possible because we removed support for the old
middle format which didn't allow storing the complete nodes (with tags).
---
 flex-config/README.md            |   2 +
 flex-config/public-transport.lua | 224 +++++++++++++++++++++++++++++++
 src/init.lua                     |  10 ++
 src/middle-pgsql.cpp             |  52 ++++++-
 src/middle-pgsql.hpp             |   2 +
 src/middle-ram.cpp               |  10 ++
 src/middle-ram.hpp               |   2 +
 src/middle.hpp                   |  17 ++-
 src/osmdata.cpp                  |   6 +-
 src/output-flex.cpp              | 134 ++++++++++++------
 src/output-flex.hpp              |   5 +-
 src/output.hpp                   |   6 +
 12 files changed, 420 insertions(+), 50 deletions(-)
 create mode 100644 flex-config/public-transport.lua

diff --git a/flex-config/README.md b/flex-config/README.md
index 5bd85e61b..0a2b9a256 100644
--- a/flex-config/README.md
+++ b/flex-config/README.md
@@ -17,6 +17,8 @@ following order (from easiest to understand to the more complex ones):
 
 After that you can dive into more advanced topics:
 
+* [public-transport.lua](public-transport.lua) -- Use multi-stage processing
+  to bring tags from public transport relations to member nodes and ways
 * [route-relations.lua](route-relations.lua) -- Use multi-stage processing
   to bring tags from relations to member ways
 * [unitable.lua](unitable.lua) -- Put all OSM data into a single table
diff --git a/flex-config/public-transport.lua b/flex-config/public-transport.lua
new file mode 100644
index 000000000..a0b97539a
--- /dev/null
+++ b/flex-config/public-transport.lua
@@ -0,0 +1,224 @@
+-- This config example file is released into the Public Domain.
+
+-- This file shows how to use multi-stage processing to bring tags from
+-- public transport relations into member nodes and ways. This allows
+-- advanced processing of public transport networks including stops.
+
+-- Nodes tagged as public transport stops are imported into the 'stops' table,
+-- if they are part of a public transport relation. Ways tagged as highway or
+-- railway or imported into the 'lines' table. The public transport routes
+-- themselves will be in the 'routes' table, but without any geometry. As a
+-- "bonus" public transport stop area relations will be imported into the
+-- 'stop_areas' table.
+--
+-- For the 'stops' and 'lines' table two-stage processing is used. The
+-- 'rel_refs' text column will contain a list of all ref tags found in parent
+-- relations with type=route and route=public_transport. The 'rel_ids' column
+-- will be an integer array containing the relation ids. These could be used,
+-- for instance, to look up other relation tags from the 'routes' table.
+
+local tables = {}
+
+tables.stops = osm2pgsql.define_node_table('stops', {
+    { column = 'tags',     type = 'jsonb' },
+    { column = 'rel_refs', type = 'text' }, -- for the refs from the relations
+    { column = 'rel_ids',  sql_type = 'int8[]' }, -- array with integers (for relation IDs)
+    { column = 'geom',     type = 'point', not_null = true },
+})
+
+tables.lines = osm2pgsql.define_way_table('lines', {
+    { column = 'tags',     type = 'jsonb' },
+    { column = 'rel_refs', type = 'text' }, -- for the refs from the relations
+    { column = 'rel_ids',  sql_type = 'int8[]' }, -- array with integers (for relation IDs)
+    { column = 'geom',     type = 'linestring', not_null = true },
+})
+
+-- Tables don't have to have a geometry column
+tables.routes = osm2pgsql.define_relation_table('routes', {
+    { column = 'ref',  type = 'text' },
+    { column = 'type', type = 'text' },
+    { column = 'from', type = 'text' },
+    { column = 'to',   type = 'text' },
+    { column = 'tags', type = 'jsonb' },
+})
+
+-- Stop areas contain everything belonging to a specific public transport
+-- stop. We model them here by adding a center point as geometry plus the
+-- radius of a circle that contains everything in that stop.
+tables.stop_areas = osm2pgsql.define_relation_table('stop_areas', {
+    { column = 'tags',   type = 'jsonb' },
+    { column = 'radius', type = 'real', not_null = true },
+    { column = 'geom',   type = 'point', not_null = true },
+})
+
+-- This will be used to store information about relations queryable by member
+-- node/way id. These are table of tables. The outer table is indexed by the
+-- node/way id, the inner table indexed by the relation id. This way even if
+-- the information about a relation is added twice, it will be in there only
+-- once. It is always good to write your osm2pgsql Lua code in an idempotent
+-- way, i.e. it can be called any number of times and will lead to the same
+-- result.
+local n2r = {}
+local w2r = {}
+
+local function clean_tags(tags)
+    tags.odbl = nil
+    tags.created_by = nil
+    tags.source = nil
+    tags['source:ref'] = nil
+
+    return next(tags) == nil
+end
+
+local function unique_array(array)
+    local result = {}
+
+    local last = nil
+    for _, v in ipairs(array) do
+        if v ~= last then
+            result[#result + 1] = v
+            last = v
+        end
+    end
+
+    return result
+end
+
+local separator = '·' -- use middle dot as separator character
+
+local function add_rel_data(row, d)
+    if not d then
+        return
+    end
+
+    local refs = {}
+    local ids = {}
+    for rel_id, rel_ref in pairs(d) do
+        refs[#refs + 1] = rel_ref
+        ids[#ids + 1] = rel_id
+    end
+    table.sort(refs)
+    table.sort(ids)
+
+    row.rel_refs = table.concat(unique_array(refs), separator)
+    row.rel_ids = '{' .. table.concat(unique_array(ids), ',') .. '}'
+end
+
+function osm2pgsql.process_node(object)
+    -- We are only interested in public transport stops here, and they are
+    -- only available in the second stage.
+    if osm2pgsql.stage ~= 2 then
+        return
+    end
+
+    local row = {
+        tags = object.tags,
+        geom = object:as_point()
+    }
+
+    -- If there is any data from parent relations, add it in
+    add_rel_data(row, n2r[object.id])
+
+    tables.stops:insert(row)
+end
+
+function osm2pgsql.process_way(object)
+    -- We are only interested in highways and railways
+    if not object.tags.highway and not object.tags.railway then
+        return
+    end
+
+    clean_tags(object.tags)
+
+    -- Data we will store in the 'lines' table always has the tags from
+    -- the way
+    local row = {
+        tags = object.tags,
+        geom = object:as_linestring()
+    }
+
+    -- If there is any data from parent relations, add it in
+    add_rel_data(row, w2r[object.id])
+
+    tables.lines:insert(row)
+end
+
+local pt = {
+    bus = true,
+    light_rail = true,
+    subway = true,
+    tram = true,
+    trolleybus = true,
+}
+
+-- We are only interested in certain route relations with a ref tag
+local function wanted_relation(tags)
+    return tags.type == 'route' and pt[tags.route] and tags.ref
+end
+
+-- This function is called for every added, modified, or deleted relation.
+-- Its only job is to return the ids of all member nodes/ways of the specified
+-- relation we want to see in stage 2 again. It MUST NOT store any information
+-- about the relation!
+function osm2pgsql.select_relation_members(relation)
+    -- Only interested in public transport relations with refs
+    if wanted_relation(relation.tags) then
+        local node_ids = {}
+        local way_ids = {}
+
+        for _, member in ipairs(relation.members) do
+            if member.type == 'n' and member.role == 'stop' then
+                node_ids[#node_ids + 1] = member.ref
+            elseif member.type == 'w' and member.role == '' then
+                way_ids[#way_ids + 1] = member.ref
+            end
+        end
+
+        return {
+            nodes = node_ids,
+            ways = way_ids,
+        }
+    end
+end
+
+-- The process_relation() function should store all information about relation
+-- members that might be needed in stage 2.
+function osm2pgsql.process_relation(object)
+    if object.tags.type == 'public_transport' and object.tags.public_transport == 'stop_area' then
+        local x1, y1, x2, y2 = object:as_geometrycollection():transform(3857):get_bbox()
+        local radius = math.sqrt((x2-x1)*(x2-x1) + (y2-y1)*(y2-y1))
+        tables.stop_areas:insert({
+            tags = object.tags,
+            geom = object:as_geometrycollection():centroid(),
+            radius = radius,
+        })
+        return
+    end
+
+    if wanted_relation(object.tags) then
+        tables.routes:insert({
+            type = object.tags.route,
+            ref = object.tags.ref,
+            from = object.tags.from,
+            to = object.tags.to,
+            tags = object.tags,
+        })
+
+        -- Go through all the members and store relation ids and refs so they
+        -- can be found by the member node/way id.
+        for _, member in ipairs(object.members) do
+            if member.type == 'n' then
+                if not n2r[member.ref] then
+                    n2r[member.ref] = {}
+                end
+                n2r[member.ref][object.id] = object.tags.ref
+            elseif member.type == 'w' then
+                if not w2r[member.ref] then
+                    w2r[member.ref] = {}
+                end
+                w2r[member.ref][object.id] = object.tags.ref
+            end
+        end
+    end
+end
+
diff --git a/src/init.lua b/src/init.lua
index 26571cb5f..9d0c76413 100644
--- a/src/init.lua
+++ b/src/init.lua
@@ -46,6 +46,16 @@ function osm2pgsql.define_area_table(_name, _columns, _options)
     return _define_table_impl('area', _name, _columns, _options)
 end
 
+function osm2pgsql.node_member_ids(relation)
+    local ids = {}
+    for _, member in ipairs(relation.members) do
+        if member.type == 'n' then
+            ids[#ids + 1] = member.ref
+        end
+    end
+    return ids
+end
+
 function osm2pgsql.way_member_ids(relation)
     local ids = {}
     for _, member in ipairs(relation.members) do
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index 34a2ae9d3..c44b69d0d 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -691,7 +691,10 @@ INSERT INTO osm2pgsql_changed_relations
         m_db_connection.exec(build_sql(*m_options, query));
     }
 
-    load_id_list(m_db_connection, "osm2pgsql_changed_ways", parent_ways);
+    if (parent_ways) {
+        load_id_list(m_db_connection, "osm2pgsql_changed_ways", parent_ways);
+    }
+
     load_id_list(m_db_connection, "osm2pgsql_changed_relations",
                  parent_relations);
 
@@ -700,9 +703,17 @@ INSERT INTO osm2pgsql_changed_relations
     timer.stop();
 
     log_debug("Found {} new/changed nodes in input.", changed_nodes.size());
-    log_debug("  Found in {} their {} parent ways and {} parent relations.",
-              std::chrono::duration_cast<std::chrono::seconds>(timer.elapsed()),
-              parent_ways->size(), parent_relations->size());
+
+    auto const elapsed_sec =
+        std::chrono::duration_cast<std::chrono::seconds>(timer.elapsed());
+
+    if (parent_ways) {
+        log_debug("  Found in {} their {} parent ways and {} parent relations.",
+                  elapsed_sec, parent_ways->size(), parent_relations->size());
+    } else {
+        log_debug("  Found in {} their {} parent relations.", elapsed_sec,
+                  parent_relations->size());
+    }
 }
 
 void middle_pgsql_t::get_way_parents(idlist_t const &changed_ways,
@@ -771,6 +782,21 @@ void middle_pgsql_t::way_set(osmium::Way const &way)
 
 namespace {
 
+/**
+ * Build node in buffer from database results.
+ */
+void build_node(osmid_t id, pg_result_t const &res, int res_num, int offset,
+                osmium::memory::Buffer *buffer, bool with_attributes)
+{
+    osmium::builder::NodeBuilder builder{*buffer};
+    builder.set_id(id);
+
+    if (with_attributes) {
+        set_attributes_on_builder(&builder, res, res_num, offset);
+    }
+    pgsql_parse_json_tags(res.get_value(res_num, offset + 1), buffer, &builder);
+}
+
 /**
  * Build way in buffer from database results.
  */
@@ -789,6 +815,24 @@ void build_way(osmid_t id, pg_result_t const &res, int res_num, int offset,
 
 } // anonymous namespace
 
+bool middle_query_pgsql_t::node_get(osmid_t id,
+                                    osmium::memory::Buffer *buffer) const
+{
+    assert(buffer);
+
+    auto const res = m_db_connection.exec_prepared("get_node", id);
+
+    if (res.num_tuples() != 1) {
+        return false;
+    }
+
+    build_node(id, res, 0, 0, buffer, m_store_options.with_attributes);
+
+    buffer->commit();
+
+    return true;
+}
+
 bool middle_query_pgsql_t::way_get(osmid_t id,
                                    osmium::memory::Buffer *buffer) const
 {
diff --git a/src/middle-pgsql.hpp b/src/middle-pgsql.hpp
index fc01f2ebc..4c7dd9218 100644
--- a/src/middle-pgsql.hpp
+++ b/src/middle-pgsql.hpp
@@ -59,6 +59,8 @@ class middle_query_pgsql_t : public middle_query_t
 
     size_t nodes_get_list(osmium::WayNodeList *nodes) const override;
 
+    bool node_get(osmid_t id, osmium::memory::Buffer *buffer) const override;
+
     bool way_get(osmid_t id, osmium::memory::Buffer *buffer) const override;
 
     size_t rel_members_get(osmium::Relation const &rel,
diff --git a/src/middle-ram.cpp b/src/middle-ram.cpp
index 13c3d96eb..74e1e44fb 100644
--- a/src/middle-ram.cpp
+++ b/src/middle-ram.cpp
@@ -278,6 +278,16 @@ std::size_t middle_ram_t::nodes_get_list(osmium::WayNodeList *nodes) const
     return count;
 }
 
+bool middle_ram_t::node_get(osmid_t id, osmium::memory::Buffer *buffer) const
+{
+    assert(buffer);
+
+    if (m_store_options.nodes) {
+        return get_object(osmium::item_type::node, id, buffer);
+    }
+    return false;
+}
+
 bool middle_ram_t::way_get(osmid_t id, osmium::memory::Buffer *buffer) const
 {
     assert(buffer);
diff --git a/src/middle-ram.hpp b/src/middle-ram.hpp
index 935491012..6fe5924a2 100644
--- a/src/middle-ram.hpp
+++ b/src/middle-ram.hpp
@@ -68,6 +68,8 @@ class middle_ram_t : public middle_t, public middle_query_t
 
     std::size_t nodes_get_list(osmium::WayNodeList *nodes) const override;
 
+    bool node_get(osmid_t id, osmium::memory::Buffer *buffer) const override;
+
     bool way_get(osmid_t id, osmium::memory::Buffer *buffer) const override;
 
     size_t rel_members_get(osmium::Relation const &rel,
diff --git a/src/middle.hpp b/src/middle.hpp
index 4b3499735..82a71fe92 100644
--- a/src/middle.hpp
+++ b/src/middle.hpp
@@ -50,11 +50,22 @@ struct middle_query_t : std::enable_shared_from_this<middle_query_t>
      */
     virtual size_t nodes_get_list(osmium::WayNodeList *nodes) const = 0;
 
+    /**
+     * Retrieves a single node from the nodes storage
+     * and stores it in the given osmium buffer.
+     *
+     * \param id     id of the node to retrieve
+     * \param buffer osmium buffer where to put the node
+     *
+     * \return true if the node was retrieved
+     */
+    virtual bool node_get(osmid_t id, osmium::memory::Buffer *buffer) const = 0;
+
     /**
      * Retrieves a single way from the ways storage
      * and stores it in the given osmium buffer.
      *
-     * \param id     id of the way to retrive
+     * \param id     id of the way to retrieve
      * \param buffer osmium buffer where to put the way
      *
      * The function does not retrieve the node locations.
@@ -78,10 +89,10 @@ struct middle_query_t : std::enable_shared_from_this<middle_query_t>
                     osmium::osm_entity_bits::type types) const = 0;
 
     /**
-     * Retrives a single relation from the relation storage
+     * Retrieves a single relation from the relation storage
      * and stores it in the given osmium buffer.
      *
-     * \param id     id of the relation to retrive
+     * \param id     id of the relation to retrieve
      * \param buffer osmium buffer where to put the relation
      *
      * \return true if the relation was retrieved
diff --git a/src/osmdata.cpp b/src/osmdata.cpp
index 06aaf4bdf..3ced9ed31 100644
--- a/src/osmdata.cpp
+++ b/src/osmdata.cpp
@@ -413,13 +413,15 @@ void osmdata_t::process_dependents()
     }
 
     // stage 1c processing: mark parent relations of marked objects as changed
+    auto const &marked_nodes = m_output->get_marked_node_ids();
     auto const &marked_ways = m_output->get_marked_way_ids();
-    if (marked_ways.empty()) {
+    if (marked_nodes.empty() && marked_ways.empty()) {
         return;
     }
 
-    // process parent relations of marked ways
+    // process parent relations of marked nodes and ways
     idlist_t rels_pending_tracker{};
+    m_mid->get_node_parents(marked_nodes, nullptr, &rels_pending_tracker);
     m_mid->get_way_parents(marked_ways, &rels_pending_tracker);
 
     if (rels_pending_tracker.empty()) {
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index e059d73a3..003a59718 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -899,6 +899,54 @@ void output_flex_t::pending_way(osmid_t id)
     get_mutex_and_call_lua_function(m_process_way, m_way_cache.get());
 }
 
+/**
+ * Expects a Lua (hash) table on the stack, reads the field with name of the
+ * 'type' parameter which must be either nil or a Lua (array) table, in which
+ * case all (integer) ids in that table are reads into the 'ids' out
+ * parameter.
+ */
+void get_object_ids(lua_State *lua_state, char const *const type, idlist_t *ids)
+{
+    lua_getfield(lua_state, -1, type);
+    int const ltype = lua_type(lua_state, -1);
+
+    if (ltype == LUA_TNIL) {
+        lua_pop(lua_state, 1);
+        return;
+    }
+
+    if (ltype != LUA_TTABLE) {
+        lua_pop(lua_state, 1);
+        throw fmt_error(
+            "Table returned from select_relation_members() contains '{}' "
+            "field, but it isn't an array table.",
+            type);
+    }
+
+    if (!luaX_is_array(lua_state)) {
+        lua_pop(lua_state, 1);
+        throw fmt_error(
+            "Table returned from select_relation_members() contains '{}' "
+            "field, but it isn't an array table.",
+            type);
+    }
+
+    luaX_for_each(lua_state, [&]() {
+        osmid_t const id = lua_tointeger(lua_state, -1);
+        if (id == 0) {
+            throw fmt_error(
+                "Table returned from select_relation_members() contains "
+                "'{}' field, which must contain an array of non-zero "
+                "integer node ids.",
+                type);
+        }
+
+        ids->push_back(id);
+    });
+
+    lua_pop(lua_state, 1);
+}
+
 void output_flex_t::select_relation_members()
 {
     if (!m_select_relation_members) {
@@ -921,43 +969,13 @@ void output_flex_t::select_relation_members()
                                  "other than nil or a table."};
     }
 
-    // We have established that we have a table. Get the 'ways' field...
-    lua_getfield(lua_state(), -1, "ways");
-    int const ltype = lua_type(lua_state(), -1);
+    // We have established that we have a table...
 
-    // No 'ways' field, that is okay, nothing to be marked.
-    if (ltype == LUA_TNIL) {
-        lua_pop(lua_state(), 2); // return value (a table), ways field (nil)
-        return;
-    }
+    // Get the 'nodes' and 'ways' fields...
+    get_object_ids(lua_state(), "nodes", m_stage2_node_ids.get());
+    get_object_ids(lua_state(), "ways", m_stage2_way_ids.get());
 
-    if (ltype != LUA_TTABLE) {
-        throw std::runtime_error{
-            "Table returned from select_relation_members() contains 'ways' "
-            "field, but it isn't an array table."};
-    }
-
-    // Iterate over the 'ways' table to get all ids...
-    if (!luaX_is_array(lua_state())) {
-        throw std::runtime_error{
-            "Table returned from select_relation_members() contains 'ways' "
-            "field, but it isn't an array table."};
-    }
-
-    luaX_for_each(
-        lua_state(), [&]() {
-            osmid_t const id = lua_tointeger(lua_state(), -1);
-            if (id == 0) {
-                throw std::runtime_error{
-                    "Table returned from select_relation_members() contains "
-                    "'ways' field, which must contain an array of non-zero "
-                    "integer way ids."};
-            }
-
-            m_stage2_way_ids->push_back(id);
-        });
-
-    lua_pop(lua_state(), 2); // return value (a table), ways field (a table)
+    lua_pop(lua_state(), 1); // return value (a table)
 }
 
 void output_flex_t::select_relation_members(osmid_t id)
@@ -1261,8 +1279,9 @@ output_flex_t::output_flex_t(std::shared_ptr<middle_query_t> const &mid,
 
     // If the osm2pgsql.select_relation_members() Lua function is defined
     // it means we need two-stage processing which in turn means we need
-    // the full ways stored in the middle.
+    // the full nodes and ways stored in the middle.
     if (m_select_relation_members) {
+        access_requirements().full_nodes = true;
         access_requirements().full_ways = true;
     }
 
@@ -1482,10 +1501,23 @@ void output_flex_t::init_lua(std::string const &filename,
     lua_remove(lua_state(), 1); // global "osm2pgsql"
 }
 
+idlist_t const &output_flex_t::get_marked_node_ids()
+{
+    if (m_stage2_node_ids->empty()) {
+        log_info("Skipping stage 1c for nodes (no marked nodes).");
+    } else {
+        log_info("Entering stage 1c processing of {} nodes...",
+                 m_stage2_node_ids->size());
+        m_stage2_node_ids->sort_unique();
+    }
+
+    return *m_stage2_node_ids;
+}
+
 idlist_t const &output_flex_t::get_marked_way_ids()
 {
     if (m_stage2_way_ids->empty()) {
-        log_info("Skipping stage 1c (no marked ways).");
+        log_info("Skipping stage 1c for ways (no marked ways).");
     } else {
         log_info("Entering stage 1c processing of {} ways...",
                  m_stage2_way_ids->size());
@@ -1497,12 +1529,12 @@ idlist_t const &output_flex_t::get_marked_way_ids()
 
 void output_flex_t::reprocess_marked()
 {
-    if (m_stage2_way_ids->empty()) {
-        log_info("No marked ways (Skipping stage 2).");
+    if (m_stage2_node_ids->empty() && m_stage2_way_ids->empty()) {
+        log_info("No marked nodes or ways (Skipping stage 2).");
         return;
     }
 
-    log_info("Reprocess marked ways (stage 2)...");
+    log_info("Reprocess marked nodes/ways (stage 2)...");
 
     if (!get_options()->append) {
         util::timer_t timer;
@@ -1528,8 +1560,30 @@ void output_flex_t::reprocess_marked()
     lua_setfield(lua_state(), -2, "stage");
     lua_pop(lua_state(), 1); // osm2pgsql
 
+    m_stage2_node_ids->sort_unique();
     m_stage2_way_ids->sort_unique();
 
+    log_info("There are {} nodes to reprocess...", m_stage2_node_ids->size());
+    {
+        osmium::memory::Buffer node_buffer{
+            1024, osmium::memory::Buffer::auto_grow::yes};
+
+        for (osmid_t const id : *m_stage2_node_ids) {
+            if (middle().node_get(id, &node_buffer)) {
+                node_delete(id);
+                if (m_process_node) {
+                    auto const &node = node_buffer.get<osmium::Node>(0);
+                    m_context_node = &node;
+                    get_mutex_and_call_lua_function(m_process_node, node);
+                }
+            }
+            node_buffer.clear();
+        }
+    }
+
+    // We don't need these any more so can free the memory.
+    m_stage2_node_ids->clear();
+
     log_info("There are {} ways to reprocess...", m_stage2_way_ids->size());
 
     for (osmid_t const id : *m_stage2_way_ids) {
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index 9a4ad92ff..f5191d0ce 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -127,7 +127,9 @@ class output_flex_t : public output_t
 
     void wait() override;
 
+    idlist_t const &get_marked_node_ids() override;
     idlist_t const &get_marked_way_ids() override;
+
     void reprocess_marked() override;
 
     void pending_way(osmid_t id) override;
@@ -280,8 +282,9 @@ class output_flex_t : public output_t
     /// The connection to the database server.
     pg_conn_t m_db_connection;
 
-    // This is shared between all clones of the output and must only be
+    // These are shared between all clones of the output and must only be
     // accessed while protected using the lua_mutex.
+    std::shared_ptr<idlist_t> m_stage2_node_ids = std::make_shared<idlist_t>();
     std::shared_ptr<idlist_t> m_stage2_way_ids = std::make_shared<idlist_t>();
 
     std::shared_ptr<db_copy_thread_t> m_copy_thread;
diff --git a/src/output.hpp b/src/output.hpp
index ac807e425..f32107d95 100644
--- a/src/output.hpp
+++ b/src/output.hpp
@@ -70,6 +70,12 @@ class output_t
 
     virtual void wait() {}
 
+    virtual idlist_t const &get_marked_node_ids()
+    {
+        static idlist_t const ids{};
+        return ids;
+    }
+
     virtual idlist_t const &get_marked_way_ids()
     {
         static idlist_t const ids{};

From 98d6df0514830b9754c85798409b7119fac259e9 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 19 Sep 2024 09:18:24 +0200
Subject: [PATCH 214/430] 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<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;

From 103c289fbb74e1565d8169b0ac44c6c07153eccf Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 19 Sep 2024 11:08:37 +0200
Subject: [PATCH 215/430] 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 }}

From 7609e0eab385bbbf9c014a880bb20885a4bde447 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 19 Sep 2024 15:10:47 +0200
Subject: [PATCH 216/430] prepare release 2.0.0

---
 CMakeLists.txt              |  2 +-
 man/osm2pgsql-gen.1         |  2 +-
 man/osm2pgsql-replication.1 |  2 +-
 man/osm2pgsql.1             | 29 ++++++++++-------------------
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c73bf341..3f0f18303 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 cmake_minimum_required(VERSION 3.8.0)
 
-project(osm2pgsql VERSION 1.11.0 LANGUAGES CXX C)
+project(osm2pgsql VERSION 2.0.0 LANGUAGES CXX C)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
diff --git a/man/osm2pgsql-gen.1 b/man/osm2pgsql-gen.1
index 52727aee5..c3750eca0 100644
--- a/man/osm2pgsql-gen.1
+++ b/man/osm2pgsql-gen.1
@@ -1,4 +1,4 @@
-.TH "OSM2PGSQL" "1" "1.11.0" "" ""
+.TH "OSM2PGSQL" "1" "2.0.0" "" ""
 .SH NAME
 .PP
 osm2pgsql-gen - Generalize OpenStreetMap data - EXPERIMENTAL!
diff --git a/man/osm2pgsql-replication.1 b/man/osm2pgsql-replication.1
index 311bb56cc..6e93af746 100644
--- a/man/osm2pgsql-replication.1
+++ b/man/osm2pgsql-replication.1
@@ -1,4 +1,4 @@
-.TH "OSM2PGSQL-REPLICATION" "1" "1.11.0" "" ""
+.TH "OSM2PGSQL-REPLICATION" "1" "2.0.0" "" ""
 .SH NAME
 osm2pgsql-replication \- osm2pgsql database updater
 .SH SYNOPSIS
diff --git a/man/osm2pgsql.1 b/man/osm2pgsql.1
index 824626e8a..1680d325f 100644
--- a/man/osm2pgsql.1
+++ b/man/osm2pgsql.1
@@ -1,4 +1,4 @@
-.TH "OSM2PGSQL" "1" "1.11.0" "" ""
+.TH "OSM2PGSQL" "1" "2.0.0" "" ""
 .SH NAME
 .PP
 osm2pgsql - OpenStreetMap data to PostgreSQL converter
@@ -170,17 +170,12 @@ Include attributes of each object in the middle tables and make them
 available to the outputs.
 Attributes are: user name, user id, changeset id, timestamp and version.
 .TP
---flat-nodes=FILENAME
-The flat-nodes mode is a separate method to store slim mode node
-information on disk.
-Instead of storing this information in the main PostgreSQL database,
-this mode creates its own separate custom database to store the
-information.
-As this custom database has application level knowledge about the data
-to store and is not general purpose, it can store the data much more
-efficiently.
+-F, --flat-nodes=FILENAME
+Use a file on disk to store node locations instead of storing them in
+memory (in non-slim mode) or in the database (in slim mode).
+This is much more efficient than storing the data in the database.
 Storing the node information for the full planet requires more than
-300GB in PostgreSQL, the same data is stored in \[lq]only\[rq] 50GB
+500GB in PostgreSQL, the same data is stored in \[lq]only\[rq] 90GB
 using the flat-nodes mode.
 This can also increase the speed of applying diff files.
 This option activates the flat-nodes mode and specifies the location of
@@ -189,6 +184,8 @@ It is a single large file.
 This mode is only recommended for full planet imports as it doesn\[cq]t
 work well with small imports.
 The default is disabled.
+The file will stay on disk after import, use --drop to remove it (but
+you can\[cq]t do updates then).
 .TP
 --middle-schema=SCHEMA
 Use PostgreSQL schema SCHEMA for all tables, indexes, and functions in
@@ -198,15 +195,9 @@ user.
 By default the schema set with \f[V]--schema\f[R] is used, or
 \f[V]public\f[R] if that is not set.
 .TP
---middle-way-node-index-id-shift=SHIFT
-Set ID shift for way node bucket index in middle.
-Experts only.
-See documentation for details.
-.TP
 --middle-with-nodes
-Used together with the \f[B]new\f[R] middle database format when a flat
-nodes file is used to force storing nodes with tags in the database,
-too.
+When a flat nodes file is used, nodes are not stored in the database.
+Use this option to force storing nodes with tags in the database, too.
 .SH OUTPUT OPTIONS
 .TP
 -O, --output=OUTPUT

From b30d7e2e1b0e2ff972ffa2007e5e16980a1b3cd1 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 30 Sep 2024 17:33:51 +0200
Subject: [PATCH 217/430] properly forward schema parameters from replication
 script

---
 scripts/osm2pgsql-replication | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/scripts/osm2pgsql-replication b/scripts/osm2pgsql-replication
index da9aae72e..13d4d425e 100755
--- a/scripts/osm2pgsql-replication
+++ b/scripts/osm2pgsql-replication
@@ -111,8 +111,8 @@ class DBError(Exception):
 
 class DBConnection:
 
-    def __init__(self, args):
-        self.schema = args.middle_schema
+    def __init__(self, schema, args):
+        self.schema = schema
 
         # If dbname looks like a conninfo string use it as such
         if args.database and any(part in args.database for part in ['=', '://']):
@@ -535,8 +535,10 @@ def update(props, args):
 
     osm2pgsql = [args.osm2pgsql_cmd, '--append', '--slim', '--prefix', args.prefix]
     osm2pgsql.extend(args.extra_params)
-    if args.middle_schema != 'public':
+    if args.middle_schema:
         osm2pgsql.extend(('--middle-schema', args.middle_schema))
+    if args.schema:
+        osm2pgsql.extend(('--schema', args.schema))
     if args.database:
         osm2pgsql.extend(('-d', args.database))
     if args.username:
@@ -717,16 +719,16 @@ def main(prog_args=None):
                         datefmt='%Y-%m-%d %H:%M:%S',
                         level=max(4 - args.verbose, 1) * 10)
 
-    args.middle_schema = args.middle_schema or args.schema or 'public'
+    prop_table_schema = args.middle_schema or args.schema or 'public'
 
-    with DBConnection(args) as db:
+    with DBConnection(prop_table_schema, args) as db:
         if db.table_exists(Osm2pgsqlProperties.PROP_TABLE_NAME):
             props = Osm2pgsqlProperties(db)
         else:
             props = LegacyProperties(db, args.prefix)
 
         if not props.is_updatable:
-            LOG.fatal(f'osm2pgsql middle table "{args.middle_schema}.{args.prefix}_ways" not found in database "{db.name}". '
+            LOG.fatal(f'osm2pgsql middle table "{prop_table_schema}.{args.prefix}_ways" not found in database "{db.name}". '
                        'Database needs to be imported in --slim mode.')
             return 1
 

From 9b16c438c19df1777f5b87434b6f7456cecd68de Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 30 Sep 2024 19:35:57 +0200
Subject: [PATCH 218/430] add tests for replication with schema use

---
 .../command-line/replication_schema.feature   | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 tests/bdd/command-line/replication_schema.feature

diff --git a/tests/bdd/command-line/replication_schema.feature b/tests/bdd/command-line/replication_schema.feature
new file mode 100644
index 000000000..4de8f9934
--- /dev/null
+++ b/tests/bdd/command-line/replication_schema.feature
@@ -0,0 +1,68 @@
+Feature: Tests for the osm2pgsql-replication script with schemas
+
+    Scenario: Replication updates work on database with schema
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the database schema foobar
+        And the replication service at http://example.com/europe/liechtenstein-updates
+            | sequence | timestamp            |
+            | 9999999  | 2013-08-01T01:00:02Z |
+            | 10000000 | 2013-09-01T01:00:00Z |
+            | 10000001 | 2013-10-01T01:00:00Z |
+        When running osm2pgsql pgsql with parameters
+            | --slim | --schema | foobar |
+        And running osm2pgsql-replication
+            | init | --schema | foobar |
+        And running osm2pgsql-replication
+            | update | --schema | foobar |
+
+        Then table foobar.osm2pgsql_properties contains
+            | property                    | value                                           |
+            | replication_base_url        | http://example.com/europe/liechtenstein-updates |
+            | replication_sequence_number | 10000001                                        |
+            | replication_timestamp       | 2013-10-01T01:00:00Z                            |
+
+
+    Scenario: Replication updates work on database with different middle schema
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the database schema foobar
+        And the replication service at http://example.com/europe/liechtenstein-updates
+            | sequence | timestamp            |
+            | 9999999  | 2013-08-01T01:00:02Z |
+            | 10000000 | 2013-09-01T01:00:00Z |
+            | 10000001 | 2013-10-01T01:00:00Z |
+        When running osm2pgsql pgsql with parameters
+            | --slim | --middle-schema | foobar |
+        And running osm2pgsql-replication
+            | init | --middle-schema | foobar |
+        And running osm2pgsql-replication
+            | update | --middle-schema | foobar |
+
+        Then table foobar.osm2pgsql_properties contains
+            | property                    | value                                           |
+            | replication_base_url        | http://example.com/europe/liechtenstein-updates |
+            | replication_sequence_number | 10000001                                        |
+            | replication_timestamp       | 2013-10-01T01:00:00Z                            |
+
+
+    Scenario: Replication updates work on database with middle schema different from schema
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the database schema foobar
+        And the database schema baz
+        And the replication service at http://example.com/europe/liechtenstein-updates
+            | sequence | timestamp            |
+            | 9999999  | 2013-08-01T01:00:02Z |
+            | 10000000 | 2013-09-01T01:00:00Z |
+            | 10000001 | 2013-10-01T01:00:00Z |
+        When running osm2pgsql pgsql with parameters
+            | --slim | --middle-schema | foobar | --schema | baz |
+        And running osm2pgsql-replication
+            | init | --middle-schema | foobar | --schema | baz |
+        And running osm2pgsql-replication
+            | update | --middle-schema | foobar | --schema | baz |
+
+        Then table foobar.osm2pgsql_properties contains
+            | property                    | value                                           |
+            | replication_base_url        | http://example.com/europe/liechtenstein-updates |
+            | replication_sequence_number | 10000001                                        |
+            | replication_timestamp       | 2013-10-01T01:00:00Z                            |
+

From a3a21a2b3678a4ba106db2deb7176a336f48e2c8 Mon Sep 17 00:00:00 2001
From: Falko Galperin <falko1@uni-bremen.de>
Date: Wed, 2 Oct 2024 22:21:19 +0200
Subject: [PATCH 219/430] Properly set schema for osm2pgsql_find_changed_ways()

---
 src/middle-pgsql.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index c44b69d0d..0f075dde9 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -659,7 +659,7 @@ void middle_pgsql_t::get_node_parents(idlist_t const &changed_nodes,
     // better to do a full table scan which totally destroys performance.
     // This is due to the PostgreSQL statistics on ARRAYs being way off.
     queries.emplace_back(R"(
-CREATE OR REPLACE FUNCTION osm2pgsql_find_changed_ways() RETURNS void AS $$
+CREATE OR REPLACE FUNCTION {schema}osm2pgsql_find_changed_ways() RETURNS void AS $$
 DECLARE
   changed_buckets RECORD;
 BEGIN
@@ -677,8 +677,8 @@ BEGIN
 END;
 $$ LANGUAGE plpgsql
 )");
-    queries.emplace_back("SELECT osm2pgsql_find_changed_ways()");
-    queries.emplace_back("DROP FUNCTION osm2pgsql_find_changed_ways()");
+    queries.emplace_back("SELECT {schema}osm2pgsql_find_changed_ways()");
+    queries.emplace_back("DROP FUNCTION {schema}osm2pgsql_find_changed_ways()");
 
     queries.emplace_back(R"(
 INSERT INTO osm2pgsql_changed_relations

From cd17e6be4896fefbde9e4ae1ffe12df6f740fa4f Mon Sep 17 00:00:00 2001
From: Falko Galperin <falko1@uni-bremen.de>
Date: Wed, 2 Oct 2024 22:22:05 +0200
Subject: [PATCH 220/430] Add tests to make sure no schema except specified one
 is touched

---
 src/pgsql-params.hpp              |   7 ++
 tests/common-import.hpp           |   4 +-
 tests/common-options.hpp          |  15 +++
 tests/test-output-flex-update.cpp | 155 ++++++++++++++++++++----------
 4 files changed, 127 insertions(+), 54 deletions(-)

diff --git a/src/pgsql-params.hpp b/src/pgsql-params.hpp
index fd0230d96..50cdf00f0 100644
--- a/src/pgsql-params.hpp
+++ b/src/pgsql-params.hpp
@@ -34,6 +34,13 @@ class connection_params_t
 
     auto end() const noexcept { return m_params.end(); }
 
+    void merge_with(connection_params_t const &other)
+    {
+        for (auto const &p : other.m_params) {
+            m_params[p.first] = p.second;
+        }
+    }
+
 private:
     std::map<std::string, std::string> m_params;
 
diff --git a/tests/common-import.hpp b/tests/common-import.hpp
index 8cdfe0403..3f1a0df54 100644
--- a/tests/common-import.hpp
+++ b/tests/common-import.hpp
@@ -131,7 +131,7 @@ class import_t
                     std::initializer_list<std::string> input_data,
                     std::string const &format = "opl")
     {
-        options.connection_params = m_db.connection_params();
+        options.connection_params.merge_with(m_db.connection_params());
 
         properties_t const properties{options.connection_params,
                                       options.middle_dbschema};
@@ -165,7 +165,7 @@ class import_t
 
     void run_file(options_t options, char const *file = nullptr)
     {
-        options.connection_params = m_db.connection_params();
+        options.connection_params.merge_with(m_db.connection_params());
 
         properties_t const properties{options.connection_params,
                                       options.middle_dbschema};
diff --git a/tests/common-options.hpp b/tests/common-options.hpp
index adcc0bef3..d58c6d74b 100644
--- a/tests/common-options.hpp
+++ b/tests/common-options.hpp
@@ -89,6 +89,21 @@ class opt_t
         return *this;
     }
 
+    opt_t &schema(char const *schema_name)
+    {
+        m_opt.dbschema = schema_name;
+        m_opt.middle_dbschema = schema_name;
+        m_opt.output_dbschema = schema_name;
+        return *this;
+    }
+
+    opt_t &user(char const *user, char const *password)
+    {
+        m_opt.connection_params.set("user", user);
+        m_opt.connection_params.set("password", password);
+        return *this;
+    }
+
 private:
     options_t m_opt;
 };
diff --git a/tests/test-output-flex-update.cpp b/tests/test-output-flex-update.cpp
index 2b111ec1a..d44c3371c 100644
--- a/tests/test-output-flex-update.cpp
+++ b/tests/test-output-flex-update.cpp
@@ -11,6 +11,7 @@
 
 #include "common-import.hpp"
 #include "common-options.hpp"
+#include "common-pg.hpp"
 
 namespace {
 
@@ -38,8 +39,50 @@ struct options_slim_expire
     }
 };
 
+struct options_slim_schema
+{
+    static options_t options()
+    {
+        auto conn = db.db().connect();
+        // Create limited user (if it doesn't exist yet),
+        // which we need to test that the public schema won't be touched.
+        // If the public schema is tried to be modified at any point, this user won't have the
+        // necessary permissions, and hence the test will fail.
+        conn.exec(R"(
+DO
+$$
+BEGIN
+   IF NOT EXISTS (SELECT FROM pg_catalog.pg_roles WHERE rolname = 'limited') THEN
+      CREATE ROLE limited LOGIN PASSWORD 'password_limited';
+   END IF;
+END
+$$;
+                  )");
+        conn.exec("REVOKE ALL PRIVILEGES ON ALL TABLES IN SCHEMA public FROM "
+                  "PUBLIC, limited;");
+        conn.exec("REVOKE CREATE ON SCHEMA public FROM PUBLIC, limited;");
+        conn.exec(
+            "CREATE SCHEMA IF NOT EXISTS myschema AUTHORIZATION limited;");
+        conn.close();
+        return testing::opt_t()
+            .slim()
+            .flex(conf_file)
+            .schema("myschema")
+            .user("limited", "password_limited");
+    }
+};
+
+// Return a string with the schema name prepended to the table name.
+std::string with_schema(char const *table_name, options_t const &options)
+{
+    if (options.dbschema.empty()) {
+        return {table_name};
+    }
+    return options.dbschema + "." + table_name;
+}
+
 TEMPLATE_TEST_CASE("updating a node", "", options_slim_default,
-                   options_slim_expire)
+                   options_slim_expire, options_slim_schema)
 {
     options_t options = TestType::options();
 
@@ -48,16 +91,16 @@ TEMPLATE_TEST_CASE("updating a node", "", options_slim_default,
 
     auto conn = db.db().connect();
 
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_point"));
+    REQUIRE(0 == conn.get_count(with_schema("osm2pgsql_test_point", options)));
 
     // give the node a tag...
     options.append = true;
     REQUIRE_NOTHROW(
         db.run_import(options, "n10 v2 dV x10 y10 Tamenity=restaurant\n"));
 
-    REQUIRE(1 == conn.get_count("osm2pgsql_test_point"));
+    REQUIRE(1 == conn.get_count(with_schema("osm2pgsql_test_point", options)));
     REQUIRE(1 ==
-            conn.get_count("osm2pgsql_test_point",
+            conn.get_count(with_schema("osm2pgsql_test_point", options),
                            "node_id = 10 AND tags->'amenity' = 'restaurant'"));
 
     SECTION("remove the tag from node")
@@ -70,11 +113,11 @@ TEMPLATE_TEST_CASE("updating a node", "", options_slim_default,
         REQUIRE_NOTHROW(db.run_import(options, "n10 v3 dD\n"));
     }
 
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_point"));
+    REQUIRE(0 == conn.get_count(with_schema("osm2pgsql_test_point", options)));
 }
 
 TEMPLATE_TEST_CASE("updating a way", "", options_slim_default,
-                   options_slim_expire)
+                   options_slim_expire, options_slim_schema)
 {
     options_t options = TestType::options();
 
@@ -86,9 +129,9 @@ TEMPLATE_TEST_CASE("updating a way", "", options_slim_default,
 
     auto conn = db.db().connect();
 
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_point"));
-    REQUIRE(1 == conn.get_count("osm2pgsql_test_line"));
-    REQUIRE(1 == conn.get_count("osm2pgsql_test_line",
+    REQUIRE(0 == conn.get_count(with_schema("osm2pgsql_test_point", options)));
+    REQUIRE(1 == conn.get_count(with_schema("osm2pgsql_test_line", options)));
+    REQUIRE(1 == conn.get_count(with_schema("osm2pgsql_test_line", options),
                                 "osm_id = 20 AND tags->'highway' = 'primary' "
                                 "AND ST_NumPoints(geom) = 2"));
 
@@ -97,18 +140,18 @@ TEMPLATE_TEST_CASE("updating a way", "", options_slim_default,
     REQUIRE_NOTHROW(
         db.run_import(options, "w20 v2 dV Thighway=secondary Nn10,n11\n"));
 
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_point"));
-    REQUIRE(1 == conn.get_count("osm2pgsql_test_line"));
-    REQUIRE(1 == conn.get_count("osm2pgsql_test_line",
+    REQUIRE(0 == conn.get_count(with_schema("osm2pgsql_test_point", options)));
+    REQUIRE(1 == conn.get_count(with_schema("osm2pgsql_test_line", options)));
+    REQUIRE(1 == conn.get_count(with_schema("osm2pgsql_test_line", options),
                                 "osm_id = 20 AND tags->'highway' = "
                                 "'secondary' AND ST_NumPoints(geom) = 2"));
 
     // now change a node in the way...
     REQUIRE_NOTHROW(db.run_import(options, "n10 v2 dV x10.0 y10.3\n"));
 
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_point"));
-    REQUIRE(1 == conn.get_count("osm2pgsql_test_line"));
-    REQUIRE(1 == conn.get_count("osm2pgsql_test_line",
+    REQUIRE(0 == conn.get_count(with_schema("osm2pgsql_test_point", options)));
+    REQUIRE(1 == conn.get_count(with_schema("osm2pgsql_test_line", options)));
+    REQUIRE(1 == conn.get_count(with_schema("osm2pgsql_test_line", options),
                                 "osm_id = 20 AND tags->'highway' = "
                                 "'secondary' AND ST_NumPoints(geom) = 2"));
 
@@ -117,21 +160,21 @@ TEMPLATE_TEST_CASE("updating a way", "", options_slim_default,
         options, "n12 v1 dV x10.2 y10.1\n"
                  "w20 v3 dV Thighway=residential Nn10,n11,n12\n"));
 
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_point"));
-    REQUIRE(1 == conn.get_count("osm2pgsql_test_line"));
-    REQUIRE(1 == conn.get_count("osm2pgsql_test_line",
+    REQUIRE(0 == conn.get_count(with_schema("osm2pgsql_test_point", options)));
+    REQUIRE(1 == conn.get_count(with_schema("osm2pgsql_test_line", options)));
+    REQUIRE(1 == conn.get_count(with_schema("osm2pgsql_test_line", options),
                                 "osm_id = 20 AND tags->'highway' = "
                                 "'residential' AND ST_NumPoints(geom) = 3"));
 
     // now delete the way...
     REQUIRE_NOTHROW(db.run_import(options, "w20 v4 dD\n"));
 
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_point"));
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_line"));
+    REQUIRE(0 == conn.get_count(with_schema("osm2pgsql_test_point", options)));
+    REQUIRE(0 == conn.get_count(with_schema("osm2pgsql_test_line", options)));
 }
 
 TEMPLATE_TEST_CASE("ways as linestrings and polygons", "", options_slim_default,
-                   options_slim_expire)
+                   options_slim_expire, options_slim_schema)
 {
     options_t options = TestType::options();
 
@@ -145,10 +188,11 @@ TEMPLATE_TEST_CASE("ways as linestrings and polygons", "", options_slim_default,
 
     auto conn = db.db().connect();
 
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_point"));
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_line"));
-    REQUIRE(1 == conn.get_count("osm2pgsql_test_polygon"));
-    REQUIRE(1 == conn.get_count("osm2pgsql_test_polygon",
+    REQUIRE(0 == conn.get_count(with_schema("osm2pgsql_test_point", options)));
+    REQUIRE(0 == conn.get_count(with_schema("osm2pgsql_test_line", options)));
+    REQUIRE(1 ==
+            conn.get_count(with_schema("osm2pgsql_test_polygon", options)));
+    REQUIRE(1 == conn.get_count(with_schema("osm2pgsql_test_polygon", options),
                                 "osm_id = 20 AND tags->'building' = 'yes' AND "
                                 "ST_GeometryType(geom) = 'ST_Polygon'"));
 
@@ -157,48 +201,52 @@ TEMPLATE_TEST_CASE("ways as linestrings and polygons", "", options_slim_default,
     REQUIRE_NOTHROW(db.run_import(
         options, "w20 v2 dV Thighway=secondary Nn10,n11,n12,n13,n10\n"));
 
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_point"));
-    REQUIRE(1 == conn.get_count("osm2pgsql_test_line"));
+    REQUIRE(0 == conn.get_count(with_schema("osm2pgsql_test_point", options)));
+    REQUIRE(1 == conn.get_count(with_schema("osm2pgsql_test_line", options)));
     REQUIRE(1 ==
-            conn.get_count("osm2pgsql_test_line",
+            conn.get_count(with_schema("osm2pgsql_test_line", options),
                            "osm_id = 20 AND tags->'highway' = 'secondary' AND "
                            "ST_GeometryType(geom) = 'ST_LineString'"));
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_polygon"));
+    REQUIRE(0 ==
+            conn.get_count(with_schema("osm2pgsql_test_polygon", options)));
 
     // now remove a node from the way...
     REQUIRE_NOTHROW(db.run_import(
         options, "w20 v3 dV Thighway=secondary Nn10,n11,n12,n13\n"));
 
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_point"));
-    REQUIRE(1 == conn.get_count("osm2pgsql_test_line"));
+    REQUIRE(0 == conn.get_count(with_schema("osm2pgsql_test_point", options)));
+    REQUIRE(1 == conn.get_count(with_schema("osm2pgsql_test_line", options)));
     REQUIRE(1 ==
-            conn.get_count("osm2pgsql_test_line",
+            conn.get_count(with_schema("osm2pgsql_test_line", options),
                            "osm_id = 20 AND tags->'highway' = 'secondary' AND "
                            "ST_GeometryType(geom) = 'ST_LineString'"));
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_polygon"));
+    REQUIRE(0 ==
+            conn.get_count(with_schema("osm2pgsql_test_polygon", options)));
 
     // now change the tag back to an area tag (but the way is not closed)...
     REQUIRE_NOTHROW(
         db.run_import(options, "w20 v4 dV Tbuilding=yes Nn10,n11,n12,n13\n"));
 
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_point"));
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_line"));
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_polygon"));
+    REQUIRE(0 == conn.get_count(with_schema("osm2pgsql_test_point", options)));
+    REQUIRE(0 == conn.get_count(with_schema("osm2pgsql_test_line", options)));
+    REQUIRE(0 ==
+            conn.get_count(with_schema("osm2pgsql_test_polygon", options)));
 
     // now close the way again
     REQUIRE_NOTHROW(db.run_import(
         options, "w20 v5 dV Tbuilding=yes Nn10,n11,n12,n13,n10\n"));
 
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_point"));
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_line"));
-    REQUIRE(1 == conn.get_count("osm2pgsql_test_polygon"));
-    REQUIRE(1 == conn.get_count("osm2pgsql_test_polygon",
+    REQUIRE(0 == conn.get_count(with_schema("osm2pgsql_test_point", options)));
+    REQUIRE(0 == conn.get_count(with_schema("osm2pgsql_test_line", options)));
+    REQUIRE(1 ==
+            conn.get_count(with_schema("osm2pgsql_test_polygon", options)));
+    REQUIRE(1 == conn.get_count(with_schema("osm2pgsql_test_polygon", options),
                                 "osm_id = 20 AND tags->'building' = 'yes' AND "
                                 "ST_GeometryType(geom) = 'ST_Polygon'"));
 }
 
 TEMPLATE_TEST_CASE("multipolygons", "", options_slim_default,
-                   options_slim_expire)
+                   options_slim_expire, options_slim_schema)
 {
     options_t options = TestType::options();
 
@@ -213,10 +261,11 @@ TEMPLATE_TEST_CASE("multipolygons", "", options_slim_default,
 
     auto conn = db.db().connect();
 
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_point"));
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_line"));
-    REQUIRE(1 == conn.get_count("osm2pgsql_test_polygon"));
-    REQUIRE(1 == conn.get_count("osm2pgsql_test_polygon",
+    REQUIRE(0 == conn.get_count(with_schema("osm2pgsql_test_point", options)));
+    REQUIRE(0 == conn.get_count(with_schema("osm2pgsql_test_line", options)));
+    REQUIRE(1 ==
+            conn.get_count(with_schema("osm2pgsql_test_polygon", options)));
+    REQUIRE(1 == conn.get_count(with_schema("osm2pgsql_test_polygon", options),
                                 "osm_id = -30 AND tags->'building' = 'yes' AND "
                                 "ST_GeometryType(geom) = 'ST_Polygon'"));
 
@@ -226,10 +275,11 @@ TEMPLATE_TEST_CASE("multipolygons", "", options_slim_default,
         options,
         "r30 v2 dV Ttype=multipolygon,building=yes,name=Shed Mw20@\n"));
 
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_point"));
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_line"));
-    REQUIRE(1 == conn.get_count("osm2pgsql_test_polygon"));
-    REQUIRE(1 == conn.get_count("osm2pgsql_test_polygon",
+    REQUIRE(0 == conn.get_count(with_schema("osm2pgsql_test_point", options)));
+    REQUIRE(0 == conn.get_count(with_schema("osm2pgsql_test_line", options)));
+    REQUIRE(1 ==
+            conn.get_count(with_schema("osm2pgsql_test_polygon", options)));
+    REQUIRE(1 == conn.get_count(with_schema("osm2pgsql_test_polygon", options),
                                 "osm_id = -30 AND tags->'building' = 'yes' AND "
                                 "ST_GeometryType(geom) = 'ST_Polygon'"));
 
@@ -244,7 +294,8 @@ TEMPLATE_TEST_CASE("multipolygons", "", options_slim_default,
             options, "r30 v3 dV Tbuilding=yes,name=Shed Mw20@\n"));
     }
 
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_point"));
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_line"));
-    REQUIRE(0 == conn.get_count("osm2pgsql_test_polygon"));
+    REQUIRE(0 == conn.get_count(with_schema("osm2pgsql_test_point", options)));
+    REQUIRE(0 == conn.get_count(with_schema("osm2pgsql_test_line", options)));
+    REQUIRE(0 ==
+            conn.get_count(with_schema("osm2pgsql_test_polygon", options)));
 }

From fbb2d72e1d121d7f8dd0e28097281a615842a5b9 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 25 Nov 2024 17:56:19 +0100
Subject: [PATCH 221/430] Also install osm2pgsql-gen on make install

---
 CMakeLists.txt     | 3 +--
 README.md          | 6 ------
 man/CMakeLists.txt | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f0f18303..607294739 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -330,7 +330,6 @@ if (ENABLE_INSTALL)
     install(FILES default.style empty.style DESTINATION share/osm2pgsql)
     install(PROGRAMS scripts/osm2pgsql-replication DESTINATION bin)
     if (BUILD_GEN)
-        install(TARGETS osm2pgsql-gen COMPONENT gen EXCLUDE_FROM_ALL DESTINATION bin)
-        add_custom_target(install-gen cmake --install ${CMAKE_BINARY_DIR} --component gen)
+        install(TARGETS osm2pgsql-gen DESTINATION bin)
     endif()
 endif()
diff --git a/README.md b/README.md
index 003c44ede..c6565e0a8 100644
--- a/README.md
+++ b/README.md
@@ -150,12 +150,6 @@ The compiled files can be installed with
 sudo make install
 ```
 
-To install the experimental `osm2pgsql-gen` binary use
-
-```sh
-sudo make install-gen
-```
-
 By default, the Release build with debug info is created and no tests are
 compiled. You can change that behavior by using additional options like
 following:
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
index f22ed68c5..94171469d 100644
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -65,6 +65,6 @@ if(ENABLE_INSTALL)
     install(FILES osm2pgsql.1 DESTINATION share/man/man1)
     install(FILES osm2pgsql-replication.1 DESTINATION share/man/man1)
     if (BUILD_GEN)
-        install(FILES osm2pgsql-gen.1 COMPONENT gen EXCLUDE_FROM_ALL DESTINATION share/man/man1)
+        install(FILES osm2pgsql-gen.1 DESTINATION share/man/man1)
     endif()
 endif()

From 08e4669915a190feda4629b2c0797ad2106c7623 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 25 Nov 2024 20:49:58 +0100
Subject: [PATCH 222/430] Github action: Disable macOS build because it is
 broken again

The macOS build breaks all the time for unknown reasons that have
nothing to do with the code but with the build environment.
---
 .github/workflows/ci.yml | 44 ----------------------------------------
 1 file changed, 44 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9cdd783c1..de6b88281 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,50 +3,6 @@ name: CI
 on: [ push, pull_request ]
 
 jobs:
-  macos:
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - "macos-13"
-          - "macos-14" # latest
-    runs-on: ${{ matrix.os }}
-
-    env:
-      LUA_VERSION: 5.4
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install prerequisites
-        run: |
-          # Workaround for github/brew problem. Python is already install
-          # on the Github action runner and then homebrew comes along...
-          # See also: https://github.com/Homebrew/homebrew-core/issues/173191
-          rm -f /usr/local/bin/2to3* /usr/local/bin/idle3* /usr/local/bin/pydoc3* /usr/local/bin/python3*
-          brew install boost lua nlohmann-json opencv pandoc postgis potrace python3
-          # --break-system-packages is needed on macOS 14
-          pip3 install --break-system-packages psycopg2 behave osmium
-          mkdir ~/postgres
-          pg_ctl -D ~/postgres init
-          pg_ctl -D ~/postgres start
-        shell: bash
-
-      - name: Setup database
-        run: |
-          psql -d postgres -c 'CREATE EXTENSION postgis'
-          psql -d postgres -c 'CREATE EXTENSION hstore'
-          psql -d postgres -c 'SELECT PostGIS_Full_Version()'
-          mkdir -m 700 $GITHUB_WORKSPACE/tablespacetest
-          psql -d postgres -c "CREATE TABLESPACE tablespacetest LOCATION '$GITHUB_WORKSPACE/tablespacetest'"
-        shell: bash
-
-      - uses: ./.github/actions/linux-cmake
-      - uses: ./.github/actions/build-and-test
-        with:
-          test-wrapper: ''
-        env:
-          PGHOST: /tmp
 
   ubuntu20-pg96-gcc10-jit:
     runs-on: ubuntu-20.04

From 0a31043bc595d3475cf3ee885df2e078860ab0d0 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 20 Sep 2024 14:37:35 +0200
Subject: [PATCH 223/430] Simplify osmdata_t class

Remove some functions and inline code.
---
 src/osmdata.cpp | 23 +++++++++--------------
 src/osmdata.hpp | 10 ----------
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/src/osmdata.cpp b/src/osmdata.cpp
index 3ced9ed31..d35032892 100644
--- a/src/osmdata.cpp
+++ b/src/osmdata.cpp
@@ -432,10 +432,16 @@ void osmdata_t::process_dependents()
     proc.process_relations_stage1c(std::move(rels_pending_tracker));
 }
 
-void osmdata_t::reprocess_marked() const { m_output->reprocess_marked(); }
-
-void osmdata_t::postprocess_database() const
+void osmdata_t::stop()
 {
+    if (m_append) {
+        process_dependents();
+    }
+
+    // Run stage 2 processing: Reprocess objects marked in stage 1 (if any).
+    m_output->reprocess_marked();
+
+    // Run postprocessing on database: Clustering and index creation.
     m_output->free_middle_references();
 
     if (m_droptemp) {
@@ -458,14 +464,3 @@ void osmdata_t::postprocess_database() const
     m_mid->wait();
     m_output->wait();
 }
-
-void osmdata_t::stop()
-{
-    if (m_append) {
-        process_dependents();
-    }
-
-    reprocess_marked();
-
-    postprocess_database();
-}
diff --git a/src/osmdata.hpp b/src/osmdata.hpp
index f4dc78c4d..709b4ef2e 100644
--- a/src/osmdata.hpp
+++ b/src/osmdata.hpp
@@ -76,16 +76,6 @@ class osmdata_t : public osmium::handler::Handler
      */
     void process_dependents();
 
-    /**
-     * Run stage 2 processing: Reprocess objects marked in stage 1 (if any).
-     */
-    void reprocess_marked() const;
-
-    /**
-     * Run postprocessing on database: Clustering and index creation.
-     */
-    void postprocess_database() const;
-
     /**
      * In append mode all new and changed nodes will be added to this. After
      * all nodes are read this is used to figure out which parent ways and

From cc0ea609584af6e2d71d811352940e575e973f16 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 2 Dec 2024 08:54:28 +0100
Subject: [PATCH 224/430] prepare release 2.0.1

---
 CMakeLists.txt              | 2 +-
 man/osm2pgsql-gen.1         | 2 +-
 man/osm2pgsql-replication.1 | 2 +-
 man/osm2pgsql.1             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 607294739..e35c5c092 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 cmake_minimum_required(VERSION 3.8.0)
 
-project(osm2pgsql VERSION 2.0.0 LANGUAGES CXX C)
+project(osm2pgsql VERSION 2.0.1 LANGUAGES CXX C)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
diff --git a/man/osm2pgsql-gen.1 b/man/osm2pgsql-gen.1
index c3750eca0..583a3aefd 100644
--- a/man/osm2pgsql-gen.1
+++ b/man/osm2pgsql-gen.1
@@ -1,4 +1,4 @@
-.TH "OSM2PGSQL" "1" "2.0.0" "" ""
+.TH "OSM2PGSQL" "1" "2.0.1" "" ""
 .SH NAME
 .PP
 osm2pgsql-gen - Generalize OpenStreetMap data - EXPERIMENTAL!
diff --git a/man/osm2pgsql-replication.1 b/man/osm2pgsql-replication.1
index 6e93af746..01308dabb 100644
--- a/man/osm2pgsql-replication.1
+++ b/man/osm2pgsql-replication.1
@@ -1,4 +1,4 @@
-.TH "OSM2PGSQL-REPLICATION" "1" "2.0.0" "" ""
+.TH "OSM2PGSQL-REPLICATION" "1" "2.0.1" "" ""
 .SH NAME
 osm2pgsql-replication \- osm2pgsql database updater
 .SH SYNOPSIS
diff --git a/man/osm2pgsql.1 b/man/osm2pgsql.1
index 1680d325f..e1adf414c 100644
--- a/man/osm2pgsql.1
+++ b/man/osm2pgsql.1
@@ -1,4 +1,4 @@
-.TH "OSM2PGSQL" "1" "2.0.0" "" ""
+.TH "OSM2PGSQL" "1" "2.0.1" "" ""
 .SH NAME
 .PP
 osm2pgsql - OpenStreetMap data to PostgreSQL converter

From f4ace451900390cb75ab1d17d9dbe463bd3154b7 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 12 Dec 2024 11:14:52 +0100
Subject: [PATCH 225/430] Use protocol level prepare instead of PREPARE sql
 commands

Introduce a new pg_conn_t::prepare() function which is now used in
several places instead of pg_conn_t::exec() with a SQL PREPARE command.

This does not yet replace all places where PREPARE is used, the rest
will come in a later commit.

This is to make osm2pgsql work with some connection poolers that have
problems with prepared statements. For some background see
https://github.com/osm2pgsql-dev/osm2pgsql/discussions/2118 and
https://www.crunchydata.com/blog/prepared-statements-in-transaction-mode-for-pgbouncer
---
 src/expire-output.cpp | 20 +++++++++++---------
 src/flex-table.cpp    | 14 ++++++--------
 src/middle-pgsql.cpp  |  9 +++++----
 src/pgsql.cpp         | 14 ++++++++++++++
 src/pgsql.hpp         | 20 ++++++++++++++++++++
 src/properties.cpp    |  6 +++---
 src/table.cpp         |  5 ++---
 7 files changed, 61 insertions(+), 27 deletions(-)

diff --git a/src/expire-output.cpp b/src/expire-output.cpp
index 5ec48d9f2..e9b9dbde4 100644
--- a/src/expire-output.cpp
+++ b/src/expire-output.cpp
@@ -65,17 +65,19 @@ std::size_t expire_output_t::output_tiles_to_table(
 
     if (result.num_fields() == 3) {
         // old format with fields: zoom, x, y
-        db_connection.exec("PREPARE insert_tiles(int4, int4, int4) AS"
-                           " INSERT INTO {} (zoom, x, y) VALUES ($1, $2, $3)"
-                           " ON CONFLICT DO NOTHING",
-                           qn);
+        db_connection.prepare("insert_tiles",
+                              "INSERT INTO {} (zoom, x, y)"
+                              " VALUES ($1::int4, $2::int4, $3::int4)"
+                              " ON CONFLICT DO NOTHING",
+                              qn);
     } else {
         // new format with fields: zoom, x, y, first, last
-        db_connection.exec("PREPARE insert_tiles(int4, int4, int4) AS"
-                           " INSERT INTO {} (zoom, x, y) VALUES ($1, $2, $3)"
-                           " ON CONFLICT (zoom, x, y)"
-                           " DO UPDATE SET last = CURRENT_TIMESTAMP(0)",
-                           qn);
+        db_connection.prepare("insert_tiles",
+                              "INSERT INTO {} (zoom, x, y)"
+                              " VALUES ($1::int4, $2::int4, $3::int4)"
+                              " ON CONFLICT (zoom, x, y)"
+                              " DO UPDATE SET last = CURRENT_TIMESTAMP(0)",
+                              qn);
     }
 
     auto const count = for_each_tile(
diff --git a/src/flex-table.cpp b/src/flex-table.cpp
index 80a2195b6..668f69aea 100644
--- a/src/flex-table.cpp
+++ b/src/flex-table.cpp
@@ -167,15 +167,12 @@ std::string flex_table_t::build_sql_prepare_get_wkb() const
 
     if (has_multicolumn_id_index()) {
         return fmt::format(
-            R"(PREPARE get_wkb_{}(char(1), bigint) AS)"
-            R"( SELECT {} FROM {} WHERE "{}" = $1 AND "{}" = $2)",
-            m_table_num, columns, full_name(), m_columns[0].name(),
-            m_columns[1].name());
+            R"(SELECT {} FROM {} WHERE "{}" = $1::char(1) AND "{}" = $2::bigint)",
+            columns, full_name(), m_columns[0].name(), m_columns[1].name());
     }
 
-    return fmt::format(R"(PREPARE get_wkb_{}(bigint) AS)"
-                       R"( SELECT {} FROM {} WHERE "{}" = $1)",
-                       m_table_num, columns, full_name(), id_column_names());
+    return fmt::format(R"(SELECT {} FROM {} WHERE "{}" = $1::bigint)", columns,
+                       full_name(), id_column_names());
 }
 
 std::string
@@ -246,7 +243,8 @@ bool flex_table_t::has_columns_with_expire() const noexcept
 void flex_table_t::prepare(pg_conn_t const &db_connection) const
 {
     if (has_id_column() && has_columns_with_expire()) {
-        db_connection.exec(build_sql_prepare_get_wkb());
+        auto const stmt = fmt::format("get_wkb_{}", m_table_num);
+        db_connection.prepare(stmt, fmt::runtime(build_sql_prepare_get_wkb()));
     }
 }
 
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index 0f075dde9..24c88dcf1 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -1105,10 +1105,11 @@ void middle_pgsql_t::update_users_table()
     log_info("Writing {} entries to table '{}'...", m_users.size(),
              m_users_table.name());
 
-    m_db_connection.exec("PREPARE insert_user(int8, text) AS"
-                         " INSERT INTO {}.\"{}\" (id, name) VALUES ($1, $2)"
-                         " ON CONFLICT (id) DO UPDATE SET id=EXCLUDED.id",
-                         m_users_table.schema(), m_users_table.name());
+    m_db_connection.prepare(
+        "insert_user",
+        "INSERT INTO {}.\"{}\" (id, name) VALUES ($1::int8, $2::text)"
+        " ON CONFLICT (id) DO UPDATE SET id=EXCLUDED.id",
+        m_users_table.schema(), m_users_table.name());
 
     for (auto const &[id, name] : m_users) {
         m_db_connection.exec_prepared("insert_user", id, name);
diff --git a/src/pgsql.cpp b/src/pgsql.cpp
index 04c5c033d..048dc73ff 100644
--- a/src/pgsql.cpp
+++ b/src/pgsql.cpp
@@ -194,6 +194,20 @@ void pg_conn_t::copy_end(std::string_view context) const
     }
 }
 
+void pg_conn_t::prepare_internal(std::string_view stmt,
+                                 std::string_view sql) const
+{
+    if (get_logger().log_sql()) {
+        log_sql("(C{}) PREPARE {} AS {}", m_connection_id, stmt, sql);
+    }
+
+    pg_result_t const res{
+        PQprepare(m_conn.get(), stmt.data(), sql.data(), 0, nullptr)};
+    if (res.status() != PGRES_COMMAND_OK) {
+        throw fmt_error("Prepare failed for '{}': {}.", sql, error_msg());
+    }
+}
+
 pg_result_t pg_conn_t::exec_prepared_internal(char const *stmt, int num_params,
                                               char const *const *param_values,
                                               int *param_lengths,
diff --git a/src/pgsql.hpp b/src/pgsql.hpp
index 9712e7a4d..8279e42a9 100644
--- a/src/pgsql.hpp
+++ b/src/pgsql.hpp
@@ -179,6 +179,24 @@ class pg_conn_t
         return exec(fmt::format(sql, std::forward<TArgs>(params)...));
     }
 
+    /**
+     * Prepare SQL query.
+     *
+     * \param stmt Name of the prepared query.
+     * \param sql SQL query.
+     * \param params Any number of arguments for the fmt lib.
+     * \throws std::runtime_exception If the command failed (didn't return
+     *         status code PGRES_COMMAND_OK).
+     */
+    template <typename... TArgs>
+    void prepare(std::string_view stmt, fmt::format_string<TArgs...> sql,
+                 TArgs... params) const
+    {
+        std::string const query =
+            fmt::format(sql, std::forward<TArgs>(params)...);
+        prepare_internal(stmt, query);
+    }
+
     /**
      * Run the named prepared SQL statement and return the results in text
      * format.
@@ -228,6 +246,8 @@ class pg_conn_t
     void close();
 
 private:
+    void prepare_internal(std::string_view stmt, std::string_view sql) const;
+
     pg_result_t exec_prepared_internal(char const *stmt, int num_params,
                                        char const *const *param_values,
                                        int *param_lengths, int *param_formats,
diff --git a/src/properties.cpp b/src/properties.cpp
index a2e454d94..602817ab2 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -121,9 +121,9 @@ void properties_t::store()
 
     pg_conn_t const db_connection{m_connection_params, "prop.store"};
 
-    db_connection.exec(
-        "PREPARE set_property(text, text) AS"
-        " INSERT INTO {} (property, value) VALUES ($1, $2)"
+    db_connection.prepare(
+        "set_property",
+        "INSERT INTO {} (property, value) VALUES ($1::text, $2::text)"
         " ON CONFLICT (property) DO UPDATE SET value = EXCLUDED.value",
         table);
 
diff --git a/src/table.cpp b/src/table.cpp
index 9d707497f..9c41b3eb2 100644
--- a/src/table.cpp
+++ b/src/table.cpp
@@ -143,9 +143,8 @@ void table_t::prepare()
 {
     //let postgres cache this query as it will presumably happen a lot
     auto const qual_name = qualified_name(m_target->schema(), m_target->name());
-    m_db_connection->exec("PREPARE get_wkb(int8) AS"
-                          " SELECT way FROM {} WHERE osm_id = $1",
-                          qual_name);
+    m_db_connection->prepare(
+        "get_wkb", "SELECT way FROM {} WHERE osm_id = $1::int8", qual_name);
 }
 
 void table_t::generate_copy_column_list()

From 3db3c81772f7d819024f5ba76dfcc5268a8cb264 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 12 Dec 2024 11:59:53 +0100
Subject: [PATCH 226/430] Refactoring: Add new template_t class for rendering
 SQL templates

Separates the generic template code cleanly from any SQL details.
---
 CMakeLists.txt       |  1 +
 src/gen/gen-base.cpp | 40 ++++++++--------------------------------
 src/gen/template.cpp | 26 ++++++++++++++++++++++++++
 src/gen/template.hpp | 35 +++++++++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+), 32 deletions(-)
 create mode 100644 src/gen/template.cpp
 create mode 100644 src/gen/template.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e35c5c092..41a89dd60 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -268,6 +268,7 @@ else()
                 src/gen/gen-tile.cpp
                 src/gen/params.cpp
                 src/gen/raster.cpp
+                src/gen/template.cpp
                 src/gen/tracer.cpp)
     target_link_libraries(osm2pgsql-gen osm2pgsql_lib ${LIBS} ${POTRACE_LIBRARY} ${OpenCV_LIBS})
 endif()
diff --git a/src/gen/gen-base.cpp b/src/gen/gen-base.cpp
index f71c13f9b..a13298c62 100644
--- a/src/gen/gen-base.cpp
+++ b/src/gen/gen-base.cpp
@@ -11,8 +11,7 @@
 
 #include "format.hpp"
 #include "params.hpp"
-
-#include <fmt/args.h>
+#include "template.hpp"
 
 #include <cassert>
 
@@ -84,43 +83,20 @@ std::string gen_base_t::context()
     return gen_name.empty() ? "" : fmt::format(" '{}'", gen_name);
 }
 
-namespace {
-
-pg_result_t dbexec_internal(
-    pg_conn_t const &connection, std::string const &templ,
-    fmt::dynamic_format_arg_store<fmt::format_context> const &format_store)
-{
-    try {
-        auto const sql = fmt::vformat(templ, format_store);
-        return connection.exec(sql);
-    } catch (fmt::format_error const &e) {
-        log_error("Missing parameter for template: '{}'", templ);
-        throw;
-    }
-}
-
-} // anonymous namespace
-
 pg_result_t gen_base_t::dbexec(std::string const &templ)
 {
-    fmt::dynamic_format_arg_store<fmt::format_context> format_store;
-    for (auto const &[key, value] : get_params()) {
-        format_store.push_back(fmt::arg(key.c_str(), to_string(value)));
-    }
-    return dbexec_internal(connection(), templ, format_store);
+    template_t sql_template{templ};
+    sql_template.set_params(get_params());
+    return connection().exec(sql_template.render());
 }
 
 pg_result_t gen_base_t::dbexec(params_t const &tmp_params,
                                std::string const &templ)
 {
-    fmt::dynamic_format_arg_store<fmt::format_context> format_store;
-    for (auto const &[key, value] : get_params()) {
-        format_store.push_back(fmt::arg(key.c_str(), to_string(value)));
-    }
-    for (auto const &[key, value] : tmp_params) {
-        format_store.push_back(fmt::arg(key.c_str(), to_string(value)));
-    }
-    return dbexec_internal(connection(), templ, format_store);
+    template_t sql_template{templ};
+    sql_template.set_params(get_params());
+    sql_template.set_params(tmp_params);
+    return connection().exec(sql_template.render());
 }
 
 void gen_base_t::raster_table_preprocess(std::string const &table)
diff --git a/src/gen/template.cpp b/src/gen/template.cpp
new file mode 100644
index 000000000..78d6bed80
--- /dev/null
+++ b/src/gen/template.cpp
@@ -0,0 +1,26 @@
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+#include "template.hpp"
+
+void template_t::set_params(params_t const &params) {
+    for (auto const &[key, value] : params) {
+        m_format_store.push_back(fmt::arg(key.c_str(), to_string(value)));
+    }
+}
+
+std::string template_t::render() const
+{
+    try {
+        return fmt::vformat(m_template, m_format_store);
+    } catch (fmt::format_error const &e) {
+        log_error("Missing parameter for template: '{}'", m_template);
+        throw;
+    }
+}
diff --git a/src/gen/template.hpp b/src/gen/template.hpp
new file mode 100644
index 000000000..1fbb324c5
--- /dev/null
+++ b/src/gen/template.hpp
@@ -0,0 +1,35 @@
+#ifndef OSM2PGSQL_TEMPLATE_HPP
+#define OSM2PGSQL_TEMPLATE_HPP
+
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+#include "format.hpp"
+#include "params.hpp"
+
+#include <fmt/args.h>
+
+#include <string>
+
+class template_t
+{
+public:
+    explicit template_t(std::string_view tmpl) : m_template(tmpl) {}
+
+    void set_params(params_t const &params);
+
+    std::string render() const;
+
+private:
+    std::string m_template;
+    fmt::dynamic_format_arg_store<fmt::format_context> m_format_store;
+
+}; // class template_t
+
+#endif // OSM2PGSQL_TEMPLATE_HPP

From 78ae9eef718e5fc4fe5c4dba44e0fae59ab6b1dc Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 12 Dec 2024 10:33:42 +0100
Subject: [PATCH 227/430] Refactor: Use fmt builtin functionality to format
 variants

When including the fmt/std.h header the fmt library has support for
formatting std::variant. So we don't need to do this ourselves.
---
 src/format.hpp       |  1 +
 src/gen/params.cpp   | 19 +++++--------------
 src/gen/params.hpp   |  6 +-----
 src/gen/template.cpp |  2 +-
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/format.hpp b/src/format.hpp
index 3d4a25f27..de5c20739 100644
--- a/src/format.hpp
+++ b/src/format.hpp
@@ -12,6 +12,7 @@
 
 #define FMT_HEADER_ONLY
 #include <fmt/format.h>
+#include <fmt/std.h>
 
 #include <stdexcept>
 
diff --git a/src/gen/params.cpp b/src/gen/params.cpp
index 1806981cc..f22f836ee 100644
--- a/src/gen/params.cpp
+++ b/src/gen/params.cpp
@@ -14,15 +14,6 @@
 #include "overloaded.hpp"
 #include "pgsql.hpp"
 
-std::string to_string(param_value_t const &value)
-{
-    return std::visit(
-        overloaded{[](null_param_t) { return std::string{}; },
-                   [](std::string val) { return val; },
-                   [](auto const &val) { return fmt::to_string(val); }},
-        value);
-}
-
 param_value_t params_t::get(std::string const &key) const
 {
     return m_map.at(key);
@@ -58,7 +49,7 @@ double params_t::get_double(std::string const &key, double default_value) const
         return static_cast<double>(std::get<int64_t>(it->second));
     }
 
-    throw fmt_error("Invalid value '{}' for {}.", to_string(it->second), key);
+    throw fmt_error("Invalid value '{}' for {}.", it->second, key);
 }
 
 std::string params_t::get_string(std::string const &key) const
@@ -67,7 +58,7 @@ std::string params_t::get_string(std::string const &key) const
     if (it == m_map.end()) {
         throw fmt_error("Missing parameter '{}' on generalizer.", key);
     }
-    return to_string(it->second);
+    return fmt::format("{}", it->second);
 }
 
 std::string params_t::get_string(std::string const &key,
@@ -82,7 +73,7 @@ std::string params_t::get_identifier(std::string const &key) const
     if (it == m_map.end()) {
         return {};
     }
-    std::string result = to_string(it->second);
+    std::string result = fmt::format("{}", it->second);
     check_identifier(result, key.c_str());
     return result;
 }
@@ -94,7 +85,7 @@ void params_t::check_identifier_with_default(std::string const &key,
     if (it == m_map.end()) {
         m_map.emplace(key, std::move(default_value));
     } else {
-        check_identifier(to_string(it->second), key.c_str());
+        check_identifier(fmt::format("{}", it->second), key.c_str());
     }
 }
 
@@ -120,6 +111,6 @@ void write_to_debug_log(params_t const &params, char const *message)
     }
     log_debug("{}", message);
     for (auto const &[key, value] : params) {
-        log_debug("  {}={}", key, to_string(value));
+        log_debug("  {}={}", key, value);
     }
 }
diff --git a/src/gen/params.hpp b/src/gen/params.hpp
index 174465820..51da49d1a 100644
--- a/src/gen/params.hpp
+++ b/src/gen/params.hpp
@@ -24,9 +24,6 @@ using null_param_t = std::monostate;
 using param_value_t =
     std::variant<null_param_t, std::string, int64_t, double, bool>;
 
-/// Convert a parameter value into a string.
-std::string to_string(param_value_t const &value);
-
 /**
  * A collection of parameters.
  */
@@ -79,8 +76,7 @@ class params_t
         }
 
         if (!std::holds_alternative<T>(it->second)) {
-            throw fmt_error("Invalid value '{}' for {}.", to_string(it->second),
-                            key);
+            throw fmt_error("Invalid value '{}' for {}.", it->second, key);
         }
         return std::get<T>(it->second);
     }
diff --git a/src/gen/template.cpp b/src/gen/template.cpp
index 78d6bed80..0bbe283fc 100644
--- a/src/gen/template.cpp
+++ b/src/gen/template.cpp
@@ -11,7 +11,7 @@
 
 void template_t::set_params(params_t const &params) {
     for (auto const &[key, value] : params) {
-        m_format_store.push_back(fmt::arg(key.c_str(), to_string(value)));
+        m_format_store.push_back(fmt::arg(key.c_str(), value));
     }
 }
 

From 6a0c731e6ee05a9e43962c7f3a5701b1c10d3016 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 13 Dec 2024 11:18:07 +0100
Subject: [PATCH 228/430] Revert "Refactor: Use fmt builtin functionality to
 format variants"

This reverts commit 78ae9eef718e5fc4fe5c4dba44e0fae59ab6b1dc.

Grr. The builtin functionality doesn't work for us. It writes any value
out as "variant(VALUE)". I thought I had tested this, but apparently I
tested the wrong thing.
---
 src/format.hpp       |  1 -
 src/gen/params.cpp   | 19 ++++++++++++++-----
 src/gen/params.hpp   |  6 +++++-
 src/gen/template.cpp |  2 +-
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/format.hpp b/src/format.hpp
index de5c20739..3d4a25f27 100644
--- a/src/format.hpp
+++ b/src/format.hpp
@@ -12,7 +12,6 @@
 
 #define FMT_HEADER_ONLY
 #include <fmt/format.h>
-#include <fmt/std.h>
 
 #include <stdexcept>
 
diff --git a/src/gen/params.cpp b/src/gen/params.cpp
index f22f836ee..1806981cc 100644
--- a/src/gen/params.cpp
+++ b/src/gen/params.cpp
@@ -14,6 +14,15 @@
 #include "overloaded.hpp"
 #include "pgsql.hpp"
 
+std::string to_string(param_value_t const &value)
+{
+    return std::visit(
+        overloaded{[](null_param_t) { return std::string{}; },
+                   [](std::string val) { return val; },
+                   [](auto const &val) { return fmt::to_string(val); }},
+        value);
+}
+
 param_value_t params_t::get(std::string const &key) const
 {
     return m_map.at(key);
@@ -49,7 +58,7 @@ double params_t::get_double(std::string const &key, double default_value) const
         return static_cast<double>(std::get<int64_t>(it->second));
     }
 
-    throw fmt_error("Invalid value '{}' for {}.", it->second, key);
+    throw fmt_error("Invalid value '{}' for {}.", to_string(it->second), key);
 }
 
 std::string params_t::get_string(std::string const &key) const
@@ -58,7 +67,7 @@ std::string params_t::get_string(std::string const &key) const
     if (it == m_map.end()) {
         throw fmt_error("Missing parameter '{}' on generalizer.", key);
     }
-    return fmt::format("{}", it->second);
+    return to_string(it->second);
 }
 
 std::string params_t::get_string(std::string const &key,
@@ -73,7 +82,7 @@ std::string params_t::get_identifier(std::string const &key) const
     if (it == m_map.end()) {
         return {};
     }
-    std::string result = fmt::format("{}", it->second);
+    std::string result = to_string(it->second);
     check_identifier(result, key.c_str());
     return result;
 }
@@ -85,7 +94,7 @@ void params_t::check_identifier_with_default(std::string const &key,
     if (it == m_map.end()) {
         m_map.emplace(key, std::move(default_value));
     } else {
-        check_identifier(fmt::format("{}", it->second), key.c_str());
+        check_identifier(to_string(it->second), key.c_str());
     }
 }
 
@@ -111,6 +120,6 @@ void write_to_debug_log(params_t const &params, char const *message)
     }
     log_debug("{}", message);
     for (auto const &[key, value] : params) {
-        log_debug("  {}={}", key, value);
+        log_debug("  {}={}", key, to_string(value));
     }
 }
diff --git a/src/gen/params.hpp b/src/gen/params.hpp
index 51da49d1a..174465820 100644
--- a/src/gen/params.hpp
+++ b/src/gen/params.hpp
@@ -24,6 +24,9 @@ using null_param_t = std::monostate;
 using param_value_t =
     std::variant<null_param_t, std::string, int64_t, double, bool>;
 
+/// Convert a parameter value into a string.
+std::string to_string(param_value_t const &value);
+
 /**
  * A collection of parameters.
  */
@@ -76,7 +79,8 @@ class params_t
         }
 
         if (!std::holds_alternative<T>(it->second)) {
-            throw fmt_error("Invalid value '{}' for {}.", it->second, key);
+            throw fmt_error("Invalid value '{}' for {}.", to_string(it->second),
+                            key);
         }
         return std::get<T>(it->second);
     }
diff --git a/src/gen/template.cpp b/src/gen/template.cpp
index 0bbe283fc..78d6bed80 100644
--- a/src/gen/template.cpp
+++ b/src/gen/template.cpp
@@ -11,7 +11,7 @@
 
 void template_t::set_params(params_t const &params) {
     for (auto const &[key, value] : params) {
-        m_format_store.push_back(fmt::arg(key.c_str(), value));
+        m_format_store.push_back(fmt::arg(key.c_str(), to_string(value)));
     }
 }
 

From b1d3ba137bc8a8c17ac7825434e7593c4d392ad9 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 11 Dec 2024 12:11:25 +0100
Subject: [PATCH 229/430] Switch to new prepare functions also in
 generalization code

---
 src/gen/gen-base.cpp               | 16 ++++++
 src/gen/gen-base.hpp               |  5 ++
 src/gen/gen-discrete-isolation.cpp |  6 +--
 src/gen/gen-rivers.cpp             |  5 +-
 src/gen/gen-tile-builtup.cpp       | 29 +++++------
 src/gen/gen-tile-raster.cpp        | 33 ++++++------
 src/gen/gen-tile-vector.cpp        | 80 +++++++++++++++---------------
 src/gen/gen-tile.cpp               |  4 +-
 8 files changed, 95 insertions(+), 83 deletions(-)

diff --git a/src/gen/gen-base.cpp b/src/gen/gen-base.cpp
index a13298c62..3aa847593 100644
--- a/src/gen/gen-base.cpp
+++ b/src/gen/gen-base.cpp
@@ -99,6 +99,22 @@ pg_result_t gen_base_t::dbexec(params_t const &tmp_params,
     return connection().exec(sql_template.render());
 }
 
+void gen_base_t::dbprepare(std::string_view stmt, std::string const &templ)
+{
+    template_t sql_template{templ};
+    sql_template.set_params(get_params());
+    return connection().prepare(stmt, fmt::runtime(sql_template.render()));
+}
+
+void gen_base_t::dbprepare(std::string_view stmt, params_t const &tmp_params,
+                           std::string const &templ)
+{
+    template_t sql_template{templ};
+    sql_template.set_params(get_params());
+    sql_template.set_params(tmp_params);
+    return connection().prepare(stmt, fmt::runtime(sql_template.render()));
+}
+
 void gen_base_t::raster_table_preprocess(std::string const &table)
 {
     params_t tmp_params;
diff --git a/src/gen/gen-base.hpp b/src/gen/gen-base.hpp
index b935d7652..a9aae09c0 100644
--- a/src/gen/gen-base.hpp
+++ b/src/gen/gen-base.hpp
@@ -101,6 +101,11 @@ class gen_base_t
 
     pg_result_t dbexec(params_t const &tmp_params, std::string const &templ);
 
+    void dbprepare(std::string_view stmt, std::string const &templ);
+
+    void dbprepare(std::string_view stmt, params_t const &tmp_params,
+                   std::string const &templ);
+
     void raster_table_preprocess(std::string const &table);
 
     void raster_table_postprocess(std::string const &table);
diff --git a/src/gen/gen-discrete-isolation.cpp b/src/gen/gen-discrete-isolation.cpp
index 6c8ca8a55..952f0c0d6 100644
--- a/src/gen/gen-discrete-isolation.cpp
+++ b/src/gen/gen-discrete-isolation.cpp
@@ -132,9 +132,9 @@ FROM {src} WHERE {importance_column} > 0
     timer(m_timer_reorder).stop();
 
     log_gen("Writing results to destination table...");
-    dbexec("PREPARE update (int, real, int4, int8) AS"
-           " UPDATE {src} SET dirank = $1, discr_iso = $2, irank = $3"
-           " WHERE {id_column} = $4");
+    dbprepare("update", "UPDATE {src} SET dirank = $1::int,"
+                        " discr_iso = $2::real, irank = $3::int4"
+                        " WHERE {id_column} = $4::int8");
 
     timer(m_timer_write).start();
     connection().exec("BEGIN");
diff --git a/src/gen/gen-rivers.cpp b/src/gen/gen-rivers.cpp
index 0f7e8d1c8..a1b445e09 100644
--- a/src/gen/gen-rivers.cpp
+++ b/src/gen/gen-rivers.cpp
@@ -334,9 +334,8 @@ SELECT "{id_column}", "{width_column}", "{name_column}", "{geom_column}"
     }
 
     log_gen("Writing results to destination table...");
-    dbexec("PREPARE ins (int8, real, text, geometry) AS"
-           " INSERT INTO {dest} ({id_column}, width, name, geom)"
-           " VALUES ($1, $2, $3, $4)");
+    dbprepare("ins", "INSERT INTO {dest} ({id_column}, width, name, geom)"
+                     " VALUES ($1::int8, $2::real, $3::text, $4::geometry)");
 
     timer(m_timer_write).start();
     connection().exec("BEGIN");
diff --git a/src/gen/gen-tile-builtup.cpp b/src/gen/gen-tile-builtup.cpp
index e075bb8a9..234a2dc21 100644
--- a/src/gen/gen-tile-builtup.cpp
+++ b/src/gen/gen-tile-builtup.cpp
@@ -127,11 +127,10 @@ CREATE TABLE IF NOT EXISTS "{}" (
     }
 
     if (params->get_bool("make_valid")) {
-        params->set(
-            "geom_sql",
-            "(ST_Dump(ST_CollectionExtract(ST_MakeValid($1), 3))).geom");
+        params->set("geom_sql", "(ST_Dump(ST_CollectionExtract(ST_MakeValid("
+                                "$1::geometry), 3))).geom");
     } else {
-        params->set("geom_sql", "$1");
+        params->set("geom_sql", "$1::geometry");
     }
 
     if ((m_image_extent & (m_image_extent - 1)) != 0) {
@@ -154,28 +153,24 @@ CREATE TABLE IF NOT EXISTS "{}" (
     auto const schema = get_params().get_string("schema");
     for (auto const &src_table : m_source_tables) {
         params_t tmp_params;
-        tmp_params.set("N", std::to_string(n++));
         tmp_params.set("SRC", qualified_name(schema, src_table));
 
-        dbexec(tmp_params, R"(
-PREPARE get_geoms_{N} (real, real, real, real) AS
- SELECT "{geom_column}", '' AS param
+        dbprepare(fmt::format("get_geoms_{}", n++), tmp_params, R"(
+SELECT "{geom_column}", '' AS param
  FROM {SRC}
- WHERE "{geom_column}" && ST_MakeEnvelope($1, $2, $3, $4, 3857)
+ WHERE "{geom_column}" && ST_MakeEnvelope($1::real, $2::real, $3::real, $4::real, 3857)
 )");
     }
 
     if (m_has_area_column) {
-        dbexec(R"(
-PREPARE insert_geoms (geometry, int, int) AS
- INSERT INTO {dest} ("{geom_column}", x, y, "{area_column}")
- VALUES ({geom_sql}, $2, $3, $4)
+        dbprepare("insert_geoms", R"(
+INSERT INTO {dest} ("{geom_column}", x, y, "{area_column}")
+ VALUES ({geom_sql}, $2::int, $3::int, $4::real)
 )");
     } else {
-        dbexec(R"(
-PREPARE insert_geoms (geometry, int, int) AS
- INSERT INTO {dest} ("{geom_column}", x, y)
- VALUES ({geom_sql}, $2, $3)
+        dbprepare("insert_geoms", R"(
+INSERT INTO {dest} ("{geom_column}", x, y)
+ VALUES ({geom_sql}, $2::int, $3::int)
 )");
     }
 }
diff --git a/src/gen/gen-tile-raster.cpp b/src/gen/gen-tile-raster.cpp
index 4771b9d6d..2f945bbbc 100644
--- a/src/gen/gen-tile-raster.cpp
+++ b/src/gen/gen-tile-raster.cpp
@@ -116,11 +116,10 @@ CREATE TABLE IF NOT EXISTS "{}" (
     }
 
     if (get_params().get_bool("make_valid")) {
-        params->set(
-            "geom_sql",
-            "(ST_Dump(ST_CollectionExtract(ST_MakeValid($1), 3))).geom");
+        params->set("geom_sql", "(ST_Dump(ST_CollectionExtract("
+                                " ST_MakeValid($1::geometry), 3))).geom");
     } else {
-        params->set("geom_sql", "$1");
+        params->set("geom_sql", "$1::geometry");
     }
 
     if ((m_image_extent & (m_image_extent - 1)) != 0) {
@@ -142,26 +141,24 @@ CREATE TABLE IF NOT EXISTS "{}" (
     std::string prepare;
     if (with_group_by()) {
         prepare = R"(
-PREPARE get_geoms (real, real, real, real) AS
- SELECT "{geom_column}", "{group_by_column}"
+SELECT "{geom_column}", "{group_by_column}"
  FROM {src}
- WHERE "{geom_column}" && ST_MakeEnvelope($1, $2, $3, $4, 3857)
+ WHERE "{geom_column}" &&
+       ST_MakeEnvelope($1::real, $2::real, $3::real, $4::real, 3857)
 )";
-        dbexec(R"(
-PREPARE insert_geoms (geometry, int, int, text) AS
- INSERT INTO {dest} ("{geom_column}", x, y, "{group_by_column}")
- VALUES ({geom_sql}, $2, $3, $4)
+        dbprepare("insert_geoms", R"(
+INSERT INTO {dest} ("{geom_column}", x, y, "{group_by_column}")
+ VALUES ({geom_sql}, $2::int, $3::int, $4::text)
 )");
     } else {
         prepare = R"(
-PREPARE get_geoms (real, real, real, real) AS
- SELECT "{geom_column}", NULL AS param
+SELECT "{geom_column}", NULL AS param
  FROM {src}
- WHERE "{geom_column}" && ST_MakeEnvelope($1, $2, $3, $4, 3857)
+ WHERE "{geom_column}" &&
+       ST_MakeEnvelope($1::real, $2::real, $3::real, $4::real, 3857)
 )";
-        dbexec(R"(
-PREPARE insert_geoms (geometry, int, int, text) AS
- INSERT INTO {dest} ("{geom_column}", x, y) VALUES ({geom_sql}, $2, $3)
+        dbprepare("insert_geoms", R"(
+INSERT INTO {dest} ("{geom_column}", x, y) VALUES ({geom_sql}, $2::int, $3::int)
 )");
     }
 
@@ -169,7 +166,7 @@ PREPARE insert_geoms (geometry, int, int, text) AS
         prepare.append(fmt::format(" AND ({})", where_condition));
     }
 
-    dbexec(prepare);
+    dbprepare("get_geoms", prepare);
 }
 
 void gen_tile_raster_union_t::process(tile_t const &tile)
diff --git a/src/gen/gen-tile-vector.cpp b/src/gen/gen-tile-vector.cpp
index 2686691a8..ea2262a96 100644
--- a/src/gen/gen-tile-vector.cpp
+++ b/src/gen/gen-tile-vector.cpp
@@ -36,48 +36,48 @@ gen_tile_vector_union_t::gen_tile_vector_union_t(pg_conn_t *connection,
     }
 
     if (with_group_by()) {
-        dbexec(R"(
-PREPARE gen_geoms (int, int, int) AS
- WITH gen_tile_input AS (
-  SELECT "{group_by_column}" AS col, "{geom_column}" AS geom FROM {src}
-   WHERE "{geom_column}" && ST_TileEnvelope($1, $2, $3, margin => {margin})
- ),
- buffered AS (
-  SELECT col, ST_Buffer(geom, {buffer_size}) AS geom
-   FROM gen_tile_input
- ),
- merged AS (
-  SELECT col, ST_Union(geom) AS geom
-   FROM buffered GROUP BY col
- ),
- unbuffered AS (
-  SELECT col, ST_Buffer(ST_Buffer(geom, -2 * {buffer_size}), {buffer_size}) AS geom
-   FROM merged
- )
- INSERT INTO {dest} (x, y, "{group_by_column}", "{geom_column}")
-  SELECT $2, $3, col, (ST_Dump(geom)).geom FROM unbuffered
+        dbprepare("gen_geoms", R"(
+WITH gen_tile_input AS (
+ SELECT "{group_by_column}" AS col, "{geom_column}" AS geom FROM {src}
+  WHERE "{geom_column}" &&
+        ST_TileEnvelope($1::int, $2::int, $3::int, margin => {margin})
+),
+buffered AS (
+ SELECT col, ST_Buffer(geom, {buffer_size}) AS geom
+  FROM gen_tile_input
+),
+merged AS (
+ SELECT col, ST_Union(geom) AS geom
+  FROM buffered GROUP BY col
+),
+unbuffered AS (
+ SELECT col, ST_Buffer(ST_Buffer(geom, -2 * {buffer_size}), {buffer_size}) AS geom
+  FROM merged
+)
+INSERT INTO {dest} (x, y, "{group_by_column}", "{geom_column}")
+ SELECT $2::int, $3::int, col, (ST_Dump(geom)).geom FROM unbuffered
 )");
     } else {
-        dbexec(R"(
-PREPARE gen_geoms (int, int, int) AS
- WITH gen_tile_input AS (
-  SELECT "{geom_column}" AS geom FROM {src}
-   WHERE "{geom_column}" && ST_TileEnvelope($1, $2, $3, margin => {margin})
- ),
- buffered AS (
-  SELECT ST_Buffer(geom, {buffer_size}) AS geom
-   FROM gen_tile_input
- ),
- merged AS (
-  SELECT ST_Union(geom) AS geom
-   FROM buffered
- ),
- unbuffered AS (
-  SELECT ST_Buffer(ST_Buffer(geom, -2 * {buffer_size}), {buffer_size}) AS geom
-   FROM merged
- )
- INSERT INTO {dest} (x, y, "{geom_column}")
-  SELECT $2, $3, (ST_Dump(geom)).geom FROM unbuffered
+        dbprepare("gen_geoms", R"(
+WITH gen_tile_input AS (
+ SELECT "{geom_column}" AS geom FROM {src}
+  WHERE "{geom_column}" &&
+        ST_TileEnvelope($1::int, $2::int, $3::int, margin => {margin})
+),
+buffered AS (
+ SELECT ST_Buffer(geom, {buffer_size}) AS geom
+  FROM gen_tile_input
+),
+merged AS (
+ SELECT ST_Union(geom) AS geom
+  FROM buffered
+),
+unbuffered AS (
+ SELECT ST_Buffer(ST_Buffer(geom, -2 * {buffer_size}), {buffer_size}) AS geom
+  FROM merged
+)
+INSERT INTO {dest} (x, y, "{geom_column}")
+ SELECT $2::int, $3::int, (ST_Dump(geom)).geom FROM unbuffered
 )");
     }
 }
diff --git a/src/gen/gen-tile.cpp b/src/gen/gen-tile.cpp
index eb9dc22bc..3941e08af 100644
--- a/src/gen/gen-tile.cpp
+++ b/src/gen/gen-tile.cpp
@@ -23,8 +23,8 @@ gen_tile_t::gen_tile_t(pg_conn_t *connection, bool append, params_t *params)
     m_with_group_by = !get_params().get_identifier("group_by_column").empty();
 
     if (append_mode()) {
-        dbexec("PREPARE del_geoms (int, int) AS"
-               " DELETE FROM {dest} WHERE x=$1 AND y=$2");
+        dbprepare("del_geoms",
+                  "DELETE FROM {dest} WHERE x=$1::int AND y=$2::int");
     }
 }
 

From b8bb093f0fb82c42a45ceba66717bb531145a9d7 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 16 Dec 2024 16:19:21 +0100
Subject: [PATCH 230/430] Check flat node file format for forwards
 compatibility

In a flat node file the first location is that of node id 0, which does
not exist. So the first location must always be the undefined location,
otherwise we might be looking at a different kind of file.

This adds a check for forwards compatibility. If and when we change the
file format, we can use the first 8 bytes to differentiate the file
formats.
---
 src/node-persistent-cache.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/node-persistent-cache.cpp b/src/node-persistent-cache.cpp
index 4d2dabbdd..3fb1e8279 100644
--- a/src/node-persistent-cache.cpp
+++ b/src/node-persistent-cache.cpp
@@ -45,6 +45,15 @@ node_persistent_cache::node_persistent_cache(std::string file_name,
     }
 
     m_index = std::make_unique<index_t>(m_fd);
+
+    // First location must always be the undefined location, otherwise we
+    // might be looking at a different kind of file. This check here is for
+    // forwards compatibility. If and when we change the file format, we
+    // can use the first 8 bytes to differentiate the file format.
+    auto const loc = get(0);
+    if (loc.is_defined()) {
+        throw fmt_error("Not a version 1 flatnode file '{}'", m_file_name);
+    }
 }
 
 node_persistent_cache::~node_persistent_cache() noexcept

From 0e7f92acaf245582de2103c03670be9bddaedfd4 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 13 Dec 2024 14:59:12 +0100
Subject: [PATCH 231/430] Move params.[ch]pp and template.[ch]pp into main src
 directory

From the "gen" directory. As preparation for using this code in the main
program.
---
 CMakeLists.txt             |  2 --
 src/CMakeLists.txt         |  2 ++
 src/middle-pgsql.cpp       | 66 +++++++++++++++++++++-----------------
 src/{gen => }/params.cpp   |  0
 src/{gen => }/params.hpp   |  0
 src/{gen => }/template.cpp |  0
 src/{gen => }/template.hpp |  0
 7 files changed, 39 insertions(+), 31 deletions(-)
 rename src/{gen => }/params.cpp (100%)
 rename src/{gen => }/params.hpp (100%)
 rename src/{gen => }/template.cpp (100%)
 rename src/{gen => }/template.hpp (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41a89dd60..9ed00e3b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -266,9 +266,7 @@ else()
                 src/gen/gen-tile-sql.cpp
                 src/gen/gen-tile-vector.cpp
                 src/gen/gen-tile.cpp
-                src/gen/params.cpp
                 src/gen/raster.cpp
-                src/gen/template.cpp
                 src/gen/tracer.cpp)
     target_link_libraries(osm2pgsql-gen osm2pgsql_lib ${LIBS} ${POTRACE_LIBRARY} ${OpenCV_LIBS})
 endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ee2b260b9..e10db77e6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -47,6 +47,7 @@ target_sources(osm2pgsql_lib PRIVATE
     output-null.cpp
     output-pgsql.cpp
     output.cpp
+    params.cpp
     pgsql-capabilities.cpp
     pgsql-helper.cpp
     pgsql.cpp
@@ -58,6 +59,7 @@ target_sources(osm2pgsql_lib PRIVATE
     tagtransform-c.cpp
     tagtransform-lua.cpp
     tagtransform.cpp
+    template.cpp
     thread-pool.cpp
     tile.cpp
     util.cpp
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index 24c88dcf1..b4bf1bcdb 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -42,6 +42,7 @@
 #include "options.hpp"
 #include "osmtypes.hpp"
 #include "pgsql-helper.hpp"
+#include "template.hpp"
 #include "util.hpp"
 
 namespace {
@@ -72,37 +73,44 @@ void load_id_list(pg_conn_t const &db_connection, std::string const &table,
 
 std::string build_sql(options_t const &options, std::string const &templ)
 {
-    std::string const using_tablespace{options.tblsslim_index.empty()
-                                           ? ""
-                                           : "USING INDEX TABLESPACE " +
-                                                 options.tblsslim_index};
-
     std::string const schema = "\"" + options.middle_dbschema + "\".";
 
-    return fmt::format(
-        fmt::runtime(templ), fmt::arg("prefix", options.prefix),
-        fmt::arg("schema", schema),
-        fmt::arg("unlogged", options.droptemp ? "UNLOGGED" : ""),
-        fmt::arg("using_tablespace", using_tablespace),
-        fmt::arg("data_tablespace", tablespace_clause(options.tblsslim_data)),
-        fmt::arg("index_tablespace", tablespace_clause(options.tblsslim_index)),
-        fmt::arg("way_node_index_id_shift", 5),
-        fmt::arg("attribute_columns_definition",
-                 options.extra_attributes ? " created timestamp with time zone,"
-                                            " version int4,"
-                                            " changeset_id int4,"
-                                            " user_id int4,"
-                                          : ""),
-        fmt::arg("attribute_columns_use",
-                 options.extra_attributes
-                     ? ", EXTRACT(EPOCH FROM created) AS created, version, "
-                       "changeset_id, user_id, u.name"
-                     : ""),
-        fmt::arg("users_table_access",
-                 options.extra_attributes
-                     ? "LEFT JOIN " + schema + '"' + options.prefix +
-                           "_users\" u ON o.user_id = u.id"
-                     : ""));
+    params_t params;
+    params.set("prefix", options.prefix);
+    params.set("schema", schema);
+    params.set("unlogged", options.droptemp ? "UNLOGGED" : "");
+    params.set("data_tablespace", tablespace_clause(options.tblsslim_data));
+    params.set("index_tablespace", tablespace_clause(options.tblsslim_index));
+    params.set("way_node_index_id_shift", 5);
+
+    if (options.tblsslim_index.empty()) {
+        params.set("using_tablespace", "");
+    } else {
+        params.set("using_tablespace",
+                   "USING INDEX TABLESPACE " + options.tblsslim_index);
+    }
+
+    if (options.extra_attributes) {
+        params.set("attribute_columns_definition",
+                   " created timestamp with time zone,"
+                   " version int4,"
+                   " changeset_id int4,"
+                   " user_id int4,");
+        params.set("attribute_columns_use",
+                   ", EXTRACT(EPOCH FROM created) AS created, version, "
+                   "changeset_id, user_id, u.name");
+        params.set("users_table_access", "LEFT JOIN " + schema + '"' +
+                                             options.prefix +
+                                             "_users\" u ON o.user_id = u.id");
+    } else {
+        params.set("attribute_columns_definition", "");
+        params.set("attribute_columns_use", "");
+        params.set("users_table_access", "");
+    }
+
+    template_t sql_template{templ};
+    sql_template.set_params(params);
+    return sql_template.render();
 }
 
 std::vector<std::string> build_sql(options_t const &options,
diff --git a/src/gen/params.cpp b/src/params.cpp
similarity index 100%
rename from src/gen/params.cpp
rename to src/params.cpp
diff --git a/src/gen/params.hpp b/src/params.hpp
similarity index 100%
rename from src/gen/params.hpp
rename to src/params.hpp
diff --git a/src/gen/template.cpp b/src/template.cpp
similarity index 100%
rename from src/gen/template.cpp
rename to src/template.cpp
diff --git a/src/gen/template.hpp b/src/template.hpp
similarity index 100%
rename from src/gen/template.hpp
rename to src/template.hpp

From 1a7fc3e2f3032b40d7b83519bf0f9d841b4f72fb Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 3 Jan 2025 14:42:32 +0100
Subject: [PATCH 232/430] Add versions of params_t::set() function and add some
 tests

It seems superfluous to have all these implementations of the set()
function, but there are some problems with MSVC 2019, and this is the
workaround. See https://developercommunity.visualstudio.com/t/10242620
---
 src/params.hpp        | 37 ++++++++++++++++++++++--
 tests/CMakeLists.txt  |  1 +
 tests/test-params.cpp | 65 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 101 insertions(+), 2 deletions(-)
 create mode 100644 tests/test-params.cpp

diff --git a/src/params.hpp b/src/params.hpp
index 174465820..14c957e80 100644
--- a/src/params.hpp
+++ b/src/params.hpp
@@ -33,10 +33,43 @@ std::string to_string(param_value_t const &value);
 class params_t
 {
 public:
-    template <typename K, typename V>
+    // It seems superfluous to have all these implementations of the set()
+    // function, but there are some problems with MSVC 2019, and this is the
+    // workaround. See https://developercommunity.visualstudio.com/t/10242620
+    template <typename K>
+    void set(K &&key, bool value)
+    {
+        m_map.insert_or_assign(std::forward<K>(key), value);
+    }
+
+    template <typename K>
+    void set(K &&key, double value)
+    {
+        m_map.insert_or_assign(std::forward<K>(key), value);
+    }
+
+    template <typename K>
+    void set(K &&key, float value)
+    {
+        m_map.insert_or_assign(std::forward<K>(key), value);
+    }
+
+    template <typename K, typename V,
+              std::enable_if_t<std::is_integral_v<std::remove_reference_t<V>>,
+                               bool> = true>
+    void set(K &&key, V value)
+    {
+        m_map.insert_or_assign(std::forward<K>(key),
+                               static_cast<int64_t>(value));
+    }
+
+    template <
+        typename K, typename V,
+        std::enable_if_t<!std::is_arithmetic_v<std::remove_reference_t<V>>,
+                         bool> = true>
     void set(K &&key, V &&value)
     {
-        m_map.insert_or_assign(std::forward<K>(key), std::forward<V>(value));
+        m_map.insert_or_assign(std::forward<K>(key), std::string(value));
     }
 
     template <typename K>
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3e85a303b..d3be5455a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -86,6 +86,7 @@ set_test(test-output-pgsql-style-file)
 set_test(test-output-pgsql-tablespace LABELS Tablespace)
 set_test(test-output-pgsql-validgeom)
 set_test(test-output-pgsql-z_order)
+set_test(test-params LABELS NoDB)
 set_test(test-persistent-cache LABELS NoDB)
 set_test(test-pgsql)
 set_test(test-pgsql-capabilities)
diff --git a/tests/test-params.cpp b/tests/test-params.cpp
new file mode 100644
index 000000000..3e5c707bc
--- /dev/null
+++ b/tests/test-params.cpp
@@ -0,0 +1,65 @@
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+#include <catch.hpp>
+
+#include "params.hpp"
+
+TEST_CASE("Set param value", "[NoDB]")
+{
+    param_value_t const p_null{null_param_t()};
+    param_value_t const p_str{std::string{"foo"}};
+    param_value_t const p_int{static_cast<int64_t>(26)};
+    param_value_t const p_double{3.141};
+    param_value_t const p_true{true};
+    param_value_t const p_false{false};
+
+    REQUIRE(to_string(p_null).empty());
+    REQUIRE(to_string(p_str) == "foo");
+    REQUIRE(to_string(p_int) == "26");
+    REQUIRE(to_string(p_double) == "3.141");
+    REQUIRE(to_string(p_true) == "true");
+    REQUIRE(to_string(p_false) == "false");
+}
+
+TEST_CASE("Params with different value types", "[NoDB]")
+{
+    params_t params;
+    REQUIRE_FALSE(params.has("foo"));
+
+    params.set("foo", 99);
+    REQUIRE(params.has("foo"));
+    REQUIRE(params.get("foo") == param_value_t(static_cast<int64_t>(99)));
+    REQUIRE(params.get_int64("foo") == 99);
+
+    params.set("foo", "astring");
+    REQUIRE(params.has("foo"));
+    REQUIRE(params.get("foo") == param_value_t(std::string("astring")));
+    REQUIRE(params.get_string("foo") == "astring");
+    REQUIRE_THROWS(params.get_int64("foo"));
+}
+
+TEST_CASE("Set params with explicit type", "[NoDB]")
+{
+    params_t params;
+
+    params.set("isstring", "hi");
+    params.set("isint", 567);
+    params.set("isdouble", 567.0);
+    params.set("istrue", true);
+    params.set("isfalse", false);
+
+    REQUIRE(params.get_string("isstring") == "hi");
+    REQUIRE(params.get_int64("isint") == 567);
+    REQUIRE(params.get_double("isdouble") == Approx(567.0));
+    REQUIRE(params.get_bool("istrue"));
+    REQUIRE_FALSE(params.get_bool("isfalse"));
+
+    REQUIRE_THROWS(params.get("does not exist"));
+}

From cd2e128e670c54152fe4a60073792fb0a4f28b78 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 13 Dec 2024 16:50:49 +0100
Subject: [PATCH 233/430] Refactor: Use templates to create middle tables

Add new middle_pgsql_t::render_template() and middle_pgsql_t::dbexec()
functions and use them to create middle tables.
---
 src/middle-pgsql.cpp | 155 ++++++++++++++++++++++++++-----------------
 src/middle-pgsql.hpp |  10 +--
 2 files changed, 101 insertions(+), 64 deletions(-)

diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index b4bf1bcdb..e02a9b620 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -130,14 +130,25 @@ std::vector<std::string> build_sql(options_t const &options,
 
 middle_pgsql_t::table_desc::table_desc(options_t const &options,
                                        table_sql const &ts)
-: m_create_table(build_sql(options, ts.create_table)),
-  m_prepare_queries(build_sql(options, ts.prepare_queries)),
+: m_prepare_queries(build_sql(options, ts.prepare_queries)),
   m_copy_target(std::make_shared<db_target_descr_t>(
       options.middle_dbschema, build_sql(options, ts.name), "id"))
 {
     m_create_fw_dep_indexes = build_sql(options, ts.create_fw_dep_indexes);
 }
 
+std::string middle_pgsql_t::render_template(std::string_view templ) const
+{
+    template_t sql_template{templ};
+    sql_template.set_params(m_params);
+    return sql_template.render();
+}
+
+void middle_pgsql_t::dbexec(std::string_view templ) const
+{
+    m_db_connection.exec(render_template(templ));
+}
+
 void middle_query_pgsql_t::exec_sql(std::string const &sql_cmd) const
 {
     m_db_connection.exec(sql_cmd);
@@ -171,14 +182,6 @@ void middle_pgsql_t::table_desc::build_index(
     }
 }
 
-void middle_pgsql_t::table_desc::create_table(
-    pg_conn_t const &db_connection) const
-{
-    if (!m_create_table.empty()) {
-        db_connection.exec(m_create_table);
-    }
-}
-
 void middle_pgsql_t::table_desc::init_max_id(pg_conn_t const &db_connection)
 {
     auto const qual_name = qualified_name(schema(), name());
@@ -696,7 +699,7 @@ INSERT INTO osm2pgsql_changed_relations
     )");
 
     for (auto const &query : queries) {
-        m_db_connection.exec(build_sql(*m_options, query));
+        dbexec(query);
     }
 
     if (parent_ways) {
@@ -741,12 +744,12 @@ void middle_pgsql_t::get_way_parents(idlist_t const &changed_ways,
 
     m_db_connection.exec("ANALYZE osm2pgsql_changed_ways");
 
-    m_db_connection.exec(build_sql(*m_options, R"(
+    dbexec(R"(
 INSERT INTO osm2pgsql_changed_relations
   SELECT DISTINCT r.id
     FROM {schema}"{prefix}_rels" r, osm2pgsql_changed_ways c
     WHERE {schema}"{prefix}_member_ids"(r.members, 'W'::char) && ARRAY[c.id];
-    )"));
+    )");
 
     load_id_list(m_db_connection, "osm2pgsql_changed_relations",
                  parent_relations);
@@ -1046,18 +1049,6 @@ middle_query_pgsql_t::middle_query_pgsql_t(
     m_db_connection.set_config("max_parallel_workers_per_gather", "0");
 }
 
-namespace {
-
-void table_setup(pg_conn_t const &db_connection,
-                 middle_pgsql_t::table_desc const &table)
-{
-    log_debug("Setting up table '{}'", table.name());
-    drop_table_if_exists(db_connection, table.schema(), table.name());
-    table.create_table(db_connection);
-}
-
-} // anonymous namespace
-
 void middle_pgsql_t::start()
 {
     assert(m_middle_state == middle_state::constructed);
@@ -1080,11 +1071,46 @@ void middle_pgsql_t::start()
         }
         m_tables.ways().init_max_id(m_db_connection);
         m_tables.relations().init_max_id(m_db_connection);
-    } else {
-        table_setup(m_db_connection, m_users_table);
-        for (auto const &table : m_tables) {
-            table_setup(m_db_connection, table);
-        }
+        return;
+    }
+
+    if (m_store_options.nodes) {
+        log_debug("Setting up table 'nodes'");
+        dbexec(R"(DROP TABLE IF EXISTS {schema}"{prefix}_nodes" CASCADE)");
+        dbexec("CREATE {unlogged} TABLE {schema}\"{prefix}_nodes\" ("
+               " id int8 PRIMARY KEY {using_tablespace},"
+               " lat int4 NOT NULL,"
+               " lon int4 NOT NULL,"
+               "{attribute_columns_definition}"
+               " tags jsonb"
+               ") {data_tablespace}");
+    }
+
+    log_debug("Setting up table 'ways'");
+    dbexec(R"(DROP TABLE IF EXISTS {schema}"{prefix}_ways" CASCADE)");
+    dbexec("CREATE {unlogged} TABLE {schema}\"{prefix}_ways\" ("
+           " id int8 PRIMARY KEY {using_tablespace},"
+           "{attribute_columns_definition}"
+           " nodes int8[] NOT NULL,"
+           " tags jsonb"
+           ") {data_tablespace}");
+
+    log_debug("Setting up table 'rels'");
+    dbexec(R"(DROP TABLE IF EXISTS {schema}"{prefix}_rels" CASCADE)");
+    dbexec("CREATE {unlogged} TABLE {schema}\"{prefix}_rels\" ("
+           " id int8 PRIMARY KEY {using_tablespace},"
+           "{attribute_columns_definition}"
+           " members jsonb NOT NULL,"
+           " tags jsonb"
+           ") {data_tablespace}");
+
+    if (m_store_options.with_attributes) {
+        log_debug("Setting up table 'users'");
+        dbexec(R"(DROP TABLE IF EXISTS {schema}"{prefix}_users" CASCADE)");
+        dbexec("CREATE TABLE {schema}\"{prefix}_users\" ("
+               " id INT4 PRIMARY KEY {using_tablespace},"
+               " name TEXT NOT NULL"
+               ") {data_tablespace}");
     }
 }
 
@@ -1168,13 +1194,6 @@ table_sql sql_for_users(middle_pgsql_options const &store_options)
 
     sql.name = "{prefix}_users";
 
-    if (store_options.with_attributes) {
-        sql.create_table = "CREATE TABLE {schema}\"{prefix}_users\" ("
-                           " id INT4 PRIMARY KEY {using_tablespace},"
-                           " name TEXT NOT NULL"
-                           ") {data_tablespace}";
-    }
-
     return sql;
 }
 
@@ -1185,15 +1204,6 @@ table_sql sql_for_nodes(middle_pgsql_options const &options)
     sql.name = "{prefix}_nodes";
 
     if (options.nodes) {
-        sql.create_table =
-            "CREATE {unlogged} TABLE {schema}\"{prefix}_nodes\" ("
-            " id int8 PRIMARY KEY {using_tablespace},"
-            " lat int4 NOT NULL,"
-            " lon int4 NOT NULL,"
-            "{attribute_columns_definition}"
-            " tags jsonb"
-            ") {data_tablespace}";
-
         sql.prepare_queries = {
             "PREPARE get_node_list(int8[]) AS"
             " SELECT id, lon, lat FROM {schema}\"{prefix}_nodes\""
@@ -1212,13 +1222,6 @@ table_sql sql_for_ways()
 
     sql.name = "{prefix}_ways";
 
-    sql.create_table = "CREATE {unlogged} TABLE {schema}\"{prefix}_ways\" ("
-                       " id int8 PRIMARY KEY {using_tablespace},"
-                       "{attribute_columns_definition}"
-                       " nodes int8[] NOT NULL,"
-                       " tags jsonb"
-                       ") {data_tablespace}";
-
     sql.prepare_queries = {"PREPARE get_way(int8) AS"
                            " SELECT nodes, tags{attribute_columns_use}"
                            " FROM {schema}\"{prefix}_ways\" o"
@@ -1251,13 +1254,6 @@ table_sql sql_for_relations()
 
     sql.name = "{prefix}_rels";
 
-    sql.create_table = "CREATE {unlogged} TABLE {schema}\"{prefix}_rels\" ("
-                       " id int8 PRIMARY KEY {using_tablespace},"
-                       "{attribute_columns_definition}"
-                       " members jsonb NOT NULL,"
-                       " tags jsonb"
-                       ") {data_tablespace}";
-
     sql.prepare_queries = {"PREPARE get_rel(int8) AS"
                            " SELECT members, tags{attribute_columns_use}"
                            " FROM {schema}\"{prefix}_rels\" o"
@@ -1284,6 +1280,43 @@ table_sql sql_for_relations()
     return sql;
 }
 
+void init_params(params_t *params, options_t const &options)
+{
+    std::string const schema = "\"" + options.middle_dbschema + "\".";
+
+    params->set("prefix", options.prefix);
+    params->set("schema", schema);
+    params->set("unlogged", options.droptemp ? "UNLOGGED" : "");
+    params->set("data_tablespace", tablespace_clause(options.tblsslim_data));
+    params->set("index_tablespace", tablespace_clause(options.tblsslim_index));
+    params->set("way_node_index_id_shift", 5);
+
+    if (options.tblsslim_index.empty()) {
+        params->set("using_tablespace", "");
+    } else {
+        params->set("using_tablespace",
+                    "USING INDEX TABLESPACE " + options.tblsslim_index);
+    }
+
+    if (options.extra_attributes) {
+        params->set("attribute_columns_definition",
+                    " created timestamp with time zone,"
+                    " version int4,"
+                    " changeset_id int4,"
+                    " user_id int4,");
+        params->set("attribute_columns_use",
+                    ", EXTRACT(EPOCH FROM created) AS created, version, "
+                    "changeset_id, user_id, u.name");
+        params->set("users_table_access", "LEFT JOIN " + schema + '"' +
+                                              options.prefix +
+                                              "_users\" u ON o.user_id = u.id");
+    } else {
+        params->set("attribute_columns_definition", "");
+        params->set("attribute_columns_use", "");
+        params->set("users_table_access", "");
+    }
+}
+
 } // anonymous namespace
 
 middle_pgsql_t::middle_pgsql_t(std::shared_ptr<thread_pool_t> thread_pool,
@@ -1312,6 +1345,8 @@ middle_pgsql_t::middle_pgsql_t(std::shared_ptr<thread_pool_t> thread_pool,
 
     log_debug("Mid: pgsql, cache={}", options->cache);
 
+    init_params(&m_params, *options);
+
     m_tables.nodes() = table_desc{*options, sql_for_nodes(m_store_options)};
     m_tables.ways() = table_desc{*options, sql_for_ways()};
     m_tables.relations() = table_desc{*options, sql_for_relations()};
diff --git a/src/middle-pgsql.hpp b/src/middle-pgsql.hpp
index 4c7dd9218..dfad00535 100644
--- a/src/middle-pgsql.hpp
+++ b/src/middle-pgsql.hpp
@@ -26,6 +26,7 @@
 #include "db-copy-mgr.hpp"
 #include "idlist.hpp"
 #include "middle.hpp"
+#include "params.hpp"
 #include "pgsql.hpp"
 
 class node_locations_t;
@@ -88,7 +89,6 @@ class middle_query_pgsql_t : public middle_query_t
 struct table_sql
 {
     std::string name;
-    std::string create_table;
     std::vector<std::string> prepare_queries;
     std::vector<std::string> create_fw_dep_indexes;
 };
@@ -151,8 +151,6 @@ struct middle_pgsql_t : public middle_t
 
         std::chrono::microseconds task_wait() { return m_task_result.wait(); }
 
-        void create_table(pg_conn_t const &db_connection) const;
-
         void init_max_id(pg_conn_t const &db_connection);
 
         osmid_t max_id() const noexcept { return m_max_id; }
@@ -163,7 +161,6 @@ struct middle_pgsql_t : public middle_t
         }
 
     private:
-        std::string m_create_table;
         std::vector<std::string> m_create_fw_dep_indexes;
         std::vector<std::string> m_prepare_queries;
         std::shared_ptr<db_target_descr_t> m_copy_target;
@@ -193,6 +190,9 @@ struct middle_pgsql_t : public middle_t
     void write_users_table();
     void update_users_table();
 
+    std::string render_template(std::string_view templ) const;
+    void dbexec(std::string_view templ) const;
+
     std::map<osmium::user_id_type, std::string> m_users;
     osmium::nwr_array<table_desc> m_tables;
     table_desc m_users_table;
@@ -211,6 +211,8 @@ struct middle_pgsql_t : public middle_t
     /// Options for this middle.
     middle_pgsql_options m_store_options;
 
+    params_t m_params;
+
     bool m_append;
 };
 

From 777394f55c008b8ebc29eea803d54ba36b350e66 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 13 Dec 2024 17:08:32 +0100
Subject: [PATCH 234/430] Refactor: Use template rendering and explicit prepare
 function

for preparing queries in the middle
---
 src/middle-pgsql.cpp | 71 +++++++++++++++++++++-----------------------
 src/middle-pgsql.hpp |  9 +-----
 2 files changed, 35 insertions(+), 45 deletions(-)

diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index e02a9b620..be6c2da56 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -130,8 +130,7 @@ std::vector<std::string> build_sql(options_t const &options,
 
 middle_pgsql_t::table_desc::table_desc(options_t const &options,
                                        table_sql const &ts)
-: m_prepare_queries(build_sql(options, ts.prepare_queries)),
-  m_copy_target(std::make_shared<db_target_descr_t>(
+: m_copy_target(std::make_shared<db_target_descr_t>(
       options.middle_dbschema, build_sql(options, ts.name), "id"))
 {
     m_create_fw_dep_indexes = build_sql(options, ts.create_fw_dep_indexes);
@@ -149,9 +148,10 @@ void middle_pgsql_t::dbexec(std::string_view templ) const
     m_db_connection.exec(render_template(templ));
 }
 
-void middle_query_pgsql_t::exec_sql(std::string const &sql_cmd) const
+void middle_query_pgsql_t::prepare(std::string_view stmt,
+                                   std::string const &sql_cmd) const
 {
-    m_db_connection.exec(sql_cmd);
+    m_db_connection.prepare(stmt, fmt::runtime(sql_cmd));
 }
 
 void middle_pgsql_t::table_desc::drop_table(
@@ -1203,16 +1203,6 @@ table_sql sql_for_nodes(middle_pgsql_options const &options)
 
     sql.name = "{prefix}_nodes";
 
-    if (options.nodes) {
-        sql.prepare_queries = {
-            "PREPARE get_node_list(int8[]) AS"
-            " SELECT id, lon, lat FROM {schema}\"{prefix}_nodes\""
-            " WHERE id = ANY($1::int8[])",
-            "PREPARE get_node(int8) AS"
-            " SELECT id, lon, lat FROM {schema}\"{prefix}_nodes\""
-            " WHERE id = $1"};
-    }
-
     return sql;
 }
 
@@ -1222,17 +1212,6 @@ table_sql sql_for_ways()
 
     sql.name = "{prefix}_ways";
 
-    sql.prepare_queries = {"PREPARE get_way(int8) AS"
-                           " SELECT nodes, tags{attribute_columns_use}"
-                           " FROM {schema}\"{prefix}_ways\" o"
-                           " {users_table_access}"
-                           " WHERE o.id = $1",
-                           "PREPARE get_way_list(int8[]) AS"
-                           " SELECT o.id, nodes, tags{attribute_columns_use}"
-                           " FROM {schema}\"{prefix}_ways\" o"
-                           "  {users_table_access}"
-                           " WHERE o.id = ANY($1::int8[])"};
-
     sql.create_fw_dep_indexes = {
         "CREATE OR REPLACE FUNCTION"
         "    {schema}\"{prefix}_index_bucket\"(int8[])"
@@ -1254,12 +1233,6 @@ table_sql sql_for_relations()
 
     sql.name = "{prefix}_rels";
 
-    sql.prepare_queries = {"PREPARE get_rel(int8) AS"
-                           " SELECT members, tags{attribute_columns_use}"
-                           " FROM {schema}\"{prefix}_rels\" o"
-                           " {users_table_access}"
-                           " WHERE o.id = $1"};
-
     sql.create_fw_dep_indexes = {
         "CREATE OR REPLACE FUNCTION"
         " {schema}\"{prefix}_member_ids\"(jsonb, char)"
@@ -1373,12 +1346,36 @@ middle_pgsql_t::get_query_instance()
         m_options->connection_params, m_cache, m_persistent_cache,
         m_store_options);
 
-    // We use a connection per table to enable the use of COPY
-    for (auto &table : m_tables) {
-        for (auto const &query : table.prepare_queries()) {
-            mid->exec_sql(query);
-        }
-    }
+    if (m_store_options.nodes) {
+        mid->prepare("get_node",
+                     render_template(
+                         "SELECT id, lon, lat FROM {schema}\"{prefix}_nodes\""
+                         " WHERE id = $1::int8"));
+
+        mid->prepare("get_node_list",
+                     render_template(
+                         "SELECT id, lon, lat FROM {schema}\"{prefix}_nodes\""
+                         " WHERE id = ANY($1::int8[])"));
+    }
+
+    mid->prepare("get_way",
+                 render_template("SELECT nodes, tags{attribute_columns_use}"
+                                 " FROM {schema}\"{prefix}_ways\" o"
+                                 " {users_table_access}"
+                                 " WHERE o.id = $1::int8"));
+
+    mid->prepare(
+        "get_way_list",
+        render_template("SELECT o.id, nodes, tags{attribute_columns_use}"
+                        " FROM {schema}\"{prefix}_ways\" o"
+                        "  {users_table_access}"
+                        " WHERE o.id = ANY($1::int8[])"));
+
+    mid->prepare("get_rel",
+                 render_template("SELECT members, tags{attribute_columns_use}"
+                                 " FROM {schema}\"{prefix}_rels\" o"
+                                 " {users_table_access}"
+                                 " WHERE o.id = $1::int8"));
 
     return std::shared_ptr<middle_query_t>(mid.release());
 }
diff --git a/src/middle-pgsql.hpp b/src/middle-pgsql.hpp
index dfad00535..af9d8c4f6 100644
--- a/src/middle-pgsql.hpp
+++ b/src/middle-pgsql.hpp
@@ -71,7 +71,7 @@ class middle_query_pgsql_t : public middle_query_t
     bool relation_get(osmid_t id,
                       osmium::memory::Buffer *buffer) const override;
 
-    void exec_sql(std::string const &sql_cmd) const;
+    void prepare(std::string_view stmt, std::string const &sql_cmd) const;
 
 private:
     osmium::Location get_node_location_flatnodes(osmid_t id) const;
@@ -89,7 +89,6 @@ class middle_query_pgsql_t : public middle_query_t
 struct table_sql
 {
     std::string name;
-    std::vector<std::string> prepare_queries;
     std::vector<std::string> create_fw_dep_indexes;
 };
 
@@ -155,14 +154,8 @@ struct middle_pgsql_t : public middle_t
 
         osmid_t max_id() const noexcept { return m_max_id; }
 
-        std::vector<std::string> const &prepare_queries() const noexcept
-        {
-            return m_prepare_queries;
-        }
-
     private:
         std::vector<std::string> m_create_fw_dep_indexes;
-        std::vector<std::string> m_prepare_queries;
         std::shared_ptr<db_target_descr_t> m_copy_target;
         task_result_t m_task_result;
 

From 094dfa06892f539b56c569aeb7d06c9b27cb57bf Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 13 Dec 2024 17:23:03 +0100
Subject: [PATCH 235/430] Refactor: Switch index creation to new template code
 in middle

---
 src/middle-pgsql.cpp | 114 +++++++++++++++++++------------------------
 src/middle-pgsql.hpp |   5 --
 2 files changed, 49 insertions(+), 70 deletions(-)

diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index be6c2da56..99102e101 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -113,19 +113,6 @@ std::string build_sql(options_t const &options, std::string const &templ)
     return sql_template.render();
 }
 
-std::vector<std::string> build_sql(options_t const &options,
-                                   std::vector<std::string> const &templs)
-{
-    std::vector<std::string> out;
-    out.reserve(templs.size());
-
-    for (auto const &templ : templs) {
-        out.push_back(build_sql(options, templ));
-    }
-
-    return out;
-}
-
 } // anonymous namespace
 
 middle_pgsql_t::table_desc::table_desc(options_t const &options,
@@ -133,7 +120,6 @@ middle_pgsql_t::table_desc::table_desc(options_t const &options,
 : m_copy_target(std::make_shared<db_target_descr_t>(
       options.middle_dbschema, build_sql(options, ts.name), "id"))
 {
-    m_create_fw_dep_indexes = build_sql(options, ts.create_fw_dep_indexes);
 }
 
 std::string middle_pgsql_t::render_template(std::string_view templ) const
@@ -165,23 +151,6 @@ void middle_pgsql_t::table_desc::drop_table(
              util::human_readable_duration(timer.stop()));
 }
 
-void middle_pgsql_t::table_desc::build_index(
-    connection_params_t const &connection_params) const
-{
-    if (m_create_fw_dep_indexes.empty()) {
-        return;
-    }
-
-    // Use a temporary connection here because we might run in a separate
-    // thread context.
-    pg_conn_t const db_connection{connection_params, "middle.index"};
-
-    log_info("Building index on table '{}'", name());
-    for (auto const &query : m_create_fw_dep_indexes) {
-        db_connection.exec(query);
-    }
-}
-
 void middle_pgsql_t::table_desc::init_max_id(pg_conn_t const &db_connection)
 {
     auto const qual_name = qualified_name(schema(), name());
@@ -1169,11 +1138,55 @@ void middle_pgsql_t::stop()
             table.drop_table(m_db_connection);
         }
     } else if (!m_options->append) {
-        // Building the indexes takes time, so do it asynchronously.
-        for (auto &table : m_tables) {
-            table.task_set(thread_pool().submit(
-                [&]() { table.build_index(m_options->connection_params); }));
-        }
+        dbexec("CREATE OR REPLACE FUNCTION"
+               "    {schema}\"{prefix}_index_bucket\"(int8[])"
+               "  RETURNS int8[] AS $$"
+               "  SELECT ARRAY(SELECT DISTINCT"
+               "    unnest($1) >> {way_node_index_id_shift})"
+               "$$ LANGUAGE SQL IMMUTABLE");
+
+        auto const create_ways_index = render_template(
+            "CREATE INDEX \"{prefix}_ways_nodes_bucket_idx\""
+            " ON {schema}\"{prefix}_ways\""
+            " USING GIN ({schema}\"{prefix}_index_bucket\"(nodes))"
+            " WITH (fastupdate = off) {index_tablespace}");
+
+        log_info("Building index on middle ways table");
+        m_tables.ways().task_set(thread_pool().submit([&, create_ways_index]() {
+            pg_conn_t const db_connection{m_options->connection_params,
+                                          "middle.index.ways"};
+            db_connection.exec(create_ways_index);
+        }));
+
+        dbexec("CREATE OR REPLACE FUNCTION"
+               " {schema}\"{prefix}_member_ids\"(jsonb, char)"
+               " RETURNS int8[] AS $$"
+               "  SELECT array_agg((el->>'ref')::int8)"
+               "   FROM jsonb_array_elements($1) AS el"
+               "    WHERE el->>'type' = $2"
+               "$$ LANGUAGE SQL IMMUTABLE");
+
+        auto const create_rels_index_node_members = render_template(
+            "CREATE INDEX \"{prefix}_rels_node_members_idx\""
+            " ON {schema}\"{prefix}_rels\" USING GIN"
+            " (({schema}\"{prefix}_member_ids\"(members, 'N'::char)))"
+            " WITH (fastupdate = off) {index_tablespace}");
+
+        auto const create_rels_index_way_members = render_template(
+            "CREATE INDEX \"{prefix}_rels_way_members_idx\""
+            " ON {schema}\"{prefix}_rels\" USING GIN"
+            " (({schema}\"{prefix}_member_ids\"(members, 'W'::char)))"
+            " WITH (fastupdate = off) {index_tablespace}");
+
+        log_info("Building indexes on middle rels table");
+        m_tables.relations().task_set(
+            thread_pool().submit([&, create_rels_index_node_members,
+                                  create_rels_index_way_members]() {
+                pg_conn_t const db_connection{m_options->connection_params,
+                                              "middle.index.rels"};
+                db_connection.exec(create_rels_index_node_members);
+                db_connection.exec(create_rels_index_way_members);
+            }));
     }
 }
 
@@ -1212,18 +1225,6 @@ table_sql sql_for_ways()
 
     sql.name = "{prefix}_ways";
 
-    sql.create_fw_dep_indexes = {
-        "CREATE OR REPLACE FUNCTION"
-        "    {schema}\"{prefix}_index_bucket\"(int8[])"
-        "  RETURNS int8[] AS $$"
-        "  SELECT ARRAY(SELECT DISTINCT"
-        "    unnest($1) >> {way_node_index_id_shift})"
-        "$$ LANGUAGE SQL IMMUTABLE",
-        "CREATE INDEX \"{prefix}_ways_nodes_bucket_idx\""
-        "  ON {schema}\"{prefix}_ways\""
-        "  USING GIN ({schema}\"{prefix}_index_bucket\"(nodes))"
-        "  WITH (fastupdate = off) {index_tablespace}"};
-
     return sql;
 }
 
@@ -1233,23 +1234,6 @@ table_sql sql_for_relations()
 
     sql.name = "{prefix}_rels";
 
-    sql.create_fw_dep_indexes = {
-        "CREATE OR REPLACE FUNCTION"
-        " {schema}\"{prefix}_member_ids\"(jsonb, char)"
-        " RETURNS int8[] AS $$"
-        "  SELECT array_agg((el->>'ref')::int8)"
-        "   FROM jsonb_array_elements($1) AS el"
-        "    WHERE el->>'type' = $2"
-        "$$ LANGUAGE SQL IMMUTABLE",
-        "CREATE INDEX \"{prefix}_rels_node_members_idx\""
-        "  ON {schema}\"{prefix}_rels\" USING GIN"
-        "  (({schema}\"{prefix}_member_ids\"(members, 'N'::char)))"
-        "  WITH (fastupdate = off) {index_tablespace}",
-        "CREATE INDEX \"{prefix}_rels_way_members_idx\""
-        "  ON {schema}\"{prefix}_rels\" USING GIN"
-        "  (({schema}\"{prefix}_member_ids\"(members, 'W'::char)))"
-        "  WITH (fastupdate = off) {index_tablespace}"};
-
     return sql;
 }
 
diff --git a/src/middle-pgsql.hpp b/src/middle-pgsql.hpp
index af9d8c4f6..3744bba58 100644
--- a/src/middle-pgsql.hpp
+++ b/src/middle-pgsql.hpp
@@ -89,7 +89,6 @@ class middle_query_pgsql_t : public middle_query_t
 struct table_sql
 {
     std::string name;
-    std::vector<std::string> create_fw_dep_indexes;
 };
 
 struct middle_pgsql_t : public middle_t
@@ -140,9 +139,6 @@ struct middle_pgsql_t : public middle_t
         ///< Drop table from database using existing database connection.
         void drop_table(pg_conn_t const &db_connection) const;
 
-        ///< Open a new database connection and build index on this table.
-        void build_index(connection_params_t const &connection_params) const;
-
         void task_set(std::future<std::chrono::microseconds> &&future)
         {
             m_task_result.set(std::move(future));
@@ -155,7 +151,6 @@ struct middle_pgsql_t : public middle_t
         osmid_t max_id() const noexcept { return m_max_id; }
 
     private:
-        std::vector<std::string> m_create_fw_dep_indexes;
         std::shared_ptr<db_target_descr_t> m_copy_target;
         task_result_t m_task_result;
 

From f2195c37d5872c2f3a5f2552acaec3f3e98b51b5 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 2 Jan 2025 20:39:27 +0100
Subject: [PATCH 236/430] Refactor: Remove the last part of the table_sql
 struct, the name

---
 src/middle-pgsql.cpp | 49 +++++++-------------------------------------
 src/middle-pgsql.hpp |  7 +------
 2 files changed, 8 insertions(+), 48 deletions(-)

diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index 99102e101..3f1d0a804 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -116,9 +116,10 @@ std::string build_sql(options_t const &options, std::string const &templ)
 } // anonymous namespace
 
 middle_pgsql_t::table_desc::table_desc(options_t const &options,
-                                       table_sql const &ts)
+                                       std::string_view name)
 : m_copy_target(std::make_shared<db_target_descr_t>(
-      options.middle_dbschema, build_sql(options, ts.name), "id"))
+      options.middle_dbschema, fmt::format("{}_{}", options.prefix, name),
+      "id"))
 {
 }
 
@@ -1201,42 +1202,6 @@ void middle_pgsql_t::wait()
 
 namespace {
 
-table_sql sql_for_users(middle_pgsql_options const &store_options)
-{
-    table_sql sql{};
-
-    sql.name = "{prefix}_users";
-
-    return sql;
-}
-
-table_sql sql_for_nodes(middle_pgsql_options const &options)
-{
-    table_sql sql{};
-
-    sql.name = "{prefix}_nodes";
-
-    return sql;
-}
-
-table_sql sql_for_ways()
-{
-    table_sql sql{};
-
-    sql.name = "{prefix}_ways";
-
-    return sql;
-}
-
-table_sql sql_for_relations()
-{
-    table_sql sql{};
-
-    sql.name = "{prefix}_rels";
-
-    return sql;
-}
-
 void init_params(params_t *params, options_t const &options)
 {
     std::string const schema = "\"" + options.middle_dbschema + "\".";
@@ -1304,11 +1269,11 @@ middle_pgsql_t::middle_pgsql_t(std::shared_ptr<thread_pool_t> thread_pool,
 
     init_params(&m_params, *options);
 
-    m_tables.nodes() = table_desc{*options, sql_for_nodes(m_store_options)};
-    m_tables.ways() = table_desc{*options, sql_for_ways()};
-    m_tables.relations() = table_desc{*options, sql_for_relations()};
+    m_tables.nodes() = table_desc{*options, "nodes"};
+    m_tables.ways() = table_desc{*options, "ways"};
+    m_tables.relations() = table_desc{*options, "rels"};
 
-    m_users_table = table_desc{*options, sql_for_users(m_store_options)};
+    m_users_table = table_desc{*options, "users"};
 }
 
 void middle_pgsql_t::set_requirements(
diff --git a/src/middle-pgsql.hpp b/src/middle-pgsql.hpp
index 3744bba58..238b08cc7 100644
--- a/src/middle-pgsql.hpp
+++ b/src/middle-pgsql.hpp
@@ -86,11 +86,6 @@ class middle_query_pgsql_t : public middle_query_t
     middle_pgsql_options m_store_options;
 };
 
-struct table_sql
-{
-    std::string name;
-};
-
 struct middle_pgsql_t : public middle_t
 {
     middle_pgsql_t(std::shared_ptr<thread_pool_t> thread_pool,
@@ -119,7 +114,7 @@ struct middle_pgsql_t : public middle_t
     {
     public:
         table_desc() = default;
-        table_desc(options_t const &options, table_sql const &ts);
+        table_desc(options_t const &options, std::string_view name);
 
         std::string const &schema() const noexcept
         {

From 25f77a8a32c529984c1656221fbcb8b74f607824 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 2 Jan 2025 20:59:02 +0100
Subject: [PATCH 237/430] Refactor: Remove m_users_table member variable

Making the code simpler.
---
 src/middle-pgsql.cpp | 23 +++++++++++------------
 src/middle-pgsql.hpp |  1 -
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index 3f1d0a804..302cad55d 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -1086,10 +1086,12 @@ void middle_pgsql_t::start()
 
 void middle_pgsql_t::write_users_table()
 {
-    log_info("Writing {} entries to table '{}'...", m_users.size(),
-             m_users_table.name());
+    auto const table_name = m_options->prefix + "_users";
+
+    log_info("Writing {} entries to table '{}'...", m_users.size(), table_name);
+
     auto const users_table = std::make_shared<db_target_descr_t>(
-        m_users_table.schema(), m_users_table.name(), "id");
+        m_options->dbschema, table_name, "id");
 
     for (auto const &[id, name] : m_users) {
         m_db_copy.new_line(users_table);
@@ -1100,20 +1102,20 @@ void middle_pgsql_t::write_users_table()
 
     m_users.clear();
 
-    analyze_table(m_db_connection, m_users_table.schema(),
-                  m_users_table.name());
+    analyze_table(m_db_connection, m_options->dbschema, table_name);
 }
 
 void middle_pgsql_t::update_users_table()
 {
-    log_info("Writing {} entries to table '{}'...", m_users.size(),
-             m_users_table.name());
+    auto const table_name = m_options->prefix + "_users";
+
+    log_info("Writing {} entries to table '{}'...", m_users.size(), table_name);
 
     m_db_connection.prepare(
         "insert_user",
         "INSERT INTO {}.\"{}\" (id, name) VALUES ($1::int8, $2::text)"
         " ON CONFLICT (id) DO UPDATE SET id=EXCLUDED.id",
-        m_users_table.schema(), m_users_table.name());
+        m_options->dbschema, table_name);
 
     for (auto const &[id, name] : m_users) {
         m_db_connection.exec_prepared("insert_user", id, name);
@@ -1121,8 +1123,7 @@ void middle_pgsql_t::update_users_table()
 
     m_users.clear();
 
-    analyze_table(m_db_connection, m_users_table.schema(),
-                  m_users_table.name());
+    analyze_table(m_db_connection, m_options->dbschema, table_name);
 }
 
 void middle_pgsql_t::stop()
@@ -1272,8 +1273,6 @@ middle_pgsql_t::middle_pgsql_t(std::shared_ptr<thread_pool_t> thread_pool,
     m_tables.nodes() = table_desc{*options, "nodes"};
     m_tables.ways() = table_desc{*options, "ways"};
     m_tables.relations() = table_desc{*options, "rels"};
-
-    m_users_table = table_desc{*options, "users"};
 }
 
 void middle_pgsql_t::set_requirements(
diff --git a/src/middle-pgsql.hpp b/src/middle-pgsql.hpp
index 238b08cc7..1df054d81 100644
--- a/src/middle-pgsql.hpp
+++ b/src/middle-pgsql.hpp
@@ -178,7 +178,6 @@ struct middle_pgsql_t : public middle_t
 
     std::map<osmium::user_id_type, std::string> m_users;
     osmium::nwr_array<table_desc> m_tables;
-    table_desc m_users_table;
 
     options_t const *m_options;
 

From b26f92841a287e7a4c0f9f8ce40d152def5234d3 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 3 Jan 2025 09:16:51 +0100
Subject: [PATCH 238/430] Remove now unused build_sql() function

---
 src/middle-pgsql.cpp | 42 ------------------------------------------
 1 file changed, 42 deletions(-)

diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index 302cad55d..0ed048136 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -71,48 +71,6 @@ void load_id_list(pg_conn_t const &db_connection, std::string const &table,
     }
 }
 
-std::string build_sql(options_t const &options, std::string const &templ)
-{
-    std::string const schema = "\"" + options.middle_dbschema + "\".";
-
-    params_t params;
-    params.set("prefix", options.prefix);
-    params.set("schema", schema);
-    params.set("unlogged", options.droptemp ? "UNLOGGED" : "");
-    params.set("data_tablespace", tablespace_clause(options.tblsslim_data));
-    params.set("index_tablespace", tablespace_clause(options.tblsslim_index));
-    params.set("way_node_index_id_shift", 5);
-
-    if (options.tblsslim_index.empty()) {
-        params.set("using_tablespace", "");
-    } else {
-        params.set("using_tablespace",
-                   "USING INDEX TABLESPACE " + options.tblsslim_index);
-    }
-
-    if (options.extra_attributes) {
-        params.set("attribute_columns_definition",
-                   " created timestamp with time zone,"
-                   " version int4,"
-                   " changeset_id int4,"
-                   " user_id int4,");
-        params.set("attribute_columns_use",
-                   ", EXTRACT(EPOCH FROM created) AS created, version, "
-                   "changeset_id, user_id, u.name");
-        params.set("users_table_access", "LEFT JOIN " + schema + '"' +
-                                             options.prefix +
-                                             "_users\" u ON o.user_id = u.id");
-    } else {
-        params.set("attribute_columns_definition", "");
-        params.set("attribute_columns_use", "");
-        params.set("users_table_access", "");
-    }
-
-    template_t sql_template{templ};
-    sql_template.set_params(params);
-    return sql_template.render();
-}
-
 } // anonymous namespace
 
 middle_pgsql_t::table_desc::table_desc(options_t const &options,

From 6259590d295dbdd178e79e2747bf36620b8ddc45 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 3 Jan 2025 10:30:34 +0100
Subject: [PATCH 239/430] Fix unused variable

---
 src/template.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/template.cpp b/src/template.cpp
index 78d6bed80..b157087f5 100644
--- a/src/template.cpp
+++ b/src/template.cpp
@@ -19,7 +19,7 @@ std::string template_t::render() const
 {
     try {
         return fmt::vformat(m_template, m_format_store);
-    } catch (fmt::format_error const &e) {
+    } catch (fmt::format_error const &) {
         log_error("Missing parameter for template: '{}'", m_template);
         throw;
     }

From c6bb4891f44317477181196af28d5659fc80cad6 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 4 Jan 2025 14:49:31 +0100
Subject: [PATCH 240/430] Label some tests that don't need the database

---
 tests/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d3be5455a..41456d7cf 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -44,7 +44,7 @@ set_test(test-db-copy-thread)
 set_test(test-domain-matcher LABELS NoDB)
 set_test(test-expire-from-geometry LABELS NoDB)
 set_test(test-expire-tiles LABELS NoDB)
-set_test(test-flex-indexes)
+set_test(test-flex-indexes LABELS NoDB)
 set_test(test-geom-box LABELS NoDB)
 set_test(test-geom-collections LABELS NoDB)
 set_test(test-geom-linestrings LABELS NoDB)
@@ -58,7 +58,7 @@ set_test(test-geom-pole-of-inaccessibility LABELS NoDB)
 set_test(test-geom-polygons LABELS NoDB)
 set_test(test-geom-transform LABELS NoDB)
 set_test(test-json-writer LABELS NoDB)
-set_test(test-lua-utils)
+set_test(test-lua-utils LABELS NoDB)
 set_test(test-middle)
 set_test(test-node-locations LABELS NoDB)
 set_test(test-options-parse LABELS NoDB)

From ede8880e722dfa213388508dd87fb79c98c9f92d Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 13 Jan 2025 09:07:30 +0100
Subject: [PATCH 241/430] Update copyright date

---
 man/manpage_from_python.py                       | 2 +-
 scripts/osm2pgsql-replication                    | 2 +-
 src/command-line-app.cpp                         | 2 +-
 src/command-line-app.hpp                         | 2 +-
 src/command-line-parser.cpp                      | 2 +-
 src/command-line-parser.hpp                      | 2 +-
 src/db-copy-mgr.hpp                              | 2 +-
 src/db-copy.cpp                                  | 2 +-
 src/db-copy.hpp                                  | 2 +-
 src/debug-output.cpp                             | 2 +-
 src/debug-output.hpp                             | 2 +-
 src/domain-matcher.hpp                           | 2 +-
 src/expire-config.hpp                            | 2 +-
 src/expire-output.cpp                            | 2 +-
 src/expire-output.hpp                            | 2 +-
 src/expire-tiles.cpp                             | 2 +-
 src/expire-tiles.hpp                             | 2 +-
 src/flex-index.cpp                               | 2 +-
 src/flex-index.hpp                               | 2 +-
 src/flex-lua-expire-output.cpp                   | 2 +-
 src/flex-lua-expire-output.hpp                   | 2 +-
 src/flex-lua-geom.cpp                            | 2 +-
 src/flex-lua-geom.hpp                            | 2 +-
 src/flex-lua-index.cpp                           | 2 +-
 src/flex-lua-index.hpp                           | 2 +-
 src/flex-lua-table.cpp                           | 2 +-
 src/flex-lua-table.hpp                           | 2 +-
 src/flex-table-column.cpp                        | 2 +-
 src/flex-table-column.hpp                        | 2 +-
 src/flex-table.cpp                               | 2 +-
 src/flex-table.hpp                               | 2 +-
 src/flex-write.cpp                               | 2 +-
 src/flex-write.hpp                               | 2 +-
 src/format.hpp                                   | 2 +-
 src/gen/canvas.cpp                               | 2 +-
 src/gen/canvas.hpp                               | 2 +-
 src/gen/gen-base.cpp                             | 2 +-
 src/gen/gen-base.hpp                             | 2 +-
 src/gen/gen-create.cpp                           | 2 +-
 src/gen/gen-create.hpp                           | 2 +-
 src/gen/gen-discrete-isolation.cpp               | 2 +-
 src/gen/gen-discrete-isolation.hpp               | 2 +-
 src/gen/gen-rivers.cpp                           | 2 +-
 src/gen/gen-rivers.hpp                           | 2 +-
 src/gen/gen-tile-builtup.cpp                     | 2 +-
 src/gen/gen-tile-builtup.hpp                     | 2 +-
 src/gen/gen-tile-raster.cpp                      | 2 +-
 src/gen/gen-tile-raster.hpp                      | 2 +-
 src/gen/gen-tile-sql.cpp                         | 2 +-
 src/gen/gen-tile-sql.hpp                         | 2 +-
 src/gen/gen-tile-vector.cpp                      | 2 +-
 src/gen/gen-tile-vector.hpp                      | 2 +-
 src/gen/gen-tile.cpp                             | 2 +-
 src/gen/gen-tile.hpp                             | 2 +-
 src/gen/osm2pgsql-gen.cpp                        | 2 +-
 src/gen/raster.cpp                               | 2 +-
 src/gen/raster.hpp                               | 2 +-
 src/gen/tracer.cpp                               | 2 +-
 src/gen/tracer.hpp                               | 2 +-
 src/geom-area-assembler.cpp                      | 2 +-
 src/geom-area-assembler.hpp                      | 2 +-
 src/geom-boost-adaptor.hpp                       | 2 +-
 src/geom-box.cpp                                 | 2 +-
 src/geom-box.hpp                                 | 2 +-
 src/geom-from-osm.cpp                            | 2 +-
 src/geom-from-osm.hpp                            | 2 +-
 src/geom-functions.cpp                           | 2 +-
 src/geom-functions.hpp                           | 2 +-
 src/geom-output.hpp                              | 2 +-
 src/geom-pole-of-inaccessibility.cpp             | 2 +-
 src/geom-pole-of-inaccessibility.hpp             | 2 +-
 src/geom.cpp                                     | 2 +-
 src/geom.hpp                                     | 2 +-
 src/idlist.cpp                                   | 2 +-
 src/idlist.hpp                                   | 2 +-
 src/input.cpp                                    | 2 +-
 src/input.hpp                                    | 2 +-
 src/json-writer.hpp                              | 2 +-
 src/logging.cpp                                  | 2 +-
 src/logging.hpp                                  | 2 +-
 src/lua-init.hpp                                 | 2 +-
 src/lua-setup.cpp                                | 2 +-
 src/lua-setup.hpp                                | 2 +-
 src/lua-utils.cpp                                | 2 +-
 src/lua-utils.hpp                                | 2 +-
 src/middle-pgsql.cpp                             | 2 +-
 src/middle-pgsql.hpp                             | 2 +-
 src/middle-ram.cpp                               | 2 +-
 src/middle-ram.hpp                               | 2 +-
 src/middle.cpp                                   | 2 +-
 src/middle.hpp                                   | 2 +-
 src/node-locations.cpp                           | 2 +-
 src/node-locations.hpp                           | 2 +-
 src/node-persistent-cache.cpp                    | 2 +-
 src/node-persistent-cache.hpp                    | 2 +-
 src/options.hpp                                  | 2 +-
 src/ordered-index.cpp                            | 2 +-
 src/ordered-index.hpp                            | 2 +-
 src/osm2pgsql.cpp                                | 2 +-
 src/osmdata.cpp                                  | 2 +-
 src/osmdata.hpp                                  | 2 +-
 src/osmtypes.hpp                                 | 2 +-
 src/output-flex.cpp                              | 2 +-
 src/output-flex.hpp                              | 2 +-
 src/output-null.cpp                              | 2 +-
 src/output-null.hpp                              | 2 +-
 src/output-pgsql.cpp                             | 2 +-
 src/output-pgsql.hpp                             | 2 +-
 src/output-requirements.hpp                      | 2 +-
 src/output.cpp                                   | 2 +-
 src/output.hpp                                   | 2 +-
 src/overloaded.hpp                               | 2 +-
 src/params.cpp                                   | 2 +-
 src/params.hpp                                   | 2 +-
 src/pgsql-capabilities-int.hpp                   | 2 +-
 src/pgsql-capabilities.cpp                       | 2 +-
 src/pgsql-capabilities.hpp                       | 2 +-
 src/pgsql-helper.cpp                             | 2 +-
 src/pgsql-helper.hpp                             | 2 +-
 src/pgsql-params.hpp                             | 2 +-
 src/pgsql.cpp                                    | 2 +-
 src/pgsql.hpp                                    | 2 +-
 src/progress-display.cpp                         | 2 +-
 src/progress-display.hpp                         | 2 +-
 src/properties.cpp                               | 2 +-
 src/properties.hpp                               | 2 +-
 src/reprojection-generic-none.cpp                | 2 +-
 src/reprojection.cpp                             | 2 +-
 src/reprojection.hpp                             | 2 +-
 src/table.cpp                                    | 2 +-
 src/table.hpp                                    | 2 +-
 src/taginfo-impl.hpp                             | 2 +-
 src/taginfo.cpp                                  | 2 +-
 src/taginfo.hpp                                  | 2 +-
 src/tagtransform-c.cpp                           | 2 +-
 src/tagtransform-c.hpp                           | 2 +-
 src/tagtransform-lua.cpp                         | 2 +-
 src/tagtransform-lua.hpp                         | 2 +-
 src/tagtransform.cpp                             | 2 +-
 src/tagtransform.hpp                             | 2 +-
 src/template.cpp                                 | 2 +-
 src/template.hpp                                 | 2 +-
 src/thread-pool.cpp                              | 2 +-
 src/thread-pool.hpp                              | 2 +-
 src/tile-output.hpp                              | 2 +-
 src/tile.cpp                                     | 2 +-
 src/tile.hpp                                     | 2 +-
 src/util.cpp                                     | 2 +-
 src/util.hpp                                     | 2 +-
 src/version.cpp.in                               | 2 +-
 src/version.hpp                                  | 2 +-
 src/wildcmp.cpp                                  | 2 +-
 src/wildcmp.hpp                                  | 2 +-
 src/wkb.cpp                                      | 2 +-
 src/wkb.hpp                                      | 2 +-
 tests/bdd/environment.py                         | 2 +-
 tests/bdd/steps/geometry_factory.py              | 2 +-
 tests/bdd/steps/replication_server_mock.py       | 2 +-
 tests/bdd/steps/steps_db.py                      | 2 +-
 tests/bdd/steps/steps_execute.py                 | 2 +-
 tests/bdd/steps/steps_osm_data.py                | 2 +-
 tests/catch-main.cpp                             | 2 +-
 tests/common-buffer.hpp                          | 2 +-
 tests/common-cleanup.hpp                         | 2 +-
 tests/common-import.hpp                          | 2 +-
 tests/common-options.hpp                         | 2 +-
 tests/common-pg.hpp                              | 2 +-
 tests/test-check-input.cpp                       | 2 +-
 tests/test-db-copy-mgr.cpp                       | 2 +-
 tests/test-db-copy-thread.cpp                    | 2 +-
 tests/test-domain-matcher.cpp                    | 2 +-
 tests/test-expire-from-geometry.cpp              | 2 +-
 tests/test-expire-tiles.cpp                      | 2 +-
 tests/test-flex-indexes.cpp                      | 2 +-
 tests/test-geom-box.cpp                          | 2 +-
 tests/test-geom-collections.cpp                  | 2 +-
 tests/test-geom-linestrings.cpp                  | 2 +-
 tests/test-geom-multilinestrings.cpp             | 2 +-
 tests/test-geom-multipoints.cpp                  | 2 +-
 tests/test-geom-multipolygons.cpp                | 2 +-
 tests/test-geom-null.cpp                         | 2 +-
 tests/test-geom-output.cpp                       | 2 +-
 tests/test-geom-points.cpp                       | 2 +-
 tests/test-geom-pole-of-inaccessibility.cpp      | 2 +-
 tests/test-geom-polygons.cpp                     | 2 +-
 tests/test-geom-transform.cpp                    | 2 +-
 tests/test-json-writer.cpp                       | 2 +-
 tests/test-lua-utils.cpp                         | 2 +-
 tests/test-middle.cpp                            | 2 +-
 tests/test-node-locations.cpp                    | 2 +-
 tests/test-options-parse.cpp                     | 2 +-
 tests/test-options-projection.cpp                | 2 +-
 tests/test-ordered-index.cpp                     | 2 +-
 tests/test-osm-file-parsing.cpp                  | 2 +-
 tests/test-output-flex-example-configs.cpp       | 2 +-
 tests/test-output-flex-multi-input.cpp           | 2 +-
 tests/test-output-flex-nodes.cpp                 | 2 +-
 tests/test-output-flex-relation-combinations.cpp | 2 +-
 tests/test-output-flex-relations.cpp             | 2 +-
 tests/test-output-flex-schema.cpp                | 2 +-
 tests/test-output-flex-stage2.cpp                | 2 +-
 tests/test-output-flex-tablespace.cpp            | 2 +-
 tests/test-output-flex-types.cpp                 | 2 +-
 tests/test-output-flex-uni.cpp                   | 2 +-
 tests/test-output-flex-update.cpp                | 2 +-
 tests/test-output-flex-validgeom.cpp             | 2 +-
 tests/test-output-flex.cpp                       | 2 +-
 tests/test-output-pgsql-area.cpp                 | 2 +-
 tests/test-output-pgsql-hstore-match-only.cpp    | 2 +-
 tests/test-output-pgsql-int4.cpp                 | 2 +-
 tests/test-output-pgsql-schema.cpp               | 2 +-
 tests/test-output-pgsql-style-file.cpp           | 2 +-
 tests/test-output-pgsql-tablespace.cpp           | 2 +-
 tests/test-output-pgsql-validgeom.cpp            | 2 +-
 tests/test-output-pgsql-z_order.cpp              | 2 +-
 tests/test-output-pgsql.cpp                      | 2 +-
 tests/test-params.cpp                            | 2 +-
 tests/test-persistent-cache.cpp                  | 2 +-
 tests/test-pgsql-capabilities.cpp                | 2 +-
 tests/test-pgsql.cpp                             | 2 +-
 tests/test-properties.cpp                        | 2 +-
 tests/test-reprojection.cpp                      | 2 +-
 tests/test-taginfo.cpp                           | 2 +-
 tests/test-tile.cpp                              | 2 +-
 tests/test-util.cpp                              | 2 +-
 tests/test-wildcard-match.cpp                    | 2 +-
 tests/test-wkb.cpp                               | 2 +-
 227 files changed, 227 insertions(+), 227 deletions(-)

diff --git a/man/manpage_from_python.py b/man/manpage_from_python.py
index ed76ed365..b41b4c2a7 100644
--- a/man/manpage_from_python.py
+++ b/man/manpage_from_python.py
@@ -2,7 +2,7 @@
 #
 # This file is part of osm2pgsql (https://osm2pgsql.org/).
 #
-# Copyright (C) 2006-2024 by the osm2pgsql developer community.
+# Copyright (C) 2006-2025 by the osm2pgsql developer community.
 # For a full list of authors see the git log.
 """ Create a man page for osm2pgsql helper scripts in python.
 """
diff --git a/scripts/osm2pgsql-replication b/scripts/osm2pgsql-replication
index 13d4d425e..09719f789 100755
--- a/scripts/osm2pgsql-replication
+++ b/scripts/osm2pgsql-replication
@@ -4,7 +4,7 @@
 #
 # This file is part of osm2pgsql (https://osm2pgsql.org/).
 #
-# Copyright (C) 2006-2024 by the osm2pgsql developer community.
+# Copyright (C) 2006-2025 by the osm2pgsql developer community.
 # For a full list of authors see the git log.
 
 """
diff --git a/src/command-line-app.cpp b/src/command-line-app.cpp
index 08d9161e0..8fd20d506 100644
--- a/src/command-line-app.cpp
+++ b/src/command-line-app.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/command-line-app.hpp b/src/command-line-app.hpp
index 11a9eef08..55080473d 100644
--- a/src/command-line-app.hpp
+++ b/src/command-line-app.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index ed2fdfb6f..f5d96f059 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/command-line-parser.hpp b/src/command-line-parser.hpp
index b06b27d5f..a3fe81891 100644
--- a/src/command-line-parser.hpp
+++ b/src/command-line-parser.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/db-copy-mgr.hpp b/src/db-copy-mgr.hpp
index 108900cc4..f56251f30 100644
--- a/src/db-copy-mgr.hpp
+++ b/src/db-copy-mgr.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/db-copy.cpp b/src/db-copy.cpp
index 96fcf8c18..c33156f69 100644
--- a/src/db-copy.cpp
+++ b/src/db-copy.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/db-copy.hpp b/src/db-copy.hpp
index beebc8155..6a6e46bd1 100644
--- a/src/db-copy.hpp
+++ b/src/db-copy.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/debug-output.cpp b/src/debug-output.cpp
index c8a94d19b..17218ddf4 100644
--- a/src/debug-output.cpp
+++ b/src/debug-output.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/debug-output.hpp b/src/debug-output.hpp
index 96256a5d7..204d71c9f 100644
--- a/src/debug-output.hpp
+++ b/src/debug-output.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/domain-matcher.hpp b/src/domain-matcher.hpp
index e12533ce1..726230627 100644
--- a/src/domain-matcher.hpp
+++ b/src/domain-matcher.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/expire-config.hpp b/src/expire-config.hpp
index f0194eb89..832ba6d64 100644
--- a/src/expire-config.hpp
+++ b/src/expire-config.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/expire-output.cpp b/src/expire-output.cpp
index e9b9dbde4..2d203e9b9 100644
--- a/src/expire-output.cpp
+++ b/src/expire-output.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/expire-output.hpp b/src/expire-output.hpp
index cbfa92869..6325a6960 100644
--- a/src/expire-output.hpp
+++ b/src/expire-output.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/expire-tiles.cpp b/src/expire-tiles.cpp
index cf6d867eb..413699025 100644
--- a/src/expire-tiles.cpp
+++ b/src/expire-tiles.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/expire-tiles.hpp b/src/expire-tiles.hpp
index 396c78371..eefa3f997 100644
--- a/src/expire-tiles.hpp
+++ b/src/expire-tiles.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-index.cpp b/src/flex-index.cpp
index 0f6ef2928..c5bc5d857 100644
--- a/src/flex-index.cpp
+++ b/src/flex-index.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-index.hpp b/src/flex-index.hpp
index b6ee96389..9b805c135 100644
--- a/src/flex-index.hpp
+++ b/src/flex-index.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-expire-output.cpp b/src/flex-lua-expire-output.cpp
index ab2188cc6..e86c73d78 100644
--- a/src/flex-lua-expire-output.cpp
+++ b/src/flex-lua-expire-output.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-expire-output.hpp b/src/flex-lua-expire-output.hpp
index b82b0af49..5c13f1a69 100644
--- a/src/flex-lua-expire-output.hpp
+++ b/src/flex-lua-expire-output.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-geom.cpp b/src/flex-lua-geom.cpp
index 448c949f0..03184b1b3 100644
--- a/src/flex-lua-geom.cpp
+++ b/src/flex-lua-geom.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-geom.hpp b/src/flex-lua-geom.hpp
index 5365f2bd8..2f1dc01e4 100644
--- a/src/flex-lua-geom.hpp
+++ b/src/flex-lua-geom.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-index.cpp b/src/flex-lua-index.cpp
index 5db9db648..2b2ce34e3 100644
--- a/src/flex-lua-index.cpp
+++ b/src/flex-lua-index.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-index.hpp b/src/flex-lua-index.hpp
index 593f87481..bba9ed5ad 100644
--- a/src/flex-lua-index.hpp
+++ b/src/flex-lua-index.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-table.cpp b/src/flex-lua-table.cpp
index 30b7a64bd..a8152a053 100644
--- a/src/flex-lua-table.cpp
+++ b/src/flex-lua-table.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-table.hpp b/src/flex-lua-table.hpp
index 883d773c2..6f82ca00e 100644
--- a/src/flex-lua-table.hpp
+++ b/src/flex-lua-table.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-table-column.cpp b/src/flex-table-column.cpp
index 7cf561dbc..3ba3c4b67 100644
--- a/src/flex-table-column.cpp
+++ b/src/flex-table-column.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-table-column.hpp b/src/flex-table-column.hpp
index 4410e03da..4d445ed71 100644
--- a/src/flex-table-column.hpp
+++ b/src/flex-table-column.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-table.cpp b/src/flex-table.cpp
index 668f69aea..f470038e4 100644
--- a/src/flex-table.cpp
+++ b/src/flex-table.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-table.hpp b/src/flex-table.hpp
index 8332b0342..3da7616dc 100644
--- a/src/flex-table.hpp
+++ b/src/flex-table.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-write.cpp b/src/flex-write.cpp
index 96cd2745e..7fcf46510 100644
--- a/src/flex-write.cpp
+++ b/src/flex-write.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-write.hpp b/src/flex-write.hpp
index a8536d4fa..e726310fa 100644
--- a/src/flex-write.hpp
+++ b/src/flex-write.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/format.hpp b/src/format.hpp
index 3d4a25f27..02eb99c4a 100644
--- a/src/format.hpp
+++ b/src/format.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/canvas.cpp b/src/gen/canvas.cpp
index e88095563..0d6cf0d55 100644
--- a/src/gen/canvas.cpp
+++ b/src/gen/canvas.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/canvas.hpp b/src/gen/canvas.hpp
index 5ccaa906d..3ea6a7f21 100644
--- a/src/gen/canvas.hpp
+++ b/src/gen/canvas.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-base.cpp b/src/gen/gen-base.cpp
index 3aa847593..b14259f97 100644
--- a/src/gen/gen-base.cpp
+++ b/src/gen/gen-base.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-base.hpp b/src/gen/gen-base.hpp
index a9aae09c0..875cbbac6 100644
--- a/src/gen/gen-base.hpp
+++ b/src/gen/gen-base.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-create.cpp b/src/gen/gen-create.cpp
index 32d6487ad..49d2fb4a0 100644
--- a/src/gen/gen-create.cpp
+++ b/src/gen/gen-create.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-create.hpp b/src/gen/gen-create.hpp
index a445a9455..b1e3432f3 100644
--- a/src/gen/gen-create.hpp
+++ b/src/gen/gen-create.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-discrete-isolation.cpp b/src/gen/gen-discrete-isolation.cpp
index 952f0c0d6..39a6b06ef 100644
--- a/src/gen/gen-discrete-isolation.cpp
+++ b/src/gen/gen-discrete-isolation.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-discrete-isolation.hpp b/src/gen/gen-discrete-isolation.hpp
index d6d5c2725..aa15d4bf7 100644
--- a/src/gen/gen-discrete-isolation.hpp
+++ b/src/gen/gen-discrete-isolation.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-rivers.cpp b/src/gen/gen-rivers.cpp
index a1b445e09..66d028a20 100644
--- a/src/gen/gen-rivers.cpp
+++ b/src/gen/gen-rivers.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-rivers.hpp b/src/gen/gen-rivers.hpp
index 513da5786..71c269f15 100644
--- a/src/gen/gen-rivers.hpp
+++ b/src/gen/gen-rivers.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile-builtup.cpp b/src/gen/gen-tile-builtup.cpp
index 234a2dc21..e04cd5a37 100644
--- a/src/gen/gen-tile-builtup.cpp
+++ b/src/gen/gen-tile-builtup.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile-builtup.hpp b/src/gen/gen-tile-builtup.hpp
index afec9a5e2..24d97ef54 100644
--- a/src/gen/gen-tile-builtup.hpp
+++ b/src/gen/gen-tile-builtup.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile-raster.cpp b/src/gen/gen-tile-raster.cpp
index 2f945bbbc..ae34bc943 100644
--- a/src/gen/gen-tile-raster.cpp
+++ b/src/gen/gen-tile-raster.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile-raster.hpp b/src/gen/gen-tile-raster.hpp
index 8365d7a8b..a8e94839b 100644
--- a/src/gen/gen-tile-raster.hpp
+++ b/src/gen/gen-tile-raster.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile-sql.cpp b/src/gen/gen-tile-sql.cpp
index 0389568cb..144892fcc 100644
--- a/src/gen/gen-tile-sql.cpp
+++ b/src/gen/gen-tile-sql.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile-sql.hpp b/src/gen/gen-tile-sql.hpp
index a19904e87..81d593e2a 100644
--- a/src/gen/gen-tile-sql.hpp
+++ b/src/gen/gen-tile-sql.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile-vector.cpp b/src/gen/gen-tile-vector.cpp
index ea2262a96..0d3b6ba62 100644
--- a/src/gen/gen-tile-vector.cpp
+++ b/src/gen/gen-tile-vector.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile-vector.hpp b/src/gen/gen-tile-vector.hpp
index f361d7801..100bff45c 100644
--- a/src/gen/gen-tile-vector.hpp
+++ b/src/gen/gen-tile-vector.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile.cpp b/src/gen/gen-tile.cpp
index 3941e08af..e2dd2585f 100644
--- a/src/gen/gen-tile.cpp
+++ b/src/gen/gen-tile.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile.hpp b/src/gen/gen-tile.hpp
index cac3cfea7..1d96dbc38 100644
--- a/src/gen/gen-tile.hpp
+++ b/src/gen/gen-tile.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index e4543122c..04c4526ba 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/raster.cpp b/src/gen/raster.cpp
index bba2043f9..9bbb4667a 100644
--- a/src/gen/raster.cpp
+++ b/src/gen/raster.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/raster.hpp b/src/gen/raster.hpp
index 61bad677e..8708789a2 100644
--- a/src/gen/raster.hpp
+++ b/src/gen/raster.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/tracer.cpp b/src/gen/tracer.cpp
index 7673bf024..7d4dcd448 100644
--- a/src/gen/tracer.cpp
+++ b/src/gen/tracer.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/tracer.hpp b/src/gen/tracer.hpp
index d07910883..284a3443d 100644
--- a/src/gen/tracer.hpp
+++ b/src/gen/tracer.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-area-assembler.cpp b/src/geom-area-assembler.cpp
index e012d9cf8..99e9633ff 100644
--- a/src/geom-area-assembler.cpp
+++ b/src/geom-area-assembler.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-area-assembler.hpp b/src/geom-area-assembler.hpp
index 0fb47681b..e00f95f26 100644
--- a/src/geom-area-assembler.hpp
+++ b/src/geom-area-assembler.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-boost-adaptor.hpp b/src/geom-boost-adaptor.hpp
index dcc45b9b0..c5af2d03c 100644
--- a/src/geom-boost-adaptor.hpp
+++ b/src/geom-boost-adaptor.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-box.cpp b/src/geom-box.cpp
index 9393e8ce8..9e80d957e 100644
--- a/src/geom-box.cpp
+++ b/src/geom-box.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-box.hpp b/src/geom-box.hpp
index ca0d7c260..eb07cf632 100644
--- a/src/geom-box.hpp
+++ b/src/geom-box.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-from-osm.cpp b/src/geom-from-osm.cpp
index 765b101a7..71c586519 100644
--- a/src/geom-from-osm.cpp
+++ b/src/geom-from-osm.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-from-osm.hpp b/src/geom-from-osm.hpp
index ece07d0ec..a2c59e4da 100644
--- a/src/geom-from-osm.hpp
+++ b/src/geom-from-osm.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-functions.cpp b/src/geom-functions.cpp
index db7605bb4..741354eec 100644
--- a/src/geom-functions.cpp
+++ b/src/geom-functions.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-functions.hpp b/src/geom-functions.hpp
index 1048a6b8e..7c22d6298 100644
--- a/src/geom-functions.hpp
+++ b/src/geom-functions.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-output.hpp b/src/geom-output.hpp
index ac54ec806..21d94f741 100644
--- a/src/geom-output.hpp
+++ b/src/geom-output.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-pole-of-inaccessibility.cpp b/src/geom-pole-of-inaccessibility.cpp
index de3bd6b66..452b84d74 100644
--- a/src/geom-pole-of-inaccessibility.cpp
+++ b/src/geom-pole-of-inaccessibility.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-pole-of-inaccessibility.hpp b/src/geom-pole-of-inaccessibility.hpp
index 2e32fe953..d4a2d5a76 100644
--- a/src/geom-pole-of-inaccessibility.hpp
+++ b/src/geom-pole-of-inaccessibility.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom.cpp b/src/geom.cpp
index 121089418..cc6394f5a 100644
--- a/src/geom.cpp
+++ b/src/geom.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom.hpp b/src/geom.hpp
index 4c3919017..b87cae0d3 100644
--- a/src/geom.hpp
+++ b/src/geom.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/idlist.cpp b/src/idlist.cpp
index d90ab0643..44dc7cd7d 100644
--- a/src/idlist.cpp
+++ b/src/idlist.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/idlist.hpp b/src/idlist.hpp
index e719f01a9..9657cbfb5 100644
--- a/src/idlist.hpp
+++ b/src/idlist.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/input.cpp b/src/input.cpp
index 96fb1d458..9ffbe108b 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/input.hpp b/src/input.hpp
index 00a73e46a..8a10ae35b 100644
--- a/src/input.hpp
+++ b/src/input.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/json-writer.hpp b/src/json-writer.hpp
index df432b0c4..9ea391702 100644
--- a/src/json-writer.hpp
+++ b/src/json-writer.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/logging.cpp b/src/logging.cpp
index 85ac2095b..3ebb0306a 100644
--- a/src/logging.cpp
+++ b/src/logging.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/logging.hpp b/src/logging.hpp
index 4504276f3..f1542b67f 100644
--- a/src/logging.hpp
+++ b/src/logging.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/lua-init.hpp b/src/lua-init.hpp
index 5b7576d15..d91e173fa 100644
--- a/src/lua-init.hpp
+++ b/src/lua-init.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/lua-setup.cpp b/src/lua-setup.cpp
index 6e9478158..e28e65d26 100644
--- a/src/lua-setup.cpp
+++ b/src/lua-setup.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/lua-setup.hpp b/src/lua-setup.hpp
index 535054aa9..6d6fa0b12 100644
--- a/src/lua-setup.hpp
+++ b/src/lua-setup.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/lua-utils.cpp b/src/lua-utils.cpp
index 029cb8cb2..928bc9222 100644
--- a/src/lua-utils.cpp
+++ b/src/lua-utils.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/lua-utils.hpp b/src/lua-utils.hpp
index ec41587e6..3ca4ec91b 100644
--- a/src/lua-utils.hpp
+++ b/src/lua-utils.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index 0ed048136..9abbf1bf2 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/middle-pgsql.hpp b/src/middle-pgsql.hpp
index 1df054d81..793d8fe8b 100644
--- a/src/middle-pgsql.hpp
+++ b/src/middle-pgsql.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/middle-ram.cpp b/src/middle-ram.cpp
index 74e1e44fb..4c5bf995b 100644
--- a/src/middle-ram.cpp
+++ b/src/middle-ram.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/middle-ram.hpp b/src/middle-ram.hpp
index 6fe5924a2..488eb60e5 100644
--- a/src/middle-ram.hpp
+++ b/src/middle-ram.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/middle.cpp b/src/middle.cpp
index 5158c76af..27733006b 100644
--- a/src/middle.cpp
+++ b/src/middle.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/middle.hpp b/src/middle.hpp
index 82a71fe92..73aae0f84 100644
--- a/src/middle.hpp
+++ b/src/middle.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/node-locations.cpp b/src/node-locations.cpp
index c0417df61..8b86c880e 100644
--- a/src/node-locations.cpp
+++ b/src/node-locations.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/node-locations.hpp b/src/node-locations.hpp
index 4e4d9495b..98fa3b8f6 100644
--- a/src/node-locations.hpp
+++ b/src/node-locations.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/node-persistent-cache.cpp b/src/node-persistent-cache.cpp
index 3fb1e8279..7b5fb8453 100644
--- a/src/node-persistent-cache.cpp
+++ b/src/node-persistent-cache.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/node-persistent-cache.hpp b/src/node-persistent-cache.hpp
index 07b7e6962..933efc47e 100644
--- a/src/node-persistent-cache.hpp
+++ b/src/node-persistent-cache.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/options.hpp b/src/options.hpp
index 4fdbed059..f81d3e1f3 100644
--- a/src/options.hpp
+++ b/src/options.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/ordered-index.cpp b/src/ordered-index.cpp
index 123d2ec54..701d18883 100644
--- a/src/ordered-index.cpp
+++ b/src/ordered-index.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/ordered-index.hpp b/src/ordered-index.hpp
index d3f0ec413..47850c138 100644
--- a/src/ordered-index.hpp
+++ b/src/ordered-index.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
index ee0b6976f..cd2b1b5b9 100644
--- a/src/osm2pgsql.cpp
+++ b/src/osm2pgsql.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/osmdata.cpp b/src/osmdata.cpp
index d35032892..82dc262db 100644
--- a/src/osmdata.cpp
+++ b/src/osmdata.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/osmdata.hpp b/src/osmdata.hpp
index 709b4ef2e..dcbe74b12 100644
--- a/src/osmdata.hpp
+++ b/src/osmdata.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/osmtypes.hpp b/src/osmtypes.hpp
index b8b2dee66..ce9ecc6ac 100644
--- a/src/osmtypes.hpp
+++ b/src/osmtypes.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 003a59718..22e8aa2e6 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index f5191d0ce..cc7bd1095 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output-null.cpp b/src/output-null.cpp
index 5058161c6..63286205a 100644
--- a/src/output-null.cpp
+++ b/src/output-null.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output-null.hpp b/src/output-null.hpp
index 6429ac0c6..75b93425c 100644
--- a/src/output-null.hpp
+++ b/src/output-null.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output-pgsql.cpp b/src/output-pgsql.cpp
index 67e92d5d1..e7c1023eb 100644
--- a/src/output-pgsql.cpp
+++ b/src/output-pgsql.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output-pgsql.hpp b/src/output-pgsql.hpp
index e9b6994e8..b99b64eca 100644
--- a/src/output-pgsql.hpp
+++ b/src/output-pgsql.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output-requirements.hpp b/src/output-requirements.hpp
index cb4cf16d0..5ffd0d1b1 100644
--- a/src/output-requirements.hpp
+++ b/src/output-requirements.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output.cpp b/src/output.cpp
index 005689b40..24f6b078d 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output.hpp b/src/output.hpp
index f32107d95..e6b75b402 100644
--- a/src/output.hpp
+++ b/src/output.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/overloaded.hpp b/src/overloaded.hpp
index dc97b692a..cef3ab445 100644
--- a/src/overloaded.hpp
+++ b/src/overloaded.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/params.cpp b/src/params.cpp
index 1806981cc..89b0abe44 100644
--- a/src/params.cpp
+++ b/src/params.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/params.hpp b/src/params.hpp
index 14c957e80..8337303d7 100644
--- a/src/params.hpp
+++ b/src/params.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/pgsql-capabilities-int.hpp b/src/pgsql-capabilities-int.hpp
index 3fa906595..0fa779837 100644
--- a/src/pgsql-capabilities-int.hpp
+++ b/src/pgsql-capabilities-int.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/pgsql-capabilities.cpp b/src/pgsql-capabilities.cpp
index 6ea96e737..b04c26f9d 100644
--- a/src/pgsql-capabilities.cpp
+++ b/src/pgsql-capabilities.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/pgsql-capabilities.hpp b/src/pgsql-capabilities.hpp
index 999400e03..a9aba9269 100644
--- a/src/pgsql-capabilities.hpp
+++ b/src/pgsql-capabilities.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/pgsql-helper.cpp b/src/pgsql-helper.cpp
index 43e2e1241..de857dd86 100644
--- a/src/pgsql-helper.cpp
+++ b/src/pgsql-helper.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/pgsql-helper.hpp b/src/pgsql-helper.hpp
index 4e0894b35..b507b4e24 100644
--- a/src/pgsql-helper.hpp
+++ b/src/pgsql-helper.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/pgsql-params.hpp b/src/pgsql-params.hpp
index 50cdf00f0..742a5b656 100644
--- a/src/pgsql-params.hpp
+++ b/src/pgsql-params.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/pgsql.cpp b/src/pgsql.cpp
index 048dc73ff..905bf51e7 100644
--- a/src/pgsql.cpp
+++ b/src/pgsql.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/pgsql.hpp b/src/pgsql.hpp
index 8279e42a9..33c398fbf 100644
--- a/src/pgsql.hpp
+++ b/src/pgsql.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/progress-display.cpp b/src/progress-display.cpp
index ae8aa946d..7f57b2359 100644
--- a/src/progress-display.cpp
+++ b/src/progress-display.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/progress-display.hpp b/src/progress-display.hpp
index 4e89972d9..95229f85e 100644
--- a/src/progress-display.hpp
+++ b/src/progress-display.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/properties.cpp b/src/properties.cpp
index 602817ab2..b959c0726 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/properties.hpp b/src/properties.hpp
index 0aa51399b..40a787104 100644
--- a/src/properties.hpp
+++ b/src/properties.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/reprojection-generic-none.cpp b/src/reprojection-generic-none.cpp
index 835af5b70..25c61b7e4 100644
--- a/src/reprojection-generic-none.cpp
+++ b/src/reprojection-generic-none.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/reprojection.cpp b/src/reprojection.cpp
index 8d7cc6c40..d7229b748 100644
--- a/src/reprojection.cpp
+++ b/src/reprojection.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/reprojection.hpp b/src/reprojection.hpp
index a457a0ebf..50d17e65a 100644
--- a/src/reprojection.hpp
+++ b/src/reprojection.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/table.cpp b/src/table.cpp
index 9c41b3eb2..e6a40c010 100644
--- a/src/table.cpp
+++ b/src/table.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/table.hpp b/src/table.hpp
index a7a6ea8fa..1dcfe1fbf 100644
--- a/src/table.hpp
+++ b/src/table.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/taginfo-impl.hpp b/src/taginfo-impl.hpp
index f54158404..e93296549 100644
--- a/src/taginfo-impl.hpp
+++ b/src/taginfo-impl.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/taginfo.cpp b/src/taginfo.cpp
index 64e7e34f5..8cfa85892 100644
--- a/src/taginfo.cpp
+++ b/src/taginfo.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/taginfo.hpp b/src/taginfo.hpp
index 13f8cc105..75fcbefb0 100644
--- a/src/taginfo.hpp
+++ b/src/taginfo.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tagtransform-c.cpp b/src/tagtransform-c.cpp
index 9e96f949f..c471d8541 100644
--- a/src/tagtransform-c.cpp
+++ b/src/tagtransform-c.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tagtransform-c.hpp b/src/tagtransform-c.hpp
index 99195bcd2..190260753 100644
--- a/src/tagtransform-c.hpp
+++ b/src/tagtransform-c.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tagtransform-lua.cpp b/src/tagtransform-lua.cpp
index 2f69b7f93..efbab0651 100644
--- a/src/tagtransform-lua.cpp
+++ b/src/tagtransform-lua.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tagtransform-lua.hpp b/src/tagtransform-lua.hpp
index 856f65270..c0d8e0e28 100644
--- a/src/tagtransform-lua.hpp
+++ b/src/tagtransform-lua.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tagtransform.cpp b/src/tagtransform.cpp
index 41c25ffdc..18428bccf 100644
--- a/src/tagtransform.cpp
+++ b/src/tagtransform.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tagtransform.hpp b/src/tagtransform.hpp
index 381ab8a19..b431848fc 100644
--- a/src/tagtransform.hpp
+++ b/src/tagtransform.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/template.cpp b/src/template.cpp
index b157087f5..2fc677475 100644
--- a/src/template.cpp
+++ b/src/template.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/template.hpp b/src/template.hpp
index 1fbb324c5..7ef4fb1ea 100644
--- a/src/template.hpp
+++ b/src/template.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/thread-pool.cpp b/src/thread-pool.cpp
index 0bfcf5bb7..7eadd5a04 100644
--- a/src/thread-pool.cpp
+++ b/src/thread-pool.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/thread-pool.hpp b/src/thread-pool.hpp
index 4680abbfa..f65e07e6b 100644
--- a/src/thread-pool.hpp
+++ b/src/thread-pool.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tile-output.hpp b/src/tile-output.hpp
index 4b970e3b1..c6cf3962c 100644
--- a/src/tile-output.hpp
+++ b/src/tile-output.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tile.cpp b/src/tile.cpp
index 8b5c2a443..e47f91e7e 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tile.hpp b/src/tile.hpp
index a6df27e47..bcda0a1c3 100644
--- a/src/tile.hpp
+++ b/src/tile.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/util.cpp b/src/util.cpp
index 3f3909bb5..7ec65aea2 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/util.hpp b/src/util.hpp
index 0f951d697..2938f224c 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/version.cpp.in b/src/version.cpp.in
index 684565c94..f560d4a39 100644
--- a/src/version.cpp.in
+++ b/src/version.cpp.in
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/version.hpp b/src/version.hpp
index 4d210c7c5..d545b2912 100644
--- a/src/version.hpp
+++ b/src/version.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/wildcmp.cpp b/src/wildcmp.cpp
index 77156c299..40b1d35a7 100644
--- a/src/wildcmp.cpp
+++ b/src/wildcmp.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/wildcmp.hpp b/src/wildcmp.hpp
index 47cd95756..2ad8a080d 100644
--- a/src/wildcmp.hpp
+++ b/src/wildcmp.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/wkb.cpp b/src/wkb.cpp
index aee24688b..519988dc3 100644
--- a/src/wkb.cpp
+++ b/src/wkb.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/wkb.hpp b/src/wkb.hpp
index 923f07b88..cb38177e6 100644
--- a/src/wkb.hpp
+++ b/src/wkb.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/bdd/environment.py b/tests/bdd/environment.py
index 93b4f242a..350b5e1b6 100644
--- a/tests/bdd/environment.py
+++ b/tests/bdd/environment.py
@@ -2,7 +2,7 @@
 #
 # This file is part of osm2pgsql (https://osm2pgsql.org/).
 #
-# Copyright (C) 2006-2024 by the osm2pgsql developer community.
+# Copyright (C) 2006-2025 by the osm2pgsql developer community.
 # For a full list of authors see the git log.
 from contextlib import closing
 from pathlib import Path
diff --git a/tests/bdd/steps/geometry_factory.py b/tests/bdd/steps/geometry_factory.py
index d5b7d3695..9ba7f9f5f 100644
--- a/tests/bdd/steps/geometry_factory.py
+++ b/tests/bdd/steps/geometry_factory.py
@@ -2,7 +2,7 @@
 #
 # This file is part of osm2pgsql (https://osm2pgsql.org/).
 #
-# Copyright (C) 2006-2024 by the osm2pgsql developer community.
+# Copyright (C) 2006-2025 by the osm2pgsql developer community.
 # For a full list of authors see the git log.
 
 class GeometryFactory:
diff --git a/tests/bdd/steps/replication_server_mock.py b/tests/bdd/steps/replication_server_mock.py
index 9ae7ba972..cf6387066 100644
--- a/tests/bdd/steps/replication_server_mock.py
+++ b/tests/bdd/steps/replication_server_mock.py
@@ -2,7 +2,7 @@
 #
 # This file is part of osm2pgsql (https://osm2pgsql.org/).
 #
-# Copyright (C) 2006-2024 by the osm2pgsql developer community.
+# Copyright (C) 2006-2025 by the osm2pgsql developer community.
 # For a full list of authors see the git log.
 
 
diff --git a/tests/bdd/steps/steps_db.py b/tests/bdd/steps/steps_db.py
index 4da16deb6..027d1af92 100644
--- a/tests/bdd/steps/steps_db.py
+++ b/tests/bdd/steps/steps_db.py
@@ -2,7 +2,7 @@
 #
 # This file is part of osm2pgsql (https://osm2pgsql.org/).
 #
-# Copyright (C) 2006-2024 by the osm2pgsql developer community.
+# Copyright (C) 2006-2025 by the osm2pgsql developer community.
 # For a full list of authors see the git log.
 """
 Steps that query the database.
diff --git a/tests/bdd/steps/steps_execute.py b/tests/bdd/steps/steps_execute.py
index 0e9b946aa..d731ab582 100644
--- a/tests/bdd/steps/steps_execute.py
+++ b/tests/bdd/steps/steps_execute.py
@@ -2,7 +2,7 @@
 #
 # This file is part of osm2pgsql (https://osm2pgsql.org/).
 #
-# Copyright (C) 2006-2024 by the osm2pgsql developer community.
+# Copyright (C) 2006-2025 by the osm2pgsql developer community.
 # For a full list of authors see the git log.
 """
 Steps for executing osm2pgsql.
diff --git a/tests/bdd/steps/steps_osm_data.py b/tests/bdd/steps/steps_osm_data.py
index 4f46bf524..37f44cf69 100644
--- a/tests/bdd/steps/steps_osm_data.py
+++ b/tests/bdd/steps/steps_osm_data.py
@@ -2,7 +2,7 @@
 #
 # This file is part of osm2pgsql (https://osm2pgsql.org/).
 #
-# Copyright (C) 2006-2024 by the osm2pgsql developer community.
+# Copyright (C) 2006-2025 by the osm2pgsql developer community.
 # For a full list of authors see the git log.
 """
 Steps for creating the OSM import file.
diff --git a/tests/catch-main.cpp b/tests/catch-main.cpp
index fa5651a52..8cad8f4a5 100644
--- a/tests/catch-main.cpp
+++ b/tests/catch-main.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/common-buffer.hpp b/tests/common-buffer.hpp
index a974ef36d..556affcf0 100644
--- a/tests/common-buffer.hpp
+++ b/tests/common-buffer.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/common-cleanup.hpp b/tests/common-cleanup.hpp
index a533ff04f..171a97263 100644
--- a/tests/common-cleanup.hpp
+++ b/tests/common-cleanup.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/common-import.hpp b/tests/common-import.hpp
index 3f1a0df54..8112cd1d4 100644
--- a/tests/common-import.hpp
+++ b/tests/common-import.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/common-options.hpp b/tests/common-options.hpp
index d58c6d74b..58adb8ea2 100644
--- a/tests/common-options.hpp
+++ b/tests/common-options.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/common-pg.hpp b/tests/common-pg.hpp
index f62842d5f..999c686dd 100644
--- a/tests/common-pg.hpp
+++ b/tests/common-pg.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-check-input.cpp b/tests/test-check-input.cpp
index 17a96b69b..06f00fda2 100644
--- a/tests/test-check-input.cpp
+++ b/tests/test-check-input.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-db-copy-mgr.cpp b/tests/test-db-copy-mgr.cpp
index bc8ac1202..691b5cd78 100644
--- a/tests/test-db-copy-mgr.cpp
+++ b/tests/test-db-copy-mgr.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-db-copy-thread.cpp b/tests/test-db-copy-thread.cpp
index c28705322..b55dd8f36 100644
--- a/tests/test-db-copy-thread.cpp
+++ b/tests/test-db-copy-thread.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-domain-matcher.cpp b/tests/test-domain-matcher.cpp
index b4b991767..f6356c5e3 100644
--- a/tests/test-domain-matcher.cpp
+++ b/tests/test-domain-matcher.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-expire-from-geometry.cpp b/tests/test-expire-from-geometry.cpp
index d614960f7..ae5f5f532 100644
--- a/tests/test-expire-from-geometry.cpp
+++ b/tests/test-expire-from-geometry.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-expire-tiles.cpp b/tests/test-expire-tiles.cpp
index 0756f4f6d..b1e970283 100644
--- a/tests/test-expire-tiles.cpp
+++ b/tests/test-expire-tiles.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-flex-indexes.cpp b/tests/test-flex-indexes.cpp
index 3bd401b09..53c13da0c 100644
--- a/tests/test-flex-indexes.cpp
+++ b/tests/test-flex-indexes.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-box.cpp b/tests/test-geom-box.cpp
index 22e90423d..5fb257cb9 100644
--- a/tests/test-geom-box.cpp
+++ b/tests/test-geom-box.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-collections.cpp b/tests/test-geom-collections.cpp
index 98f45a929..85d05805e 100644
--- a/tests/test-geom-collections.cpp
+++ b/tests/test-geom-collections.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-linestrings.cpp b/tests/test-geom-linestrings.cpp
index 7f52309d4..33420de6f 100644
--- a/tests/test-geom-linestrings.cpp
+++ b/tests/test-geom-linestrings.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-multilinestrings.cpp b/tests/test-geom-multilinestrings.cpp
index ea4fb78e0..0ae2e0e63 100644
--- a/tests/test-geom-multilinestrings.cpp
+++ b/tests/test-geom-multilinestrings.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-multipoints.cpp b/tests/test-geom-multipoints.cpp
index a19ae7393..b0b52d04c 100644
--- a/tests/test-geom-multipoints.cpp
+++ b/tests/test-geom-multipoints.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-multipolygons.cpp b/tests/test-geom-multipolygons.cpp
index b938acca4..6ba866a73 100644
--- a/tests/test-geom-multipolygons.cpp
+++ b/tests/test-geom-multipolygons.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-null.cpp b/tests/test-geom-null.cpp
index 7c2ab97e5..eca420b03 100644
--- a/tests/test-geom-null.cpp
+++ b/tests/test-geom-null.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-output.cpp b/tests/test-geom-output.cpp
index 56cffc6db..52bd32c74 100644
--- a/tests/test-geom-output.cpp
+++ b/tests/test-geom-output.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-points.cpp b/tests/test-geom-points.cpp
index e9f463834..13b07e8d4 100644
--- a/tests/test-geom-points.cpp
+++ b/tests/test-geom-points.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-pole-of-inaccessibility.cpp b/tests/test-geom-pole-of-inaccessibility.cpp
index a9fcf1d75..fdbfe9f3f 100644
--- a/tests/test-geom-pole-of-inaccessibility.cpp
+++ b/tests/test-geom-pole-of-inaccessibility.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-polygons.cpp b/tests/test-geom-polygons.cpp
index 61c7bbe6e..caee81586 100644
--- a/tests/test-geom-polygons.cpp
+++ b/tests/test-geom-polygons.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-transform.cpp b/tests/test-geom-transform.cpp
index 394137ab4..8481b1313 100644
--- a/tests/test-geom-transform.cpp
+++ b/tests/test-geom-transform.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-json-writer.cpp b/tests/test-json-writer.cpp
index b477ed348..5fd39d8b1 100644
--- a/tests/test-json-writer.cpp
+++ b/tests/test-json-writer.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-lua-utils.cpp b/tests/test-lua-utils.cpp
index b1b6cf04a..6da752042 100644
--- a/tests/test-lua-utils.cpp
+++ b/tests/test-lua-utils.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-middle.cpp b/tests/test-middle.cpp
index bf35d3e54..51d3ea453 100644
--- a/tests/test-middle.cpp
+++ b/tests/test-middle.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-node-locations.cpp b/tests/test-node-locations.cpp
index 26b18522d..76d0b6cac 100644
--- a/tests/test-node-locations.cpp
+++ b/tests/test-node-locations.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-options-parse.cpp b/tests/test-options-parse.cpp
index c8b8b9ab5..641fbb283 100644
--- a/tests/test-options-parse.cpp
+++ b/tests/test-options-parse.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-options-projection.cpp b/tests/test-options-projection.cpp
index 0c4154f1c..03667b953 100644
--- a/tests/test-options-projection.cpp
+++ b/tests/test-options-projection.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-ordered-index.cpp b/tests/test-ordered-index.cpp
index 533366df4..da75d89c6 100644
--- a/tests/test-ordered-index.cpp
+++ b/tests/test-ordered-index.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-osm-file-parsing.cpp b/tests/test-osm-file-parsing.cpp
index 64afdaafe..838b7fc80 100644
--- a/tests/test-osm-file-parsing.cpp
+++ b/tests/test-osm-file-parsing.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-example-configs.cpp b/tests/test-output-flex-example-configs.cpp
index d0004ba56..e49c45542 100644
--- a/tests/test-output-flex-example-configs.cpp
+++ b/tests/test-output-flex-example-configs.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-multi-input.cpp b/tests/test-output-flex-multi-input.cpp
index 3e235ef37..3f6b8fd4e 100644
--- a/tests/test-output-flex-multi-input.cpp
+++ b/tests/test-output-flex-multi-input.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-nodes.cpp b/tests/test-output-flex-nodes.cpp
index 9afdf3d5a..80d9ba732 100644
--- a/tests/test-output-flex-nodes.cpp
+++ b/tests/test-output-flex-nodes.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-relation-combinations.cpp b/tests/test-output-flex-relation-combinations.cpp
index 83527ac9e..42ec81e9f 100644
--- a/tests/test-output-flex-relation-combinations.cpp
+++ b/tests/test-output-flex-relation-combinations.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-relations.cpp b/tests/test-output-flex-relations.cpp
index 6606db8d9..0482523e2 100644
--- a/tests/test-output-flex-relations.cpp
+++ b/tests/test-output-flex-relations.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-schema.cpp b/tests/test-output-flex-schema.cpp
index 6cefd28fa..bb6cef9c1 100644
--- a/tests/test-output-flex-schema.cpp
+++ b/tests/test-output-flex-schema.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-stage2.cpp b/tests/test-output-flex-stage2.cpp
index 2ec31a48f..2e370bddd 100644
--- a/tests/test-output-flex-stage2.cpp
+++ b/tests/test-output-flex-stage2.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-tablespace.cpp b/tests/test-output-flex-tablespace.cpp
index 69451df8d..65e61a3f2 100644
--- a/tests/test-output-flex-tablespace.cpp
+++ b/tests/test-output-flex-tablespace.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-types.cpp b/tests/test-output-flex-types.cpp
index 7ab13564f..cd22c5c59 100644
--- a/tests/test-output-flex-types.cpp
+++ b/tests/test-output-flex-types.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-uni.cpp b/tests/test-output-flex-uni.cpp
index 28cdd668e..e42848563 100644
--- a/tests/test-output-flex-uni.cpp
+++ b/tests/test-output-flex-uni.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-update.cpp b/tests/test-output-flex-update.cpp
index d44c3371c..4c31b31d1 100644
--- a/tests/test-output-flex-update.cpp
+++ b/tests/test-output-flex-update.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-validgeom.cpp b/tests/test-output-flex-validgeom.cpp
index f40ed459c..59ae9c69e 100644
--- a/tests/test-output-flex-validgeom.cpp
+++ b/tests/test-output-flex-validgeom.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex.cpp b/tests/test-output-flex.cpp
index 83fe5b8cb..32ef66ea2 100644
--- a/tests/test-output-flex.cpp
+++ b/tests/test-output-flex.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql-area.cpp b/tests/test-output-pgsql-area.cpp
index c04466843..4b72002b1 100644
--- a/tests/test-output-pgsql-area.cpp
+++ b/tests/test-output-pgsql-area.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql-hstore-match-only.cpp b/tests/test-output-pgsql-hstore-match-only.cpp
index be08b75bb..bb432ab5c 100644
--- a/tests/test-output-pgsql-hstore-match-only.cpp
+++ b/tests/test-output-pgsql-hstore-match-only.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql-int4.cpp b/tests/test-output-pgsql-int4.cpp
index f41715a0b..f821c2499 100644
--- a/tests/test-output-pgsql-int4.cpp
+++ b/tests/test-output-pgsql-int4.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql-schema.cpp b/tests/test-output-pgsql-schema.cpp
index 83799e38a..189f34c70 100644
--- a/tests/test-output-pgsql-schema.cpp
+++ b/tests/test-output-pgsql-schema.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql-style-file.cpp b/tests/test-output-pgsql-style-file.cpp
index 27f1f7937..b52de06ef 100644
--- a/tests/test-output-pgsql-style-file.cpp
+++ b/tests/test-output-pgsql-style-file.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql-tablespace.cpp b/tests/test-output-pgsql-tablespace.cpp
index 5d750f1c7..8d9f1171d 100644
--- a/tests/test-output-pgsql-tablespace.cpp
+++ b/tests/test-output-pgsql-tablespace.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql-validgeom.cpp b/tests/test-output-pgsql-validgeom.cpp
index 496b2b562..1adcdc489 100644
--- a/tests/test-output-pgsql-validgeom.cpp
+++ b/tests/test-output-pgsql-validgeom.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql-z_order.cpp b/tests/test-output-pgsql-z_order.cpp
index ac568ebf2..1fa88f921 100644
--- a/tests/test-output-pgsql-z_order.cpp
+++ b/tests/test-output-pgsql-z_order.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql.cpp b/tests/test-output-pgsql.cpp
index b8d45578d..91ce54916 100644
--- a/tests/test-output-pgsql.cpp
+++ b/tests/test-output-pgsql.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-params.cpp b/tests/test-params.cpp
index 3e5c707bc..31b81f5cd 100644
--- a/tests/test-params.cpp
+++ b/tests/test-params.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-persistent-cache.cpp b/tests/test-persistent-cache.cpp
index 621267438..0d91ad49b 100644
--- a/tests/test-persistent-cache.cpp
+++ b/tests/test-persistent-cache.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-pgsql-capabilities.cpp b/tests/test-pgsql-capabilities.cpp
index 6cab471ae..190b93334 100644
--- a/tests/test-pgsql-capabilities.cpp
+++ b/tests/test-pgsql-capabilities.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-pgsql.cpp b/tests/test-pgsql.cpp
index 2724a2b0a..dc0855209 100644
--- a/tests/test-pgsql.cpp
+++ b/tests/test-pgsql.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-properties.cpp b/tests/test-properties.cpp
index f0e11ffa3..8b1e2563d 100644
--- a/tests/test-properties.cpp
+++ b/tests/test-properties.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-reprojection.cpp b/tests/test-reprojection.cpp
index 3eeb9cd9f..fa14af84a 100644
--- a/tests/test-reprojection.cpp
+++ b/tests/test-reprojection.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-taginfo.cpp b/tests/test-taginfo.cpp
index 428d520a9..49ef5c7c8 100644
--- a/tests/test-taginfo.cpp
+++ b/tests/test-taginfo.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-tile.cpp b/tests/test-tile.cpp
index a951ff2af..fe81d8158 100644
--- a/tests/test-tile.cpp
+++ b/tests/test-tile.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-util.cpp b/tests/test-util.cpp
index ce6fb1b57..0037f759c 100644
--- a/tests/test-util.cpp
+++ b/tests/test-util.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-wildcard-match.cpp b/tests/test-wildcard-match.cpp
index 21ed7e464..5eb10c7bd 100644
--- a/tests/test-wildcard-match.cpp
+++ b/tests/test-wildcard-match.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-wkb.cpp b/tests/test-wkb.cpp
index e3078b538..6e28e8bd0 100644
--- a/tests/test-wkb.cpp
+++ b/tests/test-wkb.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 

From 4d04f509aa65490d13086dae0dd669984a16fef8 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 13 Jan 2025 09:08:14 +0100
Subject: [PATCH 242/430] Add option to create primary key on flex tables

This is basically just a small variant of the option to create unique
indexes. But it documents the intention that the specified columns is
supposed to be the primary key. Some programs (like pg_featureserv)
use this information to handle the primary key specially.
---
 src/flex-lua-table.cpp                       |  5 ++-
 src/flex-table.cpp                           |  9 ++++++
 src/flex-table.hpp                           |  6 +++-
 tests/bdd/flex/lua-table-definitions.feature | 34 ++++++++++++++++++++
 4 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/src/flex-lua-table.cpp b/src/flex-lua-table.cpp
index 30b7a64bd..ab877556d 100644
--- a/src/flex-lua-table.cpp
+++ b/src/flex-lua-table.cpp
@@ -112,7 +112,10 @@ void parse_create_index(lua_State *lua_state, flex_table_t *table)
         table->set_always_build_id_index();
     } else if (create_index == "unique") {
         table->set_always_build_id_index();
-        table->set_build_unique_id_index();
+        table->set_build_unique_id_index(false);
+    } else if (create_index == "primary_key") {
+        table->set_always_build_id_index();
+        table->set_build_unique_id_index(true);
     } else if (create_index != "auto") {
         throw fmt_error("Unknown value '{}' for 'create_index' field of ids",
                         create_index);
diff --git a/src/flex-table.cpp b/src/flex-table.cpp
index 668f69aea..9e9500e77 100644
--- a/src/flex-table.cpp
+++ b/src/flex-table.cpp
@@ -223,6 +223,15 @@ std::string flex_table_t::build_sql_column_list() const
 
 std::string flex_table_t::build_sql_create_id_index() const
 {
+    if (m_primary_key_index) {
+        auto ts = tablespace_clause(index_tablespace());
+        if (!ts.empty()) {
+            ts = " USING INDEX" + ts;
+        }
+        return fmt::format("ALTER TABLE {} ADD PRIMARY KEY ({}){}", full_name(),
+                           id_column_names(), ts);
+    }
+
     return fmt::format("CREATE {}INDEX ON {} USING BTREE ({}) {}",
                        m_build_unique_id_index ? "UNIQUE " : "", full_name(),
                        id_column_names(),
diff --git a/src/flex-table.hpp b/src/flex-table.hpp
index 8332b0342..2101ec7fb 100644
--- a/src/flex-table.hpp
+++ b/src/flex-table.hpp
@@ -194,9 +194,10 @@ class flex_table_t
         return m_always_build_id_index;
     }
 
-    void set_build_unique_id_index() noexcept
+    void set_build_unique_id_index(bool as_primary_key) noexcept
     {
         m_build_unique_id_index = true;
+        m_primary_key_index = as_primary_key;
     }
 
     bool build_unique_id_index() const noexcept
@@ -265,6 +266,9 @@ class flex_table_t
     /// Build the index as a unique index.
     bool m_build_unique_id_index = false;
 
+    /// Index should be a primary key.
+    bool m_primary_key_index = false;
+
 }; // class flex_table_t
 
 class table_connection_t
diff --git a/tests/bdd/flex/lua-table-definitions.feature b/tests/bdd/flex/lua-table-definitions.feature
index a061b1b28..24364825d 100644
--- a/tests/bdd/flex/lua-table-definitions.feature
+++ b/tests/bdd/flex/lua-table-definitions.feature
@@ -99,6 +99,40 @@ Feature: Table definitions in Lua file
         When running osm2pgsql flex
         Then table foo has 1562 rows
 
+    Scenario: Unique index is okay
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            local t = osm2pgsql.define_table({
+                name = 'foo',
+                ids = { type = 'node', id_column = 'node_id', index = 'unique' },
+                columns = {}
+            })
+
+            function osm2pgsql.process_node(object)
+                t:insert({})
+            end
+            """
+        When running osm2pgsql flex
+        Then table foo has 1562 rows
+
+    Scenario: Primary key is okay
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            local t = osm2pgsql.define_table({
+                name = 'foo',
+                ids = { type = 'node', id_column = 'node_id', index = 'primary_key' },
+                columns = {}
+            })
+
+            function osm2pgsql.process_node(object)
+                t:insert({})
+            end
+            """
+        When running osm2pgsql flex
+        Then table foo has 1562 rows
+
     Scenario: Can not create two tables with the same name
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
         And the lua style

From 0a120f3f53765c8aa4f81fd3170ade8e81133037 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 12 Jan 2025 09:34:30 +0100
Subject: [PATCH 243/430] Refactor middle: Put index creation into their own
 functions

---
 src/middle-pgsql.cpp | 106 +++++++++++++++++++++++--------------------
 src/middle-pgsql.hpp |   3 ++
 2 files changed, 60 insertions(+), 49 deletions(-)

diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index 9abbf1bf2..2e0eb995b 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -1084,6 +1084,61 @@ void middle_pgsql_t::update_users_table()
     analyze_table(m_db_connection, m_options->dbschema, table_name);
 }
 
+void middle_pgsql_t::build_way_node_index()
+{
+    dbexec("CREATE OR REPLACE FUNCTION"
+           "    {schema}\"{prefix}_index_bucket\"(int8[])"
+           "  RETURNS int8[] AS $$"
+           "  SELECT ARRAY(SELECT DISTINCT"
+           "    unnest($1) >> {way_node_index_id_shift})"
+           "$$ LANGUAGE SQL IMMUTABLE");
+
+    auto const create_ways_index =
+        render_template("CREATE INDEX \"{prefix}_ways_nodes_bucket_idx\""
+                        " ON {schema}\"{prefix}_ways\""
+                        " USING GIN ({schema}\"{prefix}_index_bucket\"(nodes))"
+                        " WITH (fastupdate = off) {index_tablespace}");
+
+    log_info("Building index on middle ways table");
+    m_tables.ways().task_set(thread_pool().submit([&, create_ways_index]() {
+        pg_conn_t const db_connection{m_options->connection_params,
+                                      "middle.index.ways"};
+        db_connection.exec(create_ways_index);
+    }));
+}
+
+void middle_pgsql_t::build_relation_member_indexes()
+{
+    dbexec("CREATE OR REPLACE FUNCTION"
+           " {schema}\"{prefix}_member_ids\"(jsonb, char)"
+           " RETURNS int8[] AS $$"
+           "  SELECT array_agg((el->>'ref')::int8)"
+           "   FROM jsonb_array_elements($1) AS el"
+           "    WHERE el->>'type' = $2"
+           "$$ LANGUAGE SQL IMMUTABLE");
+
+    auto const create_rels_index_node_members = render_template(
+        "CREATE INDEX \"{prefix}_rels_node_members_idx\""
+        " ON {schema}\"{prefix}_rels\" USING GIN"
+        " (({schema}\"{prefix}_member_ids\"(members, 'N'::char)))"
+        " WITH (fastupdate = off) {index_tablespace}");
+
+    auto const create_rels_index_way_members = render_template(
+        "CREATE INDEX \"{prefix}_rels_way_members_idx\""
+        " ON {schema}\"{prefix}_rels\" USING GIN"
+        " (({schema}\"{prefix}_member_ids\"(members, 'W'::char)))"
+        " WITH (fastupdate = off) {index_tablespace}");
+
+    log_info("Building indexes on middle rels table");
+    m_tables.relations().task_set(thread_pool().submit(
+        [&, create_rels_index_node_members, create_rels_index_way_members]() {
+            pg_conn_t const db_connection{m_options->connection_params,
+                                          "middle.index.rels"};
+            db_connection.exec(create_rels_index_node_members);
+            db_connection.exec(create_rels_index_way_members);
+        }));
+}
+
 void middle_pgsql_t::stop()
 {
     assert(m_middle_state == middle_state::done);
@@ -1098,55 +1153,8 @@ void middle_pgsql_t::stop()
             table.drop_table(m_db_connection);
         }
     } else if (!m_options->append) {
-        dbexec("CREATE OR REPLACE FUNCTION"
-               "    {schema}\"{prefix}_index_bucket\"(int8[])"
-               "  RETURNS int8[] AS $$"
-               "  SELECT ARRAY(SELECT DISTINCT"
-               "    unnest($1) >> {way_node_index_id_shift})"
-               "$$ LANGUAGE SQL IMMUTABLE");
-
-        auto const create_ways_index = render_template(
-            "CREATE INDEX \"{prefix}_ways_nodes_bucket_idx\""
-            " ON {schema}\"{prefix}_ways\""
-            " USING GIN ({schema}\"{prefix}_index_bucket\"(nodes))"
-            " WITH (fastupdate = off) {index_tablespace}");
-
-        log_info("Building index on middle ways table");
-        m_tables.ways().task_set(thread_pool().submit([&, create_ways_index]() {
-            pg_conn_t const db_connection{m_options->connection_params,
-                                          "middle.index.ways"};
-            db_connection.exec(create_ways_index);
-        }));
-
-        dbexec("CREATE OR REPLACE FUNCTION"
-               " {schema}\"{prefix}_member_ids\"(jsonb, char)"
-               " RETURNS int8[] AS $$"
-               "  SELECT array_agg((el->>'ref')::int8)"
-               "   FROM jsonb_array_elements($1) AS el"
-               "    WHERE el->>'type' = $2"
-               "$$ LANGUAGE SQL IMMUTABLE");
-
-        auto const create_rels_index_node_members = render_template(
-            "CREATE INDEX \"{prefix}_rels_node_members_idx\""
-            " ON {schema}\"{prefix}_rels\" USING GIN"
-            " (({schema}\"{prefix}_member_ids\"(members, 'N'::char)))"
-            " WITH (fastupdate = off) {index_tablespace}");
-
-        auto const create_rels_index_way_members = render_template(
-            "CREATE INDEX \"{prefix}_rels_way_members_idx\""
-            " ON {schema}\"{prefix}_rels\" USING GIN"
-            " (({schema}\"{prefix}_member_ids\"(members, 'W'::char)))"
-            " WITH (fastupdate = off) {index_tablespace}");
-
-        log_info("Building indexes on middle rels table");
-        m_tables.relations().task_set(
-            thread_pool().submit([&, create_rels_index_node_members,
-                                  create_rels_index_way_members]() {
-                pg_conn_t const db_connection{m_options->connection_params,
-                                              "middle.index.rels"};
-                db_connection.exec(create_rels_index_node_members);
-                db_connection.exec(create_rels_index_way_members);
-            }));
+        build_way_node_index();
+        build_relation_member_indexes();
     }
 }
 
diff --git a/src/middle-pgsql.hpp b/src/middle-pgsql.hpp
index 793d8fe8b..54164c39c 100644
--- a/src/middle-pgsql.hpp
+++ b/src/middle-pgsql.hpp
@@ -176,6 +176,9 @@ struct middle_pgsql_t : public middle_t
     std::string render_template(std::string_view templ) const;
     void dbexec(std::string_view templ) const;
 
+    void build_way_node_index();
+    void build_relation_member_indexes();
+
     std::map<osmium::user_id_type, std::string> m_users;
     osmium::nwr_array<table_desc> m_tables;
 

From 5e6ac71ef119643ec12bd631679ea25ec2abfb55 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 13 Jan 2025 09:10:25 +0100
Subject: [PATCH 244/430] Update included protozero to 1.8.0

---
 contrib/protozero/README.contrib              |  2 +-
 .../include/protozero/basic_pbf_builder.hpp   |  4 +-
 .../include/protozero/basic_pbf_writer.hpp    | 56 +++++++++----------
 .../include/protozero/buffer_string.hpp       |  4 +-
 .../protozero/include/protozero/data_view.hpp |  4 +-
 .../include/protozero/pbf_message.hpp         |  2 +-
 .../include/protozero/pbf_reader.hpp          |  8 +--
 contrib/protozero/include/protozero/types.hpp |  2 +-
 .../protozero/include/protozero/varint.hpp    | 47 ++++++++--------
 9 files changed, 64 insertions(+), 65 deletions(-)

diff --git a/contrib/protozero/README.contrib b/contrib/protozero/README.contrib
index 727a30586..90eaeaaa8 100644
--- a/contrib/protozero/README.contrib
+++ b/contrib/protozero/README.contrib
@@ -1,2 +1,2 @@
 Source: https://github.com/mapbox/protozero
-Revision: v1.7.1
+Revision: v1.8.0
diff --git a/contrib/protozero/include/protozero/basic_pbf_builder.hpp b/contrib/protozero/include/protozero/basic_pbf_builder.hpp
index 0ede726fa..ce7640d43 100644
--- a/contrib/protozero/include/protozero/basic_pbf_builder.hpp
+++ b/contrib/protozero/include/protozero/basic_pbf_builder.hpp
@@ -40,7 +40,7 @@ namespace protozero {
 template <typename TBuffer, typename T>
 class basic_pbf_builder : public basic_pbf_writer<TBuffer> {
 
-    static_assert(std::is_same<pbf_tag_type, typename std::underlying_type<T>::type>::value,
+    static_assert(std::is_same<pbf_tag_type, std::underlying_type_t<T>>::value,
                   "T must be enum with underlying type protozero::pbf_tag_type");
 
 public:
@@ -67,7 +67,7 @@ class basic_pbf_builder : public basic_pbf_writer<TBuffer> {
      * @param tag Tag of the field that will be written
      */
     template <typename P>
-    basic_pbf_builder(basic_pbf_writer<TBuffer>& parent_writer, P tag) noexcept :
+    basic_pbf_builder(basic_pbf_writer<TBuffer>& parent_writer, P tag) :
         basic_pbf_writer<TBuffer>{parent_writer, pbf_tag_type(tag)} {
     }
 
diff --git a/contrib/protozero/include/protozero/basic_pbf_writer.hpp b/contrib/protozero/include/protozero/basic_pbf_writer.hpp
index f167c4d1d..c26ba67cd 100644
--- a/contrib/protozero/include/protozero/basic_pbf_writer.hpp
+++ b/contrib/protozero/include/protozero/basic_pbf_writer.hpp
@@ -85,7 +85,7 @@ class basic_pbf_writer {
 
     void add_field(pbf_tag_type tag, pbf_wire_type type) {
         protozero_assert(((tag > 0 && tag < 19000) || (tag > 19999 && tag <= ((1U << 29U) - 1))) && "tag out of range");
-        const uint32_t b = (tag << 3U) | uint32_t(type);
+        const uint32_t b = (tag << 3U) | static_cast<uint32_t>(type);
         add_varint(b);
     }
 
@@ -105,7 +105,7 @@ class basic_pbf_writer {
     }
 
     template <typename T, typename It>
-    void add_packed_fixed(pbf_tag_type tag, It first, It last, std::input_iterator_tag /*unused*/) {
+    void add_packed_fixed(pbf_tag_type tag, It first, It last, std::input_iterator_tag /*unused*/) { // NOLINT(performance-unnecessary-value-param)
         if (first == last) {
             return;
         }
@@ -118,7 +118,7 @@ class basic_pbf_writer {
     }
 
     template <typename T, typename It>
-    void add_packed_fixed(pbf_tag_type tag, It first, It last, std::forward_iterator_tag /*unused*/) {
+    void add_packed_fixed(pbf_tag_type tag, It first, It last, std::forward_iterator_tag /*unused*/) { // NOLINT(performance-unnecessary-value-param)
         if (first == last) {
             return;
         }
@@ -133,7 +133,7 @@ class basic_pbf_writer {
     }
 
     template <typename It>
-    void add_packed_varint(pbf_tag_type tag, It first, It last) {
+    void add_packed_varint(pbf_tag_type tag, It first, It last) { // NOLINT(performance-unnecessary-value-param)
         if (first == last) {
             return;
         }
@@ -146,7 +146,7 @@ class basic_pbf_writer {
     }
 
     template <typename It>
-    void add_packed_svarint(pbf_tag_type tag, It first, It last) {
+    void add_packed_svarint(pbf_tag_type tag, It first, It last) { // NOLINT(performance-unnecessary-value-param)
         if (first == last) {
             return;
         }
@@ -162,7 +162,7 @@ class basic_pbf_writer {
     // a length-delimited field. The length has to fit into pbf_length_type,
     // and a varint needs 8 bit for every 7 bit.
     enum : int {
-        reserve_bytes = sizeof(pbf_length_type) * 8 / 7 + 1
+        reserve_bytes = (sizeof(pbf_length_type) * 8 / 7) + 1
     };
 
     // If m_rollpack_pos is set to this special value, it means that when
@@ -181,7 +181,7 @@ class basic_pbf_writer {
             buffer_customization<TBuffer>::append_zeros(m_data, std::size_t(reserve_bytes));
         } else {
             m_rollback_pos = size_is_known;
-            add_length_varint(tag, pbf_length_type(size));
+            add_length_varint(tag, static_cast<pbf_length_type>(size));
             reserve(size);
         }
         m_pos = buffer_customization<TBuffer>::size(m_data);
@@ -391,7 +391,7 @@ class basic_pbf_writer {
         add_field(tag, pbf_wire_type::varint);
         protozero_assert(m_pos == 0 && "you can't add fields to a parent basic_pbf_writer if there is an existing basic_pbf_writer for a submessage");
         protozero_assert(m_data);
-        m_data->push_back(char(value));
+        m_data->push_back(static_cast<char>(value));
     }
 
     /**
@@ -401,7 +401,7 @@ class basic_pbf_writer {
      * @param value Value to be written
      */
     void add_enum(pbf_tag_type tag, int32_t value) {
-        add_tagged_varint(tag, uint64_t(value));
+        add_tagged_varint(tag, static_cast<uint64_t>(value));
     }
 
     /**
@@ -411,7 +411,7 @@ class basic_pbf_writer {
      * @param value Value to be written
      */
     void add_int32(pbf_tag_type tag, int32_t value) {
-        add_tagged_varint(tag, uint64_t(value));
+        add_tagged_varint(tag, static_cast<uint64_t>(value));
     }
 
     /**
@@ -441,7 +441,7 @@ class basic_pbf_writer {
      * @param value Value to be written
      */
     void add_int64(pbf_tag_type tag, int64_t value) {
-        add_tagged_varint(tag, uint64_t(value));
+        add_tagged_varint(tag, static_cast<uint64_t>(value));
     }
 
     /**
@@ -541,7 +541,7 @@ class basic_pbf_writer {
         protozero_assert(m_pos == 0 && "you can't add fields to a parent basic_pbf_writer if there is an existing basic_pbf_writer for a submessage");
         protozero_assert(m_data);
         protozero_assert(size <= std::numeric_limits<pbf_length_type>::max());
-        add_length_varint(tag, pbf_length_type(size));
+        add_length_varint(tag, static_cast<pbf_length_type>(size));
         buffer_customization<TBuffer>::append(m_data, value, size);
     }
 
@@ -602,7 +602,7 @@ class basic_pbf_writer {
         size_t sum_size = 0;
         (void)std::initializer_list<size_t>{sum_size += values.size()...};
         protozero_assert(sum_size <= std::numeric_limits<pbf_length_type>::max());
-        add_length_varint(tag, pbf_length_type(sum_size));
+        add_length_varint(tag, static_cast<pbf_length_type>(sum_size));
         buffer_customization<TBuffer>::reserve_additional(m_data, sum_size);
         (void)std::initializer_list<int>{(buffer_customization<TBuffer>::append(m_data, values.data(), values.size()), 0)...};
     }
@@ -697,7 +697,7 @@ class basic_pbf_writer {
      * @param last Iterator pointing one past the end of data
      */
     template <typename InputIterator>
-    void add_packed_bool(pbf_tag_type tag, InputIterator first, InputIterator last) {
+    void add_packed_bool(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
         add_packed_varint(tag, first, last);
     }
 
@@ -711,7 +711,7 @@ class basic_pbf_writer {
      * @param last Iterator pointing one past the end of data
      */
     template <typename InputIterator>
-    void add_packed_enum(pbf_tag_type tag, InputIterator first, InputIterator last) {
+    void add_packed_enum(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
         add_packed_varint(tag, first, last);
     }
 
@@ -725,7 +725,7 @@ class basic_pbf_writer {
      * @param last Iterator pointing one past the end of data
      */
     template <typename InputIterator>
-    void add_packed_int32(pbf_tag_type tag, InputIterator first, InputIterator last) {
+    void add_packed_int32(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
         add_packed_varint(tag, first, last);
     }
 
@@ -739,7 +739,7 @@ class basic_pbf_writer {
      * @param last Iterator pointing one past the end of data
      */
     template <typename InputIterator>
-    void add_packed_sint32(pbf_tag_type tag, InputIterator first, InputIterator last) {
+    void add_packed_sint32(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
         add_packed_svarint(tag, first, last);
     }
 
@@ -753,7 +753,7 @@ class basic_pbf_writer {
      * @param last Iterator pointing one past the end of data
      */
     template <typename InputIterator>
-    void add_packed_uint32(pbf_tag_type tag, InputIterator first, InputIterator last) {
+    void add_packed_uint32(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
         add_packed_varint(tag, first, last);
     }
 
@@ -767,7 +767,7 @@ class basic_pbf_writer {
      * @param last Iterator pointing one past the end of data
      */
     template <typename InputIterator>
-    void add_packed_int64(pbf_tag_type tag, InputIterator first, InputIterator last) {
+    void add_packed_int64(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
         add_packed_varint(tag, first, last);
     }
 
@@ -781,7 +781,7 @@ class basic_pbf_writer {
      * @param last Iterator pointing one past the end of data
      */
     template <typename InputIterator>
-    void add_packed_sint64(pbf_tag_type tag, InputIterator first, InputIterator last) {
+    void add_packed_sint64(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
         add_packed_svarint(tag, first, last);
     }
 
@@ -795,7 +795,7 @@ class basic_pbf_writer {
      * @param last Iterator pointing one past the end of data
      */
     template <typename InputIterator>
-    void add_packed_uint64(pbf_tag_type tag, InputIterator first, InputIterator last) {
+    void add_packed_uint64(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
         add_packed_varint(tag, first, last);
     }
 
@@ -817,7 +817,7 @@ class basic_pbf_writer {
      * @param last Iterator pointing one past the end of data
      */
     template <typename ValueType, typename InputIterator>
-    void add_packed_fixed(pbf_tag_type tag, InputIterator first, InputIterator last) {
+    void add_packed_fixed(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
         static_assert(std::is_same<ValueType, uint32_t>::value ||
                       std::is_same<ValueType, int32_t>::value ||
                       std::is_same<ValueType, int64_t>::value ||
@@ -838,7 +838,7 @@ class basic_pbf_writer {
      * @param last Iterator pointing one past the end of data
      */
     template <typename InputIterator>
-    void add_packed_fixed32(pbf_tag_type tag, InputIterator first, InputIterator last) {
+    void add_packed_fixed32(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
         add_packed_fixed<uint32_t, InputIterator>(tag, first, last,
             typename std::iterator_traits<InputIterator>::iterator_category{});
     }
@@ -853,7 +853,7 @@ class basic_pbf_writer {
      * @param last Iterator pointing one past the end of data
      */
     template <typename InputIterator>
-    void add_packed_sfixed32(pbf_tag_type tag, InputIterator first, InputIterator last) {
+    void add_packed_sfixed32(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
         add_packed_fixed<int32_t, InputIterator>(tag, first, last,
             typename std::iterator_traits<InputIterator>::iterator_category{});
     }
@@ -868,7 +868,7 @@ class basic_pbf_writer {
      * @param last Iterator pointing one past the end of data
      */
     template <typename InputIterator>
-    void add_packed_fixed64(pbf_tag_type tag, InputIterator first, InputIterator last) {
+    void add_packed_fixed64(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
         add_packed_fixed<uint64_t, InputIterator>(tag, first, last,
             typename std::iterator_traits<InputIterator>::iterator_category{});
     }
@@ -883,7 +883,7 @@ class basic_pbf_writer {
      * @param last Iterator pointing one past the end of data
      */
     template <typename InputIterator>
-    void add_packed_sfixed64(pbf_tag_type tag, InputIterator first, InputIterator last) {
+    void add_packed_sfixed64(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
         add_packed_fixed<int64_t, InputIterator>(tag, first, last,
             typename std::iterator_traits<InputIterator>::iterator_category{});
     }
@@ -898,7 +898,7 @@ class basic_pbf_writer {
      * @param last Iterator pointing one past the end of data
      */
     template <typename InputIterator>
-    void add_packed_float(pbf_tag_type tag, InputIterator first, InputIterator last) {
+    void add_packed_float(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
         add_packed_fixed<float, InputIterator>(tag, first, last,
             typename std::iterator_traits<InputIterator>::iterator_category{});
     }
@@ -913,7 +913,7 @@ class basic_pbf_writer {
      * @param last Iterator pointing one past the end of data
      */
     template <typename InputIterator>
-    void add_packed_double(pbf_tag_type tag, InputIterator first, InputIterator last) {
+    void add_packed_double(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
         add_packed_fixed<double, InputIterator>(tag, first, last,
             typename std::iterator_traits<InputIterator>::iterator_category{});
     }
diff --git a/contrib/protozero/include/protozero/buffer_string.hpp b/contrib/protozero/include/protozero/buffer_string.hpp
index 02e8ad25b..c620879e4 100644
--- a/contrib/protozero/include/protozero/buffer_string.hpp
+++ b/contrib/protozero/include/protozero/buffer_string.hpp
@@ -57,8 +57,8 @@ struct buffer_customization<std::string> {
         protozero_assert(from <= buffer->size());
         protozero_assert(to <= buffer->size());
         protozero_assert(from <= to);
-        buffer->erase(std::next(buffer->begin(), static_cast<std::string::iterator::difference_type>(from)),
-                      std::next(buffer->begin(), static_cast<std::string::iterator::difference_type>(to)));
+        buffer->erase(buffer->begin() + static_cast<std::string::difference_type>(from),
+                      buffer->begin() + static_cast<std::string::difference_type>(to));
     }
 
     static char* at_pos(std::string* buffer, std::size_t pos) {
diff --git a/contrib/protozero/include/protozero/data_view.hpp b/contrib/protozero/include/protozero/data_view.hpp
index 3ec87af34..815ceb3d2 100644
--- a/contrib/protozero/include/protozero/data_view.hpp
+++ b/contrib/protozero/include/protozero/data_view.hpp
@@ -173,7 +173,7 @@ inline void swap(data_view& lhs, data_view& rhs) noexcept {
  * @param lhs First object.
  * @param rhs Second object.
  */
-inline constexpr bool operator==(const data_view lhs, const data_view rhs) noexcept {
+constexpr bool operator==(const data_view lhs, const data_view rhs) noexcept {
     return lhs.size() == rhs.size() &&
            std::equal(lhs.data(), lhs.data() + lhs.size(), rhs.data());
 }
@@ -185,7 +185,7 @@ inline constexpr bool operator==(const data_view lhs, const data_view rhs) noexc
  * @param lhs First object.
  * @param rhs Second object.
  */
-inline constexpr bool operator!=(const data_view lhs, const data_view rhs) noexcept {
+constexpr bool operator!=(const data_view lhs, const data_view rhs) noexcept {
     return !(lhs == rhs);
 }
 
diff --git a/contrib/protozero/include/protozero/pbf_message.hpp b/contrib/protozero/include/protozero/pbf_message.hpp
index d7fd8b5d0..393078b9b 100644
--- a/contrib/protozero/include/protozero/pbf_message.hpp
+++ b/contrib/protozero/include/protozero/pbf_message.hpp
@@ -64,7 +64,7 @@ namespace protozero {
 template <typename T>
 class pbf_message : public pbf_reader {
 
-    static_assert(std::is_same<pbf_tag_type, typename std::underlying_type<T>::type>::value,
+    static_assert(std::is_same<pbf_tag_type, std::underlying_type_t<T>>::value,
                   "T must be enum with underlying type protozero::pbf_tag_type");
 
 public:
diff --git a/contrib/protozero/include/protozero/pbf_reader.hpp b/contrib/protozero/include/protozero/pbf_reader.hpp
index 92bfdee5e..297683afe 100644
--- a/contrib/protozero/include/protozero/pbf_reader.hpp
+++ b/contrib/protozero/include/protozero/pbf_reader.hpp
@@ -76,9 +76,9 @@ class pbf_reader {
     template <typename T>
     T get_fixed() {
         T result;
-        const char* data = m_data;
+        const char* tmp_data = m_data;
         skip_bytes(sizeof(T));
-        std::memcpy(&result, data, sizeof(T));
+        std::memcpy(&result, tmp_data, sizeof(T));
 #if PROTOZERO_BYTE_ORDER != PROTOZERO_LITTLE_ENDIAN
         byteswap_inplace(&result);
 #endif
@@ -263,7 +263,7 @@ class pbf_reader {
      * and how it is encoded for this number to have any meaning.
      */
     std::size_t length() const noexcept {
-        return std::size_t(m_end - m_data);
+        return static_cast<std::size_t>(m_end - m_data);
     }
 
     /**
@@ -287,7 +287,7 @@ class pbf_reader {
         }
 
         const auto value = get_varint<uint32_t>();
-        m_tag = pbf_tag_type(value >> 3U);
+        m_tag = static_cast<pbf_tag_type>(value >> 3U);
 
         // tags 0 and 19000 to 19999 are not allowed as per
         // https://developers.google.com/protocol-buffers/docs/proto#assigning-tags
diff --git a/contrib/protozero/include/protozero/types.hpp b/contrib/protozero/include/protozero/types.hpp
index 3aefddfb5..ad9c362ff 100644
--- a/contrib/protozero/include/protozero/types.hpp
+++ b/contrib/protozero/include/protozero/types.hpp
@@ -52,7 +52,7 @@ enum class pbf_wire_type : uint32_t {
  * See pbf_reader.tag_and_type() for an example how to use this.
  */
 template <typename T>
-constexpr inline uint32_t tag_and_type(T tag, pbf_wire_type wire_type) noexcept {
+constexpr uint32_t tag_and_type(T tag, pbf_wire_type wire_type) noexcept {
     return (static_cast<uint32_t>(static_cast<pbf_tag_type>(tag)) << 3U) | static_cast<uint32_t>(wire_type);
 }
 
diff --git a/contrib/protozero/include/protozero/varint.hpp b/contrib/protozero/include/protozero/varint.hpp
index b4648a442..5c7fcec75 100644
--- a/contrib/protozero/include/protozero/varint.hpp
+++ b/contrib/protozero/include/protozero/varint.hpp
@@ -26,7 +26,7 @@ namespace protozero {
 /**
  * The maximum length of a 64 bit varint.
  */
-constexpr const int8_t max_varint_length = sizeof(uint64_t) * 8 / 7 + 1;
+constexpr const int8_t max_varint_length = (sizeof(uint64_t) * 8 / 7) + 1;
 
 namespace detail {
 
@@ -40,28 +40,28 @@ namespace detail {
         if (iend - begin >= max_varint_length) {  // fast path
             do {
                 int64_t b = *p++;
-                          val  = ((uint64_t(b) & 0x7fU)       ); if (b >= 0) { break; }
-                b = *p++; val |= ((uint64_t(b) & 0x7fU) <<  7U); if (b >= 0) { break; }
-                b = *p++; val |= ((uint64_t(b) & 0x7fU) << 14U); if (b >= 0) { break; }
-                b = *p++; val |= ((uint64_t(b) & 0x7fU) << 21U); if (b >= 0) { break; }
-                b = *p++; val |= ((uint64_t(b) & 0x7fU) << 28U); if (b >= 0) { break; }
-                b = *p++; val |= ((uint64_t(b) & 0x7fU) << 35U); if (b >= 0) { break; }
-                b = *p++; val |= ((uint64_t(b) & 0x7fU) << 42U); if (b >= 0) { break; }
-                b = *p++; val |= ((uint64_t(b) & 0x7fU) << 49U); if (b >= 0) { break; }
-                b = *p++; val |= ((uint64_t(b) & 0x7fU) << 56U); if (b >= 0) { break; }
-                b = *p++; val |= ((uint64_t(b) & 0x01U) << 63U); if (b >= 0) { break; }
+                          val  = ((static_cast<uint64_t>(b) & 0x7fU)       ); if (b >= 0) { break; }
+                b = *p++; val |= ((static_cast<uint64_t>(b) & 0x7fU) <<  7U); if (b >= 0) { break; }
+                b = *p++; val |= ((static_cast<uint64_t>(b) & 0x7fU) << 14U); if (b >= 0) { break; }
+                b = *p++; val |= ((static_cast<uint64_t>(b) & 0x7fU) << 21U); if (b >= 0) { break; }
+                b = *p++; val |= ((static_cast<uint64_t>(b) & 0x7fU) << 28U); if (b >= 0) { break; }
+                b = *p++; val |= ((static_cast<uint64_t>(b) & 0x7fU) << 35U); if (b >= 0) { break; }
+                b = *p++; val |= ((static_cast<uint64_t>(b) & 0x7fU) << 42U); if (b >= 0) { break; }
+                b = *p++; val |= ((static_cast<uint64_t>(b) & 0x7fU) << 49U); if (b >= 0) { break; }
+                b = *p++; val |= ((static_cast<uint64_t>(b) & 0x7fU) << 56U); if (b >= 0) { break; }
+                b = *p++; val |= ((static_cast<uint64_t>(b) & 0x01U) << 63U); if (b >= 0) { break; }
                 throw varint_too_long_exception{};
             } while (false);
         } else {
             unsigned int shift = 0;
             while (p != iend && *p < 0) {
-                val |= (uint64_t(*p++) & 0x7fU) << shift;
+                val |= (static_cast<uint64_t>(*p++) & 0x7fU) << shift;
                 shift += 7;
             }
             if (p == iend) {
                 throw end_of_buffer_exception{};
             }
-            val |= uint64_t(*p++) << shift;
+            val |= static_cast<uint64_t>(*p++) << shift;
         }
 
         *data = reinterpret_cast<const char*>(p);
@@ -148,11 +148,11 @@ inline int write_varint(T data, uint64_t value) {
     int n = 1;
 
     while (value >= 0x80U) {
-        *data++ = char((value & 0x7fU) | 0x80U);
+        *data++ = static_cast<char>((value & 0x7fU) | 0x80U);
         value >>= 7U;
         ++n;
     }
-    *data = char(value);
+    *data = static_cast<char>(value);
 
     return n;
 }
@@ -163,16 +163,15 @@ inline int write_varint(T data, uint64_t value) {
  * @tparam TBuffer A buffer type.
  * @param buffer Output buffer the varint will be written to.
  * @param value The integer that will be encoded.
- * @returns the number of bytes written
  * @throws Any exception thrown by calling the buffer_push_back() function.
  */
 template <typename TBuffer>
 inline void add_varint_to_buffer(TBuffer* buffer, uint64_t value) {
     while (value >= 0x80U) {
-        buffer_customization<TBuffer>::push_back(buffer, char((value & 0x7fU) | 0x80U));
+        buffer_customization<TBuffer>::push_back(buffer, static_cast<char>((value & 0x7fU) | 0x80U));
         value >>= 7U;
     }
-    buffer_customization<TBuffer>::push_back(buffer, char(value));
+    buffer_customization<TBuffer>::push_back(buffer, static_cast<char>(value));
 }
 
 /**
@@ -186,11 +185,11 @@ inline int add_varint_to_buffer(char* data, uint64_t value) noexcept {
     int n = 1;
 
     while (value >= 0x80U) {
-        *data++ = char((value & 0x7fU) | 0x80U);
+        *data++ = static_cast<char>((value & 0x7fU) | 0x80U);
         value >>= 7U;
         ++n;
     }
-    *data = char(value);
+    *data = static_cast<char>(value);
 
     return n;
 }
@@ -215,28 +214,28 @@ inline int length_of_varint(uint64_t value) noexcept {
 /**
  * ZigZag encodes a 32 bit integer.
  */
-inline constexpr uint32_t encode_zigzag32(int32_t value) noexcept {
+constexpr uint32_t encode_zigzag32(int32_t value) noexcept {
     return (static_cast<uint32_t>(value) << 1U) ^ static_cast<uint32_t>(-static_cast<int32_t>(static_cast<uint32_t>(value) >> 31U));
 }
 
 /**
  * ZigZag encodes a 64 bit integer.
  */
-inline constexpr uint64_t encode_zigzag64(int64_t value) noexcept {
+constexpr uint64_t encode_zigzag64(int64_t value) noexcept {
     return (static_cast<uint64_t>(value) << 1U) ^ static_cast<uint64_t>(-static_cast<int64_t>(static_cast<uint64_t>(value) >> 63U));
 }
 
 /**
  * Decodes a 32 bit ZigZag-encoded integer.
  */
-inline constexpr int32_t decode_zigzag32(uint32_t value) noexcept {
+constexpr int32_t decode_zigzag32(uint32_t value) noexcept {
     return static_cast<int32_t>((value >> 1U) ^ static_cast<uint32_t>(-static_cast<int32_t>(value & 1U)));
 }
 
 /**
  * Decodes a 64 bit ZigZag-encoded integer.
  */
-inline constexpr int64_t decode_zigzag64(uint64_t value) noexcept {
+constexpr int64_t decode_zigzag64(uint64_t value) noexcept {
     return static_cast<int64_t>((value >> 1U) ^ static_cast<uint64_t>(-static_cast<int64_t>(value & 1U)));
 }
 

From 95b70e66e0c22e7e44df38143b7e8b60123d5f11 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 13 Jan 2025 09:31:36 +0100
Subject: [PATCH 245/430] Update included fmt library to version 11.1.2

---
 contrib/fmt/README.contrib           |    2 +-
 contrib/fmt/include/fmt/args.h       |   48 +-
 contrib/fmt/include/fmt/base.h       | 3641 +++++++++++++-------------
 contrib/fmt/include/fmt/chrono.h     |  846 +++---
 contrib/fmt/include/fmt/color.h      |   42 +-
 contrib/fmt/include/fmt/compile.h    |   70 +-
 contrib/fmt/include/fmt/format-inl.h |  109 +-
 contrib/fmt/include/fmt/format.h     | 2371 ++++++++---------
 contrib/fmt/include/fmt/os.h         |   98 +-
 contrib/fmt/include/fmt/ostream.h    |  131 +-
 contrib/fmt/include/fmt/printf.h     |  237 +-
 contrib/fmt/include/fmt/ranges.h     |  224 +-
 contrib/fmt/include/fmt/std.h        |  121 +-
 contrib/fmt/include/fmt/xchar.h      |  143 +-
 14 files changed, 3836 insertions(+), 4247 deletions(-)

diff --git a/contrib/fmt/README.contrib b/contrib/fmt/README.contrib
index 7a86cb77c..04da81c16 100644
--- a/contrib/fmt/README.contrib
+++ b/contrib/fmt/README.contrib
@@ -1,2 +1,2 @@
 Source: https://github.com/fmtlib/fmt
-Revision: v11.0.2
+Revision: v11.1.2
diff --git a/contrib/fmt/include/fmt/args.h b/contrib/fmt/include/fmt/args.h
index 31a60e8fa..3ff478807 100644
--- a/contrib/fmt/include/fmt/args.h
+++ b/contrib/fmt/include/fmt/args.h
@@ -17,7 +17,6 @@
 #include "format.h"  // std_string_view
 
 FMT_BEGIN_NAMESPACE
-
 namespace detail {
 
 template <typename T> struct is_reference_wrapper : std::false_type {};
@@ -72,19 +71,13 @@ class dynamic_arg_list {
  * It can be implicitly converted into `fmt::basic_format_args` for passing
  * into type-erased formatting functions such as `fmt::vformat`.
  */
-template <typename Context>
-class dynamic_format_arg_store
-#if FMT_GCC_VERSION && FMT_GCC_VERSION < 409
-    // Workaround a GCC template argument substitution bug.
-    : public basic_format_args<Context>
-#endif
-{
+template <typename Context> class dynamic_format_arg_store {
  private:
   using char_type = typename Context::char_type;
 
   template <typename T> struct need_copy {
     static constexpr detail::type mapped_type =
-        detail::mapped_type_constant<T, Context>::value;
+        detail::mapped_type_constant<T, char_type>::value;
 
     enum {
       value = !(detail::is_reference_wrapper<T>::value ||
@@ -97,7 +90,7 @@ class dynamic_format_arg_store
   };
 
   template <typename T>
-  using stored_type = conditional_t<
+  using stored_t = conditional_t<
       std::is_convertible<T, std::basic_string<char_type>>::value &&
           !detail::is_reference_wrapper<T>::value,
       std::basic_string<char_type>, T>;
@@ -112,41 +105,37 @@ class dynamic_format_arg_store
 
   friend class basic_format_args<Context>;
 
-  auto get_types() const -> unsigned long long {
-    return detail::is_unpacked_bit | data_.size() |
-           (named_info_.empty()
-                ? 0ULL
-                : static_cast<unsigned long long>(detail::has_named_args_bit));
-  }
-
   auto data() const -> const basic_format_arg<Context>* {
     return named_info_.empty() ? data_.data() : data_.data() + 1;
   }
 
   template <typename T> void emplace_arg(const T& arg) {
-    data_.emplace_back(detail::make_arg<Context>(arg));
+    data_.emplace_back(arg);
   }
 
   template <typename T>
   void emplace_arg(const detail::named_arg<char_type, T>& arg) {
-    if (named_info_.empty()) {
-      constexpr const detail::named_arg_info<char_type>* zero_ptr{nullptr};
-      data_.insert(data_.begin(), {zero_ptr, 0});
-    }
-    data_.emplace_back(detail::make_arg<Context>(detail::unwrap(arg.value)));
+    if (named_info_.empty())
+      data_.insert(data_.begin(), basic_format_arg<Context>(nullptr, 0));
+    data_.emplace_back(detail::unwrap(arg.value));
     auto pop_one = [](std::vector<basic_format_arg<Context>>* data) {
       data->pop_back();
     };
     std::unique_ptr<std::vector<basic_format_arg<Context>>, decltype(pop_one)>
         guard{&data_, pop_one};
     named_info_.push_back({arg.name, static_cast<int>(data_.size() - 2u)});
-    data_[0].value_.named_args = {named_info_.data(), named_info_.size()};
+    data_[0] = {named_info_.data(), named_info_.size()};
     guard.release();
   }
 
  public:
   constexpr dynamic_format_arg_store() = default;
 
+  operator basic_format_args<Context>() const {
+    return basic_format_args<Context>(data(), static_cast<int>(data_.size()),
+                                      !named_info_.empty());
+  }
+
   /**
    * Adds an argument into the dynamic store for later passing to a formatting
    * function.
@@ -164,7 +153,7 @@ class dynamic_format_arg_store
    */
   template <typename T> void push_back(const T& arg) {
     if (detail::const_check(need_copy<T>::value))
-      emplace_arg(dynamic_args_.push<stored_type<T>>(arg));
+      emplace_arg(dynamic_args_.push<stored_t<T>>(arg));
     else
       emplace_arg(detail::unwrap(arg));
   }
@@ -200,7 +189,7 @@ class dynamic_format_arg_store
         dynamic_args_.push<std::basic_string<char_type>>(arg.name).c_str();
     if (detail::const_check(need_copy<T>::value)) {
       emplace_arg(
-          fmt::arg(arg_name, dynamic_args_.push<stored_type<T>>(arg.value)));
+          fmt::arg(arg_name, dynamic_args_.push<stored_t<T>>(arg.value)));
     } else {
       emplace_arg(fmt::arg(arg_name, arg.value));
     }
@@ -210,17 +199,20 @@ class dynamic_format_arg_store
   void clear() {
     data_.clear();
     named_info_.clear();
-    dynamic_args_ = detail::dynamic_arg_list();
+    dynamic_args_ = {};
   }
 
   /// Reserves space to store at least `new_cap` arguments including
   /// `new_cap_named` named arguments.
   void reserve(size_t new_cap, size_t new_cap_named) {
     FMT_ASSERT(new_cap >= new_cap_named,
-               "Set of arguments includes set of named arguments");
+               "set of arguments includes set of named arguments");
     data_.reserve(new_cap);
     named_info_.reserve(new_cap_named);
   }
+
+  /// Returns the number of elements in the store.
+  size_t size() const noexcept { return data_.size(); }
 };
 
 FMT_END_NAMESPACE
diff --git a/contrib/fmt/include/fmt/base.h b/contrib/fmt/include/fmt/base.h
index 627649425..c1d09c6d4 100644
--- a/contrib/fmt/include/fmt/base.h
+++ b/contrib/fmt/include/fmt/base.h
@@ -15,15 +15,13 @@
 #ifndef FMT_MODULE
 #  include <limits.h>  // CHAR_BIT
 #  include <stdio.h>   // FILE
-#  include <string.h>  // strlen
+#  include <string.h>  // memcmp
 
-// <cstddef> is also included transitively from <type_traits>.
-#  include <cstddef>      // std::byte
 #  include <type_traits>  // std::enable_if
 #endif
 
 // The fmt library version in the form major * 10000 + minor * 100 + patch.
-#define FMT_VERSION 110002
+#define FMT_VERSION 110102
 
 // Detect compiler versions.
 #if defined(__clang__) && !defined(__ibmxl__)
@@ -78,6 +76,11 @@
 #else
 #  define FMT_HAS_INCLUDE(x) 0
 #endif
+#ifdef __has_builtin
+#  define FMT_HAS_BUILTIN(x) __has_builtin(x)
+#else
+#  define FMT_HAS_BUILTIN(x) 0
+#endif
 #ifdef __has_cpp_attribute
 #  define FMT_HAS_CPP_ATTRIBUTE(x) __has_cpp_attribute(x)
 #else
@@ -138,40 +141,19 @@
 #  define FMT_CONSTEXPR20
 #endif
 
-#if defined(FMT_USE_NONTYPE_TEMPLATE_ARGS)
-// Use the provided definition.
-#elif defined(__NVCOMPILER)
-#  define FMT_USE_NONTYPE_TEMPLATE_ARGS 0
-#elif FMT_GCC_VERSION >= 903 && FMT_CPLUSPLUS >= 201709L
-#  define FMT_USE_NONTYPE_TEMPLATE_ARGS 1
-#elif defined(__cpp_nontype_template_args) && \
-    __cpp_nontype_template_args >= 201911L
-#  define FMT_USE_NONTYPE_TEMPLATE_ARGS 1
-#elif FMT_CLANG_VERSION >= 1200 && FMT_CPLUSPLUS >= 202002L
-#  define FMT_USE_NONTYPE_TEMPLATE_ARGS 1
-#else
-#  define FMT_USE_NONTYPE_TEMPLATE_ARGS 0
-#endif
-
-#ifdef FMT_USE_CONCEPTS
-// Use the provided definition.
-#elif defined(__cpp_concepts)
-#  define FMT_USE_CONCEPTS 1
-#else
-#  define FMT_USE_CONCEPTS 0
-#endif
-
 // Check if exceptions are disabled.
-#ifdef FMT_EXCEPTIONS
+#ifdef FMT_USE_EXCEPTIONS
 // Use the provided definition.
 #elif defined(__GNUC__) && !defined(__EXCEPTIONS)
-#  define FMT_EXCEPTIONS 0
+#  define FMT_USE_EXCEPTIONS 0
+#elif defined(__clang__) && !defined(__cpp_exceptions)
+#  define FMT_USE_EXCEPTIONS 0
 #elif FMT_MSC_VERSION && !_HAS_EXCEPTIONS
-#  define FMT_EXCEPTIONS 0
+#  define FMT_USE_EXCEPTIONS 0
 #else
-#  define FMT_EXCEPTIONS 1
+#  define FMT_USE_EXCEPTIONS 1
 #endif
-#if FMT_EXCEPTIONS
+#if FMT_USE_EXCEPTIONS
 #  define FMT_TRY try
 #  define FMT_CATCH(x) catch (x)
 #else
@@ -179,6 +161,20 @@
 #  define FMT_CATCH(x) if (false)
 #endif
 
+#ifdef FMT_NO_UNIQUE_ADDRESS
+// Use the provided definition.
+#elif FMT_CPLUSPLUS < 202002L
+// Not supported.
+#elif FMT_HAS_CPP_ATTRIBUTE(no_unique_address)
+#  define FMT_NO_UNIQUE_ADDRESS [[no_unique_address]]
+// VS2019 v16.10 and later except clang-cl (https://reviews.llvm.org/D110485).
+#elif FMT_MSC_VERSION >= 1929 && !FMT_CLANG_VERSION
+#  define FMT_NO_UNIQUE_ADDRESS [[msvc::no_unique_address]]
+#endif
+#ifndef FMT_NO_UNIQUE_ADDRESS
+#  define FMT_NO_UNIQUE_ADDRESS
+#endif
+
 #if FMT_HAS_CPP17_ATTRIBUTE(fallthrough)
 #  define FMT_FALLTHROUGH [[fallthrough]]
 #elif defined(__clang__)
@@ -197,12 +193,12 @@
 #  define FMT_NORETURN
 #endif
 
-#ifndef FMT_NODISCARD
-#  if FMT_HAS_CPP17_ATTRIBUTE(nodiscard)
-#    define FMT_NODISCARD [[nodiscard]]
-#  else
-#    define FMT_NODISCARD
-#  endif
+#ifdef FMT_NODISCARD
+// Use the provided definition.
+#elif FMT_HAS_CPP17_ATTRIBUTE(nodiscard)
+#  define FMT_NODISCARD [[nodiscard]]
+#else
+#  define FMT_NODISCARD
 #endif
 
 #ifdef FMT_DEPRECATED
@@ -213,14 +209,14 @@
 #  define FMT_DEPRECATED /* deprecated */
 #endif
 
-#ifdef FMT_INLINE
+#ifdef FMT_ALWAYS_INLINE
 // Use the provided definition.
 #elif FMT_GCC_VERSION || FMT_CLANG_VERSION
 #  define FMT_ALWAYS_INLINE inline __attribute__((always_inline))
 #else
 #  define FMT_ALWAYS_INLINE inline
 #endif
-// A version of FMT_INLINE to prevent code bloat in debug mode.
+// A version of FMT_ALWAYS_INLINE to prevent code bloat in debug mode.
 #ifdef NDEBUG
 #  define FMT_INLINE FMT_ALWAYS_INLINE
 #else
@@ -233,30 +229,24 @@
 #  define FMT_VISIBILITY(value)
 #endif
 
-#ifndef FMT_GCC_PRAGMA
+// Detect pragmas.
+#define FMT_PRAGMA_IMPL(x) _Pragma(#x)
+#if FMT_GCC_VERSION >= 504 && !defined(__NVCOMPILER)
 // Workaround a _Pragma bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59884
 // and an nvhpc warning: https://github.com/fmtlib/fmt/pull/2582.
-#  if FMT_GCC_VERSION >= 504 && !defined(__NVCOMPILER)
-#    define FMT_GCC_PRAGMA(arg) _Pragma(arg)
-#  else
-#    define FMT_GCC_PRAGMA(arg)
-#  endif
+#  define FMT_PRAGMA_GCC(x) FMT_PRAGMA_IMPL(GCC x)
+#else
+#  define FMT_PRAGMA_GCC(x)
 #endif
-
-// GCC < 5 requires this-> in decltype.
-#if FMT_GCC_VERSION && FMT_GCC_VERSION < 500
-#  define FMT_DECLTYPE_THIS this->
+#if FMT_CLANG_VERSION
+#  define FMT_PRAGMA_CLANG(x) FMT_PRAGMA_IMPL(clang x)
 #else
-#  define FMT_DECLTYPE_THIS
+#  define FMT_PRAGMA_CLANG(x)
 #endif
-
 #if FMT_MSC_VERSION
 #  define FMT_MSC_WARNING(...) __pragma(warning(__VA_ARGS__))
-#  define FMT_UNCHECKED_ITERATOR(It) \
-    using _Unchecked_type = It  // Mark iterator as checked.
 #else
 #  define FMT_MSC_WARNING(...)
-#  define FMT_UNCHECKED_ITERATOR(It) using unchecked_type = It
 #endif
 
 #ifndef FMT_BEGIN_NAMESPACE
@@ -274,7 +264,13 @@
 #  define FMT_END_EXPORT
 #endif
 
-#if !defined(FMT_HEADER_ONLY) && defined(_WIN32)
+#ifdef _WIN32
+#  define FMT_WIN32 1
+#else
+#  define FMT_WIN32 0
+#endif
+
+#if !defined(FMT_HEADER_ONLY) && FMT_WIN32
 #  if defined(FMT_LIB_EXPORT)
 #    define FMT_API __declspec(dllexport)
 #  elif defined(FMT_SHARED)
@@ -287,28 +283,26 @@
 #  define FMT_API
 #endif
 
-#ifndef FMT_UNICODE
-#  define FMT_UNICODE 1
+#ifndef FMT_OPTIMIZE_SIZE
+#  define FMT_OPTIMIZE_SIZE 0
 #endif
 
-// Check if rtti is available.
-#ifndef FMT_USE_RTTI
-// __RTTI is for EDG compilers. _CPPRTTI is for MSVC.
-#  if defined(__GXX_RTTI) || FMT_HAS_FEATURE(cxx_rtti) || defined(_CPPRTTI) || \
-      defined(__INTEL_RTTI__) || defined(__RTTI)
-#    define FMT_USE_RTTI 1
-#  else
-#    define FMT_USE_RTTI 0
-#  endif
+// FMT_BUILTIN_TYPE=0 may result in smaller library size at the cost of higher
+// per-call binary size by passing built-in types through the extension API.
+#ifndef FMT_BUILTIN_TYPES
+#  define FMT_BUILTIN_TYPES 1
 #endif
 
-#define FMT_FWD(...) static_cast<decltype(__VA_ARGS__)&&>(__VA_ARGS__)
+#define FMT_APPLY_VARIADIC(expr) \
+  using ignore = int[];          \
+  (void)ignore { 0, (expr, 0)... }
 
 // Enable minimal optimizations for more compact code in debug mode.
-FMT_GCC_PRAGMA("GCC push_options")
+FMT_PRAGMA_GCC(push_options)
 #if !defined(__OPTIMIZE__) && !defined(__CUDACC__)
-FMT_GCC_PRAGMA("GCC optimize(\"Og\")")
+FMT_PRAGMA_GCC(optimize("Og"))
 #endif
+FMT_PRAGMA_CLANG(diagnostic push)
 
 FMT_BEGIN_NAMESPACE
 
@@ -324,17 +318,15 @@ template <typename T>
 using remove_const_t = typename std::remove_const<T>::type;
 template <typename T>
 using remove_cvref_t = typename std::remove_cv<remove_reference_t<T>>::type;
-template <typename T> struct type_identity {
-  using type = T;
-};
-template <typename T> using type_identity_t = typename type_identity<T>::type;
 template <typename T>
 using make_unsigned_t = typename std::make_unsigned<T>::type;
 template <typename T>
 using underlying_t = typename std::underlying_type<T>::type;
+template <typename T> using decay_t = typename std::decay<T>::type;
+using nullptr_t = decltype(nullptr);
 
 #if FMT_GCC_VERSION && FMT_GCC_VERSION < 500
-// A workaround for gcc 4.8 to make void_t work in a SFINAE context.
+// A workaround for gcc 4.9 to make void_t work in a SFINAE context.
 template <typename...> struct void_t_impl {
   using type = void;
 };
@@ -356,14 +348,12 @@ struct monostate {
 #  define FMT_ENABLE_IF(...) fmt::enable_if_t<(__VA_ARGS__), int> = 0
 #endif
 
-// This is defined in base.h instead of format.h to avoid injecting in std.
-// It is a template to avoid undesirable implicit conversions to std::byte.
-#ifdef __cpp_lib_byte
-template <typename T, FMT_ENABLE_IF(std::is_same<T, std::byte>::value)>
-inline auto format_as(T b) -> unsigned char {
-  return static_cast<unsigned char>(b);
+template <typename T> constexpr auto min_of(T a, T b) -> T {
+  return a < b ? a : b;
+}
+template <typename T> constexpr auto max_of(T a, T b) -> T {
+  return a > b ? a : b;
 }
-#endif
 
 namespace detail {
 // Suppresses "unused variable" warnings with the method described in
@@ -373,9 +363,8 @@ template <typename... T> FMT_CONSTEXPR void ignore_unused(const T&...) {}
 
 constexpr auto is_constant_evaluated(bool default_value = false) noexcept
     -> bool {
-// Workaround for incompatibility between libstdc++ consteval-based
-// std::is_constant_evaluated() implementation and clang-14:
-// https://github.com/fmtlib/fmt/issues/3247.
+// Workaround for incompatibility between clang 14 and libstdc++ consteval-based
+// std::is_constant_evaluated: https://github.com/fmtlib/fmt/issues/3247.
 #if FMT_CPLUSPLUS >= 202002L && FMT_GLIBCXX_RELEASE >= 12 && \
     (FMT_CLANG_VERSION >= 1400 && FMT_CLANG_VERSION < 1500)
   ignore_unused(default_value);
@@ -389,7 +378,9 @@ constexpr auto is_constant_evaluated(bool default_value = false) noexcept
 }
 
 // Suppresses "conditional expression is constant" warnings.
-template <typename T> constexpr auto const_check(T value) -> T { return value; }
+template <typename T> FMT_ALWAYS_INLINE constexpr auto const_check(T val) -> T {
+  return val;
+}
 
 FMT_NORETURN FMT_API void assert_fail(const char* file, int line,
                                       const char* message);
@@ -408,15 +399,14 @@ FMT_NORETURN FMT_API void assert_fail(const char* file, int line,
 #endif
 
 #ifdef FMT_USE_INT128
-// Do nothing.
+// Use the provided definition.
 #elif defined(__SIZEOF_INT128__) && !defined(__NVCC__) && \
     !(FMT_CLANG_VERSION && FMT_MSC_VERSION)
 #  define FMT_USE_INT128 1
 using int128_opt = __int128_t;  // An optional native 128-bit integer.
 using uint128_opt = __uint128_t;
-template <typename T> inline auto convert_for_visit(T value) -> T {
-  return value;
-}
+inline auto map(int128_opt x) -> int128_opt { return x; }
+inline auto map(uint128_opt x) -> uint128_opt { return x; }
 #else
 #  define FMT_USE_INT128 0
 #endif
@@ -424,9 +414,23 @@ template <typename T> inline auto convert_for_visit(T value) -> T {
 enum class int128_opt {};
 enum class uint128_opt {};
 // Reduce template instantiations.
-template <typename T> auto convert_for_visit(T) -> monostate { return {}; }
+inline auto map(int128_opt) -> monostate { return {}; }
+inline auto map(uint128_opt) -> monostate { return {}; }
+#endif
+
+#ifndef FMT_USE_BITINT
+#  define FMT_USE_BITINT (FMT_CLANG_VERSION >= 1500)
 #endif
 
+#if FMT_USE_BITINT
+FMT_PRAGMA_CLANG(diagnostic ignored "-Wbit-int-extension")
+template <int N> using bitint = _BitInt(N);
+template <int N> using ubitint = unsigned _BitInt(N);
+#else
+template <int N> struct bitint {};
+template <int N> struct ubitint {};
+#endif  // FMT_USE_BITINT
+
 // Casts a nonnegative integer to unsigned.
 template <typename Int>
 FMT_CONSTEXPR auto to_unsigned(Int value) -> make_unsigned_t<Int> {
@@ -434,6 +438,9 @@ FMT_CONSTEXPR auto to_unsigned(Int value) -> make_unsigned_t<Int> {
   return static_cast<make_unsigned_t<Int>>(value);
 }
 
+template <typename Char>
+using unsigned_char = conditional_t<sizeof(Char) == 1, unsigned char, unsigned>;
+
 // A heuristic to detect std::string and std::[experimental::]string_view.
 // It is mainly used to avoid dependency on <[experimental/]string_view>.
 template <typename T, typename Enable = void>
@@ -444,25 +451,19 @@ struct is_std_string_like<T, void_t<decltype(std::declval<T>().find_first_of(
     : std::is_convertible<decltype(std::declval<T>().data()),
                           const typename T::value_type*> {};
 
-// Returns true iff the literal encoding is UTF-8.
-constexpr auto is_utf8_enabled() -> bool {
-  // Avoid an MSVC sign extension bug: https://github.com/fmtlib/fmt/pull/2297.
-  using uchar = unsigned char;
-  return sizeof("\u00A7") == 3 && uchar("\u00A7"[0]) == 0xC2 &&
-         uchar("\u00A7"[1]) == 0xA7;
-}
-constexpr auto use_utf8() -> bool {
-  return !FMT_MSC_VERSION || is_utf8_enabled();
-}
+// Check if the literal encoding is UTF-8.
+enum { is_utf8_enabled = "\u00A7"[1] == '\xA7' };
+enum { use_utf8 = !FMT_WIN32 || is_utf8_enabled };
+
+#ifndef FMT_UNICODE
+#  define FMT_UNICODE 1
+#endif
 
-static_assert(!FMT_UNICODE || use_utf8(),
+static_assert(!FMT_UNICODE || use_utf8,
               "Unicode support requires compiling with /utf-8");
 
-template <typename Char> FMT_CONSTEXPR auto length(const Char* s) -> size_t {
-  size_t len = 0;
-  while (*s++) ++len;
-  return len;
-}
+template <typename T> constexpr const char* narrow(const T*) { return nullptr; }
+constexpr FMT_ALWAYS_INLINE const char* narrow(const char* s) { return s; }
 
 template <typename Char>
 FMT_CONSTEXPR auto compare(const Char* s1, const Char* s2, std::size_t n)
@@ -494,17 +495,18 @@ struct is_back_insert_iterator<
 
 // Extracts a reference to the container from *insert_iterator.
 template <typename OutputIt>
-inline auto get_container(OutputIt it) -> typename OutputIt::container_type& {
+inline FMT_CONSTEXPR20 auto get_container(OutputIt it) ->
+    typename OutputIt::container_type& {
   struct accessor : OutputIt {
-    accessor(OutputIt base) : OutputIt(base) {}
+    FMT_CONSTEXPR20 accessor(OutputIt base) : OutputIt(base) {}
     using OutputIt::container;
   };
   return *accessor(it).container;
 }
 }  // namespace detail
 
-// Checks whether T is a container with contiguous storage.
-template <typename T> struct is_contiguous : std::false_type {};
+// Parsing-related public API and forward declarations.
+FMT_BEGIN_EXPORT
 
 /**
  * An implementation of `std::basic_string_view` for pre-C++17. It provides a
@@ -513,7 +515,6 @@ template <typename T> struct is_contiguous : std::false_type {};
  * compiled with a different `-std` option than the client code (which is not
  * recommended).
  */
-FMT_EXPORT
 template <typename Char> class basic_string_view {
  private:
   const Char* data_;
@@ -529,16 +530,23 @@ template <typename Char> class basic_string_view {
   constexpr basic_string_view(const Char* s, size_t count) noexcept
       : data_(s), size_(count) {}
 
-  constexpr basic_string_view(std::nullptr_t) = delete;
+  constexpr basic_string_view(nullptr_t) = delete;
 
   /// Constructs a string reference object from a C string.
-  FMT_CONSTEXPR20
-  basic_string_view(const Char* s)
-      : data_(s),
-        size_(detail::const_check(std::is_same<Char, char>::value &&
-                                  !detail::is_constant_evaluated(false))
-                  ? strlen(reinterpret_cast<const char*>(s))
-                  : detail::length(s)) {}
+#if FMT_GCC_VERSION
+  FMT_ALWAYS_INLINE
+#endif
+  FMT_CONSTEXPR20 basic_string_view(const Char* s) : data_(s) {
+#if FMT_HAS_BUILTIN(__buitin_strlen) || FMT_GCC_VERSION || FMT_CLANG_VERSION
+    if (std::is_same<Char, char>::value) {
+      size_ = __builtin_strlen(detail::narrow(s));
+      return;
+    }
+#endif
+    size_t len = 0;
+    while (*s++) ++len;
+    size_ = len;
+  }
 
   /// Constructs a string reference from a `std::basic_string` or a
   /// `std::basic_string_view` object.
@@ -579,11 +587,10 @@ template <typename Char> class basic_string_view {
 
   // Lexicographically compare this string reference to other.
   FMT_CONSTEXPR auto compare(basic_string_view other) const -> int {
-    size_t str_size = size_ < other.size_ ? size_ : other.size_;
-    int result = detail::compare(data_, other.data_, str_size);
-    if (result == 0)
-      result = size_ == other.size_ ? 0 : (size_ < other.size_ ? -1 : 1);
-    return result;
+    int result =
+        detail::compare(data_, other.data_, min_of(size_, other.size_));
+    if (result != 0) return result;
+    return size_ == other.size_ ? 0 : (size_ < other.size_ ? -1 : 1);
   }
 
   FMT_CONSTEXPR friend auto operator==(basic_string_view lhs,
@@ -607,14 +614,313 @@ template <typename Char> class basic_string_view {
   }
 };
 
-FMT_EXPORT
 using string_view = basic_string_view<char>;
 
-/// Specifies if `T` is a character type. Can be specialized by users.
-FMT_EXPORT
-template <typename T> struct is_char : std::false_type {};
+/// Specifies if `T` is an extended character type. Can be specialized by users.
+template <typename T> struct is_xchar : std::false_type {};
+template <> struct is_xchar<wchar_t> : std::true_type {};
+template <> struct is_xchar<char16_t> : std::true_type {};
+template <> struct is_xchar<char32_t> : std::true_type {};
+#ifdef __cpp_char8_t
+template <> struct is_xchar<char8_t> : std::true_type {};
+#endif
+
+// DEPRECATED! Will be replaced with an alias to prevent specializations.
+template <typename T> struct is_char : is_xchar<T> {};
 template <> struct is_char<char> : std::true_type {};
 
+template <typename T> class basic_appender;
+using appender = basic_appender<char>;
+
+// Checks whether T is a container with contiguous storage.
+template <typename T> struct is_contiguous : std::false_type {};
+
+class context;
+template <typename OutputIt, typename Char> class generic_context;
+template <typename Char> class parse_context;
+
+// Longer aliases for C++20 compatibility.
+template <typename Char> using basic_format_parse_context = parse_context<Char>;
+using format_parse_context = parse_context<char>;
+template <typename OutputIt, typename Char>
+using basic_format_context =
+    conditional_t<std::is_same<OutputIt, appender>::value, context,
+                  generic_context<OutputIt, Char>>;
+using format_context = context;
+
+template <typename Char>
+using buffered_context =
+    conditional_t<std::is_same<Char, char>::value, context,
+                  generic_context<basic_appender<Char>, Char>>;
+
+template <typename Context> class basic_format_arg;
+template <typename Context> class basic_format_args;
+
+// A separate type would result in shorter symbols but break ABI compatibility
+// between clang and gcc on ARM (#1919).
+using format_args = basic_format_args<context>;
+
+// A formatter for objects of type T.
+template <typename T, typename Char = char, typename Enable = void>
+struct formatter {
+  // A deleted default constructor indicates a disabled formatter.
+  formatter() = delete;
+};
+
+/// Reports a format error at compile time or, via a `format_error` exception,
+/// at runtime.
+// This function is intentionally not constexpr to give a compile-time error.
+FMT_NORETURN FMT_API void report_error(const char* message);
+
+enum class presentation_type : unsigned char {
+  // Common specifiers:
+  none = 0,
+  debug = 1,   // '?'
+  string = 2,  // 's' (string, bool)
+
+  // Integral, bool and character specifiers:
+  dec = 3,  // 'd'
+  hex,      // 'x' or 'X'
+  oct,      // 'o'
+  bin,      // 'b' or 'B'
+  chr,      // 'c'
+
+  // String and pointer specifiers:
+  pointer = 3,  // 'p'
+
+  // Floating-point specifiers:
+  exp = 1,  // 'e' or 'E' (1 since there is no FP debug presentation)
+  fixed,    // 'f' or 'F'
+  general,  // 'g' or 'G'
+  hexfloat  // 'a' or 'A'
+};
+
+enum class align { none, left, right, center, numeric };
+enum class sign { none, minus, plus, space };
+enum class arg_id_kind { none, index, name };
+
+// Basic format specifiers for built-in and string types.
+class basic_specs {
+ private:
+  // Data is arranged as follows:
+  //
+  //  0                   1                   2                   3
+  //  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+  // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  // |type |align| w | p | s |u|#|L|  f  |          unused           |
+  // +-----+-----+---+---+---+-+-+-+-----+---------------------------+
+  //
+  //   w - dynamic width info
+  //   p - dynamic precision info
+  //   s - sign
+  //   u - uppercase (e.g. 'X' for 'x')
+  //   # - alternate form ('#')
+  //   L - localized
+  //   f - fill size
+  //
+  // Bitfields are not used because of compiler bugs such as gcc bug 61414.
+  enum : unsigned {
+    type_mask = 0x00007,
+    align_mask = 0x00038,
+    width_mask = 0x000C0,
+    precision_mask = 0x00300,
+    sign_mask = 0x00C00,
+    uppercase_mask = 0x01000,
+    alternate_mask = 0x02000,
+    localized_mask = 0x04000,
+    fill_size_mask = 0x38000,
+
+    align_shift = 3,
+    width_shift = 6,
+    precision_shift = 8,
+    sign_shift = 10,
+    fill_size_shift = 15,
+
+    max_fill_size = 4
+  };
+
+  size_t data_ = 1 << fill_size_shift;
+
+  // Character (code unit) type is erased to prevent template bloat.
+  char fill_data_[max_fill_size] = {' '};
+
+  FMT_CONSTEXPR void set_fill_size(size_t size) {
+    data_ = (data_ & ~fill_size_mask) | (size << fill_size_shift);
+  }
+
+ public:
+  constexpr auto type() const -> presentation_type {
+    return static_cast<presentation_type>(data_ & type_mask);
+  }
+  FMT_CONSTEXPR void set_type(presentation_type t) {
+    data_ = (data_ & ~type_mask) | static_cast<unsigned>(t);
+  }
+
+  constexpr auto align() const -> align {
+    return static_cast<fmt::align>((data_ & align_mask) >> align_shift);
+  }
+  FMT_CONSTEXPR void set_align(fmt::align a) {
+    data_ = (data_ & ~align_mask) | (static_cast<unsigned>(a) << align_shift);
+  }
+
+  constexpr auto dynamic_width() const -> arg_id_kind {
+    return static_cast<arg_id_kind>((data_ & width_mask) >> width_shift);
+  }
+  FMT_CONSTEXPR void set_dynamic_width(arg_id_kind w) {
+    data_ = (data_ & ~width_mask) | (static_cast<unsigned>(w) << width_shift);
+  }
+
+  FMT_CONSTEXPR auto dynamic_precision() const -> arg_id_kind {
+    return static_cast<arg_id_kind>((data_ & precision_mask) >>
+                                    precision_shift);
+  }
+  FMT_CONSTEXPR void set_dynamic_precision(arg_id_kind p) {
+    data_ = (data_ & ~precision_mask) |
+            (static_cast<unsigned>(p) << precision_shift);
+  }
+
+  constexpr bool dynamic() const {
+    return (data_ & (width_mask | precision_mask)) != 0;
+  }
+
+  constexpr auto sign() const -> sign {
+    return static_cast<fmt::sign>((data_ & sign_mask) >> sign_shift);
+  }
+  FMT_CONSTEXPR void set_sign(fmt::sign s) {
+    data_ = (data_ & ~sign_mask) | (static_cast<unsigned>(s) << sign_shift);
+  }
+
+  constexpr auto upper() const -> bool { return (data_ & uppercase_mask) != 0; }
+  FMT_CONSTEXPR void set_upper() { data_ |= uppercase_mask; }
+
+  constexpr auto alt() const -> bool { return (data_ & alternate_mask) != 0; }
+  FMT_CONSTEXPR void set_alt() { data_ |= alternate_mask; }
+  FMT_CONSTEXPR void clear_alt() { data_ &= ~alternate_mask; }
+
+  constexpr auto localized() const -> bool {
+    return (data_ & localized_mask) != 0;
+  }
+  FMT_CONSTEXPR void set_localized() { data_ |= localized_mask; }
+
+  constexpr auto fill_size() const -> size_t {
+    return (data_ & fill_size_mask) >> fill_size_shift;
+  }
+
+  template <typename Char, FMT_ENABLE_IF(std::is_same<Char, char>::value)>
+  constexpr auto fill() const -> const Char* {
+    return fill_data_;
+  }
+  template <typename Char, FMT_ENABLE_IF(!std::is_same<Char, char>::value)>
+  constexpr auto fill() const -> const Char* {
+    return nullptr;
+  }
+
+  template <typename Char> constexpr auto fill_unit() const -> Char {
+    using uchar = unsigned char;
+    return static_cast<Char>(static_cast<uchar>(fill_data_[0]) |
+                             (static_cast<uchar>(fill_data_[1]) << 8) |
+                             (static_cast<uchar>(fill_data_[2]) << 16));
+  }
+
+  FMT_CONSTEXPR void set_fill(char c) {
+    fill_data_[0] = c;
+    set_fill_size(1);
+  }
+
+  template <typename Char>
+  FMT_CONSTEXPR void set_fill(basic_string_view<Char> s) {
+    auto size = s.size();
+    set_fill_size(size);
+    if (size == 1) {
+      unsigned uchar = static_cast<detail::unsigned_char<Char>>(s[0]);
+      fill_data_[0] = static_cast<char>(uchar);
+      fill_data_[1] = static_cast<char>(uchar >> 8);
+      fill_data_[2] = static_cast<char>(uchar >> 16);
+      return;
+    }
+    FMT_ASSERT(size <= max_fill_size, "invalid fill");
+    for (size_t i = 0; i < size; ++i)
+      fill_data_[i & 3] = static_cast<char>(s[i]);
+  }
+
+  FMT_CONSTEXPR void copy_fill_from(const basic_specs& specs) {
+    set_fill_size(specs.fill_size());
+    for (size_t i = 0; i < max_fill_size; ++i)
+      fill_data_[i] = specs.fill_data_[i];
+  }
+};
+
+// Format specifiers for built-in and string types.
+struct format_specs : basic_specs {
+  int width;
+  int precision;
+
+  constexpr format_specs() : width(0), precision(-1) {}
+};
+
+/**
+ * Parsing context consisting of a format string range being parsed and an
+ * argument counter for automatic indexing.
+ */
+template <typename Char = char> class parse_context {
+ private:
+  basic_string_view<Char> fmt_;
+  int next_arg_id_;
+
+  enum { use_constexpr_cast = !FMT_GCC_VERSION || FMT_GCC_VERSION >= 1200 };
+
+  FMT_CONSTEXPR void do_check_arg_id(int arg_id);
+
+ public:
+  using char_type = Char;
+  using iterator = const Char*;
+
+  constexpr explicit parse_context(basic_string_view<Char> fmt,
+                                   int next_arg_id = 0)
+      : fmt_(fmt), next_arg_id_(next_arg_id) {}
+
+  /// Returns an iterator to the beginning of the format string range being
+  /// parsed.
+  constexpr auto begin() const noexcept -> iterator { return fmt_.begin(); }
+
+  /// Returns an iterator past the end of the format string range being parsed.
+  constexpr auto end() const noexcept -> iterator { return fmt_.end(); }
+
+  /// Advances the begin iterator to `it`.
+  FMT_CONSTEXPR void advance_to(iterator it) {
+    fmt_.remove_prefix(detail::to_unsigned(it - begin()));
+  }
+
+  /// Reports an error if using the manual argument indexing; otherwise returns
+  /// the next argument index and switches to the automatic indexing.
+  FMT_CONSTEXPR auto next_arg_id() -> int {
+    if (next_arg_id_ < 0) {
+      report_error("cannot switch from manual to automatic argument indexing");
+      return 0;
+    }
+    int id = next_arg_id_++;
+    do_check_arg_id(id);
+    return id;
+  }
+
+  /// Reports an error if using the automatic argument indexing; otherwise
+  /// switches to the manual indexing.
+  FMT_CONSTEXPR void check_arg_id(int id) {
+    if (next_arg_id_ > 0) {
+      report_error("cannot switch from automatic to manual argument indexing");
+      return;
+    }
+    next_arg_id_ = -1;
+    do_check_arg_id(id);
+  }
+  FMT_CONSTEXPR void check_arg_id(basic_string_view<Char>) {
+    next_arg_id_ = -1;
+  }
+  FMT_CONSTEXPR void check_dynamic_spec(int arg_id);
+};
+
+FMT_END_EXPORT
+
 namespace detail {
 
 // Constructs fmt::basic_string_view<Char> from types implicitly convertible
@@ -643,16 +949,10 @@ struct has_to_string_view<
     T, void_t<decltype(detail::to_string_view(std::declval<T>()))>>
     : std::true_type {};
 
-template <typename Char, Char... C> struct string_literal {
-  static constexpr Char value[sizeof...(C)] = {C...};
-  constexpr operator basic_string_view<Char>() const {
-    return {value, sizeof...(C)};
-  }
-};
-#if FMT_CPLUSPLUS < 201703L
-template <typename Char, Char... C>
-constexpr Char string_literal<Char, C...>::value[sizeof...(C)];
-#endif
+/// String's character (code unit) type. detail:: is intentional to prevent ADL.
+template <typename S,
+          typename V = decltype(detail::to_string_view(std::declval<S>()))>
+using char_t = typename V::value_type;
 
 enum class type {
   none_type,
@@ -727,103 +1027,196 @@ enum {
   cstring_set = set(type::cstring_type),
   pointer_set = set(type::pointer_type)
 };
-}  // namespace detail
-
-/// Reports a format error at compile time or, via a `format_error` exception,
-/// at runtime.
-// This function is intentionally not constexpr to give a compile-time error.
-FMT_NORETURN FMT_API void report_error(const char* message);
 
-FMT_DEPRECATED FMT_NORETURN inline void throw_format_error(
-    const char* message) {
-  report_error(message);
-}
+struct view {};
 
-/// String's character (code unit) type.
-template <typename S,
-          typename V = decltype(detail::to_string_view(std::declval<S>()))>
-using char_t = typename V::value_type;
+template <typename Char, typename T> struct named_arg;
+template <typename T> struct is_named_arg : std::false_type {};
+template <typename T> struct is_static_named_arg : std::false_type {};
 
-/**
- * Parsing context consisting of a format string range being parsed and an
- * argument counter for automatic indexing.
- * You can use the `format_parse_context` type alias for `char` instead.
- */
-FMT_EXPORT
-template <typename Char> class basic_format_parse_context {
- private:
-  basic_string_view<Char> format_str_;
-  int next_arg_id_;
+template <typename Char, typename T>
+struct is_named_arg<named_arg<Char, T>> : std::true_type {};
 
-  FMT_CONSTEXPR void do_check_arg_id(int id);
+template <typename Char, typename T> struct named_arg : view {
+  const Char* name;
+  const T& value;
 
- public:
-  using char_type = Char;
-  using iterator = const Char*;
+  named_arg(const Char* n, const T& v) : name(n), value(v) {}
+  static_assert(!is_named_arg<T>::value, "nested named arguments");
+};
 
-  explicit constexpr basic_format_parse_context(
-      basic_string_view<Char> format_str, int next_arg_id = 0)
-      : format_str_(format_str), next_arg_id_(next_arg_id) {}
+template <bool B = false> constexpr auto count() -> int { return B ? 1 : 0; }
+template <bool B1, bool B2, bool... Tail> constexpr auto count() -> int {
+  return (B1 ? 1 : 0) + count<B2, Tail...>();
+}
 
-  /// Returns an iterator to the beginning of the format string range being
-  /// parsed.
-  constexpr auto begin() const noexcept -> iterator {
-    return format_str_.begin();
-  }
+template <typename... Args> constexpr auto count_named_args() -> int {
+  return count<is_named_arg<Args>::value...>();
+}
+template <typename... Args> constexpr auto count_static_named_args() -> int {
+  return count<is_static_named_arg<Args>::value...>();
+}
 
-  /// Returns an iterator past the end of the format string range being parsed.
-  constexpr auto end() const noexcept -> iterator { return format_str_.end(); }
+template <typename Char> struct named_arg_info {
+  const Char* name;
+  int id;
+};
 
-  /// Advances the begin iterator to `it`.
-  FMT_CONSTEXPR void advance_to(iterator it) {
-    format_str_.remove_prefix(detail::to_unsigned(it - begin()));
-  }
+template <typename Char, typename T, FMT_ENABLE_IF(!is_named_arg<T>::value)>
+void init_named_arg(named_arg_info<Char>*, int& arg_index, int&, const T&) {
+  ++arg_index;
+}
+template <typename Char, typename T, FMT_ENABLE_IF(is_named_arg<T>::value)>
+void init_named_arg(named_arg_info<Char>* named_args, int& arg_index,
+                    int& named_arg_index, const T& arg) {
+  named_args[named_arg_index++] = {arg.name, arg_index++};
+}
 
-  /// Reports an error if using the manual argument indexing; otherwise returns
-  /// the next argument index and switches to the automatic indexing.
-  FMT_CONSTEXPR auto next_arg_id() -> int {
-    if (next_arg_id_ < 0) {
-      report_error("cannot switch from manual to automatic argument indexing");
-      return 0;
-    }
-    int id = next_arg_id_++;
-    do_check_arg_id(id);
-    return id;
-  }
+template <typename T, typename Char,
+          FMT_ENABLE_IF(!is_static_named_arg<T>::value)>
+FMT_CONSTEXPR void init_static_named_arg(named_arg_info<Char>*, int& arg_index,
+                                         int&) {
+  ++arg_index;
+}
+template <typename T, typename Char,
+          FMT_ENABLE_IF(is_static_named_arg<T>::value)>
+FMT_CONSTEXPR void init_static_named_arg(named_arg_info<Char>* named_args,
+                                         int& arg_index, int& named_arg_index) {
+  named_args[named_arg_index++] = {T::name, arg_index++};
+}
 
-  /// Reports an error if using the automatic argument indexing; otherwise
-  /// switches to the manual indexing.
-  FMT_CONSTEXPR void check_arg_id(int id) {
-    if (next_arg_id_ > 0) {
-      report_error("cannot switch from automatic to manual argument indexing");
-      return;
-    }
-    next_arg_id_ = -1;
-    do_check_arg_id(id);
-  }
-  FMT_CONSTEXPR void check_arg_id(basic_string_view<Char>) {
-    next_arg_id_ = -1;
-  }
-  FMT_CONSTEXPR void check_dynamic_spec(int arg_id);
+// To minimize the number of types we need to deal with, long is translated
+// either to int or to long long depending on its size.
+enum { long_short = sizeof(long) == sizeof(int) };
+using long_type = conditional_t<long_short, int, long long>;
+using ulong_type = conditional_t<long_short, unsigned, unsigned long long>;
+
+template <typename T>
+using format_as_result =
+    remove_cvref_t<decltype(format_as(std::declval<const T&>()))>;
+template <typename T>
+using format_as_member_result =
+    remove_cvref_t<decltype(formatter<T>::format_as(std::declval<const T&>()))>;
+
+template <typename T, typename Enable = std::true_type>
+struct use_format_as : std::false_type {};
+// format_as member is only used to avoid injection into the std namespace.
+template <typename T, typename Enable = std::true_type>
+struct use_format_as_member : std::false_type {};
+
+// Only map owning types because mapping views can be unsafe.
+template <typename T>
+struct use_format_as<
+    T, bool_constant<std::is_arithmetic<format_as_result<T>>::value>>
+    : std::true_type {};
+template <typename T>
+struct use_format_as_member<
+    T, bool_constant<std::is_arithmetic<format_as_member_result<T>>::value>>
+    : std::true_type {};
+
+template <typename T, typename U = remove_const_t<T>>
+using use_formatter =
+    bool_constant<(std::is_class<T>::value || std::is_enum<T>::value ||
+                   std::is_union<T>::value || std::is_array<T>::value) &&
+                  !has_to_string_view<T>::value && !is_named_arg<T>::value &&
+                  !use_format_as<T>::value && !use_format_as_member<T>::value>;
+
+template <typename Char, typename T, typename U = remove_const_t<T>>
+auto has_formatter_impl(T* p, buffered_context<Char>* ctx = nullptr)
+    -> decltype(formatter<U, Char>().format(*p, *ctx), std::true_type());
+template <typename Char> auto has_formatter_impl(...) -> std::false_type;
+
+// T can be const-qualified to check if it is const-formattable.
+template <typename T, typename Char> constexpr auto has_formatter() -> bool {
+  return decltype(has_formatter_impl<Char>(static_cast<T*>(nullptr)))::value;
+}
+
+// Maps formatting argument types to natively supported types or user-defined
+// types with formatters. Returns void on errors to be SFINAE-friendly.
+template <typename Char> struct type_mapper {
+  static auto map(signed char) -> int;
+  static auto map(unsigned char) -> unsigned;
+  static auto map(short) -> int;
+  static auto map(unsigned short) -> unsigned;
+  static auto map(int) -> int;
+  static auto map(unsigned) -> unsigned;
+  static auto map(long) -> long_type;
+  static auto map(unsigned long) -> ulong_type;
+  static auto map(long long) -> long long;
+  static auto map(unsigned long long) -> unsigned long long;
+  static auto map(int128_opt) -> int128_opt;
+  static auto map(uint128_opt) -> uint128_opt;
+  static auto map(bool) -> bool;
+
+  template <int N>
+  static auto map(bitint<N>) -> conditional_t<N <= 64, long long, void>;
+  template <int N>
+  static auto map(ubitint<N>)
+      -> conditional_t<N <= 64, unsigned long long, void>;
+
+  template <typename T, FMT_ENABLE_IF(is_char<T>::value)>
+  static auto map(T) -> conditional_t<
+      std::is_same<T, char>::value || std::is_same<T, Char>::value, Char, void>;
+
+  static auto map(float) -> float;
+  static auto map(double) -> double;
+  static auto map(long double) -> long double;
+
+  static auto map(Char*) -> const Char*;
+  static auto map(const Char*) -> const Char*;
+  template <typename T, typename C = char_t<T>,
+            FMT_ENABLE_IF(!std::is_pointer<T>::value)>
+  static auto map(const T&) -> conditional_t<std::is_same<C, Char>::value,
+                                             basic_string_view<C>, void>;
+
+  static auto map(void*) -> const void*;
+  static auto map(const void*) -> const void*;
+  static auto map(volatile void*) -> const void*;
+  static auto map(const volatile void*) -> const void*;
+  static auto map(nullptr_t) -> const void*;
+  template <typename T, FMT_ENABLE_IF(std::is_pointer<T>::value ||
+                                      std::is_member_pointer<T>::value)>
+  static auto map(const T&) -> void;
+
+  template <typename T, FMT_ENABLE_IF(use_format_as<T>::value)>
+  static auto map(const T& x) -> decltype(map(format_as(x)));
+  template <typename T, FMT_ENABLE_IF(use_format_as_member<T>::value)>
+  static auto map(const T& x) -> decltype(map(formatter<T>::format_as(x)));
+
+  template <typename T, FMT_ENABLE_IF(use_formatter<T>::value)>
+  static auto map(T&) -> conditional_t<has_formatter<T, Char>(), T&, void>;
+
+  template <typename T, FMT_ENABLE_IF(is_named_arg<T>::value)>
+  static auto map(const T& named_arg) -> decltype(map(named_arg.value));
 };
 
-FMT_EXPORT
-using format_parse_context = basic_format_parse_context<char>;
+// detail:: is used to workaround a bug in MSVC 2017.
+template <typename T, typename Char>
+using mapped_t = decltype(detail::type_mapper<Char>::map(std::declval<T&>()));
 
-namespace detail {
+// A type constant after applying type_mapper.
+template <typename T, typename Char = char>
+using mapped_type_constant = type_constant<mapped_t<T, Char>, Char>;
+
+template <typename T, typename Context,
+          type TYPE =
+              mapped_type_constant<T, typename Context::char_type>::value>
+using stored_type_constant = std::integral_constant<
+    type, Context::builtin_types || TYPE == type::int_type ? TYPE
+                                                           : type::custom_type>;
 // A parse context with extra data used only in compile-time checks.
 template <typename Char>
-class compile_parse_context : public basic_format_parse_context<Char> {
+class compile_parse_context : public parse_context<Char> {
  private:
   int num_args_;
   const type* types_;
-  using base = basic_format_parse_context<Char>;
+  using base = parse_context<Char>;
 
  public:
-  explicit FMT_CONSTEXPR compile_parse_context(
-      basic_string_view<Char> format_str, int num_args, const type* types,
-      int next_arg_id = 0)
-      : base(format_str, next_arg_id), num_args_(num_args), types_(types) {}
+  FMT_CONSTEXPR explicit compile_parse_context(basic_string_view<Char> fmt,
+                                               int num_args, const type* types,
+                                               int next_arg_id = 0)
+      : base(fmt, next_arg_id), num_args_(num_args), types_(types) {}
 
   constexpr auto num_args() const -> int { return num_args_; }
   constexpr auto arg_type(int id) const -> type { return types_[id]; }
@@ -841,90 +1234,570 @@ class compile_parse_context : public basic_format_parse_context<Char> {
   using base::check_arg_id;
 
   FMT_CONSTEXPR void check_dynamic_spec(int arg_id) {
-    detail::ignore_unused(arg_id);
+    ignore_unused(arg_id);
     if (arg_id < num_args_ && types_ && !is_integral_type(types_[arg_id]))
       report_error("width/precision is not integer");
   }
 };
 
-/// A contiguous memory buffer with an optional growing ability. It is an
-/// internal class and shouldn't be used directly, only via `memory_buffer`.
-template <typename T> class buffer {
- private:
-  T* ptr_;
-  size_t size_;
-  size_t capacity_;
+// An argument reference.
+template <typename Char> union arg_ref {
+  FMT_CONSTEXPR arg_ref(int idx = 0) : index(idx) {}
+  FMT_CONSTEXPR arg_ref(basic_string_view<Char> n) : name(n) {}
 
-  using grow_fun = void (*)(buffer& buf, size_t capacity);
-  grow_fun grow_;
+  int index;
+  basic_string_view<Char> name;
+};
 
- protected:
-  // Don't initialize ptr_ since it is not accessed to save a few cycles.
-  FMT_MSC_WARNING(suppress : 26495)
-  FMT_CONSTEXPR20 buffer(grow_fun grow, size_t sz) noexcept
-      : size_(sz), capacity_(sz), grow_(grow) {}
+// Format specifiers with width and precision resolved at formatting rather
+// than parsing time to allow reusing the same parsed specifiers with
+// different sets of arguments (precompilation of format strings).
+template <typename Char = char> struct dynamic_format_specs : format_specs {
+  arg_ref<Char> width_ref;
+  arg_ref<Char> precision_ref;
+};
 
-  constexpr buffer(grow_fun grow, T* p = nullptr, size_t sz = 0,
-                   size_t cap = 0) noexcept
-      : ptr_(p), size_(sz), capacity_(cap), grow_(grow) {}
+// Converts a character to ASCII. Returns '\0' on conversion failure.
+template <typename Char, FMT_ENABLE_IF(std::is_integral<Char>::value)>
+constexpr auto to_ascii(Char c) -> char {
+  return c <= 0xff ? static_cast<char>(c) : '\0';
+}
 
-  FMT_CONSTEXPR20 ~buffer() = default;
-  buffer(buffer&&) = default;
+// Returns the number of code units in a code point or 1 on error.
+template <typename Char>
+FMT_CONSTEXPR auto code_point_length(const Char* begin) -> int {
+  if (const_check(sizeof(Char) != 1)) return 1;
+  auto c = static_cast<unsigned char>(*begin);
+  return static_cast<int>((0x3a55000000000000ull >> (2 * (c >> 3))) & 3) + 1;
+}
 
-  /// Sets the buffer data and capacity.
-  FMT_CONSTEXPR void set(T* buf_data, size_t buf_capacity) noexcept {
-    ptr_ = buf_data;
-    capacity_ = buf_capacity;
-  }
+// Parses the range [begin, end) as an unsigned integer. This function assumes
+// that the range is non-empty and the first character is a digit.
+template <typename Char>
+FMT_CONSTEXPR auto parse_nonnegative_int(const Char*& begin, const Char* end,
+                                         int error_value) noexcept -> int {
+  FMT_ASSERT(begin != end && '0' <= *begin && *begin <= '9', "");
+  unsigned value = 0, prev = 0;
+  auto p = begin;
+  do {
+    prev = value;
+    value = value * 10 + unsigned(*p - '0');
+    ++p;
+  } while (p != end && '0' <= *p && *p <= '9');
+  auto num_digits = p - begin;
+  begin = p;
+  int digits10 = static_cast<int>(sizeof(int) * CHAR_BIT * 3 / 10);
+  if (num_digits <= digits10) return static_cast<int>(value);
+  // Check for overflow.
+  unsigned max = INT_MAX;
+  return num_digits == digits10 + 1 &&
+                 prev * 10ull + unsigned(p[-1] - '0') <= max
+             ? static_cast<int>(value)
+             : error_value;
+}
 
- public:
-  using value_type = T;
-  using const_reference = const T&;
+FMT_CONSTEXPR inline auto parse_align(char c) -> align {
+  switch (c) {
+  case '<': return align::left;
+  case '>': return align::right;
+  case '^': return align::center;
+  }
+  return align::none;
+}
 
-  buffer(const buffer&) = delete;
-  void operator=(const buffer&) = delete;
+template <typename Char> constexpr auto is_name_start(Char c) -> bool {
+  return ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || c == '_';
+}
 
-  auto begin() noexcept -> T* { return ptr_; }
-  auto end() noexcept -> T* { return ptr_ + size_; }
+template <typename Char, typename Handler>
+FMT_CONSTEXPR auto parse_arg_id(const Char* begin, const Char* end,
+                                Handler&& handler) -> const Char* {
+  Char c = *begin;
+  if (c >= '0' && c <= '9') {
+    int index = 0;
+    if (c != '0')
+      index = parse_nonnegative_int(begin, end, INT_MAX);
+    else
+      ++begin;
+    if (begin == end || (*begin != '}' && *begin != ':'))
+      report_error("invalid format string");
+    else
+      handler.on_index(index);
+    return begin;
+  }
+  if (FMT_OPTIMIZE_SIZE > 1 || !is_name_start(c)) {
+    report_error("invalid format string");
+    return begin;
+  }
+  auto it = begin;
+  do {
+    ++it;
+  } while (it != end && (is_name_start(*it) || ('0' <= *it && *it <= '9')));
+  handler.on_name({begin, to_unsigned(it - begin)});
+  return it;
+}
 
-  auto begin() const noexcept -> const T* { return ptr_; }
-  auto end() const noexcept -> const T* { return ptr_ + size_; }
+template <typename Char> struct dynamic_spec_handler {
+  parse_context<Char>& ctx;
+  arg_ref<Char>& ref;
+  arg_id_kind& kind;
 
-  /// Returns the size of this buffer.
-  constexpr auto size() const noexcept -> size_t { return size_; }
+  FMT_CONSTEXPR void on_index(int id) {
+    ref = id;
+    kind = arg_id_kind::index;
+    ctx.check_arg_id(id);
+    ctx.check_dynamic_spec(id);
+  }
+  FMT_CONSTEXPR void on_name(basic_string_view<Char> id) {
+    ref = id;
+    kind = arg_id_kind::name;
+    ctx.check_arg_id(id);
+  }
+};
 
-  /// Returns the capacity of this buffer.
-  constexpr auto capacity() const noexcept -> size_t { return capacity_; }
+template <typename Char> struct parse_dynamic_spec_result {
+  const Char* end;
+  arg_id_kind kind;
+};
 
-  /// Returns a pointer to the buffer data (not null-terminated).
-  FMT_CONSTEXPR auto data() noexcept -> T* { return ptr_; }
-  FMT_CONSTEXPR auto data() const noexcept -> const T* { return ptr_; }
+// Parses integer | "{" [arg_id] "}".
+template <typename Char>
+FMT_CONSTEXPR auto parse_dynamic_spec(const Char* begin, const Char* end,
+                                      int& value, arg_ref<Char>& ref,
+                                      parse_context<Char>& ctx)
+    -> parse_dynamic_spec_result<Char> {
+  FMT_ASSERT(begin != end, "");
+  auto kind = arg_id_kind::none;
+  if ('0' <= *begin && *begin <= '9') {
+    int val = parse_nonnegative_int(begin, end, -1);
+    if (val == -1) report_error("number is too big");
+    value = val;
+  } else {
+    if (*begin == '{') {
+      ++begin;
+      if (begin != end) {
+        Char c = *begin;
+        if (c == '}' || c == ':') {
+          int id = ctx.next_arg_id();
+          ref = id;
+          kind = arg_id_kind::index;
+          ctx.check_dynamic_spec(id);
+        } else {
+          begin = parse_arg_id(begin, end,
+                               dynamic_spec_handler<Char>{ctx, ref, kind});
+        }
+      }
+      if (begin != end && *begin == '}') return {++begin, kind};
+    }
+    report_error("invalid format string");
+  }
+  return {begin, kind};
+}
 
-  /// Clears this buffer.
-  void clear() { size_ = 0; }
+template <typename Char>
+FMT_CONSTEXPR auto parse_width(const Char* begin, const Char* end,
+                               format_specs& specs, arg_ref<Char>& width_ref,
+                               parse_context<Char>& ctx) -> const Char* {
+  auto result = parse_dynamic_spec(begin, end, specs.width, width_ref, ctx);
+  specs.set_dynamic_width(result.kind);
+  return result.end;
+}
 
-  // Tries resizing the buffer to contain `count` elements. If T is a POD type
-  // the new elements may not be initialized.
-  FMT_CONSTEXPR void try_resize(size_t count) {
-    try_reserve(count);
-    size_ = count <= capacity_ ? count : capacity_;
+template <typename Char>
+FMT_CONSTEXPR auto parse_precision(const Char* begin, const Char* end,
+                                   format_specs& specs,
+                                   arg_ref<Char>& precision_ref,
+                                   parse_context<Char>& ctx) -> const Char* {
+  ++begin;
+  if (begin == end) {
+    report_error("invalid precision");
+    return begin;
   }
+  auto result =
+      parse_dynamic_spec(begin, end, specs.precision, precision_ref, ctx);
+  specs.set_dynamic_precision(result.kind);
+  return result.end;
+}
 
-  // Tries increasing the buffer capacity to `new_capacity`. It can increase the
-  // capacity by a smaller amount than requested but guarantees there is space
-  // for at least one additional element either by increasing the capacity or by
-  // flushing the buffer if it is full.
-  FMT_CONSTEXPR void try_reserve(size_t new_capacity) {
-    if (new_capacity > capacity_) grow_(*this, new_capacity);
-  }
+enum class state { start, align, sign, hash, zero, width, precision, locale };
 
-  FMT_CONSTEXPR void push_back(const T& value) {
-    try_reserve(size_ + 1);
-    ptr_[size_++] = value;
+// Parses standard format specifiers.
+template <typename Char>
+FMT_CONSTEXPR auto parse_format_specs(const Char* begin, const Char* end,
+                                      dynamic_format_specs<Char>& specs,
+                                      parse_context<Char>& ctx, type arg_type)
+    -> const Char* {
+  auto c = '\0';
+  if (end - begin > 1) {
+    auto next = to_ascii(begin[1]);
+    c = parse_align(next) == align::none ? to_ascii(*begin) : '\0';
+  } else {
+    if (begin == end) return begin;
+    c = to_ascii(*begin);
   }
 
-  /// Appends data to the end of the buffer.
-  template <typename U> void append(const U* begin, const U* end) {
+  struct {
+    state current_state = state::start;
+    FMT_CONSTEXPR void operator()(state s, bool valid = true) {
+      if (current_state >= s || !valid)
+        report_error("invalid format specifier");
+      current_state = s;
+    }
+  } enter_state;
+
+  using pres = presentation_type;
+  constexpr auto integral_set = sint_set | uint_set | bool_set | char_set;
+  struct {
+    const Char*& begin;
+    format_specs& specs;
+    type arg_type;
+
+    FMT_CONSTEXPR auto operator()(pres pres_type, int set) -> const Char* {
+      if (!in(arg_type, set)) report_error("invalid format specifier");
+      specs.set_type(pres_type);
+      return begin + 1;
+    }
+  } parse_presentation_type{begin, specs, arg_type};
+
+  for (;;) {
+    switch (c) {
+    case '<':
+    case '>':
+    case '^':
+      enter_state(state::align);
+      specs.set_align(parse_align(c));
+      ++begin;
+      break;
+    case '+':
+    case ' ':
+      specs.set_sign(c == ' ' ? sign::space : sign::plus);
+      FMT_FALLTHROUGH;
+    case '-':
+      enter_state(state::sign, in(arg_type, sint_set | float_set));
+      ++begin;
+      break;
+    case '#':
+      enter_state(state::hash, is_arithmetic_type(arg_type));
+      specs.set_alt();
+      ++begin;
+      break;
+    case '0':
+      enter_state(state::zero);
+      if (!is_arithmetic_type(arg_type))
+        report_error("format specifier requires numeric argument");
+      if (specs.align() == align::none) {
+        // Ignore 0 if align is specified for compatibility with std::format.
+        specs.set_align(align::numeric);
+        specs.set_fill('0');
+      }
+      ++begin;
+      break;
+      // clang-format off
+    case '1': case '2': case '3': case '4': case '5':
+    case '6': case '7': case '8': case '9': case '{':
+      // clang-format on
+      enter_state(state::width);
+      begin = parse_width(begin, end, specs, specs.width_ref, ctx);
+      break;
+    case '.':
+      enter_state(state::precision,
+                  in(arg_type, float_set | string_set | cstring_set));
+      begin = parse_precision(begin, end, specs, specs.precision_ref, ctx);
+      break;
+    case 'L':
+      enter_state(state::locale, is_arithmetic_type(arg_type));
+      specs.set_localized();
+      ++begin;
+      break;
+    case 'd': return parse_presentation_type(pres::dec, integral_set);
+    case 'X': specs.set_upper(); FMT_FALLTHROUGH;
+    case 'x': return parse_presentation_type(pres::hex, integral_set);
+    case 'o': return parse_presentation_type(pres::oct, integral_set);
+    case 'B': specs.set_upper(); FMT_FALLTHROUGH;
+    case 'b': return parse_presentation_type(pres::bin, integral_set);
+    case 'E': specs.set_upper(); FMT_FALLTHROUGH;
+    case 'e': return parse_presentation_type(pres::exp, float_set);
+    case 'F': specs.set_upper(); FMT_FALLTHROUGH;
+    case 'f': return parse_presentation_type(pres::fixed, float_set);
+    case 'G': specs.set_upper(); FMT_FALLTHROUGH;
+    case 'g': return parse_presentation_type(pres::general, float_set);
+    case 'A': specs.set_upper(); FMT_FALLTHROUGH;
+    case 'a': return parse_presentation_type(pres::hexfloat, float_set);
+    case 'c':
+      if (arg_type == type::bool_type) report_error("invalid format specifier");
+      return parse_presentation_type(pres::chr, integral_set);
+    case 's':
+      return parse_presentation_type(pres::string,
+                                     bool_set | string_set | cstring_set);
+    case 'p':
+      return parse_presentation_type(pres::pointer, pointer_set | cstring_set);
+    case '?':
+      return parse_presentation_type(pres::debug,
+                                     char_set | string_set | cstring_set);
+    case '}': return begin;
+    default:  {
+      if (*begin == '}') return begin;
+      // Parse fill and alignment.
+      auto fill_end = begin + code_point_length(begin);
+      if (end - fill_end <= 0) {
+        report_error("invalid format specifier");
+        return begin;
+      }
+      if (*begin == '{') {
+        report_error("invalid fill character '{'");
+        return begin;
+      }
+      auto alignment = parse_align(to_ascii(*fill_end));
+      enter_state(state::align, alignment != align::none);
+      specs.set_fill(
+          basic_string_view<Char>(begin, to_unsigned(fill_end - begin)));
+      specs.set_align(alignment);
+      begin = fill_end + 1;
+    }
+    }
+    if (begin == end) return begin;
+    c = to_ascii(*begin);
+  }
+}
+
+template <typename Char, typename Handler>
+FMT_CONSTEXPR FMT_INLINE auto parse_replacement_field(const Char* begin,
+                                                      const Char* end,
+                                                      Handler&& handler)
+    -> const Char* {
+  ++begin;
+  if (begin == end) {
+    handler.on_error("invalid format string");
+    return end;
+  }
+  int arg_id = 0;
+  switch (*begin) {
+  case '}':
+    handler.on_replacement_field(handler.on_arg_id(), begin);
+    return begin + 1;
+  case '{': handler.on_text(begin, begin + 1); return begin + 1;
+  case ':': arg_id = handler.on_arg_id(); break;
+  default:  {
+    struct id_adapter {
+      Handler& handler;
+      int arg_id;
+
+      FMT_CONSTEXPR void on_index(int id) { arg_id = handler.on_arg_id(id); }
+      FMT_CONSTEXPR void on_name(basic_string_view<Char> id) {
+        arg_id = handler.on_arg_id(id);
+      }
+    } adapter = {handler, 0};
+    begin = parse_arg_id(begin, end, adapter);
+    arg_id = adapter.arg_id;
+    Char c = begin != end ? *begin : Char();
+    if (c == '}') {
+      handler.on_replacement_field(arg_id, begin);
+      return begin + 1;
+    }
+    if (c != ':') {
+      handler.on_error("missing '}' in format string");
+      return end;
+    }
+    break;
+  }
+  }
+  begin = handler.on_format_specs(arg_id, begin + 1, end);
+  if (begin == end || *begin != '}')
+    return handler.on_error("unknown format specifier"), end;
+  return begin + 1;
+}
+
+template <typename Char, typename Handler>
+FMT_CONSTEXPR void parse_format_string(basic_string_view<Char> fmt,
+                                       Handler&& handler) {
+  auto begin = fmt.data(), end = begin + fmt.size();
+  auto p = begin;
+  while (p != end) {
+    auto c = *p++;
+    if (c == '{') {
+      handler.on_text(begin, p - 1);
+      begin = p = parse_replacement_field(p - 1, end, handler);
+    } else if (c == '}') {
+      if (p == end || *p != '}')
+        return handler.on_error("unmatched '}' in format string");
+      handler.on_text(begin, p);
+      begin = ++p;
+    }
+  }
+  handler.on_text(begin, end);
+}
+
+// Checks char specs and returns true iff the presentation type is char-like.
+FMT_CONSTEXPR inline auto check_char_specs(const format_specs& specs) -> bool {
+  auto type = specs.type();
+  if (type != presentation_type::none && type != presentation_type::chr &&
+      type != presentation_type::debug) {
+    return false;
+  }
+  if (specs.align() == align::numeric || specs.sign() != sign::none ||
+      specs.alt()) {
+    report_error("invalid format specifier for char");
+  }
+  return true;
+}
+
+// A base class for compile-time strings.
+struct compile_string {};
+
+template <typename T, typename Char>
+FMT_VISIBILITY("hidden")  // Suppress an ld warning on macOS (#3769).
+FMT_CONSTEXPR auto invoke_parse(parse_context<Char>& ctx) -> const Char* {
+  using mapped_type = remove_cvref_t<mapped_t<T, Char>>;
+  constexpr bool formattable =
+      std::is_constructible<formatter<mapped_type, Char>>::value;
+  if (!formattable) return ctx.begin();  // Error is reported in the value ctor.
+  using formatted_type = conditional_t<formattable, mapped_type, int>;
+  return formatter<formatted_type, Char>().parse(ctx);
+}
+
+template <typename... T> struct arg_pack {};
+
+template <typename Char, int NUM_ARGS, int NUM_NAMED_ARGS, bool DYNAMIC_NAMES>
+class format_string_checker {
+ private:
+  type types_[max_of(1, NUM_ARGS)];
+  named_arg_info<Char> named_args_[max_of(1, NUM_NAMED_ARGS)];
+  compile_parse_context<Char> context_;
+
+  using parse_func = auto (*)(parse_context<Char>&) -> const Char*;
+  parse_func parse_funcs_[max_of(1, NUM_ARGS)];
+
+ public:
+  template <typename... T>
+  FMT_CONSTEXPR explicit format_string_checker(basic_string_view<Char> fmt,
+                                               arg_pack<T...>)
+      : types_{mapped_type_constant<T, Char>::value...},
+        named_args_{},
+        context_(fmt, NUM_ARGS, types_),
+        parse_funcs_{&invoke_parse<T, Char>...} {
+    int arg_index = 0, named_arg_index = 0;
+    FMT_APPLY_VARIADIC(
+        init_static_named_arg<T>(named_args_, arg_index, named_arg_index));
+    ignore_unused(arg_index, named_arg_index);
+  }
+
+  FMT_CONSTEXPR void on_text(const Char*, const Char*) {}
+
+  FMT_CONSTEXPR auto on_arg_id() -> int { return context_.next_arg_id(); }
+  FMT_CONSTEXPR auto on_arg_id(int id) -> int {
+    context_.check_arg_id(id);
+    return id;
+  }
+  FMT_CONSTEXPR auto on_arg_id(basic_string_view<Char> id) -> int {
+    for (int i = 0; i < NUM_NAMED_ARGS; ++i) {
+      if (named_args_[i].name == id) return named_args_[i].id;
+    }
+    if (!DYNAMIC_NAMES) on_error("argument not found");
+    return -1;
+  }
+
+  FMT_CONSTEXPR void on_replacement_field(int id, const Char* begin) {
+    on_format_specs(id, begin, begin);  // Call parse() on empty specs.
+  }
+
+  FMT_CONSTEXPR auto on_format_specs(int id, const Char* begin, const Char* end)
+      -> const Char* {
+    context_.advance_to(begin);
+    if (id >= 0 && id < NUM_ARGS) return parse_funcs_[id](context_);
+    while (begin != end && *begin != '}') ++begin;
+    return begin;
+  }
+
+  FMT_NORETURN FMT_CONSTEXPR void on_error(const char* message) {
+    report_error(message);
+  }
+};
+
+/// A contiguous memory buffer with an optional growing ability. It is an
+/// internal class and shouldn't be used directly, only via `memory_buffer`.
+template <typename T> class buffer {
+ private:
+  T* ptr_;
+  size_t size_;
+  size_t capacity_;
+
+  using grow_fun = void (*)(buffer& buf, size_t capacity);
+  grow_fun grow_;
+
+ protected:
+  // Don't initialize ptr_ since it is not accessed to save a few cycles.
+  FMT_MSC_WARNING(suppress : 26495)
+  FMT_CONSTEXPR buffer(grow_fun grow, size_t sz) noexcept
+      : size_(sz), capacity_(sz), grow_(grow) {}
+
+  constexpr buffer(grow_fun grow, T* p = nullptr, size_t sz = 0,
+                   size_t cap = 0) noexcept
+      : ptr_(p), size_(sz), capacity_(cap), grow_(grow) {}
+
+  FMT_CONSTEXPR20 ~buffer() = default;
+  buffer(buffer&&) = default;
+
+  /// Sets the buffer data and capacity.
+  FMT_CONSTEXPR void set(T* buf_data, size_t buf_capacity) noexcept {
+    ptr_ = buf_data;
+    capacity_ = buf_capacity;
+  }
+
+ public:
+  using value_type = T;
+  using const_reference = const T&;
+
+  buffer(const buffer&) = delete;
+  void operator=(const buffer&) = delete;
+
+  auto begin() noexcept -> T* { return ptr_; }
+  auto end() noexcept -> T* { return ptr_ + size_; }
+
+  auto begin() const noexcept -> const T* { return ptr_; }
+  auto end() const noexcept -> const T* { return ptr_ + size_; }
+
+  /// Returns the size of this buffer.
+  constexpr auto size() const noexcept -> size_t { return size_; }
+
+  /// Returns the capacity of this buffer.
+  constexpr auto capacity() const noexcept -> size_t { return capacity_; }
+
+  /// Returns a pointer to the buffer data (not null-terminated).
+  FMT_CONSTEXPR auto data() noexcept -> T* { return ptr_; }
+  FMT_CONSTEXPR auto data() const noexcept -> const T* { return ptr_; }
+
+  /// Clears this buffer.
+  FMT_CONSTEXPR void clear() { size_ = 0; }
+
+  // Tries resizing the buffer to contain `count` elements. If T is a POD type
+  // the new elements may not be initialized.
+  FMT_CONSTEXPR void try_resize(size_t count) {
+    try_reserve(count);
+    size_ = min_of(count, capacity_);
+  }
+
+  // Tries increasing the buffer capacity to `new_capacity`. It can increase the
+  // capacity by a smaller amount than requested but guarantees there is space
+  // for at least one additional element either by increasing the capacity or by
+  // flushing the buffer if it is full.
+  FMT_CONSTEXPR void try_reserve(size_t new_capacity) {
+    if (new_capacity > capacity_) grow_(*this, new_capacity);
+  }
+
+  FMT_CONSTEXPR void push_back(const T& value) {
+    try_reserve(size_ + 1);
+    ptr_[size_++] = value;
+  }
+
+  /// Appends data to the end of the buffer.
+  template <typename U>
+// Workaround for MSVC2019 to fix error C2893: Failed to specialize function
+// template 'void fmt::v11::detail::buffer<T>::append(const U *,const U *)'.
+#if !FMT_MSC_VERSION || FMT_MSC_VERSION >= 1940
+  FMT_CONSTEXPR20
+#endif
+      void
+      append(const U* begin, const U* end) {
     while (begin != end) {
       auto count = to_unsigned(end - begin);
       try_reserve(size_ + count);
@@ -948,9 +1821,9 @@ template <typename T> class buffer {
 };
 
 struct buffer_traits {
-  explicit buffer_traits(size_t) {}
-  auto count() const -> size_t { return 0; }
-  auto limit(size_t size) -> size_t { return size; }
+  constexpr explicit buffer_traits(size_t) {}
+  constexpr auto count() const -> size_t { return 0; }
+  constexpr auto limit(size_t size) const -> size_t { return size; }
 };
 
 class fixed_buffer_traits {
@@ -959,12 +1832,12 @@ class fixed_buffer_traits {
   size_t limit_;
 
  public:
-  explicit fixed_buffer_traits(size_t limit) : limit_(limit) {}
-  auto count() const -> size_t { return count_; }
-  auto limit(size_t size) -> size_t {
+  constexpr explicit fixed_buffer_traits(size_t limit) : limit_(limit) {}
+  constexpr auto count() const -> size_t { return count_; }
+  FMT_CONSTEXPR auto limit(size_t size) -> size_t {
     size_t n = limit_ > count_ ? limit_ - count_ : 0;
     count_ += size;
-    return size < n ? size : n;
+    return min_of(size, n);
   }
 };
 
@@ -1061,32 +1934,41 @@ template <typename T> class iterator_buffer<T*, T> : public buffer<T> {
   auto out() -> T* { return &*this->end(); }
 };
 
+template <typename Container>
+class container_buffer : public buffer<typename Container::value_type> {
+ private:
+  using value_type = typename Container::value_type;
+
+  static FMT_CONSTEXPR void grow(buffer<value_type>& buf, size_t capacity) {
+    auto& self = static_cast<container_buffer&>(buf);
+    self.container.resize(capacity);
+    self.set(&self.container[0], capacity);
+  }
+
+ public:
+  Container& container;
+
+  explicit container_buffer(Container& c)
+      : buffer<value_type>(grow, c.size()), container(c) {}
+};
+
 // A buffer that writes to a container with the contiguous storage.
 template <typename OutputIt>
 class iterator_buffer<
     OutputIt,
-    enable_if_t<detail::is_back_insert_iterator<OutputIt>::value &&
+    enable_if_t<is_back_insert_iterator<OutputIt>::value &&
                     is_contiguous<typename OutputIt::container_type>::value,
                 typename OutputIt::container_type::value_type>>
-    : public buffer<typename OutputIt::container_type::value_type> {
+    : public container_buffer<typename OutputIt::container_type> {
  private:
-  using container_type = typename OutputIt::container_type;
-  using value_type = typename container_type::value_type;
-  container_type& container_;
-
-  static FMT_CONSTEXPR void grow(buffer<value_type>& buf, size_t capacity) {
-    auto& self = static_cast<iterator_buffer&>(buf);
-    self.container_.resize(capacity);
-    self.set(&self.container_[0], capacity);
-  }
+  using base = container_buffer<typename OutputIt::container_type>;
 
  public:
-  explicit iterator_buffer(container_type& c)
-      : buffer<value_type>(grow, c.size()), container_(c) {}
+  explicit iterator_buffer(typename OutputIt::container_type& c) : base(c) {}
   explicit iterator_buffer(OutputIt out, size_t = 0)
-      : iterator_buffer(get_container(out)) {}
+      : base(get_container(out)) {}
 
-  auto out() -> OutputIt { return back_inserter(container_); }
+  auto out() -> OutputIt { return OutputIt(this->container); }
 };
 
 // A buffer that counts the number of code units written discarding the output.
@@ -1103,110 +1985,47 @@ template <typename T = char> class counting_buffer : public buffer<T> {
   }
 
  public:
-  counting_buffer() : buffer<T>(grow, data_, 0, buffer_size) {}
+  FMT_CONSTEXPR counting_buffer() : buffer<T>(grow, data_, 0, buffer_size) {}
 
-  auto count() -> size_t { return count_ + this->size(); }
+  constexpr auto count() const noexcept -> size_t {
+    return count_ + this->size();
+  }
 };
-}  // namespace detail
 
-template <typename Char>
-FMT_CONSTEXPR void basic_format_parse_context<Char>::do_check_arg_id(int id) {
-  // Argument id is only checked at compile-time during parsing because
-  // formatting has its own validation.
-  if (detail::is_constant_evaluated() &&
-      (!FMT_GCC_VERSION || FMT_GCC_VERSION >= 1200)) {
-    using context = detail::compile_parse_context<Char>;
-    if (id >= static_cast<context*>(this)->num_args())
-      report_error("argument not found");
-  }
-}
-
-template <typename Char>
-FMT_CONSTEXPR void basic_format_parse_context<Char>::check_dynamic_spec(
-    int arg_id) {
-  if (detail::is_constant_evaluated() &&
-      (!FMT_GCC_VERSION || FMT_GCC_VERSION >= 1200)) {
-    using context = detail::compile_parse_context<Char>;
-    static_cast<context*>(this)->check_dynamic_spec(arg_id);
-  }
-}
-
-FMT_EXPORT template <typename Context> class basic_format_arg;
-FMT_EXPORT template <typename Context> class basic_format_args;
-FMT_EXPORT template <typename Context> class dynamic_format_arg_store;
-
-// A formatter for objects of type T.
-FMT_EXPORT
-template <typename T, typename Char = char, typename Enable = void>
-struct formatter {
-  // A deleted default constructor indicates a disabled formatter.
-  formatter() = delete;
-};
-
-// Specifies if T has an enabled formatter specialization. A type can be
-// formattable even if it doesn't have a formatter e.g. via a conversion.
-template <typename T, typename Context>
-using has_formatter =
-    std::is_constructible<typename Context::template formatter_type<T>>;
-
-// An output iterator that appends to a buffer. It is used instead of
-// back_insert_iterator to reduce symbol sizes and avoid <iterator> dependency.
-template <typename T> class basic_appender {
- private:
-  detail::buffer<T>* buffer_;
-
-  friend auto get_container(basic_appender app) -> detail::buffer<T>& {
-    return *app.buffer_;
-  }
-
- public:
-  using iterator_category = int;
-  using value_type = T;
-  using difference_type = ptrdiff_t;
-  using pointer = T*;
-  using reference = T&;
-  using container_type = detail::buffer<T>;
-  FMT_UNCHECKED_ITERATOR(basic_appender);
-
-  FMT_CONSTEXPR basic_appender(detail::buffer<T>& buf) : buffer_(&buf) {}
-
-  auto operator=(T c) -> basic_appender& {
-    buffer_->push_back(c);
-    return *this;
-  }
-  auto operator*() -> basic_appender& { return *this; }
-  auto operator++() -> basic_appender& { return *this; }
-  auto operator++(int) -> basic_appender { return *this; }
-};
-
-using appender = basic_appender<char>;
-
-namespace detail {
 template <typename T>
 struct is_back_insert_iterator<basic_appender<T>> : std::true_type {};
 
-template <typename T, typename Enable = void>
-struct locking : std::true_type {};
-template <typename T>
-struct locking<T, void_t<typename formatter<remove_cvref_t<T>>::nonlocking>>
-    : std::false_type {};
-
-template <typename T = int> FMT_CONSTEXPR inline auto is_locking() -> bool {
-  return locking<T>::value;
-}
-template <typename T1, typename T2, typename... Tail>
-FMT_CONSTEXPR inline auto is_locking() -> bool {
-  return locking<T1>::value || is_locking<T2, Tail...>();
-}
+template <typename OutputIt, typename InputIt, typename = void>
+struct has_back_insert_iterator_container_append : std::false_type {};
+template <typename OutputIt, typename InputIt>
+struct has_back_insert_iterator_container_append<
+    OutputIt, InputIt,
+    void_t<decltype(get_container(std::declval<OutputIt>())
+                        .append(std::declval<InputIt>(),
+                                std::declval<InputIt>()))>> : std::true_type {};
 
 // An optimized version of std::copy with the output value type (T).
 template <typename T, typename InputIt, typename OutputIt,
-          FMT_ENABLE_IF(is_back_insert_iterator<OutputIt>::value)>
-auto copy(InputIt begin, InputIt end, OutputIt out) -> OutputIt {
+          FMT_ENABLE_IF(is_back_insert_iterator<OutputIt>::value&&
+                            has_back_insert_iterator_container_append<
+                                OutputIt, InputIt>::value)>
+FMT_CONSTEXPR20 auto copy(InputIt begin, InputIt end, OutputIt out)
+    -> OutputIt {
   get_container(out).append(begin, end);
   return out;
 }
 
+template <typename T, typename InputIt, typename OutputIt,
+          FMT_ENABLE_IF(is_back_insert_iterator<OutputIt>::value &&
+                        !has_back_insert_iterator_container_append<
+                            OutputIt, InputIt>::value)>
+FMT_CONSTEXPR20 auto copy(InputIt begin, InputIt end, OutputIt out)
+    -> OutputIt {
+  auto& c = get_container(out);
+  c.insert(c.end(), begin, end);
+  return out;
+}
+
 template <typename T, typename InputIt, typename OutputIt,
           FMT_ENABLE_IF(!is_back_insert_iterator<OutputIt>::value)>
 FMT_CONSTEXPR auto copy(InputIt begin, InputIt end, OutputIt out) -> OutputIt {
@@ -1219,22 +2038,6 @@ FMT_CONSTEXPR auto copy(basic_string_view<V> s, OutputIt out) -> OutputIt {
   return copy<T>(s.begin(), s.end(), out);
 }
 
-template <typename Context, typename T>
-constexpr auto has_const_formatter_impl(T*)
-    -> decltype(typename Context::template formatter_type<T>().format(
-                    std::declval<const T&>(), std::declval<Context&>()),
-                true) {
-  return true;
-}
-template <typename Context>
-constexpr auto has_const_formatter_impl(...) -> bool {
-  return false;
-}
-template <typename T, typename Context>
-constexpr auto has_const_formatter() -> bool {
-  return has_const_formatter_impl<Context>(static_cast<T*>(nullptr));
-}
-
 template <typename It, typename Enable = std::true_type>
 struct is_buffer_appender : std::false_type {};
 template <typename It>
@@ -1266,46 +2069,19 @@ auto get_iterator(buffer<T>&, OutputIt out) -> OutputIt {
   return out;
 }
 
-struct view {};
-
-template <typename Char, typename T> struct named_arg : view {
-  const Char* name;
-  const T& value;
-  named_arg(const Char* n, const T& v) : name(n), value(v) {}
-};
-
-template <typename Char> struct named_arg_info {
-  const Char* name;
-  int id;
-};
-
-template <typename T> struct is_named_arg : std::false_type {};
-template <typename T> struct is_statically_named_arg : std::false_type {};
-
-template <typename T, typename Char>
-struct is_named_arg<named_arg<Char, T>> : std::true_type {};
-
-template <bool B = false> constexpr auto count() -> size_t { return B ? 1 : 0; }
-template <bool B1, bool B2, bool... Tail> constexpr auto count() -> size_t {
-  return (B1 ? 1 : 0) + count<B2, Tail...>();
-}
-
-template <typename... Args> constexpr auto count_named_args() -> size_t {
-  return count<is_named_arg<Args>::value...>();
-}
-
-template <typename... Args>
-constexpr auto count_statically_named_args() -> size_t {
-  return count<is_statically_named_arg<Args>::value...>();
-}
-
-struct unformattable {};
-struct unformattable_char : unformattable {};
-struct unformattable_pointer : unformattable {};
+// This type is intentionally undefined, only used for errors.
+template <typename T, typename Char> struct type_is_unformattable_for;
 
 template <typename Char> struct string_value {
   const Char* data;
   size_t size;
+  auto str() const -> basic_string_view<Char> { return {data, size}; }
+};
+
+template <typename Context> struct custom_value {
+  using char_type = typename Context::char_type;
+  void* value;
+  void (*format)(void* arg, parse_context<char_type>& parse_ctx, Context& ctx);
 };
 
 template <typename Char> struct named_arg_value {
@@ -1313,11 +2089,13 @@ template <typename Char> struct named_arg_value {
   size_t size;
 };
 
-template <typename Context> struct custom_value {
-  using parse_context = typename Context::parse_context_type;
-  void* value;
-  void (*format)(void* arg, parse_context& parse_ctx, Context& ctx);
-};
+struct custom_tag {};
+
+#if !FMT_BUILTIN_TYPES
+#  define FMT_BUILTIN , monostate
+#else
+#  define FMT_BUILTIN
+#endif
 
 // A formatting argument value.
 template <typename Context> class value {
@@ -1343,223 +2121,132 @@ template <typename Context> class value {
     named_arg_value<char_type> named_args;
   };
 
-  constexpr FMT_ALWAYS_INLINE value() : no_value() {}
-  constexpr FMT_ALWAYS_INLINE value(int val) : int_value(val) {}
-  constexpr FMT_ALWAYS_INLINE value(unsigned val) : uint_value(val) {}
-  constexpr FMT_ALWAYS_INLINE value(long long val) : long_long_value(val) {}
-  constexpr FMT_ALWAYS_INLINE value(unsigned long long val)
-      : ulong_long_value(val) {}
-  FMT_ALWAYS_INLINE value(int128_opt val) : int128_value(val) {}
-  FMT_ALWAYS_INLINE value(uint128_opt val) : uint128_value(val) {}
-  constexpr FMT_ALWAYS_INLINE value(float val) : float_value(val) {}
-  constexpr FMT_ALWAYS_INLINE value(double val) : double_value(val) {}
-  FMT_ALWAYS_INLINE value(long double val) : long_double_value(val) {}
-  constexpr FMT_ALWAYS_INLINE value(bool val) : bool_value(val) {}
-  constexpr FMT_ALWAYS_INLINE value(char_type val) : char_value(val) {}
-  FMT_CONSTEXPR FMT_ALWAYS_INLINE value(const char_type* val) {
-    string.data = val;
-    if (is_constant_evaluated()) string.size = {};
-  }
-  FMT_CONSTEXPR FMT_ALWAYS_INLINE value(basic_string_view<char_type> val) {
-    string.data = val.data();
-    string.size = val.size();
-  }
-  FMT_ALWAYS_INLINE value(const void* val) : pointer(val) {}
+  constexpr FMT_INLINE value() : no_value() {}
+  constexpr FMT_INLINE value(signed char x) : int_value(x) {}
+  constexpr FMT_INLINE value(unsigned char x FMT_BUILTIN) : uint_value(x) {}
+  constexpr FMT_INLINE value(signed short x) : int_value(x) {}
+  constexpr FMT_INLINE value(unsigned short x FMT_BUILTIN) : uint_value(x) {}
+  constexpr FMT_INLINE value(int x) : int_value(x) {}
+  constexpr FMT_INLINE value(unsigned x FMT_BUILTIN) : uint_value(x) {}
+  FMT_CONSTEXPR FMT_INLINE value(long x FMT_BUILTIN) : value(long_type(x)) {}
+  FMT_CONSTEXPR FMT_INLINE value(unsigned long x FMT_BUILTIN)
+      : value(ulong_type(x)) {}
+  constexpr FMT_INLINE value(long long x FMT_BUILTIN) : long_long_value(x) {}
+  constexpr FMT_INLINE value(unsigned long long x FMT_BUILTIN)
+      : ulong_long_value(x) {}
+  FMT_INLINE value(int128_opt x FMT_BUILTIN) : int128_value(x) {}
+  FMT_INLINE value(uint128_opt x FMT_BUILTIN) : uint128_value(x) {}
+  constexpr FMT_INLINE value(bool x FMT_BUILTIN) : bool_value(x) {}
+
+  template <int N>
+  constexpr FMT_INLINE value(bitint<N> x FMT_BUILTIN) : long_long_value(x) {
+    static_assert(N <= 64, "unsupported _BitInt");
+  }
+  template <int N>
+  constexpr FMT_INLINE value(ubitint<N> x FMT_BUILTIN) : ulong_long_value(x) {
+    static_assert(N <= 64, "unsupported _BitInt");
+  }
+
+  template <typename T, FMT_ENABLE_IF(is_char<T>::value)>
+  constexpr FMT_INLINE value(T x FMT_BUILTIN) : char_value(x) {
+    static_assert(
+        std::is_same<T, char>::value || std::is_same<T, char_type>::value,
+        "mixing character types is disallowed");
+  }
+
+  constexpr FMT_INLINE value(float x FMT_BUILTIN) : float_value(x) {}
+  constexpr FMT_INLINE value(double x FMT_BUILTIN) : double_value(x) {}
+  FMT_INLINE value(long double x FMT_BUILTIN) : long_double_value(x) {}
+
+  FMT_CONSTEXPR FMT_INLINE value(char_type* x FMT_BUILTIN) {
+    string.data = x;
+    if (is_constant_evaluated()) string.size = 0;
+  }
+  FMT_CONSTEXPR FMT_INLINE value(const char_type* x FMT_BUILTIN) {
+    string.data = x;
+    if (is_constant_evaluated()) string.size = 0;
+  }
+  template <typename T, typename C = char_t<T>,
+            FMT_ENABLE_IF(!std::is_pointer<T>::value)>
+  FMT_CONSTEXPR value(const T& x FMT_BUILTIN) {
+    static_assert(std::is_same<C, char_type>::value,
+                  "mixing character types is disallowed");
+    auto sv = to_string_view(x);
+    string.data = sv.data();
+    string.size = sv.size();
+  }
+  FMT_INLINE value(void* x FMT_BUILTIN) : pointer(x) {}
+  FMT_INLINE value(const void* x FMT_BUILTIN) : pointer(x) {}
+  FMT_INLINE value(volatile void* x FMT_BUILTIN)
+      : pointer(const_cast<const void*>(x)) {}
+  FMT_INLINE value(const volatile void* x FMT_BUILTIN)
+      : pointer(const_cast<const void*>(x)) {}
+  FMT_INLINE value(nullptr_t) : pointer(nullptr) {}
+
+  template <typename T, FMT_ENABLE_IF(std::is_pointer<T>::value ||
+                                      std::is_member_pointer<T>::value)>
+  value(const T&) {
+    // Formatting of arbitrary pointers is disallowed. If you want to format a
+    // pointer cast it to `void*` or `const void*`. In particular, this forbids
+    // formatting of `[const] volatile char*` printed as bool by iostreams.
+    static_assert(sizeof(T) == 0,
+                  "formatting of non-void pointers is disallowed");
+  }
+
+  template <typename T, FMT_ENABLE_IF(use_format_as<T>::value)>
+  value(const T& x) : value(format_as(x)) {}
+  template <typename T, FMT_ENABLE_IF(use_format_as_member<T>::value)>
+  value(const T& x) : value(formatter<T>::format_as(x)) {}
+
+  template <typename T, FMT_ENABLE_IF(is_named_arg<T>::value)>
+  value(const T& named_arg) : value(named_arg.value) {}
+
+  template <typename T,
+            FMT_ENABLE_IF(use_formatter<T>::value || !FMT_BUILTIN_TYPES)>
+  FMT_CONSTEXPR20 FMT_INLINE value(T& x) : value(x, custom_tag()) {}
+
   FMT_ALWAYS_INLINE value(const named_arg_info<char_type>* args, size_t size)
       : named_args{args, size} {}
 
-  template <typename T> FMT_CONSTEXPR20 FMT_ALWAYS_INLINE value(T& val) {
+ private:
+  template <typename T, FMT_ENABLE_IF(has_formatter<T, char_type>())>
+  FMT_CONSTEXPR value(T& x, custom_tag) {
     using value_type = remove_const_t<T>;
     // T may overload operator& e.g. std::vector<bool>::reference in libc++.
+    if (!is_constant_evaluated()) {
+      custom.value =
+          const_cast<char*>(&reinterpret_cast<const volatile char&>(x));
+    } else {
+      custom.value = nullptr;
 #if defined(__cpp_if_constexpr)
-    if constexpr (std::is_same<decltype(&val), T*>::value)
-      custom.value = const_cast<value_type*>(&val);
+      if constexpr (std::is_same<decltype(&x), remove_reference_t<T>*>::value)
+        custom.value = const_cast<value_type*>(&x);
 #endif
-    if (!is_constant_evaluated())
-      custom.value = const_cast<char*>(&reinterpret_cast<const char&>(val));
-    // Get the formatter type through the context to allow different contexts
-    // have different extension points, e.g. `formatter<T>` for `format` and
-    // `printf_formatter<T>` for `printf`.
-    custom.format = format_custom_arg<
-        value_type, typename Context::template formatter_type<value_type>>;
-  }
-  value(unformattable);
-  value(unformattable_char);
-  value(unformattable_pointer);
+    }
+    custom.format = format_custom<value_type, formatter<value_type, char_type>>;
+  }
+
+  template <typename T, FMT_ENABLE_IF(!has_formatter<T, char_type>())>
+  FMT_CONSTEXPR value(const T&, custom_tag) {
+    // Cannot format an argument; to make type T formattable provide a
+    // formatter<T> specialization: https://fmt.dev/latest/api.html#udt.
+    type_is_unformattable_for<T, char_type> _;
+  }
 
- private:
   // Formats an argument of a custom type, such as a user-defined class.
   template <typename T, typename Formatter>
-  static void format_custom_arg(void* arg,
-                                typename Context::parse_context_type& parse_ctx,
-                                Context& ctx) {
+  static void format_custom(void* arg, parse_context<char_type>& parse_ctx,
+                            Context& ctx) {
     auto f = Formatter();
     parse_ctx.advance_to(f.parse(parse_ctx));
     using qualified_type =
-        conditional_t<has_const_formatter<T, Context>(), const T, T>;
+        conditional_t<has_formatter<const T, char_type>(), const T, T>;
     // format must be const for compatibility with std::format and compilation.
     const auto& cf = f;
     ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
   }
 };
 
-// To minimize the number of types we need to deal with, long is translated
-// either to int or to long long depending on its size.
-enum { long_short = sizeof(long) == sizeof(int) };
-using long_type = conditional_t<long_short, int, long long>;
-using ulong_type = conditional_t<long_short, unsigned, unsigned long long>;
-
-template <typename T> struct format_as_result {
-  template <typename U,
-            FMT_ENABLE_IF(std::is_enum<U>::value || std::is_class<U>::value)>
-  static auto map(U*) -> remove_cvref_t<decltype(format_as(std::declval<U>()))>;
-  static auto map(...) -> void;
-
-  using type = decltype(map(static_cast<T*>(nullptr)));
-};
-template <typename T> using format_as_t = typename format_as_result<T>::type;
-
-template <typename T>
-struct has_format_as
-    : bool_constant<!std::is_same<format_as_t<T>, void>::value> {};
-
-#define FMT_MAP_API FMT_CONSTEXPR FMT_ALWAYS_INLINE
-
-// Maps formatting arguments to core types.
-// arg_mapper reports errors by returning unformattable instead of using
-// static_assert because it's used in the is_formattable trait.
-template <typename Context> struct arg_mapper {
-  using char_type = typename Context::char_type;
-
-  FMT_MAP_API auto map(signed char val) -> int { return val; }
-  FMT_MAP_API auto map(unsigned char val) -> unsigned { return val; }
-  FMT_MAP_API auto map(short val) -> int { return val; }
-  FMT_MAP_API auto map(unsigned short val) -> unsigned { return val; }
-  FMT_MAP_API auto map(int val) -> int { return val; }
-  FMT_MAP_API auto map(unsigned val) -> unsigned { return val; }
-  FMT_MAP_API auto map(long val) -> long_type { return val; }
-  FMT_MAP_API auto map(unsigned long val) -> ulong_type { return val; }
-  FMT_MAP_API auto map(long long val) -> long long { return val; }
-  FMT_MAP_API auto map(unsigned long long val) -> unsigned long long {
-    return val;
-  }
-  FMT_MAP_API auto map(int128_opt val) -> int128_opt { return val; }
-  FMT_MAP_API auto map(uint128_opt val) -> uint128_opt { return val; }
-  FMT_MAP_API auto map(bool val) -> bool { return val; }
-
-  template <typename T, FMT_ENABLE_IF(std::is_same<T, char>::value ||
-                                      std::is_same<T, char_type>::value)>
-  FMT_MAP_API auto map(T val) -> char_type {
-    return val;
-  }
-  template <typename T, enable_if_t<(std::is_same<T, wchar_t>::value ||
-#ifdef __cpp_char8_t
-                                     std::is_same<T, char8_t>::value ||
-#endif
-                                     std::is_same<T, char16_t>::value ||
-                                     std::is_same<T, char32_t>::value) &&
-                                        !std::is_same<T, char_type>::value,
-                                    int> = 0>
-  FMT_MAP_API auto map(T) -> unformattable_char {
-    return {};
-  }
-
-  FMT_MAP_API auto map(float val) -> float { return val; }
-  FMT_MAP_API auto map(double val) -> double { return val; }
-  FMT_MAP_API auto map(long double val) -> long double { return val; }
-
-  FMT_MAP_API auto map(char_type* val) -> const char_type* { return val; }
-  FMT_MAP_API auto map(const char_type* val) -> const char_type* { return val; }
-  template <typename T, typename Char = char_t<T>,
-            FMT_ENABLE_IF(std::is_same<Char, char_type>::value &&
-                          !std::is_pointer<T>::value)>
-  FMT_MAP_API auto map(const T& val) -> basic_string_view<Char> {
-    return to_string_view(val);
-  }
-  template <typename T, typename Char = char_t<T>,
-            FMT_ENABLE_IF(!std::is_same<Char, char_type>::value &&
-                          !std::is_pointer<T>::value)>
-  FMT_MAP_API auto map(const T&) -> unformattable_char {
-    return {};
-  }
-
-  FMT_MAP_API auto map(void* val) -> const void* { return val; }
-  FMT_MAP_API auto map(const void* val) -> const void* { return val; }
-  FMT_MAP_API auto map(volatile void* val) -> const void* {
-    return const_cast<const void*>(val);
-  }
-  FMT_MAP_API auto map(const volatile void* val) -> const void* {
-    return const_cast<const void*>(val);
-  }
-  FMT_MAP_API auto map(std::nullptr_t val) -> const void* { return val; }
-
-  // Use SFINAE instead of a const T* parameter to avoid a conflict with the
-  // array overload.
-  template <
-      typename T,
-      FMT_ENABLE_IF(
-          std::is_pointer<T>::value || std::is_member_pointer<T>::value ||
-          std::is_function<typename std::remove_pointer<T>::type>::value ||
-          (std::is_array<T>::value &&
-           !std::is_convertible<T, const char_type*>::value))>
-  FMT_CONSTEXPR auto map(const T&) -> unformattable_pointer {
-    return {};
-  }
-
-  template <typename T, std::size_t N,
-            FMT_ENABLE_IF(!std::is_same<T, wchar_t>::value)>
-  FMT_MAP_API auto map(const T (&values)[N]) -> const T (&)[N] {
-    return values;
-  }
-
-  // Only map owning types because mapping views can be unsafe.
-  template <typename T, typename U = format_as_t<T>,
-            FMT_ENABLE_IF(std::is_arithmetic<U>::value)>
-  FMT_MAP_API auto map(const T& val) -> decltype(FMT_DECLTYPE_THIS map(U())) {
-    return map(format_as(val));
-  }
-
-  template <typename T, typename U = remove_const_t<T>>
-  struct formattable : bool_constant<has_const_formatter<U, Context>() ||
-                                     (has_formatter<U, Context>::value &&
-                                      !std::is_const<T>::value)> {};
-
-  template <typename T, FMT_ENABLE_IF(formattable<T>::value)>
-  FMT_MAP_API auto do_map(T& val) -> T& {
-    return val;
-  }
-  template <typename T, FMT_ENABLE_IF(!formattable<T>::value)>
-  FMT_MAP_API auto do_map(T&) -> unformattable {
-    return {};
-  }
-
-  // is_fundamental is used to allow formatters for extended FP types.
-  template <typename T, typename U = remove_const_t<T>,
-            FMT_ENABLE_IF(
-                (std::is_class<U>::value || std::is_enum<U>::value ||
-                 std::is_union<U>::value || std::is_fundamental<U>::value) &&
-                !has_to_string_view<U>::value && !is_char<U>::value &&
-                !is_named_arg<U>::value && !std::is_integral<U>::value &&
-                !std::is_arithmetic<format_as_t<U>>::value)>
-  FMT_MAP_API auto map(T& val) -> decltype(FMT_DECLTYPE_THIS do_map(val)) {
-    return do_map(val);
-  }
-
-  template <typename T, FMT_ENABLE_IF(is_named_arg<T>::value)>
-  FMT_MAP_API auto map(const T& named_arg)
-      -> decltype(FMT_DECLTYPE_THIS map(named_arg.value)) {
-    return map(named_arg.value);
-  }
-
-  auto map(...) -> unformattable { return {}; }
-};
-
-// A type constant after applying arg_mapper<Context>.
-template <typename T, typename Context>
-using mapped_type_constant =
-    type_constant<decltype(arg_mapper<Context>().map(std::declval<const T&>())),
-                  typename Context::char_type>;
-
 enum { packed_arg_bits = 4 };
 // Maximum number of arguments with packed types.
 enum { max_packed_args = 62 / packed_arg_bits };
@@ -1573,19 +2260,26 @@ template <> struct is_output_iterator<appender, char> : std::true_type {};
 
 template <typename It, typename T>
 struct is_output_iterator<
-    It, T, void_t<decltype(*std::declval<It&>()++ = std::declval<T>())>>
+    It, T,
+    void_t<decltype(*std::declval<decay_t<It>&>()++ = std::declval<T>())>>
     : std::true_type {};
 
+#ifndef FMT_USE_LOCALE
+#  define FMT_USE_LOCALE (FMT_OPTIMIZE_SIZE <= 1)
+#endif
+
 // A type-erased reference to an std::locale to avoid a heavy <locale> include.
-class locale_ref {
+struct locale_ref {
+#if FMT_USE_LOCALE
  private:
   const void* locale_;  // A type-erased pointer to std::locale.
 
  public:
   constexpr locale_ref() : locale_(nullptr) {}
-  template <typename Locale> explicit locale_ref(const Locale& loc);
+  template <typename Locale> locale_ref(const Locale& loc);
 
-  explicit operator bool() const noexcept { return locale_ != nullptr; }
+  inline explicit operator bool() const noexcept { return locale_ != nullptr; }
+#endif  // FMT_USE_LOCALE
 
   template <typename Locale> auto get() const -> Locale;
 };
@@ -1596,1255 +2290,466 @@ template <typename> constexpr auto encode_types() -> unsigned long long {
 
 template <typename Context, typename Arg, typename... Args>
 constexpr auto encode_types() -> unsigned long long {
-  return static_cast<unsigned>(mapped_type_constant<Arg, Context>::value) |
+  return static_cast<unsigned>(stored_type_constant<Arg, Context>::value) |
          (encode_types<Context, Args...>() << packed_arg_bits);
 }
 
 template <typename Context, typename... T, size_t NUM_ARGS = sizeof...(T)>
-constexpr unsigned long long make_descriptor() {
+constexpr auto make_descriptor() -> unsigned long long {
   return NUM_ARGS <= max_packed_args ? encode_types<Context, T...>()
                                      : is_unpacked_bit | NUM_ARGS;
 }
 
-// This type is intentionally undefined, only used for errors.
-template <typename T, typename Char>
-#if FMT_CLANG_VERSION && FMT_CLANG_VERSION <= 1500
-// https://github.com/fmtlib/fmt/issues/3796
-struct type_is_unformattable_for {
-};
-#else
-struct type_is_unformattable_for;
-#endif
-
-template <bool PACKED, typename Context, typename T, FMT_ENABLE_IF(PACKED)>
-FMT_CONSTEXPR auto make_arg(T& val) -> value<Context> {
-  using arg_type = remove_cvref_t<decltype(arg_mapper<Context>().map(val))>;
-
-  // Use enum instead of constexpr because the latter may generate code.
-  enum {
-    formattable_char = !std::is_same<arg_type, unformattable_char>::value
-  };
-  static_assert(formattable_char, "Mixing character types is disallowed.");
-
-  // Formatting of arbitrary pointers is disallowed. If you want to format a
-  // pointer cast it to `void*` or `const void*`. In particular, this forbids
-  // formatting of `[const] volatile char*` printed as bool by iostreams.
-  enum {
-    formattable_pointer = !std::is_same<arg_type, unformattable_pointer>::value
-  };
-  static_assert(formattable_pointer,
-                "Formatting of non-void pointers is disallowed.");
-
-  enum { formattable = !std::is_same<arg_type, unformattable>::value };
-#if defined(__cpp_if_constexpr)
-  if constexpr (!formattable)
-    type_is_unformattable_for<T, typename Context::char_type> _;
-#endif
-  static_assert(
-      formattable,
-      "Cannot format an argument. To make type T formattable provide a "
-      "formatter<T> specialization: https://fmt.dev/latest/api.html#udt");
-  return {arg_mapper<Context>().map(val)};
-}
-
-template <typename Context, typename T>
-FMT_CONSTEXPR auto make_arg(T& val) -> basic_format_arg<Context> {
-  auto arg = basic_format_arg<Context>();
-  arg.type_ = mapped_type_constant<T, Context>::value;
-  arg.value_ = make_arg<true, Context>(val);
-  return arg;
-}
-
-template <bool PACKED, typename Context, typename T, FMT_ENABLE_IF(!PACKED)>
-FMT_CONSTEXPR inline auto make_arg(T& val) -> basic_format_arg<Context> {
-  return make_arg<Context>(val);
-}
-
-template <typename Context, size_t NUM_ARGS>
+template <typename Context, int NUM_ARGS>
 using arg_t = conditional_t<NUM_ARGS <= max_packed_args, value<Context>,
                             basic_format_arg<Context>>;
 
-template <typename Char, typename T, FMT_ENABLE_IF(!is_named_arg<T>::value)>
-void init_named_arg(named_arg_info<Char>*, int& arg_index, int&, const T&) {
-  ++arg_index;
-}
-template <typename Char, typename T, FMT_ENABLE_IF(is_named_arg<T>::value)>
-void init_named_arg(named_arg_info<Char>* named_args, int& arg_index,
-                    int& named_arg_index, const T& arg) {
-  named_args[named_arg_index++] = {arg.name, arg_index++};
-}
-
-// An array of references to arguments. It can be implicitly converted to
-// `fmt::basic_format_args` for passing into type-erased formatting functions
-// such as `fmt::vformat`.
-template <typename Context, size_t NUM_ARGS, size_t NUM_NAMED_ARGS,
+template <typename Context, int NUM_ARGS, int NUM_NAMED_ARGS,
           unsigned long long DESC>
-struct format_arg_store {
+struct named_arg_store {
   // args_[0].named_args points to named_args to avoid bloating format_args.
-  // +1 to workaround a bug in gcc 7.5 that causes duplicated-branches warning.
-  static constexpr size_t ARGS_ARR_SIZE = 1 + (NUM_ARGS != 0 ? NUM_ARGS : +1);
-
-  arg_t<Context, NUM_ARGS> args[ARGS_ARR_SIZE];
+  arg_t<Context, NUM_ARGS> args[1 + NUM_ARGS];
   named_arg_info<typename Context::char_type> named_args[NUM_NAMED_ARGS];
 
   template <typename... T>
-  FMT_MAP_API format_arg_store(T&... values)
-      : args{{named_args, NUM_NAMED_ARGS},
-             make_arg<NUM_ARGS <= max_packed_args, Context>(values)...} {
-    using dummy = int[];
+  FMT_CONSTEXPR FMT_ALWAYS_INLINE named_arg_store(T&... values)
+      : args{{named_args, NUM_NAMED_ARGS}, values...} {
     int arg_index = 0, named_arg_index = 0;
-    (void)dummy{
-        0,
-        (init_named_arg(named_args, arg_index, named_arg_index, values), 0)...};
+    FMT_APPLY_VARIADIC(
+        init_named_arg(named_args, arg_index, named_arg_index, values));
   }
 
-  format_arg_store(format_arg_store&& rhs) {
+  named_arg_store(named_arg_store&& rhs) {
     args[0] = {named_args, NUM_NAMED_ARGS};
-    for (size_t i = 1; i < ARGS_ARR_SIZE; ++i) args[i] = rhs.args[i];
+    for (size_t i = 1; i < sizeof(args) / sizeof(*args); ++i)
+      args[i] = rhs.args[i];
     for (size_t i = 0; i < NUM_NAMED_ARGS; ++i)
       named_args[i] = rhs.named_args[i];
   }
 
-  format_arg_store(const format_arg_store& rhs) = delete;
-  format_arg_store& operator=(const format_arg_store& rhs) = delete;
-  format_arg_store& operator=(format_arg_store&& rhs) = delete;
+  named_arg_store(const named_arg_store& rhs) = delete;
+  named_arg_store& operator=(const named_arg_store& rhs) = delete;
+  named_arg_store& operator=(named_arg_store&& rhs) = delete;
+  operator const arg_t<Context, NUM_ARGS>*() const { return args + 1; }
 };
 
-// A specialization of format_arg_store without named arguments.
-// It is a plain struct to reduce binary size in debug mode.
-template <typename Context, size_t NUM_ARGS, unsigned long long DESC>
-struct format_arg_store<Context, NUM_ARGS, 0, DESC> {
+// An array of references to arguments. It can be implicitly converted to
+// `basic_format_args` for passing into type-erased formatting functions
+// such as `vformat`. It is a plain struct to reduce binary size in debug mode.
+template <typename Context, int NUM_ARGS, int NUM_NAMED_ARGS,
+          unsigned long long DESC>
+struct format_arg_store {
   // +1 to workaround a bug in gcc 7.5 that causes duplicated-branches warning.
-  arg_t<Context, NUM_ARGS> args[NUM_ARGS != 0 ? NUM_ARGS : +1];
+  using type =
+      conditional_t<NUM_NAMED_ARGS == 0,
+                    arg_t<Context, NUM_ARGS>[max_of(1, NUM_ARGS)],
+                    named_arg_store<Context, NUM_ARGS, NUM_NAMED_ARGS, DESC>>;
+  type args;
 };
 
-}  // namespace detail
-FMT_BEGIN_EXPORT
-
-// A formatting argument. Context is a template parameter for the compiled API
-// where output can be unbuffered.
-template <typename Context> class basic_format_arg {
+// TYPE can be different from type_constant<T>, e.g. for __float128.
+template <typename T, typename Char, type TYPE> struct native_formatter {
  private:
-  detail::value<Context> value_;
-  detail::type type_;
+  dynamic_format_specs<Char> specs_;
 
-  template <typename ContextType, typename T>
-  friend FMT_CONSTEXPR auto detail::make_arg(T& value)
-      -> basic_format_arg<ContextType>;
+ public:
+  using nonlocking = void;
 
-  friend class basic_format_args<Context>;
-  friend class dynamic_format_arg_store<Context>;
+  FMT_CONSTEXPR auto parse(parse_context<Char>& ctx) -> const Char* {
+    if (ctx.begin() == ctx.end() || *ctx.begin() == '}') return ctx.begin();
+    auto end = parse_format_specs(ctx.begin(), ctx.end(), specs_, ctx, TYPE);
+    if (const_check(TYPE == type::char_type)) check_char_specs(specs_);
+    return end;
+  }
 
-  using char_type = typename Context::char_type;
+  template <type U = TYPE,
+            FMT_ENABLE_IF(U == type::string_type || U == type::cstring_type ||
+                          U == type::char_type)>
+  FMT_CONSTEXPR void set_debug_format(bool set = true) {
+    specs_.set_type(set ? presentation_type::debug : presentation_type::none);
+  }
 
-  template <typename, size_t, size_t, unsigned long long>
-  friend struct detail::format_arg_store;
+  FMT_PRAGMA_CLANG(diagnostic ignored "-Wundefined-inline")
+  template <typename FormatContext>
+  FMT_CONSTEXPR auto format(const T& val, FormatContext& ctx) const
+      -> decltype(ctx.out());
+};
 
-  basic_format_arg(const detail::named_arg_info<char_type>* args, size_t size)
-      : value_(args, size) {}
+template <typename T, typename Enable = void>
+struct locking
+    : bool_constant<mapped_type_constant<T>::value == type::custom_type> {};
+template <typename T>
+struct locking<T, void_t<typename formatter<remove_cvref_t<T>>::nonlocking>>
+    : std::false_type {};
 
- public:
-  class handle {
-   public:
-    explicit handle(detail::custom_value<Context> custom) : custom_(custom) {}
+template <typename T = int> FMT_CONSTEXPR inline auto is_locking() -> bool {
+  return locking<T>::value;
+}
+template <typename T1, typename T2, typename... Tail>
+FMT_CONSTEXPR inline auto is_locking() -> bool {
+  return locking<T1>::value || is_locking<T2, Tail...>();
+}
 
-    void format(typename Context::parse_context_type& parse_ctx,
-                Context& ctx) const {
-      custom_.format(custom_.value, parse_ctx, ctx);
-    }
+FMT_API void vformat_to(buffer<char>& buf, string_view fmt, format_args args,
+                        locale_ref loc = {});
 
-   private:
-    detail::custom_value<Context> custom_;
-  };
+#if FMT_WIN32
+FMT_API void vprint_mojibake(FILE*, string_view, format_args, bool);
+#else  // format_args is passed by reference since it is defined later.
+inline void vprint_mojibake(FILE*, string_view, const format_args&, bool) {}
+#endif
+}  // namespace detail
 
-  constexpr basic_format_arg() : type_(detail::type::none_type) {}
+// The main public API.
 
-  constexpr explicit operator bool() const noexcept {
-    return type_ != detail::type::none_type;
+template <typename Char>
+FMT_CONSTEXPR void parse_context<Char>::do_check_arg_id(int arg_id) {
+  // Argument id is only checked at compile time during parsing because
+  // formatting has its own validation.
+  if (detail::is_constant_evaluated() && use_constexpr_cast) {
+    auto ctx = static_cast<detail::compile_parse_context<Char>*>(this);
+    if (arg_id >= ctx->num_args()) report_error("argument not found");
   }
+}
 
-  auto type() const -> detail::type { return type_; }
+template <typename Char>
+FMT_CONSTEXPR void parse_context<Char>::check_dynamic_spec(int arg_id) {
+  using detail::compile_parse_context;
+  if (detail::is_constant_evaluated() && use_constexpr_cast)
+    static_cast<compile_parse_context<Char>*>(this)->check_dynamic_spec(arg_id);
+}
 
-  auto is_integral() const -> bool { return detail::is_integral_type(type_); }
-  auto is_arithmetic() const -> bool {
-    return detail::is_arithmetic_type(type_);
-  }
+FMT_BEGIN_EXPORT
 
-  /**
-   * Visits an argument dispatching to the appropriate visit method based on
-   * the argument type. For example, if the argument type is `double` then
-   * `vis(value)` will be called with the value of type `double`.
-   */
-  template <typename Visitor>
-  FMT_CONSTEXPR FMT_INLINE auto visit(Visitor&& vis) const -> decltype(vis(0)) {
-    switch (type_) {
-    case detail::type::none_type:
-      break;
-    case detail::type::int_type:
-      return vis(value_.int_value);
-    case detail::type::uint_type:
-      return vis(value_.uint_value);
-    case detail::type::long_long_type:
-      return vis(value_.long_long_value);
-    case detail::type::ulong_long_type:
-      return vis(value_.ulong_long_value);
-    case detail::type::int128_type:
-      return vis(detail::convert_for_visit(value_.int128_value));
-    case detail::type::uint128_type:
-      return vis(detail::convert_for_visit(value_.uint128_value));
-    case detail::type::bool_type:
-      return vis(value_.bool_value);
-    case detail::type::char_type:
-      return vis(value_.char_value);
-    case detail::type::float_type:
-      return vis(value_.float_value);
-    case detail::type::double_type:
-      return vis(value_.double_value);
-    case detail::type::long_double_type:
-      return vis(value_.long_double_value);
-    case detail::type::cstring_type:
-      return vis(value_.string.data);
-    case detail::type::string_type:
-      using sv = basic_string_view<typename Context::char_type>;
-      return vis(sv(value_.string.data, value_.string.size));
-    case detail::type::pointer_type:
-      return vis(value_.pointer);
-    case detail::type::custom_type:
-      return vis(typename basic_format_arg<Context>::handle(value_.custom));
-    }
-    return vis(monostate());
-  }
+// An output iterator that appends to a buffer. It is used instead of
+// back_insert_iterator to reduce symbol sizes and avoid <iterator> dependency.
+template <typename T> class basic_appender {
+ protected:
+  detail::buffer<T>* container;
 
-  auto format_custom(const char_type* parse_begin,
-                     typename Context::parse_context_type& parse_ctx,
-                     Context& ctx) -> bool {
-    if (type_ != detail::type::custom_type) return false;
-    parse_ctx.advance_to(parse_begin);
-    value_.custom.format(value_.custom.value, parse_ctx, ctx);
-    return true;
+ public:
+  using container_type = detail::buffer<T>;
+
+  FMT_CONSTEXPR basic_appender(detail::buffer<T>& buf) : container(&buf) {}
+
+  FMT_CONSTEXPR20 auto operator=(T c) -> basic_appender& {
+    container->push_back(c);
+    return *this;
   }
+  FMT_CONSTEXPR20 auto operator*() -> basic_appender& { return *this; }
+  FMT_CONSTEXPR20 auto operator++() -> basic_appender& { return *this; }
+  FMT_CONSTEXPR20 auto operator++(int) -> basic_appender { return *this; }
 };
 
-template <typename Visitor, typename Context>
-FMT_DEPRECATED FMT_CONSTEXPR auto visit_format_arg(
-    Visitor&& vis, const basic_format_arg<Context>& arg) -> decltype(vis(0)) {
-  return arg.visit(static_cast<Visitor&&>(vis));
-}
-
-/**
- * A view of a collection of formatting arguments. To avoid lifetime issues it
- * should only be used as a parameter type in type-erased functions such as
- * `vformat`:
- *
- *     void vlog(fmt::string_view fmt, fmt::format_args args);  // OK
- *     fmt::format_args args = fmt::make_format_args();  // Dangling reference
- */
-template <typename Context> class basic_format_args {
- public:
-  using size_type = int;
-  using format_arg = basic_format_arg<Context>;
-
- private:
-  // A descriptor that contains information about formatting arguments.
-  // If the number of arguments is less or equal to max_packed_args then
-  // argument types are passed in the descriptor. This reduces binary code size
-  // per formatting function call.
-  unsigned long long desc_;
-  union {
-    // If is_packed() returns true then argument values are stored in values_;
-    // otherwise they are stored in args_. This is done to improve cache
-    // locality and reduce compiled code size since storing larger objects
-    // may require more code (at least on x86-64) even if the same amount of
-    // data is actually copied to stack. It saves ~10% on the bloat test.
-    const detail::value<Context>* values_;
-    const format_arg* args_;
-  };
-
-  constexpr auto is_packed() const -> bool {
-    return (desc_ & detail::is_unpacked_bit) == 0;
-  }
-  constexpr auto has_named_args() const -> bool {
-    return (desc_ & detail::has_named_args_bit) != 0;
-  }
-
-  FMT_CONSTEXPR auto type(int index) const -> detail::type {
-    int shift = index * detail::packed_arg_bits;
-    unsigned int mask = (1 << detail::packed_arg_bits) - 1;
-    return static_cast<detail::type>((desc_ >> shift) & mask);
-  }
-
- public:
-  constexpr basic_format_args() : desc_(0), args_(nullptr) {}
-
-  /// Constructs a `basic_format_args` object from `format_arg_store`.
-  template <size_t NUM_ARGS, size_t NUM_NAMED_ARGS, unsigned long long DESC,
-            FMT_ENABLE_IF(NUM_ARGS <= detail::max_packed_args)>
-  constexpr FMT_ALWAYS_INLINE basic_format_args(
-      const detail::format_arg_store<Context, NUM_ARGS, NUM_NAMED_ARGS, DESC>&
-          store)
-      : desc_(DESC), values_(store.args + (NUM_NAMED_ARGS != 0 ? 1 : 0)) {}
-
-  template <size_t NUM_ARGS, size_t NUM_NAMED_ARGS, unsigned long long DESC,
-            FMT_ENABLE_IF(NUM_ARGS > detail::max_packed_args)>
-  constexpr basic_format_args(
-      const detail::format_arg_store<Context, NUM_ARGS, NUM_NAMED_ARGS, DESC>&
-          store)
-      : desc_(DESC), args_(store.args + (NUM_NAMED_ARGS != 0 ? 1 : 0)) {}
-
-  /// Constructs a `basic_format_args` object from `dynamic_format_arg_store`.
-  constexpr basic_format_args(const dynamic_format_arg_store<Context>& store)
-      : desc_(store.get_types()), args_(store.data()) {}
-
-  /// Constructs a `basic_format_args` object from a dynamic list of arguments.
-  constexpr basic_format_args(const format_arg* args, int count)
-      : desc_(detail::is_unpacked_bit | detail::to_unsigned(count)),
-        args_(args) {}
-
-  /// Returns the argument with the specified id.
-  FMT_CONSTEXPR auto get(int id) const -> format_arg {
-    format_arg arg;
-    if (!is_packed()) {
-      if (id < max_size()) arg = args_[id];
-      return arg;
-    }
-    if (static_cast<unsigned>(id) >= detail::max_packed_args) return arg;
-    arg.type_ = type(id);
-    if (arg.type_ == detail::type::none_type) return arg;
-    arg.value_ = values_[id];
-    return arg;
-  }
-
-  template <typename Char>
-  auto get(basic_string_view<Char> name) const -> format_arg {
-    int id = get_id(name);
-    return id >= 0 ? get(id) : format_arg();
-  }
-
-  template <typename Char>
-  FMT_CONSTEXPR auto get_id(basic_string_view<Char> name) const -> int {
-    if (!has_named_args()) return -1;
-    const auto& named_args =
-        (is_packed() ? values_[-1] : args_[-1].value_).named_args;
-    for (size_t i = 0; i < named_args.size; ++i) {
-      if (named_args.data[i].name == name) return named_args.data[i].id;
-    }
-    return -1;
-  }
-
-  auto max_size() const -> int {
-    unsigned long long max_packed = detail::max_packed_args;
-    return static_cast<int>(is_packed() ? max_packed
-                                        : desc_ & ~detail::is_unpacked_bit);
-  }
-};
-
-// A formatting context.
-class context {
+// A formatting argument. Context is a template parameter for the compiled API
+// where output can be unbuffered.
+template <typename Context> class basic_format_arg {
  private:
-  appender out_;
-  basic_format_args<context> args_;
-  detail::locale_ref loc_;
-
- public:
-  /// The character type for the output.
-  using char_type = char;
-
-  using iterator = appender;
-  using format_arg = basic_format_arg<context>;
-  using parse_context_type = basic_format_parse_context<char>;
-  template <typename T> using formatter_type = formatter<T, char>;
-
-  /// Constructs a `basic_format_context` object. References to the arguments
-  /// are stored in the object so make sure they have appropriate lifetimes.
-  FMT_CONSTEXPR context(iterator out, basic_format_args<context> ctx_args,
-                        detail::locale_ref loc = {})
-      : out_(out), args_(ctx_args), loc_(loc) {}
-  context(context&&) = default;
-  context(const context&) = delete;
-  void operator=(const context&) = delete;
-
-  FMT_CONSTEXPR auto arg(int id) const -> format_arg { return args_.get(id); }
-  auto arg(string_view name) -> format_arg { return args_.get(name); }
-  FMT_CONSTEXPR auto arg_id(string_view name) -> int {
-    return args_.get_id(name);
-  }
-  auto args() const -> const basic_format_args<context>& { return args_; }
-
-  // Returns an iterator to the beginning of the output range.
-  FMT_CONSTEXPR auto out() -> iterator { return out_; }
-
-  // Advances the begin iterator to `it`.
-  void advance_to(iterator) {}
-
-  FMT_CONSTEXPR auto locale() -> detail::locale_ref { return loc_; }
-};
-
-template <typename OutputIt, typename Char> class generic_context;
-
-// Longer aliases for C++20 compatibility.
-template <typename OutputIt, typename Char>
-using basic_format_context =
-    conditional_t<std::is_same<OutputIt, appender>::value, context,
-                  generic_context<OutputIt, Char>>;
-using format_context = context;
-
-template <typename Char>
-using buffered_context = basic_format_context<basic_appender<Char>, Char>;
-
-template <typename T, typename Char = char>
-using is_formattable = bool_constant<!std::is_base_of<
-    detail::unformattable, decltype(detail::arg_mapper<buffered_context<Char>>()
-                                        .map(std::declval<T&>()))>::value>;
-
-#if FMT_USE_CONCEPTS
-template <typename T, typename Char = char>
-concept formattable = is_formattable<remove_reference_t<T>, Char>::value;
-#endif
-
-/**
- * Constructs an object that stores references to arguments and can be
- * implicitly converted to `format_args`. `Context` can be omitted in which case
- * it defaults to `format_context`. See `arg` for lifetime considerations.
- */
-// Take arguments by lvalue references to avoid some lifetime issues, e.g.
-//   auto args = make_format_args(std::string());
-template <typename Context = format_context, typename... T,
-          size_t NUM_ARGS = sizeof...(T),
-          size_t NUM_NAMED_ARGS = detail::count_named_args<T...>(),
-          unsigned long long DESC = detail::make_descriptor<Context, T...>(),
-          FMT_ENABLE_IF(NUM_NAMED_ARGS == 0)>
-constexpr FMT_ALWAYS_INLINE auto make_format_args(T&... args)
-    -> detail::format_arg_store<Context, NUM_ARGS, 0, DESC> {
-  return {{detail::make_arg<NUM_ARGS <= detail::max_packed_args, Context>(
-      args)...}};
-}
-
-#ifndef FMT_DOC
-template <typename Context = format_context, typename... T,
-          size_t NUM_NAMED_ARGS = detail::count_named_args<T...>(),
-          unsigned long long DESC =
-              detail::make_descriptor<Context, T...>() |
-              static_cast<unsigned long long>(detail::has_named_args_bit),
-          FMT_ENABLE_IF(NUM_NAMED_ARGS != 0)>
-constexpr auto make_format_args(T&... args)
-    -> detail::format_arg_store<Context, sizeof...(T), NUM_NAMED_ARGS, DESC> {
-  return {args...};
-}
-#endif
-
-/**
- * Returns a named argument to be used in a formatting function.
- * It should only be used in a call to a formatting function or
- * `dynamic_format_arg_store::push_back`.
- *
- * **Example**:
- *
- *     fmt::print("The answer is {answer}.", fmt::arg("answer", 42));
- */
-template <typename Char, typename T>
-inline auto arg(const Char* name, const T& arg) -> detail::named_arg<Char, T> {
-  static_assert(!detail::is_named_arg<T>(), "nested named arguments");
-  return {name, arg};
-}
-FMT_END_EXPORT
-
-/// An alias for `basic_format_args<format_context>`.
-// A separate type would result in shorter symbols but break ABI compatibility
-// between clang and gcc on ARM (#1919).
-FMT_EXPORT using format_args = basic_format_args<format_context>;
-
-// We cannot use enum classes as bit fields because of a gcc bug, so we put them
-// in namespaces instead (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61414).
-// Additionally, if an underlying type is specified, older gcc incorrectly warns
-// that the type is too small. Both bugs are fixed in gcc 9.3.
-#if FMT_GCC_VERSION && FMT_GCC_VERSION < 903
-#  define FMT_ENUM_UNDERLYING_TYPE(type)
-#else
-#  define FMT_ENUM_UNDERLYING_TYPE(type) : type
-#endif
-namespace align {
-enum type FMT_ENUM_UNDERLYING_TYPE(unsigned char){none, left, right, center,
-                                                  numeric};
-}
-using align_t = align::type;
-namespace sign {
-enum type FMT_ENUM_UNDERLYING_TYPE(unsigned char){none, minus, plus, space};
-}
-using sign_t = sign::type;
-
-namespace detail {
+  detail::value<Context> value_;
+  detail::type type_;
 
-template <typename Char>
-using unsigned_char = typename conditional_t<std::is_integral<Char>::value,
-                                             std::make_unsigned<Char>,
-                                             type_identity<unsigned>>::type;
+  friend class basic_format_args<Context>;
 
-// Character (code unit) type is erased to prevent template bloat.
-struct fill_t {
- private:
-  enum { max_size = 4 };
-  char data_[max_size] = {' '};
-  unsigned char size_ = 1;
+  using char_type = typename Context::char_type;
 
  public:
-  template <typename Char>
-  FMT_CONSTEXPR void operator=(basic_string_view<Char> s) {
-    auto size = s.size();
-    size_ = static_cast<unsigned char>(size);
-    if (size == 1) {
-      unsigned uchar = static_cast<unsigned_char<Char>>(s[0]);
-      data_[0] = static_cast<char>(uchar);
-      data_[1] = static_cast<char>(uchar >> 8);
-      return;
-    }
-    FMT_ASSERT(size <= max_size, "invalid fill");
-    for (size_t i = 0; i < size; ++i) data_[i] = static_cast<char>(s[i]);
-  }
-
-  FMT_CONSTEXPR void operator=(char c) {
-    data_[0] = c;
-    size_ = 1;
-  }
-
-  constexpr auto size() const -> size_t { return size_; }
-
-  template <typename Char> constexpr auto get() const -> Char {
-    using uchar = unsigned char;
-    return static_cast<Char>(static_cast<uchar>(data_[0]) |
-                             (static_cast<uchar>(data_[1]) << 8));
-  }
-
-  template <typename Char, FMT_ENABLE_IF(std::is_same<Char, char>::value)>
-  constexpr auto data() const -> const Char* {
-    return data_;
-  }
-  template <typename Char, FMT_ENABLE_IF(!std::is_same<Char, char>::value)>
-  constexpr auto data() const -> const Char* {
-    return nullptr;
-  }
-};
-}  // namespace detail
-
-enum class presentation_type : unsigned char {
-  // Common specifiers:
-  none = 0,
-  debug = 1,   // '?'
-  string = 2,  // 's' (string, bool)
-
-  // Integral, bool and character specifiers:
-  dec = 3,  // 'd'
-  hex,      // 'x' or 'X'
-  oct,      // 'o'
-  bin,      // 'b' or 'B'
-  chr,      // 'c'
-
-  // String and pointer specifiers:
-  pointer = 3,  // 'p'
-
-  // Floating-point specifiers:
-  exp = 1,  // 'e' or 'E' (1 since there is no FP debug presentation)
-  fixed,    // 'f' or 'F'
-  general,  // 'g' or 'G'
-  hexfloat  // 'a' or 'A'
-};
-
-// Format specifiers for built-in and string types.
-struct format_specs {
-  int width;
-  int precision;
-  presentation_type type;
-  align_t align : 4;
-  sign_t sign : 3;
-  bool upper : 1;  // An uppercase version e.g. 'X' for 'x'.
-  bool alt : 1;    // Alternate form ('#').
-  bool localized : 1;
-  detail::fill_t fill;
-
-  constexpr format_specs()
-      : width(0),
-        precision(-1),
-        type(presentation_type::none),
-        align(align::none),
-        sign(sign::none),
-        upper(false),
-        alt(false),
-        localized(false) {}
-};
-
-namespace detail {
-
-enum class arg_id_kind { none, index, name };
-
-// An argument reference.
-template <typename Char> struct arg_ref {
-  FMT_CONSTEXPR arg_ref() : kind(arg_id_kind::none), val() {}
-
-  FMT_CONSTEXPR explicit arg_ref(int index)
-      : kind(arg_id_kind::index), val(index) {}
-  FMT_CONSTEXPR explicit arg_ref(basic_string_view<Char> name)
-      : kind(arg_id_kind::name), val(name) {}
-
-  FMT_CONSTEXPR auto operator=(int idx) -> arg_ref& {
-    kind = arg_id_kind::index;
-    val.index = idx;
-    return *this;
-  }
-
-  arg_id_kind kind;
-  union value {
-    FMT_CONSTEXPR value(int idx = 0) : index(idx) {}
-    FMT_CONSTEXPR value(basic_string_view<Char> n) : name(n) {}
-
-    int index;
-    basic_string_view<Char> name;
-  } val;
-};
-
-// Format specifiers with width and precision resolved at formatting rather
-// than parsing time to allow reusing the same parsed specifiers with
-// different sets of arguments (precompilation of format strings).
-template <typename Char = char> struct dynamic_format_specs : format_specs {
-  arg_ref<Char> width_ref;
-  arg_ref<Char> precision_ref;
-};
-
-// Converts a character to ASCII. Returns '\0' on conversion failure.
-template <typename Char, FMT_ENABLE_IF(std::is_integral<Char>::value)>
-constexpr auto to_ascii(Char c) -> char {
-  return c <= 0xff ? static_cast<char>(c) : '\0';
-}
-
-// Returns the number of code units in a code point or 1 on error.
-template <typename Char>
-FMT_CONSTEXPR auto code_point_length(const Char* begin) -> int {
-  if (const_check(sizeof(Char) != 1)) return 1;
-  auto c = static_cast<unsigned char>(*begin);
-  return static_cast<int>((0x3a55000000000000ull >> (2 * (c >> 3))) & 0x3) + 1;
-}
-
-// Return the result via the out param to workaround gcc bug 77539.
-template <bool IS_CONSTEXPR, typename T, typename Ptr = const T*>
-FMT_CONSTEXPR auto find(Ptr first, Ptr last, T value, Ptr& out) -> bool {
-  for (out = first; out != last; ++out) {
-    if (*out == value) return true;
-  }
-  return false;
-}
-
-template <>
-inline auto find<false, char>(const char* first, const char* last, char value,
-                              const char*& out) -> bool {
-  out =
-      static_cast<const char*>(memchr(first, value, to_unsigned(last - first)));
-  return out != nullptr;
-}
-
-// Parses the range [begin, end) as an unsigned integer. This function assumes
-// that the range is non-empty and the first character is a digit.
-template <typename Char>
-FMT_CONSTEXPR auto parse_nonnegative_int(const Char*& begin, const Char* end,
-                                         int error_value) noexcept -> int {
-  FMT_ASSERT(begin != end && '0' <= *begin && *begin <= '9', "");
-  unsigned value = 0, prev = 0;
-  auto p = begin;
-  do {
-    prev = value;
-    value = value * 10 + unsigned(*p - '0');
-    ++p;
-  } while (p != end && '0' <= *p && *p <= '9');
-  auto num_digits = p - begin;
-  begin = p;
-  int digits10 = static_cast<int>(sizeof(int) * CHAR_BIT * 3 / 10);
-  if (num_digits <= digits10) return static_cast<int>(value);
-  // Check for overflow.
-  unsigned max = INT_MAX;
-  return num_digits == digits10 + 1 &&
-                 prev * 10ull + unsigned(p[-1] - '0') <= max
-             ? static_cast<int>(value)
-             : error_value;
-}
-
-FMT_CONSTEXPR inline auto parse_align(char c) -> align_t {
-  switch (c) {
-  case '<':
-    return align::left;
-  case '>':
-    return align::right;
-  case '^':
-    return align::center;
-  }
-  return align::none;
-}
-
-template <typename Char> constexpr auto is_name_start(Char c) -> bool {
-  return ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || c == '_';
-}
-
-template <typename Char, typename Handler>
-FMT_CONSTEXPR auto do_parse_arg_id(const Char* begin, const Char* end,
-                                   Handler&& handler) -> const Char* {
-  Char c = *begin;
-  if (c >= '0' && c <= '9') {
-    int index = 0;
-    if (c != '0')
-      index = parse_nonnegative_int(begin, end, INT_MAX);
-    else
-      ++begin;
-    if (begin == end || (*begin != '}' && *begin != ':'))
-      report_error("invalid format string");
-    else
-      handler.on_index(index);
-    return begin;
-  }
-  if (!is_name_start(c)) {
-    report_error("invalid format string");
-    return begin;
-  }
-  auto it = begin;
-  do {
-    ++it;
-  } while (it != end && (is_name_start(*it) || ('0' <= *it && *it <= '9')));
-  handler.on_name({begin, to_unsigned(it - begin)});
-  return it;
-}
-
-template <typename Char, typename Handler>
-FMT_CONSTEXPR auto parse_arg_id(const Char* begin, const Char* end,
-                                Handler&& handler) -> const Char* {
-  FMT_ASSERT(begin != end, "");
-  Char c = *begin;
-  if (c != '}' && c != ':') return do_parse_arg_id(begin, end, handler);
-  handler.on_auto();
-  return begin;
-}
-
-template <typename Char> struct dynamic_spec_id_handler {
-  basic_format_parse_context<Char>& ctx;
-  arg_ref<Char>& ref;
-
-  FMT_CONSTEXPR void on_auto() {
-    int id = ctx.next_arg_id();
-    ref = arg_ref<Char>(id);
-    ctx.check_dynamic_spec(id);
-  }
-  FMT_CONSTEXPR void on_index(int id) {
-    ref = arg_ref<Char>(id);
-    ctx.check_arg_id(id);
-    ctx.check_dynamic_spec(id);
-  }
-  FMT_CONSTEXPR void on_name(basic_string_view<Char> id) {
-    ref = arg_ref<Char>(id);
-    ctx.check_arg_id(id);
-  }
-};
-
-// Parses [integer | "{" [arg_id] "}"].
-template <typename Char>
-FMT_CONSTEXPR auto parse_dynamic_spec(const Char* begin, const Char* end,
-                                      int& value, arg_ref<Char>& ref,
-                                      basic_format_parse_context<Char>& ctx)
-    -> const Char* {
-  FMT_ASSERT(begin != end, "");
-  if ('0' <= *begin && *begin <= '9') {
-    int val = parse_nonnegative_int(begin, end, -1);
-    if (val != -1)
-      value = val;
-    else
-      report_error("number is too big");
-  } else if (*begin == '{') {
-    ++begin;
-    auto handler = dynamic_spec_id_handler<Char>{ctx, ref};
-    if (begin != end) begin = parse_arg_id(begin, end, handler);
-    if (begin != end && *begin == '}') return ++begin;
-    report_error("invalid format string");
-  }
-  return begin;
-}
-
-template <typename Char>
-FMT_CONSTEXPR auto parse_precision(const Char* begin, const Char* end,
-                                   int& value, arg_ref<Char>& ref,
-                                   basic_format_parse_context<Char>& ctx)
-    -> const Char* {
-  ++begin;
-  if (begin == end || *begin == '}') {
-    report_error("invalid precision");
-    return begin;
-  }
-  return parse_dynamic_spec(begin, end, value, ref, ctx);
-}
-
-enum class state { start, align, sign, hash, zero, width, precision, locale };
-
-// Parses standard format specifiers.
-template <typename Char>
-FMT_CONSTEXPR auto parse_format_specs(const Char* begin, const Char* end,
-                                      dynamic_format_specs<Char>& specs,
-                                      basic_format_parse_context<Char>& ctx,
-                                      type arg_type) -> const Char* {
-  auto c = '\0';
-  if (end - begin > 1) {
-    auto next = to_ascii(begin[1]);
-    c = parse_align(next) == align::none ? to_ascii(*begin) : '\0';
-  } else {
-    if (begin == end) return begin;
-    c = to_ascii(*begin);
-  }
-
-  struct {
-    state current_state = state::start;
-    FMT_CONSTEXPR void operator()(state s, bool valid = true) {
-      if (current_state >= s || !valid)
-        report_error("invalid format specifier");
-      current_state = s;
-    }
-  } enter_state;
-
-  using pres = presentation_type;
-  constexpr auto integral_set = sint_set | uint_set | bool_set | char_set;
-  struct {
-    const Char*& begin;
-    dynamic_format_specs<Char>& specs;
-    type arg_type;
-
-    FMT_CONSTEXPR auto operator()(pres pres_type, int set) -> const Char* {
-      if (!in(arg_type, set)) {
-        if (arg_type == type::none_type) return begin;
-        report_error("invalid format specifier");
-      }
-      specs.type = pres_type;
-      return begin + 1;
-    }
-  } parse_presentation_type{begin, specs, arg_type};
-
-  for (;;) {
-    switch (c) {
-    case '<':
-    case '>':
-    case '^':
-      enter_state(state::align);
-      specs.align = parse_align(c);
-      ++begin;
-      break;
-    case '+':
-    case '-':
-    case ' ':
-      if (arg_type == type::none_type) return begin;
-      enter_state(state::sign, in(arg_type, sint_set | float_set));
-      switch (c) {
-      case '+':
-        specs.sign = sign::plus;
-        break;
-      case '-':
-        specs.sign = sign::minus;
-        break;
-      case ' ':
-        specs.sign = sign::space;
-        break;
-      }
-      ++begin;
-      break;
-    case '#':
-      if (arg_type == type::none_type) return begin;
-      enter_state(state::hash, is_arithmetic_type(arg_type));
-      specs.alt = true;
-      ++begin;
-      break;
-    case '0':
-      enter_state(state::zero);
-      if (!is_arithmetic_type(arg_type)) {
-        if (arg_type == type::none_type) return begin;
-        report_error("format specifier requires numeric argument");
-      }
-      if (specs.align == align::none) {
-        // Ignore 0 if align is specified for compatibility with std::format.
-        specs.align = align::numeric;
-        specs.fill = '0';
-      }
-      ++begin;
-      break;
-    case '1':
-    case '2':
-    case '3':
-    case '4':
-    case '5':
-    case '6':
-    case '7':
-    case '8':
-    case '9':
-    case '{':
-      enter_state(state::width);
-      begin = parse_dynamic_spec(begin, end, specs.width, specs.width_ref, ctx);
-      break;
-    case '.':
-      if (arg_type == type::none_type) return begin;
-      enter_state(state::precision,
-                  in(arg_type, float_set | string_set | cstring_set));
-      begin = parse_precision(begin, end, specs.precision, specs.precision_ref,
-                              ctx);
-      break;
-    case 'L':
-      if (arg_type == type::none_type) return begin;
-      enter_state(state::locale, is_arithmetic_type(arg_type));
-      specs.localized = true;
-      ++begin;
-      break;
-    case 'd':
-      return parse_presentation_type(pres::dec, integral_set);
-    case 'X':
-      specs.upper = true;
-      FMT_FALLTHROUGH;
-    case 'x':
-      return parse_presentation_type(pres::hex, integral_set);
-    case 'o':
-      return parse_presentation_type(pres::oct, integral_set);
-    case 'B':
-      specs.upper = true;
-      FMT_FALLTHROUGH;
-    case 'b':
-      return parse_presentation_type(pres::bin, integral_set);
-    case 'E':
-      specs.upper = true;
-      FMT_FALLTHROUGH;
-    case 'e':
-      return parse_presentation_type(pres::exp, float_set);
-    case 'F':
-      specs.upper = true;
-      FMT_FALLTHROUGH;
-    case 'f':
-      return parse_presentation_type(pres::fixed, float_set);
-    case 'G':
-      specs.upper = true;
-      FMT_FALLTHROUGH;
-    case 'g':
-      return parse_presentation_type(pres::general, float_set);
-    case 'A':
-      specs.upper = true;
-      FMT_FALLTHROUGH;
-    case 'a':
-      return parse_presentation_type(pres::hexfloat, float_set);
-    case 'c':
-      if (arg_type == type::bool_type) report_error("invalid format specifier");
-      return parse_presentation_type(pres::chr, integral_set);
-    case 's':
-      return parse_presentation_type(pres::string,
-                                     bool_set | string_set | cstring_set);
-    case 'p':
-      return parse_presentation_type(pres::pointer, pointer_set | cstring_set);
-    case '?':
-      return parse_presentation_type(pres::debug,
-                                     char_set | string_set | cstring_set);
-    case '}':
-      return begin;
-    default: {
-      if (*begin == '}') return begin;
-      // Parse fill and alignment.
-      auto fill_end = begin + code_point_length(begin);
-      if (end - fill_end <= 0) {
-        report_error("invalid format specifier");
-        return begin;
-      }
-      if (*begin == '{') {
-        report_error("invalid fill character '{'");
-        return begin;
-      }
-      auto align = parse_align(to_ascii(*fill_end));
-      enter_state(state::align, align != align::none);
-      specs.fill =
-          basic_string_view<Char>(begin, to_unsigned(fill_end - begin));
-      specs.align = align;
-      begin = fill_end + 1;
-    }
-    }
-    if (begin == end) return begin;
-    c = to_ascii(*begin);
-  }
-}
-
-template <typename Char, typename Handler>
-FMT_CONSTEXPR auto parse_replacement_field(const Char* begin, const Char* end,
-                                           Handler&& handler) -> const Char* {
-  struct id_adapter {
-    Handler& handler;
-    int arg_id;
-
-    FMT_CONSTEXPR void on_auto() { arg_id = handler.on_arg_id(); }
-    FMT_CONSTEXPR void on_index(int id) { arg_id = handler.on_arg_id(id); }
-    FMT_CONSTEXPR void on_name(basic_string_view<Char> id) {
-      arg_id = handler.on_arg_id(id);
-    }
-  };
+  class handle {
+   private:
+    detail::custom_value<Context> custom_;
 
-  ++begin;
-  if (begin == end) return handler.on_error("invalid format string"), end;
-  if (*begin == '}') {
-    handler.on_replacement_field(handler.on_arg_id(), begin);
-  } else if (*begin == '{') {
-    handler.on_text(begin, begin + 1);
-  } else {
-    auto adapter = id_adapter{handler, 0};
-    begin = parse_arg_id(begin, end, adapter);
-    Char c = begin != end ? *begin : Char();
-    if (c == '}') {
-      handler.on_replacement_field(adapter.arg_id, begin);
-    } else if (c == ':') {
-      begin = handler.on_format_specs(adapter.arg_id, begin + 1, end);
-      if (begin == end || *begin != '}')
-        return handler.on_error("unknown format specifier"), end;
-    } else {
-      return handler.on_error("missing '}' in format string"), end;
+   public:
+    explicit handle(detail::custom_value<Context> custom) : custom_(custom) {}
+
+    void format(parse_context<char_type>& parse_ctx, Context& ctx) const {
+      custom_.format(custom_.value, parse_ctx, ctx);
     }
+  };
+
+  constexpr basic_format_arg() : type_(detail::type::none_type) {}
+  basic_format_arg(const detail::named_arg_info<char_type>* args, size_t size)
+      : value_(args, size) {}
+  template <typename T>
+  basic_format_arg(T&& val)
+      : value_(val), type_(detail::stored_type_constant<T, Context>::value) {}
+
+  constexpr explicit operator bool() const noexcept {
+    return type_ != detail::type::none_type;
   }
-  return begin + 1;
-}
+  auto type() const -> detail::type { return type_; }
 
-template <bool IS_CONSTEXPR, typename Char, typename Handler>
-FMT_CONSTEXPR void parse_format_string(basic_string_view<Char> format_str,
-                                       Handler&& handler) {
-  auto begin = format_str.data();
-  auto end = begin + format_str.size();
-  if (end - begin < 32) {
-    // Use a simple loop instead of memchr for small strings.
-    const Char* p = begin;
-    while (p != end) {
-      auto c = *p++;
-      if (c == '{') {
-        handler.on_text(begin, p - 1);
-        begin = p = parse_replacement_field(p - 1, end, handler);
-      } else if (c == '}') {
-        if (p == end || *p != '}')
-          return handler.on_error("unmatched '}' in format string");
-        handler.on_text(begin, p);
-        begin = ++p;
-      }
-    }
-    handler.on_text(begin, end);
-    return;
-  }
-  struct writer {
-    FMT_CONSTEXPR void operator()(const Char* from, const Char* to) {
-      if (from == to) return;
-      for (;;) {
-        const Char* p = nullptr;
-        if (!find<IS_CONSTEXPR>(from, to, Char('}'), p))
-          return handler_.on_text(from, to);
-        ++p;
-        if (p == to || *p != '}')
-          return handler_.on_error("unmatched '}' in format string");
-        handler_.on_text(from, p);
-        from = p + 1;
-      }
+  /**
+   * Visits an argument dispatching to the appropriate visit method based on
+   * the argument type. For example, if the argument type is `double` then
+   * `vis(value)` will be called with the value of type `double`.
+   */
+  template <typename Visitor>
+  FMT_CONSTEXPR FMT_INLINE auto visit(Visitor&& vis) const -> decltype(vis(0)) {
+    using detail::map;
+    switch (type_) {
+    case detail::type::none_type:        break;
+    case detail::type::int_type:         return vis(value_.int_value);
+    case detail::type::uint_type:        return vis(value_.uint_value);
+    case detail::type::long_long_type:   return vis(value_.long_long_value);
+    case detail::type::ulong_long_type:  return vis(value_.ulong_long_value);
+    case detail::type::int128_type:      return vis(map(value_.int128_value));
+    case detail::type::uint128_type:     return vis(map(value_.uint128_value));
+    case detail::type::bool_type:        return vis(value_.bool_value);
+    case detail::type::char_type:        return vis(value_.char_value);
+    case detail::type::float_type:       return vis(value_.float_value);
+    case detail::type::double_type:      return vis(value_.double_value);
+    case detail::type::long_double_type: return vis(value_.long_double_value);
+    case detail::type::cstring_type:     return vis(value_.string.data);
+    case detail::type::string_type:      return vis(value_.string.str());
+    case detail::type::pointer_type:     return vis(value_.pointer);
+    case detail::type::custom_type:      return vis(handle(value_.custom));
     }
-    Handler& handler_;
-  } write = {handler};
-  while (begin != end) {
-    // Doing two passes with memchr (one for '{' and another for '}') is up to
-    // 2.5x faster than the naive one-pass implementation on big format strings.
-    const Char* p = begin;
-    if (*begin != '{' && !find<IS_CONSTEXPR>(begin + 1, end, Char('{'), p))
-      return write(begin, end);
-    write(begin, p);
-    begin = parse_replacement_field(p, end, handler);
+    return vis(monostate());
   }
-}
 
-template <typename T, bool = is_named_arg<T>::value> struct strip_named_arg {
-  using type = T;
-};
-template <typename T> struct strip_named_arg<T, true> {
-  using type = remove_cvref_t<decltype(T::value)>;
+  auto format_custom(const char_type* parse_begin,
+                     parse_context<char_type>& parse_ctx, Context& ctx)
+      -> bool {
+    if (type_ != detail::type::custom_type) return false;
+    parse_ctx.advance_to(parse_begin);
+    value_.custom.format(value_.custom.value, parse_ctx, ctx);
+    return true;
+  }
 };
 
-template <typename T, typename ParseContext>
-FMT_VISIBILITY("hidden")  // Suppress an ld warning on macOS (#3769).
-FMT_CONSTEXPR auto parse_format_specs(ParseContext& ctx)
-    -> decltype(ctx.begin()) {
-  using char_type = typename ParseContext::char_type;
-  using context = buffered_context<char_type>;
-  using mapped_type = conditional_t<
-      mapped_type_constant<T, context>::value != type::custom_type,
-      decltype(arg_mapper<context>().map(std::declval<const T&>())),
-      typename strip_named_arg<T>::type>;
-#if defined(__cpp_if_constexpr)
-  if constexpr (std::is_default_constructible<
-                    formatter<mapped_type, char_type>>::value) {
-    return formatter<mapped_type, char_type>().parse(ctx);
-  } else {
-    type_is_unformattable_for<T, char_type> _;
-    return ctx.begin();
-  }
-#else
-  return formatter<mapped_type, char_type>().parse(ctx);
-#endif
-}
+/**
+ * A view of a collection of formatting arguments. To avoid lifetime issues it
+ * should only be used as a parameter type in type-erased functions such as
+ * `vformat`:
+ *
+ *     void vlog(fmt::string_view fmt, fmt::format_args args);  // OK
+ *     fmt::format_args args = fmt::make_format_args();  // Dangling reference
+ */
+template <typename Context> class basic_format_args {
+ private:
+  // A descriptor that contains information about formatting arguments.
+  // If the number of arguments is less or equal to max_packed_args then
+  // argument types are passed in the descriptor. This reduces binary code size
+  // per formatting function call.
+  unsigned long long desc_;
+  union {
+    // If is_packed() returns true then argument values are stored in values_;
+    // otherwise they are stored in args_. This is done to improve cache
+    // locality and reduce compiled code size since storing larger objects
+    // may require more code (at least on x86-64) even if the same amount of
+    // data is actually copied to stack. It saves ~10% on the bloat test.
+    const detail::value<Context>* values_;
+    const basic_format_arg<Context>* args_;
+  };
 
-// Checks char specs and returns true iff the presentation type is char-like.
-FMT_CONSTEXPR inline auto check_char_specs(const format_specs& specs) -> bool {
-  if (specs.type != presentation_type::none &&
-      specs.type != presentation_type::chr &&
-      specs.type != presentation_type::debug) {
-    return false;
+  constexpr auto is_packed() const -> bool {
+    return (desc_ & detail::is_unpacked_bit) == 0;
+  }
+  constexpr auto has_named_args() const -> bool {
+    return (desc_ & detail::has_named_args_bit) != 0;
   }
-  if (specs.align == align::numeric || specs.sign != sign::none || specs.alt)
-    report_error("invalid format specifier for char");
-  return true;
-}
 
-#if FMT_USE_NONTYPE_TEMPLATE_ARGS
-template <int N, typename T, typename... Args, typename Char>
-constexpr auto get_arg_index_by_name(basic_string_view<Char> name) -> int {
-  if constexpr (is_statically_named_arg<T>()) {
-    if (name == T::name) return N;
+  FMT_CONSTEXPR auto type(int index) const -> detail::type {
+    int shift = index * detail::packed_arg_bits;
+    unsigned mask = (1 << detail::packed_arg_bits) - 1;
+    return static_cast<detail::type>((desc_ >> shift) & mask);
   }
-  if constexpr (sizeof...(Args) > 0)
-    return get_arg_index_by_name<N + 1, Args...>(name);
-  (void)name;  // Workaround an MSVC bug about "unused" parameter.
-  return -1;
-}
-#endif
 
-template <typename... Args, typename Char>
-FMT_CONSTEXPR auto get_arg_index_by_name(basic_string_view<Char> name) -> int {
-#if FMT_USE_NONTYPE_TEMPLATE_ARGS
-  if constexpr (sizeof...(Args) > 0)
-    return get_arg_index_by_name<0, Args...>(name);
-#endif
-  (void)name;
-  return -1;
-}
+  template <int NUM_ARGS, int NUM_NAMED_ARGS, unsigned long long DESC>
+  using store =
+      detail::format_arg_store<Context, NUM_ARGS, NUM_NAMED_ARGS, DESC>;
 
-template <typename Char, typename... Args> class format_string_checker {
- private:
-  using parse_context_type = compile_parse_context<Char>;
-  static constexpr int num_args = sizeof...(Args);
+ public:
+  using format_arg = basic_format_arg<Context>;
 
-  // Format specifier parsing function.
-  // In the future basic_format_parse_context will replace compile_parse_context
-  // here and will use is_constant_evaluated and downcasting to access the data
-  // needed for compile-time checks: https://godbolt.org/z/GvWzcTjh1.
-  using parse_func = const Char* (*)(parse_context_type&);
+  constexpr basic_format_args() : desc_(0), args_(nullptr) {}
 
-  type types_[num_args > 0 ? static_cast<size_t>(num_args) : 1];
-  parse_context_type context_;
-  parse_func parse_funcs_[num_args > 0 ? static_cast<size_t>(num_args) : 1];
+  /// Constructs a `basic_format_args` object from `format_arg_store`.
+  template <int NUM_ARGS, int NUM_NAMED_ARGS, unsigned long long DESC,
+            FMT_ENABLE_IF(NUM_ARGS <= detail::max_packed_args)>
+  constexpr FMT_ALWAYS_INLINE basic_format_args(
+      const store<NUM_ARGS, NUM_NAMED_ARGS, DESC>& s)
+      : desc_(DESC | (NUM_NAMED_ARGS != 0 ? +detail::has_named_args_bit : 0)),
+        values_(s.args) {}
 
- public:
-  explicit FMT_CONSTEXPR format_string_checker(basic_string_view<Char> fmt)
-      : types_{mapped_type_constant<Args, buffered_context<Char>>::value...},
-        context_(fmt, num_args, types_),
-        parse_funcs_{&parse_format_specs<Args, parse_context_type>...} {}
+  template <int NUM_ARGS, int NUM_NAMED_ARGS, unsigned long long DESC,
+            FMT_ENABLE_IF(NUM_ARGS > detail::max_packed_args)>
+  constexpr basic_format_args(const store<NUM_ARGS, NUM_NAMED_ARGS, DESC>& s)
+      : desc_(DESC | (NUM_NAMED_ARGS != 0 ? +detail::has_named_args_bit : 0)),
+        args_(s.args) {}
 
-  FMT_CONSTEXPR void on_text(const Char*, const Char*) {}
+  /// Constructs a `basic_format_args` object from a dynamic list of arguments.
+  constexpr basic_format_args(const format_arg* args, int count,
+                              bool has_named = false)
+      : desc_(detail::is_unpacked_bit | detail::to_unsigned(count) |
+              (has_named ? +detail::has_named_args_bit : 0)),
+        args_(args) {}
 
-  FMT_CONSTEXPR auto on_arg_id() -> int { return context_.next_arg_id(); }
-  FMT_CONSTEXPR auto on_arg_id(int id) -> int {
-    return context_.check_arg_id(id), id;
-  }
-  FMT_CONSTEXPR auto on_arg_id(basic_string_view<Char> id) -> int {
-#if FMT_USE_NONTYPE_TEMPLATE_ARGS
-    auto index = get_arg_index_by_name<Args...>(id);
-    if (index < 0) on_error("named argument is not found");
-    return index;
-#else
-    (void)id;
-    on_error("compile-time checks for named arguments require C++20 support");
-    return 0;
-#endif
+  /// Returns the argument with the specified id.
+  FMT_CONSTEXPR auto get(int id) const -> format_arg {
+    auto arg = format_arg();
+    if (!is_packed()) {
+      if (id < max_size()) arg = args_[id];
+      return arg;
+    }
+    if (static_cast<unsigned>(id) >= detail::max_packed_args) return arg;
+    arg.type_ = type(id);
+    if (arg.type_ != detail::type::none_type) arg.value_ = values_[id];
+    return arg;
   }
 
-  FMT_CONSTEXPR void on_replacement_field(int id, const Char* begin) {
-    on_format_specs(id, begin, begin);  // Call parse() on empty specs.
+  template <typename Char>
+  auto get(basic_string_view<Char> name) const -> format_arg {
+    int id = get_id(name);
+    return id >= 0 ? get(id) : format_arg();
   }
 
-  FMT_CONSTEXPR auto on_format_specs(int id, const Char* begin, const Char*)
-      -> const Char* {
-    context_.advance_to(begin);
-    // id >= 0 check is a workaround for gcc 10 bug (#2065).
-    return id >= 0 && id < num_args ? parse_funcs_[id](context_) : begin;
+  template <typename Char>
+  FMT_CONSTEXPR auto get_id(basic_string_view<Char> name) const -> int {
+    if (!has_named_args()) return -1;
+    const auto& named_args =
+        (is_packed() ? values_[-1] : args_[-1].value_).named_args;
+    for (size_t i = 0; i < named_args.size; ++i) {
+      if (named_args.data[i].name == name) return named_args.data[i].id;
+    }
+    return -1;
   }
 
-  FMT_NORETURN FMT_CONSTEXPR void on_error(const char* message) {
-    report_error(message);
+  auto max_size() const -> int {
+    unsigned long long max_packed = detail::max_packed_args;
+    return static_cast<int>(is_packed() ? max_packed
+                                        : desc_ & ~detail::is_unpacked_bit);
   }
 };
 
-// A base class for compile-time strings.
-struct compile_string {};
+// A formatting context.
+class context {
+ private:
+  appender out_;
+  format_args args_;
+  FMT_NO_UNIQUE_ADDRESS detail::locale_ref loc_;
 
-template <typename S>
-using is_compile_string = std::is_base_of<compile_string, S>;
+ public:
+  /// The character type for the output.
+  using char_type = char;
 
-// Reports a compile-time error if S is not a valid format string.
-template <typename..., typename S, FMT_ENABLE_IF(!is_compile_string<S>::value)>
-FMT_ALWAYS_INLINE void check_format_string(const S&) {
-#ifdef FMT_ENFORCE_COMPILE_STRING
-  static_assert(is_compile_string<S>::value,
-                "FMT_ENFORCE_COMPILE_STRING requires all format strings to use "
-                "FMT_STRING.");
-#endif
-}
-template <typename... Args, typename S,
-          FMT_ENABLE_IF(is_compile_string<S>::value)>
-void check_format_string(S format_str) {
-  using char_t = typename S::char_type;
-  FMT_CONSTEXPR auto s = basic_string_view<char_t>(format_str);
-  using checker = format_string_checker<char_t, remove_cvref_t<Args>...>;
-  FMT_CONSTEXPR bool error = (parse_format_string<true>(s, checker(s)), true);
-  ignore_unused(error);
-}
+  using iterator = appender;
+  using format_arg = basic_format_arg<context>;
+  using parse_context_type FMT_DEPRECATED = parse_context<>;
+  template <typename T> using formatter_type FMT_DEPRECATED = formatter<T>;
+  enum { builtin_types = FMT_BUILTIN_TYPES };
 
-// Report truncation to prevent silent data loss.
-inline void report_truncation(bool truncated) {
-  if (truncated) report_error("output is truncated");
-}
+  /// Constructs a `context` object. References to the arguments are stored
+  /// in the object so make sure they have appropriate lifetimes.
+  FMT_CONSTEXPR context(iterator out, format_args args,
+                        detail::locale_ref loc = {})
+      : out_(out), args_(args), loc_(loc) {}
+  context(context&&) = default;
+  context(const context&) = delete;
+  void operator=(const context&) = delete;
 
-// Use vformat_args and avoid type_identity to keep symbols short and workaround
-// a GCC <= 4.8 bug.
-template <typename Char = char> struct vformat_args {
-  using type = basic_format_args<buffered_context<Char>>;
-};
-template <> struct vformat_args<char> {
-  using type = format_args;
+  FMT_CONSTEXPR auto arg(int id) const -> format_arg { return args_.get(id); }
+  inline auto arg(string_view name) const -> format_arg {
+    return args_.get(name);
+  }
+  FMT_CONSTEXPR auto arg_id(string_view name) const -> int {
+    return args_.get_id(name);
+  }
+
+  // Returns an iterator to the beginning of the output range.
+  FMT_CONSTEXPR auto out() const -> iterator { return out_; }
+
+  // Advances the begin iterator to `it`.
+  FMT_CONSTEXPR void advance_to(iterator) {}
+
+  FMT_CONSTEXPR auto locale() const -> detail::locale_ref { return loc_; }
 };
 
-template <typename Char>
-void vformat_to(buffer<Char>& buf, basic_string_view<Char> fmt,
-                typename vformat_args<Char>::type args, locale_ref loc = {});
+template <typename Char = char> struct runtime_format_string {
+  basic_string_view<Char> str;
+};
 
-FMT_API void vprint_mojibake(FILE*, string_view, format_args, bool = false);
-#ifndef _WIN32
-inline void vprint_mojibake(FILE*, string_view, format_args, bool) {}
-#endif
+/**
+ * Creates a runtime format string.
+ *
+ * **Example**:
+ *
+ *     // Check format string at runtime instead of compile-time.
+ *     fmt::print(fmt::runtime("{:d}"), "I am not a number");
+ */
+inline auto runtime(string_view s) -> runtime_format_string<> { return {{s}}; }
 
-template <typename T, typename Char, type TYPE> struct native_formatter {
+/// A compile-time format string. Use `format_string` in the public API to
+/// prevent type deduction.
+template <typename... T> struct fstring {
  private:
-  dynamic_format_specs<Char> specs_;
+  static constexpr int num_static_named_args =
+      detail::count_static_named_args<T...>();
 
- public:
-  using nonlocking = void;
+  using checker = detail::format_string_checker<
+      char, static_cast<int>(sizeof...(T)), num_static_named_args,
+      num_static_named_args != detail::count_named_args<T...>()>;
 
-  template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> const Char* {
-    if (ctx.begin() == ctx.end() || *ctx.begin() == '}') return ctx.begin();
-    auto end = parse_format_specs(ctx.begin(), ctx.end(), specs_, ctx, TYPE);
-    if (const_check(TYPE == type::char_type)) check_char_specs(specs_);
-    return end;
-  }
+  using arg_pack = detail::arg_pack<T...>;
 
-  template <type U = TYPE,
-            FMT_ENABLE_IF(U == type::string_type || U == type::cstring_type ||
-                          U == type::char_type)>
-  FMT_CONSTEXPR void set_debug_format(bool set = true) {
-    specs_.type = set ? presentation_type::debug : presentation_type::none;
+ public:
+  string_view str;
+  using t = fstring;
+
+  // Reports a compile-time error if S is not a valid format string for T.
+  template <size_t N>
+  FMT_CONSTEVAL FMT_ALWAYS_INLINE fstring(const char (&s)[N]) : str(s, N - 1) {
+    using namespace detail;
+    static_assert(count<(std::is_base_of<view, remove_reference_t<T>>::value &&
+                         std::is_reference<T>::value)...>() == 0,
+                  "passing views as lvalues is disallowed");
+    if (FMT_USE_CONSTEVAL) parse_format_string<char>(s, checker(s, arg_pack()));
+#ifdef FMT_ENFORCE_COMPILE_STRING
+    static_assert(
+        FMT_USE_CONSTEVAL && sizeof(s) != 0,
+        "FMT_ENFORCE_COMPILE_STRING requires format strings to use FMT_STRING");
+#endif
   }
-
-  template <typename FormatContext>
-  FMT_CONSTEXPR auto format(const T& val, FormatContext& ctx) const
-      -> decltype(ctx.out());
+  template <typename S,
+            FMT_ENABLE_IF(std::is_convertible<const S&, string_view>::value)>
+  FMT_CONSTEVAL FMT_ALWAYS_INLINE fstring(const S& s) : str(s) {
+    auto sv = string_view(str);
+    if (FMT_USE_CONSTEVAL)
+      detail::parse_format_string<char>(sv, checker(sv, arg_pack()));
+#ifdef FMT_ENFORCE_COMPILE_STRING
+    static_assert(
+        FMT_USE_CONSTEVAL && sizeof(s) != 0,
+        "FMT_ENFORCE_COMPILE_STRING requires format strings to use FMT_STRING");
+#endif
+  }
+  template <typename S,
+            FMT_ENABLE_IF(std::is_base_of<detail::compile_string, S>::value&&
+                              std::is_same<typename S::char_type, char>::value)>
+  FMT_ALWAYS_INLINE fstring(const S&) : str(S()) {
+    FMT_CONSTEXPR auto sv = string_view(S());
+    FMT_CONSTEXPR int ignore =
+        (parse_format_string(sv, checker(sv, arg_pack())), 0);
+    detail::ignore_unused(ignore);
+  }
+  fstring(runtime_format_string<> fmt) : str(fmt.str) {}
+
+  // Returning by reference generates better code in debug mode.
+  FMT_ALWAYS_INLINE operator const string_view&() const { return str; }
+  auto get() const -> string_view { return str; }
 };
-}  // namespace detail
 
-FMT_BEGIN_EXPORT
+template <typename... T> using format_string = typename fstring<T...>::t;
+
+template <typename T, typename Char = char>
+using is_formattable = bool_constant<!std::is_same<
+    detail::mapped_t<conditional_t<std::is_void<T>::value, int*, T>, Char>,
+    void>::value>;
+#ifdef __cpp_concepts
+template <typename T, typename Char = char>
+concept formattable = is_formattable<remove_reference_t<T>, Char>::value;
+#endif
+
+template <typename T, typename Char>
+using has_formatter FMT_DEPRECATED = std::is_constructible<formatter<T, Char>>;
 
 // A formatter specialization for natively supported types.
 template <typename T, typename Char>
@@ -2854,62 +2759,42 @@ struct formatter<T, Char,
     : detail::native_formatter<T, Char, detail::type_constant<T, Char>::value> {
 };
 
-template <typename Char = char> struct runtime_format_string {
-  basic_string_view<Char> str;
-};
-
-/// A compile-time format string.
-template <typename Char, typename... Args> class basic_format_string {
- private:
-  basic_string_view<Char> str_;
-
- public:
-  template <
-      typename S,
-      FMT_ENABLE_IF(
-          std::is_convertible<const S&, basic_string_view<Char>>::value ||
-          (detail::is_compile_string<S>::value &&
-           std::is_constructible<basic_string_view<Char>, const S&>::value))>
-  FMT_CONSTEVAL FMT_ALWAYS_INLINE basic_format_string(const S& s) : str_(s) {
-    static_assert(
-        detail::count<
-            (std::is_base_of<detail::view, remove_reference_t<Args>>::value &&
-             std::is_reference<Args>::value)...>() == 0,
-        "passing views as lvalues is disallowed");
-#if FMT_USE_CONSTEVAL
-    if constexpr (detail::count_named_args<Args...>() ==
-                  detail::count_statically_named_args<Args...>()) {
-      using checker =
-          detail::format_string_checker<Char, remove_cvref_t<Args>...>;
-      detail::parse_format_string<true>(str_, checker(s));
-    }
-#else
-    detail::check_format_string<Args...>(s);
-#endif
-  }
-  basic_format_string(runtime_format_string<Char> fmt) : str_(fmt.str) {}
+/**
+ * Constructs an object that stores references to arguments and can be
+ * implicitly converted to `format_args`. `Context` can be omitted in which case
+ * it defaults to `context`. See `arg` for lifetime considerations.
+ */
+// Take arguments by lvalue references to avoid some lifetime issues, e.g.
+//   auto args = make_format_args(std::string());
+template <typename Context = context, typename... T,
+          int NUM_ARGS = sizeof...(T),
+          int NUM_NAMED_ARGS = detail::count_named_args<T...>(),
+          unsigned long long DESC = detail::make_descriptor<Context, T...>()>
+constexpr FMT_ALWAYS_INLINE auto make_format_args(T&... args)
+    -> detail::format_arg_store<Context, NUM_ARGS, NUM_NAMED_ARGS, DESC> {
+  // Suppress warnings for pathological types convertible to detail::value.
+  FMT_PRAGMA_GCC(diagnostic ignored "-Wconversion")
+  return {{args...}};
+}
 
-  FMT_ALWAYS_INLINE operator basic_string_view<Char>() const { return str_; }
-  auto get() const -> basic_string_view<Char> { return str_; }
-};
+template <typename... T>
+using vargs =
+    detail::format_arg_store<context, sizeof...(T),
+                             detail::count_named_args<T...>(),
+                             detail::make_descriptor<context, T...>()>;
 
-#if FMT_GCC_VERSION && FMT_GCC_VERSION < 409
-// Workaround broken conversion on older gcc.
-template <typename...> using format_string = string_view;
-inline auto runtime(string_view s) -> string_view { return s; }
-#else
-template <typename... Args>
-using format_string = basic_format_string<char, type_identity_t<Args>...>;
 /**
- * Creates a runtime format string.
+ * Returns a named argument to be used in a formatting function.
+ * It should only be used in a call to a formatting function.
  *
  * **Example**:
  *
- *     // Check format string at runtime instead of compile-time.
- *     fmt::print(fmt::runtime("{:d}"), "I am not a number");
+ *     fmt::print("The answer is {answer}.", fmt::arg("answer", 42));
  */
-inline auto runtime(string_view s) -> runtime_format_string<> { return {{s}}; }
-#endif
+template <typename Char, typename T>
+inline auto arg(const Char* name, const T& arg) -> detail::named_arg<Char, T> {
+  return {name, arg};
+}
 
 /// Formats a string and writes the output to `out`.
 template <typename OutputIt,
@@ -2937,7 +2822,7 @@ template <typename OutputIt, typename... T,
                                                    char>::value)>
 FMT_INLINE auto format_to(OutputIt&& out, format_string<T...> fmt, T&&... args)
     -> remove_cvref_t<OutputIt> {
-  return vformat_to(FMT_FWD(out), fmt, fmt::make_format_args(args...));
+  return vformat_to(out, fmt.str, vargs<T...>{{args...}});
 }
 
 template <typename OutputIt> struct format_to_n_result {
@@ -2967,41 +2852,33 @@ template <typename OutputIt, typename... T,
           FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, char>::value)>
 FMT_INLINE auto format_to_n(OutputIt out, size_t n, format_string<T...> fmt,
                             T&&... args) -> format_to_n_result<OutputIt> {
-  return vformat_to_n(out, n, fmt, fmt::make_format_args(args...));
+  return vformat_to_n(out, n, fmt.str, vargs<T...>{{args...}});
 }
 
-template <typename OutputIt, typename Sentinel = OutputIt>
 struct format_to_result {
-  /// Iterator pointing to just after the last successful write in the range.
-  OutputIt out;
+  /// Pointer to just after the last successful write in the array.
+  char* out;
   /// Specifies if the output was truncated.
   bool truncated;
 
-  FMT_CONSTEXPR operator OutputIt&() & {
-    detail::report_truncation(truncated);
-    return out;
-  }
-  FMT_CONSTEXPR operator const OutputIt&() const& {
-    detail::report_truncation(truncated);
+  FMT_CONSTEXPR operator char*() const {
+    // Report truncation to prevent silent data loss.
+    if (truncated) report_error("output is truncated");
     return out;
   }
-  FMT_CONSTEXPR operator OutputIt&&() && {
-    detail::report_truncation(truncated);
-    return static_cast<OutputIt&&>(out);
-  }
 };
 
 template <size_t N>
 auto vformat_to(char (&out)[N], string_view fmt, format_args args)
-    -> format_to_result<char*> {
+    -> format_to_result {
   auto result = vformat_to_n(out, N, fmt, args);
   return {result.out, result.size > N};
 }
 
 template <size_t N, typename... T>
 FMT_INLINE auto format_to(char (&out)[N], format_string<T...> fmt, T&&... args)
-    -> format_to_result<char*> {
-  auto result = fmt::format_to_n(out, N, fmt, static_cast<T&&>(args)...);
+    -> format_to_result {
+  auto result = vformat_to_n(out, N, fmt.str, vargs<T...>{{args...}});
   return {result.out, result.size > N};
 }
 
@@ -3010,14 +2887,14 @@ template <typename... T>
 FMT_NODISCARD FMT_INLINE auto formatted_size(format_string<T...> fmt,
                                              T&&... args) -> size_t {
   auto buf = detail::counting_buffer<>();
-  detail::vformat_to<char>(buf, fmt, fmt::make_format_args(args...), {});
+  detail::vformat_to(buf, fmt.str, vargs<T...>{{args...}}, {});
   return buf.count();
 }
 
 FMT_API void vprint(string_view fmt, format_args args);
 FMT_API void vprint(FILE* f, string_view fmt, format_args args);
-FMT_API void vprint_buffered(FILE* f, string_view fmt, format_args args);
 FMT_API void vprintln(FILE* f, string_view fmt, format_args args);
+FMT_API void vprint_buffered(FILE* f, string_view fmt, format_args args);
 
 /**
  * Formats `args` according to specifications in `fmt` and writes the output
@@ -3029,10 +2906,11 @@ FMT_API void vprintln(FILE* f, string_view fmt, format_args args);
  */
 template <typename... T>
 FMT_INLINE void print(format_string<T...> fmt, T&&... args) {
-  const auto& vargs = fmt::make_format_args(args...);
-  if (!detail::use_utf8()) return detail::vprint_mojibake(stdout, fmt, vargs);
-  return detail::is_locking<T...>() ? vprint_buffered(stdout, fmt, vargs)
-                                    : vprint(fmt, vargs);
+  vargs<T...> va = {{args...}};
+  if (detail::const_check(!detail::use_utf8))
+    return detail::vprint_mojibake(stdout, fmt.str, va, false);
+  return detail::is_locking<T...>() ? vprint_buffered(stdout, fmt.str, va)
+                                    : vprint(fmt.str, va);
 }
 
 /**
@@ -3045,19 +2923,21 @@ FMT_INLINE void print(format_string<T...> fmt, T&&... args) {
  */
 template <typename... T>
 FMT_INLINE void print(FILE* f, format_string<T...> fmt, T&&... args) {
-  const auto& vargs = fmt::make_format_args(args...);
-  if (!detail::use_utf8()) return detail::vprint_mojibake(f, fmt, vargs);
-  return detail::is_locking<T...>() ? vprint_buffered(f, fmt, vargs)
-                                    : vprint(f, fmt, vargs);
+  vargs<T...> va = {{args...}};
+  if (detail::const_check(!detail::use_utf8))
+    return detail::vprint_mojibake(f, fmt.str, va, false);
+  return detail::is_locking<T...>() ? vprint_buffered(f, fmt.str, va)
+                                    : vprint(f, fmt.str, va);
 }
 
 /// Formats `args` according to specifications in `fmt` and writes the output
 /// to the file `f` followed by a newline.
 template <typename... T>
 FMT_INLINE void println(FILE* f, format_string<T...> fmt, T&&... args) {
-  const auto& vargs = fmt::make_format_args(args...);
-  return detail::use_utf8() ? vprintln(f, fmt, vargs)
-                            : detail::vprint_mojibake(f, fmt, vargs, true);
+  vargs<T...> va = {{args...}};
+  return detail::const_check(detail::use_utf8)
+             ? vprintln(f, fmt.str, va)
+             : detail::vprint_mojibake(f, fmt.str, va, true);
 }
 
 /// Formats `args` according to specifications in `fmt` and writes the output
@@ -3068,7 +2948,8 @@ FMT_INLINE void println(format_string<T...> fmt, T&&... args) {
 }
 
 FMT_END_EXPORT
-FMT_GCC_PRAGMA("GCC pop_options")
+FMT_PRAGMA_CLANG(diagnostic pop)
+FMT_PRAGMA_GCC(pop_options)
 FMT_END_NAMESPACE
 
 #ifdef FMT_HEADER_ONLY
diff --git a/contrib/fmt/include/fmt/chrono.h b/contrib/fmt/include/fmt/chrono.h
index c93123fd3..50c777c84 100644
--- a/contrib/fmt/include/fmt/chrono.h
+++ b/contrib/fmt/include/fmt/chrono.h
@@ -22,39 +22,22 @@
 
 #include "format.h"
 
-FMT_BEGIN_NAMESPACE
-
-// Check if std::chrono::local_t is available.
-#ifndef FMT_USE_LOCAL_TIME
-#  ifdef __cpp_lib_chrono
-#    define FMT_USE_LOCAL_TIME (__cpp_lib_chrono >= 201907L)
-#  else
-#    define FMT_USE_LOCAL_TIME 0
-#  endif
-#endif
+namespace fmt_detail {
+struct time_zone {
+  template <typename Duration, typename T>
+  auto to_sys(T)
+      -> std::chrono::time_point<std::chrono::system_clock, Duration> {
+    return {};
+  }
+};
+template <typename... T> inline auto current_zone(T...) -> time_zone* {
+  return nullptr;
+}
 
-// Check if std::chrono::utc_timestamp is available.
-#ifndef FMT_USE_UTC_TIME
-#  ifdef __cpp_lib_chrono
-#    define FMT_USE_UTC_TIME (__cpp_lib_chrono >= 201907L)
-#  else
-#    define FMT_USE_UTC_TIME 0
-#  endif
-#endif
+template <typename... T> inline void _tzset(T...) {}
+}  // namespace fmt_detail
 
-// Enable tzset.
-#ifndef FMT_USE_TZSET
-// UWP doesn't provide _tzset.
-#  if FMT_HAS_INCLUDE("winapifamily.h")
-#    include <winapifamily.h>
-#  endif
-#  if defined(_WIN32) && (!defined(WINAPI_FAMILY) || \
-                          (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP))
-#    define FMT_USE_TZSET 1
-#  else
-#    define FMT_USE_TZSET 0
-#  endif
-#endif
+FMT_BEGIN_NAMESPACE
 
 // Enable safe chrono durations, unless explicitly disabled.
 #ifndef FMT_SAFE_DURATION_CAST
@@ -185,56 +168,6 @@ FMT_CONSTEXPR auto safe_float_conversion(const From from, int& ec) -> To {
   return from;
 }
 
-/// Safe duration cast between integral durations
-template <typename To, typename FromRep, typename FromPeriod,
-          FMT_ENABLE_IF(std::is_integral<FromRep>::value),
-          FMT_ENABLE_IF(std::is_integral<typename To::rep>::value)>
-auto safe_duration_cast(std::chrono::duration<FromRep, FromPeriod> from,
-                        int& ec) -> To {
-  using From = std::chrono::duration<FromRep, FromPeriod>;
-  ec = 0;
-  // the basic idea is that we need to convert from count() in the from type
-  // to count() in the To type, by multiplying it with this:
-  struct Factor
-      : std::ratio_divide<typename From::period, typename To::period> {};
-
-  static_assert(Factor::num > 0, "num must be positive");
-  static_assert(Factor::den > 0, "den must be positive");
-
-  // the conversion is like this: multiply from.count() with Factor::num
-  // /Factor::den and convert it to To::rep, all this without
-  // overflow/underflow. let's start by finding a suitable type that can hold
-  // both To, From and Factor::num
-  using IntermediateRep =
-      typename std::common_type<typename From::rep, typename To::rep,
-                                decltype(Factor::num)>::type;
-
-  // safe conversion to IntermediateRep
-  IntermediateRep count =
-      lossless_integral_conversion<IntermediateRep>(from.count(), ec);
-  if (ec) return {};
-  // multiply with Factor::num without overflow or underflow
-  if (detail::const_check(Factor::num != 1)) {
-    const auto max1 = detail::max_value<IntermediateRep>() / Factor::num;
-    if (count > max1) {
-      ec = 1;
-      return {};
-    }
-    const auto min1 =
-        (std::numeric_limits<IntermediateRep>::min)() / Factor::num;
-    if (detail::const_check(!std::is_unsigned<IntermediateRep>::value) &&
-        count < min1) {
-      ec = 1;
-      return {};
-    }
-    count *= Factor::num;
-  }
-
-  if (detail::const_check(Factor::den != 1)) count /= Factor::den;
-  auto tocount = lossless_integral_conversion<typename To::rep>(count, ec);
-  return ec ? To() : To(tocount);
-}
-
 /// Safe duration_cast between floating point durations
 template <typename To, typename FromRep, typename FromPeriod,
           FMT_ENABLE_IF(std::is_floating_point<FromRep>::value),
@@ -314,11 +247,55 @@ auto safe_duration_cast(std::chrono::duration<FromRep, FromPeriod> from,
 }  // namespace safe_duration_cast
 #endif
 
+namespace detail {
+
+// Check if std::chrono::utc_time is available.
+#ifdef FMT_USE_UTC_TIME
+// Use the provided definition.
+#elif defined(__cpp_lib_chrono)
+#  define FMT_USE_UTC_TIME (__cpp_lib_chrono >= 201907L)
+#else
+#  define FMT_USE_UTC_TIME 0
+#endif
+#if FMT_USE_UTC_TIME
+using utc_clock = std::chrono::utc_clock;
+#else
+struct utc_clock {
+  template <typename T> void to_sys(T);
+};
+#endif
+
+// Check if std::chrono::local_time is available.
+#ifdef FMT_USE_LOCAL_TIME
+// Use the provided definition.
+#elif defined(__cpp_lib_chrono)
+#  define FMT_USE_LOCAL_TIME (__cpp_lib_chrono >= 201907L)
+#else
+#  define FMT_USE_LOCAL_TIME 0
+#endif
+#if FMT_USE_LOCAL_TIME
+using local_t = std::chrono::local_t;
+#else
+struct local_t {};
+#endif
+
+}  // namespace detail
+
+template <typename Duration>
+using sys_time = std::chrono::time_point<std::chrono::system_clock, Duration>;
+
+template <typename Duration>
+using utc_time = std::chrono::time_point<detail::utc_clock, Duration>;
+
+template <class Duration>
+using local_time = std::chrono::time_point<detail::local_t, Duration>;
+
+namespace detail {
+
 // Prevents expansion of a preceding token as a function-style macro.
 // Usage: f FMT_NOMACRO()
 #define FMT_NOMACRO
 
-namespace detail {
 template <typename T = void> struct null {};
 inline auto localtime_r FMT_NOMACRO(...) -> null<> { return null<>(); }
 inline auto localtime_s(...) -> null<> { return null<>(); }
@@ -327,12 +304,12 @@ inline auto gmtime_s(...) -> null<> { return null<>(); }
 
 // It is defined here and not in ostream.h because the latter has expensive
 // includes.
-template <typename Streambuf> class formatbuf : public Streambuf {
+template <typename StreamBuf> class formatbuf : public StreamBuf {
  private:
-  using char_type = typename Streambuf::char_type;
-  using streamsize = decltype(std::declval<Streambuf>().sputn(nullptr, 0));
-  using int_type = typename Streambuf::int_type;
-  using traits_type = typename Streambuf::traits_type;
+  using char_type = typename StreamBuf::char_type;
+  using streamsize = decltype(std::declval<StreamBuf>().sputn(nullptr, 0));
+  using int_type = typename StreamBuf::int_type;
+  using traits_type = typename StreamBuf::traits_type;
 
   buffer<char_type>& buffer_;
 
@@ -370,20 +347,16 @@ template <typename CodeUnit> struct codecvt_result {
 };
 
 template <typename CodeUnit>
-void write_codecvt(codecvt_result<CodeUnit>& out, string_view in_buf,
+void write_codecvt(codecvt_result<CodeUnit>& out, string_view in,
                    const std::locale& loc) {
-#if FMT_CLANG_VERSION
-#  pragma clang diagnostic push
-#  pragma clang diagnostic ignored "-Wdeprecated"
-  auto& f = std::use_facet<std::codecvt<CodeUnit, char, std::mbstate_t>>(loc);
-#  pragma clang diagnostic pop
-#else
+  FMT_PRAGMA_CLANG(diagnostic push)
+  FMT_PRAGMA_CLANG(diagnostic ignored "-Wdeprecated")
   auto& f = std::use_facet<std::codecvt<CodeUnit, char, std::mbstate_t>>(loc);
-#endif
+  FMT_PRAGMA_CLANG(diagnostic pop)
   auto mb = std::mbstate_t();
   const char* from_next = nullptr;
-  auto result = f.in(mb, in_buf.begin(), in_buf.end(), from_next,
-                     std::begin(out.buf), std::end(out.buf), out.end);
+  auto result = f.in(mb, in.begin(), in.end(), from_next, std::begin(out.buf),
+                     std::end(out.buf), out.end);
   if (result != std::codecvt_base::ok)
     FMT_THROW(format_error("failed to format time"));
 }
@@ -391,7 +364,7 @@ void write_codecvt(codecvt_result<CodeUnit>& out, string_view in_buf,
 template <typename OutputIt>
 auto write_encoded_tm_str(OutputIt out, string_view in, const std::locale& loc)
     -> OutputIt {
-  if (detail::use_utf8() && loc != get_classic_locale()) {
+  if (const_check(detail::use_utf8) && loc != get_classic_locale()) {
     // char16_t and char32_t codecvts are broken in MSVC (linkage errors) and
     // gcc-4.
 #if FMT_MSC_VERSION != 0 ||  \
@@ -471,16 +444,56 @@ struct is_same_arithmetic_type
                                          std::is_floating_point<Rep2>::value)> {
 };
 
-template <
-    typename To, typename FromRep, typename FromPeriod,
-    FMT_ENABLE_IF(is_same_arithmetic_type<FromRep, typename To::rep>::value)>
-auto fmt_duration_cast(std::chrono::duration<FromRep, FromPeriod> from) -> To {
+FMT_NORETURN inline void throw_duration_error() {
+  FMT_THROW(format_error("cannot format duration"));
+}
+
+// Cast one integral duration to another with an overflow check.
+template <typename To, typename FromRep, typename FromPeriod,
+          FMT_ENABLE_IF(std::is_integral<FromRep>::value&&
+                            std::is_integral<typename To::rep>::value)>
+auto duration_cast(std::chrono::duration<FromRep, FromPeriod> from) -> To {
+#if !FMT_SAFE_DURATION_CAST
+  return std::chrono::duration_cast<To>(from);
+#else
+  // The conversion factor: to.count() == factor * from.count().
+  using factor = std::ratio_divide<FromPeriod, typename To::period>;
+
+  using common_rep = typename std::common_type<FromRep, typename To::rep,
+                                               decltype(factor::num)>::type;
+
+  int ec = 0;
+  auto count = safe_duration_cast::lossless_integral_conversion<common_rep>(
+      from.count(), ec);
+  if (ec) throw_duration_error();
+
+  // Multiply from.count() by factor and check for overflow.
+  if (const_check(factor::num != 1)) {
+    if (count > max_value<common_rep>() / factor::num) throw_duration_error();
+    const auto min = (std::numeric_limits<common_rep>::min)() / factor::num;
+    if (const_check(!std::is_unsigned<common_rep>::value) && count < min)
+      throw_duration_error();
+    count *= factor::num;
+  }
+  if (const_check(factor::den != 1)) count /= factor::den;
+  auto to =
+      To(safe_duration_cast::lossless_integral_conversion<typename To::rep>(
+          count, ec));
+  if (ec) throw_duration_error();
+  return to;
+#endif
+}
+
+template <typename To, typename FromRep, typename FromPeriod,
+          FMT_ENABLE_IF(std::is_floating_point<FromRep>::value&&
+                            std::is_floating_point<typename To::rep>::value)>
+auto duration_cast(std::chrono::duration<FromRep, FromPeriod> from) -> To {
 #if FMT_SAFE_DURATION_CAST
   // Throwing version of safe_duration_cast is only available for
   // integer to integer or float to float casts.
   int ec;
   To to = safe_duration_cast::safe_duration_cast<To>(from, ec);
-  if (ec) FMT_THROW(format_error("cannot format duration"));
+  if (ec) throw_duration_error();
   return to;
 #else
   // Standard duration cast, may overflow.
@@ -491,22 +504,28 @@ auto fmt_duration_cast(std::chrono::duration<FromRep, FromPeriod> from) -> To {
 template <
     typename To, typename FromRep, typename FromPeriod,
     FMT_ENABLE_IF(!is_same_arithmetic_type<FromRep, typename To::rep>::value)>
-auto fmt_duration_cast(std::chrono::duration<FromRep, FromPeriod> from) -> To {
+auto duration_cast(std::chrono::duration<FromRep, FromPeriod> from) -> To {
   // Mixed integer <-> float cast is not supported by safe_duration_cast.
   return std::chrono::duration_cast<To>(from);
 }
 
 template <typename Duration>
-auto to_time_t(
-    std::chrono::time_point<std::chrono::system_clock, Duration> time_point)
-    -> std::time_t {
+auto to_time_t(sys_time<Duration> time_point) -> std::time_t {
   // Cannot use std::chrono::system_clock::to_time_t since this would first
   // require a cast to std::chrono::system_clock::time_point, which could
   // overflow.
-  return fmt_duration_cast<std::chrono::duration<std::time_t>>(
+  return detail::duration_cast<std::chrono::duration<std::time_t>>(
              time_point.time_since_epoch())
       .count();
 }
+
+// Workaround a bug in libstdc++ which sets __cpp_lib_chrono to 201907 without
+// providing current_zone(): https://github.com/fmtlib/fmt/issues/4160.
+template <typename T> FMT_CONSTEXPR auto has_current_zone() -> bool {
+  using namespace std::chrono;
+  using namespace fmt_detail;
+  return !std::is_same<decltype(current_zone()), fmt_detail::time_zone*>::value;
+}
 }  // namespace detail
 
 FMT_BEGIN_EXPORT
@@ -521,24 +540,24 @@ inline auto localtime(std::time_t time) -> std::tm {
     std::time_t time_;
     std::tm tm_;
 
-    dispatcher(std::time_t t) : time_(t) {}
+    inline dispatcher(std::time_t t) : time_(t) {}
 
-    auto run() -> bool {
+    inline auto run() -> bool {
       using namespace fmt::detail;
       return handle(localtime_r(&time_, &tm_));
     }
 
-    auto handle(std::tm* tm) -> bool { return tm != nullptr; }
+    inline auto handle(std::tm* tm) -> bool { return tm != nullptr; }
 
-    auto handle(detail::null<>) -> bool {
+    inline auto handle(detail::null<>) -> bool {
       using namespace fmt::detail;
       return fallback(localtime_s(&tm_, &time_));
     }
 
-    auto fallback(int res) -> bool { return res == 0; }
+    inline auto fallback(int res) -> bool { return res == 0; }
 
 #if !FMT_MSC_VERSION
-    auto fallback(detail::null<>) -> bool {
+    inline auto fallback(detail::null<>) -> bool {
       using namespace fmt::detail;
       std::tm* tm = std::localtime(&time_);
       if (tm) tm_ = *tm;
@@ -553,10 +572,12 @@ inline auto localtime(std::time_t time) -> std::tm {
 }
 
 #if FMT_USE_LOCAL_TIME
-template <typename Duration>
+template <typename Duration,
+          FMT_ENABLE_IF(detail::has_current_zone<Duration>())>
 inline auto localtime(std::chrono::local_time<Duration> time) -> std::tm {
-  return localtime(
-      detail::to_time_t(std::chrono::current_zone()->to_sys(time)));
+  using namespace std::chrono;
+  using namespace fmt_detail;
+  return localtime(detail::to_time_t(current_zone()->to_sys<Duration>(time)));
 }
 #endif
 
@@ -570,24 +591,24 @@ inline auto gmtime(std::time_t time) -> std::tm {
     std::time_t time_;
     std::tm tm_;
 
-    dispatcher(std::time_t t) : time_(t) {}
+    inline dispatcher(std::time_t t) : time_(t) {}
 
-    auto run() -> bool {
+    inline auto run() -> bool {
       using namespace fmt::detail;
       return handle(gmtime_r(&time_, &tm_));
     }
 
-    auto handle(std::tm* tm) -> bool { return tm != nullptr; }
+    inline auto handle(std::tm* tm) -> bool { return tm != nullptr; }
 
-    auto handle(detail::null<>) -> bool {
+    inline auto handle(detail::null<>) -> bool {
       using namespace fmt::detail;
       return fallback(gmtime_s(&tm_, &time_));
     }
 
-    auto fallback(int res) -> bool { return res == 0; }
+    inline auto fallback(int res) -> bool { return res == 0; }
 
 #if !FMT_MSC_VERSION
-    auto fallback(detail::null<>) -> bool {
+    inline auto fallback(detail::null<>) -> bool {
       std::tm* tm = std::gmtime(&time_);
       if (tm) tm_ = *tm;
       return tm != nullptr;
@@ -601,9 +622,7 @@ inline auto gmtime(std::time_t time) -> std::tm {
 }
 
 template <typename Duration>
-inline auto gmtime(
-    std::chrono::time_point<std::chrono::system_clock, Duration> time_point)
-    -> std::tm {
+inline auto gmtime(sys_time<Duration> time_point) -> std::tm {
   return gmtime(detail::to_time_t(time_point));
 }
 
@@ -649,7 +668,8 @@ FMT_CONSTEXPR inline auto get_units() -> const char* {
   if (std::is_same<Period, std::femto>::value) return "fs";
   if (std::is_same<Period, std::pico>::value) return "ps";
   if (std::is_same<Period, std::nano>::value) return "ns";
-  if (std::is_same<Period, std::micro>::value) return "µs";
+  if (std::is_same<Period, std::micro>::value)
+    return detail::use_utf8 ? "µs" : "us";
   if (std::is_same<Period, std::milli>::value) return "ms";
   if (std::is_same<Period, std::centi>::value) return "cs";
   if (std::is_same<Period, std::deci>::value) return "ds";
@@ -728,9 +748,7 @@ FMT_CONSTEXPR auto parse_chrono_format(const Char* begin, const Char* end,
     if (ptr == end) FMT_THROW(format_error("invalid format"));
     c = *ptr++;
     switch (c) {
-    case '%':
-      handler.on_text(ptr - 1, ptr);
-      break;
+    case '%': handler.on_text(ptr - 1, ptr); break;
     case 'n': {
       const Char newline[] = {'\n'};
       handler.on_text(newline, newline + 1);
@@ -742,45 +760,21 @@ FMT_CONSTEXPR auto parse_chrono_format(const Char* begin, const Char* end,
       break;
     }
     // Year:
-    case 'Y':
-      handler.on_year(numeric_system::standard);
-      break;
-    case 'y':
-      handler.on_short_year(numeric_system::standard);
-      break;
-    case 'C':
-      handler.on_century(numeric_system::standard);
-      break;
-    case 'G':
-      handler.on_iso_week_based_year();
-      break;
-    case 'g':
-      handler.on_iso_week_based_short_year();
-      break;
+    case 'Y': handler.on_year(numeric_system::standard, pad); break;
+    case 'y': handler.on_short_year(numeric_system::standard); break;
+    case 'C': handler.on_century(numeric_system::standard); break;
+    case 'G': handler.on_iso_week_based_year(); break;
+    case 'g': handler.on_iso_week_based_short_year(); break;
     // Day of the week:
-    case 'a':
-      handler.on_abbr_weekday();
-      break;
-    case 'A':
-      handler.on_full_weekday();
-      break;
-    case 'w':
-      handler.on_dec0_weekday(numeric_system::standard);
-      break;
-    case 'u':
-      handler.on_dec1_weekday(numeric_system::standard);
-      break;
+    case 'a': handler.on_abbr_weekday(); break;
+    case 'A': handler.on_full_weekday(); break;
+    case 'w': handler.on_dec0_weekday(numeric_system::standard); break;
+    case 'u': handler.on_dec1_weekday(numeric_system::standard); break;
     // Month:
     case 'b':
-    case 'h':
-      handler.on_abbr_month();
-      break;
-    case 'B':
-      handler.on_full_month();
-      break;
-    case 'm':
-      handler.on_dec_month(numeric_system::standard);
-      break;
+    case 'h': handler.on_abbr_month(); break;
+    case 'B': handler.on_full_month(); break;
+    case 'm': handler.on_dec_month(numeric_system::standard, pad); break;
     // Day of the year/month:
     case 'U':
       handler.on_dec0_week_of_year(numeric_system::standard, pad);
@@ -788,99 +782,44 @@ FMT_CONSTEXPR auto parse_chrono_format(const Char* begin, const Char* end,
     case 'W':
       handler.on_dec1_week_of_year(numeric_system::standard, pad);
       break;
-    case 'V':
-      handler.on_iso_week_of_year(numeric_system::standard, pad);
-      break;
-    case 'j':
-      handler.on_day_of_year();
-      break;
-    case 'd':
-      handler.on_day_of_month(numeric_system::standard, pad);
-      break;
+    case 'V': handler.on_iso_week_of_year(numeric_system::standard, pad); break;
+    case 'j': handler.on_day_of_year(pad); break;
+    case 'd': handler.on_day_of_month(numeric_system::standard, pad); break;
     case 'e':
       handler.on_day_of_month(numeric_system::standard, pad_type::space);
       break;
     // Hour, minute, second:
-    case 'H':
-      handler.on_24_hour(numeric_system::standard, pad);
-      break;
-    case 'I':
-      handler.on_12_hour(numeric_system::standard, pad);
-      break;
-    case 'M':
-      handler.on_minute(numeric_system::standard, pad);
-      break;
-    case 'S':
-      handler.on_second(numeric_system::standard, pad);
-      break;
+    case 'H': handler.on_24_hour(numeric_system::standard, pad); break;
+    case 'I': handler.on_12_hour(numeric_system::standard, pad); break;
+    case 'M': handler.on_minute(numeric_system::standard, pad); break;
+    case 'S': handler.on_second(numeric_system::standard, pad); break;
     // Other:
-    case 'c':
-      handler.on_datetime(numeric_system::standard);
-      break;
-    case 'x':
-      handler.on_loc_date(numeric_system::standard);
-      break;
-    case 'X':
-      handler.on_loc_time(numeric_system::standard);
-      break;
-    case 'D':
-      handler.on_us_date();
-      break;
-    case 'F':
-      handler.on_iso_date();
-      break;
-    case 'r':
-      handler.on_12_hour_time();
-      break;
-    case 'R':
-      handler.on_24_hour_time();
-      break;
-    case 'T':
-      handler.on_iso_time();
-      break;
-    case 'p':
-      handler.on_am_pm();
-      break;
-    case 'Q':
-      handler.on_duration_value();
-      break;
-    case 'q':
-      handler.on_duration_unit();
-      break;
-    case 'z':
-      handler.on_utc_offset(numeric_system::standard);
-      break;
-    case 'Z':
-      handler.on_tz_name();
-      break;
+    case 'c': handler.on_datetime(numeric_system::standard); break;
+    case 'x': handler.on_loc_date(numeric_system::standard); break;
+    case 'X': handler.on_loc_time(numeric_system::standard); break;
+    case 'D': handler.on_us_date(); break;
+    case 'F': handler.on_iso_date(); break;
+    case 'r': handler.on_12_hour_time(); break;
+    case 'R': handler.on_24_hour_time(); break;
+    case 'T': handler.on_iso_time(); break;
+    case 'p': handler.on_am_pm(); break;
+    case 'Q': handler.on_duration_value(); break;
+    case 'q': handler.on_duration_unit(); break;
+    case 'z': handler.on_utc_offset(numeric_system::standard); break;
+    case 'Z': handler.on_tz_name(); break;
     // Alternative representation:
     case 'E': {
       if (ptr == end) FMT_THROW(format_error("invalid format"));
       c = *ptr++;
       switch (c) {
-      case 'Y':
-        handler.on_year(numeric_system::alternative);
-        break;
-      case 'y':
-        handler.on_offset_year();
-        break;
-      case 'C':
-        handler.on_century(numeric_system::alternative);
-        break;
-      case 'c':
-        handler.on_datetime(numeric_system::alternative);
-        break;
-      case 'x':
-        handler.on_loc_date(numeric_system::alternative);
-        break;
-      case 'X':
-        handler.on_loc_time(numeric_system::alternative);
-        break;
-      case 'z':
-        handler.on_utc_offset(numeric_system::alternative);
-        break;
-      default:
-        FMT_THROW(format_error("invalid format"));
+      case 'Y': handler.on_year(numeric_system::alternative, pad); break;
+      case 'y': handler.on_offset_year(); break;
+      case 'C': handler.on_century(numeric_system::alternative); break;
+      case 'c': handler.on_datetime(numeric_system::alternative); break;
+      case 'x': handler.on_loc_date(numeric_system::alternative); break;
+      case 'X': handler.on_loc_time(numeric_system::alternative); break;
+      case 'z': handler.on_utc_offset(numeric_system::alternative); break;
+      default:  FMT_THROW(format_error("invalid format"));
       }
       break;
     }
@@ -888,12 +827,8 @@ FMT_CONSTEXPR auto parse_chrono_format(const Char* begin, const Char* end,
       if (ptr == end) FMT_THROW(format_error("invalid format"));
       c = *ptr++;
       switch (c) {
-      case 'y':
-        handler.on_short_year(numeric_system::alternative);
-        break;
-      case 'm':
-        handler.on_dec_month(numeric_system::alternative);
-        break;
+      case 'y': handler.on_short_year(numeric_system::alternative); break;
+      case 'm': handler.on_dec_month(numeric_system::alternative, pad); break;
       case 'U':
         handler.on_dec0_week_of_year(numeric_system::alternative, pad);
         break;
@@ -909,33 +844,17 @@ FMT_CONSTEXPR auto parse_chrono_format(const Char* begin, const Char* end,
       case 'e':
         handler.on_day_of_month(numeric_system::alternative, pad_type::space);
         break;
-      case 'w':
-        handler.on_dec0_weekday(numeric_system::alternative);
-        break;
-      case 'u':
-        handler.on_dec1_weekday(numeric_system::alternative);
-        break;
-      case 'H':
-        handler.on_24_hour(numeric_system::alternative, pad);
-        break;
-      case 'I':
-        handler.on_12_hour(numeric_system::alternative, pad);
-        break;
-      case 'M':
-        handler.on_minute(numeric_system::alternative, pad);
-        break;
-      case 'S':
-        handler.on_second(numeric_system::alternative, pad);
-        break;
-      case 'z':
-        handler.on_utc_offset(numeric_system::alternative);
-        break;
-      default:
-        FMT_THROW(format_error("invalid format"));
+      case 'w': handler.on_dec0_weekday(numeric_system::alternative); break;
+      case 'u': handler.on_dec1_weekday(numeric_system::alternative); break;
+      case 'H': handler.on_24_hour(numeric_system::alternative, pad); break;
+      case 'I': handler.on_12_hour(numeric_system::alternative, pad); break;
+      case 'M': handler.on_minute(numeric_system::alternative, pad); break;
+      case 'S': handler.on_second(numeric_system::alternative, pad); break;
+      case 'z': handler.on_utc_offset(numeric_system::alternative); break;
+      default:  FMT_THROW(format_error("invalid format"));
       }
       break;
-    default:
-      FMT_THROW(format_error("invalid format"));
+    default: FMT_THROW(format_error("invalid format"));
     }
     begin = ptr;
   }
@@ -947,7 +866,7 @@ template <typename Derived> struct null_chrono_spec_handler {
   FMT_CONSTEXPR void unsupported() {
     static_cast<Derived*>(this)->unsupported();
   }
-  FMT_CONSTEXPR void on_year(numeric_system) { unsupported(); }
+  FMT_CONSTEXPR void on_year(numeric_system, pad_type) { unsupported(); }
   FMT_CONSTEXPR void on_short_year(numeric_system) { unsupported(); }
   FMT_CONSTEXPR void on_offset_year() { unsupported(); }
   FMT_CONSTEXPR void on_century(numeric_system) { unsupported(); }
@@ -959,7 +878,7 @@ template <typename Derived> struct null_chrono_spec_handler {
   FMT_CONSTEXPR void on_dec1_weekday(numeric_system) { unsupported(); }
   FMT_CONSTEXPR void on_abbr_month() { unsupported(); }
   FMT_CONSTEXPR void on_full_month() { unsupported(); }
-  FMT_CONSTEXPR void on_dec_month(numeric_system) { unsupported(); }
+  FMT_CONSTEXPR void on_dec_month(numeric_system, pad_type) { unsupported(); }
   FMT_CONSTEXPR void on_dec0_week_of_year(numeric_system, pad_type) {
     unsupported();
   }
@@ -969,7 +888,7 @@ template <typename Derived> struct null_chrono_spec_handler {
   FMT_CONSTEXPR void on_iso_week_of_year(numeric_system, pad_type) {
     unsupported();
   }
-  FMT_CONSTEXPR void on_day_of_year() { unsupported(); }
+  FMT_CONSTEXPR void on_day_of_year(pad_type) { unsupported(); }
   FMT_CONSTEXPR void on_day_of_month(numeric_system, pad_type) {
     unsupported();
   }
@@ -993,11 +912,13 @@ template <typename Derived> struct null_chrono_spec_handler {
 };
 
 struct tm_format_checker : null_chrono_spec_handler<tm_format_checker> {
-  FMT_NORETURN void unsupported() { FMT_THROW(format_error("no format")); }
+  FMT_NORETURN inline void unsupported() {
+    FMT_THROW(format_error("no format"));
+  }
 
   template <typename Char>
   FMT_CONSTEXPR void on_text(const Char*, const Char*) {}
-  FMT_CONSTEXPR void on_year(numeric_system) {}
+  FMT_CONSTEXPR void on_year(numeric_system, pad_type) {}
   FMT_CONSTEXPR void on_short_year(numeric_system) {}
   FMT_CONSTEXPR void on_offset_year() {}
   FMT_CONSTEXPR void on_century(numeric_system) {}
@@ -1009,11 +930,11 @@ struct tm_format_checker : null_chrono_spec_handler<tm_format_checker> {
   FMT_CONSTEXPR void on_dec1_weekday(numeric_system) {}
   FMT_CONSTEXPR void on_abbr_month() {}
   FMT_CONSTEXPR void on_full_month() {}
-  FMT_CONSTEXPR void on_dec_month(numeric_system) {}
+  FMT_CONSTEXPR void on_dec_month(numeric_system, pad_type) {}
   FMT_CONSTEXPR void on_dec0_week_of_year(numeric_system, pad_type) {}
   FMT_CONSTEXPR void on_dec1_week_of_year(numeric_system, pad_type) {}
   FMT_CONSTEXPR void on_iso_week_of_year(numeric_system, pad_type) {}
-  FMT_CONSTEXPR void on_day_of_year() {}
+  FMT_CONSTEXPR void on_day_of_year(pad_type) {}
   FMT_CONSTEXPR void on_day_of_month(numeric_system, pad_type) {}
   FMT_CONSTEXPR void on_24_hour(numeric_system, pad_type) {}
   FMT_CONSTEXPR void on_12_hour(numeric_system, pad_type) {}
@@ -1070,15 +991,14 @@ template <typename T>
 struct has_member_data_tm_zone<T, void_t<decltype(T::tm_zone)>>
     : std::true_type {};
 
-#if FMT_USE_TZSET
 inline void tzset_once() {
-  static bool init = []() -> bool {
+  static bool init = []() {
+    using namespace fmt_detail;
     _tzset();
-    return true;
+    return false;
   }();
   ignore_unused(init);
 }
-#endif
 
 // Converts value to Int and checks that it's in the range [0, upper).
 template <typename T, typename Int, FMT_ENABLE_IF(std::is_integral<T>::value)>
@@ -1129,16 +1049,16 @@ void write_fractional_seconds(OutputIt& out, Duration d, int precision = -1) {
   using subsecond_precision = std::chrono::duration<
       typename std::common_type<typename Duration::rep,
                                 std::chrono::seconds::rep>::type,
-      std::ratio<1, detail::pow10(num_fractional_digits)>>;
+      std::ratio<1, pow10(num_fractional_digits)>>;
 
-  const auto fractional = d - fmt_duration_cast<std::chrono::seconds>(d);
+  const auto fractional = d - detail::duration_cast<std::chrono::seconds>(d);
   const auto subseconds =
       std::chrono::treat_as_floating_point<
           typename subsecond_precision::rep>::value
           ? fractional.count()
-          : fmt_duration_cast<subsecond_precision>(fractional).count();
+          : detail::duration_cast<subsecond_precision>(fractional).count();
   auto n = static_cast<uint32_or_64_or_128_t<long long>>(subseconds);
-  const int num_digits = detail::count_digits(n);
+  const int num_digits = count_digits(n);
 
   int leading_zeroes = (std::max)(0, num_fractional_digits - num_digits);
   if (precision < 0) {
@@ -1147,23 +1067,21 @@ void write_fractional_seconds(OutputIt& out, Duration d, int precision = -1) {
                         std::chrono::seconds::period>::value) {
       *out++ = '.';
       out = detail::fill_n(out, leading_zeroes, '0');
-      out = format_decimal<Char>(out, n, num_digits).end;
+      out = format_decimal<Char>(out, n, num_digits);
     }
   } else if (precision > 0) {
     *out++ = '.';
-    leading_zeroes = (std::min)(leading_zeroes, precision);
+    leading_zeroes = min_of(leading_zeroes, precision);
     int remaining = precision - leading_zeroes;
     out = detail::fill_n(out, leading_zeroes, '0');
     if (remaining < num_digits) {
       int num_truncated_digits = num_digits - remaining;
-      n /= to_unsigned(detail::pow10(to_unsigned(num_truncated_digits)));
-      if (n) {
-        out = format_decimal<Char>(out, n, remaining).end;
-      }
+      n /= to_unsigned(pow10(to_unsigned(num_truncated_digits)));
+      if (n != 0) out = format_decimal<Char>(out, n, remaining);
       return;
     }
-    if (n) {
-      out = format_decimal<Char>(out, n, num_digits).end;
+    if (n != 0) {
+      out = format_decimal<Char>(out, n, num_digits);
       remaining -= num_digits;
     }
     out = detail::fill_n(out, remaining, '0');
@@ -1307,30 +1225,28 @@ class tm_writer {
     }
   }
 
-  void write_year_extended(long long year) {
+  void write_year_extended(long long year, pad_type pad) {
     // At least 4 characters.
     int width = 4;
-    if (year < 0) {
-      *out_++ = '-';
+    bool negative = year < 0;
+    if (negative) {
       year = 0 - year;
       --width;
     }
     uint32_or_64_or_128_t<long long> n = to_unsigned(year);
     const int num_digits = count_digits(n);
-    if (width > num_digits)
-      out_ = detail::fill_n(out_, width - num_digits, '0');
-    out_ = format_decimal<Char>(out_, n, num_digits).end;
-  }
-  void write_year(long long year) {
-    if (year >= 0 && year < 10000) {
-      write2(static_cast<int>(year / 100));
-      write2(static_cast<int>(year % 100));
-    } else {
-      write_year_extended(year);
+    if (negative && pad == pad_type::zero) *out_++ = '-';
+    if (width > num_digits) {
+      out_ = detail::write_padding(out_, pad, width - num_digits);
     }
+    if (negative && pad != pad_type::zero) *out_++ = '-';
+    out_ = format_decimal<Char>(out_, n, num_digits);
+  }
+  void write_year(long long year, pad_type pad) {
+    write_year_extended(year, pad);
   }
 
-  void write_utc_offset(long offset, numeric_system ns) {
+  void write_utc_offset(long long offset, numeric_system ns) {
     if (offset < 0) {
       *out_++ = '-';
       offset = -offset;
@@ -1342,6 +1258,7 @@ class tm_writer {
     if (ns != numeric_system::standard) *out_++ = ':';
     write2(static_cast<int>(offset % 60));
   }
+
   template <typename T, FMT_ENABLE_IF(has_member_data_tm_gmtoff<T>::value)>
   void format_utc_offset_impl(const T& tm, numeric_system ns) {
     write_utc_offset(tm.tm_gmtoff, ns);
@@ -1349,9 +1266,7 @@ class tm_writer {
   template <typename T, FMT_ENABLE_IF(!has_member_data_tm_gmtoff<T>::value)>
   void format_utc_offset_impl(const T& tm, numeric_system ns) {
 #if defined(_WIN32) && defined(_UCRT)
-#  if FMT_USE_TZSET
     tzset_once();
-#  endif
     long offset = 0;
     _get_timezone(&offset);
     if (tm.tm_isdst) {
@@ -1368,7 +1283,7 @@ class tm_writer {
     std::time_t gt = std::mktime(&gtm);
     std::tm ltm = gmtime(gt);
     std::time_t lt = std::mktime(&ltm);
-    long offset = gt - lt;
+    long long offset = gt - lt;
     write_utc_offset(offset, ns);
 #endif
   }
@@ -1452,7 +1367,7 @@ class tm_writer {
       *out_++ = ' ';
       on_iso_time();
       *out_++ = ' ';
-      on_year(numeric_system::standard);
+      on_year(numeric_system::standard, pad_type::space);
     } else {
       format_localized('c', ns == numeric_system::standard ? '\0' : 'E');
     }
@@ -1481,10 +1396,10 @@ class tm_writer {
     char buf[10];
     size_t offset = 0;
     if (year >= 0 && year < 10000) {
-      copy2(buf, digits2(static_cast<size_t>(year / 100)));
+      write2digits(buf, static_cast<size_t>(year / 100));
     } else {
       offset = 4;
-      write_year_extended(year);
+      write_year_extended(year, pad_type::zero);
       year = 0;
     }
     write_digit2_separated(buf + 2, static_cast<unsigned>(year % 100),
@@ -1496,9 +1411,9 @@ class tm_writer {
   void on_utc_offset(numeric_system ns) { format_utc_offset_impl(tm_, ns); }
   void on_tz_name() { format_tz_name_impl(tm_); }
 
-  void on_year(numeric_system ns) {
+  void on_year(numeric_system ns, pad_type pad) {
     if (is_classic_ || ns == numeric_system::standard)
-      return write_year(tm_year());
+      return write_year(tm_year(), pad);
     format_localized('Y', 'E');
   }
   void on_short_year(numeric_system ns) {
@@ -1529,9 +1444,9 @@ class tm_writer {
     }
   }
 
-  void on_dec_month(numeric_system ns) {
+  void on_dec_month(numeric_system ns, pad_type pad) {
     if (is_classic_ || ns == numeric_system::standard)
-      return write2(tm_mon() + 1);
+      return write2(tm_mon() + 1, pad);
     format_localized('m', 'O');
   }
 
@@ -1558,16 +1473,24 @@ class tm_writer {
     format_localized('V', 'O');
   }
 
-  void on_iso_week_based_year() { write_year(tm_iso_week_year()); }
+  void on_iso_week_based_year() {
+    write_year(tm_iso_week_year(), pad_type::zero);
+  }
   void on_iso_week_based_short_year() {
     write2(split_year_lower(tm_iso_week_year()));
   }
 
-  void on_day_of_year() {
+  void on_day_of_year(pad_type pad) {
     auto yday = tm_yday() + 1;
-    write1(yday / 100);
-    write2(yday % 100);
+    auto digit1 = yday / 100;
+    if (digit1 != 0) {
+      write1(digit1);
+    } else {
+      out_ = detail::write_padding(out_, pad);
+    }
+    write2(yday % 100, pad);
   }
+
   void on_day_of_month(numeric_system ns, pad_type pad) {
     if (is_classic_ || ns == numeric_system::standard)
       return write2(tm_mday(), pad);
@@ -1599,7 +1522,7 @@ class tm_writer {
           write_floating_seconds(buf, *subsecs_);
           if (buf.size() > 1) {
             // Remove the leading "0", write something like ".123".
-            out_ = std::copy(buf.begin() + 1, buf.end(), out_);
+            out_ = copy<Char>(buf.begin() + 1, buf.end(), out_);
           }
         } else {
           write_fractional_seconds<Char>(out_, *subsecs_);
@@ -1651,11 +1574,11 @@ class tm_writer {
 struct chrono_format_checker : null_chrono_spec_handler<chrono_format_checker> {
   bool has_precision_integral = false;
 
-  FMT_NORETURN void unsupported() { FMT_THROW(format_error("no date")); }
+  FMT_NORETURN inline void unsupported() { FMT_THROW(format_error("no date")); }
 
   template <typename Char>
   FMT_CONSTEXPR void on_text(const Char*, const Char*) {}
-  FMT_CONSTEXPR void on_day_of_year() {}
+  FMT_CONSTEXPR void on_day_of_year(pad_type) {}
   FMT_CONSTEXPR void on_24_hour(numeric_system, pad_type) {}
   FMT_CONSTEXPR void on_12_hour(numeric_system, pad_type) {}
   FMT_CONSTEXPR void on_minute(numeric_system, pad_type) {}
@@ -1665,9 +1588,8 @@ struct chrono_format_checker : null_chrono_spec_handler<chrono_format_checker> {
   FMT_CONSTEXPR void on_iso_time() {}
   FMT_CONSTEXPR void on_am_pm() {}
   FMT_CONSTEXPR void on_duration_value() const {
-    if (has_precision_integral) {
+    if (has_precision_integral)
       FMT_THROW(format_error("precision not allowed for this argument type"));
-    }
   }
   FMT_CONSTEXPR void on_duration_unit() {}
 };
@@ -1707,17 +1629,17 @@ inline auto get_milliseconds(std::chrono::duration<Rep, Period> d)
 #if FMT_SAFE_DURATION_CAST
   using CommonSecondsType =
       typename std::common_type<decltype(d), std::chrono::seconds>::type;
-  const auto d_as_common = fmt_duration_cast<CommonSecondsType>(d);
+  const auto d_as_common = detail::duration_cast<CommonSecondsType>(d);
   const auto d_as_whole_seconds =
-      fmt_duration_cast<std::chrono::seconds>(d_as_common);
+      detail::duration_cast<std::chrono::seconds>(d_as_common);
   // this conversion should be nonproblematic
   const auto diff = d_as_common - d_as_whole_seconds;
   const auto ms =
-      fmt_duration_cast<std::chrono::duration<Rep, std::milli>>(diff);
+      detail::duration_cast<std::chrono::duration<Rep, std::milli>>(diff);
   return ms;
 #else
-  auto s = fmt_duration_cast<std::chrono::seconds>(d);
-  return fmt_duration_cast<std::chrono::milliseconds>(d - s);
+  auto s = detail::duration_cast<std::chrono::seconds>(d);
+  return detail::duration_cast<std::chrono::milliseconds>(d - s);
 #endif
 }
 
@@ -1732,14 +1654,14 @@ template <typename Char, typename Rep, typename OutputIt,
 auto format_duration_value(OutputIt out, Rep val, int precision) -> OutputIt {
   auto specs = format_specs();
   specs.precision = precision;
-  specs.type =
-      precision >= 0 ? presentation_type::fixed : presentation_type::general;
+  specs.set_type(precision >= 0 ? presentation_type::fixed
+                                : presentation_type::general);
   return write<Char>(out, val, specs);
 }
 
 template <typename Char, typename OutputIt>
 auto copy_unit(string_view unit, OutputIt out, Char) -> OutputIt {
-  return std::copy(unit.begin(), unit.end(), out);
+  return copy<Char>(unit.begin(), unit.end(), out);
 }
 
 template <typename OutputIt>
@@ -1747,7 +1669,7 @@ auto copy_unit(string_view unit, OutputIt out, wchar_t) -> OutputIt {
   // This works when wchar_t is UTF-32 because units only contain characters
   // that have the same representation in UTF-16 and UTF-32.
   utf8_to_utf16 u(unit);
-  return std::copy(u.c_str(), u.c_str() + u.size(), out);
+  return copy<wchar_t>(u.c_str(), u.c_str() + u.size(), out);
 }
 
 template <typename Char, typename Period, typename OutputIt>
@@ -1773,16 +1695,14 @@ class get_locale {
   bool has_locale_ = false;
 
  public:
-  get_locale(bool localized, locale_ref loc) : has_locale_(localized) {
-#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
+  inline get_locale(bool localized, locale_ref loc) : has_locale_(localized) {
     if (localized)
       ::new (&locale_) std::locale(loc.template get<std::locale>());
-#endif
   }
-  ~get_locale() {
+  inline ~get_locale() {
     if (has_locale_) locale_.~locale();
   }
-  operator const std::locale&() const {
+  inline operator const std::locale&() const {
     return has_locale_ ? locale_ : get_classic_locale();
   }
 };
@@ -1821,7 +1741,7 @@ struct chrono_formatter {
     // this may overflow and/or the result may not fit in the
     // target type.
     // might need checked conversion (rep!=Rep)
-    s = fmt_duration_cast<seconds>(std::chrono::duration<rep, Period>(val));
+    s = detail::duration_cast<seconds>(std::chrono::duration<rep, Period>(val));
   }
 
   // returns true if nan or inf, writes to out.
@@ -1881,7 +1801,7 @@ struct chrono_formatter {
     if (width > num_digits) {
       out = detail::write_padding(out, pad, width - num_digits);
     }
-    out = format_decimal<char_type>(out, n, num_digits).end;
+    out = format_decimal<char_type>(out, n, num_digits);
   }
 
   void write_nan() { std::copy_n("nan", 3, out); }
@@ -1898,7 +1818,7 @@ struct chrono_formatter {
   }
 
   void on_text(const char_type* begin, const char_type* end) {
-    std::copy(begin, end, out);
+    copy<char_type>(begin, end, out);
   }
 
   // These are not implemented because durations don't have date information.
@@ -1915,19 +1835,19 @@ struct chrono_formatter {
   void on_iso_date() {}
   void on_utc_offset(numeric_system) {}
   void on_tz_name() {}
-  void on_year(numeric_system) {}
+  void on_year(numeric_system, pad_type) {}
   void on_short_year(numeric_system) {}
   void on_offset_year() {}
   void on_century(numeric_system) {}
   void on_iso_week_based_year() {}
   void on_iso_week_based_short_year() {}
-  void on_dec_month(numeric_system) {}
+  void on_dec_month(numeric_system, pad_type) {}
   void on_dec0_week_of_year(numeric_system, pad_type) {}
   void on_dec1_week_of_year(numeric_system, pad_type) {}
   void on_iso_week_of_year(numeric_system, pad_type) {}
   void on_day_of_month(numeric_system, pad_type) {}
 
-  void on_day_of_year() {
+  void on_day_of_year(pad_type) {
     if (handle_nan_inf()) return;
     write(days(), 0);
   }
@@ -1971,7 +1891,7 @@ struct chrono_formatter {
         if (buf.size() < 2 || buf[1] == '.') {
           out = detail::write_padding(out, pad);
         }
-        out = std::copy(buf.begin(), buf.end(), out);
+        out = copy<char_type>(buf.begin(), buf.end(), out);
       } else {
         write(second(), 2, pad);
         write_fractional_seconds<char_type>(
@@ -2100,8 +2020,7 @@ struct formatter<weekday, Char> : private formatter<std::tm, Char> {
   bool use_tm_formatter_ = false;
 
  public:
-  FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
-      -> decltype(ctx.begin()) {
+  FMT_CONSTEXPR auto parse(parse_context<Char>& ctx) -> const Char* {
     auto it = ctx.begin(), end = ctx.end();
     if (it != end && *it == 'L') {
       ++it;
@@ -2130,8 +2049,7 @@ struct formatter<day, Char> : private formatter<std::tm, Char> {
   bool use_tm_formatter_ = false;
 
  public:
-  FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
-      -> decltype(ctx.begin()) {
+  FMT_CONSTEXPR auto parse(parse_context<Char>& ctx) -> const Char* {
     auto it = ctx.begin(), end = ctx.end();
     use_tm_formatter_ = it != end && *it != '}';
     return use_tm_formatter_ ? formatter<std::tm, Char>::parse(ctx) : it;
@@ -2156,8 +2074,7 @@ struct formatter<month, Char> : private formatter<std::tm, Char> {
   bool use_tm_formatter_ = false;
 
  public:
-  FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
-      -> decltype(ctx.begin()) {
+  FMT_CONSTEXPR auto parse(parse_context<Char>& ctx) -> const Char* {
     auto it = ctx.begin(), end = ctx.end();
     if (it != end && *it == 'L') {
       ++it;
@@ -2186,8 +2103,7 @@ struct formatter<year, Char> : private formatter<std::tm, Char> {
   bool use_tm_formatter_ = false;
 
  public:
-  FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
-      -> decltype(ctx.begin()) {
+  FMT_CONSTEXPR auto parse(parse_context<Char>& ctx) -> const Char* {
     auto it = ctx.begin(), end = ctx.end();
     use_tm_formatter_ = it != end && *it != '}';
     return use_tm_formatter_ ? formatter<std::tm, Char>::parse(ctx) : it;
@@ -2200,7 +2116,7 @@ struct formatter<year, Char> : private formatter<std::tm, Char> {
     if (use_tm_formatter_) return formatter<std::tm, Char>::format(time, ctx);
     detail::get_locale loc(false, ctx.locale());
     auto w = detail::tm_writer<decltype(ctx.out()), Char>(loc, ctx.out(), time);
-    w.on_year(detail::numeric_system::standard);
+    w.on_year(detail::numeric_system::standard, detail::pad_type::zero);
     return w.out();
   }
 };
@@ -2211,8 +2127,7 @@ struct formatter<year_month_day, Char> : private formatter<std::tm, Char> {
   bool use_tm_formatter_ = false;
 
  public:
-  FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
-      -> decltype(ctx.begin()) {
+  FMT_CONSTEXPR auto parse(parse_context<Char>& ctx) -> const Char* {
     auto it = ctx.begin(), end = ctx.end();
     use_tm_formatter_ = it != end && *it != '}';
     return use_tm_formatter_ ? formatter<std::tm, Char>::parse(ctx) : it;
@@ -2240,32 +2155,33 @@ struct formatter<std::chrono::duration<Rep, Period>, Char> {
   detail::arg_ref<Char> width_ref_;
   detail::arg_ref<Char> precision_ref_;
   bool localized_ = false;
-  basic_string_view<Char> format_str_;
+  basic_string_view<Char> fmt_;
 
  public:
-  FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
-      -> decltype(ctx.begin()) {
+  FMT_CONSTEXPR auto parse(parse_context<Char>& ctx) -> const Char* {
     auto it = ctx.begin(), end = ctx.end();
     if (it == end || *it == '}') return it;
 
     it = detail::parse_align(it, end, specs_);
     if (it == end) return it;
 
-    it = detail::parse_dynamic_spec(it, end, specs_.width, width_ref_, ctx);
-    if (it == end) return it;
+    Char c = *it;
+    if ((c >= '0' && c <= '9') || c == '{') {
+      it = detail::parse_width(it, end, specs_, width_ref_, ctx);
+      if (it == end) return it;
+    }
 
     auto checker = detail::chrono_format_checker();
     if (*it == '.') {
       checker.has_precision_integral = !std::is_floating_point<Rep>::value;
-      it = detail::parse_precision(it, end, specs_.precision, precision_ref_,
-                                   ctx);
+      it = detail::parse_precision(it, end, specs_, precision_ref_, ctx);
     }
     if (it != end && *it == 'L') {
       localized_ = true;
       ++it;
     }
     end = detail::parse_chrono_format(it, end, checker);
-    format_str_ = {it, detail::to_unsigned(end - it)};
+    fmt_ = {it, detail::to_unsigned(end - it)};
     return end;
   }
 
@@ -2275,15 +2191,15 @@ struct formatter<std::chrono::duration<Rep, Period>, Char> {
     auto specs = specs_;
     auto precision = specs.precision;
     specs.precision = -1;
-    auto begin = format_str_.begin(), end = format_str_.end();
+    auto begin = fmt_.begin(), end = fmt_.end();
     // As a possible future optimization, we could avoid extra copying if width
     // is not specified.
     auto buf = basic_memory_buffer<Char>();
-    auto out = std::back_inserter(buf);
-    detail::handle_dynamic_spec<detail::width_checker>(specs.width, width_ref_,
-                                                       ctx);
-    detail::handle_dynamic_spec<detail::precision_checker>(precision,
-                                                           precision_ref_, ctx);
+    auto out = basic_appender<Char>(buf);
+    detail::handle_dynamic_spec(specs.dynamic_width(), specs.width, width_ref_,
+                                ctx);
+    detail::handle_dynamic_spec(specs.dynamic_precision(), precision,
+                                precision_ref_, ctx);
     if (begin == end || *begin == '}') {
       out = detail::format_duration_value<Char>(out, d.count(), precision);
       detail::format_duration_unit<Char, Period>(out);
@@ -2300,129 +2216,119 @@ struct formatter<std::chrono::duration<Rep, Period>, Char> {
   }
 };
 
-template <typename Char, typename Duration>
-struct formatter<std::chrono::time_point<std::chrono::system_clock, Duration>,
-                 Char> : formatter<std::tm, Char> {
-  FMT_CONSTEXPR formatter() {
-    this->format_str_ = detail::string_literal<Char, '%', 'F', ' ', '%', 'T'>{};
-  }
-
-  template <typename FormatContext>
-  auto format(std::chrono::time_point<std::chrono::system_clock, Duration> val,
-              FormatContext& ctx) const -> decltype(ctx.out()) {
-    std::tm tm = gmtime(val);
-    using period = typename Duration::period;
-    if (detail::const_check(
-            period::num == 1 && period::den == 1 &&
-            !std::is_floating_point<typename Duration::rep>::value)) {
-      return formatter<std::tm, Char>::format(tm, ctx);
-    }
-    Duration epoch = val.time_since_epoch();
-    Duration subsecs = detail::fmt_duration_cast<Duration>(
-        epoch - detail::fmt_duration_cast<std::chrono::seconds>(epoch));
-    if (subsecs.count() < 0) {
-      auto second =
-          detail::fmt_duration_cast<Duration>(std::chrono::seconds(1));
-      if (tm.tm_sec != 0)
-        --tm.tm_sec;
-      else
-        tm = gmtime(val - second);
-      subsecs += detail::fmt_duration_cast<Duration>(std::chrono::seconds(1));
-    }
-    return formatter<std::tm, Char>::do_format(tm, ctx, &subsecs);
-  }
-};
-
-#if FMT_USE_LOCAL_TIME
-template <typename Char, typename Duration>
-struct formatter<std::chrono::local_time<Duration>, Char>
-    : formatter<std::tm, Char> {
-  FMT_CONSTEXPR formatter() {
-    this->format_str_ = detail::string_literal<Char, '%', 'F', ' ', '%', 'T'>{};
-  }
-
-  template <typename FormatContext>
-  auto format(std::chrono::local_time<Duration> val, FormatContext& ctx) const
-      -> decltype(ctx.out()) {
-    using period = typename Duration::period;
-    if (period::num != 1 || period::den != 1 ||
-        std::is_floating_point<typename Duration::rep>::value) {
-      const auto epoch = val.time_since_epoch();
-      const auto subsecs = detail::fmt_duration_cast<Duration>(
-          epoch - detail::fmt_duration_cast<std::chrono::seconds>(epoch));
-
-      return formatter<std::tm, Char>::do_format(localtime(val), ctx, &subsecs);
-    }
-
-    return formatter<std::tm, Char>::format(localtime(val), ctx);
-  }
-};
-#endif
-
-#if FMT_USE_UTC_TIME
-template <typename Char, typename Duration>
-struct formatter<std::chrono::time_point<std::chrono::utc_clock, Duration>,
-                 Char>
-    : formatter<std::chrono::time_point<std::chrono::system_clock, Duration>,
-                Char> {
-  template <typename FormatContext>
-  auto format(std::chrono::time_point<std::chrono::utc_clock, Duration> val,
-              FormatContext& ctx) const -> decltype(ctx.out()) {
-    return formatter<
-        std::chrono::time_point<std::chrono::system_clock, Duration>,
-        Char>::format(std::chrono::utc_clock::to_sys(val), ctx);
-  }
-};
-#endif
-
 template <typename Char> struct formatter<std::tm, Char> {
  private:
   format_specs specs_;
   detail::arg_ref<Char> width_ref_;
 
  protected:
-  basic_string_view<Char> format_str_;
+  basic_string_view<Char> fmt_;
 
-  template <typename FormatContext, typename Duration>
+  template <typename Duration, typename FormatContext>
   auto do_format(const std::tm& tm, FormatContext& ctx,
                  const Duration* subsecs) const -> decltype(ctx.out()) {
     auto specs = specs_;
     auto buf = basic_memory_buffer<Char>();
-    auto out = std::back_inserter(buf);
-    detail::handle_dynamic_spec<detail::width_checker>(specs.width, width_ref_,
-                                                       ctx);
+    auto out = basic_appender<Char>(buf);
+    detail::handle_dynamic_spec(specs.dynamic_width(), specs.width, width_ref_,
+                                ctx);
 
     auto loc_ref = ctx.locale();
     detail::get_locale loc(static_cast<bool>(loc_ref), loc_ref);
     auto w =
         detail::tm_writer<decltype(out), Char, Duration>(loc, out, tm, subsecs);
-    detail::parse_chrono_format(format_str_.begin(), format_str_.end(), w);
+    detail::parse_chrono_format(fmt_.begin(), fmt_.end(), w);
     return detail::write(
         ctx.out(), basic_string_view<Char>(buf.data(), buf.size()), specs);
   }
 
  public:
-  FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
-      -> decltype(ctx.begin()) {
+  FMT_CONSTEXPR auto parse(parse_context<Char>& ctx) -> const Char* {
     auto it = ctx.begin(), end = ctx.end();
     if (it == end || *it == '}') return it;
 
     it = detail::parse_align(it, end, specs_);
     if (it == end) return it;
 
-    it = detail::parse_dynamic_spec(it, end, specs_.width, width_ref_, ctx);
-    if (it == end) return it;
+    Char c = *it;
+    if ((c >= '0' && c <= '9') || c == '{') {
+      it = detail::parse_width(it, end, specs_, width_ref_, ctx);
+      if (it == end) return it;
+    }
 
     end = detail::parse_chrono_format(it, end, detail::tm_format_checker());
-    // Replace the default format_str only if the new spec is not empty.
-    if (end != it) format_str_ = {it, detail::to_unsigned(end - it)};
+    // Replace the default format string only if the new spec is not empty.
+    if (end != it) fmt_ = {it, detail::to_unsigned(end - it)};
     return end;
   }
 
   template <typename FormatContext>
   auto format(const std::tm& tm, FormatContext& ctx) const
       -> decltype(ctx.out()) {
-    return do_format<FormatContext, std::chrono::seconds>(tm, ctx, nullptr);
+    return do_format<std::chrono::seconds>(tm, ctx, nullptr);
+  }
+};
+
+template <typename Char, typename Duration>
+struct formatter<sys_time<Duration>, Char> : formatter<std::tm, Char> {
+  FMT_CONSTEXPR formatter() {
+    this->fmt_ = detail::string_literal<Char, '%', 'F', ' ', '%', 'T'>();
+  }
+
+  template <typename FormatContext>
+  auto format(sys_time<Duration> val, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    std::tm tm = gmtime(val);
+    using period = typename Duration::period;
+    if (detail::const_check(
+            period::num == 1 && period::den == 1 &&
+            !std::is_floating_point<typename Duration::rep>::value)) {
+      return formatter<std::tm, Char>::format(tm, ctx);
+    }
+    Duration epoch = val.time_since_epoch();
+    Duration subsecs = detail::duration_cast<Duration>(
+        epoch - detail::duration_cast<std::chrono::seconds>(epoch));
+    if (subsecs.count() < 0) {
+      auto second = detail::duration_cast<Duration>(std::chrono::seconds(1));
+      if (tm.tm_sec != 0)
+        --tm.tm_sec;
+      else
+        tm = gmtime(val - second);
+      subsecs += detail::duration_cast<Duration>(std::chrono::seconds(1));
+    }
+    return formatter<std::tm, Char>::do_format(tm, ctx, &subsecs);
+  }
+};
+
+template <typename Duration, typename Char>
+struct formatter<utc_time<Duration>, Char>
+    : formatter<sys_time<Duration>, Char> {
+  template <typename FormatContext>
+  auto format(utc_time<Duration> val, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    return formatter<sys_time<Duration>, Char>::format(
+        detail::utc_clock::to_sys(val), ctx);
+  }
+};
+
+template <typename Duration, typename Char>
+struct formatter<local_time<Duration>, Char> : formatter<std::tm, Char> {
+  FMT_CONSTEXPR formatter() {
+    this->fmt_ = detail::string_literal<Char, '%', 'F', ' ', '%', 'T'>();
+  }
+
+  template <typename FormatContext>
+  auto format(local_time<Duration> val, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    using period = typename Duration::period;
+    if (period::num == 1 && period::den == 1 &&
+        !std::is_floating_point<typename Duration::rep>::value) {
+      return formatter<std::tm, Char>::format(localtime(val), ctx);
+    }
+    auto epoch = val.time_since_epoch();
+    auto subsecs = detail::duration_cast<Duration>(
+        epoch - detail::duration_cast<std::chrono::seconds>(epoch));
+    return formatter<std::tm, Char>::do_format(localtime(val), ctx, &subsecs);
   }
 };
 
diff --git a/contrib/fmt/include/fmt/color.h b/contrib/fmt/include/fmt/color.h
index f0e9dd94e..2faaf3a06 100644
--- a/contrib/fmt/include/fmt/color.h
+++ b/contrib/fmt/include/fmt/color.h
@@ -330,7 +330,7 @@ FMT_CONSTEXPR inline auto operator|(emphasis lhs, emphasis rhs) noexcept
 namespace detail {
 
 template <typename Char> struct ansi_color_escape {
-  FMT_CONSTEXPR ansi_color_escape(detail::color_type text_color,
+  FMT_CONSTEXPR ansi_color_escape(color_type text_color,
                                   const char* esc) noexcept {
     // If we have a terminal color, we need to output another escape code
     // sequence.
@@ -412,13 +412,13 @@ template <typename Char> struct ansi_color_escape {
 };
 
 template <typename Char>
-FMT_CONSTEXPR auto make_foreground_color(detail::color_type foreground) noexcept
+FMT_CONSTEXPR auto make_foreground_color(color_type foreground) noexcept
     -> ansi_color_escape<Char> {
   return ansi_color_escape<Char>(foreground, "\x1b[38;2;");
 }
 
 template <typename Char>
-FMT_CONSTEXPR auto make_background_color(detail::color_type background) noexcept
+FMT_CONSTEXPR auto make_background_color(color_type background) noexcept
     -> ansi_color_escape<Char> {
   return ansi_color_escape<Char>(background, "\x1b[48;2;");
 }
@@ -434,36 +434,35 @@ template <typename Char> inline void reset_color(buffer<Char>& buffer) {
   buffer.append(reset_color.begin(), reset_color.end());
 }
 
-template <typename T> struct styled_arg : detail::view {
+template <typename T> struct styled_arg : view {
   const T& value;
   text_style style;
   styled_arg(const T& v, text_style s) : value(v), style(s) {}
 };
 
 template <typename Char>
-void vformat_to(
-    buffer<Char>& buf, const text_style& ts, basic_string_view<Char> format_str,
-    basic_format_args<buffered_context<type_identity_t<Char>>> args) {
+void vformat_to(buffer<Char>& buf, const text_style& ts,
+                basic_string_view<Char> fmt,
+                basic_format_args<buffered_context<Char>> args) {
   bool has_style = false;
   if (ts.has_emphasis()) {
     has_style = true;
-    auto emphasis = detail::make_emphasis<Char>(ts.get_emphasis());
+    auto emphasis = make_emphasis<Char>(ts.get_emphasis());
     buf.append(emphasis.begin(), emphasis.end());
   }
   if (ts.has_foreground()) {
     has_style = true;
-    auto foreground = detail::make_foreground_color<Char>(ts.get_foreground());
+    auto foreground = make_foreground_color<Char>(ts.get_foreground());
     buf.append(foreground.begin(), foreground.end());
   }
   if (ts.has_background()) {
     has_style = true;
-    auto background = detail::make_background_color<Char>(ts.get_background());
+    auto background = make_background_color<Char>(ts.get_background());
     buf.append(background.begin(), background.end());
   }
-  detail::vformat_to(buf, format_str, args, {});
-  if (has_style) detail::reset_color<Char>(buf);
+  vformat_to(buf, fmt, args);
+  if (has_style) reset_color<Char>(buf);
 }
-
 }  // namespace detail
 
 inline void vprint(FILE* f, const text_style& ts, string_view fmt,
@@ -485,7 +484,7 @@ inline void vprint(FILE* f, const text_style& ts, string_view fmt,
 template <typename... T>
 void print(FILE* f, const text_style& ts, format_string<T...> fmt,
            T&&... args) {
-  vprint(f, ts, fmt, fmt::make_format_args(args...));
+  vprint(f, ts, fmt.str, vargs<T...>{{args...}});
 }
 
 /**
@@ -524,7 +523,7 @@ inline auto vformat(const text_style& ts, string_view fmt, format_args args)
 template <typename... T>
 inline auto format(const text_style& ts, format_string<T...> fmt, T&&... args)
     -> std::string {
-  return fmt::vformat(ts, fmt, fmt::make_format_args(args...));
+  return fmt::vformat(ts, fmt.str, vargs<T...>{{args...}});
 }
 
 /// Formats a string with the given text_style and writes the output to `out`.
@@ -551,7 +550,7 @@ template <typename OutputIt, typename... T,
           FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, char>::value)>
 inline auto format_to(OutputIt out, const text_style& ts,
                       format_string<T...> fmt, T&&... args) -> OutputIt {
-  return vformat_to(out, ts, fmt, fmt::make_format_args(args...));
+  return vformat_to(out, ts, fmt.str, vargs<T...>{{args...}});
 }
 
 template <typename T, typename Char>
@@ -560,31 +559,30 @@ struct formatter<detail::styled_arg<T>, Char> : formatter<T, Char> {
   auto format(const detail::styled_arg<T>& arg, FormatContext& ctx) const
       -> decltype(ctx.out()) {
     const auto& ts = arg.style;
-    const auto& value = arg.value;
     auto out = ctx.out();
 
     bool has_style = false;
     if (ts.has_emphasis()) {
       has_style = true;
       auto emphasis = detail::make_emphasis<Char>(ts.get_emphasis());
-      out = std::copy(emphasis.begin(), emphasis.end(), out);
+      out = detail::copy<Char>(emphasis.begin(), emphasis.end(), out);
     }
     if (ts.has_foreground()) {
       has_style = true;
       auto foreground =
           detail::make_foreground_color<Char>(ts.get_foreground());
-      out = std::copy(foreground.begin(), foreground.end(), out);
+      out = detail::copy<Char>(foreground.begin(), foreground.end(), out);
     }
     if (ts.has_background()) {
       has_style = true;
       auto background =
           detail::make_background_color<Char>(ts.get_background());
-      out = std::copy(background.begin(), background.end(), out);
+      out = detail::copy<Char>(background.begin(), background.end(), out);
     }
-    out = formatter<T, Char>::format(value, ctx);
+    out = formatter<T, Char>::format(arg.value, ctx);
     if (has_style) {
       auto reset_color = string_view("\x1b[0m");
-      out = std::copy(reset_color.begin(), reset_color.end(), out);
+      out = detail::copy<Char>(reset_color.begin(), reset_color.end(), out);
     }
     return out;
   }
diff --git a/contrib/fmt/include/fmt/compile.h b/contrib/fmt/include/fmt/compile.h
index b2afc2c30..68b451c71 100644
--- a/contrib/fmt/include/fmt/compile.h
+++ b/contrib/fmt/include/fmt/compile.h
@@ -21,12 +21,6 @@ FMT_EXPORT class compiled_string {};
 
 namespace detail {
 
-template <typename T, typename InputIt>
-FMT_CONSTEXPR inline auto copy(InputIt begin, InputIt end, counting_iterator it)
-    -> counting_iterator {
-  return it + (end - begin);
-}
-
 template <typename S>
 struct is_compiled_string : std::is_base_of<compiled_string, S> {};
 
@@ -42,17 +36,16 @@ struct is_compiled_string : std::is_base_of<compiled_string, S> {};
  *     std::string s = fmt::format(FMT_COMPILE("{}"), 42);
  */
 #if defined(__cpp_if_constexpr) && defined(__cpp_return_type_deduction)
-#  define FMT_COMPILE(s) FMT_STRING_IMPL(s, fmt::compiled_string, explicit)
+#  define FMT_COMPILE(s) FMT_STRING_IMPL(s, fmt::compiled_string)
 #else
 #  define FMT_COMPILE(s) FMT_STRING(s)
 #endif
 
 #if FMT_USE_NONTYPE_TEMPLATE_ARGS
-template <typename Char, size_t N,
-          fmt::detail_exported::fixed_string<Char, N> Str>
+template <typename Char, size_t N, fmt::detail::fixed_string<Char, N> Str>
 struct udl_compiled_string : compiled_string {
   using char_type = Char;
-  explicit constexpr operator basic_string_view<char_type>() const {
+  constexpr explicit operator basic_string_view<char_type>() const {
     return {Str.data, N - 1};
   }
 };
@@ -77,6 +70,29 @@ constexpr const auto& get([[maybe_unused]] const T& first,
     return detail::get<N - 1>(rest...);
 }
 
+#  if FMT_USE_NONTYPE_TEMPLATE_ARGS
+template <int N, typename T, typename... Args, typename Char>
+constexpr auto get_arg_index_by_name(basic_string_view<Char> name) -> int {
+  if constexpr (is_static_named_arg<T>()) {
+    if (name == T::name) return N;
+  }
+  if constexpr (sizeof...(Args) > 0)
+    return get_arg_index_by_name<N + 1, Args...>(name);
+  (void)name;  // Workaround an MSVC bug about "unused" parameter.
+  return -1;
+}
+#  endif
+
+template <typename... Args, typename Char>
+FMT_CONSTEXPR auto get_arg_index_by_name(basic_string_view<Char> name) -> int {
+#  if FMT_USE_NONTYPE_TEMPLATE_ARGS
+  if constexpr (sizeof...(Args) > 0)
+    return get_arg_index_by_name<0, Args...>(name);
+#  endif
+  (void)name;
+  return -1;
+}
+
 template <typename Char, typename... Args>
 constexpr int get_arg_index_by_name(basic_string_view<Char> name,
                                     type_list<Args...>) {
@@ -149,8 +165,9 @@ template <typename Char, typename T, int N> struct field {
     if constexpr (std::is_convertible<T, basic_string_view<Char>>::value) {
       auto s = basic_string_view<Char>(arg);
       return copy<Char>(s.begin(), s.end(), out);
+    } else {
+      return write<Char>(out, arg);
     }
-    return write<Char>(out, arg);
   }
 };
 
@@ -275,6 +292,7 @@ constexpr parse_specs_result<T, Char> parse_specs(basic_string_view<Char> str,
 }
 
 template <typename Char> struct arg_id_handler {
+  arg_id_kind kind;
   arg_ref<Char> arg_id;
 
   constexpr int on_auto() {
@@ -282,25 +300,28 @@ template <typename Char> struct arg_id_handler {
     return 0;
   }
   constexpr int on_index(int id) {
+    kind = arg_id_kind::index;
     arg_id = arg_ref<Char>(id);
     return 0;
   }
   constexpr int on_name(basic_string_view<Char> id) {
+    kind = arg_id_kind::name;
     arg_id = arg_ref<Char>(id);
     return 0;
   }
 };
 
 template <typename Char> struct parse_arg_id_result {
+  arg_id_kind kind;
   arg_ref<Char> arg_id;
   const Char* arg_id_end;
 };
 
 template <int ID, typename Char>
 constexpr auto parse_arg_id(const Char* begin, const Char* end) {
-  auto handler = arg_id_handler<Char>{arg_ref<Char>{}};
+  auto handler = arg_id_handler<Char>{arg_id_kind::none, arg_ref<Char>{}};
   auto arg_id_end = parse_arg_id(begin, end, handler);
-  return parse_arg_id_result<Char>{handler.arg_id, arg_id_end};
+  return parse_arg_id_result<Char>{handler.kind, handler.arg_id, arg_id_end};
 }
 
 template <typename T, typename Enable = void> struct field_type {
@@ -363,18 +384,18 @@ constexpr auto compile_format_string(S fmt) {
       constexpr char_type c =
           arg_id_end_pos != str.size() ? str[arg_id_end_pos] : char_type();
       static_assert(c == '}' || c == ':', "missing '}' in format string");
-      if constexpr (arg_id_result.arg_id.kind == arg_id_kind::index) {
+      if constexpr (arg_id_result.kind == arg_id_kind::index) {
         static_assert(
             ID == manual_indexing_id || ID == 0,
             "cannot switch from automatic to manual argument indexing");
-        constexpr auto arg_index = arg_id_result.arg_id.val.index;
+        constexpr auto arg_index = arg_id_result.arg_id.index;
         return parse_replacement_field_then_tail<get_type<arg_index, Args>,
                                                  Args, arg_id_end_pos,
                                                  arg_index, manual_indexing_id>(
             fmt);
-      } else if constexpr (arg_id_result.arg_id.kind == arg_id_kind::name) {
+      } else if constexpr (arg_id_result.kind == arg_id_kind::name) {
         constexpr auto arg_index =
-            get_arg_index_by_name(arg_id_result.arg_id.val.name, Args{});
+            get_arg_index_by_name(arg_id_result.arg_id.name, Args{});
         if constexpr (arg_index >= 0) {
           constexpr auto next_id =
               ID != manual_indexing_id ? ID + 1 : manual_indexing_id;
@@ -383,8 +404,7 @@ constexpr auto compile_format_string(S fmt) {
               arg_index, next_id>(fmt);
         } else if constexpr (c == '}') {
           return parse_tail<Args, arg_id_end_pos + 1, ID>(
-              runtime_named_field<char_type>{arg_id_result.arg_id.val.name},
-              fmt);
+              runtime_named_field<char_type>{arg_id_result.arg_id.name}, fmt);
         } else if constexpr (c == ':') {
           return unknown_format();  // no type info for specs parsing
         }
@@ -496,15 +516,17 @@ template <typename S, typename... Args,
           FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
 FMT_CONSTEXPR20 auto formatted_size(const S& fmt, const Args&... args)
     -> size_t {
-  return fmt::format_to(detail::counting_iterator(), fmt, args...).count();
+  auto buf = detail::counting_buffer<>();
+  fmt::format_to(appender(buf), fmt, args...);
+  return buf.count();
 }
 
 template <typename S, typename... Args,
           FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
 void print(std::FILE* f, const S& fmt, const Args&... args) {
-  memory_buffer buffer;
-  fmt::format_to(std::back_inserter(buffer), fmt, args...);
-  detail::print(f, {buffer.data(), buffer.size()});
+  auto buf = memory_buffer();
+  fmt::format_to(appender(buf), fmt, args...);
+  detail::print(f, {buf.data(), buf.size()});
 }
 
 template <typename S, typename... Args,
@@ -515,7 +537,7 @@ void print(const S& fmt, const Args&... args) {
 
 #if FMT_USE_NONTYPE_TEMPLATE_ARGS
 inline namespace literals {
-template <detail_exported::fixed_string Str> constexpr auto operator""_cf() {
+template <detail::fixed_string Str> constexpr auto operator""_cf() {
   using char_t = remove_cvref_t<decltype(Str.data[0])>;
   return detail::udl_compiled_string<char_t, sizeof(Str.data) / sizeof(char_t),
                                      Str>();
diff --git a/contrib/fmt/include/fmt/format-inl.h b/contrib/fmt/include/fmt/format-inl.h
index a887483b6..a5b79dbe4 100644
--- a/contrib/fmt/include/fmt/format-inl.h
+++ b/contrib/fmt/include/fmt/format-inl.h
@@ -14,10 +14,6 @@
 #  include <climits>
 #  include <cmath>
 #  include <exception>
-
-#  if !defined(FMT_STATIC_THOUSANDS_SEPARATOR)
-#    include <locale>
-#  endif
 #endif
 
 #if defined(_WIN32) && !defined(FMT_USE_WRITE_CONSOLE)
@@ -26,16 +22,22 @@
 
 #include "format.h"
 
+#if FMT_USE_LOCALE
+#  include <locale>
+#endif
+
+#ifndef FMT_FUNC
+#  define FMT_FUNC
+#endif
+
 FMT_BEGIN_NAMESPACE
 namespace detail {
 
 FMT_FUNC void assert_fail(const char* file, int line, const char* message) {
   // Use unchecked std::fprintf to avoid triggering another assertion when
-  // writing to stderr fails
-  std::fprintf(stderr, "%s:%d: assertion failed: %s", file, line, message);
-  // Chosen instead of std::abort to satisfy Clang in CUDA mode during device
-  // code pass.
-  std::terminate();
+  // writing to stderr fails.
+  fprintf(stderr, "%s:%d: assertion failed: %s", file, line, message);
+  abort();
 }
 
 FMT_FUNC void format_error_code(detail::buffer<char>& out, int error_code,
@@ -61,86 +63,95 @@ FMT_FUNC void format_error_code(detail::buffer<char>& out, int error_code,
   FMT_ASSERT(out.size() <= inline_buffer_size, "");
 }
 
-FMT_FUNC void report_error(format_func func, int error_code,
-                           const char* message) noexcept {
+FMT_FUNC void do_report_error(format_func func, int error_code,
+                              const char* message) noexcept {
   memory_buffer full_message;
   func(full_message, error_code, message);
-  // Don't use fwrite_fully because the latter may throw.
+  // Don't use fwrite_all because the latter may throw.
   if (std::fwrite(full_message.data(), full_message.size(), 1, stderr) > 0)
     std::fputc('\n', stderr);
 }
 
 // A wrapper around fwrite that throws on error.
-inline void fwrite_fully(const void* ptr, size_t count, FILE* stream) {
+inline void fwrite_all(const void* ptr, size_t count, FILE* stream) {
   size_t written = std::fwrite(ptr, 1, count, stream);
   if (written < count)
     FMT_THROW(system_error(errno, FMT_STRING("cannot write to file")));
 }
 
-#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
+#if FMT_USE_LOCALE
+using std::locale;
+using std::numpunct;
+using std::use_facet;
+
 template <typename Locale>
 locale_ref::locale_ref(const Locale& loc) : locale_(&loc) {
-  static_assert(std::is_same<Locale, std::locale>::value, "");
+  static_assert(std::is_same<Locale, locale>::value, "");
 }
+#else
+struct locale {};
+template <typename Char> struct numpunct {
+  auto grouping() const -> std::string { return "\03"; }
+  auto thousands_sep() const -> Char { return ','; }
+  auto decimal_point() const -> Char { return '.'; }
+};
+template <typename Facet> Facet use_facet(locale) { return {}; }
+#endif  // FMT_USE_LOCALE
 
 template <typename Locale> auto locale_ref::get() const -> Locale {
-  static_assert(std::is_same<Locale, std::locale>::value, "");
-  return locale_ ? *static_cast<const std::locale*>(locale_) : std::locale();
+  static_assert(std::is_same<Locale, locale>::value, "");
+#if FMT_USE_LOCALE
+  if (locale_) return *static_cast<const locale*>(locale_);
+#endif
+  return locale();
 }
 
 template <typename Char>
 FMT_FUNC auto thousands_sep_impl(locale_ref loc) -> thousands_sep_result<Char> {
-  auto& facet = std::use_facet<std::numpunct<Char>>(loc.get<std::locale>());
+  auto&& facet = use_facet<numpunct<Char>>(loc.get<locale>());
   auto grouping = facet.grouping();
   auto thousands_sep = grouping.empty() ? Char() : facet.thousands_sep();
   return {std::move(grouping), thousands_sep};
 }
 template <typename Char>
 FMT_FUNC auto decimal_point_impl(locale_ref loc) -> Char {
-  return std::use_facet<std::numpunct<Char>>(loc.get<std::locale>())
-      .decimal_point();
+  return use_facet<numpunct<Char>>(loc.get<locale>()).decimal_point();
 }
-#else
-template <typename Char>
-FMT_FUNC auto thousands_sep_impl(locale_ref) -> thousands_sep_result<Char> {
-  return {"\03", FMT_STATIC_THOUSANDS_SEPARATOR};
-}
-template <typename Char> FMT_FUNC Char decimal_point_impl(locale_ref) {
-  return '.';
-}
-#endif
 
+#if FMT_USE_LOCALE
 FMT_FUNC auto write_loc(appender out, loc_value value,
                         const format_specs& specs, locale_ref loc) -> bool {
-#ifdef FMT_STATIC_THOUSANDS_SEPARATOR
-  value.visit(loc_writer<>{
-      out, specs, std::string(1, FMT_STATIC_THOUSANDS_SEPARATOR), "\3", "."});
-  return true;
-#else
   auto locale = loc.get<std::locale>();
   // We cannot use the num_put<char> facet because it may produce output in
   // a wrong encoding.
   using facet = format_facet<std::locale>;
   if (std::has_facet<facet>(locale))
-    return std::use_facet<facet>(locale).put(out, value, specs);
+    return use_facet<facet>(locale).put(out, value, specs);
   return facet(locale).put(out, value, specs);
-#endif
 }
+#endif
 }  // namespace detail
 
 FMT_FUNC void report_error(const char* message) {
+#if FMT_USE_EXCEPTIONS
+  // Use FMT_THROW instead of throw to avoid bogus unreachable code warnings
+  // from MSVC.
   FMT_THROW(format_error(message));
+#else
+  fputs(message, stderr);
+  abort();
+#endif
 }
 
 template <typename Locale> typename Locale::id format_facet<Locale>::id;
 
-#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
 template <typename Locale> format_facet<Locale>::format_facet(Locale& loc) {
-  auto& numpunct = std::use_facet<std::numpunct<char>>(loc);
-  grouping_ = numpunct.grouping();
-  if (!grouping_.empty()) separator_ = std::string(1, numpunct.thousands_sep());
+  auto& np = detail::use_facet<detail::numpunct<char>>(loc);
+  grouping_ = np.grouping();
+  if (!grouping_.empty()) separator_ = std::string(1, np.thousands_sep());
 }
 
+#if FMT_USE_LOCALE
 template <>
 FMT_API FMT_FUNC auto format_facet<std::locale>::do_put(
     appender out, loc_value val, const format_specs& specs) const -> bool {
@@ -1425,7 +1436,7 @@ FMT_FUNC void format_system_error(detail::buffer<char>& out, int error_code,
 
 FMT_FUNC void report_system_error(int error_code,
                                   const char* message) noexcept {
-  report_error(format_system_error, error_code, message);
+  do_report_error(format_system_error, error_code, message);
 }
 
 FMT_FUNC auto vformat(string_view fmt, format_args args) -> std::string {
@@ -1438,6 +1449,15 @@ FMT_FUNC auto vformat(string_view fmt, format_args args) -> std::string {
 
 namespace detail {
 
+FMT_FUNC void vformat_to(buffer<char>& buf, string_view fmt, format_args args,
+                         locale_ref loc) {
+  auto out = appender(buf);
+  if (fmt.size() == 2 && equal2(fmt.data(), "{}"))
+    return args.get(0).visit(default_arg_formatter<char>{out});
+  parse_format_string(
+      fmt, format_handler<char>{parse_context<char>(fmt), {out, args, loc}});
+}
+
 template <typename T> struct span {
   T* data;
   size_t size;
@@ -1508,6 +1528,7 @@ template <typename F> class glibc_file : public file_base<F> {
   void init_buffer() {
     if (this->file_->_IO_write_ptr) return;
     // Force buffer initialization by placing and removing a char in a buffer.
+    assume(this->file_->_IO_write_ptr >= this->file_->_IO_write_end);
     putc_unlocked(0, this->file_);
     --this->file_->_IO_write_ptr;
   }
@@ -1615,7 +1636,7 @@ template <typename F> class fallback_file : public file_base<F> {
 };
 
 #ifndef FMT_USE_FALLBACK_FILE
-#  define FMT_USE_FALLBACK_FILE 1
+#  define FMT_USE_FALLBACK_FILE 0
 #endif
 
 template <typename F,
@@ -1692,7 +1713,7 @@ FMT_FUNC void vprint_mojibake(std::FILE* f, string_view fmt, format_args args,
   auto buffer = memory_buffer();
   detail::vformat_to(buffer, fmt, args);
   if (newline) buffer.push_back('\n');
-  fwrite_fully(buffer.data(), buffer.size(), f);
+  fwrite_all(buffer.data(), buffer.size(), f);
 }
 #endif
 
@@ -1704,7 +1725,7 @@ FMT_FUNC void print(std::FILE* f, string_view text) {
     if (write_console(fd, text)) return;
   }
 #endif
-  fwrite_fully(text.data(), text.size(), f);
+  fwrite_all(text.data(), text.size(), f);
 }
 }  // namespace detail
 
diff --git a/contrib/fmt/include/fmt/format.h b/contrib/fmt/include/fmt/format.h
index 67f0ab739..92a1d5b7a 100644
--- a/contrib/fmt/include/fmt/format.h
+++ b/contrib/fmt/include/fmt/format.h
@@ -41,11 +41,12 @@
 #include "base.h"
 
 #ifndef FMT_MODULE
-#  include <cmath>             // std::signbit
-#  include <cstdint>           // uint32_t
-#  include <cstring>           // std::memcpy
-#  include <initializer_list>  // std::initializer_list
-#  include <limits>            // std::numeric_limits
+#  include <cmath>    // std::signbit
+#  include <cstddef>  // std::byte
+#  include <cstdint>  // uint32_t
+#  include <cstring>  // std::memcpy
+#  include <limits>   // std::numeric_limits
+#  include <new>      // std::bad_alloc
 #  if defined(__GLIBCXX__) && !defined(_GLIBCXX_USE_DUAL_ABI)
 // Workaround for pre gcc 5 libstdc++.
 #    include <memory>  // std::allocator_traits
@@ -54,7 +55,7 @@
 #  include <string>        // std::string
 #  include <system_error>  // std::system_error
 
-// Checking FMT_CPLUSPLUS for warning suppression in MSVC.
+// Check FMT_CPLUSPLUS to avoid a warning in MSVC.
 #  if FMT_HAS_INCLUDE(<bit>) && FMT_CPLUSPLUS > 201703L
 #    include <bit>  // std::bit_cast
 #  endif
@@ -65,26 +66,42 @@
 #    include <string_view>
 #    define FMT_USE_STRING_VIEW
 #  endif
+
+#  if FMT_MSC_VERSION
+#    include <intrin.h>  // _BitScanReverse[64], _umul128
+#  endif
 #endif  // FMT_MODULE
 
+#if defined(FMT_USE_NONTYPE_TEMPLATE_ARGS)
+// Use the provided definition.
+#elif defined(__NVCOMPILER)
+#  define FMT_USE_NONTYPE_TEMPLATE_ARGS 0
+#elif FMT_GCC_VERSION >= 903 && FMT_CPLUSPLUS >= 201709L
+#  define FMT_USE_NONTYPE_TEMPLATE_ARGS 1
+#elif defined(__cpp_nontype_template_args) && \
+    __cpp_nontype_template_args >= 201911L
+#  define FMT_USE_NONTYPE_TEMPLATE_ARGS 1
+#elif FMT_CLANG_VERSION >= 1200 && FMT_CPLUSPLUS >= 202002L
+#  define FMT_USE_NONTYPE_TEMPLATE_ARGS 1
+#else
+#  define FMT_USE_NONTYPE_TEMPLATE_ARGS 0
+#endif
+
 #if defined __cpp_inline_variables && __cpp_inline_variables >= 201606L
 #  define FMT_INLINE_VARIABLE inline
 #else
 #  define FMT_INLINE_VARIABLE
 #endif
 
-#ifndef FMT_NO_UNIQUE_ADDRESS
-#  if FMT_CPLUSPLUS >= 202002L
-#    if FMT_HAS_CPP_ATTRIBUTE(no_unique_address)
-#      define FMT_NO_UNIQUE_ADDRESS [[no_unique_address]]
-// VS2019 v16.10 and later except clang-cl (https://reviews.llvm.org/D110485).
-#    elif (FMT_MSC_VERSION >= 1929) && !FMT_CLANG_VERSION
-#      define FMT_NO_UNIQUE_ADDRESS [[msvc::no_unique_address]]
-#    endif
-#  endif
-#endif
-#ifndef FMT_NO_UNIQUE_ADDRESS
-#  define FMT_NO_UNIQUE_ADDRESS
+// Check if RTTI is disabled.
+#ifdef FMT_USE_RTTI
+// Use the provided definition.
+#elif defined(__GXX_RTTI) || FMT_HAS_FEATURE(cxx_rtti) || defined(_CPPRTTI) || \
+    defined(__INTEL_RTTI__) || defined(__RTTI)
+// __RTTI is for EDG compilers. _CPPRTTI is for MSVC.
+#  define FMT_USE_RTTI 1
+#else
+#  define FMT_USE_RTTI 0
 #endif
 
 // Visibility when compiled as a shared library/object.
@@ -94,12 +111,6 @@
 #  define FMT_SO_VISIBILITY(value)
 #endif
 
-#ifdef __has_builtin
-#  define FMT_HAS_BUILTIN(x) __has_builtin(x)
-#else
-#  define FMT_HAS_BUILTIN(x) 0
-#endif
-
 #if FMT_GCC_VERSION || FMT_CLANG_VERSION
 #  define FMT_NOINLINE __attribute__((noinline))
 #else
@@ -107,14 +118,18 @@
 #endif
 
 namespace std {
-template <> struct iterator_traits<fmt::appender> {
+template <typename T> struct iterator_traits<fmt::basic_appender<T>> {
   using iterator_category = output_iterator_tag;
-  using value_type = char;
+  using value_type = T;
+  using difference_type =
+      decltype(static_cast<int*>(nullptr) - static_cast<int*>(nullptr));
+  using pointer = void;
+  using reference = void;
 };
 }  // namespace std
 
 #ifndef FMT_THROW
-#  if FMT_EXCEPTIONS
+#  if FMT_USE_EXCEPTIONS
 #    if FMT_MSC_VERSION || defined(__NVCC__)
 FMT_BEGIN_NAMESPACE
 namespace detail {
@@ -133,30 +148,8 @@ FMT_END_NAMESPACE
 #  else
 #    define FMT_THROW(x) \
       ::fmt::detail::assert_fail(__FILE__, __LINE__, (x).what())
-#  endif
-#endif
-
-#ifndef FMT_MAYBE_UNUSED
-#  if FMT_HAS_CPP17_ATTRIBUTE(maybe_unused)
-#    define FMT_MAYBE_UNUSED [[maybe_unused]]
-#  else
-#    define FMT_MAYBE_UNUSED
-#  endif
-#endif
-
-#ifndef FMT_USE_USER_DEFINED_LITERALS
-// EDG based compilers (Intel, NVIDIA, Elbrus, etc), GCC and MSVC support UDLs.
-//
-// GCC before 4.9 requires a space in `operator"" _a` which is invalid in later
-// compiler versions.
-#  if (FMT_HAS_FEATURE(cxx_user_literals) || FMT_GCC_VERSION >= 409 || \
-       FMT_MSC_VERSION >= 1900) &&                                     \
-      (!defined(__EDG_VERSION__) || __EDG_VERSION__ >= /* UDL feature */ 480)
-#    define FMT_USE_USER_DEFINED_LITERALS 1
-#  else
-#    define FMT_USE_USER_DEFINED_LITERALS 0
-#  endif
-#endif
+#  endif  // FMT_USE_EXCEPTIONS
+#endif    // FMT_THROW
 
 // Defining FMT_REDUCE_INT_INSTANTIATIONS to 1, will reduce the number of
 // integer formatter template instantiations to just one by only using the
@@ -166,7 +159,15 @@ FMT_END_NAMESPACE
 #  define FMT_REDUCE_INT_INSTANTIATIONS 0
 #endif
 
-// __builtin_clz is broken in clang with Microsoft CodeGen:
+FMT_BEGIN_NAMESPACE
+
+template <typename Char, typename Traits, typename Allocator>
+struct is_contiguous<std::basic_string<Char, Traits, Allocator>>
+    : std::true_type {};
+
+namespace detail {
+
+// __builtin_clz is broken in clang with Microsoft codegen:
 // https://github.com/fmtlib/fmt/issues/519.
 #if !FMT_MSC_VERSION
 #  if FMT_HAS_BUILTIN(__builtin_clz) || FMT_GCC_VERSION || FMT_ICC_VERSION
@@ -177,53 +178,30 @@ FMT_END_NAMESPACE
 #  endif
 #endif
 
-// __builtin_ctz is broken in Intel Compiler Classic on Windows:
-// https://github.com/fmtlib/fmt/issues/2510.
-#ifndef __ICL
-#  if FMT_HAS_BUILTIN(__builtin_ctz) || FMT_GCC_VERSION || FMT_ICC_VERSION || \
-      defined(__NVCOMPILER)
-#    define FMT_BUILTIN_CTZ(n) __builtin_ctz(n)
-#  endif
-#  if FMT_HAS_BUILTIN(__builtin_ctzll) || FMT_GCC_VERSION || \
-      FMT_ICC_VERSION || defined(__NVCOMPILER)
-#    define FMT_BUILTIN_CTZLL(n) __builtin_ctzll(n)
-#  endif
-#endif
-
-#if FMT_MSC_VERSION
-#  include <intrin.h>  // _BitScanReverse[64], _BitScanForward[64], _umul128
-#endif
-
-// Some compilers masquerade as both MSVC and GCC-likes or otherwise support
+// Some compilers masquerade as both MSVC and GCC but otherwise support
 // __builtin_clz and __builtin_clzll, so only define FMT_BUILTIN_CLZ using the
 // MSVC intrinsics if the clz and clzll builtins are not available.
-#if FMT_MSC_VERSION && !defined(FMT_BUILTIN_CLZLL) && \
-    !defined(FMT_BUILTIN_CTZLL)
-FMT_BEGIN_NAMESPACE
-namespace detail {
+#if FMT_MSC_VERSION && !defined(FMT_BUILTIN_CLZLL)
 // Avoid Clang with Microsoft CodeGen's -Wunknown-pragmas warning.
-#  if !defined(__clang__)
-#    pragma intrinsic(_BitScanForward)
+#  ifndef __clang__
 #    pragma intrinsic(_BitScanReverse)
-#    if defined(_WIN64)
-#      pragma intrinsic(_BitScanForward64)
+#    ifdef _WIN64
 #      pragma intrinsic(_BitScanReverse64)
 #    endif
 #  endif
 
 inline auto clz(uint32_t x) -> int {
+  FMT_ASSERT(x != 0, "");
+  FMT_MSC_WARNING(suppress : 6102)  // Suppress a bogus static analysis warning.
   unsigned long r = 0;
   _BitScanReverse(&r, x);
-  FMT_ASSERT(x != 0, "");
-  // Static analysis complains about using uninitialized data
-  // "r", but the only way that can happen is if "x" is 0,
-  // which the callers guarantee to not happen.
-  FMT_MSC_WARNING(suppress : 6102)
   return 31 ^ static_cast<int>(r);
 }
 #  define FMT_BUILTIN_CLZ(n) detail::clz(n)
 
 inline auto clzll(uint64_t x) -> int {
+  FMT_ASSERT(x != 0, "");
+  FMT_MSC_WARNING(suppress : 6102)  // Suppress a bogus static analysis warning.
   unsigned long r = 0;
 #  ifdef _WIN64
   _BitScanReverse64(&r, x);
@@ -234,48 +212,10 @@ inline auto clzll(uint64_t x) -> int {
   // Scan the low 32 bits.
   _BitScanReverse(&r, static_cast<uint32_t>(x));
 #  endif
-  FMT_ASSERT(x != 0, "");
-  FMT_MSC_WARNING(suppress : 6102)  // Suppress a bogus static analysis warning.
   return 63 ^ static_cast<int>(r);
 }
 #  define FMT_BUILTIN_CLZLL(n) detail::clzll(n)
-
-inline auto ctz(uint32_t x) -> int {
-  unsigned long r = 0;
-  _BitScanForward(&r, x);
-  FMT_ASSERT(x != 0, "");
-  FMT_MSC_WARNING(suppress : 6102)  // Suppress a bogus static analysis warning.
-  return static_cast<int>(r);
-}
-#  define FMT_BUILTIN_CTZ(n) detail::ctz(n)
-
-inline auto ctzll(uint64_t x) -> int {
-  unsigned long r = 0;
-  FMT_ASSERT(x != 0, "");
-  FMT_MSC_WARNING(suppress : 6102)  // Suppress a bogus static analysis warning.
-#  ifdef _WIN64
-  _BitScanForward64(&r, x);
-#  else
-  // Scan the low 32 bits.
-  if (_BitScanForward(&r, static_cast<uint32_t>(x))) return static_cast<int>(r);
-  // Scan the high 32 bits.
-  _BitScanForward(&r, static_cast<uint32_t>(x >> 32));
-  r += 32;
-#  endif
-  return static_cast<int>(r);
-}
-#  define FMT_BUILTIN_CTZLL(n) detail::ctzll(n)
-}  // namespace detail
-FMT_END_NAMESPACE
-#endif
-
-FMT_BEGIN_NAMESPACE
-
-template <typename Char, typename Traits, typename Allocator>
-struct is_contiguous<std::basic_string<Char, Traits, Allocator>>
-    : std::true_type {};
-
-namespace detail {
+#endif  // FMT_MSC_VERSION && !defined(FMT_BUILTIN_CLZLL)
 
 FMT_CONSTEXPR inline void abort_fuzzing_if(bool condition) {
   ignore_unused(condition);
@@ -290,6 +230,17 @@ template <typename Char> using std_string_view = std::basic_string_view<Char>;
 template <typename T> struct std_string_view {};
 #endif
 
+template <typename Char, Char... C> struct string_literal {
+  static constexpr Char value[sizeof...(C)] = {C...};
+  constexpr operator basic_string_view<Char>() const {
+    return {value, sizeof...(C)};
+  }
+};
+#if FMT_CPLUSPLUS < 201703L
+template <typename Char, Char... C>
+constexpr Char string_literal<Char, C...>::value[sizeof...(C)];
+#endif
+
 // Implementation of std::bit_cast for pre-C++20.
 template <typename To, typename From, FMT_ENABLE_IF(sizeof(To) == sizeof(From))>
 FMT_CONSTEXPR20 auto bit_cast(const From& from) -> To {
@@ -359,13 +310,14 @@ class uint128_fallback {
       -> uint128_fallback {
     return {~n.hi_, ~n.lo_};
   }
-  friend auto operator+(const uint128_fallback& lhs,
-                        const uint128_fallback& rhs) -> uint128_fallback {
+  friend FMT_CONSTEXPR auto operator+(const uint128_fallback& lhs,
+                                      const uint128_fallback& rhs)
+      -> uint128_fallback {
     auto result = uint128_fallback(lhs);
     result += rhs;
     return result;
   }
-  friend auto operator*(const uint128_fallback& lhs, uint32_t rhs)
+  friend FMT_CONSTEXPR auto operator*(const uint128_fallback& lhs, uint32_t rhs)
       -> uint128_fallback {
     FMT_ASSERT(lhs.hi_ == 0, "");
     uint64_t hi = (lhs.lo_ >> 32) * rhs;
@@ -373,7 +325,7 @@ class uint128_fallback {
     uint64_t new_lo = (hi << 32) + lo;
     return {(hi >> 32) + (new_lo < lo ? 1 : 0), new_lo};
   }
-  friend auto operator-(const uint128_fallback& lhs, uint64_t rhs)
+  friend constexpr auto operator-(const uint128_fallback& lhs, uint64_t rhs)
       -> uint128_fallback {
     return {lhs.hi_ - (lhs.lo_ < rhs ? 1 : 0), lhs.lo_ - rhs};
   }
@@ -453,17 +405,17 @@ template <> constexpr auto num_bits<uint128_fallback>() -> int { return 128; }
 // and 128-bit pointers to uint128_fallback.
 template <typename To, typename From, FMT_ENABLE_IF(sizeof(To) > sizeof(From))>
 inline auto bit_cast(const From& from) -> To {
-  constexpr auto size = static_cast<int>(sizeof(From) / sizeof(unsigned));
+  constexpr auto size = static_cast<int>(sizeof(From) / sizeof(unsigned short));
   struct data_t {
-    unsigned value[static_cast<unsigned>(size)];
+    unsigned short value[static_cast<unsigned>(size)];
   } data = bit_cast<data_t>(from);
   auto result = To();
   if (const_check(is_big_endian())) {
     for (int i = 0; i < size; ++i)
-      result = (result << num_bits<unsigned>()) | data.value[i];
+      result = (result << num_bits<unsigned short>()) | data.value[i];
   } else {
     for (int i = size - 1; i >= 0; --i)
-      result = (result << num_bits<unsigned>()) | data.value[i];
+      result = (result << num_bits<unsigned short>()) | data.value[i];
   }
   return result;
 }
@@ -499,21 +451,6 @@ FMT_INLINE void assume(bool condition) {
 #endif
 }
 
-// An approximation of iterator_t for pre-C++20 systems.
-template <typename T>
-using iterator_t = decltype(std::begin(std::declval<T&>()));
-template <typename T> using sentinel_t = decltype(std::end(std::declval<T&>()));
-
-// A workaround for std::string not having mutable data() until C++17.
-template <typename Char>
-inline auto get_data(std::basic_string<Char>& s) -> Char* {
-  return &s[0];
-}
-template <typename Container>
-inline auto get_data(Container& c) -> typename Container::value_type* {
-  return c.data();
-}
-
 // Attempts to reserve space for n extra characters in the output range.
 // Returns a pointer to the reserved range or a reference to it.
 template <typename OutputIt,
@@ -522,16 +459,17 @@ template <typename OutputIt,
 #if FMT_CLANG_VERSION >= 307 && !FMT_ICC_VERSION
 __attribute__((no_sanitize("undefined")))
 #endif
-inline auto
+FMT_CONSTEXPR20 inline auto
 reserve(OutputIt it, size_t n) -> typename OutputIt::value_type* {
   auto& c = get_container(it);
   size_t size = c.size();
   c.resize(size + n);
-  return get_data(c) + size;
+  return &c[size];
 }
 
 template <typename T>
-inline auto reserve(basic_appender<T> it, size_t n) -> basic_appender<T> {
+FMT_CONSTEXPR20 inline auto reserve(basic_appender<T> it, size_t n)
+    -> basic_appender<T> {
   buffer<T>& buf = get_container(it);
   buf.try_reserve(buf.size() + n);
   return it;
@@ -550,10 +488,11 @@ template <typename T, typename OutputIt>
 constexpr auto to_pointer(OutputIt, size_t) -> T* {
   return nullptr;
 }
-template <typename T> auto to_pointer(basic_appender<T> it, size_t n) -> T* {
+template <typename T>
+FMT_CONSTEXPR20 auto to_pointer(basic_appender<T> it, size_t n) -> T* {
   buffer<T>& buf = get_container(it);
+  buf.try_reserve(buf.size() + n);
   auto size = buf.size();
-  buf.try_reserve(size + n);
   if (buf.capacity() < size + n) return nullptr;
   buf.try_resize(size + n);
   return buf.data() + size;
@@ -583,9 +522,7 @@ FMT_CONSTEXPR auto fill_n(OutputIt out, Size count, const T& value)
 }
 template <typename T, typename Size>
 FMT_CONSTEXPR20 auto fill_n(T* out, Size count, char value) -> T* {
-  if (is_constant_evaluated()) {
-    return fill_n<T*, Size, T>(out, count, value);
-  }
+  if (is_constant_evaluated()) return fill_n<T*, Size, T>(out, count, value);
   std::memset(out, value, to_unsigned(count));
   return out + count;
 }
@@ -664,6 +601,7 @@ FMT_CONSTEXPR void for_each_codepoint(string_view s, F f) {
                     string_view(ptr, error ? 1 : to_unsigned(end - buf_ptr)));
     return result ? (error ? buf_ptr + 1 : end) : nullptr;
   };
+
   auto p = s.data();
   const size_t block_size = 4;  // utf8_decode always reads blocks of 4 chars.
   if (s.size() >= block_size) {
@@ -672,17 +610,20 @@ FMT_CONSTEXPR void for_each_codepoint(string_view s, F f) {
       if (!p) return;
     }
   }
-  if (auto num_chars_left = s.data() + s.size() - p) {
-    char buf[2 * block_size - 1] = {};
-    copy<char>(p, p + num_chars_left, buf);
-    const char* buf_ptr = buf;
-    do {
-      auto end = decode(buf_ptr, p);
-      if (!end) return;
-      p += end - buf_ptr;
-      buf_ptr = end;
-    } while (buf_ptr - buf < num_chars_left);
-  }
+  auto num_chars_left = to_unsigned(s.data() + s.size() - p);
+  if (num_chars_left == 0) return;
+
+  // Suppress bogus -Wstringop-overflow.
+  if (FMT_GCC_VERSION) num_chars_left &= 3;
+  char buf[2 * block_size - 1] = {};
+  copy<char>(p, p + num_chars_left, buf);
+  const char* buf_ptr = buf;
+  do {
+    auto end = decode(buf_ptr, p);
+    if (!end) return;
+    p += end - buf_ptr;
+    buf_ptr = end;
+  } while (buf_ptr < buf + num_chars_left);
 }
 
 template <typename Char>
@@ -697,7 +638,7 @@ FMT_CONSTEXPR inline auto compute_width(string_view s) -> size_t {
   struct count_code_points {
     size_t* count;
     FMT_CONSTEXPR auto operator()(uint32_t cp, string_view) const -> bool {
-      *count += detail::to_unsigned(
+      *count += to_unsigned(
           1 +
           (cp >= 0x1100 &&
            (cp <= 0x115f ||  // Hangul Jamo init. consonants
@@ -727,8 +668,7 @@ FMT_CONSTEXPR inline auto compute_width(string_view s) -> size_t {
 
 template <typename Char>
 inline auto code_point_index(basic_string_view<Char> s, size_t n) -> size_t {
-  size_t size = s.size();
-  return n < size ? n : size;
+  return min_of(n, s.size());
 }
 
 // Calculates the index of the nth code point in a UTF-8 string.
@@ -761,16 +701,6 @@ using is_integer =
                   !std::is_same<T, char>::value &&
                   !std::is_same<T, wchar_t>::value>;
 
-#ifndef FMT_USE_FLOAT
-#  define FMT_USE_FLOAT 1
-#endif
-#ifndef FMT_USE_DOUBLE
-#  define FMT_USE_DOUBLE 1
-#endif
-#ifndef FMT_USE_LONG_DOUBLE
-#  define FMT_USE_LONG_DOUBLE 1
-#endif
-
 #if defined(FMT_USE_FLOAT128)
 // Use the provided definition.
 #elif FMT_CLANG_VERSION && FMT_HAS_INCLUDE(<quadmath.h>)
@@ -784,7 +714,7 @@ using is_integer =
 #if FMT_USE_FLOAT128
 using float128 = __float128;
 #else
-using float128 = void;
+struct float128 {};
 #endif
 
 template <typename T> using is_float128 = std::is_same<T, float128>;
@@ -805,10 +735,21 @@ using is_double_double = bool_constant<std::numeric_limits<T>::digits == 106>;
 #  define FMT_USE_FULL_CACHE_DRAGONBOX 0
 #endif
 
-template <typename T, typename Enable = void>
-struct is_locale : std::false_type {};
-template <typename T>
-struct is_locale<T, void_t<decltype(T::classic())>> : std::true_type {};
+// An allocator that uses malloc/free to allow removing dependency on the C++
+// standard libary runtime.
+template <typename T> struct allocator {
+  using value_type = T;
+
+  T* allocate(size_t n) {
+    FMT_ASSERT(n <= max_value<size_t>() / sizeof(T), "");
+    T* p = static_cast<T*>(malloc(n * sizeof(T)));
+    if (!p) FMT_THROW(std::bad_alloc());
+    return p;
+  }
+
+  void deallocate(T* p, size_t) { free(p); }
+};
+
 }  // namespace detail
 
 FMT_BEGIN_EXPORT
@@ -831,7 +772,7 @@ enum { inline_buffer_size = 500 };
  * converted to `std::string` with `to_string(out)`.
  */
 template <typename T, size_t SIZE = inline_buffer_size,
-          typename Allocator = std::allocator<T>>
+          typename Allocator = detail::allocator<T>>
 class basic_memory_buffer : public detail::buffer<T> {
  private:
   T store_[SIZE];
@@ -855,7 +796,7 @@ class basic_memory_buffer : public detail::buffer<T> {
     if (size > new_capacity)
       new_capacity = size;
     else if (new_capacity > max_size)
-      new_capacity = size > max_size ? size : max_size;
+      new_capacity = max_of(size, max_size);
     T* old_data = buf.data();
     T* new_data = self.alloc_.allocate(new_capacity);
     // Suppress a bogus -Wstringop-overflow in gcc 13.1 (#3481).
@@ -873,7 +814,7 @@ class basic_memory_buffer : public detail::buffer<T> {
   using value_type = T;
   using const_reference = const T&;
 
-  FMT_CONSTEXPR20 explicit basic_memory_buffer(
+  FMT_CONSTEXPR explicit basic_memory_buffer(
       const Allocator& alloc = Allocator())
       : detail::buffer<T>(grow), alloc_(alloc) {
     this->set(store_, SIZE);
@@ -921,36 +862,69 @@ class basic_memory_buffer : public detail::buffer<T> {
 
   /// Resizes the buffer to contain `count` elements. If T is a POD type new
   /// elements may not be initialized.
-  FMT_CONSTEXPR20 void resize(size_t count) { this->try_resize(count); }
+  FMT_CONSTEXPR void resize(size_t count) { this->try_resize(count); }
 
   /// Increases the buffer capacity to `new_capacity`.
   void reserve(size_t new_capacity) { this->try_reserve(new_capacity); }
 
   using detail::buffer<T>::append;
   template <typename ContiguousRange>
-  void append(const ContiguousRange& range) {
+  FMT_CONSTEXPR20 void append(const ContiguousRange& range) {
     append(range.data(), range.data() + range.size());
   }
 };
 
 using memory_buffer = basic_memory_buffer<char>;
 
-template <typename T, size_t SIZE, typename Allocator>
-struct is_contiguous<basic_memory_buffer<T, SIZE, Allocator>> : std::true_type {
+template <size_t SIZE>
+FMT_NODISCARD auto to_string(const basic_memory_buffer<char, SIZE>& buf)
+    -> std::string {
+  auto size = buf.size();
+  detail::assume(size < std::string().max_size());
+  return {buf.data(), size};
+}
+
+// A writer to a buffered stream. It doesn't own the underlying stream.
+class writer {
+ private:
+  detail::buffer<char>* buf_;
+
+  // We cannot create a file buffer in advance because any write to a FILE may
+  // invalidate it.
+  FILE* file_;
+
+ public:
+  inline writer(FILE* f) : buf_(nullptr), file_(f) {}
+  inline writer(detail::buffer<char>& buf) : buf_(&buf) {}
+
+  /// Formats `args` according to specifications in `fmt` and writes the
+  /// output to the file.
+  template <typename... T> void print(format_string<T...> fmt, T&&... args) {
+    if (buf_)
+      fmt::format_to(appender(*buf_), fmt, std::forward<T>(args)...);
+    else
+      fmt::print(file_, fmt, std::forward<T>(args)...);
+  }
 };
 
-FMT_END_EXPORT
-namespace detail {
-FMT_API auto write_console(int fd, string_view text) -> bool;
-FMT_API void print(std::FILE*, string_view);
-}  // namespace detail
+class string_buffer {
+ private:
+  std::string str_;
+  detail::container_buffer<std::string> buf_;
 
-FMT_BEGIN_EXPORT
+ public:
+  inline string_buffer() : buf_(str_) {}
+
+  inline operator writer() { return buf_; }
+  inline std::string& str() { return str_; }
+};
+
+template <typename T, size_t SIZE, typename Allocator>
+struct is_contiguous<basic_memory_buffer<T, SIZE, Allocator>> : std::true_type {
+};
 
 // Suppress a misleading warning in older versions of clang.
-#if FMT_CLANG_VERSION
-#  pragma clang diagnostic ignored "-Wweak-vtables"
-#endif
+FMT_PRAGMA_CLANG(diagnostic ignored "-Wweak-vtables")
 
 /// An error reported from a formatting function.
 class FMT_SO_VISIBILITY("default") format_error : public std::runtime_error {
@@ -958,125 +932,36 @@ class FMT_SO_VISIBILITY("default") format_error : public std::runtime_error {
   using std::runtime_error::runtime_error;
 };
 
-namespace detail_exported {
-#if FMT_USE_NONTYPE_TEMPLATE_ARGS
+class loc_value;
+
+FMT_END_EXPORT
+namespace detail {
+FMT_API auto write_console(int fd, string_view text) -> bool;
+FMT_API void print(FILE*, string_view);
+}  // namespace detail
+
+namespace detail {
 template <typename Char, size_t N> struct fixed_string {
-  constexpr fixed_string(const Char (&str)[N]) {
-    detail::copy<Char, const Char*, Char*>(static_cast<const Char*>(str),
-                                           str + N, data);
+  FMT_CONSTEXPR20 fixed_string(const Char (&s)[N]) {
+    detail::copy<Char, const Char*, Char*>(static_cast<const Char*>(s), s + N,
+                                           data);
   }
   Char data[N] = {};
 };
-#endif
 
 // Converts a compile-time string to basic_string_view.
-template <typename Char, size_t N>
+FMT_EXPORT template <typename Char, size_t N>
 constexpr auto compile_string_to_view(const Char (&s)[N])
     -> basic_string_view<Char> {
   // Remove trailing NUL character if needed. Won't be present if this is used
   // with a raw character array (i.e. not defined as a string).
   return {s, N - (std::char_traits<Char>::to_int_type(s[N - 1]) == 0 ? 1 : 0)};
 }
-template <typename Char>
+FMT_EXPORT template <typename Char>
 constexpr auto compile_string_to_view(basic_string_view<Char> s)
     -> basic_string_view<Char> {
   return s;
 }
-}  // namespace detail_exported
-
-// A generic formatting context with custom output iterator and character
-// (code unit) support. Char is the format string code unit type which can be
-// different from OutputIt::value_type.
-template <typename OutputIt, typename Char> class generic_context {
- private:
-  OutputIt out_;
-  basic_format_args<generic_context> args_;
-  detail::locale_ref loc_;
-
- public:
-  using char_type = Char;
-  using iterator = OutputIt;
-  using parse_context_type = basic_format_parse_context<Char>;
-  template <typename T> using formatter_type = formatter<T, Char>;
-
-  constexpr generic_context(OutputIt out,
-                            basic_format_args<generic_context> ctx_args,
-                            detail::locale_ref loc = {})
-      : out_(out), args_(ctx_args), loc_(loc) {}
-  generic_context(generic_context&&) = default;
-  generic_context(const generic_context&) = delete;
-  void operator=(const generic_context&) = delete;
-
-  constexpr auto arg(int id) const -> basic_format_arg<generic_context> {
-    return args_.get(id);
-  }
-  auto arg(basic_string_view<Char> name) -> basic_format_arg<generic_context> {
-    return args_.get(name);
-  }
-  FMT_CONSTEXPR auto arg_id(basic_string_view<Char> name) -> int {
-    return args_.get_id(name);
-  }
-  auto args() const -> const basic_format_args<generic_context>& {
-    return args_;
-  }
-
-  FMT_CONSTEXPR auto out() -> iterator { return out_; }
-
-  void advance_to(iterator it) {
-    if (!detail::is_back_insert_iterator<iterator>()) out_ = it;
-  }
-
-  FMT_CONSTEXPR auto locale() -> detail::locale_ref { return loc_; }
-};
-
-class loc_value {
- private:
-  basic_format_arg<format_context> value_;
-
- public:
-  template <typename T, FMT_ENABLE_IF(!detail::is_float128<T>::value)>
-  loc_value(T value) : value_(detail::make_arg<format_context>(value)) {}
-
-  template <typename T, FMT_ENABLE_IF(detail::is_float128<T>::value)>
-  loc_value(T) {}
-
-  template <typename Visitor> auto visit(Visitor&& vis) -> decltype(vis(0)) {
-    return value_.visit(vis);
-  }
-};
-
-// A locale facet that formats values in UTF-8.
-// It is parameterized on the locale to avoid the heavy <locale> include.
-template <typename Locale> class format_facet : public Locale::facet {
- private:
-  std::string separator_;
-  std::string grouping_;
-  std::string decimal_point_;
-
- protected:
-  virtual auto do_put(appender out, loc_value val,
-                      const format_specs& specs) const -> bool;
-
- public:
-  static FMT_API typename Locale::id id;
-
-  explicit format_facet(Locale& loc);
-  explicit format_facet(string_view sep = "",
-                        std::initializer_list<unsigned char> g = {3},
-                        std::string decimal_point = ".")
-      : separator_(sep.data(), sep.size()),
-        grouping_(g.begin(), g.end()),
-        decimal_point_(decimal_point) {}
-
-  auto put(appender out, loc_value val, const format_specs& specs) const
-      -> bool {
-    return do_put(out, val, specs);
-  }
-};
-
-FMT_END_EXPORT
-
-namespace detail {
 
 // Returns true if value is negative, false otherwise.
 // Same as `value < 0` but doesn't produce warnings if T is an unsigned type.
@@ -1089,14 +974,6 @@ constexpr auto is_negative(T) -> bool {
   return false;
 }
 
-template <typename T>
-FMT_CONSTEXPR auto is_supported_floating_point(T) -> bool {
-  if (std::is_same<T, float>()) return FMT_USE_FLOAT;
-  if (std::is_same<T, double>()) return FMT_USE_DOUBLE;
-  if (std::is_same<T, long double>()) return FMT_USE_LONG_DOUBLE;
-  return true;
-}
-
 // Smallest of uint32_t, uint64_t, uint128_t that is large enough to
 // represent all values of an integral type T.
 template <typename T>
@@ -1113,21 +990,22 @@ using uint64_or_128_t = conditional_t<num_bits<T>() <= 64, uint64_t, uint128_t>;
       (factor) * 100000000, (factor) * 1000000000
 
 // Converts value in the range [0, 100) to a string.
-constexpr auto digits2(size_t value) -> const char* {
-  // GCC generates slightly better code when value is pointer-size.
-  return &"0001020304050607080910111213141516171819"
-         "2021222324252627282930313233343536373839"
-         "4041424344454647484950515253545556575859"
-         "6061626364656667686970717273747576777879"
-         "8081828384858687888990919293949596979899"[value * 2];
-}
-
-// Sign is a template parameter to workaround a bug in gcc 4.8.
-template <typename Char, typename Sign> constexpr auto sign(Sign s) -> Char {
-#if !FMT_GCC_VERSION || FMT_GCC_VERSION >= 604
-  static_assert(std::is_same<Sign, sign_t>::value, "");
-#endif
-  return static_cast<char>(((' ' << 24) | ('+' << 16) | ('-' << 8)) >> (s * 8));
+// GCC generates slightly better code when value is pointer-size.
+inline auto digits2(size_t value) -> const char* {
+  // Align data since unaligned access may be slower when crossing a
+  // hardware-specific boundary.
+  alignas(2) static const char data[] =
+      "0001020304050607080910111213141516171819"
+      "2021222324252627282930313233343536373839"
+      "4041424344454647484950515253545556575859"
+      "6061626364656667686970717273747576777879"
+      "8081828384858687888990919293949596979899";
+  return &data[value * 2];
+}
+
+template <typename Char> constexpr auto getsign(sign s) -> Char {
+  return static_cast<char>(((' ' << 24) | ('+' << 16) | ('-' << 8)) >>
+                           (static_cast<int>(s) * 8));
 }
 
 template <typename T> FMT_CONSTEXPR auto count_digits_fallback(T n) -> int {
@@ -1175,7 +1053,7 @@ inline auto do_count_digits(uint64_t n) -> int {
 // except for n == 0 in which case count_digits returns 1.
 FMT_CONSTEXPR20 inline auto count_digits(uint64_t n) -> int {
 #ifdef FMT_BUILTIN_CLZLL
-  if (!is_constant_evaluated()) return do_count_digits(n);
+  if (!is_constant_evaluated() && !FMT_OPTIMIZE_SIZE) return do_count_digits(n);
 #endif
   return count_digits_fallback(n);
 }
@@ -1225,9 +1103,7 @@ FMT_INLINE auto do_count_digits(uint32_t n) -> int {
 // Optional version of count_digits for better performance on 32-bit platforms.
 FMT_CONSTEXPR20 inline auto count_digits(uint32_t n) -> int {
 #ifdef FMT_BUILTIN_CLZ
-  if (!is_constant_evaluated()) {
-    return do_count_digits(n);
-  }
+  if (!is_constant_evaluated() && !FMT_OPTIMIZE_SIZE) return do_count_digits(n);
 #endif
   return count_digits_fallback(n);
 }
@@ -1264,6 +1140,17 @@ template <> inline auto decimal_point(locale_ref loc) -> wchar_t {
   return decimal_point_impl<wchar_t>(loc);
 }
 
+#ifndef FMT_HEADER_ONLY
+FMT_BEGIN_EXPORT
+extern template FMT_API auto thousands_sep_impl<char>(locale_ref)
+    -> thousands_sep_result<char>;
+extern template FMT_API auto thousands_sep_impl<wchar_t>(locale_ref)
+    -> thousands_sep_result<wchar_t>;
+extern template FMT_API auto decimal_point_impl(locale_ref) -> char;
+extern template FMT_API auto decimal_point_impl(locale_ref) -> wchar_t;
+FMT_END_EXPORT
+#endif  // FMT_HEADER_ONLY
+
 // Compares two characters for equality.
 template <typename Char> auto equal2(const Char* lhs, const char* rhs) -> bool {
   return lhs[0] == Char(rhs[0]) && lhs[1] == Char(rhs[1]);
@@ -1272,82 +1159,98 @@ inline auto equal2(const char* lhs, const char* rhs) -> bool {
   return memcmp(lhs, rhs, 2) == 0;
 }
 
-// Copies two characters from src to dst.
+// Writes a two-digit value to out.
 template <typename Char>
-FMT_CONSTEXPR20 FMT_INLINE void copy2(Char* dst, const char* src) {
-  if (!is_constant_evaluated() && sizeof(Char) == sizeof(char)) {
-    memcpy(dst, src, 2);
+FMT_CONSTEXPR20 FMT_INLINE void write2digits(Char* out, size_t value) {
+  if (!is_constant_evaluated() && std::is_same<Char, char>::value &&
+      !FMT_OPTIMIZE_SIZE) {
+    memcpy(out, digits2(value), 2);
     return;
   }
-  *dst++ = static_cast<Char>(*src++);
-  *dst = static_cast<Char>(*src);
+  *out++ = static_cast<Char>('0' + value / 10);
+  *out = static_cast<Char>('0' + value % 10);
 }
 
-template <typename Iterator> struct format_decimal_result {
-  Iterator begin;
-  Iterator end;
-};
-
-// Formats a decimal unsigned integer value writing into out pointing to a
-// buffer of specified size. The caller must ensure that the buffer is large
-// enough.
+// Formats a decimal unsigned integer value writing to out pointing to a buffer
+// of specified size. The caller must ensure that the buffer is large enough.
 template <typename Char, typename UInt>
-FMT_CONSTEXPR20 auto format_decimal(Char* out, UInt value, int size)
-    -> format_decimal_result<Char*> {
+FMT_CONSTEXPR20 auto do_format_decimal(Char* out, UInt value, int size)
+    -> Char* {
   FMT_ASSERT(size >= count_digits(value), "invalid digit count");
-  out += size;
-  Char* end = out;
+  unsigned n = to_unsigned(size);
   while (value >= 100) {
     // Integer division is slow so do it for a group of two digits instead
     // of for every digit. The idea comes from the talk by Alexandrescu
     // "Three Optimization Tips for C++". See speed-test for a comparison.
-    out -= 2;
-    copy2(out, digits2(static_cast<size_t>(value % 100)));
+    n -= 2;
+    write2digits(out + n, static_cast<unsigned>(value % 100));
     value /= 100;
   }
-  if (value < 10) {
-    *--out = static_cast<Char>('0' + value);
-    return {out, end};
+  if (value >= 10) {
+    n -= 2;
+    write2digits(out + n, static_cast<unsigned>(value));
+  } else {
+    out[--n] = static_cast<Char>('0' + value);
   }
-  out -= 2;
-  copy2(out, digits2(static_cast<size_t>(value)));
-  return {out, end};
+  return out + n;
 }
 
-template <typename Char, typename UInt, typename Iterator,
-          FMT_ENABLE_IF(!std::is_pointer<remove_cvref_t<Iterator>>::value)>
-FMT_CONSTEXPR inline auto format_decimal(Iterator out, UInt value, int size)
-    -> format_decimal_result<Iterator> {
-  // Buffer is large enough to hold all digits (digits10 + 1).
-  Char buffer[digits10<UInt>() + 1] = {};
-  auto end = format_decimal(buffer, value, size).end;
-  return {out, detail::copy_noinline<Char>(buffer, end, out)};
+template <typename Char, typename UInt>
+FMT_CONSTEXPR FMT_INLINE auto format_decimal(Char* out, UInt value,
+                                             int num_digits) -> Char* {
+  do_format_decimal(out, value, num_digits);
+  return out + num_digits;
 }
 
-template <unsigned BASE_BITS, typename Char, typename UInt>
-FMT_CONSTEXPR auto format_uint(Char* buffer, UInt value, int num_digits,
-                               bool upper = false) -> Char* {
-  buffer += num_digits;
-  Char* end = buffer;
-  do {
-    const char* digits = upper ? "0123456789ABCDEF" : "0123456789abcdef";
-    unsigned digit = static_cast<unsigned>(value & ((1 << BASE_BITS) - 1));
-    *--buffer = static_cast<Char>(BASE_BITS < 4 ? static_cast<char>('0' + digit)
-                                                : digits[digit]);
-  } while ((value >>= BASE_BITS) != 0);
-  return end;
+template <typename Char, typename UInt, typename OutputIt,
+          FMT_ENABLE_IF(is_back_insert_iterator<OutputIt>::value)>
+FMT_CONSTEXPR auto format_decimal(OutputIt out, UInt value, int num_digits)
+    -> OutputIt {
+  if (auto ptr = to_pointer<Char>(out, to_unsigned(num_digits))) {
+    do_format_decimal(ptr, value, num_digits);
+    return out;
+  }
+  // Buffer is large enough to hold all digits (digits10 + 1).
+  char buffer[digits10<UInt>() + 1];
+  if (is_constant_evaluated()) fill_n(buffer, sizeof(buffer), '\0');
+  do_format_decimal(buffer, value, num_digits);
+  return copy_noinline<Char>(buffer, buffer + num_digits, out);
+}
+
+template <typename Char, typename UInt>
+FMT_CONSTEXPR auto do_format_base2e(int base_bits, Char* out, UInt value,
+                                    int size, bool upper = false) -> Char* {
+  out += size;
+  do {
+    const char* digits = upper ? "0123456789ABCDEF" : "0123456789abcdef";
+    unsigned digit = static_cast<unsigned>(value & ((1 << base_bits) - 1));
+    *--out = static_cast<Char>(base_bits < 4 ? static_cast<char>('0' + digit)
+                                             : digits[digit]);
+  } while ((value >>= base_bits) != 0);
+  return out;
 }
 
-template <unsigned BASE_BITS, typename Char, typename It, typename UInt>
-FMT_CONSTEXPR inline auto format_uint(It out, UInt value, int num_digits,
-                                      bool upper = false) -> It {
+// Formats an unsigned integer in the power of two base (binary, octal, hex).
+template <typename Char, typename UInt>
+FMT_CONSTEXPR auto format_base2e(int base_bits, Char* out, UInt value,
+                                 int num_digits, bool upper = false) -> Char* {
+  do_format_base2e(base_bits, out, value, num_digits, upper);
+  return out + num_digits;
+}
+
+template <typename Char, typename OutputIt, typename UInt,
+          FMT_ENABLE_IF(is_back_insert_iterator<OutputIt>::value)>
+FMT_CONSTEXPR inline auto format_base2e(int base_bits, OutputIt out, UInt value,
+                                        int num_digits, bool upper = false)
+    -> OutputIt {
   if (auto ptr = to_pointer<Char>(out, to_unsigned(num_digits))) {
-    format_uint<BASE_BITS>(ptr, value, num_digits, upper);
+    format_base2e(base_bits, ptr, value, num_digits, upper);
     return out;
   }
-  // Buffer should be large enough to hold all digits (digits / BASE_BITS + 1).
-  char buffer[num_bits<UInt>() / BASE_BITS + 1] = {};
-  format_uint<BASE_BITS>(buffer, value, num_digits, upper);
+  // Make buffer large enough for any base.
+  char buffer[num_bits<UInt>()];
+  if (is_constant_evaluated()) fill_n(buffer, sizeof(buffer), '\0');
+  format_base2e(base_bits, buffer, value, num_digits, upper);
   return detail::copy_noinline<Char>(buffer, buffer + num_digits, out);
 }
 
@@ -1358,10 +1261,12 @@ class utf8_to_utf16 {
 
  public:
   FMT_API explicit utf8_to_utf16(string_view s);
-  operator basic_string_view<wchar_t>() const { return {&buffer_[0], size()}; }
-  auto size() const -> size_t { return buffer_.size() - 1; }
-  auto c_str() const -> const wchar_t* { return &buffer_[0]; }
-  auto str() const -> std::wstring { return {&buffer_[0], size()}; }
+  inline operator basic_string_view<wchar_t>() const {
+    return {&buffer_[0], size()};
+  }
+  inline auto size() const -> size_t { return buffer_.size() - 1; }
+  inline auto c_str() const -> const wchar_t* { return &buffer_[0]; }
+  inline auto str() const -> std::wstring { return {&buffer_[0], size()}; }
 };
 
 enum class to_utf8_error_policy { abort, replace };
@@ -1408,10 +1313,12 @@ template <typename WChar, typename Buffer = memory_buffer> class to_utf8 {
           if (policy == to_utf8_error_policy::abort) return false;
           buf.append(string_view("\xEF\xBF\xBD"));
           --p;
+          continue;
         } else {
           c = (c << 10) + static_cast<uint32_t>(*p) - 0x35fdc00;
         }
-      } else if (c < 0x80) {
+      }
+      if (c < 0x80) {
         buf.push_back(static_cast<char>(c));
       } else if (c < 0x800) {
         buf.push_back(static_cast<char>(0xc0 | (c >> 6)));
@@ -1579,25 +1486,30 @@ template <typename Float> constexpr auto exponent_bias() -> int {
 }
 
 // Writes the exponent exp in the form "[+-]d{2,3}" to buffer.
-template <typename Char, typename It>
-FMT_CONSTEXPR auto write_exponent(int exp, It it) -> It {
+template <typename Char, typename OutputIt>
+FMT_CONSTEXPR auto write_exponent(int exp, OutputIt out) -> OutputIt {
   FMT_ASSERT(-10000 < exp && exp < 10000, "exponent out of range");
   if (exp < 0) {
-    *it++ = static_cast<Char>('-');
+    *out++ = static_cast<Char>('-');
     exp = -exp;
   } else {
-    *it++ = static_cast<Char>('+');
+    *out++ = static_cast<Char>('+');
   }
-  if (exp >= 100) {
-    const char* top = digits2(to_unsigned(exp / 100));
-    if (exp >= 1000) *it++ = static_cast<Char>(top[0]);
-    *it++ = static_cast<Char>(top[1]);
-    exp %= 100;
-  }
-  const char* d = digits2(to_unsigned(exp));
-  *it++ = static_cast<Char>(d[0]);
-  *it++ = static_cast<Char>(d[1]);
-  return it;
+  auto uexp = static_cast<uint32_t>(exp);
+  if (is_constant_evaluated()) {
+    if (uexp < 10) *out++ = '0';
+    return format_decimal<Char>(out, uexp, count_digits(uexp));
+  }
+  if (uexp >= 100u) {
+    const char* top = digits2(uexp / 100);
+    if (uexp >= 1000u) *out++ = static_cast<Char>(top[0]);
+    *out++ = static_cast<Char>(top[1]);
+    uexp %= 100;
+  }
+  const char* d = digits2(uexp);
+  *out++ = static_cast<Char>(d[0]);
+  *out++ = static_cast<Char>(d[1]);
+  return out;
 }
 
 // A floating-point number f * pow(2, e) where F is an unsigned type.
@@ -1699,11 +1611,11 @@ constexpr auto convert_float(T value) -> convert_float_result<T> {
 }
 
 template <typename Char, typename OutputIt>
-FMT_NOINLINE FMT_CONSTEXPR auto fill(OutputIt it, size_t n, const fill_t& fill)
-    -> OutputIt {
-  auto fill_size = fill.size();
-  if (fill_size == 1) return detail::fill_n(it, n, fill.template get<Char>());
-  if (const Char* data = fill.template data<Char>()) {
+FMT_NOINLINE FMT_CONSTEXPR auto fill(OutputIt it, size_t n,
+                                     const basic_specs& specs) -> OutputIt {
+  auto fill_size = specs.fill_size();
+  if (fill_size == 1) return detail::fill_n(it, n, specs.fill_unit<Char>());
+  if (const Char* data = specs.fill<Char>()) {
     for (size_t i = 0; i < n; ++i) it = copy<Char>(data, data + fill_size, it);
   }
   return it;
@@ -1712,36 +1624,38 @@ FMT_NOINLINE FMT_CONSTEXPR auto fill(OutputIt it, size_t n, const fill_t& fill)
 // Writes the output of f, padded according to format specifications in specs.
 // size: output size in code units.
 // width: output display width in (terminal) column positions.
-template <typename Char, align::type align = align::left, typename OutputIt,
+template <typename Char, align default_align = align::left, typename OutputIt,
           typename F>
 FMT_CONSTEXPR auto write_padded(OutputIt out, const format_specs& specs,
                                 size_t size, size_t width, F&& f) -> OutputIt {
-  static_assert(align == align::left || align == align::right, "");
+  static_assert(default_align == align::left || default_align == align::right,
+                "");
   unsigned spec_width = to_unsigned(specs.width);
   size_t padding = spec_width > width ? spec_width - width : 0;
   // Shifts are encoded as string literals because static constexpr is not
   // supported in constexpr functions.
-  auto* shifts = align == align::left ? "\x1f\x1f\x00\x01" : "\x00\x1f\x00\x01";
-  size_t left_padding = padding >> shifts[specs.align];
+  auto* shifts =
+      default_align == align::left ? "\x1f\x1f\x00\x01" : "\x00\x1f\x00\x01";
+  size_t left_padding = padding >> shifts[static_cast<int>(specs.align())];
   size_t right_padding = padding - left_padding;
-  auto it = reserve(out, size + padding * specs.fill.size());
-  if (left_padding != 0) it = fill<Char>(it, left_padding, specs.fill);
+  auto it = reserve(out, size + padding * specs.fill_size());
+  if (left_padding != 0) it = fill<Char>(it, left_padding, specs);
   it = f(it);
-  if (right_padding != 0) it = fill<Char>(it, right_padding, specs.fill);
+  if (right_padding != 0) it = fill<Char>(it, right_padding, specs);
   return base_iterator(out, it);
 }
 
-template <typename Char, align::type align = align::left, typename OutputIt,
+template <typename Char, align default_align = align::left, typename OutputIt,
           typename F>
 constexpr auto write_padded(OutputIt out, const format_specs& specs,
                             size_t size, F&& f) -> OutputIt {
-  return write_padded<Char, align>(out, specs, size, size, f);
+  return write_padded<Char, default_align>(out, specs, size, size, f);
 }
 
-template <typename Char, align::type align = align::left, typename OutputIt>
+template <typename Char, align default_align = align::left, typename OutputIt>
 FMT_CONSTEXPR auto write_bytes(OutputIt out, string_view bytes,
                                const format_specs& specs = {}) -> OutputIt {
-  return write_padded<Char, align>(
+  return write_padded<Char, default_align>(
       out, specs, bytes.size(), [bytes](reserve_iterator<OutputIt> it) {
         const char* data = bytes.data();
         return copy<Char>(data, data + bytes.size(), it);
@@ -1756,7 +1670,7 @@ auto write_ptr(OutputIt out, UIntPtr value, const format_specs* specs)
   auto write = [=](reserve_iterator<OutputIt> it) {
     *it++ = static_cast<Char>('0');
     *it++ = static_cast<Char>('x');
-    return format_uint<4, Char>(it, value, num_digits);
+    return format_base2e<Char>(4, it, value, num_digits);
   };
   return specs ? write_padded<Char, align::right>(out, *specs, size, write)
                : base_iterator(out, write(reserve(out, size)));
@@ -1766,8 +1680,9 @@ auto write_ptr(OutputIt out, UIntPtr value, const format_specs* specs)
 FMT_API auto is_printable(uint32_t cp) -> bool;
 
 inline auto needs_escape(uint32_t cp) -> bool {
-  return cp < 0x20 || cp == 0x7f || cp == '"' || cp == '\\' ||
-         !is_printable(cp);
+  if (cp < 0x20 || cp == 0x7f || cp == '"' || cp == '\\') return true;
+  if (const_check(FMT_OPTIMIZE_SIZE > 1)) return false;
+  return !is_printable(cp);
 }
 
 template <typename Char> struct find_escape_result {
@@ -1789,7 +1704,7 @@ auto find_escape(const Char* begin, const Char* end)
 
 inline auto find_escape(const char* begin, const char* end)
     -> find_escape_result<char> {
-  if (!use_utf8()) return find_escape<char>(begin, end);
+  if (const_check(!use_utf8)) return find_escape<char>(begin, end);
   auto result = find_escape_result<char>{end, nullptr, 0};
   for_each_codepoint(string_view(begin, to_unsigned(end - begin)),
                      [&](uint32_t cp, string_view sv) {
@@ -1802,37 +1717,13 @@ inline auto find_escape(const char* begin, const char* end)
   return result;
 }
 
-#define FMT_STRING_IMPL(s, base, explicit)                                    \
-  [] {                                                                        \
-    /* Use the hidden visibility as a workaround for a GCC bug (#1973). */    \
-    /* Use a macro-like name to avoid shadowing warnings. */                  \
-    struct FMT_VISIBILITY("hidden") FMT_COMPILE_STRING : base {               \
-      using char_type FMT_MAYBE_UNUSED = fmt::remove_cvref_t<decltype(s[0])>; \
-      FMT_MAYBE_UNUSED FMT_CONSTEXPR explicit                                 \
-      operator fmt::basic_string_view<char_type>() const {                    \
-        return fmt::detail_exported::compile_string_to_view<char_type>(s);    \
-      }                                                                       \
-    };                                                                        \
-    return FMT_COMPILE_STRING();                                              \
-  }()
-
-/**
- * Constructs a compile-time format string from a string literal `s`.
- *
- * **Example**:
- *
- *     // A compile-time error because 'd' is an invalid specifier for strings.
- *     std::string s = fmt::format(FMT_STRING("{:d}"), "foo");
- */
-#define FMT_STRING(s) FMT_STRING_IMPL(s, fmt::detail::compile_string, )
-
 template <size_t width, typename Char, typename OutputIt>
 auto write_codepoint(OutputIt out, char prefix, uint32_t cp) -> OutputIt {
   *out++ = static_cast<Char>('\\');
   *out++ = static_cast<Char>(prefix);
   Char buf[width];
   fill_n(buf, width, static_cast<Char>('0'));
-  format_uint<4>(buf, cp, width);
+  format_base2e(4, buf, cp, width);
   return copy<Char>(buf, buf + width, out);
 }
 
@@ -1853,13 +1744,9 @@ auto write_escaped_cp(OutputIt out, const find_escape_result<Char>& escape)
     *out++ = static_cast<Char>('\\');
     c = static_cast<Char>('t');
     break;
-  case '"':
-    FMT_FALLTHROUGH;
-  case '\'':
-    FMT_FALLTHROUGH;
-  case '\\':
-    *out++ = static_cast<Char>('\\');
-    break;
+  case '"':  FMT_FALLTHROUGH;
+  case '\'': FMT_FALLTHROUGH;
+  case '\\': *out++ = static_cast<Char>('\\'); break;
   default:
     if (escape.cp < 0x100) return write_codepoint<2, Char>(out, 'x', escape.cp);
     if (escape.cp < 0x10000)
@@ -1912,7 +1799,7 @@ auto write_escaped_char(OutputIt out, Char v) -> OutputIt {
 template <typename Char, typename OutputIt>
 FMT_CONSTEXPR auto write_char(OutputIt out, Char value,
                               const format_specs& specs) -> OutputIt {
-  bool is_debug = specs.type == presentation_type::debug;
+  bool is_debug = specs.type() == presentation_type::debug;
   return write_padded<Char>(out, specs, 1, [=](reserve_iterator<OutputIt> it) {
     if (is_debug) return write_escaped_char(it, value);
     *it++ = value;
@@ -1930,56 +1817,6 @@ FMT_CONSTEXPR auto write(OutputIt out, Char value, const format_specs& specs,
              : write<Char>(out, static_cast<unsigned_type>(value), specs, loc);
 }
 
-// Data for write_int that doesn't depend on output iterator type. It is used to
-// avoid template code bloat.
-template <typename Char> struct write_int_data {
-  size_t size;
-  size_t padding;
-
-  FMT_CONSTEXPR write_int_data(int num_digits, unsigned prefix,
-                               const format_specs& specs)
-      : size((prefix >> 24) + to_unsigned(num_digits)), padding(0) {
-    if (specs.align == align::numeric) {
-      auto width = to_unsigned(specs.width);
-      if (width > size) {
-        padding = width - size;
-        size = width;
-      }
-    } else if (specs.precision > num_digits) {
-      size = (prefix >> 24) + to_unsigned(specs.precision);
-      padding = to_unsigned(specs.precision - num_digits);
-    }
-  }
-};
-
-// Writes an integer in the format
-//   <left-padding><prefix><numeric-padding><digits><right-padding>
-// where <digits> are written by write_digits(it).
-// prefix contains chars in three lower bytes and the size in the fourth byte.
-template <typename Char, typename OutputIt, typename W>
-FMT_CONSTEXPR FMT_INLINE auto write_int(OutputIt out, int num_digits,
-                                        unsigned prefix,
-                                        const format_specs& specs,
-                                        W write_digits) -> OutputIt {
-  // Slightly faster check for specs.width == 0 && specs.precision == -1.
-  if ((specs.width | (specs.precision + 1)) == 0) {
-    auto it = reserve(out, to_unsigned(num_digits) + (prefix >> 24));
-    if (prefix != 0) {
-      for (unsigned p = prefix & 0xffffff; p != 0; p >>= 8)
-        *it++ = static_cast<Char>(p & 0xff);
-    }
-    return base_iterator(out, write_digits(it));
-  }
-  auto data = write_int_data<Char>(num_digits, prefix, specs);
-  return write_padded<Char, align::right>(
-      out, specs, data.size, [=](reserve_iterator<OutputIt> it) {
-        for (unsigned p = prefix & 0xffffff; p != 0; p >>= 8)
-          *it++ = static_cast<Char>(p & 0xff);
-        it = detail::fill_n(it, data.padding, static_cast<Char>('0'));
-        return write_digits(it);
-      });
-}
-
 template <typename Char> class digit_grouping {
  private:
   std::string grouping_;
@@ -2002,7 +1839,9 @@ template <typename Char> class digit_grouping {
   }
 
  public:
-  explicit digit_grouping(locale_ref loc, bool localized = true) {
+  template <typename Locale,
+            FMT_ENABLE_IF(std::is_same<Locale, locale_ref>::value)>
+  explicit digit_grouping(Locale loc, bool localized = true) {
     if (!localized) return;
     auto sep = thousands_sep<Char>(loc);
     grouping_ = sep.grouping;
@@ -2057,34 +1896,32 @@ auto write_int(OutputIt out, UInt value, unsigned prefix,
   static_assert(std::is_same<uint64_or_128_t<UInt>, UInt>::value, "");
   int num_digits = 0;
   auto buffer = memory_buffer();
-  switch (specs.type) {
-  default:
-    FMT_ASSERT(false, "");
-    FMT_FALLTHROUGH;
+  switch (specs.type()) {
+  default: FMT_ASSERT(false, ""); FMT_FALLTHROUGH;
   case presentation_type::none:
   case presentation_type::dec:
     num_digits = count_digits(value);
     format_decimal<char>(appender(buffer), value, num_digits);
     break;
   case presentation_type::hex:
-    if (specs.alt)
-      prefix_append(prefix, unsigned(specs.upper ? 'X' : 'x') << 8 | '0');
+    if (specs.alt())
+      prefix_append(prefix, unsigned(specs.upper() ? 'X' : 'x') << 8 | '0');
     num_digits = count_digits<4>(value);
-    format_uint<4, char>(appender(buffer), value, num_digits, specs.upper);
+    format_base2e<char>(4, appender(buffer), value, num_digits, specs.upper());
     break;
   case presentation_type::oct:
     num_digits = count_digits<3>(value);
     // Octal prefix '0' is counted as a digit, so only add it if precision
     // is not greater than the number of digits.
-    if (specs.alt && specs.precision <= num_digits && value != 0)
+    if (specs.alt() && specs.precision <= num_digits && value != 0)
       prefix_append(prefix, '0');
-    format_uint<3, char>(appender(buffer), value, num_digits);
+    format_base2e<char>(3, appender(buffer), value, num_digits);
     break;
   case presentation_type::bin:
-    if (specs.alt)
-      prefix_append(prefix, unsigned(specs.upper ? 'B' : 'b') << 8 | '0');
+    if (specs.alt())
+      prefix_append(prefix, unsigned(specs.upper() ? 'B' : 'b') << 8 | '0');
     num_digits = count_digits<1>(value);
-    format_uint<1, char>(appender(buffer), value, num_digits);
+    format_base2e<char>(1, appender(buffer), value, num_digits);
     break;
   case presentation_type::chr:
     return write_char<Char>(out, static_cast<Char>(value), specs);
@@ -2100,12 +1937,14 @@ auto write_int(OutputIt out, UInt value, unsigned prefix,
       });
 }
 
+#if FMT_USE_LOCALE
 // Writes a localized value.
 FMT_API auto write_loc(appender out, loc_value value, const format_specs& specs,
                        locale_ref loc) -> bool;
+#endif
 template <typename OutputIt>
-inline auto write_loc(OutputIt, loc_value, const format_specs&, locale_ref)
-    -> bool {
+inline auto write_loc(OutputIt, const loc_value&, const format_specs&,
+                      locale_ref) -> bool {
   return false;
 }
 
@@ -2115,7 +1954,7 @@ template <typename UInt> struct write_int_arg {
 };
 
 template <typename T>
-FMT_CONSTEXPR auto make_write_int_arg(T value, sign_t sign)
+FMT_CONSTEXPR auto make_write_int_arg(T value, sign s)
     -> write_int_arg<uint32_or_64_or_128_t<T>> {
   auto prefix = 0u;
   auto abs_value = static_cast<uint32_or_64_or_128_t<T>>(value);
@@ -2125,7 +1964,7 @@ FMT_CONSTEXPR auto make_write_int_arg(T value, sign_t sign)
   } else {
     constexpr const unsigned prefixes[4] = {0, 0, 0x1000000u | '+',
                                             0x1000000u | ' '};
-    prefix = prefixes[sign];
+    prefix = prefixes[static_cast<int>(s)];
   }
   return {abs_value, prefix};
 }
@@ -2139,7 +1978,7 @@ template <typename Char = char> struct loc_writer {
 
   template <typename T, FMT_ENABLE_IF(is_integer<T>::value)>
   auto operator()(T value) -> bool {
-    auto arg = make_write_int_arg(value, specs.sign);
+    auto arg = make_write_int_arg(value, specs.sign());
     write_int(out, static_cast<uint64_or_128_t<T>>(arg.abs_value), arg.prefix,
               specs, digit_grouping<Char>(grouping, sep));
     return true;
@@ -2151,65 +1990,99 @@ template <typename Char = char> struct loc_writer {
   }
 };
 
+// Size and padding computation separate from write_int to avoid template bloat.
+struct size_padding {
+  unsigned size;
+  unsigned padding;
+
+  FMT_CONSTEXPR size_padding(int num_digits, unsigned prefix,
+                             const format_specs& specs)
+      : size((prefix >> 24) + to_unsigned(num_digits)), padding(0) {
+    if (specs.align() == align::numeric) {
+      auto width = to_unsigned(specs.width);
+      if (width > size) {
+        padding = width - size;
+        size = width;
+      }
+    } else if (specs.precision > num_digits) {
+      size = (prefix >> 24) + to_unsigned(specs.precision);
+      padding = to_unsigned(specs.precision - num_digits);
+    }
+  }
+};
+
 template <typename Char, typename OutputIt, typename T>
 FMT_CONSTEXPR FMT_INLINE auto write_int(OutputIt out, write_int_arg<T> arg,
-                                        const format_specs& specs, locale_ref)
-    -> OutputIt {
+                                        const format_specs& specs) -> OutputIt {
   static_assert(std::is_same<T, uint32_or_64_or_128_t<T>>::value, "");
+
+  constexpr int buffer_size = num_bits<T>();
+  char buffer[buffer_size];
+  if (is_constant_evaluated()) fill_n(buffer, buffer_size, '\0');
+  const char* begin = nullptr;
+  const char* end = buffer + buffer_size;
+
   auto abs_value = arg.abs_value;
   auto prefix = arg.prefix;
-  switch (specs.type) {
-  default:
-    FMT_ASSERT(false, "");
-    FMT_FALLTHROUGH;
+  switch (specs.type()) {
+  default: FMT_ASSERT(false, ""); FMT_FALLTHROUGH;
   case presentation_type::none:
-  case presentation_type::dec: {
-    int num_digits = count_digits(abs_value);
-    return write_int<Char>(
-        out, num_digits, prefix, specs, [=](reserve_iterator<OutputIt> it) {
-          return format_decimal<Char>(it, abs_value, num_digits).end;
-        });
-  }
-  case presentation_type::hex: {
-    if (specs.alt)
-      prefix_append(prefix, unsigned(specs.upper ? 'X' : 'x') << 8 | '0');
-    int num_digits = count_digits<4>(abs_value);
-    return write_int<Char>(
-        out, num_digits, prefix, specs, [=](reserve_iterator<OutputIt> it) {
-          return format_uint<4, Char>(it, abs_value, num_digits, specs.upper);
-        });
-  }
+  case presentation_type::dec:
+    begin = do_format_decimal(buffer, abs_value, buffer_size);
+    break;
+  case presentation_type::hex:
+    begin = do_format_base2e(4, buffer, abs_value, buffer_size, specs.upper());
+    if (specs.alt())
+      prefix_append(prefix, unsigned(specs.upper() ? 'X' : 'x') << 8 | '0');
+    break;
   case presentation_type::oct: {
-    int num_digits = count_digits<3>(abs_value);
+    begin = do_format_base2e(3, buffer, abs_value, buffer_size);
     // Octal prefix '0' is counted as a digit, so only add it if precision
     // is not greater than the number of digits.
-    if (specs.alt && specs.precision <= num_digits && abs_value != 0)
+    auto num_digits = end - begin;
+    if (specs.alt() && specs.precision <= num_digits && abs_value != 0)
       prefix_append(prefix, '0');
-    return write_int<Char>(
-        out, num_digits, prefix, specs, [=](reserve_iterator<OutputIt> it) {
-          return format_uint<3, Char>(it, abs_value, num_digits);
-        });
-  }
-  case presentation_type::bin: {
-    if (specs.alt)
-      prefix_append(prefix, unsigned(specs.upper ? 'B' : 'b') << 8 | '0');
-    int num_digits = count_digits<1>(abs_value);
-    return write_int<Char>(
-        out, num_digits, prefix, specs, [=](reserve_iterator<OutputIt> it) {
-          return format_uint<1, Char>(it, abs_value, num_digits);
-        });
+    break;
   }
+  case presentation_type::bin:
+    begin = do_format_base2e(1, buffer, abs_value, buffer_size);
+    if (specs.alt())
+      prefix_append(prefix, unsigned(specs.upper() ? 'B' : 'b') << 8 | '0');
+    break;
   case presentation_type::chr:
     return write_char<Char>(out, static_cast<Char>(abs_value), specs);
   }
+
+  // Write an integer in the format
+  //   <left-padding><prefix><numeric-padding><digits><right-padding>
+  // prefix contains chars in three lower bytes and the size in the fourth byte.
+  int num_digits = static_cast<int>(end - begin);
+  // Slightly faster check for specs.width == 0 && specs.precision == -1.
+  if ((specs.width | (specs.precision + 1)) == 0) {
+    auto it = reserve(out, to_unsigned(num_digits) + (prefix >> 24));
+    for (unsigned p = prefix & 0xffffff; p != 0; p >>= 8)
+      *it++ = static_cast<Char>(p & 0xff);
+    return base_iterator(out, copy<Char>(begin, end, it));
+  }
+  auto sp = size_padding(num_digits, prefix, specs);
+  unsigned padding = sp.padding;
+  return write_padded<Char, align::right>(
+      out, specs, sp.size, [=](reserve_iterator<OutputIt> it) {
+        for (unsigned p = prefix & 0xffffff; p != 0; p >>= 8)
+          *it++ = static_cast<Char>(p & 0xff);
+        it = detail::fill_n(it, padding, static_cast<Char>('0'));
+        return copy<Char>(begin, end, it);
+      });
 }
+
 template <typename Char, typename OutputIt, typename T>
 FMT_CONSTEXPR FMT_NOINLINE auto write_int_noinline(OutputIt out,
                                                    write_int_arg<T> arg,
-                                                   const format_specs& specs,
-                                                   locale_ref loc) -> OutputIt {
-  return write_int<Char>(out, arg, specs, loc);
+                                                   const format_specs& specs)
+    -> OutputIt {
+  return write_int<Char>(out, arg, specs);
 }
+
 template <typename Char, typename T,
           FMT_ENABLE_IF(is_integral<T>::value &&
                         !std::is_same<T, bool>::value &&
@@ -2217,10 +2090,11 @@ template <typename Char, typename T,
 FMT_CONSTEXPR FMT_INLINE auto write(basic_appender<Char> out, T value,
                                     const format_specs& specs, locale_ref loc)
     -> basic_appender<Char> {
-  if (specs.localized && write_loc(out, value, specs, loc)) return out;
-  return write_int_noinline<Char>(out, make_write_int_arg(value, specs.sign),
-                                  specs, loc);
+  if (specs.localized() && write_loc(out, value, specs, loc)) return out;
+  return write_int_noinline<Char>(out, make_write_int_arg(value, specs.sign()),
+                                  specs);
 }
+
 // An inlined version of write used in format string compilation.
 template <typename Char, typename OutputIt, typename T,
           FMT_ENABLE_IF(is_integral<T>::value &&
@@ -2230,51 +2104,10 @@ template <typename Char, typename OutputIt, typename T,
 FMT_CONSTEXPR FMT_INLINE auto write(OutputIt out, T value,
                                     const format_specs& specs, locale_ref loc)
     -> OutputIt {
-  if (specs.localized && write_loc(out, value, specs, loc)) return out;
-  return write_int<Char>(out, make_write_int_arg(value, specs.sign), specs,
-                         loc);
+  if (specs.localized() && write_loc(out, value, specs, loc)) return out;
+  return write_int<Char>(out, make_write_int_arg(value, specs.sign()), specs);
 }
 
-// An output iterator that counts the number of objects written to it and
-// discards them.
-class counting_iterator {
- private:
-  size_t count_;
-
- public:
-  using iterator_category = std::output_iterator_tag;
-  using difference_type = std::ptrdiff_t;
-  using pointer = void;
-  using reference = void;
-  FMT_UNCHECKED_ITERATOR(counting_iterator);
-
-  struct value_type {
-    template <typename T> FMT_CONSTEXPR void operator=(const T&) {}
-  };
-
-  FMT_CONSTEXPR counting_iterator() : count_(0) {}
-
-  FMT_CONSTEXPR auto count() const -> size_t { return count_; }
-
-  FMT_CONSTEXPR auto operator++() -> counting_iterator& {
-    ++count_;
-    return *this;
-  }
-  FMT_CONSTEXPR auto operator++(int) -> counting_iterator {
-    auto it = *this;
-    ++*this;
-    return it;
-  }
-
-  FMT_CONSTEXPR friend auto operator+(counting_iterator it, difference_type n)
-      -> counting_iterator {
-    it.count_ += static_cast<size_t>(n);
-    return it;
-  }
-
-  FMT_CONSTEXPR auto operator*() const -> value_type { return {}; }
-};
-
 template <typename Char, typename OutputIt>
 FMT_CONSTEXPR auto write(OutputIt out, basic_string_view<Char> s,
                          const format_specs& specs) -> OutputIt {
@@ -2282,33 +2115,34 @@ FMT_CONSTEXPR auto write(OutputIt out, basic_string_view<Char> s,
   auto size = s.size();
   if (specs.precision >= 0 && to_unsigned(specs.precision) < size)
     size = code_point_index(s, to_unsigned(specs.precision));
-  bool is_debug = specs.type == presentation_type::debug;
-  size_t width = 0;
 
-  if (is_debug) size = write_escaped_string(counting_iterator{}, s).count();
+  bool is_debug = specs.type() == presentation_type::debug;
+  if (is_debug) {
+    auto buf = counting_buffer<Char>();
+    write_escaped_string(basic_appender<Char>(buf), s);
+    size = buf.count();
+  }
 
+  size_t width = 0;
   if (specs.width != 0) {
-    if (is_debug)
-      width = size;
-    else
-      width = compute_width(basic_string_view<Char>(data, size));
+    width =
+        is_debug ? size : compute_width(basic_string_view<Char>(data, size));
   }
-  return write_padded<Char>(out, specs, size, width,
-                            [=](reserve_iterator<OutputIt> it) {
-                              if (is_debug) return write_escaped_string(it, s);
-                              return copy<Char>(data, data + size, it);
-                            });
+  return write_padded<Char>(
+      out, specs, size, width, [=](reserve_iterator<OutputIt> it) {
+        return is_debug ? write_escaped_string(it, s)
+                        : copy<Char>(data, data + size, it);
+      });
 }
 template <typename Char, typename OutputIt>
-FMT_CONSTEXPR auto write(OutputIt out,
-                         basic_string_view<type_identity_t<Char>> s,
+FMT_CONSTEXPR auto write(OutputIt out, basic_string_view<Char> s,
                          const format_specs& specs, locale_ref) -> OutputIt {
   return write<Char>(out, s, specs);
 }
 template <typename Char, typename OutputIt>
 FMT_CONSTEXPR auto write(OutputIt out, const Char* s, const format_specs& specs,
                          locale_ref) -> OutputIt {
-  if (specs.type == presentation_type::pointer)
+  if (specs.type() == presentation_type::pointer)
     return write_ptr<Char>(out, bit_cast<uintptr_t>(s), &specs);
   if (!s) report_error("string pointer is null");
   return write<Char>(out, basic_string_view<Char>(s), specs, {});
@@ -2331,30 +2165,23 @@ FMT_CONSTEXPR auto write(OutputIt out, T value) -> OutputIt {
     return out;
   }
   if (negative) *out++ = static_cast<Char>('-');
-  return format_decimal<Char>(out, abs_value, num_digits).end;
+  return format_decimal<Char>(out, abs_value, num_digits);
 }
 
-// DEPRECATED!
 template <typename Char>
 FMT_CONSTEXPR auto parse_align(const Char* begin, const Char* end,
                                format_specs& specs) -> const Char* {
   FMT_ASSERT(begin != end, "");
-  auto align = align::none;
+  auto alignment = align::none;
   auto p = begin + code_point_length(begin);
   if (end - p <= 0) p = begin;
   for (;;) {
     switch (to_ascii(*p)) {
-    case '<':
-      align = align::left;
-      break;
-    case '>':
-      align = align::right;
-      break;
-    case '^':
-      align = align::center;
-      break;
+    case '<': alignment = align::left; break;
+    case '>': alignment = align::right; break;
+    case '^': alignment = align::center; break;
     }
-    if (align != align::none) {
+    if (alignment != align::none) {
       if (p != begin) {
         auto c = *begin;
         if (c == '}') return begin;
@@ -2362,7 +2189,7 @@ FMT_CONSTEXPR auto parse_align(const Char* begin, const Char* end,
           report_error("invalid fill character '{'");
           return begin;
         }
-        specs.fill = basic_string_view<Char>(begin, to_unsigned(p - begin));
+        specs.set_fill(basic_string_view<Char>(begin, to_unsigned(p - begin)));
         begin = p + 1;
       } else {
         ++begin;
@@ -2373,68 +2200,25 @@ FMT_CONSTEXPR auto parse_align(const Char* begin, const Char* end,
     }
     p = begin;
   }
-  specs.align = align;
+  specs.set_align(alignment);
   return begin;
 }
 
-// A floating-point presentation format.
-enum class float_format : unsigned char {
-  general,  // General: exponent notation or fixed point based on magnitude.
-  exp,      // Exponent notation with the default precision of 6, e.g. 1.2e-3.
-  fixed     // Fixed point with the default precision of 6, e.g. 0.0012.
-};
-
-struct float_specs {
-  int precision;
-  float_format format : 8;
-  sign_t sign : 8;
-  bool locale : 1;
-  bool binary32 : 1;
-  bool showpoint : 1;
-};
-
-// DEPRECATED!
-FMT_CONSTEXPR inline auto parse_float_type_spec(const format_specs& specs)
-    -> float_specs {
-  auto result = float_specs();
-  result.showpoint = specs.alt;
-  result.locale = specs.localized;
-  switch (specs.type) {
-  default:
-    FMT_FALLTHROUGH;
-  case presentation_type::none:
-    result.format = float_format::general;
-    break;
-  case presentation_type::exp:
-    result.format = float_format::exp;
-    result.showpoint |= specs.precision != 0;
-    break;
-  case presentation_type::fixed:
-    result.format = float_format::fixed;
-    result.showpoint |= specs.precision != 0;
-    break;
-  case presentation_type::general:
-    result.format = float_format::general;
-    break;
-  }
-  return result;
-}
-
 template <typename Char, typename OutputIt>
 FMT_CONSTEXPR20 auto write_nonfinite(OutputIt out, bool isnan,
-                                     format_specs specs, sign_t sign)
-    -> OutputIt {
+                                     format_specs specs, sign s) -> OutputIt {
   auto str =
-      isnan ? (specs.upper ? "NAN" : "nan") : (specs.upper ? "INF" : "inf");
+      isnan ? (specs.upper() ? "NAN" : "nan") : (specs.upper() ? "INF" : "inf");
   constexpr size_t str_size = 3;
-  auto size = str_size + (sign ? 1 : 0);
+  auto size = str_size + (s != sign::none ? 1 : 0);
   // Replace '0'-padding with space for non-finite values.
   const bool is_zero_fill =
-      specs.fill.size() == 1 && specs.fill.template get<Char>() == '0';
-  if (is_zero_fill) specs.fill = ' ';
+      specs.fill_size() == 1 && specs.fill_unit<Char>() == '0';
+  if (is_zero_fill) specs.set_fill(' ');
   return write_padded<Char>(out, specs, size,
                             [=](reserve_iterator<OutputIt> it) {
-                              if (sign) *it++ = detail::sign<Char>(sign);
+                              if (s != sign::none)
+                                *it++ = detail::getsign<Char>(s);
                               return copy<Char>(str, str + str_size, it);
                             });
 }
@@ -2462,7 +2246,7 @@ constexpr auto write_significand(OutputIt out, const char* significand,
 template <typename Char, typename OutputIt, typename UInt>
 inline auto write_significand(OutputIt out, UInt significand,
                               int significand_size) -> OutputIt {
-  return format_decimal<Char>(out, significand, significand_size).end;
+  return format_decimal<Char>(out, significand, significand_size);
 }
 template <typename Char, typename OutputIt, typename T, typename Grouping>
 FMT_CONSTEXPR20 auto write_significand(OutputIt out, T significand,
@@ -2482,14 +2266,13 @@ template <typename Char, typename UInt,
           FMT_ENABLE_IF(std::is_integral<UInt>::value)>
 inline auto write_significand(Char* out, UInt significand, int significand_size,
                               int integral_size, Char decimal_point) -> Char* {
-  if (!decimal_point)
-    return format_decimal(out, significand, significand_size).end;
+  if (!decimal_point) return format_decimal(out, significand, significand_size);
   out += significand_size + 1;
   Char* end = out;
   int floating_size = significand_size - integral_size;
   for (int i = floating_size / 2; i > 0; --i) {
     out -= 2;
-    copy2(out, digits2(static_cast<std::size_t>(significand % 100)));
+    write2digits(out, static_cast<std::size_t>(significand % 100));
     significand /= 100;
   }
   if (floating_size % 2 != 0) {
@@ -2546,33 +2329,31 @@ FMT_CONSTEXPR20 auto write_significand(OutputIt out, T significand,
 template <typename Char, typename OutputIt, typename DecimalFP,
           typename Grouping = digit_grouping<Char>>
 FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& f,
-                                    const format_specs& specs,
-                                    float_specs fspecs, locale_ref loc)
-    -> OutputIt {
+                                    const format_specs& specs, sign s,
+                                    locale_ref loc) -> OutputIt {
   auto significand = f.significand;
   int significand_size = get_significand_size(f);
   const Char zero = static_cast<Char>('0');
-  auto sign = fspecs.sign;
-  size_t size = to_unsigned(significand_size) + (sign ? 1 : 0);
+  size_t size = to_unsigned(significand_size) + (s != sign::none ? 1 : 0);
   using iterator = reserve_iterator<OutputIt>;
 
-  Char decimal_point =
-      fspecs.locale ? detail::decimal_point<Char>(loc) : static_cast<Char>('.');
+  Char decimal_point = specs.localized() ? detail::decimal_point<Char>(loc)
+                                         : static_cast<Char>('.');
 
   int output_exp = f.exponent + significand_size - 1;
   auto use_exp_format = [=]() {
-    if (fspecs.format == float_format::exp) return true;
-    if (fspecs.format != float_format::general) return false;
+    if (specs.type() == presentation_type::exp) return true;
+    if (specs.type() == presentation_type::fixed) return false;
     // Use the fixed notation if the exponent is in [exp_lower, exp_upper),
     // e.g. 0.0001 instead of 1e-04. Otherwise use the exponent notation.
     const int exp_lower = -4, exp_upper = 16;
     return output_exp < exp_lower ||
-           output_exp >= (fspecs.precision > 0 ? fspecs.precision : exp_upper);
+           output_exp >= (specs.precision > 0 ? specs.precision : exp_upper);
   };
   if (use_exp_format()) {
     int num_zeros = 0;
-    if (fspecs.showpoint) {
-      num_zeros = fspecs.precision - significand_size;
+    if (specs.alt()) {
+      num_zeros = specs.precision - significand_size;
       if (num_zeros < 0) num_zeros = 0;
       size += to_unsigned(num_zeros);
     } else if (significand_size == 1) {
@@ -2583,9 +2364,9 @@ FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& f,
     if (abs_output_exp >= 100) exp_digits = abs_output_exp >= 1000 ? 4 : 3;
 
     size += to_unsigned((decimal_point ? 1 : 0) + 2 + exp_digits);
-    char exp_char = specs.upper ? 'E' : 'e';
+    char exp_char = specs.upper() ? 'E' : 'e';
     auto write = [=](iterator it) {
-      if (sign) *it++ = detail::sign<Char>(sign);
+      if (s != sign::none) *it++ = detail::getsign<Char>(s);
       // Insert a decimal point after the first digit and add an exponent.
       it = write_significand(it, significand, significand_size, 1,
                              decimal_point);
@@ -2602,31 +2383,32 @@ FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& f,
   if (f.exponent >= 0) {
     // 1234e5 -> 123400000[.0+]
     size += to_unsigned(f.exponent);
-    int num_zeros = fspecs.precision - exp;
+    int num_zeros = specs.precision - exp;
     abort_fuzzing_if(num_zeros > 5000);
-    if (fspecs.showpoint) {
+    if (specs.alt()) {
       ++size;
-      if (num_zeros <= 0 && fspecs.format != float_format::fixed) num_zeros = 0;
+      if (num_zeros <= 0 && specs.type() != presentation_type::fixed)
+        num_zeros = 0;
       if (num_zeros > 0) size += to_unsigned(num_zeros);
     }
-    auto grouping = Grouping(loc, fspecs.locale);
+    auto grouping = Grouping(loc, specs.localized());
     size += to_unsigned(grouping.count_separators(exp));
     return write_padded<Char, align::right>(out, specs, size, [&](iterator it) {
-      if (sign) *it++ = detail::sign<Char>(sign);
+      if (s != sign::none) *it++ = detail::getsign<Char>(s);
       it = write_significand<Char>(it, significand, significand_size,
                                    f.exponent, grouping);
-      if (!fspecs.showpoint) return it;
+      if (!specs.alt()) return it;
       *it++ = decimal_point;
       return num_zeros > 0 ? detail::fill_n(it, num_zeros, zero) : it;
     });
   } else if (exp > 0) {
     // 1234e-2 -> 12.34[0+]
-    int num_zeros = fspecs.showpoint ? fspecs.precision - significand_size : 0;
-    size += 1 + to_unsigned(num_zeros > 0 ? num_zeros : 0);
-    auto grouping = Grouping(loc, fspecs.locale);
+    int num_zeros = specs.alt() ? specs.precision - significand_size : 0;
+    size += 1 + static_cast<unsigned>(max_of(num_zeros, 0));
+    auto grouping = Grouping(loc, specs.localized());
     size += to_unsigned(grouping.count_separators(exp));
     return write_padded<Char, align::right>(out, specs, size, [&](iterator it) {
-      if (sign) *it++ = detail::sign<Char>(sign);
+      if (s != sign::none) *it++ = detail::getsign<Char>(s);
       it = write_significand(it, significand, significand_size, exp,
                              decimal_point, grouping);
       return num_zeros > 0 ? detail::fill_n(it, num_zeros, zero) : it;
@@ -2634,14 +2416,14 @@ FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& f,
   }
   // 1234e-6 -> 0.001234
   int num_zeros = -exp;
-  if (significand_size == 0 && fspecs.precision >= 0 &&
-      fspecs.precision < num_zeros) {
-    num_zeros = fspecs.precision;
+  if (significand_size == 0 && specs.precision >= 0 &&
+      specs.precision < num_zeros) {
+    num_zeros = specs.precision;
   }
-  bool pointy = num_zeros != 0 || significand_size != 0 || fspecs.showpoint;
+  bool pointy = num_zeros != 0 || significand_size != 0 || specs.alt();
   size += 1 + (pointy ? 1 : 0) + to_unsigned(num_zeros);
   return write_padded<Char, align::right>(out, specs, size, [&](iterator it) {
-    if (sign) *it++ = detail::sign<Char>(sign);
+    if (s != sign::none) *it++ = detail::getsign<Char>(s);
     *it++ = zero;
     if (!pointy) return it;
     *it++ = decimal_point;
@@ -2666,14 +2448,13 @@ template <typename Char> class fallback_digit_grouping {
 
 template <typename Char, typename OutputIt, typename DecimalFP>
 FMT_CONSTEXPR20 auto write_float(OutputIt out, const DecimalFP& f,
-                                 const format_specs& specs, float_specs fspecs,
+                                 const format_specs& specs, sign s,
                                  locale_ref loc) -> OutputIt {
   if (is_constant_evaluated()) {
     return do_write_float<Char, OutputIt, DecimalFP,
-                          fallback_digit_grouping<Char>>(out, f, specs, fspecs,
-                                                         loc);
+                          fallback_digit_grouping<Char>>(out, f, specs, s, loc);
   } else {
-    return do_write_float<Char>(out, f, specs, fspecs, loc);
+    return do_write_float<Char>(out, f, specs, s, loc);
   }
 }
 
@@ -2726,52 +2507,48 @@ inline FMT_CONSTEXPR20 void adjust_precision(int& precision, int exp10) {
 
 class bigint {
  private:
-  // A bigint is stored as an array of bigits (big digits), with bigit at index
-  // 0 being the least significant one.
-  using bigit = uint32_t;
+  // A bigint is a number in the form bigit_[N - 1] ... bigit_[0] * 32^exp_.
+  using bigit = uint32_t;  // A big digit.
   using double_bigit = uint64_t;
+  enum { bigit_bits = num_bits<bigit>() };
   enum { bigits_capacity = 32 };
   basic_memory_buffer<bigit, bigits_capacity> bigits_;
   int exp_;
 
-  FMT_CONSTEXPR20 auto operator[](int index) const -> bigit {
-    return bigits_[to_unsigned(index)];
-  }
-  FMT_CONSTEXPR20 auto operator[](int index) -> bigit& {
-    return bigits_[to_unsigned(index)];
-  }
-
-  static constexpr const int bigit_bits = num_bits<bigit>();
-
   friend struct formatter<bigint>;
 
-  FMT_CONSTEXPR20 void subtract_bigits(int index, bigit other, bigit& borrow) {
-    auto result = static_cast<double_bigit>((*this)[index]) - other - borrow;
-    (*this)[index] = static_cast<bigit>(result);
+  FMT_CONSTEXPR auto get_bigit(int i) const -> bigit {
+    return i >= exp_ && i < num_bigits() ? bigits_[i - exp_] : 0;
+  }
+
+  FMT_CONSTEXPR void subtract_bigits(int index, bigit other, bigit& borrow) {
+    auto result = double_bigit(bigits_[index]) - other - borrow;
+    bigits_[index] = static_cast<bigit>(result);
     borrow = static_cast<bigit>(result >> (bigit_bits * 2 - 1));
   }
 
-  FMT_CONSTEXPR20 void remove_leading_zeros() {
+  FMT_CONSTEXPR void remove_leading_zeros() {
     int num_bigits = static_cast<int>(bigits_.size()) - 1;
-    while (num_bigits > 0 && (*this)[num_bigits] == 0) --num_bigits;
+    while (num_bigits > 0 && bigits_[num_bigits] == 0) --num_bigits;
     bigits_.resize(to_unsigned(num_bigits + 1));
   }
 
   // Computes *this -= other assuming aligned bigints and *this >= other.
-  FMT_CONSTEXPR20 void subtract_aligned(const bigint& other) {
+  FMT_CONSTEXPR void subtract_aligned(const bigint& other) {
     FMT_ASSERT(other.exp_ >= exp_, "unaligned bigints");
     FMT_ASSERT(compare(*this, other) >= 0, "");
     bigit borrow = 0;
     int i = other.exp_ - exp_;
     for (size_t j = 0, n = other.bigits_.size(); j != n; ++i, ++j)
       subtract_bigits(i, other.bigits_[j], borrow);
-    while (borrow > 0) subtract_bigits(i, 0, borrow);
+    if (borrow != 0) subtract_bigits(i, 0, borrow);
+    FMT_ASSERT(borrow == 0, "");
     remove_leading_zeros();
   }
 
-  FMT_CONSTEXPR20 void multiply(uint32_t value) {
-    const double_bigit wide_value = value;
+  FMT_CONSTEXPR void multiply(uint32_t value) {
     bigit carry = 0;
+    const double_bigit wide_value = value;
     for (size_t i = 0, n = bigits_.size(); i < n; ++i) {
       double_bigit result = bigits_[i] * wide_value + carry;
       bigits_[i] = static_cast<bigit>(result);
@@ -2782,7 +2559,7 @@ class bigint {
 
   template <typename UInt, FMT_ENABLE_IF(std::is_same<UInt, uint64_t>::value ||
                                          std::is_same<UInt, uint128_t>::value)>
-  FMT_CONSTEXPR20 void multiply(UInt value) {
+  FMT_CONSTEXPR void multiply(UInt value) {
     using half_uint =
         conditional_t<std::is_same<UInt, uint128_t>::value, uint64_t, uint32_t>;
     const int shift = num_bits<half_uint>() - bigit_bits;
@@ -2803,7 +2580,7 @@ class bigint {
 
   template <typename UInt, FMT_ENABLE_IF(std::is_same<UInt, uint64_t>::value ||
                                          std::is_same<UInt, uint128_t>::value)>
-  FMT_CONSTEXPR20 void assign(UInt n) {
+  FMT_CONSTEXPR void assign(UInt n) {
     size_t num_bigits = 0;
     do {
       bigits_[num_bigits++] = static_cast<bigit>(n);
@@ -2814,13 +2591,13 @@ class bigint {
   }
 
  public:
-  FMT_CONSTEXPR20 bigint() : exp_(0) {}
+  FMT_CONSTEXPR bigint() : exp_(0) {}
   explicit bigint(uint64_t n) { assign(n); }
 
   bigint(const bigint&) = delete;
   void operator=(const bigint&) = delete;
 
-  FMT_CONSTEXPR20 void assign(const bigint& other) {
+  FMT_CONSTEXPR void assign(const bigint& other) {
     auto size = other.bigits_.size();
     bigits_.resize(size);
     auto data = other.bigits_.data();
@@ -2828,16 +2605,16 @@ class bigint {
     exp_ = other.exp_;
   }
 
-  template <typename Int> FMT_CONSTEXPR20 void operator=(Int n) {
+  template <typename Int> FMT_CONSTEXPR void operator=(Int n) {
     FMT_ASSERT(n > 0, "");
     assign(uint64_or_128_t<Int>(n));
   }
 
-  FMT_CONSTEXPR20 auto num_bigits() const -> int {
+  FMT_CONSTEXPR auto num_bigits() const -> int {
     return static_cast<int>(bigits_.size()) + exp_;
   }
 
-  FMT_NOINLINE FMT_CONSTEXPR20 auto operator<<=(int shift) -> bigint& {
+  FMT_CONSTEXPR auto operator<<=(int shift) -> bigint& {
     FMT_ASSERT(shift >= 0, "");
     exp_ += shift / bigit_bits;
     shift %= bigit_bits;
@@ -2852,49 +2629,39 @@ class bigint {
     return *this;
   }
 
-  template <typename Int>
-  FMT_CONSTEXPR20 auto operator*=(Int value) -> bigint& {
+  template <typename Int> FMT_CONSTEXPR auto operator*=(Int value) -> bigint& {
     FMT_ASSERT(value > 0, "");
     multiply(uint32_or_64_or_128_t<Int>(value));
     return *this;
   }
 
-  friend FMT_CONSTEXPR20 auto compare(const bigint& lhs, const bigint& rhs)
-      -> int {
-    int num_lhs_bigits = lhs.num_bigits(), num_rhs_bigits = rhs.num_bigits();
-    if (num_lhs_bigits != num_rhs_bigits)
-      return num_lhs_bigits > num_rhs_bigits ? 1 : -1;
-    int i = static_cast<int>(lhs.bigits_.size()) - 1;
-    int j = static_cast<int>(rhs.bigits_.size()) - 1;
+  friend FMT_CONSTEXPR auto compare(const bigint& b1, const bigint& b2) -> int {
+    int num_bigits1 = b1.num_bigits(), num_bigits2 = b2.num_bigits();
+    if (num_bigits1 != num_bigits2) return num_bigits1 > num_bigits2 ? 1 : -1;
+    int i = static_cast<int>(b1.bigits_.size()) - 1;
+    int j = static_cast<int>(b2.bigits_.size()) - 1;
     int end = i - j;
     if (end < 0) end = 0;
     for (; i >= end; --i, --j) {
-      bigit lhs_bigit = lhs[i], rhs_bigit = rhs[j];
-      if (lhs_bigit != rhs_bigit) return lhs_bigit > rhs_bigit ? 1 : -1;
+      bigit b1_bigit = b1.bigits_[i], b2_bigit = b2.bigits_[j];
+      if (b1_bigit != b2_bigit) return b1_bigit > b2_bigit ? 1 : -1;
     }
     if (i != j) return i > j ? 1 : -1;
     return 0;
   }
 
   // Returns compare(lhs1 + lhs2, rhs).
-  friend FMT_CONSTEXPR20 auto add_compare(const bigint& lhs1,
-                                          const bigint& lhs2, const bigint& rhs)
-      -> int {
-    auto minimum = [](int a, int b) { return a < b ? a : b; };
-    auto maximum = [](int a, int b) { return a > b ? a : b; };
-    int max_lhs_bigits = maximum(lhs1.num_bigits(), lhs2.num_bigits());
+  friend FMT_CONSTEXPR auto add_compare(const bigint& lhs1, const bigint& lhs2,
+                                        const bigint& rhs) -> int {
+    int max_lhs_bigits = max_of(lhs1.num_bigits(), lhs2.num_bigits());
     int num_rhs_bigits = rhs.num_bigits();
     if (max_lhs_bigits + 1 < num_rhs_bigits) return -1;
     if (max_lhs_bigits > num_rhs_bigits) return 1;
-    auto get_bigit = [](const bigint& n, int i) -> bigit {
-      return i >= n.exp_ && i < n.num_bigits() ? n[i - n.exp_] : 0;
-    };
     double_bigit borrow = 0;
-    int min_exp = minimum(minimum(lhs1.exp_, lhs2.exp_), rhs.exp_);
+    int min_exp = min_of(min_of(lhs1.exp_, lhs2.exp_), rhs.exp_);
     for (int i = num_rhs_bigits - 1; i >= min_exp; --i) {
-      double_bigit sum =
-          static_cast<double_bigit>(get_bigit(lhs1, i)) + get_bigit(lhs2, i);
-      bigit rhs_bigit = get_bigit(rhs, i);
+      double_bigit sum = double_bigit(lhs1.get_bigit(i)) + lhs2.get_bigit(i);
+      bigit rhs_bigit = rhs.get_bigit(i);
       if (sum > rhs_bigit + borrow) return 1;
       borrow = rhs_bigit + borrow - sum;
       if (borrow > 1) return -1;
@@ -2907,10 +2674,8 @@ class bigint {
   FMT_CONSTEXPR20 void assign_pow10(int exp) {
     FMT_ASSERT(exp >= 0, "");
     if (exp == 0) return *this = 1;
-    // Find the top bit.
-    int bitmask = 1;
-    while (exp >= bitmask) bitmask <<= 1;
-    bitmask >>= 1;
+    int bitmask = 1 << (num_bits<unsigned>() -
+                        countl_zero(static_cast<uint32_t>(exp)) - 1);
     // pow(10, exp) = pow(5, exp) * pow(2, exp). First compute pow(5, exp) by
     // repeated squaring and multiplication.
     *this = 5;
@@ -2934,17 +2699,17 @@ class bigint {
       // cross-product terms n[i] * n[j] such that i + j == bigit_index.
       for (int i = 0, j = bigit_index; j >= 0; ++i, --j) {
         // Most terms are multiplied twice which can be optimized in the future.
-        sum += static_cast<double_bigit>(n[i]) * n[j];
+        sum += double_bigit(n[i]) * n[j];
       }
-      (*this)[bigit_index] = static_cast<bigit>(sum);
+      bigits_[bigit_index] = static_cast<bigit>(sum);
       sum >>= num_bits<bigit>();  // Compute the carry.
     }
     // Do the same for the top half.
     for (int bigit_index = num_bigits; bigit_index < num_result_bigits;
          ++bigit_index) {
       for (int j = num_bigits - 1, i = bigit_index - j; i < num_bigits;)
-        sum += static_cast<double_bigit>(n[i++]) * n[j--];
-      (*this)[bigit_index] = static_cast<bigit>(sum);
+        sum += double_bigit(n[i++]) * n[j--];
+      bigits_[bigit_index] = static_cast<bigit>(sum);
       sum >>= num_bits<bigit>();
     }
     remove_leading_zeros();
@@ -2953,7 +2718,7 @@ class bigint {
 
   // If this bigint has a bigger exponent than other, adds trailing zero to make
   // exponents equal. This simplifies some operations such as subtraction.
-  FMT_CONSTEXPR20 void align(const bigint& other) {
+  FMT_CONSTEXPR void align(const bigint& other) {
     int exp_difference = exp_ - other.exp_;
     if (exp_difference <= 0) return;
     int num_bigits = static_cast<int>(bigits_.size());
@@ -2966,7 +2731,7 @@ class bigint {
 
   // Divides this bignum by divisor, assigning the remainder to this and
   // returning the quotient.
-  FMT_CONSTEXPR20 auto divmod_assign(const bigint& divisor) -> int {
+  FMT_CONSTEXPR auto divmod_assign(const bigint& divisor) -> int {
     FMT_ASSERT(this != &divisor, "");
     if (compare(*this, divisor) < 0) return 0;
     FMT_ASSERT(divisor.bigits_[divisor.bigits_.size() - 1u] != 0, "");
@@ -3137,18 +2902,17 @@ FMT_CONSTEXPR20 void format_hexfloat(Float value, format_specs specs,
   // Assume Float is in the format [sign][exponent][significand].
   using carrier_uint = typename info::carrier_uint;
 
-  constexpr auto num_float_significand_bits =
-      detail::num_significand_bits<Float>();
+  const auto num_float_significand_bits = detail::num_significand_bits<Float>();
 
   basic_fp<carrier_uint> f(value);
   f.e += num_float_significand_bits;
   if (!has_implicit_bit<Float>()) --f.e;
 
-  constexpr auto num_fraction_bits =
+  const auto num_fraction_bits =
       num_float_significand_bits + (has_implicit_bit<Float>() ? 1 : 0);
-  constexpr auto num_xdigits = (num_fraction_bits + 3) / 4;
+  const auto num_xdigits = (num_fraction_bits + 3) / 4;
 
-  constexpr auto leading_shift = ((num_xdigits - 1) * 4);
+  const auto leading_shift = ((num_xdigits - 1) * 4);
   const auto leading_mask = carrier_uint(0xF) << leading_shift;
   const auto leading_xdigit =
       static_cast<uint32_t>((f.f & leading_mask) >> leading_shift);
@@ -3180,20 +2944,20 @@ FMT_CONSTEXPR20 void format_hexfloat(Float value, format_specs specs,
 
   char xdigits[num_bits<carrier_uint>() / 4];
   detail::fill_n(xdigits, sizeof(xdigits), '0');
-  format_uint<4>(xdigits, f.f, num_xdigits, specs.upper);
+  format_base2e(4, xdigits, f.f, num_xdigits, specs.upper());
 
   // Remove zero tail
   while (print_xdigits > 0 && xdigits[print_xdigits] == '0') --print_xdigits;
 
   buf.push_back('0');
-  buf.push_back(specs.upper ? 'X' : 'x');
+  buf.push_back(specs.upper() ? 'X' : 'x');
   buf.push_back(xdigits[0]);
-  if (specs.alt || print_xdigits > 0 || print_xdigits < specs.precision)
+  if (specs.alt() || print_xdigits > 0 || print_xdigits < specs.precision)
     buf.push_back('.');
   buf.append(xdigits + 1, xdigits + 1 + print_xdigits);
   for (; print_xdigits < specs.precision; ++print_xdigits) buf.push_back('0');
 
-  buf.push_back(specs.upper ? 'P' : 'p');
+  buf.push_back(specs.upper() ? 'P' : 'p');
 
   uint32_t abs_e;
   if (f.e < 0) {
@@ -3224,15 +2988,15 @@ constexpr auto fractional_part_rounding_thresholds(int index) -> uint32_t {
 }
 
 template <typename Float>
-FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
+FMT_CONSTEXPR20 auto format_float(Float value, int precision,
+                                  const format_specs& specs, bool binary32,
                                   buffer<char>& buf) -> int {
   // float is passed as double to reduce the number of instantiations.
   static_assert(!std::is_same<Float, float>::value, "");
-  FMT_ASSERT(value >= 0, "value is negative");
   auto converted_value = convert_float(value);
 
-  const bool fixed = specs.format == float_format::fixed;
-  if (value <= 0) {  // <= instead of == to silence a warning.
+  const bool fixed = specs.type() == presentation_type::fixed;
+  if (value == 0) {
     if (precision <= 0 || !fixed) {
       buf.push_back('0');
       return 0;
@@ -3257,16 +3021,6 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
     exp = static_cast<int>(e);
     if (e > exp) ++exp;  // Compute ceil.
     dragon_flags = dragon::fixup;
-  } else if (precision < 0) {
-    // Use Dragonbox for the shortest format.
-    if (specs.binary32) {
-      auto dec = dragonbox::to_decimal(static_cast<float>(value));
-      write<char>(appender(buf), dec.significand);
-      return dec.exponent;
-    }
-    auto dec = dragonbox::to_decimal(static_cast<double>(value));
-    write<char>(appender(buf), dec.significand);
-    return dec.exponent;
   } else {
     // Extract significand bits and exponent bits.
     using info = dragonbox::float_info<double>;
@@ -3365,7 +3119,7 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
         uint64_t prod;
         uint32_t digits;
         bool should_round_up;
-        int number_of_digits_to_print = precision > 9 ? 9 : precision;
+        int number_of_digits_to_print = min_of(precision, 9);
 
         // Print a 9-digits subsegment, either the first or the second.
         auto print_subsegment = [&](uint32_t subsegment, char* buffer) {
@@ -3393,7 +3147,7 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
             // for details.
             prod = ((subsegment * static_cast<uint64_t>(450359963)) >> 20) + 1;
             digits = static_cast<uint32_t>(prod >> 32);
-            copy2(buffer, digits2(digits));
+            write2digits(buffer, digits);
             number_of_digits_printed += 2;
           }
 
@@ -3401,7 +3155,7 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
           while (number_of_digits_printed < number_of_digits_to_print) {
             prod = static_cast<uint32_t>(prod) * static_cast<uint64_t>(100);
             digits = static_cast<uint32_t>(prod >> 32);
-            copy2(buffer + number_of_digits_printed, digits2(digits));
+            write2digits(buffer + number_of_digits_printed, digits);
             number_of_digits_printed += 2;
           }
         };
@@ -3510,9 +3264,8 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
   }
   if (use_dragon) {
     auto f = basic_fp<uint128_t>();
-    bool is_predecessor_closer = specs.binary32
-                                     ? f.assign(static_cast<float>(value))
-                                     : f.assign(converted_value);
+    bool is_predecessor_closer = binary32 ? f.assign(static_cast<float>(value))
+                                          : f.assign(converted_value);
     if (is_predecessor_closer) dragon_flags |= dragon::predecessor_closer;
     if (fixed) dragon_flags |= dragon::fixed;
     // Limit precision to the maximum possible number of significant digits in
@@ -3521,7 +3274,7 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
     if (precision > max_double_digits) precision = max_double_digits;
     format_dragon(f, dragon_flags, precision, buf, exp);
   }
-  if (!fixed && !specs.showpoint) {
+  if (!fixed && !specs.alt()) {
     // Remove trailing zeros.
     auto num_digits = buf.size();
     while (num_digits > 0 && buf[num_digits - 1] == '0') {
@@ -3536,59 +3289,62 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
 template <typename Char, typename OutputIt, typename T>
 FMT_CONSTEXPR20 auto write_float(OutputIt out, T value, format_specs specs,
                                  locale_ref loc) -> OutputIt {
-  sign_t sign = specs.sign;
-  if (detail::signbit(value)) {  // value < 0 is false for NaN so use signbit.
-    sign = sign::minus;
-    value = -value;
-  } else if (sign == sign::minus) {
-    sign = sign::none;
-  }
+  // Use signbit because value < 0 is false for NaN.
+  sign s = detail::signbit(value) ? sign::minus : specs.sign();
 
   if (!detail::isfinite(value))
-    return write_nonfinite<Char>(out, detail::isnan(value), specs, sign);
+    return write_nonfinite<Char>(out, detail::isnan(value), specs, s);
 
-  if (specs.align == align::numeric && sign) {
-    auto it = reserve(out, 1);
-    *it++ = detail::sign<Char>(sign);
-    out = base_iterator(out, it);
-    sign = sign::none;
+  if (specs.align() == align::numeric && s != sign::none) {
+    *out++ = detail::getsign<Char>(s);
+    s = sign::none;
     if (specs.width != 0) --specs.width;
   }
 
+  int precision = specs.precision;
+  if (precision < 0) {
+    if (specs.type() != presentation_type::none) {
+      precision = 6;
+    } else if (is_fast_float<T>::value && !is_constant_evaluated()) {
+      // Use Dragonbox for the shortest format.
+      using floaty = conditional_t<sizeof(T) >= sizeof(double), double, float>;
+      auto dec = dragonbox::to_decimal(static_cast<floaty>(value));
+      return write_float<Char>(out, dec, specs, s, loc);
+    }
+  }
+
   memory_buffer buffer;
-  if (specs.type == presentation_type::hexfloat) {
-    if (sign) buffer.push_back(detail::sign<char>(sign));
+  if (specs.type() == presentation_type::hexfloat) {
+    if (s != sign::none) buffer.push_back(detail::getsign<char>(s));
     format_hexfloat(convert_float(value), specs, buffer);
     return write_bytes<Char, align::right>(out, {buffer.data(), buffer.size()},
                                            specs);
   }
 
-  int precision = specs.precision >= 0 || specs.type == presentation_type::none
-                      ? specs.precision
-                      : 6;
-  if (specs.type == presentation_type::exp) {
+  if (specs.type() == presentation_type::exp) {
     if (precision == max_value<int>())
       report_error("number is too big");
     else
       ++precision;
-  } else if (specs.type != presentation_type::fixed && precision == 0) {
+    if (specs.precision != 0) specs.set_alt();
+  } else if (specs.type() == presentation_type::fixed) {
+    if (specs.precision != 0) specs.set_alt();
+  } else if (precision == 0) {
     precision = 1;
   }
-  float_specs fspecs = parse_float_type_spec(specs);
-  fspecs.sign = sign;
-  if (const_check(std::is_same<T, float>())) fspecs.binary32 = true;
-  int exp = format_float(convert_float(value), precision, fspecs, buffer);
-  fspecs.precision = precision;
+  int exp = format_float(convert_float(value), precision, specs,
+                         std::is_same<T, float>(), buffer);
+
+  specs.precision = precision;
   auto f = big_decimal_fp{buffer.data(), static_cast<int>(buffer.size()), exp};
-  return write_float<Char>(out, f, specs, fspecs, loc);
+  return write_float<Char>(out, f, specs, s, loc);
 }
 
 template <typename Char, typename OutputIt, typename T,
           FMT_ENABLE_IF(is_floating_point<T>::value)>
 FMT_CONSTEXPR20 auto write(OutputIt out, T value, format_specs specs,
                            locale_ref loc = {}) -> OutputIt {
-  if (const_check(!is_supported_floating_point(value))) return out;
-  return specs.localized && write_loc(out, value, specs, loc)
+  return specs.localized() && write_loc(out, value, specs, loc)
              ? out
              : write_float<Char>(out, value, specs, loc);
 }
@@ -3597,25 +3353,18 @@ template <typename Char, typename OutputIt, typename T,
           FMT_ENABLE_IF(is_fast_float<T>::value)>
 FMT_CONSTEXPR20 auto write(OutputIt out, T value) -> OutputIt {
   if (is_constant_evaluated()) return write<Char>(out, value, format_specs());
-  if (const_check(!is_supported_floating_point(value))) return out;
 
-  auto sign = sign_t::none;
-  if (detail::signbit(value)) {
-    sign = sign::minus;
-    value = -value;
-  }
+  auto s = detail::signbit(value) ? sign::minus : sign::none;
 
   constexpr auto specs = format_specs();
-  using floaty = conditional_t<std::is_same<T, long double>::value, double, T>;
+  using floaty = conditional_t<sizeof(T) >= sizeof(double), double, float>;
   using floaty_uint = typename dragonbox::float_info<floaty>::carrier_uint;
   floaty_uint mask = exponent_mask<floaty>();
   if ((bit_cast<floaty_uint>(value) & mask) == mask)
-    return write_nonfinite<Char>(out, std::isnan(value), specs, sign);
+    return write_nonfinite<Char>(out, std::isnan(value), specs, s);
 
-  auto fspecs = float_specs();
-  fspecs.sign = sign;
   auto dec = dragonbox::to_decimal(static_cast<floaty>(value));
-  return write_float<Char>(out, dec, specs, fspecs, {});
+  return write_float<Char>(out, dec, specs, s, {});
 }
 
 template <typename Char, typename OutputIt, typename T,
@@ -3647,10 +3396,8 @@ constexpr auto write(OutputIt out, const T& value) -> OutputIt {
 // FMT_ENABLE_IF() condition separated to workaround an MSVC bug.
 template <
     typename Char, typename OutputIt, typename T,
-    bool check =
-        std::is_enum<T>::value && !std::is_same<T, Char>::value &&
-        mapped_type_constant<T, basic_format_context<OutputIt, Char>>::value !=
-            type::custom_type,
+    bool check = std::is_enum<T>::value && !std::is_same<T, Char>::value &&
+                 mapped_type_constant<T, Char>::value != type::custom_type,
     FMT_ENABLE_IF(check)>
 FMT_CONSTEXPR auto write(OutputIt out, T value) -> OutputIt {
   return write<Char>(out, static_cast<underlying_t<T>>(value));
@@ -3660,8 +3407,8 @@ template <typename Char, typename OutputIt, typename T,
           FMT_ENABLE_IF(std::is_same<T, bool>::value)>
 FMT_CONSTEXPR auto write(OutputIt out, T value, const format_specs& specs = {},
                          locale_ref = {}) -> OutputIt {
-  return specs.type != presentation_type::none &&
-                 specs.type != presentation_type::string
+  return specs.type() != presentation_type::none &&
+                 specs.type() != presentation_type::string
              ? write<Char>(out, value ? 1 : 0, specs, {})
              : write_bytes<Char>(out, value ? "true" : "false", specs);
 }
@@ -3687,158 +3434,137 @@ auto write(OutputIt out, const T* value, const format_specs& specs = {},
   return write_ptr<Char>(out, bit_cast<uintptr_t>(value), &specs);
 }
 
-// A write overload that handles implicit conversions.
 template <typename Char, typename OutputIt, typename T,
-          typename Context = basic_format_context<OutputIt, Char>>
-FMT_CONSTEXPR auto write(OutputIt out, const T& value) -> enable_if_t<
-    std::is_class<T>::value && !has_to_string_view<T>::value &&
-        !is_floating_point<T>::value && !std::is_same<T, Char>::value &&
-        !std::is_same<T, remove_cvref_t<decltype(arg_mapper<Context>().map(
-                             value))>>::value,
-    OutputIt> {
-  return write<Char>(out, arg_mapper<Context>().map(value));
+          FMT_ENABLE_IF(mapped_type_constant<T, Char>::value ==
+                            type::custom_type &&
+                        !std::is_fundamental<T>::value)>
+FMT_CONSTEXPR auto write(OutputIt out, const T& value) -> OutputIt {
+  auto f = formatter<T, Char>();
+  auto parse_ctx = parse_context<Char>({});
+  f.parse(parse_ctx);
+  auto ctx = basic_format_context<OutputIt, Char>(out, {}, {});
+  return f.format(value, ctx);
 }
 
-template <typename Char, typename OutputIt, typename T,
-          typename Context = basic_format_context<OutputIt, Char>>
-FMT_CONSTEXPR auto write(OutputIt out, const T& value)
-    -> enable_if_t<mapped_type_constant<T, Context>::value ==
-                           type::custom_type &&
-                       !std::is_fundamental<T>::value,
-                   OutputIt> {
-  auto formatter = typename Context::template formatter_type<T>();
-  auto parse_ctx = typename Context::parse_context_type({});
-  formatter.parse(parse_ctx);
-  auto ctx = Context(out, {}, {});
-  return formatter.format(value, ctx);
-}
+template <typename T>
+using is_builtin =
+    bool_constant<std::is_same<T, int>::value || FMT_BUILTIN_TYPES>;
 
 // An argument visitor that formats the argument and writes it via the output
 // iterator. It's a class and not a generic lambda for compatibility with C++11.
 template <typename Char> struct default_arg_formatter {
-  using iterator = basic_appender<Char>;
   using context = buffered_context<Char>;
 
-  iterator out;
-  basic_format_args<context> args;
-  locale_ref loc;
+  basic_appender<Char> out;
+
+  void operator()(monostate) { report_error("argument not found"); }
 
-  template <typename T> auto operator()(T value) -> iterator {
-    return write<Char>(out, value);
+  template <typename T, FMT_ENABLE_IF(is_builtin<T>::value)>
+  void operator()(T value) {
+    write<Char>(out, value);
   }
-  auto operator()(typename basic_format_arg<context>::handle h) -> iterator {
-    basic_format_parse_context<Char> parse_ctx({});
-    context format_ctx(out, args, loc);
+
+  template <typename T, FMT_ENABLE_IF(!is_builtin<T>::value)>
+  void operator()(T) {
+    FMT_ASSERT(false, "");
+  }
+
+  void operator()(typename basic_format_arg<context>::handle h) {
+    // Use a null locale since the default format must be unlocalized.
+    auto parse_ctx = parse_context<Char>({});
+    auto format_ctx = context(out, {}, {});
     h.format(parse_ctx, format_ctx);
-    return format_ctx.out();
   }
 };
 
 template <typename Char> struct arg_formatter {
-  using iterator = basic_appender<Char>;
-  using context = buffered_context<Char>;
-
-  iterator out;
+  basic_appender<Char> out;
   const format_specs& specs;
-  locale_ref locale;
+  FMT_NO_UNIQUE_ADDRESS locale_ref locale;
 
-  template <typename T>
-  FMT_CONSTEXPR FMT_INLINE auto operator()(T value) -> iterator {
-    return detail::write<Char>(out, value, specs, locale);
+  template <typename T, FMT_ENABLE_IF(is_builtin<T>::value)>
+  FMT_CONSTEXPR FMT_INLINE void operator()(T value) {
+    detail::write<Char>(out, value, specs, locale);
   }
-  auto operator()(typename basic_format_arg<context>::handle) -> iterator {
-    // User-defined types are handled separately because they require access
-    // to the parse context.
-    return out;
-  }
-};
 
-struct width_checker {
-  template <typename T, FMT_ENABLE_IF(is_integer<T>::value)>
-  FMT_CONSTEXPR auto operator()(T value) -> unsigned long long {
-    if (is_negative(value)) report_error("negative width");
-    return static_cast<unsigned long long>(value);
+  template <typename T, FMT_ENABLE_IF(!is_builtin<T>::value)>
+  void operator()(T) {
+    FMT_ASSERT(false, "");
   }
 
-  template <typename T, FMT_ENABLE_IF(!is_integer<T>::value)>
-  FMT_CONSTEXPR auto operator()(T) -> unsigned long long {
-    report_error("width is not integer");
-    return 0;
+  void operator()(typename basic_format_arg<buffered_context<Char>>::handle) {
+    // User-defined types are handled separately because they require access
+    // to the parse context.
   }
 };
 
-struct precision_checker {
+struct dynamic_spec_getter {
   template <typename T, FMT_ENABLE_IF(is_integer<T>::value)>
   FMT_CONSTEXPR auto operator()(T value) -> unsigned long long {
-    if (is_negative(value)) report_error("negative precision");
-    return static_cast<unsigned long long>(value);
+    return is_negative(value) ? ~0ull : static_cast<unsigned long long>(value);
   }
 
   template <typename T, FMT_ENABLE_IF(!is_integer<T>::value)>
   FMT_CONSTEXPR auto operator()(T) -> unsigned long long {
-    report_error("precision is not integer");
+    report_error("width/precision is not integer");
     return 0;
   }
 };
 
-template <typename Handler, typename FormatArg>
-FMT_CONSTEXPR auto get_dynamic_spec(FormatArg arg) -> int {
-  unsigned long long value = arg.visit(Handler());
-  if (value > to_unsigned(max_value<int>())) report_error("number is too big");
-  return static_cast<int>(value);
-}
-
 template <typename Context, typename ID>
-FMT_CONSTEXPR auto get_arg(Context& ctx, ID id) -> decltype(ctx.arg(id)) {
+FMT_CONSTEXPR auto get_arg(Context& ctx, ID id) -> basic_format_arg<Context> {
   auto arg = ctx.arg(id);
   if (!arg) report_error("argument not found");
   return arg;
 }
 
-template <typename Handler, typename Context>
-FMT_CONSTEXPR void handle_dynamic_spec(int& value,
-                                       arg_ref<typename Context::char_type> ref,
-                                       Context& ctx) {
-  switch (ref.kind) {
-  case arg_id_kind::none:
-    break;
-  case arg_id_kind::index:
-    value = detail::get_dynamic_spec<Handler>(get_arg(ctx, ref.val.index));
-    break;
-  case arg_id_kind::name:
-    value = detail::get_dynamic_spec<Handler>(get_arg(ctx, ref.val.name));
-    break;
-  }
+template <typename Context>
+FMT_CONSTEXPR int get_dynamic_spec(
+    arg_id_kind kind, const arg_ref<typename Context::char_type>& ref,
+    Context& ctx) {
+  FMT_ASSERT(kind != arg_id_kind::none, "");
+  auto arg =
+      kind == arg_id_kind::index ? ctx.arg(ref.index) : ctx.arg(ref.name);
+  if (!arg) report_error("argument not found");
+  unsigned long long value = arg.visit(dynamic_spec_getter());
+  if (value > to_unsigned(max_value<int>()))
+    report_error("width/precision is out of range");
+  return static_cast<int>(value);
+}
+
+template <typename Context>
+FMT_CONSTEXPR void handle_dynamic_spec(
+    arg_id_kind kind, int& value,
+    const arg_ref<typename Context::char_type>& ref, Context& ctx) {
+  if (kind != arg_id_kind::none) value = get_dynamic_spec(kind, ref, ctx);
 }
 
-#if FMT_USE_USER_DEFINED_LITERALS
-#  if FMT_USE_NONTYPE_TEMPLATE_ARGS
+#if FMT_USE_NONTYPE_TEMPLATE_ARGS
 template <typename T, typename Char, size_t N,
-          fmt::detail_exported::fixed_string<Char, N> Str>
-struct statically_named_arg : view {
+          fmt::detail::fixed_string<Char, N> Str>
+struct static_named_arg : view {
   static constexpr auto name = Str.data;
 
   const T& value;
-  statically_named_arg(const T& v) : value(v) {}
+  static_named_arg(const T& v) : value(v) {}
 };
 
 template <typename T, typename Char, size_t N,
-          fmt::detail_exported::fixed_string<Char, N> Str>
-struct is_named_arg<statically_named_arg<T, Char, N, Str>> : std::true_type {};
+          fmt::detail::fixed_string<Char, N> Str>
+struct is_named_arg<static_named_arg<T, Char, N, Str>> : std::true_type {};
 
 template <typename T, typename Char, size_t N,
-          fmt::detail_exported::fixed_string<Char, N> Str>
-struct is_statically_named_arg<statically_named_arg<T, Char, N, Str>>
-    : std::true_type {};
+          fmt::detail::fixed_string<Char, N> Str>
+struct is_static_named_arg<static_named_arg<T, Char, N, Str>> : std::true_type {
+};
 
-template <typename Char, size_t N,
-          fmt::detail_exported::fixed_string<Char, N> Str>
+template <typename Char, size_t N, fmt::detail::fixed_string<Char, N> Str>
 struct udl_arg {
   template <typename T> auto operator=(T&& value) const {
-    return statically_named_arg<T, Char, N, Str>(std::forward<T>(value));
+    return static_named_arg<T, Char, N, Str>(std::forward<T>(value));
   }
 };
-#  else
+#else
 template <typename Char> struct udl_arg {
   const Char* str;
 
@@ -3846,148 +3572,197 @@ template <typename Char> struct udl_arg {
     return {str, std::forward<T>(value)};
   }
 };
-#  endif
-#endif  // FMT_USE_USER_DEFINED_LITERALS
+#endif  // FMT_USE_NONTYPE_TEMPLATE_ARGS
 
-template <typename Locale, typename Char>
-auto vformat(const Locale& loc, basic_string_view<Char> fmt,
-             typename detail::vformat_args<Char>::type args)
-    -> std::basic_string<Char> {
-  auto buf = basic_memory_buffer<Char>();
-  detail::vformat_to(buf, fmt, args, detail::locale_ref(loc));
-  return {buf.data(), buf.size()};
-}
+template <typename Char> struct format_handler {
+  parse_context<Char> parse_ctx;
+  buffered_context<Char> ctx;
+
+  void on_text(const Char* begin, const Char* end) {
+    copy_noinline<Char>(begin, end, ctx.out());
+  }
+
+  FMT_CONSTEXPR auto on_arg_id() -> int { return parse_ctx.next_arg_id(); }
+  FMT_CONSTEXPR auto on_arg_id(int id) -> int {
+    parse_ctx.check_arg_id(id);
+    return id;
+  }
+  FMT_CONSTEXPR auto on_arg_id(basic_string_view<Char> id) -> int {
+    parse_ctx.check_arg_id(id);
+    int arg_id = ctx.arg_id(id);
+    if (arg_id < 0) report_error("argument not found");
+    return arg_id;
+  }
+
+  FMT_INLINE void on_replacement_field(int id, const Char*) {
+    ctx.arg(id).visit(default_arg_formatter<Char>{ctx.out()});
+  }
+
+  auto on_format_specs(int id, const Char* begin, const Char* end)
+      -> const Char* {
+    auto arg = get_arg(ctx, id);
+    // Not using a visitor for custom types gives better codegen.
+    if (arg.format_custom(begin, parse_ctx, ctx)) return parse_ctx.begin();
+
+    auto specs = dynamic_format_specs<Char>();
+    begin = parse_format_specs(begin, end, specs, parse_ctx, arg.type());
+    if (specs.dynamic()) {
+      handle_dynamic_spec(specs.dynamic_width(), specs.width, specs.width_ref,
+                          ctx);
+      handle_dynamic_spec(specs.dynamic_precision(), specs.precision,
+                          specs.precision_ref, ctx);
+    }
+
+    arg.visit(arg_formatter<Char>{ctx.out(), specs, ctx.locale()});
+    return begin;
+  }
+
+  FMT_NORETURN void on_error(const char* message) { report_error(message); }
+};
 
 using format_func = void (*)(detail::buffer<char>&, int, const char*);
+FMT_API void do_report_error(format_func func, int error_code,
+                             const char* message) noexcept;
 
 FMT_API void format_error_code(buffer<char>& out, int error_code,
                                string_view message) noexcept;
 
-using fmt::report_error;
-FMT_API void report_error(format_func func, int error_code,
-                          const char* message) noexcept;
-}  // namespace detail
+template <typename T, typename Char, type TYPE>
+template <typename FormatContext>
+FMT_CONSTEXPR auto native_formatter<T, Char, TYPE>::format(
+    const T& val, FormatContext& ctx) const -> decltype(ctx.out()) {
+  if (!specs_.dynamic())
+    return write<Char>(ctx.out(), val, specs_, ctx.locale());
+  auto specs = format_specs(specs_);
+  handle_dynamic_spec(specs.dynamic_width(), specs.width, specs_.width_ref,
+                      ctx);
+  handle_dynamic_spec(specs.dynamic_precision(), specs.precision,
+                      specs_.precision_ref, ctx);
+  return write<Char>(ctx.out(), val, specs, ctx.locale());
+}
 
-FMT_BEGIN_EXPORT
-FMT_API auto vsystem_error(int error_code, string_view format_str,
-                           format_args args) -> std::system_error;
+// DEPRECATED! https://github.com/fmtlib/fmt/issues/4292.
+template <typename T, typename Enable = void>
+struct is_locale : std::false_type {};
+template <typename T>
+struct is_locale<T, void_t<decltype(T::classic())>> : std::true_type {};
 
-/**
- * Constructs `std::system_error` with a message formatted with
- * `fmt::format(fmt, args...)`.
- * `error_code` is a system error code as given by `errno`.
- *
- * **Example**:
- *
- *     // This throws std::system_error with the description
- *     //   cannot open file 'madeup': No such file or directory
- *     // or similar (system message may vary).
- *     const char* filename = "madeup";
- *     std::FILE* file = std::fopen(filename, "r");
- *     if (!file)
- *       throw fmt::system_error(errno, "cannot open file '{}'", filename);
- */
-template <typename... T>
-auto system_error(int error_code, format_string<T...> fmt, T&&... args)
-    -> std::system_error {
-  return vsystem_error(error_code, fmt, fmt::make_format_args(args...));
-}
+// DEPRECATED!
+template <typename Char = char> struct vformat_args {
+  using type = basic_format_args<buffered_context<Char>>;
+};
+template <> struct vformat_args<char> {
+  using type = format_args;
+};
 
-/**
- * Formats an error message for an error returned by an operating system or a
- * language runtime, for example a file opening error, and writes it to `out`.
- * The format is the same as the one used by `std::system_error(ec, message)`
- * where `ec` is `std::error_code(error_code, std::generic_category())`.
- * It is implementation-defined but normally looks like:
- *
- *     <message>: <system-message>
- *
- * where `<message>` is the passed message and `<system-message>` is the system
- * message corresponding to the error code.
- * `error_code` is a system error code as given by `errno`.
- */
-FMT_API void format_system_error(detail::buffer<char>& out, int error_code,
-                                 const char* message) noexcept;
+template <typename Char>
+void vformat_to(buffer<Char>& buf, basic_string_view<Char> fmt,
+                typename vformat_args<Char>::type args, locale_ref loc = {}) {
+  auto out = basic_appender<Char>(buf);
+  parse_format_string(
+      fmt, format_handler<Char>{parse_context<Char>(fmt), {out, args, loc}});
+}
+}  // namespace detail
 
-// Reports a system error without throwing an exception.
-// Can be used to report errors from destructors.
-FMT_API void report_system_error(int error_code, const char* message) noexcept;
+FMT_BEGIN_EXPORT
 
-/// A fast integer formatter.
-class format_int {
+// A generic formatting context with custom output iterator and character
+// (code unit) support. Char is the format string code unit type which can be
+// different from OutputIt::value_type.
+template <typename OutputIt, typename Char> class generic_context {
  private:
-  // Buffer should be large enough to hold all digits (digits10 + 1),
-  // a sign and a null character.
-  enum { buffer_size = std::numeric_limits<unsigned long long>::digits10 + 3 };
-  mutable char buffer_[buffer_size];
-  char* str_;
+  OutputIt out_;
+  basic_format_args<generic_context> args_;
+  detail::locale_ref loc_;
 
-  template <typename UInt>
-  FMT_CONSTEXPR20 auto format_unsigned(UInt value) -> char* {
-    auto n = static_cast<detail::uint32_or_64_or_128_t<UInt>>(value);
-    return detail::format_decimal(buffer_, n, buffer_size - 1).begin;
+ public:
+  using char_type = Char;
+  using iterator = OutputIt;
+  using parse_context_type FMT_DEPRECATED = parse_context<Char>;
+  template <typename T>
+  using formatter_type FMT_DEPRECATED = formatter<T, Char>;
+  enum { builtin_types = FMT_BUILTIN_TYPES };
+
+  constexpr generic_context(OutputIt out,
+                            basic_format_args<generic_context> args,
+                            detail::locale_ref loc = {})
+      : out_(out), args_(args), loc_(loc) {}
+  generic_context(generic_context&&) = default;
+  generic_context(const generic_context&) = delete;
+  void operator=(const generic_context&) = delete;
+
+  constexpr auto arg(int id) const -> basic_format_arg<generic_context> {
+    return args_.get(id);
+  }
+  auto arg(basic_string_view<Char> name) const
+      -> basic_format_arg<generic_context> {
+    return args_.get(name);
+  }
+  constexpr auto arg_id(basic_string_view<Char> name) const -> int {
+    return args_.get_id(name);
   }
 
-  template <typename Int>
-  FMT_CONSTEXPR20 auto format_signed(Int value) -> char* {
-    auto abs_value = static_cast<detail::uint32_or_64_or_128_t<Int>>(value);
-    bool negative = value < 0;
-    if (negative) abs_value = 0 - abs_value;
-    auto begin = format_unsigned(abs_value);
-    if (negative) *--begin = '-';
-    return begin;
+  constexpr auto out() const -> iterator { return out_; }
+
+  void advance_to(iterator it) {
+    if (!detail::is_back_insert_iterator<iterator>()) out_ = it;
   }
 
+  constexpr auto locale() const -> detail::locale_ref { return loc_; }
+};
+
+class loc_value {
+ private:
+  basic_format_arg<context> value_;
+
  public:
-  explicit FMT_CONSTEXPR20 format_int(int value) : str_(format_signed(value)) {}
-  explicit FMT_CONSTEXPR20 format_int(long value)
-      : str_(format_signed(value)) {}
-  explicit FMT_CONSTEXPR20 format_int(long long value)
-      : str_(format_signed(value)) {}
-  explicit FMT_CONSTEXPR20 format_int(unsigned value)
-      : str_(format_unsigned(value)) {}
-  explicit FMT_CONSTEXPR20 format_int(unsigned long value)
-      : str_(format_unsigned(value)) {}
-  explicit FMT_CONSTEXPR20 format_int(unsigned long long value)
-      : str_(format_unsigned(value)) {}
+  template <typename T, FMT_ENABLE_IF(!detail::is_float128<T>::value)>
+  loc_value(T value) : value_(value) {}
 
-  /// Returns the number of characters written to the output buffer.
-  FMT_CONSTEXPR20 auto size() const -> size_t {
-    return detail::to_unsigned(buffer_ - str_ + buffer_size - 1);
+  template <typename T, FMT_ENABLE_IF(detail::is_float128<T>::value)>
+  loc_value(T) {}
+
+  template <typename Visitor> auto visit(Visitor&& vis) -> decltype(vis(0)) {
+    return value_.visit(vis);
   }
+};
 
-  /// Returns a pointer to the output buffer content. No terminating null
-  /// character is appended.
-  FMT_CONSTEXPR20 auto data() const -> const char* { return str_; }
+// A locale facet that formats values in UTF-8.
+// It is parameterized on the locale to avoid the heavy <locale> include.
+template <typename Locale> class format_facet : public Locale::facet {
+ private:
+  std::string separator_;
+  std::string grouping_;
+  std::string decimal_point_;
 
-  /// Returns a pointer to the output buffer content with terminating null
-  /// character appended.
-  FMT_CONSTEXPR20 auto c_str() const -> const char* {
-    buffer_[buffer_size - 1] = '\0';
-    return str_;
-  }
+ protected:
+  virtual auto do_put(appender out, loc_value val,
+                      const format_specs& specs) const -> bool;
 
-  /// Returns the content of the output buffer as an `std::string`.
-  auto str() const -> std::string { return std::string(str_, size()); }
-};
+ public:
+  static FMT_API typename Locale::id id;
 
-template <typename T, typename Char>
-struct formatter<T, Char, enable_if_t<detail::has_format_as<T>::value>>
-    : formatter<detail::format_as_t<T>, Char> {
-  template <typename FormatContext>
-  auto format(const T& value, FormatContext& ctx) const -> decltype(ctx.out()) {
-    auto&& val = format_as(value);  // Make an lvalue reference for format.
-    return formatter<detail::format_as_t<T>, Char>::format(val, ctx);
+  explicit format_facet(Locale& loc);
+  explicit format_facet(string_view sep = "", std::string grouping = "\3",
+                        std::string decimal_point = ".")
+      : separator_(sep.data(), sep.size()),
+        grouping_(grouping),
+        decimal_point_(decimal_point) {}
+
+  auto put(appender out, loc_value val, const format_specs& specs) const
+      -> bool {
+    return do_put(out, val, specs);
   }
 };
 
-#define FMT_FORMAT_AS(Type, Base)                                              \
-  template <typename Char>                                                     \
-  struct formatter<Type, Char> : formatter<Base, Char> {                       \
-    template <typename FormatContext>                                          \
-    auto format(Type value, FormatContext& ctx) const -> decltype(ctx.out()) { \
-      return formatter<Base, Char>::format(value, ctx);                        \
-    }                                                                          \
+#define FMT_FORMAT_AS(Type, Base)                                   \
+  template <typename Char>                                          \
+  struct formatter<Type, Char> : formatter<Base, Char> {            \
+    template <typename FormatContext>                               \
+    FMT_CONSTEXPR auto format(Type value, FormatContext& ctx) const \
+        -> decltype(ctx.out()) {                                    \
+      return formatter<Base, Char>::format(value, ctx);             \
+    }                                                               \
   }
 
 FMT_FORMAT_AS(signed char, int);
@@ -3997,16 +3772,38 @@ FMT_FORMAT_AS(unsigned short, unsigned);
 FMT_FORMAT_AS(long, detail::long_type);
 FMT_FORMAT_AS(unsigned long, detail::ulong_type);
 FMT_FORMAT_AS(Char*, const Char*);
-FMT_FORMAT_AS(std::nullptr_t, const void*);
 FMT_FORMAT_AS(detail::std_string_view<Char>, basic_string_view<Char>);
+FMT_FORMAT_AS(std::nullptr_t, const void*);
 FMT_FORMAT_AS(void*, const void*);
 
+template <typename Char, size_t N>
+struct formatter<Char[N], Char> : formatter<basic_string_view<Char>, Char> {};
+
 template <typename Char, typename Traits, typename Allocator>
 class formatter<std::basic_string<Char, Traits, Allocator>, Char>
     : public formatter<basic_string_view<Char>, Char> {};
 
-template <typename Char, size_t N>
-struct formatter<Char[N], Char> : formatter<basic_string_view<Char>, Char> {};
+template <int N, typename Char>
+struct formatter<detail::bitint<N>, Char> : formatter<long long, Char> {};
+template <int N, typename Char>
+struct formatter<detail::ubitint<N>, Char>
+    : formatter<unsigned long long, Char> {};
+
+template <typename Char>
+struct formatter<detail::float128, Char>
+    : detail::native_formatter<detail::float128, Char,
+                               detail::type::float_type> {};
+
+template <typename T, typename Char>
+struct formatter<T, Char, void_t<detail::format_as_result<T>>>
+    : formatter<detail::format_as_result<T>, Char> {
+  template <typename FormatContext>
+  FMT_CONSTEXPR auto format(const T& value, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    auto&& val = format_as(value);  // Make an lvalue reference for format.
+    return formatter<detail::format_as_result<T>, Char>::format(val, ctx);
+  }
+};
 
 /**
  * Converts `p` to `const void*` for pointer formatting.
@@ -4026,7 +3823,7 @@ template <typename T> auto ptr(T p) -> const void* {
  * **Example**:
  *
  *     enum class color { red, green, blue };
- *     auto s = fmt::format("{}", fmt::underlying(color::red));
+ *     auto s = fmt::format("{}", fmt::underlying(color::red));  // s == "0"
  */
 template <typename Enum>
 constexpr auto underlying(Enum e) noexcept -> underlying_t<Enum> {
@@ -4040,13 +3837,22 @@ constexpr auto format_as(Enum e) noexcept -> underlying_t<Enum> {
 }
 }  // namespace enums
 
-class bytes {
- private:
-  string_view data_;
-  friend struct formatter<bytes>;
+#ifdef __cpp_lib_byte
+template <> struct formatter<std::byte> : formatter<unsigned> {
+  static auto format_as(std::byte b) -> unsigned char {
+    return static_cast<unsigned char>(b);
+  }
+  template <typename Context>
+  auto format(std::byte b, Context& ctx) const -> decltype(ctx.out()) {
+    return formatter<unsigned>::format(format_as(b), ctx);
+  }
+};
+#endif
 
- public:
-  explicit bytes(string_view data) : data_(data) {}
+struct bytes {
+  string_view data;
+
+  inline explicit bytes(string_view s) : data(s) {}
 };
 
 template <> struct formatter<bytes> {
@@ -4054,8 +3860,7 @@ template <> struct formatter<bytes> {
   detail::dynamic_format_specs<> specs_;
 
  public:
-  template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> const char* {
+  FMT_CONSTEXPR auto parse(parse_context<>& ctx) -> const char* {
     return parse_format_specs(ctx.begin(), ctx.end(), specs_, ctx,
                               detail::type::string_type);
   }
@@ -4063,11 +3868,11 @@ template <> struct formatter<bytes> {
   template <typename FormatContext>
   auto format(bytes b, FormatContext& ctx) const -> decltype(ctx.out()) {
     auto specs = specs_;
-    detail::handle_dynamic_spec<detail::width_checker>(specs.width,
-                                                       specs.width_ref, ctx);
-    detail::handle_dynamic_spec<detail::precision_checker>(
-        specs.precision, specs.precision_ref, ctx);
-    return detail::write_bytes<char>(ctx.out(), b.data_, specs);
+    detail::handle_dynamic_spec(specs.dynamic_width(), specs.width,
+                                specs.width_ref, ctx);
+    detail::handle_dynamic_spec(specs.dynamic_precision(), specs.precision,
+                                specs.precision_ref, ctx);
+    return detail::write_bytes<char>(ctx.out(), b.data, specs);
   }
 };
 
@@ -4094,21 +3899,20 @@ template <typename T> struct formatter<group_digits_view<T>> : formatter<T> {
   detail::dynamic_format_specs<> specs_;
 
  public:
-  template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> const char* {
+  FMT_CONSTEXPR auto parse(parse_context<>& ctx) -> const char* {
     return parse_format_specs(ctx.begin(), ctx.end(), specs_, ctx,
                               detail::type::int_type);
   }
 
   template <typename FormatContext>
-  auto format(group_digits_view<T> t, FormatContext& ctx) const
+  auto format(group_digits_view<T> view, FormatContext& ctx) const
       -> decltype(ctx.out()) {
     auto specs = specs_;
-    detail::handle_dynamic_spec<detail::width_checker>(specs.width,
-                                                       specs.width_ref, ctx);
-    detail::handle_dynamic_spec<detail::precision_checker>(
-        specs.precision, specs.precision_ref, ctx);
-    auto arg = detail::make_write_int_arg(t.value, specs.sign);
+    detail::handle_dynamic_spec(specs.dynamic_width(), specs.width,
+                                specs.width_ref, ctx);
+    detail::handle_dynamic_spec(specs.dynamic_precision(), specs.precision,
+                                specs.precision_ref, ctx);
+    auto arg = detail::make_write_int_arg(view.value, specs.sign());
     return detail::write_int(
         ctx.out(), static_cast<detail::uint64_or_128_t<T>>(arg.abs_value),
         arg.prefix, specs, detail::digit_grouping<char>("\3", ","));
@@ -4122,8 +3926,7 @@ template <typename T, typename Char> struct nested_view {
 
 template <typename T, typename Char>
 struct formatter<nested_view<T, Char>, Char> {
-  template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
+  FMT_CONSTEXPR auto parse(parse_context<Char>& ctx) -> const Char* {
     return ctx.begin();
   }
   template <typename FormatContext>
@@ -4135,22 +3938,25 @@ struct formatter<nested_view<T, Char>, Char> {
 
 template <typename T, typename Char = char> struct nested_formatter {
  private:
+  basic_specs specs_;
   int width_;
-  detail::fill_t fill_;
-  align_t align_ : 4;
   formatter<T, Char> formatter_;
 
  public:
-  constexpr nested_formatter() : width_(0), align_(align_t::none) {}
-
-  FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
-      -> decltype(ctx.begin()) {
-    auto specs = detail::dynamic_format_specs<Char>();
-    auto it = parse_format_specs(ctx.begin(), ctx.end(), specs, ctx,
-                                 detail::type::none_type);
-    width_ = specs.width;
-    fill_ = specs.fill;
-    align_ = specs.align;
+  constexpr nested_formatter() : width_(0) {}
+
+  FMT_CONSTEXPR auto parse(parse_context<Char>& ctx) -> const Char* {
+    auto it = ctx.begin(), end = ctx.end();
+    if (it == end) return it;
+    auto specs = format_specs();
+    it = detail::parse_align(it, end, specs);
+    specs_ = specs;
+    Char c = *it;
+    auto width_ref = detail::arg_ref<Char>();
+    if ((c >= '0' && c <= '9') || c == '{') {
+      it = detail::parse_width(it, end, specs, width_ref, ctx);
+      width_ = specs.width;
+    }
     ctx.advance_to(it);
     return formatter_.parse(ctx);
   }
@@ -4162,8 +3968,8 @@ template <typename T, typename Char = char> struct nested_formatter {
     write(basic_appender<Char>(buf));
     auto specs = format_specs();
     specs.width = width_;
-    specs.fill = fill_;
-    specs.align = align_;
+    specs.copy_fill_from(specs_);
+    specs.set_align(specs_.align());
     return detail::write<Char>(
         ctx.out(), basic_string_view<Char>(buf.data(), buf.size()), specs);
   }
@@ -4173,218 +3979,175 @@ template <typename T, typename Char = char> struct nested_formatter {
   }
 };
 
+inline namespace literals {
+#if FMT_USE_NONTYPE_TEMPLATE_ARGS
+template <detail::fixed_string S> constexpr auto operator""_a() {
+  using char_t = remove_cvref_t<decltype(*S.data)>;
+  return detail::udl_arg<char_t, sizeof(S.data) / sizeof(char_t), S>();
+}
+#else
 /**
- * Converts `value` to `std::string` using the default format for type `T`.
+ * User-defined literal equivalent of `fmt::arg`.
  *
  * **Example**:
  *
- *     std::string answer = fmt::to_string(42);
+ *     using namespace fmt::literals;
+ *     fmt::print("The answer is {answer}.", "answer"_a=42);
  */
-template <typename T, FMT_ENABLE_IF(!std::is_integral<T>::value &&
-                                    !detail::has_format_as<T>::value)>
-inline auto to_string(const T& value) -> std::string {
-  auto buffer = memory_buffer();
-  detail::write<char>(appender(buffer), value);
-  return {buffer.data(), buffer.size()};
-}
-
-template <typename T, FMT_ENABLE_IF(std::is_integral<T>::value)>
-FMT_NODISCARD inline auto to_string(T value) -> std::string {
-  // The buffer should be large enough to store the number including the sign
-  // or "false" for bool.
-  constexpr int max_size = detail::digits10<T>() + 2;
-  char buffer[max_size > 5 ? static_cast<unsigned>(max_size) : 5];
-  char* begin = buffer;
-  return std::string(begin, detail::write<char>(begin, value));
-}
-
-template <typename Char, size_t SIZE>
-FMT_NODISCARD auto to_string(const basic_memory_buffer<Char, SIZE>& buf)
-    -> std::basic_string<Char> {
-  auto size = buf.size();
-  detail::assume(size < std::basic_string<Char>().max_size());
-  return std::basic_string<Char>(buf.data(), size);
-}
-
-template <typename T, FMT_ENABLE_IF(!std::is_integral<T>::value &&
-                                    detail::has_format_as<T>::value)>
-inline auto to_string(const T& value) -> std::string {
-  return to_string(format_as(value));
+constexpr auto operator""_a(const char* s, size_t) -> detail::udl_arg<char> {
+  return {s};
 }
+#endif  // FMT_USE_NONTYPE_TEMPLATE_ARGS
+}  // namespace literals
 
-FMT_END_EXPORT
-
-namespace detail {
+/// A fast integer formatter.
+class format_int {
+ private:
+  // Buffer should be large enough to hold all digits (digits10 + 1),
+  // a sign and a null character.
+  enum { buffer_size = std::numeric_limits<unsigned long long>::digits10 + 3 };
+  mutable char buffer_[buffer_size];
+  char* str_;
 
-template <typename Char>
-void vformat_to(buffer<Char>& buf, basic_string_view<Char> fmt,
-                typename vformat_args<Char>::type args, locale_ref loc) {
-  auto out = basic_appender<Char>(buf);
-  if (fmt.size() == 2 && equal2(fmt.data(), "{}")) {
-    auto arg = args.get(0);
-    if (!arg) report_error("argument not found");
-    arg.visit(default_arg_formatter<Char>{out, args, loc});
-    return;
+  template <typename UInt>
+  FMT_CONSTEXPR20 auto format_unsigned(UInt value) -> char* {
+    auto n = static_cast<detail::uint32_or_64_or_128_t<UInt>>(value);
+    return detail::do_format_decimal(buffer_, n, buffer_size - 1);
   }
 
-  struct format_handler {
-    basic_format_parse_context<Char> parse_context;
-    buffered_context<Char> context;
-
-    format_handler(basic_appender<Char> p_out, basic_string_view<Char> str,
-                   basic_format_args<buffered_context<Char>> p_args,
-                   locale_ref p_loc)
-        : parse_context(str), context(p_out, p_args, p_loc) {}
-
-    void on_text(const Char* begin, const Char* end) {
-      auto text = basic_string_view<Char>(begin, to_unsigned(end - begin));
-      context.advance_to(write<Char>(context.out(), text));
-    }
-
-    FMT_CONSTEXPR auto on_arg_id() -> int {
-      return parse_context.next_arg_id();
-    }
-    FMT_CONSTEXPR auto on_arg_id(int id) -> int {
-      parse_context.check_arg_id(id);
-      return id;
-    }
-    FMT_CONSTEXPR auto on_arg_id(basic_string_view<Char> id) -> int {
-      parse_context.check_arg_id(id);
-      int arg_id = context.arg_id(id);
-      if (arg_id < 0) report_error("argument not found");
-      return arg_id;
-    }
-
-    FMT_INLINE void on_replacement_field(int id, const Char*) {
-      auto arg = get_arg(context, id);
-      context.advance_to(arg.visit(default_arg_formatter<Char>{
-          context.out(), context.args(), context.locale()}));
-    }
-
-    auto on_format_specs(int id, const Char* begin, const Char* end)
-        -> const Char* {
-      auto arg = get_arg(context, id);
-      // Not using a visitor for custom types gives better codegen.
-      if (arg.format_custom(begin, parse_context, context))
-        return parse_context.begin();
-      auto specs = detail::dynamic_format_specs<Char>();
-      begin = parse_format_specs(begin, end, specs, parse_context, arg.type());
-      detail::handle_dynamic_spec<detail::width_checker>(
-          specs.width, specs.width_ref, context);
-      detail::handle_dynamic_spec<detail::precision_checker>(
-          specs.precision, specs.precision_ref, context);
-      if (begin == end || *begin != '}')
-        report_error("missing '}' in format string");
-      context.advance_to(arg.visit(
-          arg_formatter<Char>{context.out(), specs, context.locale()}));
-      return begin;
-    }
-
-    FMT_NORETURN void on_error(const char* message) { report_error(message); }
-  };
-  detail::parse_format_string<false>(fmt, format_handler(out, fmt, args, loc));
-}
+  template <typename Int>
+  FMT_CONSTEXPR20 auto format_signed(Int value) -> char* {
+    auto abs_value = static_cast<detail::uint32_or_64_or_128_t<Int>>(value);
+    bool negative = value < 0;
+    if (negative) abs_value = 0 - abs_value;
+    auto begin = format_unsigned(abs_value);
+    if (negative) *--begin = '-';
+    return begin;
+  }
 
-FMT_BEGIN_EXPORT
+ public:
+  FMT_CONSTEXPR20 explicit format_int(int value) : str_(format_signed(value)) {}
+  FMT_CONSTEXPR20 explicit format_int(long value)
+      : str_(format_signed(value)) {}
+  FMT_CONSTEXPR20 explicit format_int(long long value)
+      : str_(format_signed(value)) {}
+  FMT_CONSTEXPR20 explicit format_int(unsigned value)
+      : str_(format_unsigned(value)) {}
+  FMT_CONSTEXPR20 explicit format_int(unsigned long value)
+      : str_(format_unsigned(value)) {}
+  FMT_CONSTEXPR20 explicit format_int(unsigned long long value)
+      : str_(format_unsigned(value)) {}
 
-#ifndef FMT_HEADER_ONLY
-extern template FMT_API void vformat_to(buffer<char>&, string_view,
-                                        typename vformat_args<>::type,
-                                        locale_ref);
-extern template FMT_API auto thousands_sep_impl<char>(locale_ref)
-    -> thousands_sep_result<char>;
-extern template FMT_API auto thousands_sep_impl<wchar_t>(locale_ref)
-    -> thousands_sep_result<wchar_t>;
-extern template FMT_API auto decimal_point_impl(locale_ref) -> char;
-extern template FMT_API auto decimal_point_impl(locale_ref) -> wchar_t;
-#endif  // FMT_HEADER_ONLY
+  /// Returns the number of characters written to the output buffer.
+  FMT_CONSTEXPR20 auto size() const -> size_t {
+    return detail::to_unsigned(buffer_ - str_ + buffer_size - 1);
+  }
 
-FMT_END_EXPORT
+  /// Returns a pointer to the output buffer content. No terminating null
+  /// character is appended.
+  FMT_CONSTEXPR20 auto data() const -> const char* { return str_; }
 
-template <typename T, typename Char, type TYPE>
-template <typename FormatContext>
-FMT_CONSTEXPR FMT_INLINE auto native_formatter<T, Char, TYPE>::format(
-    const T& val, FormatContext& ctx) const -> decltype(ctx.out()) {
-  if (specs_.width_ref.kind == arg_id_kind::none &&
-      specs_.precision_ref.kind == arg_id_kind::none) {
-    return write<Char>(ctx.out(), val, specs_, ctx.locale());
+  /// Returns a pointer to the output buffer content with terminating null
+  /// character appended.
+  FMT_CONSTEXPR20 auto c_str() const -> const char* {
+    buffer_[buffer_size - 1] = '\0';
+    return str_;
   }
-  auto specs = specs_;
-  handle_dynamic_spec<width_checker>(specs.width, specs.width_ref, ctx);
-  handle_dynamic_spec<precision_checker>(specs.precision, specs.precision_ref,
-                                         ctx);
-  return write<Char>(ctx.out(), val, specs, ctx.locale());
-}
-
-}  // namespace detail
 
-FMT_BEGIN_EXPORT
+  /// Returns the content of the output buffer as an `std::string`.
+  inline auto str() const -> std::string { return {str_, size()}; }
+};
 
-template <typename Char>
-struct formatter<detail::float128, Char>
-    : detail::native_formatter<detail::float128, Char,
-                               detail::type::float_type> {};
+#define FMT_STRING_IMPL(s, base)                                              \
+  [] {                                                                        \
+    /* Use the hidden visibility as a workaround for a GCC bug (#1973). */    \
+    /* Use a macro-like name to avoid shadowing warnings. */                  \
+    struct FMT_VISIBILITY("hidden") FMT_COMPILE_STRING : base {               \
+      using char_type = fmt::remove_cvref_t<decltype(s[0])>;                  \
+      constexpr explicit operator fmt::basic_string_view<char_type>() const { \
+        return fmt::detail::compile_string_to_view<char_type>(s);             \
+      }                                                                       \
+    };                                                                        \
+    using FMT_STRING_VIEW =                                                   \
+        fmt::basic_string_view<typename FMT_COMPILE_STRING::char_type>;       \
+    fmt::detail::ignore_unused(FMT_STRING_VIEW(FMT_COMPILE_STRING()));        \
+    return FMT_COMPILE_STRING();                                              \
+  }()
 
-#if FMT_USE_USER_DEFINED_LITERALS
-inline namespace literals {
 /**
- * User-defined literal equivalent of `fmt::arg`.
+ * Constructs a legacy compile-time format string from a string literal `s`.
  *
  * **Example**:
  *
- *     using namespace fmt::literals;
- *     fmt::print("The answer is {answer}.", "answer"_a=42);
+ *     // A compile-time error because 'd' is an invalid specifier for strings.
+ *     std::string s = fmt::format(FMT_STRING("{:d}"), "foo");
  */
-#  if FMT_USE_NONTYPE_TEMPLATE_ARGS
-template <detail_exported::fixed_string Str> constexpr auto operator""_a() {
-  using char_t = remove_cvref_t<decltype(Str.data[0])>;
-  return detail::udl_arg<char_t, sizeof(Str.data) / sizeof(char_t), Str>();
-}
-#  else
-constexpr auto operator""_a(const char* s, size_t) -> detail::udl_arg<char> {
-  return {s};
-}
-#  endif
-}  // namespace literals
-#endif  // FMT_USE_USER_DEFINED_LITERALS
+#define FMT_STRING(s) FMT_STRING_IMPL(s, fmt::detail::compile_string)
 
-FMT_API auto vformat(string_view fmt, format_args args) -> std::string;
+FMT_API auto vsystem_error(int error_code, string_view fmt, format_args args)
+    -> std::system_error;
 
 /**
- * Formats `args` according to specifications in `fmt` and returns the result
- * as a string.
+ * Constructs `std::system_error` with a message formatted with
+ * `fmt::format(fmt, args...)`.
+ * `error_code` is a system error code as given by `errno`.
  *
  * **Example**:
  *
- *     #include <fmt/format.h>
- *     std::string message = fmt::format("The answer is {}.", 42);
+ *     // This throws std::system_error with the description
+ *     //   cannot open file 'madeup': No such file or directory
+ *     // or similar (system message may vary).
+ *     const char* filename = "madeup";
+ *     FILE* file = fopen(filename, "r");
+ *     if (!file)
+ *       throw fmt::system_error(errno, "cannot open file '{}'", filename);
  */
 template <typename... T>
-FMT_NODISCARD FMT_INLINE auto format(format_string<T...> fmt, T&&... args)
-    -> std::string {
-  return vformat(fmt, fmt::make_format_args(args...));
+auto system_error(int error_code, format_string<T...> fmt, T&&... args)
+    -> std::system_error {
+  return vsystem_error(error_code, fmt.str, vargs<T...>{{args...}});
 }
 
+/**
+ * Formats an error message for an error returned by an operating system or a
+ * language runtime, for example a file opening error, and writes it to `out`.
+ * The format is the same as the one used by `std::system_error(ec, message)`
+ * where `ec` is `std::error_code(error_code, std::generic_category())`.
+ * It is implementation-defined but normally looks like:
+ *
+ *     <message>: <system-message>
+ *
+ * where `<message>` is the passed message and `<system-message>` is the system
+ * message corresponding to the error code.
+ * `error_code` is a system error code as given by `errno`.
+ */
+FMT_API void format_system_error(detail::buffer<char>& out, int error_code,
+                                 const char* message) noexcept;
+
+// Reports a system error without throwing an exception.
+// Can be used to report errors from destructors.
+FMT_API void report_system_error(int error_code, const char* message) noexcept;
+
 template <typename Locale, FMT_ENABLE_IF(detail::is_locale<Locale>::value)>
 inline auto vformat(const Locale& loc, string_view fmt, format_args args)
     -> std::string {
-  return detail::vformat(loc, fmt, args);
+  auto buf = memory_buffer();
+  detail::vformat_to(buf, fmt, args, detail::locale_ref(loc));
+  return {buf.data(), buf.size()};
 }
 
 template <typename Locale, typename... T,
           FMT_ENABLE_IF(detail::is_locale<Locale>::value)>
-inline auto format(const Locale& loc, format_string<T...> fmt, T&&... args)
+FMT_INLINE auto format(const Locale& loc, format_string<T...> fmt, T&&... args)
     -> std::string {
-  return fmt::vformat(loc, string_view(fmt), fmt::make_format_args(args...));
+  return vformat(loc, fmt.str, vargs<T...>{{args...}});
 }
 
 template <typename OutputIt, typename Locale,
-          FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, char>::value&&
-                            detail::is_locale<Locale>::value)>
+          FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, char>::value)>
 auto vformat_to(OutputIt out, const Locale& loc, string_view fmt,
                 format_args args) -> OutputIt {
-  using detail::get_buffer;
-  auto&& buf = get_buffer<char>(out);
+  auto&& buf = detail::get_buffer<char>(out);
   detail::vformat_to(buf, fmt, args, detail::locale_ref(loc));
   return detail::get_iterator(buf, out);
 }
@@ -4394,7 +4157,7 @@ template <typename OutputIt, typename Locale, typename... T,
                             detail::is_locale<Locale>::value)>
 FMT_INLINE auto format_to(OutputIt out, const Locale& loc,
                           format_string<T...> fmt, T&&... args) -> OutputIt {
-  return vformat_to(out, loc, fmt, fmt::make_format_args(args...));
+  return fmt::vformat_to(out, loc, fmt.str, vargs<T...>{{args...}});
 }
 
 template <typename Locale, typename... T,
@@ -4403,20 +4166,62 @@ FMT_NODISCARD FMT_INLINE auto formatted_size(const Locale& loc,
                                              format_string<T...> fmt,
                                              T&&... args) -> size_t {
   auto buf = detail::counting_buffer<>();
-  detail::vformat_to<char>(buf, fmt, fmt::make_format_args(args...),
-                           detail::locale_ref(loc));
+  detail::vformat_to(buf, fmt.str, vargs<T...>{{args...}},
+                     detail::locale_ref(loc));
   return buf.count();
 }
 
-FMT_END_EXPORT
+FMT_API auto vformat(string_view fmt, format_args args) -> std::string;
+
+/**
+ * Formats `args` according to specifications in `fmt` and returns the result
+ * as a string.
+ *
+ * **Example**:
+ *
+ *     #include <fmt/format.h>
+ *     std::string message = fmt::format("The answer is {}.", 42);
+ */
+template <typename... T>
+FMT_NODISCARD FMT_INLINE auto format(format_string<T...> fmt, T&&... args)
+    -> std::string {
+  return vformat(fmt.str, vargs<T...>{{args...}});
+}
 
+/**
+ * Converts `value` to `std::string` using the default format for type `T`.
+ *
+ * **Example**:
+ *
+ *     std::string answer = fmt::to_string(42);
+ */
+template <typename T, FMT_ENABLE_IF(std::is_integral<T>::value)>
+FMT_NODISCARD auto to_string(T value) -> std::string {
+  // The buffer should be large enough to store the number including the sign
+  // or "false" for bool.
+  char buffer[max_of(detail::digits10<T>() + 2, 5)];
+  return {buffer, detail::write<char>(buffer, value)};
+}
+
+template <typename T, FMT_ENABLE_IF(detail::use_format_as<T>::value)>
+FMT_NODISCARD auto to_string(const T& value) -> std::string {
+  return to_string(format_as(value));
+}
+
+template <typename T, FMT_ENABLE_IF(!std::is_integral<T>::value &&
+                                    !detail::use_format_as<T>::value)>
+FMT_NODISCARD auto to_string(const T& value) -> std::string {
+  auto buffer = memory_buffer();
+  detail::write<char>(appender(buffer), value);
+  return {buffer.data(), buffer.size()};
+}
+
+FMT_END_EXPORT
 FMT_END_NAMESPACE
 
 #ifdef FMT_HEADER_ONLY
 #  define FMT_FUNC inline
 #  include "format-inl.h"
-#else
-#  define FMT_FUNC
 #endif
 
 // Restore _LIBCPP_REMOVE_TRANSITIVE_INCLUDES.
diff --git a/contrib/fmt/include/fmt/os.h b/contrib/fmt/include/fmt/os.h
index 5c85ea08f..b2cc5e4b8 100644
--- a/contrib/fmt/include/fmt/os.h
+++ b/contrib/fmt/include/fmt/os.h
@@ -118,7 +118,7 @@ FMT_API void format_windows_error(buffer<char>& out, int error_code,
                                   const char* message) noexcept;
 }
 
-FMT_API std::system_error vwindows_error(int error_code, string_view format_str,
+FMT_API std::system_error vwindows_error(int error_code, string_view fmt,
                                          format_args args);
 
 /**
@@ -146,10 +146,10 @@ FMT_API std::system_error vwindows_error(int error_code, string_view format_str,
  *                                "cannot open file '{}'", filename);
  *     }
  */
-template <typename... Args>
-std::system_error windows_error(int error_code, string_view message,
-                                const Args&... args) {
-  return vwindows_error(error_code, message, fmt::make_format_args(args...));
+template <typename... T>
+auto windows_error(int error_code, string_view message, const T&... args)
+    -> std::system_error {
+  return vwindows_error(error_code, message, vargs<T...>{{args...}});
 }
 
 // Reports a Windows error without throwing an exception.
@@ -164,8 +164,8 @@ inline auto system_category() noexcept -> const std::error_category& {
 // std::system is not available on some platforms such as iOS (#2248).
 #ifdef __OSX__
 template <typename S, typename... Args, typename Char = char_t<S>>
-void say(const S& format_str, Args&&... args) {
-  std::system(format("say \"{}\"", format(format_str, args...)).c_str());
+void say(const S& fmt, Args&&... args) {
+  std::system(format("say \"{}\"", format(fmt, args...)).c_str());
 }
 #endif
 
@@ -176,24 +176,24 @@ class buffered_file {
 
   friend class file;
 
-  explicit buffered_file(FILE* f) : file_(f) {}
+  inline explicit buffered_file(FILE* f) : file_(f) {}
 
  public:
   buffered_file(const buffered_file&) = delete;
   void operator=(const buffered_file&) = delete;
 
   // Constructs a buffered_file object which doesn't represent any file.
-  buffered_file() noexcept : file_(nullptr) {}
+  inline buffered_file() noexcept : file_(nullptr) {}
 
   // Destroys the object closing the file it represents if any.
   FMT_API ~buffered_file() noexcept;
 
  public:
-  buffered_file(buffered_file&& other) noexcept : file_(other.file_) {
+  inline buffered_file(buffered_file&& other) noexcept : file_(other.file_) {
     other.file_ = nullptr;
   }
 
-  auto operator=(buffered_file&& other) -> buffered_file& {
+  inline auto operator=(buffered_file&& other) -> buffered_file& {
     close();
     file_ = other.file_;
     other.file_ = nullptr;
@@ -207,13 +207,13 @@ class buffered_file {
   FMT_API void close();
 
   // Returns the pointer to a FILE object representing this file.
-  auto get() const noexcept -> FILE* { return file_; }
+  inline auto get() const noexcept -> FILE* { return file_; }
 
   FMT_API auto descriptor() const -> int;
 
   template <typename... T>
   inline void print(string_view fmt, const T&... args) {
-    const auto& vargs = fmt::make_format_args(args...);
+    fmt::vargs<T...> vargs = {{args...}};
     detail::is_locking<T...>() ? fmt::vprint_buffered(file_, fmt, vargs)
                                : fmt::vprint(file_, fmt, vargs);
   }
@@ -248,7 +248,7 @@ class FMT_API file {
   };
 
   // Constructs a file object which doesn't represent any file.
-  file() noexcept : fd_(-1) {}
+  inline file() noexcept : fd_(-1) {}
 
   // Opens a file and constructs a file object representing this file.
   file(cstring_view path, int oflag);
@@ -257,10 +257,10 @@ class FMT_API file {
   file(const file&) = delete;
   void operator=(const file&) = delete;
 
-  file(file&& other) noexcept : fd_(other.fd_) { other.fd_ = -1; }
+  inline file(file&& other) noexcept : fd_(other.fd_) { other.fd_ = -1; }
 
   // Move assignment is not noexcept because close may throw.
-  auto operator=(file&& other) -> file& {
+  inline auto operator=(file&& other) -> file& {
     close();
     fd_ = other.fd_;
     other.fd_ = -1;
@@ -271,7 +271,7 @@ class FMT_API file {
   ~file() noexcept;
 
   // Returns the file descriptor.
-  auto descriptor() const noexcept -> int { return fd_; }
+  inline auto descriptor() const noexcept -> int { return fd_; }
 
   // Closes the file.
   void close();
@@ -324,9 +324,9 @@ auto getpagesize() -> long;
 namespace detail {
 
 struct buffer_size {
-  buffer_size() = default;
+  constexpr buffer_size() = default;
   size_t value = 0;
-  auto operator=(size_t val) const -> buffer_size {
+  FMT_CONSTEXPR auto operator=(size_t val) const -> buffer_size {
     auto bs = buffer_size();
     bs.value = val;
     return bs;
@@ -337,7 +337,7 @@ struct ostream_params {
   int oflag = file::WRONLY | file::CREATE | file::TRUNC;
   size_t buffer_size = BUFSIZ > 32768 ? BUFSIZ : 32768;
 
-  ostream_params() {}
+  constexpr ostream_params() {}
 
   template <typename... T>
   ostream_params(T... params, int new_oflag) : ostream_params(params...) {
@@ -358,59 +358,47 @@ struct ostream_params {
 #  endif
 };
 
-class file_buffer final : public buffer<char> {
- private:
-  file file_;
-
-  FMT_API static void grow(buffer<char>& buf, size_t);
-
- public:
-  FMT_API file_buffer(cstring_view path, const ostream_params& params);
-  FMT_API file_buffer(file_buffer&& other) noexcept;
-  FMT_API ~file_buffer();
-
-  void flush() {
-    if (size() == 0) return;
-    file_.write(data(), size() * sizeof(data()[0]));
-    clear();
-  }
-
-  void close() {
-    flush();
-    file_.close();
-  }
-};
-
 }  // namespace detail
 
-constexpr auto buffer_size = detail::buffer_size();
+FMT_INLINE_VARIABLE constexpr auto buffer_size = detail::buffer_size();
 
-/// A fast output stream for writing from a single thread. Writing from
+/// A fast buffered output stream for writing from a single thread. Writing from
 /// multiple threads without external synchronization may result in a data race.
-class FMT_API ostream {
+class FMT_API ostream : private detail::buffer<char> {
  private:
-  FMT_MSC_WARNING(suppress : 4251)
-  detail::file_buffer buffer_;
+  file file_;
 
-  ostream(cstring_view path, const detail::ostream_params& params)
-      : buffer_(path, params) {}
+  ostream(cstring_view path, const detail::ostream_params& params);
 
- public:
-  ostream(ostream&& other) : buffer_(std::move(other.buffer_)) {}
+  static void grow(buffer<char>& buf, size_t);
 
+ public:
+  ostream(ostream&& other) noexcept;
   ~ostream();
 
-  void flush() { buffer_.flush(); }
+  operator writer() {
+    detail::buffer<char>& buf = *this;
+    return buf;
+  }
+
+  inline void flush() {
+    if (size() == 0) return;
+    file_.write(data(), size() * sizeof(data()[0]));
+    clear();
+  }
 
   template <typename... T>
   friend auto output_file(cstring_view path, T... params) -> ostream;
 
-  void close() { buffer_.close(); }
+  inline void close() {
+    flush();
+    file_.close();
+  }
 
   /// Formats `args` according to specifications in `fmt` and writes the
   /// output to the file.
   template <typename... T> void print(format_string<T...> fmt, T&&... args) {
-    vformat_to(appender(buffer_), fmt, fmt::make_format_args(args...));
+    vformat_to(appender(*this), fmt.str, vargs<T...>{{args...}});
   }
 };
 
diff --git a/contrib/fmt/include/fmt/ostream.h b/contrib/fmt/include/fmt/ostream.h
index 98faef659..5d893c921 100644
--- a/contrib/fmt/include/fmt/ostream.h
+++ b/contrib/fmt/include/fmt/ostream.h
@@ -22,6 +22,14 @@
 
 #include "chrono.h"  // formatbuf
 
+#ifdef _MSVC_STL_UPDATE
+#  define FMT_MSVC_STL_UPDATE _MSVC_STL_UPDATE
+#elif defined(_MSC_VER) && _MSC_VER < 1912  // VS 15.5
+#  define FMT_MSVC_STL_UPDATE _MSVC_LANG
+#else
+#  define FMT_MSVC_STL_UPDATE 0
+#endif
+
 FMT_BEGIN_NAMESPACE
 namespace detail {
 
@@ -35,53 +43,18 @@ class file_access {
   friend auto get_file(BufType& obj) -> FILE* { return obj.*FileMemberPtr; }
 };
 
-#if FMT_MSC_VERSION
+#if FMT_MSVC_STL_UPDATE
 template class file_access<file_access_tag, std::filebuf,
                            &std::filebuf::_Myfile>;
 auto get_file(std::filebuf&) -> FILE*;
 #endif
 
-inline auto write_ostream_unicode(std::ostream& os, fmt::string_view data)
-    -> bool {
-  FILE* f = nullptr;
-#if FMT_MSC_VERSION && FMT_USE_RTTI
-  if (auto* buf = dynamic_cast<std::filebuf*>(os.rdbuf()))
-    f = get_file(*buf);
-  else
-    return false;
-#elif defined(_WIN32) && defined(__GLIBCXX__) && FMT_USE_RTTI
-  auto* rdbuf = os.rdbuf();
-  if (auto* sfbuf = dynamic_cast<__gnu_cxx::stdio_sync_filebuf<char>*>(rdbuf))
-    f = sfbuf->file();
-  else if (auto* fbuf = dynamic_cast<__gnu_cxx::stdio_filebuf<char>*>(rdbuf))
-    f = fbuf->file();
-  else
-    return false;
-#else
-  ignore_unused(os, data, f);
-#endif
-#ifdef _WIN32
-  if (f) {
-    int fd = _fileno(f);
-    if (_isatty(fd)) {
-      os.flush();
-      return write_console(fd, data);
-    }
-  }
-#endif
-  return false;
-}
-inline auto write_ostream_unicode(std::wostream&,
-                                  fmt::basic_string_view<wchar_t>) -> bool {
-  return false;
-}
-
 // Write the content of buf to os.
 // It is a separate function rather than a part of vprint to simplify testing.
 template <typename Char>
 void write_buffer(std::basic_ostream<Char>& os, buffer<Char>& buf) {
   const Char* buf_data = buf.data();
-  using unsigned_streamsize = std::make_unsigned<std::streamsize>::type;
+  using unsigned_streamsize = make_unsigned_t<std::streamsize>;
   unsigned_streamsize size = buf.size();
   unsigned_streamsize max_size = to_unsigned(max_value<std::streamsize>());
   do {
@@ -92,21 +65,9 @@ void write_buffer(std::basic_ostream<Char>& os, buffer<Char>& buf) {
   } while (size != 0);
 }
 
-template <typename Char, typename T>
-void format_value(buffer<Char>& buf, const T& value) {
-  auto&& format_buf = formatbuf<std::basic_streambuf<Char>>(buf);
-  auto&& output = std::basic_ostream<Char>(&format_buf);
-#if !defined(FMT_STATIC_THOUSANDS_SEPARATOR)
-  output.imbue(std::locale::classic());  // The default is always unlocalized.
-#endif
-  output << value;
-  output.exceptions(std::ios_base::failbit | std::ios_base::badbit);
-}
-
 template <typename T> struct streamed_view {
   const T& value;
 };
-
 }  // namespace detail
 
 // Formats an object of type T that has an overloaded ostream operator<<.
@@ -117,7 +78,11 @@ struct basic_ostream_formatter : formatter<basic_string_view<Char>, Char> {
   template <typename T, typename Context>
   auto format(const T& value, Context& ctx) const -> decltype(ctx.out()) {
     auto buffer = basic_memory_buffer<Char>();
-    detail::format_value(buffer, value);
+    auto&& formatbuf = detail::formatbuf<std::basic_streambuf<Char>>(buffer);
+    auto&& output = std::basic_ostream<Char>(&formatbuf);
+    output.imbue(std::locale::classic());  // The default is always unlocalized.
+    output << value;
+    output.exceptions(std::ios_base::failbit | std::ios_base::badbit);
     return formatter<basic_string_view<Char>, Char>::format(
         {buffer.data(), buffer.size()}, ctx);
   }
@@ -148,24 +113,30 @@ constexpr auto streamed(const T& value) -> detail::streamed_view<T> {
   return {value};
 }
 
-namespace detail {
-
-inline void vprint_directly(std::ostream& os, string_view format_str,
-                            format_args args) {
+inline void vprint(std::ostream& os, string_view fmt, format_args args) {
   auto buffer = memory_buffer();
-  detail::vformat_to(buffer, format_str, args);
-  detail::write_buffer(os, buffer);
-}
-
-}  // namespace detail
-
-FMT_EXPORT template <typename Char>
-void vprint(std::basic_ostream<Char>& os,
-            basic_string_view<type_identity_t<Char>> format_str,
-            typename detail::vformat_args<Char>::type args) {
-  auto buffer = basic_memory_buffer<Char>();
-  detail::vformat_to(buffer, format_str, args);
-  if (detail::write_ostream_unicode(os, {buffer.data(), buffer.size()})) return;
+  detail::vformat_to(buffer, fmt, args);
+  FILE* f = nullptr;
+#if FMT_MSVC_STL_UPDATE && FMT_USE_RTTI
+  if (auto* buf = dynamic_cast<std::filebuf*>(os.rdbuf()))
+    f = detail::get_file(*buf);
+#elif defined(_WIN32) && defined(__GLIBCXX__) && FMT_USE_RTTI
+  auto* rdbuf = os.rdbuf();
+  if (auto* sfbuf = dynamic_cast<__gnu_cxx::stdio_sync_filebuf<char>*>(rdbuf))
+    f = sfbuf->file();
+  else if (auto* fbuf = dynamic_cast<__gnu_cxx::stdio_filebuf<char>*>(rdbuf))
+    f = fbuf->file();
+#endif
+#ifdef _WIN32
+  if (f) {
+    int fd = _fileno(f);
+    if (_isatty(fd)) {
+      os.flush();
+      if (detail::write_console(fd, {buffer.data(), buffer.size()})) return;
+    }
+  }
+#endif
+  detail::ignore_unused(f);
   detail::write_buffer(os, buffer);
 }
 
@@ -178,19 +149,11 @@ void vprint(std::basic_ostream<Char>& os,
  */
 FMT_EXPORT template <typename... T>
 void print(std::ostream& os, format_string<T...> fmt, T&&... args) {
-  const auto& vargs = fmt::make_format_args(args...);
-  if (detail::use_utf8())
-    vprint(os, fmt, vargs);
-  else
-    detail::vprint_directly(os, fmt, vargs);
-}
-
-FMT_EXPORT
-template <typename... Args>
-void print(std::wostream& os,
-           basic_format_string<wchar_t, type_identity_t<Args>...> fmt,
-           Args&&... args) {
-  vprint(os, fmt, fmt::make_format_args<buffered_context<wchar_t>>(args...));
+  fmt::vargs<T...> vargs = {{args...}};
+  if (detail::use_utf8) return vprint(os, fmt.str, vargs);
+  auto buffer = memory_buffer();
+  detail::vformat_to(buffer, fmt.str, vargs);
+  detail::write_buffer(os, buffer);
 }
 
 FMT_EXPORT template <typename... T>
@@ -198,14 +161,6 @@ void println(std::ostream& os, format_string<T...> fmt, T&&... args) {
   fmt::print(os, "{}\n", fmt::format(fmt, std::forward<T>(args)...));
 }
 
-FMT_EXPORT
-template <typename... Args>
-void println(std::wostream& os,
-             basic_format_string<wchar_t, type_identity_t<Args>...> fmt,
-             Args&&... args) {
-  print(os, L"{}\n", fmt::format(fmt, std::forward<Args>(args)...));
-}
-
 FMT_END_NAMESPACE
 
 #endif  // FMT_OSTREAM_H_
diff --git a/contrib/fmt/include/fmt/printf.h b/contrib/fmt/include/fmt/printf.h
index 072cc6b30..e72684018 100644
--- a/contrib/fmt/include/fmt/printf.h
+++ b/contrib/fmt/include/fmt/printf.h
@@ -33,8 +33,9 @@ template <typename Char> class basic_printf_context {
 
  public:
   using char_type = Char;
-  using parse_context_type = basic_format_parse_context<Char>;
+  using parse_context_type = parse_context<Char>;
   template <typename T> using formatter_type = printf_formatter<T>;
+  enum { builtin_types = 1 };
 
   /// Constructs a `printf_context` object. References to the arguments are
   /// stored in the context object so make sure they have appropriate lifetimes.
@@ -54,6 +55,23 @@ template <typename Char> class basic_printf_context {
 
 namespace detail {
 
+// Return the result via the out param to workaround gcc bug 77539.
+template <bool IS_CONSTEXPR, typename T, typename Ptr = const T*>
+FMT_CONSTEXPR auto find(Ptr first, Ptr last, T value, Ptr& out) -> bool {
+  for (out = first; out != last; ++out) {
+    if (*out == value) return true;
+  }
+  return false;
+}
+
+template <>
+inline auto find<false, char>(const char* first, const char* last, char value,
+                              const char*& out) -> bool {
+  out =
+      static_cast<const char*>(memchr(first, value, to_unsigned(last - first)));
+  return out != nullptr;
+}
+
 // Checks if a value fits in int - used to avoid warnings about comparing
 // signed and unsigned integers.
 template <bool IsSigned> struct int_checker {
@@ -61,7 +79,7 @@ template <bool IsSigned> struct int_checker {
     unsigned max = to_unsigned(max_value<int>());
     return value <= max;
   }
-  static auto fits_in_int(bool) -> bool { return true; }
+  inline static auto fits_in_int(bool) -> bool { return true; }
 };
 
 template <> struct int_checker<true> {
@@ -69,7 +87,7 @@ template <> struct int_checker<true> {
     return value >= (std::numeric_limits<int>::min)() &&
            value <= max_value<int>();
   }
-  static auto fits_in_int(int) -> bool { return true; }
+  inline static auto fits_in_int(int) -> bool { return true; }
 };
 
 struct printf_precision_handler {
@@ -127,25 +145,19 @@ template <typename T, typename Context> class arg_converter {
     using target_type = conditional_t<std::is_same<T, void>::value, U, T>;
     if (const_check(sizeof(target_type) <= sizeof(int))) {
       // Extra casts are used to silence warnings.
-      if (is_signed) {
-        auto n = static_cast<int>(static_cast<target_type>(value));
-        arg_ = detail::make_arg<Context>(n);
-      } else {
-        using unsigned_type = typename make_unsigned_or_bool<target_type>::type;
-        auto n = static_cast<unsigned>(static_cast<unsigned_type>(value));
-        arg_ = detail::make_arg<Context>(n);
-      }
+      using unsigned_type = typename make_unsigned_or_bool<target_type>::type;
+      if (is_signed)
+        arg_ = static_cast<int>(static_cast<target_type>(value));
+      else
+        arg_ = static_cast<unsigned>(static_cast<unsigned_type>(value));
     } else {
-      if (is_signed) {
-        // glibc's printf doesn't sign extend arguments of smaller types:
-        //   std::printf("%lld", -42);  // prints "4294967254"
-        // but we don't have to do the same because it's a UB.
-        auto n = static_cast<long long>(value);
-        arg_ = detail::make_arg<Context>(n);
-      } else {
-        auto n = static_cast<typename make_unsigned_or_bool<U>::type>(value);
-        arg_ = detail::make_arg<Context>(n);
-      }
+      // glibc's printf doesn't sign extend arguments of smaller types:
+      //   std::printf("%lld", -42);  // prints "4294967254"
+      // but we don't have to do the same because it's a UB.
+      if (is_signed)
+        arg_ = static_cast<long long>(value);
+      else
+        arg_ = static_cast<typename make_unsigned_or_bool<U>::type>(value);
     }
   }
 
@@ -172,8 +184,7 @@ template <typename Context> class char_converter {
 
   template <typename T, FMT_ENABLE_IF(std::is_integral<T>::value)>
   void operator()(T value) {
-    auto c = static_cast<typename Context::char_type>(value);
-    arg_ = detail::make_arg<Context>(c);
+    arg_ = static_cast<typename Context::char_type>(value);
   }
 
   template <typename T, FMT_ENABLE_IF(!std::is_integral<T>::value)>
@@ -194,13 +205,13 @@ class printf_width_handler {
   format_specs& specs_;
 
  public:
-  explicit printf_width_handler(format_specs& specs) : specs_(specs) {}
+  inline explicit printf_width_handler(format_specs& specs) : specs_(specs) {}
 
   template <typename T, FMT_ENABLE_IF(std::is_integral<T>::value)>
   auto operator()(T value) -> unsigned {
     auto width = static_cast<uint32_or_64_or_128_t<T>>(value);
     if (detail::is_negative(value)) {
-      specs_.align = align::left;
+      specs_.set_align(align::left);
       width = 0 - width;
     }
     unsigned int_max = to_unsigned(max_value<int>());
@@ -234,69 +245,74 @@ class printf_arg_formatter : public arg_formatter<Char> {
 
   void write_null_pointer(bool is_string = false) {
     auto s = this->specs;
-    s.type = presentation_type::none;
+    s.set_type(presentation_type::none);
     write_bytes<Char>(this->out, is_string ? "(null)" : "(nil)", s);
   }
 
+  template <typename T> void write(T value) {
+    detail::write<Char>(this->out, value, this->specs, this->locale);
+  }
+
  public:
   printf_arg_formatter(basic_appender<Char> iter, format_specs& s,
                        context_type& ctx)
       : base(make_arg_formatter(iter, s)), context_(ctx) {}
 
-  void operator()(monostate value) { base::operator()(value); }
+  void operator()(monostate value) { write(value); }
 
   template <typename T, FMT_ENABLE_IF(detail::is_integral<T>::value)>
   void operator()(T value) {
     // MSVC2013 fails to compile separate overloads for bool and Char so use
     // std::is_same instead.
     if (!std::is_same<T, Char>::value) {
-      base::operator()(value);
+      write(value);
       return;
     }
     format_specs s = this->specs;
-    if (s.type != presentation_type::none && s.type != presentation_type::chr) {
+    if (s.type() != presentation_type::none &&
+        s.type() != presentation_type::chr) {
       return (*this)(static_cast<int>(value));
     }
-    s.sign = sign::none;
-    s.alt = false;
-    s.fill = ' ';  // Ignore '0' flag for char types.
+    s.set_sign(sign::none);
+    s.clear_alt();
+    s.set_fill(' ');  // Ignore '0' flag for char types.
     // align::numeric needs to be overwritten here since the '0' flag is
     // ignored for non-numeric types
-    if (s.align == align::none || s.align == align::numeric)
-      s.align = align::right;
-    write<Char>(this->out, static_cast<Char>(value), s);
+    if (s.align() == align::none || s.align() == align::numeric)
+      s.set_align(align::right);
+    detail::write<Char>(this->out, static_cast<Char>(value), s);
   }
 
   template <typename T, FMT_ENABLE_IF(std::is_floating_point<T>::value)>
   void operator()(T value) {
-    base::operator()(value);
+    write(value);
   }
 
   void operator()(const char* value) {
     if (value)
-      base::operator()(value);
+      write(value);
     else
-      write_null_pointer(this->specs.type != presentation_type::pointer);
+      write_null_pointer(this->specs.type() != presentation_type::pointer);
   }
 
   void operator()(const wchar_t* value) {
     if (value)
-      base::operator()(value);
+      write(value);
     else
-      write_null_pointer(this->specs.type != presentation_type::pointer);
+      write_null_pointer(this->specs.type() != presentation_type::pointer);
   }
 
-  void operator()(basic_string_view<Char> value) { base::operator()(value); }
+  void operator()(basic_string_view<Char> value) { write(value); }
 
   void operator()(const void* value) {
     if (value)
-      base::operator()(value);
+      write(value);
     else
       write_null_pointer();
   }
 
   void operator()(typename basic_format_arg<context_type>::handle handle) {
-    auto parse_ctx = basic_format_parse_context<Char>({});
+    auto parse_ctx = parse_context<Char>({});
     handle.format(parse_ctx, context_);
   }
 };
@@ -305,23 +321,14 @@ template <typename Char>
 void parse_flags(format_specs& specs, const Char*& it, const Char* end) {
   for (; it != end; ++it) {
     switch (*it) {
-    case '-':
-      specs.align = align::left;
-      break;
-    case '+':
-      specs.sign = sign::plus;
-      break;
-    case '0':
-      specs.fill = '0';
-      break;
+    case '-': specs.set_align(align::left); break;
+    case '+': specs.set_sign(sign::plus); break;
+    case '0': specs.set_fill('0'); break;
     case ' ':
-      if (specs.sign != sign::plus) specs.sign = sign::space;
+      if (specs.sign() != sign::plus) specs.set_sign(sign::space);
       break;
-    case '#':
-      specs.alt = true;
-      break;
-    default:
-      return;
+    case '#': specs.set_alt(); break;
+    default:  return;
     }
   }
 }
@@ -339,7 +346,7 @@ auto parse_header(const Char*& it, const Char* end, format_specs& specs,
       ++it;
       arg_index = value != -1 ? value : max_value<int>();
     } else {
-      if (c == '0') specs.fill = '0';
+      if (c == '0') specs.set_fill('0');
       if (value != 0) {
         // Nonzero value means that we parsed width and don't need to
         // parse it or flags again, so return now.
@@ -369,43 +376,22 @@ inline auto parse_printf_presentation_type(char c, type t, bool& upper)
   using pt = presentation_type;
   constexpr auto integral_set = sint_set | uint_set | bool_set | char_set;
   switch (c) {
-  case 'd':
-    return in(t, integral_set) ? pt::dec : pt::none;
-  case 'o':
-    return in(t, integral_set) ? pt::oct : pt::none;
-  case 'X':
-    upper = true;
-    FMT_FALLTHROUGH;
-  case 'x':
-    return in(t, integral_set) ? pt::hex : pt::none;
-  case 'E':
-    upper = true;
-    FMT_FALLTHROUGH;
-  case 'e':
-    return in(t, float_set) ? pt::exp : pt::none;
-  case 'F':
-    upper = true;
-    FMT_FALLTHROUGH;
-  case 'f':
-    return in(t, float_set) ? pt::fixed : pt::none;
-  case 'G':
-    upper = true;
-    FMT_FALLTHROUGH;
-  case 'g':
-    return in(t, float_set) ? pt::general : pt::none;
-  case 'A':
-    upper = true;
-    FMT_FALLTHROUGH;
-  case 'a':
-    return in(t, float_set) ? pt::hexfloat : pt::none;
-  case 'c':
-    return in(t, integral_set) ? pt::chr : pt::none;
-  case 's':
-    return in(t, string_set | cstring_set) ? pt::string : pt::none;
-  case 'p':
-    return in(t, pointer_set | cstring_set) ? pt::pointer : pt::none;
-  default:
-    return pt::none;
+  case 'd': return in(t, integral_set) ? pt::dec : pt::none;
+  case 'o': return in(t, integral_set) ? pt::oct : pt::none;
+  case 'X': upper = true; FMT_FALLTHROUGH;
+  case 'x': return in(t, integral_set) ? pt::hex : pt::none;
+  case 'E': upper = true; FMT_FALLTHROUGH;
+  case 'e': return in(t, float_set) ? pt::exp : pt::none;
+  case 'F': upper = true; FMT_FALLTHROUGH;
+  case 'f': return in(t, float_set) ? pt::fixed : pt::none;
+  case 'G': upper = true; FMT_FALLTHROUGH;
+  case 'g': return in(t, float_set) ? pt::general : pt::none;
+  case 'A': upper = true; FMT_FALLTHROUGH;
+  case 'a': return in(t, float_set) ? pt::hexfloat : pt::none;
+  case 'c': return in(t, integral_set) ? pt::chr : pt::none;
+  case 's': return in(t, string_set | cstring_set) ? pt::string : pt::none;
+  case 'p': return in(t, pointer_set | cstring_set) ? pt::pointer : pt::none;
+  default:  return pt::none;
   }
 }
 
@@ -415,7 +401,7 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
   using iterator = basic_appender<Char>;
   auto out = iterator(buf);
   auto context = basic_printf_context<Char>(out, args);
-  auto parse_ctx = basic_format_parse_context<Char>(format);
+  auto parse_ctx = parse_context<Char>(format);
 
   // Returns the argument with specified index or, if arg_index is -1, the next
   // argument.
@@ -444,7 +430,7 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
     write(out, basic_string_view<Char>(start, to_unsigned(it - 1 - start)));
 
     auto specs = format_specs();
-    specs.align = align::right;
+    specs.set_align(align::right);
 
     // Parse argument index, flags and width.
     int arg_index = parse_header(it, end, specs, get_arg);
@@ -468,9 +454,9 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
     auto arg = get_arg(arg_index);
     // For d, i, o, u, x, and X conversion specifiers, if a precision is
     // specified, the '0' flag is ignored
-    if (specs.precision >= 0 && arg.is_integral()) {
+    if (specs.precision >= 0 && is_integral_type(arg.type())) {
       // Ignore '0' for non-numeric types or if '-' present.
-      specs.fill = ' ';
+      specs.set_fill(' ');
     }
     if (specs.precision >= 0 && arg.type() == type::cstring_type) {
       auto str = arg.visit(get_cstring<Char>());
@@ -478,15 +464,16 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
       auto nul = std::find(str, str_end, Char());
       auto sv = basic_string_view<Char>(
           str, to_unsigned(nul != str_end ? nul - str : specs.precision));
-      arg = make_arg<basic_printf_context<Char>>(sv);
+      arg = sv;
     }
-    if (specs.alt && arg.visit(is_zero_int())) specs.alt = false;
-    if (specs.fill.template get<Char>() == '0') {
-      if (arg.is_arithmetic() && specs.align != align::left)
-        specs.align = align::numeric;
-      else
-        specs.fill = ' ';  // Ignore '0' flag for non-numeric types or if '-'
-                           // flag is also present.
+    if (specs.alt() && arg.visit(is_zero_int())) specs.clear_alt();
+    if (specs.fill_unit<Char>() == '0') {
+      if (is_arithmetic_type(arg.type()) && specs.align() != align::left) {
+        specs.set_align(align::numeric);
+      } else {
+        // Ignore '0' flag for non-numeric types or if '-' flag is also present.
+        specs.set_fill(' ');
+      }
     }
 
     // Parse length and convert the argument to the required type.
@@ -511,44 +498,34 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
         convert_arg<long>(arg, t);
       }
       break;
-    case 'j':
-      convert_arg<intmax_t>(arg, t);
-      break;
-    case 'z':
-      convert_arg<size_t>(arg, t);
-      break;
-    case 't':
-      convert_arg<std::ptrdiff_t>(arg, t);
-      break;
+    case 'j': convert_arg<intmax_t>(arg, t); break;
+    case 'z': convert_arg<size_t>(arg, t); break;
+    case 't': convert_arg<std::ptrdiff_t>(arg, t); break;
     case 'L':
       // printf produces garbage when 'L' is omitted for long double, no
       // need to do the same.
       break;
-    default:
-      --it;
-      convert_arg<void>(arg, c);
+    default: --it; convert_arg<void>(arg, c);
     }
 
     // Parse type.
     if (it == end) report_error("invalid format string");
     char type = static_cast<char>(*it++);
-    if (arg.is_integral()) {
+    if (is_integral_type(arg.type())) {
       // Normalize type.
       switch (type) {
       case 'i':
-      case 'u':
-        type = 'd';
-        break;
+      case 'u': type = 'd'; break;
       case 'c':
         arg.visit(char_converter<basic_printf_context<Char>>(arg));
         break;
       }
     }
     bool upper = false;
-    specs.type = parse_printf_presentation_type(type, arg.type(), upper);
-    if (specs.type == presentation_type::none)
+    specs.set_type(parse_printf_presentation_type(type, arg.type(), upper));
+    if (specs.type() == presentation_type::none)
       report_error("invalid format specifier");
-    specs.upper = upper;
+    if (upper) specs.set_upper();
 
     start = it;
 
@@ -583,7 +560,7 @@ inline auto vsprintf(basic_string_view<Char> fmt,
     -> std::basic_string<Char> {
   auto buf = basic_memory_buffer<Char>();
   detail::vprintf(buf, fmt, args);
-  return to_string(buf);
+  return {buf.data(), buf.size()};
 }
 
 /**
@@ -594,7 +571,7 @@ inline auto vsprintf(basic_string_view<Char> fmt,
  *
  *     std::string message = fmt::sprintf("The answer is %d", 42);
  */
-template <typename S, typename... T, typename Char = char_t<S>>
+template <typename S, typename... T, typename Char = detail::char_t<S>>
 inline auto sprintf(const S& fmt, const T&... args) -> std::basic_string<Char> {
   return vsprintf(detail::to_string_view(fmt),
                   fmt::make_format_args<basic_printf_context<Char>>(args...));
@@ -619,7 +596,7 @@ inline auto vfprintf(std::FILE* f, basic_string_view<Char> fmt,
  *
  *     fmt::fprintf(stderr, "Don't %s!", "panic");
  */
-template <typename S, typename... T, typename Char = char_t<S>>
+template <typename S, typename... T, typename Char = detail::char_t<S>>
 inline auto fprintf(std::FILE* f, const S& fmt, const T&... args) -> int {
   return vfprintf(f, detail::to_string_view(fmt),
                   make_printf_args<Char>(args...));
diff --git a/contrib/fmt/include/fmt/ranges.h b/contrib/fmt/include/fmt/ranges.h
index 0d3dfbd8d..118d24fe8 100644
--- a/contrib/fmt/include/fmt/ranges.h
+++ b/contrib/fmt/include/fmt/ranges.h
@@ -44,18 +44,6 @@ template <typename T> class is_set {
       !std::is_void<decltype(check<T>(nullptr))>::value && !is_map<T>::value;
 };
 
-template <typename... Ts> struct conditional_helper {};
-
-template <typename T, typename _ = void> struct is_range_ : std::false_type {};
-
-#if !FMT_MSC_VERSION || FMT_MSC_VERSION > 1800
-
-#  define FMT_DECLTYPE_RETURN(val)  \
-    ->decltype(val) { return val; } \
-    static_assert(                  \
-        true, "")  // This makes it so that a semicolon is required after the
-                   // macro, which helps clang-format handle the formatting.
-
 // C array overload
 template <typename T, std::size_t N>
 auto range_begin(const T (&arr)[N]) -> const T* {
@@ -76,9 +64,13 @@ struct has_member_fn_begin_end_t<T, void_t<decltype(*std::declval<T>().begin()),
 
 // Member function overloads.
 template <typename T>
-auto range_begin(T&& rng) FMT_DECLTYPE_RETURN(static_cast<T&&>(rng).begin());
+auto range_begin(T&& rng) -> decltype(static_cast<T&&>(rng).begin()) {
+  return static_cast<T&&>(rng).begin();
+}
 template <typename T>
-auto range_end(T&& rng) FMT_DECLTYPE_RETURN(static_cast<T&&>(rng).end());
+auto range_end(T&& rng) -> decltype(static_cast<T&&>(rng).end()) {
+  return static_cast<T&&>(rng).end();
+}
 
 // ADL overloads. Only participate in overload resolution if member functions
 // are not found.
@@ -115,17 +107,16 @@ struct has_mutable_begin_end<
               // SFINAE properly unless there are distinct types
               int>> : std::true_type {};
 
+template <typename T, typename _ = void> struct is_range_ : std::false_type {};
 template <typename T>
 struct is_range_<T, void>
     : std::integral_constant<bool, (has_const_begin_end<T>::value ||
                                     has_mutable_begin_end<T>::value)> {};
-#  undef FMT_DECLTYPE_RETURN
-#endif
 
 // tuple_size and tuple_element check.
 template <typename T> class is_tuple_like_ {
-  template <typename U>
-  static auto check(U* p) -> decltype(std::tuple_size<U>::value, int());
+  template <typename U, typename V = typename std::remove_cv<U>::type>
+  static auto check(U* p) -> decltype(std::tuple_size<V>::value, 0);
   template <typename> static void check(...);
 
  public:
@@ -266,12 +257,12 @@ template <range_format K>
 using range_format_constant = std::integral_constant<range_format, K>;
 
 // These are not generic lambdas for compatibility with C++11.
-template <typename ParseContext> struct parse_empty_specs {
+template <typename Char> struct parse_empty_specs {
   template <typename Formatter> FMT_CONSTEXPR void operator()(Formatter& f) {
     f.parse(ctx);
     detail::maybe_set_debug_format(f, true);
   }
-  ParseContext& ctx;
+  parse_context<Char>& ctx;
 };
 template <typename FormatContext> struct format_tuple_element {
   using char_type = typename FormatContext::char_type;
@@ -327,11 +318,17 @@ struct formatter<Tuple, Char,
     closing_bracket_ = close;
   }
 
-  template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
+  FMT_CONSTEXPR auto parse(parse_context<Char>& ctx) -> const Char* {
     auto it = ctx.begin();
-    if (it != ctx.end() && *it != '}') report_error("invalid format specifier");
-    detail::for_each(formatters_, detail::parse_empty_specs<ParseContext>{ctx});
+    auto end = ctx.end();
+    if (it != end && detail::to_ascii(*it) == 'n') {
+      ++it;
+      set_brackets({}, {});
+      set_separator({});
+    }
+    if (it != end && *it != '}') report_error("invalid format specifier");
+    ctx.advance_to(it);
+    detail::for_each(formatters_, detail::parse_empty_specs<Char>{ctx});
     return it;
   }
 
@@ -352,38 +349,17 @@ template <typename T, typename Char> struct is_range {
 };
 
 namespace detail {
-template <typename Context> struct range_mapper {
-  using mapper = arg_mapper<Context>;
-
-  template <typename T,
-            FMT_ENABLE_IF(has_formatter<remove_cvref_t<T>, Context>::value)>
-  static auto map(T&& value) -> T&& {
-    return static_cast<T&&>(value);
-  }
-  template <typename T,
-            FMT_ENABLE_IF(!has_formatter<remove_cvref_t<T>, Context>::value)>
-  static auto map(T&& value)
-      -> decltype(mapper().map(static_cast<T&&>(value))) {
-    return mapper().map(static_cast<T&&>(value));
-  }
-};
 
 template <typename Char, typename Element>
-using range_formatter_type =
-    formatter<remove_cvref_t<decltype(range_mapper<buffered_context<Char>>{}
-                                          .map(std::declval<Element>()))>,
-              Char>;
+using range_formatter_type = formatter<remove_cvref_t<Element>, Char>;
 
 template <typename R>
 using maybe_const_range =
     conditional_t<has_const_begin_end<R>::value, const R, R>;
 
-// Workaround a bug in MSVC 2015 and earlier.
-#if !FMT_MSC_VERSION || FMT_MSC_VERSION >= 1910
 template <typename R, typename Char>
 struct is_formattable_delayed
     : is_formattable<uncvref_type<maybe_const_range<R>>, Char> {};
-#endif
 }  // namespace detail
 
 template <typename...> struct conjunction : std::true_type {};
@@ -415,7 +391,7 @@ struct range_formatter<
     auto buf = basic_memory_buffer<Char>();
     for (; it != end; ++it) buf.push_back(*it);
     auto specs = format_specs();
-    specs.type = presentation_type::debug;
+    specs.set_type(presentation_type::debug);
     return detail::write<Char>(
         out, basic_string_view<Char>(buf.data(), buf.size()), specs);
   }
@@ -443,8 +419,7 @@ struct range_formatter<
     closing_bracket_ = close;
   }
 
-  template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
+  FMT_CONSTEXPR auto parse(parse_context<Char>& ctx) -> const Char* {
     auto it = ctx.begin();
     auto end = ctx.end();
     detail::maybe_set_debug_format(underlying_, true);
@@ -486,7 +461,6 @@ struct range_formatter<
 
   template <typename R, typename FormatContext>
   auto format(R&& range, FormatContext& ctx) const -> decltype(ctx.out()) {
-    auto mapper = detail::range_mapper<buffered_context<Char>>();
     auto out = ctx.out();
     auto it = detail::range_begin(range);
     auto end = detail::range_end(range);
@@ -498,7 +472,7 @@ struct range_formatter<
       if (i > 0) out = detail::copy<Char>(separator_, out);
       ctx.advance_to(out);
       auto&& item = *it;  // Need an lvalue
-      out = underlying_.format(mapper.map(item), ctx);
+      out = underlying_.format(item, ctx);
       ++i;
     }
     out = detail::copy<Char>(closing_bracket_, out);
@@ -521,13 +495,8 @@ struct formatter<
             range_format_kind<R, Char>::value != range_format::disabled &&
             range_format_kind<R, Char>::value != range_format::map &&
             range_format_kind<R, Char>::value != range_format::string &&
-            range_format_kind<R, Char>::value != range_format::debug_string>
-// Workaround a bug in MSVC 2015 and earlier.
-#if !FMT_MSC_VERSION || FMT_MSC_VERSION >= 1910
-        ,
-        detail::is_formattable_delayed<R, Char>
-#endif
-        >::value>> {
+            range_format_kind<R, Char>::value != range_format::debug_string>,
+        detail::is_formattable_delayed<R, Char>>::value>> {
  private:
   using range_type = detail::maybe_const_range<R>;
   range_formatter<detail::uncvref_type<range_type>, Char> range_formatter_;
@@ -543,8 +512,7 @@ struct formatter<
                                   detail::string_literal<Char, '}'>{});
   }
 
-  template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
+  FMT_CONSTEXPR auto parse(parse_context<Char>& ctx) -> const Char* {
     return range_formatter_.parse(ctx);
   }
 
@@ -571,8 +539,7 @@ struct formatter<
  public:
   FMT_CONSTEXPR formatter() {}
 
-  template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
+  FMT_CONSTEXPR auto parse(parse_context<Char>& ctx) -> const Char* {
     auto it = ctx.begin();
     auto end = ctx.end();
     if (it != end) {
@@ -586,7 +553,7 @@ struct formatter<
       }
       ctx.advance_to(it);
     }
-    detail::for_each(formatters_, detail::parse_empty_specs<ParseContext>{ctx});
+    detail::for_each(formatters_, detail::parse_empty_specs<Char>{ctx});
     return it;
   }
 
@@ -596,12 +563,11 @@ struct formatter<
     basic_string_view<Char> open = detail::string_literal<Char, '{'>{};
     if (!no_delimiters_) out = detail::copy<Char>(open, out);
     int i = 0;
-    auto mapper = detail::range_mapper<buffered_context<Char>>();
     basic_string_view<Char> sep = detail::string_literal<Char, ',', ' '>{};
     for (auto&& value : map) {
       if (i > 0) out = detail::copy<Char>(sep, out);
       ctx.advance_to(out);
-      detail::for_each2(formatters_, mapper.map(value),
+      detail::for_each2(formatters_, value,
                         detail::format_tuple_element<FormatContext>{
                             0, ctx, detail::string_literal<Char, ':', ' '>{}});
       ++i;
@@ -631,8 +597,7 @@ struct formatter<
   formatter<string_type, Char> underlying_;
 
  public:
-  template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
+  FMT_CONSTEXPR auto parse(parse_context<Char>& ctx) -> const Char* {
     return underlying_.parse(ctx);
   }
 
@@ -673,22 +638,22 @@ struct formatter<join_view<It, Sentinel, Char>, Char> {
 #endif
   formatter<remove_cvref_t<value_type>, Char> value_formatter_;
 
-  using view_ref = conditional_t<std::is_copy_constructible<It>::value,
-                                 const join_view<It, Sentinel, Char>&,
-                                 join_view<It, Sentinel, Char>&&>;
+  using view = conditional_t<std::is_copy_constructible<It>::value,
+                             const join_view<It, Sentinel, Char>,
+                             join_view<It, Sentinel, Char>>;
 
  public:
   using nonlocking = void;
 
-  template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> const Char* {
+  FMT_CONSTEXPR auto parse(parse_context<Char>& ctx) -> const Char* {
     return value_formatter_.parse(ctx);
   }
 
   template <typename FormatContext>
-  auto format(view_ref& value, FormatContext& ctx) const
-      -> decltype(ctx.out()) {
-    auto it = std::forward<view_ref>(value).begin;
+  auto format(view& value, FormatContext& ctx) const -> decltype(ctx.out()) {
+    using iter =
+        conditional_t<std::is_copy_constructible<view>::value, It, It&>;
+    iter it = value.begin;
     auto out = ctx.out();
     if (it == value.end) return out;
     out = value_formatter_.format(*it, ctx);
@@ -703,39 +668,11 @@ struct formatter<join_view<It, Sentinel, Char>, Char> {
   }
 };
 
-/// Returns a view that formats the iterator range `[begin, end)` with elements
-/// separated by `sep`.
-template <typename It, typename Sentinel>
-auto join(It begin, Sentinel end, string_view sep) -> join_view<It, Sentinel> {
-  return {std::move(begin), end, sep};
-}
-
-/**
- * Returns a view that formats `range` with elements separated by `sep`.
- *
- * **Example**:
- *
- *     auto v = std::vector<int>{1, 2, 3};
- *     fmt::print("{}", fmt::join(v, ", "));
- *     // Output: 1, 2, 3
- *
- * `fmt::join` applies passed format specifiers to the range elements:
- *
- *     fmt::print("{:02}", fmt::join(v, ", "));
- *     // Output: 01, 02, 03
- */
-template <typename Range>
-auto join(Range&& r, string_view sep)
-    -> join_view<decltype(detail::range_begin(r)),
-                 decltype(detail::range_end(r))> {
-  return {detail::range_begin(r), detail::range_end(r), sep};
-}
-
-template <typename Char, typename... T> struct tuple_join_view : detail::view {
-  const std::tuple<T...>& tuple;
+template <typename Char, typename Tuple> struct tuple_join_view : detail::view {
+  const Tuple& tuple;
   basic_string_view<Char> sep;
 
-  tuple_join_view(const std::tuple<T...>& t, basic_string_view<Char> s)
+  tuple_join_view(const Tuple& t, basic_string_view<Char> s)
       : tuple(t), sep{s} {}
 };
 
@@ -746,37 +683,36 @@ template <typename Char, typename... T> struct tuple_join_view : detail::view {
 #  define FMT_TUPLE_JOIN_SPECIFIERS 0
 #endif
 
-template <typename Char, typename... T>
-struct formatter<tuple_join_view<Char, T...>, Char> {
-  template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
-    return do_parse(ctx, std::integral_constant<size_t, sizeof...(T)>());
+template <typename Char, typename Tuple>
+struct formatter<tuple_join_view<Char, Tuple>, Char,
+                 enable_if_t<is_tuple_like<Tuple>::value>> {
+  FMT_CONSTEXPR auto parse(parse_context<Char>& ctx) -> const Char* {
+    return do_parse(ctx, std::tuple_size<Tuple>());
   }
 
   template <typename FormatContext>
-  auto format(const tuple_join_view<Char, T...>& value,
+  auto format(const tuple_join_view<Char, Tuple>& value,
               FormatContext& ctx) const -> typename FormatContext::iterator {
-    return do_format(value, ctx,
-                     std::integral_constant<size_t, sizeof...(T)>());
+    return do_format(value, ctx, std::tuple_size<Tuple>());
   }
 
  private:
-  std::tuple<formatter<typename std::decay<T>::type, Char>...> formatters_;
+  decltype(detail::tuple::get_formatters<Tuple, Char>(
+      detail::tuple_index_sequence<Tuple>())) formatters_;
 
-  template <typename ParseContext>
-  FMT_CONSTEXPR auto do_parse(ParseContext& ctx,
+  FMT_CONSTEXPR auto do_parse(parse_context<Char>& ctx,
                               std::integral_constant<size_t, 0>)
-      -> decltype(ctx.begin()) {
+      -> const Char* {
     return ctx.begin();
   }
 
-  template <typename ParseContext, size_t N>
-  FMT_CONSTEXPR auto do_parse(ParseContext& ctx,
+  template <size_t N>
+  FMT_CONSTEXPR auto do_parse(parse_context<Char>& ctx,
                               std::integral_constant<size_t, N>)
-      -> decltype(ctx.begin()) {
+      -> const Char* {
     auto end = ctx.begin();
 #if FMT_TUPLE_JOIN_SPECIFIERS
-    end = std::get<sizeof...(T) - N>(formatters_).parse(ctx);
+    end = std::get<std::tuple_size<Tuple>::value - N>(formatters_).parse(ctx);
     if (N > 1) {
       auto end1 = do_parse(ctx, std::integral_constant<size_t, N - 1>());
       if (end != end1)
@@ -787,18 +723,20 @@ struct formatter<tuple_join_view<Char, T...>, Char> {
   }
 
   template <typename FormatContext>
-  auto do_format(const tuple_join_view<Char, T...>&, FormatContext& ctx,
+  auto do_format(const tuple_join_view<Char, Tuple>&, FormatContext& ctx,
                  std::integral_constant<size_t, 0>) const ->
       typename FormatContext::iterator {
     return ctx.out();
   }
 
   template <typename FormatContext, size_t N>
-  auto do_format(const tuple_join_view<Char, T...>& value, FormatContext& ctx,
+  auto do_format(const tuple_join_view<Char, Tuple>& value, FormatContext& ctx,
                  std::integral_constant<size_t, N>) const ->
       typename FormatContext::iterator {
-    auto out = std::get<sizeof...(T) - N>(formatters_)
-                   .format(std::get<sizeof...(T) - N>(value.tuple), ctx);
+    using std::get;
+    auto out =
+        std::get<std::tuple_size<Tuple>::value - N>(formatters_)
+            .format(get<std::tuple_size<Tuple>::value - N>(value.tuple), ctx);
     if (N <= 1) return out;
     out = detail::copy<Char>(value.sep, out);
     ctx.advance_to(out);
@@ -846,6 +784,34 @@ struct formatter<
 
 FMT_BEGIN_EXPORT
 
+/// Returns a view that formats the iterator range `[begin, end)` with elements
+/// separated by `sep`.
+template <typename It, typename Sentinel>
+auto join(It begin, Sentinel end, string_view sep) -> join_view<It, Sentinel> {
+  return {std::move(begin), end, sep};
+}
+
+/**
+ * Returns a view that formats `range` with elements separated by `sep`.
+ *
+ * **Example**:
+ *
+ *     auto v = std::vector<int>{1, 2, 3};
+ *     fmt::print("{}", fmt::join(v, ", "));
+ *     // Output: 1, 2, 3
+ *
+ * `fmt::join` applies passed format specifiers to the range elements:
+ *
+ *     fmt::print("{:02}", fmt::join(v, ", "));
+ *     // Output: 01, 02, 03
+ */
+template <typename Range, FMT_ENABLE_IF(!is_tuple_like<Range>::value)>
+auto join(Range&& r, string_view sep)
+    -> join_view<decltype(detail::range_begin(r)),
+                 decltype(detail::range_end(r))> {
+  return {detail::range_begin(r), detail::range_end(r), sep};
+}
+
 /**
  * Returns an object that formats `std::tuple` with elements separated by `sep`.
  *
@@ -855,9 +821,9 @@ FMT_BEGIN_EXPORT
  *     fmt::print("{}", fmt::join(t, ", "));
  *     // Output: 1, a
  */
-template <typename... T>
-FMT_CONSTEXPR auto join(const std::tuple<T...>& tuple, string_view sep)
-    -> tuple_join_view<char, T...> {
+template <typename Tuple, FMT_ENABLE_IF(is_tuple_like<Tuple>::value)>
+FMT_CONSTEXPR auto join(const Tuple& tuple, string_view sep)
+    -> tuple_join_view<char, Tuple> {
   return {tuple, sep};
 }
 
diff --git a/contrib/fmt/include/fmt/std.h b/contrib/fmt/include/fmt/std.h
index fb43940bc..54eb2c2a7 100644
--- a/contrib/fmt/include/fmt/std.h
+++ b/contrib/fmt/include/fmt/std.h
@@ -17,6 +17,7 @@
 #  include <complex>
 #  include <cstdlib>
 #  include <exception>
+#  include <functional>
 #  include <memory>
 #  include <thread>
 #  include <type_traits>
@@ -26,7 +27,8 @@
 
 // Check FMT_CPLUSPLUS to suppress a bogus warning in MSVC.
 #  if FMT_CPLUSPLUS >= 201703L
-#    if FMT_HAS_INCLUDE(<filesystem>)
+#    if FMT_HAS_INCLUDE(<filesystem>) && \
+        (!defined(FMT_CPP_LIB_FILESYSTEM) || FMT_CPP_LIB_FILESYSTEM != 0)
 #      include <filesystem>
 #    endif
 #    if FMT_HAS_INCLUDE(<variant>)
@@ -122,14 +124,16 @@ template <typename Char> struct formatter<std::filesystem::path, Char> {
  public:
   FMT_CONSTEXPR void set_debug_format(bool set = true) { debug_ = set; }
 
-  template <typename ParseContext> FMT_CONSTEXPR auto parse(ParseContext& ctx) {
+  FMT_CONSTEXPR auto parse(parse_context<Char>& ctx) {
     auto it = ctx.begin(), end = ctx.end();
     if (it == end) return it;
 
     it = detail::parse_align(it, end, specs_);
     if (it == end) return it;
 
-    it = detail::parse_dynamic_spec(it, end, specs_.width, width_ref_, ctx);
+    Char c = *it;
+    if ((c >= '0' && c <= '9') || c == '{')
+      it = detail::parse_width(it, end, specs_, width_ref_, ctx);
     if (it != end && *it == '?') {
       debug_ = true;
       ++it;
@@ -145,8 +149,8 @@ template <typename Char> struct formatter<std::filesystem::path, Char> {
         !path_type_ ? p.native()
                     : p.generic_string<std::filesystem::path::value_type>();
 
-    detail::handle_dynamic_spec<detail::width_checker>(specs.width, width_ref_,
-                                                       ctx);
+    detail::handle_dynamic_spec(specs.dynamic_width(), specs.width, width_ref_,
+                                ctx);
     if (!debug_) {
       auto s = detail::get_path_string<Char>(p, path_string);
       return detail::write(ctx.out(), basic_string_view<Char>(s), specs);
@@ -180,7 +184,8 @@ FMT_END_NAMESPACE
 FMT_BEGIN_NAMESPACE
 FMT_EXPORT
 template <std::size_t N, typename Char>
-struct formatter<std::bitset<N>, Char> : nested_formatter<string_view> {
+struct formatter<std::bitset<N>, Char>
+    : nested_formatter<basic_string_view<Char>, Char> {
  private:
   // Functor because C++11 doesn't support generic lambdas.
   struct writer {
@@ -200,7 +205,7 @@ struct formatter<std::bitset<N>, Char> : nested_formatter<string_view> {
   template <typename FormatContext>
   auto format(const std::bitset<N>& bs, FormatContext& ctx) const
       -> decltype(ctx.out()) {
-    return write_padded(ctx, writer{bs});
+    return this->write_padded(ctx, writer{bs});
   }
 };
 
@@ -233,7 +238,7 @@ struct formatter<std::optional<T>, Char,
   FMT_CONSTEXPR static void maybe_set_debug_format(U&, ...) {}
 
  public:
-  template <typename ParseContext> FMT_CONSTEXPR auto parse(ParseContext& ctx) {
+  FMT_CONSTEXPR auto parse(parse_context<Char>& ctx) {
     maybe_set_debug_format(underlying_, true);
     return underlying_.parse(ctx);
   }
@@ -277,10 +282,10 @@ FMT_BEGIN_NAMESPACE
 FMT_EXPORT
 template <typename T, typename E, typename Char>
 struct formatter<std::expected<T, E>, Char,
-                 std::enable_if_t<is_formattable<T, Char>::value &&
+                 std::enable_if_t<(std::is_void<T>::value ||
+                                   is_formattable<T, Char>::value) &&
                                   is_formattable<E, Char>::value>> {
-  template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
+  FMT_CONSTEXPR auto parse(parse_context<Char>& ctx) -> const Char* {
     return ctx.begin();
   }
 
@@ -291,7 +296,8 @@ struct formatter<std::expected<T, E>, Char,
 
     if (value.has_value()) {
       out = detail::write<Char>(out, "expected(");
-      out = detail::write_escaped_alternative<Char>(out, *value);
+      if constexpr (!std::is_void<T>::value)
+        out = detail::write_escaped_alternative<Char>(out, *value);
     } else {
       out = detail::write<Char>(out, "unexpected(");
       out = detail::write_escaped_alternative<Char>(out, value.error());
@@ -307,9 +313,7 @@ FMT_END_NAMESPACE
 FMT_BEGIN_NAMESPACE
 FMT_EXPORT
 template <> struct formatter<std::source_location> {
-  template <typename ParseContext> FMT_CONSTEXPR auto parse(ParseContext& ctx) {
-    return ctx.begin();
-  }
+  FMT_CONSTEXPR auto parse(parse_context<>& ctx) { return ctx.begin(); }
 
   template <typename FormatContext>
   auto format(const std::source_location& loc, FormatContext& ctx) const
@@ -365,8 +369,7 @@ template <typename T, typename C> struct is_variant_formattable {
 
 FMT_EXPORT
 template <typename Char> struct formatter<std::monostate, Char> {
-  template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
+  FMT_CONSTEXPR auto parse(parse_context<Char>& ctx) -> const Char* {
     return ctx.begin();
   }
 
@@ -383,8 +386,7 @@ struct formatter<
     Variant, Char,
     std::enable_if_t<std::conjunction_v<
         is_variant_like<Variant>, is_variant_formattable<Variant, Char>>>> {
-  template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
+  FMT_CONSTEXPR auto parse(parse_context<Char>& ctx) -> const Char* {
     return ctx.begin();
   }
 
@@ -413,20 +415,37 @@ FMT_END_NAMESPACE
 
 FMT_BEGIN_NAMESPACE
 FMT_EXPORT
-template <typename Char> struct formatter<std::error_code, Char> {
-  template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
-    return ctx.begin();
+template <> struct formatter<std::error_code> {
+ private:
+  format_specs specs_;
+  detail::arg_ref<char> width_ref_;
+
+ public:
+  FMT_CONSTEXPR auto parse(parse_context<>& ctx) -> const char* {
+    auto it = ctx.begin(), end = ctx.end();
+    if (it == end) return it;
+
+    it = detail::parse_align(it, end, specs_);
+    if (it == end) return it;
+
+    char c = *it;
+    if ((c >= '0' && c <= '9') || c == '{')
+      it = detail::parse_width(it, end, specs_, width_ref_, ctx);
+    return it;
   }
 
   template <typename FormatContext>
-  FMT_CONSTEXPR auto format(const std::error_code& ec, FormatContext& ctx) const
-      -> decltype(ctx.out()) {
-    auto out = ctx.out();
-    out = detail::write_bytes<Char>(out, ec.category().name(), format_specs());
-    out = detail::write<Char>(out, Char(':'));
-    out = detail::write<Char>(out, ec.value());
-    return out;
+  FMT_CONSTEXPR20 auto format(const std::error_code& ec,
+                              FormatContext& ctx) const -> decltype(ctx.out()) {
+    auto specs = specs_;
+    detail::handle_dynamic_spec(specs.dynamic_width(), specs.width, width_ref_,
+                                ctx);
+    memory_buffer buf;
+    buf.append(string_view(ec.category().name()));
+    buf.push_back(':');
+    detail::write<char>(appender(buf), ec.value());
+    return detail::write<char>(ctx.out(), string_view(buf.data(), buf.size()),
+                               specs);
   }
 };
 
@@ -506,8 +525,7 @@ template <typename Char>
 struct formatter<std::type_info, Char  // DEPRECATED! Mixing code unit types.
                  > {
  public:
-  FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
-      -> decltype(ctx.begin()) {
+  FMT_CONSTEXPR auto parse(parse_context<Char>& ctx) -> const Char* {
     return ctx.begin();
   }
 
@@ -528,8 +546,7 @@ struct formatter<
   bool with_typename_ = false;
 
  public:
-  FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
-      -> decltype(ctx.begin()) {
+  FMT_CONSTEXPR auto parse(parse_context<Char>& ctx) -> const Char* {
     auto it = ctx.begin();
     auto end = ctx.end();
     if (it == end || *it == '}') return it;
@@ -643,7 +660,7 @@ template <typename T, typename Char> struct formatter<std::complex<T>, Char> {
     if (c.real() != 0) {
       *out++ = Char('(');
       out = detail::write<Char>(out, c.real(), specs, ctx.locale());
-      specs.sign = sign::plus;
+      specs.set_sign(sign::plus);
       out = detail::write<Char>(out, c.imag(), specs, ctx.locale());
       if (!detail::isfinite(c.imag())) *out++ = Char(' ');
       *out++ = Char('i');
@@ -657,8 +674,7 @@ template <typename T, typename Char> struct formatter<std::complex<T>, Char> {
   }
 
  public:
-  FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
-      -> decltype(ctx.begin()) {
+  FMT_CONSTEXPR auto parse(parse_context<Char>& ctx) -> const Char* {
     if (ctx.begin() == ctx.end() || *ctx.begin() == '}') return ctx.begin();
     return parse_format_specs(ctx.begin(), ctx.end(), specs_, ctx,
                               detail::type_constant<T, Char>::value);
@@ -668,12 +684,11 @@ template <typename T, typename Char> struct formatter<std::complex<T>, Char> {
   auto format(const std::complex<T>& c, FormatContext& ctx) const
       -> decltype(ctx.out()) {
     auto specs = specs_;
-    if (specs.width_ref.kind != detail::arg_id_kind::none ||
-        specs.precision_ref.kind != detail::arg_id_kind::none) {
-      detail::handle_dynamic_spec<detail::width_checker>(specs.width,
-                                                         specs.width_ref, ctx);
-      detail::handle_dynamic_spec<detail::precision_checker>(
-          specs.precision, specs.precision_ref, ctx);
+    if (specs.dynamic()) {
+      detail::handle_dynamic_spec(specs.dynamic_width(), specs.width,
+                                  specs.width_ref, ctx);
+      detail::handle_dynamic_spec(specs.dynamic_precision(), specs.precision,
+                                  specs.precision_ref, ctx);
     }
 
     if (specs.width == 0) return do_format(c, specs, ctx, ctx.out());
@@ -681,12 +696,12 @@ template <typename T, typename Char> struct formatter<std::complex<T>, Char> {
 
     auto outer_specs = format_specs();
     outer_specs.width = specs.width;
-    outer_specs.fill = specs.fill;
-    outer_specs.align = specs.align;
+    outer_specs.copy_fill_from(specs);
+    outer_specs.set_align(specs.align());
 
     specs.width = 0;
-    specs.fill = {};
-    specs.align = align::none;
+    specs.set_fill({});
+    specs.set_align(align::none);
 
     do_format(c, specs, ctx, basic_appender<Char>(buf));
     return detail::write<Char>(ctx.out(),
@@ -695,5 +710,17 @@ template <typename T, typename Char> struct formatter<std::complex<T>, Char> {
   }
 };
 
+FMT_EXPORT
+template <typename T, typename Char>
+struct formatter<std::reference_wrapper<T>, Char,
+                 enable_if_t<is_formattable<remove_cvref_t<T>, Char>::value>>
+    : formatter<remove_cvref_t<T>, Char> {
+  template <typename FormatContext>
+  auto format(std::reference_wrapper<T> ref, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    return formatter<remove_cvref_t<T>, Char>::format(ref.get(), ctx);
+  }
+};
+
 FMT_END_NAMESPACE
 #endif  // FMT_STD_H_
diff --git a/contrib/fmt/include/fmt/xchar.h b/contrib/fmt/include/fmt/xchar.h
index b1f39ed22..9f7f889d6 100644
--- a/contrib/fmt/include/fmt/xchar.h
+++ b/contrib/fmt/include/fmt/xchar.h
@@ -10,11 +10,12 @@
 
 #include "color.h"
 #include "format.h"
+#include "ostream.h"
 #include "ranges.h"
 
 #ifndef FMT_MODULE
 #  include <cwchar>
-#  if !defined(FMT_STATIC_THOUSANDS_SEPARATOR)
+#  if FMT_USE_LOCALE
 #    include <locale>
 #  endif
 #endif
@@ -34,7 +35,8 @@ struct format_string_char<
 };
 
 template <typename S>
-struct format_string_char<S, enable_if_t<is_compile_string<S>::value>> {
+struct format_string_char<
+    S, enable_if_t<std::is_base_of<detail::compile_string, S>::value>> {
   using type = typename S::char_type;
 };
 
@@ -43,7 +45,7 @@ using format_string_char_t = typename format_string_char<S>::type;
 
 inline auto write_loc(basic_appender<wchar_t> out, loc_value value,
                       const format_specs& specs, locale_ref loc) -> bool {
-#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
+#if FMT_USE_LOCALE
   auto& numpunct =
       std::use_facet<std::numpunct<wchar_t>>(loc.get<std::locale>());
   auto separator = std::wstring();
@@ -58,30 +60,64 @@ inline auto write_loc(basic_appender<wchar_t> out, loc_value value,
 FMT_BEGIN_EXPORT
 
 using wstring_view = basic_string_view<wchar_t>;
-using wformat_parse_context = basic_format_parse_context<wchar_t>;
+using wformat_parse_context = parse_context<wchar_t>;
 using wformat_context = buffered_context<wchar_t>;
 using wformat_args = basic_format_args<wformat_context>;
 using wmemory_buffer = basic_memory_buffer<wchar_t>;
 
-#if FMT_GCC_VERSION && FMT_GCC_VERSION < 409
-// Workaround broken conversion on older gcc.
-template <typename... Args> using wformat_string = wstring_view;
-inline auto runtime(wstring_view s) -> wstring_view { return s; }
-#else
-template <typename... Args>
-using wformat_string = basic_format_string<wchar_t, type_identity_t<Args>...>;
+template <typename Char, typename... T> struct basic_fstring {
+ private:
+  basic_string_view<Char> str_;
+
+  static constexpr int num_static_named_args =
+      detail::count_static_named_args<T...>();
+
+  using checker = detail::format_string_checker<
+      Char, static_cast<int>(sizeof...(T)), num_static_named_args,
+      num_static_named_args != detail::count_named_args<T...>()>;
+
+  using arg_pack = detail::arg_pack<T...>;
+
+ public:
+  using t = basic_fstring;
+
+  template <typename S,
+            FMT_ENABLE_IF(
+                std::is_convertible<const S&, basic_string_view<Char>>::value)>
+  FMT_CONSTEVAL FMT_ALWAYS_INLINE basic_fstring(const S& s) : str_(s) {
+    if (FMT_USE_CONSTEVAL)
+      detail::parse_format_string<Char>(s, checker(s, arg_pack()));
+  }
+  template <typename S,
+            FMT_ENABLE_IF(std::is_base_of<detail::compile_string, S>::value&&
+                              std::is_same<typename S::char_type, Char>::value)>
+  FMT_ALWAYS_INLINE basic_fstring(const S&) : str_(S()) {
+    FMT_CONSTEXPR auto sv = basic_string_view<Char>(S());
+    FMT_CONSTEXPR int ignore =
+        (parse_format_string(sv, checker(sv, arg_pack())), 0);
+    detail::ignore_unused(ignore);
+  }
+  basic_fstring(runtime_format_string<Char> fmt) : str_(fmt.str) {}
+
+  operator basic_string_view<Char>() const { return str_; }
+  auto get() const -> basic_string_view<Char> { return str_; }
+};
+
+template <typename Char, typename... T>
+using basic_format_string = basic_fstring<Char, T...>;
+
+template <typename... T>
+using wformat_string = typename basic_format_string<wchar_t, T...>::t;
 inline auto runtime(wstring_view s) -> runtime_format_string<wchar_t> {
   return {{s}};
 }
-#endif
 
 template <> struct is_char<wchar_t> : std::true_type {};
 template <> struct is_char<char16_t> : std::true_type {};
 template <> struct is_char<char32_t> : std::true_type {};
 
 #ifdef __cpp_char8_t
-template <>
-struct is_char<char8_t> : bool_constant<detail::is_utf8_enabled()> {};
+template <> struct is_char<char8_t> : bool_constant<detail::is_utf8_enabled> {};
 #endif
 
 template <typename... T>
@@ -90,14 +126,13 @@ constexpr auto make_wformat_args(T&... args)
   return fmt::make_format_args<wformat_context>(args...);
 }
 
+#if !FMT_USE_NONTYPE_TEMPLATE_ARGS
 inline namespace literals {
-#if FMT_USE_USER_DEFINED_LITERALS && !FMT_USE_NONTYPE_TEMPLATE_ARGS
-constexpr auto operator""_a(const wchar_t* s, size_t)
-    -> detail::udl_arg<wchar_t> {
+inline auto operator""_a(const wchar_t* s, size_t) -> detail::udl_arg<wchar_t> {
   return {s};
 }
-#endif
 }  // namespace literals
+#endif
 
 template <typename It, typename Sentinel>
 auto join(It begin, Sentinel end, wstring_view sep)
@@ -105,9 +140,9 @@ auto join(It begin, Sentinel end, wstring_view sep)
   return {begin, end, sep};
 }
 
-template <typename Range>
+template <typename Range, FMT_ENABLE_IF(!is_tuple_like<Range>::value)>
 auto join(Range&& range, wstring_view sep)
-    -> join_view<detail::iterator_t<Range>, detail::sentinel_t<Range>,
+    -> join_view<decltype(std::begin(range)), decltype(std::end(range)),
                  wchar_t> {
   return join(std::begin(range), std::end(range), sep);
 }
@@ -118,19 +153,19 @@ auto join(std::initializer_list<T> list, wstring_view sep)
   return join(std::begin(list), std::end(list), sep);
 }
 
-template <typename... T>
-auto join(const std::tuple<T...>& tuple, basic_string_view<wchar_t> sep)
-    -> tuple_join_view<wchar_t, T...> {
+template <typename Tuple, FMT_ENABLE_IF(is_tuple_like<Tuple>::value)>
+auto join(const Tuple& tuple, basic_string_view<wchar_t> sep)
+    -> tuple_join_view<wchar_t, Tuple> {
   return {tuple, sep};
 }
 
 template <typename Char, FMT_ENABLE_IF(!std::is_same<Char, char>::value)>
-auto vformat(basic_string_view<Char> format_str,
+auto vformat(basic_string_view<Char> fmt,
              typename detail::vformat_args<Char>::type args)
     -> std::basic_string<Char> {
   auto buf = basic_memory_buffer<Char>();
-  detail::vformat_to(buf, format_str, args);
-  return to_string(buf);
+  detail::vformat_to(buf, fmt, args);
+  return {buf.data(), buf.size()};
 }
 
 template <typename... T>
@@ -151,8 +186,8 @@ template <typename S, typename... T,
           typename Char = detail::format_string_char_t<S>,
           FMT_ENABLE_IF(!std::is_same<Char, char>::value &&
                         !std::is_same<Char, wchar_t>::value)>
-auto format(const S& format_str, T&&... args) -> std::basic_string<Char> {
-  return vformat(detail::to_string_view(format_str),
+auto format(const S& fmt, T&&... args) -> std::basic_string<Char> {
+  return vformat(detail::to_string_view(fmt),
                  fmt::make_format_args<buffered_context<Char>>(args...));
 }
 
@@ -160,31 +195,33 @@ template <typename Locale, typename S,
           typename Char = detail::format_string_char_t<S>,
           FMT_ENABLE_IF(detail::is_locale<Locale>::value&&
                             detail::is_exotic_char<Char>::value)>
-inline auto vformat(const Locale& loc, const S& format_str,
+inline auto vformat(const Locale& loc, const S& fmt,
                     typename detail::vformat_args<Char>::type args)
     -> std::basic_string<Char> {
-  return detail::vformat(loc, detail::to_string_view(format_str), args);
+  auto buf = basic_memory_buffer<Char>();
+  detail::vformat_to(buf, detail::to_string_view(fmt), args,
+                     detail::locale_ref(loc));
+  return {buf.data(), buf.size()};
 }
 
 template <typename Locale, typename S, typename... T,
           typename Char = detail::format_string_char_t<S>,
           FMT_ENABLE_IF(detail::is_locale<Locale>::value&&
                             detail::is_exotic_char<Char>::value)>
-inline auto format(const Locale& loc, const S& format_str, T&&... args)
+inline auto format(const Locale& loc, const S& fmt, T&&... args)
     -> std::basic_string<Char> {
-  return detail::vformat(
-      loc, detail::to_string_view(format_str),
-      fmt::make_format_args<buffered_context<Char>>(args...));
+  return vformat(loc, detail::to_string_view(fmt),
+                 fmt::make_format_args<buffered_context<Char>>(args...));
 }
 
 template <typename OutputIt, typename S,
           typename Char = detail::format_string_char_t<S>,
           FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value&&
                             detail::is_exotic_char<Char>::value)>
-auto vformat_to(OutputIt out, const S& format_str,
+auto vformat_to(OutputIt out, const S& fmt,
                 typename detail::vformat_args<Char>::type args) -> OutputIt {
   auto&& buf = detail::get_buffer<Char>(out);
-  detail::vformat_to(buf, detail::to_string_view(format_str), args);
+  detail::vformat_to(buf, detail::to_string_view(fmt), args);
   return detail::get_iterator(buf, out);
 }
 
@@ -203,37 +240,35 @@ template <typename Locale, typename S, typename OutputIt, typename... Args,
           FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value&&
                             detail::is_locale<Locale>::value&&
                                 detail::is_exotic_char<Char>::value)>
-inline auto vformat_to(OutputIt out, const Locale& loc, const S& format_str,
+inline auto vformat_to(OutputIt out, const Locale& loc, const S& fmt,
                        typename detail::vformat_args<Char>::type args)
     -> OutputIt {
   auto&& buf = detail::get_buffer<Char>(out);
-  vformat_to(buf, detail::to_string_view(format_str), args,
-             detail::locale_ref(loc));
+  vformat_to(buf, detail::to_string_view(fmt), args, detail::locale_ref(loc));
   return detail::get_iterator(buf, out);
 }
 
-template <typename OutputIt, typename Locale, typename S, typename... T,
+template <typename Locale, typename OutputIt, typename S, typename... T,
           typename Char = detail::format_string_char_t<S>,
           bool enable = detail::is_output_iterator<OutputIt, Char>::value &&
                         detail::is_locale<Locale>::value &&
                         detail::is_exotic_char<Char>::value>
-inline auto format_to(OutputIt out, const Locale& loc, const S& format_str,
+inline auto format_to(OutputIt out, const Locale& loc, const S& fmt,
                       T&&... args) ->
     typename std::enable_if<enable, OutputIt>::type {
-  return vformat_to(out, loc, detail::to_string_view(format_str),
+  return vformat_to(out, loc, detail::to_string_view(fmt),
                     fmt::make_format_args<buffered_context<Char>>(args...));
 }
 
 template <typename OutputIt, typename Char, typename... Args,
           FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value&&
                             detail::is_exotic_char<Char>::value)>
-inline auto vformat_to_n(OutputIt out, size_t n,
-                         basic_string_view<Char> format_str,
+inline auto vformat_to_n(OutputIt out, size_t n, basic_string_view<Char> fmt,
                          typename detail::vformat_args<Char>::type args)
     -> format_to_n_result<OutputIt> {
   using traits = detail::fixed_buffer_traits;
   auto buf = detail::iterator_buffer<OutputIt, Char, traits>(out, n);
-  detail::vformat_to(buf, format_str, args);
+  detail::vformat_to(buf, fmt, args);
   return {buf.out(), buf.count()};
 }
 
@@ -291,7 +326,7 @@ inline auto vformat(const text_style& ts, wstring_view fmt, wformat_args args)
     -> std::wstring {
   auto buf = wmemory_buffer();
   detail::vformat_to(buf, ts, fmt, args);
-  return fmt::to_string(buf);
+  return {buf.data(), buf.size()};
 }
 
 template <typename... T>
@@ -312,6 +347,22 @@ FMT_DEPRECATED void print(const text_style& ts, wformat_string<T...> fmt,
   return print(stdout, ts, fmt, args...);
 }
 
+inline void vprint(std::wostream& os, wstring_view fmt, wformat_args args) {
+  auto buffer = basic_memory_buffer<wchar_t>();
+  detail::vformat_to(buffer, fmt, args);
+  detail::write_buffer(os, buffer);
+}
+
+template <typename... T>
+void print(std::wostream& os, wformat_string<T...> fmt, T&&... args) {
+  vprint(os, fmt, fmt::make_format_args<buffered_context<wchar_t>>(args...));
+}
+
+template <typename... T>
+void println(std::wostream& os, wformat_string<T...> fmt, T&&... args) {
+  print(os, L"{}\n", fmt::format(fmt, std::forward<T>(args)...));
+}
+
 /// Converts `value` to `std::wstring` using the default format for type `T`.
 template <typename T> inline auto to_wstring(const T& value) -> std::wstring {
   return format(FMT_STRING(L"{}"), value);

From 02ac17ef070ce155cdc3c934658def5a2949fe4c Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 13 Jan 2025 10:40:23 +0100
Subject: [PATCH 246/430] actions: switch windows install to postgis package
 from OSGeo

Also enabled Windows 2025 build.
---
 .github/actions/win-postgres/action.yml | 29 ++++++++++++++++++++++++-
 .github/workflows/ci.yml                | 12 +---------
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/.github/actions/win-postgres/action.yml b/.github/actions/win-postgres/action.yml
index c8ab4450b..122ca852c 100644
--- a/.github/actions/win-postgres/action.yml
+++ b/.github/actions/win-postgres/action.yml
@@ -3,11 +3,38 @@ name: Set up PostgreSQL on Windows
 runs:
   using: composite
   steps:
+    - name: Decide Postgis version (Windows)
+      # Borrowed from https://github.com/nyurik/action-setup-postgis/blob/main/action.yml
+      id: postgis-ver
+      shell: pwsh
+      run: |
+        echo "PowerShell version: ${PSVersionTable.PSVersion}"
+        $PG_VERSION = Split-Path $env:PGROOT -Leaf
+        $postgis_page = "https://download.osgeo.org/postgis/windows/pg$PG_VERSION"
+        echo "Detecting PostGIS version from $postgis_page for PostgreSQL $PG_VERSION"
+        $pgis_bundle = (Invoke-WebRequest -Uri $postgis_page -ErrorAction Stop).Links.Where({$_.href -match "^postgis.*zip$"}).href
+        if (!$pgis_bundle) {
+          Write-Error "Could not find latest PostGIS version in $postgis_page that would match  ^postgis.*zip$  pattern"
+          exit 1
+        }
+        $pgis_bundle = [IO.Path]::ChangeExtension($pgis_bundle, [NullString]::Value)
+        $pgis_bundle_url = "$postgis_page/$pgis_bundle.zip"
+        Add-Content $env:GITHUB_OUTPUT "postgis_file=$pgis_bundle"
+        Add-Content $env:GITHUB_OUTPUT "postgis_bundle_url=$pgis_bundle_url"
+
+    - uses: actions/cache@v4
+      with:
+        path: |
+          C:/postgis.zip
+        key: postgis-cache-${{ steps.postgis-ver.outputs.postgis_file }}
+
     - name: Download postgis
       run: |
-        if (!(Test-Path "C:\postgis.zip")){(new-object net.webclient).DownloadFile("https://osm2pgsql.org/ci/winbuild/postgis-bundle-pg14-3.2.0x64.zip", "c:\postgis.zip")}
+        if (!(Test-Path "C:\postgis.zip")){(new-object net.webclient).DownloadFile($env:PGIS_BUNDLE_URL, "c:\postgis.zip")}
         7z x c:\postgis.zip -oc:\postgis_archive
       shell: pwsh
+      env:
+        PGIS_BUNDLE_URL: ${{ steps.postgis-ver.outputs.postgis_bundle_url }}
 
     - name: Install postgis
       run: |
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index de6b88281..2deae7e40 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -341,7 +341,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2019, windows-2022]
+        os: [windows-2019, windows-2022, windows-2025]
     runs-on: ${{ matrix.os }}
 
     env:
@@ -356,11 +356,6 @@ jobs:
           key: vcpkg-binary-cache-${{ matrix.os }}-${{ github.run_id }}
           restore-keys: |
             vcpkg-binary-cache-${{ matrix.os }}
-      - uses: actions/cache@v4
-        with:
-          path: |
-            C:/postgis.zip
-          key: postgis-cache
       - name: Prepare cache
         run: if [ ! -d C:/vcpkg_binary_cache ]; then mkdir C:/vcpkg_binary_cache; fi
         shell: bash
@@ -393,11 +388,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/cache@v4
-        with:
-          path: |
-            C:/postgis.zip
-          key: postgis-cache
       - uses: actions/download-artifact@v4
         with:
           name: osm2pgsql-win64

From 316116058c555cd59113907a29caa37aa05b7b3e Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 13 Jan 2025 16:19:14 +0100
Subject: [PATCH 247/430] Update included libosmium to version 2.21.0

---
 contrib/libosmium/README.contrib              |   2 +-
 .../include/osmium/area/assembler.hpp         |   2 +-
 .../include/osmium/area/assembler_config.hpp  |   2 +-
 .../include/osmium/area/assembler_legacy.hpp  |   2 +-
 .../osmium/area/detail/basic_assembler.hpp    |  14 +-
 .../area/detail/basic_assembler_with_tags.hpp |   2 +-
 .../osmium/area/detail/node_ref_segment.hpp   |  14 +-
 .../include/osmium/area/detail/proto_ring.hpp |   6 +-
 .../osmium/area/detail/segment_list.hpp       |   4 +-
 .../include/osmium/area/detail/vector.hpp     |  18 +-
 .../include/osmium/area/geom_assembler.hpp    |   2 +-
 .../osmium/area/multipolygon_collector.hpp    |   4 +-
 .../osmium/area/multipolygon_manager.hpp      |   4 +-
 .../area/multipolygon_manager_legacy.hpp      |   4 +-
 .../include/osmium/area/problem_reporter.hpp  |   2 +-
 .../area/problem_reporter_exception.hpp       |   2 +-
 .../osmium/area/problem_reporter_ogr.hpp      |   4 +-
 .../osmium/area/problem_reporter_stream.hpp   |   2 +-
 .../libosmium/include/osmium/area/stats.hpp   |   2 +-
 .../libosmium/include/osmium/builder/attr.hpp |  26 +--
 .../include/osmium/builder/builder.hpp        |   2 +-
 .../osmium/builder/osm_object_builder.hpp     |   2 +-
 .../libosmium/include/osmium/diff_handler.hpp |   2 +-
 .../include/osmium/diff_iterator.hpp          |   4 +-
 .../libosmium/include/osmium/diff_visitor.hpp |   2 +-
 .../include/osmium/dynamic_handler.hpp        |   2 +-
 .../osmium/experimental/flex_reader.hpp       |   8 +-
 contrib/libosmium/include/osmium/fwd.hpp      |   2 +-
 .../include/osmium/geom/coordinates.hpp       |   2 +-
 .../libosmium/include/osmium/geom/factory.hpp |   2 +-
 .../libosmium/include/osmium/geom/geojson.hpp |   2 +-
 .../libosmium/include/osmium/geom/geos.hpp    |   2 +-
 .../include/osmium/geom/haversine.hpp         |   4 +-
 .../osmium/geom/mercator_projection.hpp       |  10 +-
 contrib/libosmium/include/osmium/geom/ogr.hpp |  18 +-
 .../include/osmium/geom/projection.hpp        | 213 ------------------
 .../include/osmium/geom/rapid_geojson.hpp     |   2 +-
 .../include/osmium/geom/relations.hpp         |   2 +-
 .../libosmium/include/osmium/geom/tile.hpp    |  28 ++-
 .../libosmium/include/osmium/geom/util.hpp    |   6 +-
 contrib/libosmium/include/osmium/geom/wkb.hpp |   2 +-
 contrib/libosmium/include/osmium/geom/wkt.hpp |   2 +-
 contrib/libosmium/include/osmium/handler.hpp  |   2 +-
 .../include/osmium/handler/chain.hpp          |   2 +-
 .../include/osmium/handler/check_order.hpp    |   2 +-
 .../include/osmium/handler/disk_store.hpp     |   2 +-
 .../libosmium/include/osmium/handler/dump.hpp |   2 +-
 .../handler/node_locations_for_ways.hpp       |   2 +-
 .../osmium/handler/object_relations.hpp       |   2 +-
 .../index/detail/create_map_with_fd.hpp       |   2 +-
 .../osmium/index/detail/mmap_vector_anon.hpp  |   2 +-
 .../osmium/index/detail/mmap_vector_base.hpp  |   2 +-
 .../osmium/index/detail/mmap_vector_file.hpp  |   2 +-
 .../include/osmium/index/detail/tmpfile.hpp   |  11 +-
 .../osmium/index/detail/vector_map.hpp        |   2 +-
 .../osmium/index/detail/vector_multimap.hpp   |   2 +-
 .../libosmium/include/osmium/index/id_set.hpp |   2 +-
 .../libosmium/include/osmium/index/index.hpp  |   6 +-
 .../libosmium/include/osmium/index/map.hpp    |   2 +-
 .../include/osmium/index/map/all.hpp          |   2 +-
 .../osmium/index/map/dense_file_array.hpp     |   2 +-
 .../osmium/index/map/dense_mem_array.hpp      |   2 +-
 .../osmium/index/map/dense_mmap_array.hpp     |   2 +-
 .../include/osmium/index/map/dummy.hpp        |   2 +-
 .../include/osmium/index/map/flex_mem.hpp     |   6 +-
 .../osmium/index/map/sparse_file_array.hpp    |   2 +-
 .../osmium/index/map/sparse_mem_array.hpp     |   2 +-
 .../osmium/index/map/sparse_mem_map.hpp       |   4 +-
 .../osmium/index/map/sparse_mmap_array.hpp    |   2 +-
 .../include/osmium/index/multimap.hpp         |   2 +-
 .../include/osmium/index/multimap/all.hpp     |   2 +-
 .../include/osmium/index/multimap/hybrid.hpp  |   2 +-
 .../index/multimap/sparse_file_array.hpp      |   2 +-
 .../index/multimap/sparse_mem_array.hpp       |   2 +-
 .../index/multimap/sparse_mem_multimap.hpp    |   4 +-
 .../index/multimap/sparse_mmap_array.hpp      |   2 +-
 .../osmium/index/node_locations_map.hpp       |   2 +-
 .../include/osmium/index/nwr_array.hpp        |   2 +-
 .../include/osmium/index/relations_map.hpp    |  12 +-
 .../include/osmium/io/any_compression.hpp     |   2 +-
 .../libosmium/include/osmium/io/any_input.hpp |   2 +-
 .../include/osmium/io/any_output.hpp          |   2 +-
 .../include/osmium/io/bzip2_compression.hpp   |  36 +--
 .../include/osmium/io/compression.hpp         |   6 +-
 .../include/osmium/io/debug_output.hpp        |   2 +-
 .../osmium/io/detail/debug_output_format.hpp  |   2 +-
 .../osmium/io/detail/ids_output_format.hpp    |   2 +-
 .../include/osmium/io/detail/input_format.hpp |   2 +-
 .../include/osmium/io/detail/lz4.hpp          |   4 +-
 .../osmium/io/detail/o5m_input_format.hpp     |   6 +-
 .../osmium/io/detail/opl_input_format.hpp     |   2 +-
 .../osmium/io/detail/opl_output_format.hpp    |   2 +-
 .../osmium/io/detail/opl_parser_functions.hpp |   2 +-
 .../osmium/io/detail/output_format.hpp        |   2 +-
 .../include/osmium/io/detail/pbf.hpp          |   2 +-
 .../include/osmium/io/detail/pbf_decoder.hpp  |   2 +-
 .../osmium/io/detail/pbf_input_format.hpp     |  31 +--
 .../osmium/io/detail/pbf_output_format.hpp    |  12 +-
 .../osmium/io/detail/protobuf_tags.hpp        |   2 +-
 .../include/osmium/io/detail/queue_util.hpp   |   5 +-
 .../include/osmium/io/detail/read_thread.hpp  |   2 +-
 .../include/osmium/io/detail/read_write.hpp   |  26 ++-
 .../include/osmium/io/detail/string_table.hpp |   4 +-
 .../include/osmium/io/detail/string_util.hpp  |   2 +-
 .../include/osmium/io/detail/write_thread.hpp |   2 +-
 .../osmium/io/detail/xml_input_format.hpp     |  39 ++--
 .../osmium/io/detail/xml_output_format.hpp    |   2 +-
 .../include/osmium/io/detail/zlib.hpp         |   4 +-
 contrib/libosmium/include/osmium/io/error.hpp |   2 +-
 contrib/libosmium/include/osmium/io/file.hpp  |   4 +-
 .../include/osmium/io/file_compression.hpp    |   2 +-
 .../include/osmium/io/file_format.hpp         |   2 +-
 .../include/osmium/io/gzip_compression.hpp    |  10 +-
 .../libosmium/include/osmium/io/header.hpp    |   4 +-
 .../include/osmium/io/ids_output.hpp          |   2 +-
 .../include/osmium/io/input_iterator.hpp      |   2 +-
 .../libosmium/include/osmium/io/o5m_input.hpp |   2 +-
 .../libosmium/include/osmium/io/opl_input.hpp |   2 +-
 .../include/osmium/io/opl_output.hpp          |   2 +-
 .../include/osmium/io/output_iterator.hpp     |   2 +-
 .../libosmium/include/osmium/io/overwrite.hpp |   2 +-
 contrib/libosmium/include/osmium/io/pbf.hpp   |   2 +-
 .../libosmium/include/osmium/io/pbf_input.hpp |   2 +-
 .../include/osmium/io/pbf_output.hpp          |   2 +-
 .../libosmium/include/osmium/io/reader.hpp    |  12 +-
 .../include/osmium/io/reader_iterator.hpp     |   2 +-
 .../osmium/io/reader_with_progress_bar.hpp    |   4 +-
 .../libosmium/include/osmium/io/writer.hpp    |  10 +-
 .../include/osmium/io/writer_options.hpp      |   2 +-
 .../libosmium/include/osmium/io/xml_input.hpp |   2 +-
 .../include/osmium/io/xml_output.hpp          |   2 +-
 .../include/osmium/memory/buffer.hpp          |   4 +-
 .../include/osmium/memory/callback_buffer.hpp |   2 +-
 .../include/osmium/memory/collection.hpp      |   4 +-
 .../libosmium/include/osmium/memory/item.hpp  |   4 +-
 .../include/osmium/memory/item_iterator.hpp   |   8 +-
 .../osmium/object_pointer_collection.hpp      |   4 +-
 contrib/libosmium/include/osmium/opl.hpp      |   2 +-
 contrib/libosmium/include/osmium/osm.hpp      |   2 +-
 contrib/libosmium/include/osmium/osm/area.hpp |   2 +-
 contrib/libosmium/include/osmium/osm/box.hpp  |   8 +-
 .../include/osmium/osm/changeset.hpp          |   2 +-
 contrib/libosmium/include/osmium/osm/crc.hpp  |   2 +-
 .../libosmium/include/osmium/osm/crc_zlib.hpp |   2 +-
 .../include/osmium/osm/diff_object.hpp        |   2 +-
 .../libosmium/include/osmium/osm/entity.hpp   |   2 +-
 .../include/osmium/osm/entity_bits.hpp        |  19 +-
 .../include/osmium/osm/item_type.hpp          |   2 +-
 .../libosmium/include/osmium/osm/location.hpp |  14 +-
 .../include/osmium/osm/metadata_options.hpp   |   2 +-
 contrib/libosmium/include/osmium/osm/node.hpp |   2 +-
 .../libosmium/include/osmium/osm/node_ref.hpp |  14 +-
 .../include/osmium/osm/node_ref_list.hpp      |   2 +-
 .../libosmium/include/osmium/osm/object.hpp   |   4 +-
 .../include/osmium/osm/object_comparisons.hpp |   8 +-
 .../libosmium/include/osmium/osm/relation.hpp |   2 +-
 .../libosmium/include/osmium/osm/segment.hpp  |   6 +-
 contrib/libosmium/include/osmium/osm/tag.hpp  |   2 +-
 .../include/osmium/osm/timestamp.hpp          |   8 +-
 .../libosmium/include/osmium/osm/types.hpp    |   2 +-
 .../include/osmium/osm/types_from_string.hpp  |   2 +-
 .../include/osmium/osm/undirected_segment.hpp |   2 +-
 contrib/libosmium/include/osmium/osm/way.hpp  |   2 +-
 .../include/osmium/relations/collector.hpp    |   2 +-
 .../osmium/relations/detail/member_meta.hpp   |   2 +-
 .../osmium/relations/detail/relation_meta.hpp |   2 +-
 .../include/osmium/relations/manager_util.hpp |   2 +-
 .../osmium/relations/members_database.hpp     |   6 +-
 .../osmium/relations/relations_database.hpp   |   4 +-
 .../osmium/relations/relations_manager.hpp    |   8 +-
 .../include/osmium/storage/item_stash.hpp     |   6 +-
 .../libosmium/include/osmium/tags/filter.hpp  |   6 +-
 .../libosmium/include/osmium/tags/matcher.hpp |  10 +-
 .../include/osmium/tags/regex_filter.hpp      |   2 +-
 .../libosmium/include/osmium/tags/taglist.hpp |   2 +-
 .../include/osmium/tags/tags_filter.hpp       |   2 +-
 .../osmium/thread/function_wrapper.hpp        |   6 +-
 .../libosmium/include/osmium/thread/pool.hpp  |   6 +-
 .../libosmium/include/osmium/thread/queue.hpp |   2 +-
 .../libosmium/include/osmium/thread/util.hpp  |   2 +-
 .../include/osmium/util/compatibility.hpp     |  11 +-
 .../libosmium/include/osmium/util/config.hpp  |   2 +-
 .../libosmium/include/osmium/util/delta.hpp   |   2 +-
 .../libosmium/include/osmium/util/double.hpp  |   2 +-
 .../libosmium/include/osmium/util/endian.hpp  |   2 +-
 .../libosmium/include/osmium/util/file.hpp    |  18 +-
 .../include/osmium/util/iterator.hpp          |   2 +-
 .../libosmium/include/osmium/util/memory.hpp  |   2 +-
 .../include/osmium/util/memory_mapping.hpp    |   8 +-
 .../libosmium/include/osmium/util/minmax.hpp  |   2 +-
 .../libosmium/include/osmium/util/misc.hpp    |   4 +-
 .../libosmium/include/osmium/util/options.hpp |   2 +-
 .../include/osmium/util/progress_bar.hpp      |   2 +-
 .../libosmium/include/osmium/util/string.hpp  |   2 +-
 .../include/osmium/util/string_matcher.hpp    |   6 +-
 .../libosmium/include/osmium/util/timer.hpp   |   2 +-
 .../include/osmium/util/verbose_output.hpp    |   2 +-
 contrib/libosmium/include/osmium/version.hpp  |   6 +-
 contrib/libosmium/include/osmium/visitor.hpp  |  14 +-
 199 files changed, 478 insertions(+), 655 deletions(-)
 delete mode 100644 contrib/libosmium/include/osmium/geom/projection.hpp

diff --git a/contrib/libosmium/README.contrib b/contrib/libosmium/README.contrib
index 9f7e2eff7..997cc5923 100644
--- a/contrib/libosmium/README.contrib
+++ b/contrib/libosmium/README.contrib
@@ -1,2 +1,2 @@
 Source: https://github.com/osmcode/libosmium
-Revision: v2.20.0
+Revision: v2.21.0
diff --git a/contrib/libosmium/include/osmium/area/assembler.hpp b/contrib/libosmium/include/osmium/area/assembler.hpp
index 9ed2d5ff1..3116f47b0 100644
--- a/contrib/libosmium/include/osmium/area/assembler.hpp
+++ b/contrib/libosmium/include/osmium/area/assembler.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/area/assembler_config.hpp b/contrib/libosmium/include/osmium/area/assembler_config.hpp
index 5fa11d2ca..e81afcfa3 100644
--- a/contrib/libosmium/include/osmium/area/assembler_config.hpp
+++ b/contrib/libosmium/include/osmium/area/assembler_config.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/area/assembler_legacy.hpp b/contrib/libosmium/include/osmium/area/assembler_legacy.hpp
index 23bfa2bca..f30ab329d 100644
--- a/contrib/libosmium/include/osmium/area/assembler_legacy.hpp
+++ b/contrib/libosmium/include/osmium/area/assembler_legacy.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/area/detail/basic_assembler.hpp b/contrib/libosmium/include/osmium/area/detail/basic_assembler.hpp
index 842136249..5a378d076 100644
--- a/contrib/libosmium/include/osmium/area/detail/basic_assembler.hpp
+++ b/contrib/libosmium/include/osmium/area/detail/basic_assembler.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -70,7 +70,7 @@ namespace osmium {
 
             struct location_to_ring_map {
                 osmium::Location location;
-                open_ring_its_type::iterator ring_it{};
+                open_ring_its_type::iterator ring_it;
                 bool start{false};
 
                 location_to_ring_map(osmium::Location l, open_ring_its_type::iterator r, const bool s) noexcept :
@@ -217,7 +217,7 @@ namespace osmium {
                         }
                     }
 
-                    for (const osmium::Way* way : ways_in_multiple_rings) {
+                    for (const osmium::Way* way : ways_in_multiple_rings) { // NOLINT(bugprone-nondeterministic-pointer-iteration-order)
                         ++m_stats.ways_in_multiple_rings;
                         if (debug()) {
                             std::cerr << "      Way " << way->id() << " is in multiple rings\n";
@@ -326,7 +326,7 @@ namespace osmium {
                             const int64_t ay = a.y();
                             const int64_t by = b.y();
                             const int64_t ly = end_location.y();
-                            const auto z = (bx - ax) * (ly - ay) - (by - ay) * (lx - ax);
+                            const auto z = ((bx - ax) * (ly - ay)) - ((by - ay) * (lx - ax));
                             if (debug()) {
                                 std::cerr << "      Segment z=" << z << '\n';
                             }
@@ -353,7 +353,7 @@ namespace osmium {
                             const int64_t ay = a.y();
                             const int64_t by = b.y();
                             const int64_t ly = location.y();
-                            const auto z = (bx - ax) * (ly - ay) - (by - ay) * (lx - ax);
+                            const auto z = ((bx - ax) * (ly - ay)) - ((by - ay) * (lx - ax));
 
                             if (z >= 0) {
                                 nesting += segment->is_reverse() ? -1 : 1;
@@ -362,7 +362,7 @@ namespace osmium {
                                 }
                                 if (segment->ring()->is_outer()) {
                                     const double y = static_cast<double>(ay) +
-                                                     static_cast<double>((by - ay) * (lx - ax)) / static_cast<double>(bx - ax);
+                                                     (static_cast<double>((by - ay) * (lx - ax)) / static_cast<double>(bx - ax));
                                     if (debug()) {
                                         std::cerr << "        Segment belongs to outer ring (y=" << y << " ring=" << *segment->ring() << ")\n";
                                     }
@@ -703,7 +703,7 @@ namespace osmium {
 
                 struct candidate {
                     int64_t sum;
-                    std::vector<std::pair<location_to_ring_map, bool>> rings{};
+                    std::vector<std::pair<location_to_ring_map, bool>> rings;
                     osmium::Location start_location;
                     osmium::Location stop_location;
 
diff --git a/contrib/libosmium/include/osmium/area/detail/basic_assembler_with_tags.hpp b/contrib/libosmium/include/osmium/area/detail/basic_assembler_with_tags.hpp
index b5a173b44..9e4a4072e 100644
--- a/contrib/libosmium/include/osmium/area/detail/basic_assembler_with_tags.hpp
+++ b/contrib/libosmium/include/osmium/area/detail/basic_assembler_with_tags.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/area/detail/node_ref_segment.hpp b/contrib/libosmium/include/osmium/area/detail/node_ref_segment.hpp
index 8da4f8ccf..5ecaf02a4 100644
--- a/contrib/libosmium/include/osmium/area/detail/node_ref_segment.hpp
+++ b/contrib/libosmium/include/osmium/area/detail/node_ref_segment.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -75,10 +75,10 @@ namespace osmium {
             class NodeRefSegment {
 
                 // First node in order described above.
-                osmium::NodeRef m_first{};
+                osmium::NodeRef m_first;
 
                 // Second node in order described above.
-                osmium::NodeRef m_second{};
+                osmium::NodeRef m_second;
 
                 // Way this segment was from.
                 const osmium::Way* m_way = nullptr;
@@ -319,11 +319,11 @@ namespace osmium {
 
                     // intersection in a point
 
-                    const int64_t na = (q1.x - q0.x) * (p0.y - q0.y) -
-                                       (q1.y - q0.y) * (p0.x - q0.x);
+                    const int64_t na = ((q1.x - q0.x) * (p0.y - q0.y)) -
+                                       ((q1.y - q0.y) * (p0.x - q0.x));
 
-                    const int64_t nb = (p1.x - p0.x) * (p0.y - q0.y) -
-                                       (p1.y - p0.y) * (p0.x - q0.x);
+                    const int64_t nb = ((p1.x - p0.x) * (p0.y - q0.y)) -
+                                       ((p1.y - p0.y) * (p0.x - q0.x));
 
                     if ((d > 0 && na >= 0 && na <= d && nb >= 0 && nb <= d) ||
                         (d < 0 && na <= 0 && na >= d && nb <= 0 && nb >= d)) {
diff --git a/contrib/libosmium/include/osmium/area/detail/proto_ring.hpp b/contrib/libosmium/include/osmium/area/detail/proto_ring.hpp
index 9b773a0a9..ec62dca59 100644
--- a/contrib/libosmium/include/osmium/area/detail/proto_ring.hpp
+++ b/contrib/libosmium/include/osmium/area/detail/proto_ring.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -64,11 +64,11 @@ namespace osmium {
             private:
 
                 // Segments in this ring.
-                segments_type m_segments{};
+                segments_type m_segments;
 
                 // If this is an outer ring, these point to it's inner rings
                 // (if any).
-                std::vector<ProtoRing*> m_inner{};
+                std::vector<ProtoRing*> m_inner;
 
                 // The smallest segment. Will be kept current whenever a new
                 // segment is added to the ring.
diff --git a/contrib/libosmium/include/osmium/area/detail/segment_list.hpp b/contrib/libosmium/include/osmium/area/detail/segment_list.hpp
index 53f203215..9f0e4c4f8 100644
--- a/contrib/libosmium/include/osmium/area/detail/segment_list.hpp
+++ b/contrib/libosmium/include/osmium/area/detail/segment_list.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -84,7 +84,7 @@ namespace osmium {
 
                 using slist_type = std::vector<NodeRefSegment>;
 
-                slist_type m_segments{};
+                slist_type m_segments;
 
                 bool m_debug;
 
diff --git a/contrib/libosmium/include/osmium/area/detail/vector.hpp b/contrib/libosmium/include/osmium/area/detail/vector.hpp
index e52a65cc5..3c1ba31b0 100644
--- a/contrib/libosmium/include/osmium/area/detail/vector.hpp
+++ b/contrib/libosmium/include/osmium/area/detail/vector.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -73,37 +73,37 @@ namespace osmium {
             }; // struct vec
 
             // addition
-            constexpr inline vec operator+(const vec& lhs, const vec& rhs) noexcept {
+            constexpr vec operator+(const vec& lhs, const vec& rhs) noexcept {
                 return vec{lhs.x + rhs.x, lhs.y + rhs.y};
             }
 
             // subtraction
-            constexpr inline vec operator-(const vec& lhs, const vec& rhs) noexcept {
+            constexpr vec operator-(const vec& lhs, const vec& rhs) noexcept {
                 return vec{lhs.x - rhs.x, lhs.y - rhs.y};
             }
 
             // cross product
-            constexpr inline int64_t operator*(const vec& lhs, const vec& rhs) noexcept {
-                return lhs.x * rhs.y - lhs.y * rhs.x;
+            constexpr int64_t operator*(const vec& lhs, const vec& rhs) noexcept {
+                return (lhs.x * rhs.y) - (lhs.y * rhs.x);
             }
 
             // scale vector
-            constexpr inline vec operator*(double s, const vec& v) noexcept {
+            constexpr vec operator*(double s, const vec& v) noexcept {
                 return vec{static_cast<int64_t>(s * static_cast<double>(v.x)), static_cast<int64_t>(s * static_cast<double>(v.y))};
             }
 
             // scale vector
-            constexpr inline vec operator*(const vec& v, double s) noexcept {
+            constexpr vec operator*(const vec& v, double s) noexcept {
                 return vec{static_cast<int64_t>(s * static_cast<double>(v.x)), static_cast<int64_t>(s * static_cast<double>(v.y))};
             }
 
             // equality
-            constexpr inline bool operator==(const vec& lhs, const vec& rhs) noexcept {
+            constexpr bool operator==(const vec& lhs, const vec& rhs) noexcept {
                 return lhs.x == rhs.x && lhs.y == rhs.y;
             }
 
             // inequality
-            constexpr inline bool operator!=(const vec& lhs, const vec& rhs) noexcept {
+            constexpr bool operator!=(const vec& lhs, const vec& rhs) noexcept {
                 return !(lhs == rhs);
             }
 
diff --git a/contrib/libosmium/include/osmium/area/geom_assembler.hpp b/contrib/libosmium/include/osmium/area/geom_assembler.hpp
index 6a665b4a9..8ce75a7a6 100644
--- a/contrib/libosmium/include/osmium/area/geom_assembler.hpp
+++ b/contrib/libosmium/include/osmium/area/geom_assembler.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/area/multipolygon_collector.hpp b/contrib/libosmium/include/osmium/area/multipolygon_collector.hpp
index a2a70b69f..c983ae18a 100644
--- a/contrib/libosmium/include/osmium/area/multipolygon_collector.hpp
+++ b/contrib/libosmium/include/osmium/area/multipolygon_collector.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -79,7 +79,7 @@ namespace osmium {
             using collector_type = osmium::relations::Collector<MultipolygonCollector<TAssembler>, false, true, false>;
 
             using assembler_config_type = typename TAssembler::config_type;
-            const assembler_config_type m_assembler_config;
+            assembler_config_type m_assembler_config;
 
             osmium::memory::Buffer m_output_buffer;
 
diff --git a/contrib/libosmium/include/osmium/area/multipolygon_manager.hpp b/contrib/libosmium/include/osmium/area/multipolygon_manager.hpp
index c478aa158..26b4c06ec 100644
--- a/contrib/libosmium/include/osmium/area/multipolygon_manager.hpp
+++ b/contrib/libosmium/include/osmium/area/multipolygon_manager.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -76,7 +76,7 @@ namespace osmium {
         class MultipolygonManager : public osmium::relations::RelationsManager<MultipolygonManager<TAssembler>, false, true, false> {
 
             using assembler_config_type = typename TAssembler::config_type;
-            const assembler_config_type m_assembler_config;
+            assembler_config_type m_assembler_config;
 
             area_stats m_stats;
 
diff --git a/contrib/libosmium/include/osmium/area/multipolygon_manager_legacy.hpp b/contrib/libosmium/include/osmium/area/multipolygon_manager_legacy.hpp
index feea9a04b..adf9eda0c 100644
--- a/contrib/libosmium/include/osmium/area/multipolygon_manager_legacy.hpp
+++ b/contrib/libosmium/include/osmium/area/multipolygon_manager_legacy.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -78,7 +78,7 @@ namespace osmium {
         class MultipolygonManagerLegacy : public osmium::relations::RelationsManager<MultipolygonManagerLegacy<TAssembler>, false, true, false> {
 
             using assembler_config_type = typename TAssembler::config_type;
-            const assembler_config_type m_assembler_config;
+            assembler_config_type m_assembler_config;
 
             area_stats m_stats;
 
diff --git a/contrib/libosmium/include/osmium/area/problem_reporter.hpp b/contrib/libosmium/include/osmium/area/problem_reporter.hpp
index 4c32ed970..95e4e8206 100644
--- a/contrib/libosmium/include/osmium/area/problem_reporter.hpp
+++ b/contrib/libosmium/include/osmium/area/problem_reporter.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/area/problem_reporter_exception.hpp b/contrib/libosmium/include/osmium/area/problem_reporter_exception.hpp
index 4527a9984..216b4b0c4 100644
--- a/contrib/libosmium/include/osmium/area/problem_reporter_exception.hpp
+++ b/contrib/libosmium/include/osmium/area/problem_reporter_exception.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/area/problem_reporter_ogr.hpp b/contrib/libosmium/include/osmium/area/problem_reporter_ogr.hpp
index bad49f89c..a99e2f1f3 100644
--- a/contrib/libosmium/include/osmium/area/problem_reporter_ogr.hpp
+++ b/contrib/libosmium/include/osmium/area/problem_reporter_ogr.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -89,7 +89,7 @@ namespace osmium {
             }
 
             void write_line(const char* problem_type, osmium::object_id_type id1, osmium::object_id_type id2, osmium::Location loc1, osmium::Location loc2) {
-                auto ogr_linestring = std::unique_ptr<OGRLineString>{new OGRLineString{}};
+                auto ogr_linestring = std::make_unique<OGRLineString>();
                 ogr_linestring->addPoint(loc1.lon(), loc1.lat());
                 ogr_linestring->addPoint(loc2.lon(), loc2.lat());
 
diff --git a/contrib/libosmium/include/osmium/area/problem_reporter_stream.hpp b/contrib/libosmium/include/osmium/area/problem_reporter_stream.hpp
index 9fa2ccdb7..d2307a6a3 100644
--- a/contrib/libosmium/include/osmium/area/problem_reporter_stream.hpp
+++ b/contrib/libosmium/include/osmium/area/problem_reporter_stream.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/area/stats.hpp b/contrib/libosmium/include/osmium/area/stats.hpp
index d081e6110..2699d7445 100644
--- a/contrib/libosmium/include/osmium/area/stats.hpp
+++ b/contrib/libosmium/include/osmium/area/stats.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/builder/attr.hpp b/contrib/libosmium/include/osmium/builder/attr.hpp
index b11272659..fdc54bb34 100644
--- a/contrib/libosmium/include/osmium/builder/attr.hpp
+++ b/contrib/libosmium/include/osmium/builder/attr.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -182,7 +182,7 @@ namespace osmium {
 
 #define OSMIUM_ATTRIBUTE_WITH_CONSTRUCTOR(_handler, _name, _type) \
     OSMIUM_ATTRIBUTE(_handler, _name, _type) \
-        constexpr explicit _name(std::add_const<_type>::type& value) : \
+        constexpr explicit _name(std::add_const_t<_type>& value) : \
             type_wrapper(value) {} \
     }
 
@@ -381,7 +381,7 @@ namespace osmium {
             };
 
             template <typename TTagIterator>
-            inline constexpr detail::tags_from_iterator_pair<TTagIterator> _tags(TTagIterator first, TTagIterator last) {
+            constexpr detail::tags_from_iterator_pair<TTagIterator> _tags(TTagIterator first, TTagIterator last) {
                 return {first, last};
             }
 
@@ -409,7 +409,7 @@ namespace osmium {
             };
 
             template <typename TIdIterator>
-            inline constexpr detail::nodes_from_iterator_pair<TIdIterator> _nodes(TIdIterator first, TIdIterator last) {
+            constexpr detail::nodes_from_iterator_pair<TIdIterator> _nodes(TIdIterator first, TIdIterator last) {
                 return {first, last};
             }
 
@@ -449,7 +449,7 @@ namespace osmium {
             };
 
             template <typename TMemberIterator>
-            inline constexpr detail::members_from_iterator_pair<TMemberIterator> _members(TMemberIterator first, TMemberIterator last) {
+            constexpr detail::members_from_iterator_pair<TMemberIterator> _members(TMemberIterator first, TMemberIterator last) {
                 return {first, last};
             }
 
@@ -481,7 +481,7 @@ namespace osmium {
             };
 
             template <typename TCommentIterator>
-            inline constexpr detail::comments_from_iterator_pair<TCommentIterator> _comments(TCommentIterator first, TCommentIterator last) {
+            constexpr detail::comments_from_iterator_pair<TCommentIterator> _comments(TCommentIterator first, TCommentIterator last) {
                 return {first, last};
             }
 
@@ -501,7 +501,7 @@ namespace osmium {
 
 
             template <typename TIdIterator>
-            inline constexpr detail::outer_ring_from_iterator_pair<TIdIterator> _outer_ring(TIdIterator first, TIdIterator last) {
+            constexpr detail::outer_ring_from_iterator_pair<TIdIterator> _outer_ring(TIdIterator first, TIdIterator last) {
                 return {first, last};
             }
 
@@ -527,7 +527,7 @@ namespace osmium {
             }
 
             template <typename TIdIterator>
-            inline constexpr detail::inner_ring_from_iterator_pair<TIdIterator> _inner_ring(TIdIterator first, TIdIterator last) {
+            constexpr detail::inner_ring_from_iterator_pair<TIdIterator> _inner_ring(TIdIterator first, TIdIterator last) {
                 return {first, last};
             }
 
@@ -649,16 +649,16 @@ namespace osmium {
             // ==============================================================
 
             template <typename... TArgs>
-            inline constexpr const char* get_user(const attr::_user& user, const TArgs&... /*args*/) noexcept {
+            constexpr const char* get_user(const attr::_user& user, const TArgs&... /*args*/) noexcept {
                 return user.value;
             }
 
-            inline constexpr const char* get_user() noexcept {
+            constexpr const char* get_user() noexcept {
                 return "";
             }
 
             template <typename TFirst, typename... TRest>
-            inline constexpr typename std::enable_if<!std::is_same<attr::_user, TFirst>::value, const char*>::type
+            constexpr std::enable_if_t<!std::is_same<attr::_user, TFirst>::value, const char*>
             get_user(const TFirst& /*first*/, const TRest&... args) noexcept {
                 return get_user(args...);
             }
@@ -802,12 +802,12 @@ namespace osmium {
             // ==============================================================
 
             template <typename TBuilder, typename THandler, typename... TArgs>
-            inline typename std::enable_if<!is_handled_by<THandler, TArgs...>::value>::type
+            inline std::enable_if_t<!is_handled_by<THandler, TArgs...>::value>
             add_list(osmium::builder::Builder& /*parent*/, const TArgs&... /*args*/) noexcept {
             }
 
             template <typename TBuilder, typename THandler, typename... TArgs>
-            inline typename std::enable_if<is_handled_by<THandler, TArgs...>::value>::type
+            inline std::enable_if_t<is_handled_by<THandler, TArgs...>::value>
             add_list(osmium::builder::Builder& parent, const TArgs&... args) {
                 TBuilder builder{parent.buffer(), &parent};
                 (void)std::initializer_list<int>{
diff --git a/contrib/libosmium/include/osmium/builder/builder.hpp b/contrib/libosmium/include/osmium/builder/builder.hpp
index feda7c36e..2206bcd50 100644
--- a/contrib/libosmium/include/osmium/builder/builder.hpp
+++ b/contrib/libosmium/include/osmium/builder/builder.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/builder/osm_object_builder.hpp b/contrib/libosmium/include/osmium/builder/osm_object_builder.hpp
index c3228ca7d..7e49535d9 100644
--- a/contrib/libosmium/include/osmium/builder/osm_object_builder.hpp
+++ b/contrib/libosmium/include/osmium/builder/osm_object_builder.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/diff_handler.hpp b/contrib/libosmium/include/osmium/diff_handler.hpp
index 1f88f768d..935d6a1a1 100644
--- a/contrib/libosmium/include/osmium/diff_handler.hpp
+++ b/contrib/libosmium/include/osmium/diff_handler.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/diff_iterator.hpp b/contrib/libosmium/include/osmium/diff_iterator.hpp
index 08b8ea09b..c6c725168 100644
--- a/contrib/libosmium/include/osmium/diff_iterator.hpp
+++ b/contrib/libosmium/include/osmium/diff_iterator.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -62,7 +62,7 @@ namespace osmium {
         TBasicIterator m_curr;
         TBasicIterator m_next;
 
-        const TBasicIterator m_end;
+        TBasicIterator m_end;
 
         mutable osmium::DiffObject m_diff;
 
diff --git a/contrib/libosmium/include/osmium/diff_visitor.hpp b/contrib/libosmium/include/osmium/diff_visitor.hpp
index 976c63313..32f0ff328 100644
--- a/contrib/libosmium/include/osmium/diff_visitor.hpp
+++ b/contrib/libosmium/include/osmium/diff_visitor.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/dynamic_handler.hpp b/contrib/libosmium/include/osmium/dynamic_handler.hpp
index 73f2ac54a..3917309dd 100644
--- a/contrib/libosmium/include/osmium/dynamic_handler.hpp
+++ b/contrib/libosmium/include/osmium/dynamic_handler.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/experimental/flex_reader.hpp b/contrib/libosmium/include/osmium/experimental/flex_reader.hpp
index dc8289624..ad4525f1f 100644
--- a/contrib/libosmium/include/osmium/experimental/flex_reader.hpp
+++ b/contrib/libosmium/include/osmium/experimental/flex_reader.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -84,11 +84,11 @@ namespace osmium {
             }
 
             explicit FlexReader(const std::string& filename, TLocationHandler& location_handler, osmium::osm_entity_bits::type entities = osmium::osm_entity_bits::nwr) :
-                FlexReader(osmium::io::File(filename), location_handler, entities) {
+                FlexReader(osmium::io::File{filename}, location_handler, entities) {
             }
 
             explicit FlexReader(const char* filename, TLocationHandler& location_handler, osmium::osm_entity_bits::type entities = osmium::osm_entity_bits::nwr) :
-                FlexReader(osmium::io::File(filename), location_handler, entities) {
+                FlexReader(osmium::io::File{filename}, location_handler, entities) {
             }
 
             osmium::memory::Buffer read() {
@@ -117,7 +117,7 @@ namespace osmium {
             }
 
             void close() {
-                return m_reader.close();
+                m_reader.close();
             }
 
             bool eof() const {
diff --git a/contrib/libosmium/include/osmium/fwd.hpp b/contrib/libosmium/include/osmium/fwd.hpp
index f556d3fc3..b80c5d742 100644
--- a/contrib/libosmium/include/osmium/fwd.hpp
+++ b/contrib/libosmium/include/osmium/fwd.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/geom/coordinates.hpp b/contrib/libosmium/include/osmium/geom/coordinates.hpp
index 161c0021e..c734d0dd7 100644
--- a/contrib/libosmium/include/osmium/geom/coordinates.hpp
+++ b/contrib/libosmium/include/osmium/geom/coordinates.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/geom/factory.hpp b/contrib/libosmium/include/osmium/geom/factory.hpp
index 07c7f2e67..148a3e2e3 100644
--- a/contrib/libosmium/include/osmium/geom/factory.hpp
+++ b/contrib/libosmium/include/osmium/geom/factory.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/geom/geojson.hpp b/contrib/libosmium/include/osmium/geom/geojson.hpp
index 193c8cd22..41650501b 100644
--- a/contrib/libosmium/include/osmium/geom/geojson.hpp
+++ b/contrib/libosmium/include/osmium/geom/geojson.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/geom/geos.hpp b/contrib/libosmium/include/osmium/geom/geos.hpp
index 73538f9b5..d859e6be3 100644
--- a/contrib/libosmium/include/osmium/geom/geos.hpp
+++ b/contrib/libosmium/include/osmium/geom/geos.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/geom/haversine.hpp b/contrib/libosmium/include/osmium/geom/haversine.hpp
index 3da00d588..a57170f82 100644
--- a/contrib/libosmium/include/osmium/geom/haversine.hpp
+++ b/contrib/libosmium/include/osmium/geom/haversine.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -69,7 +69,7 @@ namespace osmium {
                 double lath = std::sin(deg_to_rad(c1.y - c2.y) * 0.5);
                 lath *= lath;
                 const double tmp = std::cos(deg_to_rad(c1.y)) * std::cos(deg_to_rad(c2.y));
-                return 2.0 * EARTH_RADIUS_IN_METERS * std::asin(std::sqrt(lath + tmp * lonh));
+                return 2.0 * EARTH_RADIUS_IN_METERS * std::asin(std::sqrt(lath + (tmp * lonh)));
             }
 
             /**
diff --git a/contrib/libosmium/include/osmium/geom/mercator_projection.hpp b/contrib/libosmium/include/osmium/geom/mercator_projection.hpp
index acb4d27f1..514152e1c 100644
--- a/contrib/libosmium/include/osmium/geom/mercator_projection.hpp
+++ b/contrib/libosmium/include/osmium/geom/mercator_projection.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -49,12 +49,12 @@ namespace osmium {
             constexpr double earth_radius_for_epsg3857 = 6378137.0;
             constexpr double max_coordinate_epsg3857 = 20037508.34;
 
-            constexpr inline double lon_to_x(double lon) noexcept {
+            constexpr double lon_to_x(double lon) noexcept {
                 return earth_radius_for_epsg3857 * deg_to_rad(lon);
             }
 
             inline double lat_to_y_with_tan(double lat) { // not constexpr because math functions aren't
-                return earth_radius_for_epsg3857 * std::log(std::tan(osmium::geom::PI / 4 + deg_to_rad(lat) / 2));
+                return earth_radius_for_epsg3857 * std::log(std::tan((osmium::geom::PI / 4) + (deg_to_rad(lat) / 2)));
             }
 
 #ifdef OSMIUM_USE_SLOW_MERCATOR_PROJECTION
@@ -96,12 +96,12 @@ namespace osmium {
             }
 #endif
 
-            constexpr inline double x_to_lon(double x) {
+            constexpr double x_to_lon(double x) {
                 return rad_to_deg(x) / earth_radius_for_epsg3857;
             }
 
             inline double y_to_lat(double y) { // not constexpr because math functions aren't
-                return rad_to_deg(2 * std::atan(std::exp(y / earth_radius_for_epsg3857)) - osmium::geom::PI / 2);
+                return rad_to_deg((2 * std::atan(std::exp(y / earth_radius_for_epsg3857))) - (osmium::geom::PI / 2));
             }
 
         } // namespace detail
diff --git a/contrib/libosmium/include/osmium/geom/ogr.hpp b/contrib/libosmium/include/osmium/geom/ogr.hpp
index 226684b28..603a104cf 100644
--- a/contrib/libosmium/include/osmium/geom/ogr.hpp
+++ b/contrib/libosmium/include/osmium/geom/ogr.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -83,13 +83,13 @@ namespace osmium {
                 /* Point */
 
                 static point_type make_point(const osmium::geom::Coordinates& xy) {
-                    return point_type{new OGRPoint{xy.x, xy.y}};
+                    return std::make_unique<OGRPoint>(xy.x, xy.y);
                 }
 
                 /* LineString */
 
                 void linestring_start() {
-                    m_linestring.reset(new OGRLineString{});
+                    m_linestring = std::make_unique<OGRLineString>();
                 }
 
                 void linestring_add_location(const osmium::geom::Coordinates& xy) {
@@ -105,7 +105,7 @@ namespace osmium {
                 /* Polygon */
 
                 void polygon_start() {
-                    m_ring.reset(new OGRLinearRing{});
+                    m_ring = std::make_unique<OGRLinearRing>();
                 }
 
                 void polygon_add_location(const osmium::geom::Coordinates& xy) {
@@ -114,7 +114,7 @@ namespace osmium {
                 }
 
                 polygon_type polygon_finish(size_t /* num_points */) {
-                    auto polygon = std::unique_ptr<OGRPolygon>{new OGRPolygon{}};
+                    auto polygon = std::make_unique<OGRPolygon>();
                     polygon->addRingDirectly(m_ring.release());
                     return polygon;
                 }
@@ -122,11 +122,11 @@ namespace osmium {
                 /* MultiPolygon */
 
                 void multipolygon_start() {
-                    m_multipolygon.reset(new OGRMultiPolygon{});
+                    m_multipolygon = std::make_unique<OGRMultiPolygon>();
                 }
 
                 void multipolygon_polygon_start() {
-                    m_polygon.reset(new OGRPolygon{});
+                    m_polygon = std::make_unique<OGRPolygon>();
                 }
 
                 void multipolygon_polygon_finish() {
@@ -136,7 +136,7 @@ namespace osmium {
                 }
 
                 void multipolygon_outer_ring_start() {
-                    m_ring.reset(new OGRLinearRing{});
+                    m_ring = std::make_unique<OGRLinearRing>();
                 }
 
                 void multipolygon_outer_ring_finish() {
@@ -146,7 +146,7 @@ namespace osmium {
                 }
 
                 void multipolygon_inner_ring_start() {
-                    m_ring.reset(new OGRLinearRing{});
+                    m_ring = std::make_unique<OGRLinearRing>();
                 }
 
                 void multipolygon_inner_ring_finish() {
diff --git a/contrib/libosmium/include/osmium/geom/projection.hpp b/contrib/libosmium/include/osmium/geom/projection.hpp
deleted file mode 100644
index b96980f86..000000000
--- a/contrib/libosmium/include/osmium/geom/projection.hpp
+++ /dev/null
@@ -1,213 +0,0 @@
-#ifndef OSMIUM_GEOM_PROJECTION_HPP
-#define OSMIUM_GEOM_PROJECTION_HPP
-
-/*
-
-This file is part of Osmium (https://osmcode.org/libosmium).
-
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
-
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-*/
-
-/**
- * @file
- *
- * This file contains code for projecting OSM locations to arbitrary
- * coordinate reference systems. It is based on the Proj.4 library.
- *
- * @attention If you include this file, you'll need to link with `libproj`.
- */
-
-#include <osmium/geom/coordinates.hpp>
-#include <osmium/geom/mercator_projection.hpp>
-#include <osmium/geom/util.hpp>
-#include <osmium/osm/location.hpp>
-#include <osmium/util/compatibility.hpp>
-
-#ifdef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
-# include <proj_api.h>
-#else
-# define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
-# include <proj_api.h>
-# undef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
-#endif
-
-#include <memory>
-#include <string>
-
-namespace osmium {
-
-    namespace geom {
-
-        /**
-         * C++ wrapper for a Coordinate Reference System of the proj library.
-         *
-         * @deprecated Only supports the old PROJ API.
-         */
-        class OSMIUM_DEPRECATED CRS {
-
-            struct ProjCRSDeleter {
-                void operator()(void* crs) {
-                    pj_free(crs);
-                }
-            }; // struct ProjCRSDeleter
-
-            std::unique_ptr<void, ProjCRSDeleter> m_crs;
-
-        public:
-
-            explicit CRS(const char* crs) :
-                m_crs(pj_init_plus(crs), ProjCRSDeleter()) {
-                if (!m_crs) {
-                    throw osmium::projection_error{std::string{"creation of CRS failed: "} + pj_strerrno(*pj_get_errno_ref())};
-                }
-            }
-
-            explicit CRS(const std::string& crs) :
-                CRS(crs.c_str()) {
-            }
-
-            explicit CRS(int epsg) :
-                CRS(std::string{"+init=epsg:"} + std::to_string(epsg)) {
-            }
-
-            /**
-             * Get underlying projPJ handle from proj library.
-             */
-            projPJ get() const noexcept {
-                return m_crs.get();
-            }
-
-            bool is_latlong() const noexcept {
-                return pj_is_latlong(m_crs.get()) != 0;
-            }
-
-            bool is_geocent() const noexcept {
-                return pj_is_geocent(m_crs.get()) != 0;
-            }
-
-        }; // class CRS
-
-        /**
-         * Transform coordinates from one CRS into another. Wraps the same
-         * function of the proj library.
-         *
-         * Coordinates have to be in radians and are produced in radians.
-         *
-         * @throws osmium::projection_error if the projection fails
-         *
-         * @deprecated Only supports the old PROJ API.
-         */
-        inline OSMIUM_DEPRECATED Coordinates transform(const CRS& src, const CRS& dest, Coordinates c) {
-            const int result = pj_transform(src.get(), dest.get(), 1, 1, &c.x, &c.y, nullptr);
-            if (result != 0) {
-                throw osmium::projection_error{std::string{"projection failed: "} + pj_strerrno(result)};
-            }
-            return c;
-        }
-
-        /**
-         * Functor that does projection from WGS84 (EPSG:4326) to the given
-         * CRS.
-         *
-         * If this Projection is initialized with the constructor taking
-         * an integer with the epsg code 4326, no projection is done. If it
-         * is initialized with epsg code 3857 the Osmium-internal
-         * implementation of the Mercator projection is used, otherwise this
-         * falls back to using the proj.4 library. Note that this "magic" does
-         * not work if you use any of the constructors taking a string.
-         *
-         * @deprecated Only supports the old PROJ API.
-         */
-        class OSMIUM_DEPRECATED Projection {
-
-            int m_epsg;
-            std::string m_proj_string;
-            CRS m_crs_wgs84{4326};
-            CRS m_crs_user;
-
-        public:
-
-            explicit Projection(std::string proj_string) :
-                m_epsg(-1),
-                m_proj_string(std::move(proj_string)),
-                m_crs_user(proj_string) {
-            }
-
-            explicit Projection(const char* proj_string) :
-                m_epsg(-1),
-                m_proj_string(proj_string),
-                m_crs_user(proj_string) {
-            }
-
-            explicit Projection(int epsg) :
-                m_epsg(epsg),
-                m_proj_string(std::string{"+init=epsg:"} + std::to_string(epsg)),
-                m_crs_user(epsg) {
-            }
-
-            /**
-             * Do coordinate transformation.
-             *
-             * @pre Location must be in valid range (depends on projection
-             *      used).
-             */
-            Coordinates operator()(osmium::Location location) const {
-                if (m_epsg == 4326) {
-                    return Coordinates{location.lon(), location.lat()};
-                }
-
-                if (m_epsg == 3857) {
-                    return Coordinates{detail::lon_to_x(location.lon()),
-                                       detail::lat_to_y(location.lat())};
-                }
-
-                Coordinates c{transform(m_crs_wgs84, m_crs_user, Coordinates{deg_to_rad(location.lon()),
-                                                                             deg_to_rad(location.lat())})};
-                if (m_crs_user.is_latlong()) {
-                    c.x = rad_to_deg(c.x);
-                    c.y = rad_to_deg(c.y);
-                }
-
-                return c;
-            }
-
-            int epsg() const noexcept {
-                return m_epsg;
-            }
-
-            std::string proj_string() const {
-                return m_proj_string;
-            }
-
-        }; // class Projection
-
-    } // namespace geom
-
-} // namespace osmium
-
-#endif // OSMIUM_GEOM_PROJECTION_HPP
diff --git a/contrib/libosmium/include/osmium/geom/rapid_geojson.hpp b/contrib/libosmium/include/osmium/geom/rapid_geojson.hpp
index 94f172609..5e415f5b4 100644
--- a/contrib/libosmium/include/osmium/geom/rapid_geojson.hpp
+++ b/contrib/libosmium/include/osmium/geom/rapid_geojson.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/geom/relations.hpp b/contrib/libosmium/include/osmium/geom/relations.hpp
index 6c4352d3e..4a33574ce 100644
--- a/contrib/libosmium/include/osmium/geom/relations.hpp
+++ b/contrib/libosmium/include/osmium/geom/relations.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/geom/tile.hpp b/contrib/libosmium/include/osmium/geom/tile.hpp
index d03504bc9..242fd5c27 100644
--- a/contrib/libosmium/include/osmium/geom/tile.hpp
+++ b/contrib/libosmium/include/osmium/geom/tile.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -46,9 +46,11 @@ namespace osmium {
 
         namespace detail {
 
-            template <typename T>
-            inline constexpr const T& clamp(const T& value, const T& min, const T& max) {
-                return value < min ? min : (max < value ? max : value);
+            constexpr int32_t clamp(int32_t value, int32_t min, int32_t max) {
+                if (value < min) {
+                    return min;
+                }
+                return max < value ? max : value;
             }
 
         } // namespace detail
@@ -57,7 +59,7 @@ namespace osmium {
          * Returns the number of tiles (in each direction) for the given zoom
          * level.
          */
-        inline constexpr uint32_t num_tiles_in_zoom(uint32_t zoom) noexcept {
+        constexpr uint32_t num_tiles_in_zoom(uint32_t zoom) noexcept {
             return 1U << zoom;
         }
 
@@ -65,7 +67,7 @@ namespace osmium {
          * Returns the width or height of a tile in web mercator coordinates for
          * the given zoom level.
          */
-        inline constexpr double tile_extent_in_zoom(uint32_t zoom) noexcept {
+        constexpr double tile_extent_in_zoom(uint32_t zoom) noexcept {
             return detail::max_coordinate_epsg3857 * 2 / num_tiles_in_zoom(zoom);
         }
 
@@ -74,10 +76,11 @@ namespace osmium {
          * projection in the given zoom level. Tiles are numbered from left
          * to right.
          */
-        inline constexpr uint32_t mercx_to_tilex(uint32_t zoom, double x) noexcept {
-            return static_cast<uint32_t>(detail::clamp<int32_t>(
+        constexpr uint32_t mercx_to_tilex(uint32_t zoom, double x) noexcept {
+            return static_cast<uint32_t>(detail::clamp(
                 static_cast<int32_t>((x + detail::max_coordinate_epsg3857) / tile_extent_in_zoom(zoom)),
-                0, num_tiles_in_zoom(zoom) - 1));
+                0,
+                static_cast<int32_t>(num_tiles_in_zoom(zoom) - 1)));
         }
 
         /**
@@ -85,10 +88,11 @@ namespace osmium {
          * projection in the given zoom level. Tiles are numbered from top
          * to bottom.
          */
-        inline constexpr uint32_t mercy_to_tiley(uint32_t zoom, double y) noexcept {
-            return static_cast<uint32_t>(detail::clamp<int32_t>(
+        constexpr uint32_t mercy_to_tiley(uint32_t zoom, double y) noexcept {
+            return static_cast<uint32_t>(detail::clamp(
                 static_cast<int32_t>((detail::max_coordinate_epsg3857 - y) / tile_extent_in_zoom(zoom)),
-                0, num_tiles_in_zoom(zoom) - 1));
+                0,
+                static_cast<int32_t>(num_tiles_in_zoom(zoom) - 1)));
         }
 
         /**
diff --git a/contrib/libosmium/include/osmium/geom/util.hpp b/contrib/libosmium/include/osmium/geom/util.hpp
index 2e8ee858c..2341b38d7 100644
--- a/contrib/libosmium/include/osmium/geom/util.hpp
+++ b/contrib/libosmium/include/osmium/geom/util.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -61,12 +61,12 @@ namespace osmium {
         constexpr double PI = 3.14159265358979323846;
 
         /// Convert angle from degrees to radians.
-        inline constexpr double deg_to_rad(double degree) noexcept {
+        constexpr double deg_to_rad(double degree) noexcept {
             return degree * (PI / 180.0);
         }
 
         /// Convert angle from radians to degrees.
-        inline constexpr double rad_to_deg(double radians) noexcept {
+        constexpr double rad_to_deg(double radians) noexcept {
             return radians * (180.0 / PI);
         }
 
diff --git a/contrib/libosmium/include/osmium/geom/wkb.hpp b/contrib/libosmium/include/osmium/geom/wkb.hpp
index 15a7d44ec..30f0b5428 100644
--- a/contrib/libosmium/include/osmium/geom/wkb.hpp
+++ b/contrib/libosmium/include/osmium/geom/wkb.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/geom/wkt.hpp b/contrib/libosmium/include/osmium/geom/wkt.hpp
index 216873dfe..5be2507cc 100644
--- a/contrib/libosmium/include/osmium/geom/wkt.hpp
+++ b/contrib/libosmium/include/osmium/geom/wkt.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/handler.hpp b/contrib/libosmium/include/osmium/handler.hpp
index 58bc427cd..cd510c30a 100644
--- a/contrib/libosmium/include/osmium/handler.hpp
+++ b/contrib/libosmium/include/osmium/handler.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/handler/chain.hpp b/contrib/libosmium/include/osmium/handler/chain.hpp
index 70ad76b3c..869076809 100644
--- a/contrib/libosmium/include/osmium/handler/chain.hpp
+++ b/contrib/libosmium/include/osmium/handler/chain.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/handler/check_order.hpp b/contrib/libosmium/include/osmium/handler/check_order.hpp
index 1daedda31..643034226 100644
--- a/contrib/libosmium/include/osmium/handler/check_order.hpp
+++ b/contrib/libosmium/include/osmium/handler/check_order.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/handler/disk_store.hpp b/contrib/libosmium/include/osmium/handler/disk_store.hpp
index e5bd36c51..2d5ec190e 100644
--- a/contrib/libosmium/include/osmium/handler/disk_store.hpp
+++ b/contrib/libosmium/include/osmium/handler/disk_store.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/handler/dump.hpp b/contrib/libosmium/include/osmium/handler/dump.hpp
index 86398c9cd..c08d79752 100644
--- a/contrib/libosmium/include/osmium/handler/dump.hpp
+++ b/contrib/libosmium/include/osmium/handler/dump.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/handler/node_locations_for_ways.hpp b/contrib/libosmium/include/osmium/handler/node_locations_for_ways.hpp
index 8e66f3837..05b36e814 100644
--- a/contrib/libosmium/include/osmium/handler/node_locations_for_ways.hpp
+++ b/contrib/libosmium/include/osmium/handler/node_locations_for_ways.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/handler/object_relations.hpp b/contrib/libosmium/include/osmium/handler/object_relations.hpp
index a50b61c65..0dee79edf 100644
--- a/contrib/libosmium/include/osmium/handler/object_relations.hpp
+++ b/contrib/libosmium/include/osmium/handler/object_relations.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/detail/create_map_with_fd.hpp b/contrib/libosmium/include/osmium/index/detail/create_map_with_fd.hpp
index c67329f9a..8870f09b2 100644
--- a/contrib/libosmium/include/osmium/index/detail/create_map_with_fd.hpp
+++ b/contrib/libosmium/include/osmium/index/detail/create_map_with_fd.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/detail/mmap_vector_anon.hpp b/contrib/libosmium/include/osmium/index/detail/mmap_vector_anon.hpp
index 075d187e8..1b36522c7 100644
--- a/contrib/libosmium/include/osmium/index/detail/mmap_vector_anon.hpp
+++ b/contrib/libosmium/include/osmium/index/detail/mmap_vector_anon.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/detail/mmap_vector_base.hpp b/contrib/libosmium/include/osmium/index/detail/mmap_vector_base.hpp
index 3da81ca4b..a81cde7fb 100644
--- a/contrib/libosmium/include/osmium/index/detail/mmap_vector_base.hpp
+++ b/contrib/libosmium/include/osmium/index/detail/mmap_vector_base.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/detail/mmap_vector_file.hpp b/contrib/libosmium/include/osmium/index/detail/mmap_vector_file.hpp
index 5f048e072..f7e18e59c 100644
--- a/contrib/libosmium/include/osmium/index/detail/mmap_vector_file.hpp
+++ b/contrib/libosmium/include/osmium/index/detail/mmap_vector_file.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/detail/tmpfile.hpp b/contrib/libosmium/include/osmium/index/detail/tmpfile.hpp
index 38746d3f1..88db24d7d 100644
--- a/contrib/libosmium/include/osmium/index/detail/tmpfile.hpp
+++ b/contrib/libosmium/include/osmium/index/detail/tmpfile.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -33,6 +33,8 @@ DEALINGS IN THE SOFTWARE.
 
 */
 
+#include <osmium/io/detail/read_write.hpp>
+
 #include <cerrno>
 #include <cstdio>
 #include <system_error>
@@ -43,16 +45,19 @@ namespace osmium {
 
         /**
          * Create and open a temporary file. It is removed after opening.
+         * After use close the file by calling close().
          *
          * @returns File descriptor of temporary file.
          * @throws std::system_error if something went wrong.
          */
         inline int create_tmp_file() {
-            FILE* file = ::tmpfile();
+            FILE* file = std::tmpfile();
             if (!file) {
                 throw std::system_error{errno, std::system_category(), "tempfile failed"};
             }
-            return fileno(file);
+            const int fd = osmium::io::detail::reliable_dup(fileno(file));
+            std::fclose(file);
+            return fd;
         }
 
     } // namespace detail
diff --git a/contrib/libosmium/include/osmium/index/detail/vector_map.hpp b/contrib/libosmium/include/osmium/index/detail/vector_map.hpp
index d9ee56db4..550694b98 100644
--- a/contrib/libosmium/include/osmium/index/detail/vector_map.hpp
+++ b/contrib/libosmium/include/osmium/index/detail/vector_map.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/detail/vector_multimap.hpp b/contrib/libosmium/include/osmium/index/detail/vector_multimap.hpp
index ab272618e..a1a5a7320 100644
--- a/contrib/libosmium/include/osmium/index/detail/vector_multimap.hpp
+++ b/contrib/libosmium/include/osmium/index/detail/vector_multimap.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/id_set.hpp b/contrib/libosmium/include/osmium/index/id_set.hpp
index c2f44c59e..c5732ea3a 100644
--- a/contrib/libosmium/include/osmium/index/id_set.hpp
+++ b/contrib/libosmium/include/osmium/index/id_set.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/index.hpp b/contrib/libosmium/include/osmium/index/index.hpp
index 6e780a34d..9ebb4cce6 100644
--- a/contrib/libosmium/include/osmium/index/index.hpp
+++ b/contrib/libosmium/include/osmium/index/index.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -76,7 +76,7 @@ namespace osmium {
          * object, but it can be specialized.
          */
         template <typename T>
-        inline constexpr T empty_value() {
+        constexpr T empty_value() {
             return T{};
         }
 
@@ -86,7 +86,7 @@ namespace osmium {
          * the full range, so the max value is a good "empty" value.
          */
         template <>
-        inline constexpr size_t empty_value<size_t>() {
+        constexpr size_t empty_value<size_t>() {
             return std::numeric_limits<size_t>::max();
         }
 
diff --git a/contrib/libosmium/include/osmium/index/map.hpp b/contrib/libosmium/include/osmium/index/map.hpp
index c2ffe9112..ff2a54d56 100644
--- a/contrib/libosmium/include/osmium/index/map.hpp
+++ b/contrib/libosmium/include/osmium/index/map.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/map/all.hpp b/contrib/libosmium/include/osmium/index/map/all.hpp
index 4bcb0cc95..9f001c30c 100644
--- a/contrib/libosmium/include/osmium/index/map/all.hpp
+++ b/contrib/libosmium/include/osmium/index/map/all.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/map/dense_file_array.hpp b/contrib/libosmium/include/osmium/index/map/dense_file_array.hpp
index 8f00c8c1b..674464589 100644
--- a/contrib/libosmium/include/osmium/index/map/dense_file_array.hpp
+++ b/contrib/libosmium/include/osmium/index/map/dense_file_array.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/map/dense_mem_array.hpp b/contrib/libosmium/include/osmium/index/map/dense_mem_array.hpp
index 68b4b64e5..0a90488a3 100644
--- a/contrib/libosmium/include/osmium/index/map/dense_mem_array.hpp
+++ b/contrib/libosmium/include/osmium/index/map/dense_mem_array.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/map/dense_mmap_array.hpp b/contrib/libosmium/include/osmium/index/map/dense_mmap_array.hpp
index d59457d1f..0ee920491 100644
--- a/contrib/libosmium/include/osmium/index/map/dense_mmap_array.hpp
+++ b/contrib/libosmium/include/osmium/index/map/dense_mmap_array.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/map/dummy.hpp b/contrib/libosmium/include/osmium/index/map/dummy.hpp
index e5f24a607..e29322371 100644
--- a/contrib/libosmium/include/osmium/index/map/dummy.hpp
+++ b/contrib/libosmium/include/osmium/index/map/dummy.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/map/flex_mem.hpp b/contrib/libosmium/include/osmium/index/map/flex_mem.hpp
index 74b0e390c..b282217b2 100644
--- a/contrib/libosmium/include/osmium/index/map/flex_mem.hpp
+++ b/contrib/libosmium/include/osmium/index/map/flex_mem.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -192,8 +192,8 @@ namespace osmium {
 
                 std::size_t used_memory() const noexcept final {
                     return sizeof(FlexMem) +
-                           m_sparse_entries.size() * sizeof(entry) +
-                           m_dense_blocks.size() * (block_size * sizeof(TValue) + sizeof(std::vector<TValue>));
+                           (m_sparse_entries.size() * sizeof(entry)) +
+                           (m_dense_blocks.size() * (block_size * sizeof(TValue) + sizeof(std::vector<TValue>)));
                 }
 
                 void set(const TId id, const TValue value) final {
diff --git a/contrib/libosmium/include/osmium/index/map/sparse_file_array.hpp b/contrib/libosmium/include/osmium/index/map/sparse_file_array.hpp
index b0e25021f..8832682f1 100644
--- a/contrib/libosmium/include/osmium/index/map/sparse_file_array.hpp
+++ b/contrib/libosmium/include/osmium/index/map/sparse_file_array.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/map/sparse_mem_array.hpp b/contrib/libosmium/include/osmium/index/map/sparse_mem_array.hpp
index 004a5abf3..ce0ef9cb7 100644
--- a/contrib/libosmium/include/osmium/index/map/sparse_mem_array.hpp
+++ b/contrib/libosmium/include/osmium/index/map/sparse_mem_array.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/map/sparse_mem_map.hpp b/contrib/libosmium/include/osmium/index/map/sparse_mem_map.hpp
index 68869c083..b7b798abb 100644
--- a/contrib/libosmium/include/osmium/index/map/sparse_mem_map.hpp
+++ b/contrib/libosmium/include/osmium/index/map/sparse_mem_map.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -63,7 +63,7 @@ namespace osmium {
                 // and parent plus some overhead for color of red-black-tree
                 // or similar).
                 enum {
-                    element_size = sizeof(TId) + sizeof(TValue) + sizeof(void*) * 4U
+                    element_size = sizeof(TId) + sizeof(TValue) + (sizeof(void*) * 4U)
                 };
 
                 std::map<TId, TValue> m_elements;
diff --git a/contrib/libosmium/include/osmium/index/map/sparse_mmap_array.hpp b/contrib/libosmium/include/osmium/index/map/sparse_mmap_array.hpp
index 0f8f4295f..b616f1921 100644
--- a/contrib/libosmium/include/osmium/index/map/sparse_mmap_array.hpp
+++ b/contrib/libosmium/include/osmium/index/map/sparse_mmap_array.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/multimap.hpp b/contrib/libosmium/include/osmium/index/multimap.hpp
index 97cf9f513..6c72fdcc5 100644
--- a/contrib/libosmium/include/osmium/index/multimap.hpp
+++ b/contrib/libosmium/include/osmium/index/multimap.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/multimap/all.hpp b/contrib/libosmium/include/osmium/index/multimap/all.hpp
index 1f4ffd007..439762a74 100644
--- a/contrib/libosmium/include/osmium/index/multimap/all.hpp
+++ b/contrib/libosmium/include/osmium/index/multimap/all.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/multimap/hybrid.hpp b/contrib/libosmium/include/osmium/index/multimap/hybrid.hpp
index 2ebdb3a50..45e38d954 100644
--- a/contrib/libosmium/include/osmium/index/multimap/hybrid.hpp
+++ b/contrib/libosmium/include/osmium/index/multimap/hybrid.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/multimap/sparse_file_array.hpp b/contrib/libosmium/include/osmium/index/multimap/sparse_file_array.hpp
index 68b618d47..38cf5e4cb 100644
--- a/contrib/libosmium/include/osmium/index/multimap/sparse_file_array.hpp
+++ b/contrib/libosmium/include/osmium/index/multimap/sparse_file_array.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/multimap/sparse_mem_array.hpp b/contrib/libosmium/include/osmium/index/multimap/sparse_mem_array.hpp
index caff6eade..c9a24eb79 100644
--- a/contrib/libosmium/include/osmium/index/multimap/sparse_mem_array.hpp
+++ b/contrib/libosmium/include/osmium/index/multimap/sparse_mem_array.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/multimap/sparse_mem_multimap.hpp b/contrib/libosmium/include/osmium/index/multimap/sparse_mem_multimap.hpp
index bb4e7798e..5899d647a 100644
--- a/contrib/libosmium/include/osmium/index/multimap/sparse_mem_multimap.hpp
+++ b/contrib/libosmium/include/osmium/index/multimap/sparse_mem_multimap.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -60,7 +60,7 @@ namespace osmium {
                 // and parent plus some overhead for color of red-black-tree
                 // or similar).
                 enum {
-                    element_size = sizeof(TId) + sizeof(TValue) + sizeof(void*) * 4U
+                    element_size = sizeof(TId) + sizeof(TValue) + (sizeof(void*) * 4U)
                 };
 
             public:
diff --git a/contrib/libosmium/include/osmium/index/multimap/sparse_mmap_array.hpp b/contrib/libosmium/include/osmium/index/multimap/sparse_mmap_array.hpp
index 44db98a1d..7d82c3eac 100644
--- a/contrib/libosmium/include/osmium/index/multimap/sparse_mmap_array.hpp
+++ b/contrib/libosmium/include/osmium/index/multimap/sparse_mmap_array.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/node_locations_map.hpp b/contrib/libosmium/include/osmium/index/node_locations_map.hpp
index f1263e413..3a1035c49 100644
--- a/contrib/libosmium/include/osmium/index/node_locations_map.hpp
+++ b/contrib/libosmium/include/osmium/index/node_locations_map.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/nwr_array.hpp b/contrib/libosmium/include/osmium/index/nwr_array.hpp
index 3abf95aa1..001851a11 100644
--- a/contrib/libosmium/include/osmium/index/nwr_array.hpp
+++ b/contrib/libosmium/include/osmium/index/nwr_array.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/relations_map.hpp b/contrib/libosmium/include/osmium/index/relations_map.hpp
index 39bc13fdf..2cfcfc93b 100644
--- a/contrib/libosmium/include/osmium/index/relations_map.hpp
+++ b/contrib/libosmium/include/osmium/index/relations_map.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -95,7 +95,7 @@ namespace osmium {
                     m_map.emplace_back(key, value);
                 }
 
-                typename std::enable_if<std::is_same<TKey, TValue>::value>::type flip_in_place() {
+                std::enable_if_t<std::is_same<TKey, TValue>::value> flip_in_place() {
                     for (auto& p : m_map) {
                         using std::swap;
                         swap(p.key, p.value);
@@ -260,8 +260,8 @@ namespace osmium {
 
         // defined outside the class on purpose
         // see https://akrzemi1.wordpress.com/2015/09/11/declaring-the-move-constructor/
-        inline RelationsMapIndex::RelationsMapIndex(RelationsMapIndex&&) noexcept(std::is_nothrow_move_constructible<map_type>::value) = default;
-        inline RelationsMapIndex& RelationsMapIndex::operator=(RelationsMapIndex&&) noexcept(std::is_nothrow_move_assignable<map_type>::value) = default;
+        inline RelationsMapIndex::RelationsMapIndex(RelationsMapIndex&&) noexcept(std::is_nothrow_move_constructible<map_type>::value) = default; // NOLINT(readability-redundant-inline-specifier)
+        inline RelationsMapIndex& RelationsMapIndex::operator=(RelationsMapIndex&&) noexcept(std::is_nothrow_move_assignable<map_type>::value) = default; // NOLINT(readability-redundant-inline-specifier)
 
         class RelationsMapIndexes {
 
@@ -442,8 +442,8 @@ namespace osmium {
 
         // defined outside the class on purpose
         // see https://akrzemi1.wordpress.com/2015/09/11/declaring-the-move-constructor/
-        inline RelationsMapStash::RelationsMapStash(RelationsMapStash&&) noexcept(std::is_nothrow_move_constructible<map_type>::value) = default;
-        inline RelationsMapStash& RelationsMapStash::operator=(RelationsMapStash&&) noexcept(std::is_nothrow_move_assignable<map_type>::value) = default;
+        inline RelationsMapStash::RelationsMapStash(RelationsMapStash&&) noexcept(std::is_nothrow_move_constructible<map_type>::value) = default; // NOLINT(readability-redundant-inline-specifier)
+        inline RelationsMapStash& RelationsMapStash::operator=(RelationsMapStash&&) noexcept(std::is_nothrow_move_assignable<map_type>::value) = default; // NOLINT(readability-redundant-inline-specifier)
 
     } // namespace index
 
diff --git a/contrib/libosmium/include/osmium/io/any_compression.hpp b/contrib/libosmium/include/osmium/io/any_compression.hpp
index 507a04cc3..ebdb0f87c 100644
--- a/contrib/libosmium/include/osmium/io/any_compression.hpp
+++ b/contrib/libosmium/include/osmium/io/any_compression.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/any_input.hpp b/contrib/libosmium/include/osmium/io/any_input.hpp
index 58336cc3b..bb625ed8c 100644
--- a/contrib/libosmium/include/osmium/io/any_input.hpp
+++ b/contrib/libosmium/include/osmium/io/any_input.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/any_output.hpp b/contrib/libosmium/include/osmium/io/any_output.hpp
index 87c1de9be..a78fff652 100644
--- a/contrib/libosmium/include/osmium/io/any_output.hpp
+++ b/contrib/libosmium/include/osmium/io/any_output.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/bzip2_compression.hpp b/contrib/libosmium/include/osmium/io/bzip2_compression.hpp
index 7641572fa..99c50cc2a 100644
--- a/contrib/libosmium/include/osmium/io/bzip2_compression.hpp
+++ b/contrib/libosmium/include/osmium/io/bzip2_compression.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -195,7 +195,7 @@ namespace osmium {
             ~Bzip2Compressor() noexcept override {
                 try {
                     close();
-                } catch (...) {
+                } catch (...) { // NOLINT(bugprone-empty-catch)
                     // Ignore any exceptions because destructor must not throw.
                 }
             }
@@ -269,7 +269,7 @@ namespace osmium {
             ~Bzip2Decompressor() noexcept override {
                 try {
                     close();
-                } catch (...) {
+                } catch (...) { // NOLINT(bugprone-empty-catch)
                     // Ignore any exceptions because destructor must not throw.
                 }
             }
@@ -294,22 +294,26 @@ namespace osmium {
                         detail::throw_bzip2_error(m_bzfile, "read failed", bzerror);
                     }
                     if (bzerror == BZ_STREAM_END) {
-                        void* unused = nullptr;
-                        int nunused = 0;
                         if (!feof(m_file.file())) {
-                            ::BZ2_bzReadGetUnused(&bzerror, m_bzfile, &unused, &nunused);
+                            void* unused = nullptr;
+                            int num_unused = 0;
+                            ::BZ2_bzReadGetUnused(&bzerror, m_bzfile, &unused, &num_unused);
                             if (bzerror != BZ_OK) {
                                 detail::throw_bzip2_error(m_bzfile, "get unused failed", bzerror);
                             }
-                            std::string unused_data{static_cast<const char*>(unused), static_cast<std::string::size_type>(nunused)};
-                            ::BZ2_bzReadClose(&bzerror, m_bzfile);
-                            if (bzerror != BZ_OK) {
-                                throw bzip2_error{"bzip2 error: read close failed", bzerror};
-                            }
-                            assert(unused_data.size() < std::numeric_limits<int>::max());
-                            m_bzfile = ::BZ2_bzReadOpen(&bzerror, m_file.file(), 0, 0, &*unused_data.begin(), static_cast<int>(unused_data.size()));
-                            if (!m_bzfile) {
-                                throw bzip2_error{"bzip2 error: read open failed", bzerror};
+                            if (num_unused != 0) {
+                                std::string unused_data{static_cast<const char*>(unused), static_cast<std::string::size_type>(num_unused)};
+                                ::BZ2_bzReadClose(&bzerror, m_bzfile);
+                                if (bzerror != BZ_OK) {
+                                    throw bzip2_error{"bzip2 error: read close failed", bzerror};
+                                }
+                                assert(unused_data.size() < std::numeric_limits<int>::max());
+                                m_bzfile = ::BZ2_bzReadOpen(&bzerror, m_file.file(), 0, 0, &*unused_data.begin(), static_cast<int>(unused_data.size()));
+                                if (!m_bzfile) {
+                                    throw bzip2_error{"bzip2 error: read open failed", bzerror};
+                                }
+                            } else {
+                                m_stream_end = true;
                             }
                         } else {
                             m_stream_end = true;
@@ -373,7 +377,7 @@ namespace osmium {
             ~Bzip2BufferDecompressor() noexcept override {
                 try {
                     close();
-                } catch (...) {
+                } catch (...) { // NOLINT(bugprone-empty-catch)
                     // Ignore any exceptions because destructor must not throw.
                 }
             }
diff --git a/contrib/libosmium/include/osmium/io/compression.hpp b/contrib/libosmium/include/osmium/io/compression.hpp
index cd45791fd..f21905d34 100644
--- a/contrib/libosmium/include/osmium/io/compression.hpp
+++ b/contrib/libosmium/include/osmium/io/compression.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -246,7 +246,7 @@ namespace osmium {
             ~NoCompressor() noexcept override {
                 try {
                     close();
-                } catch (...) {
+                } catch (...) { // NOLINT(bugprone-empty-catch)
                     // Ignore any exceptions because destructor must not throw.
                 }
             }
@@ -337,7 +337,7 @@ namespace osmium {
             ~NoDecompressor() noexcept override {
                 try {
                     close();
-                } catch (...) {
+                } catch (...) { // NOLINT(bugprone-empty-catch)
                     // Ignore any exceptions because destructor must not throw.
                 }
             }
diff --git a/contrib/libosmium/include/osmium/io/debug_output.hpp b/contrib/libosmium/include/osmium/io/debug_output.hpp
index 9d7051a3a..87bf29d32 100644
--- a/contrib/libosmium/include/osmium/io/debug_output.hpp
+++ b/contrib/libosmium/include/osmium/io/debug_output.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/debug_output_format.hpp b/contrib/libosmium/include/osmium/io/detail/debug_output_format.hpp
index d2a09598f..9767690e9 100644
--- a/contrib/libosmium/include/osmium/io/detail/debug_output_format.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/debug_output_format.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/ids_output_format.hpp b/contrib/libosmium/include/osmium/io/detail/ids_output_format.hpp
index d6c3c9f52..87448280b 100644
--- a/contrib/libosmium/include/osmium/io/detail/ids_output_format.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/ids_output_format.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/input_format.hpp b/contrib/libosmium/include/osmium/io/detail/input_format.hpp
index 7e3ee521f..f16a1b77e 100644
--- a/contrib/libosmium/include/osmium/io/detail/input_format.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/input_format.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/lz4.hpp b/contrib/libosmium/include/osmium/io/detail/lz4.hpp
index 1527f4476..601ffc5af 100644
--- a/contrib/libosmium/include/osmium/io/detail/lz4.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/lz4.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -58,7 +58,7 @@ namespace osmium {
 
         namespace detail {
 
-            constexpr inline int lz4_default_compression_level() noexcept {
+            constexpr int lz4_default_compression_level() noexcept {
                 return 1; // LZ4_ACCELERATION_DEFAULT
             }
 
diff --git a/contrib/libosmium/include/osmium/io/detail/o5m_input_format.hpp b/contrib/libosmium/include/osmium/io/detail/o5m_input_format.hpp
index 8deec41ea..2f6995186 100644
--- a/contrib/libosmium/include/osmium/io/detail/o5m_input_format.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/o5m_input_format.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -153,9 +153,9 @@ namespace osmium {
 
             class O5mParser final : public ParserWithBuffer {
 
-                osmium::io::Header m_header{};
+                osmium::io::Header m_header;
 
-                std::string m_input{};
+                std::string m_input;
 
                 const char* m_data;
                 const char* m_end;
diff --git a/contrib/libosmium/include/osmium/io/detail/opl_input_format.hpp b/contrib/libosmium/include/osmium/io/detail/opl_input_format.hpp
index f76e14ffe..568110af2 100644
--- a/contrib/libosmium/include/osmium/io/detail/opl_input_format.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/opl_input_format.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/opl_output_format.hpp b/contrib/libosmium/include/osmium/io/detail/opl_output_format.hpp
index cfb2c5f33..ab5a847b1 100644
--- a/contrib/libosmium/include/osmium/io/detail/opl_output_format.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/opl_output_format.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/opl_parser_functions.hpp b/contrib/libosmium/include/osmium/io/detail/opl_parser_functions.hpp
index 3ce11b44c..8fb5c3966 100644
--- a/contrib/libosmium/include/osmium/io/detail/opl_parser_functions.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/opl_parser_functions.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/output_format.hpp b/contrib/libosmium/include/osmium/io/detail/output_format.hpp
index c7ba6fa79..3a86d497c 100644
--- a/contrib/libosmium/include/osmium/io/detail/output_format.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/output_format.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/pbf.hpp b/contrib/libosmium/include/osmium/io/detail/pbf.hpp
index 21cccfa1a..0dd5e7550 100644
--- a/contrib/libosmium/include/osmium/io/detail/pbf.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/pbf.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/pbf_decoder.hpp b/contrib/libosmium/include/osmium/io/detail/pbf_decoder.hpp
index 804dd5831..6f77dda6b 100644
--- a/contrib/libosmium/include/osmium/io/detail/pbf_decoder.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/pbf_decoder.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/pbf_input_format.hpp b/contrib/libosmium/include/osmium/io/detail/pbf_input_format.hpp
index 0f1060083..fc4b70d18 100644
--- a/contrib/libosmium/include/osmium/io/detail/pbf_input_format.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/pbf_input_format.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -65,7 +65,7 @@ namespace osmium {
 
             class PBFParser final : public Parser {
 
-                std::string m_input_buffer{};
+                std::string m_input_buffer;
                 std::atomic<std::size_t>* m_offset_ptr;
                 int m_fd;
                 bool m_want_buffered_pages_removed;
@@ -114,29 +114,6 @@ namespace osmium {
                     return size;
                 }
 
-                /**
-                 * Read exactly size bytes from fd into buffer.
-                 *
-                 * @pre Value in size parameter must fit in unsigned int
-                 * @returns true if size bytes could be read
-                 *          false if EOF was encountered
-                 */
-                bool read_exactly(char* buffer, std::size_t size) {
-                    std::size_t to_read = size;
-
-                    while (to_read > 0) {
-                        auto const read_size = osmium::io::detail::reliable_read(m_fd, buffer + (size - to_read), static_cast<unsigned int>(to_read));
-                        if (read_size == 0) { // EOF
-                            return false;
-                        }
-                        to_read -= read_size;
-                    }
-
-                    *m_offset_ptr += size;
-
-                    return true;
-                }
-
                 /**
                  * Read 4 bytes in network byte order from file. They contain
                  * the length of the following BlobHeader.
@@ -144,7 +121,7 @@ namespace osmium {
                 uint32_t read_blob_header_size_from_file() {
                     if (m_fd != -1) {
                         std::array<char, sizeof(uint32_t)> buffer{};
-                        if (!read_exactly(buffer.data(), buffer.size())) {
+                        if (!osmium::io::detail::read_exactly(m_fd, buffer.data(), static_cast<unsigned int>(buffer.size()))) {
                             return 0; // EOF
                         }
                         return check_size(get_size_in_network_byte_order(buffer.data()));
@@ -230,7 +207,7 @@ namespace osmium {
                     if (m_fd != -1) {
                         buffer.resize(size);
 
-                        if (!read_exactly(&*buffer.begin(), size)) {
+                        if (!osmium::io::detail::read_exactly(m_fd, &*buffer.begin(), static_cast<unsigned int>(size))) {
                             throw osmium::pbf_error{"unexpected EOF"};
                         }
                     } else {
diff --git a/contrib/libosmium/include/osmium/io/detail/pbf_output_format.hpp b/contrib/libosmium/include/osmium/io/detail/pbf_output_format.hpp
index f6e0f6dcc..4834475c0 100644
--- a/contrib/libosmium/include/osmium/io/detail/pbf_output_format.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/pbf_output_format.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -275,7 +275,7 @@ namespace osmium {
                 protozero::pbf_builder<OSMFormat::PrimitiveGroup> m_pbf_primitive_group;
                 StringTable m_stringtable;
                 pbf_output_options m_options;
-                std::unique_ptr<DenseNodes> m_dense_nodes{};
+                std::unique_ptr<DenseNodes> m_dense_nodes;
                 OSMFormat::PrimitiveGroup m_type;
                 int m_count = 0;
 
@@ -312,7 +312,7 @@ namespace osmium {
 
                 void add_dense_node(const osmium::Node& node) {
                     if (!m_dense_nodes) {
-                        m_dense_nodes.reset(new DenseNodes{&m_stringtable, &m_options});
+                        m_dense_nodes = std::make_unique<DenseNodes>(&m_stringtable, &m_options);
                     }
                     m_dense_nodes->add_node(node);
                     ++m_count;
@@ -366,7 +366,7 @@ namespace osmium {
 
             class SerializeBlob {
 
-                std::shared_ptr<PrimitiveBlock> m_block{};
+                std::shared_ptr<PrimitiveBlock> m_block;
 
                 std::string m_msg;
 
@@ -482,7 +482,7 @@ namespace osmium {
 
                 pbf_output_options m_options;
 
-                std::shared_ptr<PrimitiveBlock> m_primitive_block{};
+                std::shared_ptr<PrimitiveBlock> m_primitive_block;
 
                 std::size_t m_bucket_count = StringTable::min_bucket_count;
 
@@ -553,7 +553,7 @@ namespace osmium {
                 void switch_primitive_block_type(OSMFormat::PrimitiveGroup type) {
                     if (!m_primitive_block || !m_primitive_block->can_add(type)) {
                         store_primitive_block();
-                        m_primitive_block.reset(new PrimitiveBlock{m_options, type, m_bucket_count});
+                        m_primitive_block = std::make_shared<PrimitiveBlock>(m_options, type, m_bucket_count);
                     }
                 }
 
diff --git a/contrib/libosmium/include/osmium/io/detail/protobuf_tags.hpp b/contrib/libosmium/include/osmium/io/detail/protobuf_tags.hpp
index 6bd67b504..50e09fc18 100644
--- a/contrib/libosmium/include/osmium/io/detail/protobuf_tags.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/protobuf_tags.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/queue_util.hpp b/contrib/libosmium/include/osmium/io/detail/queue_util.hpp
index 16edcf1e2..5bffb1e00 100644
--- a/contrib/libosmium/include/osmium/io/detail/queue_util.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/queue_util.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -117,7 +117,8 @@ namespace osmium {
                 ~queue_wrapper() noexcept {
                     try {
                         shutdown();
-                    } catch (...) {
+                    } catch (...) { // NOLINT(bugprone-empty-catch)
+                        // Ignore any exceptions because destructor must not throw.
                     }
                 }
 
diff --git a/contrib/libosmium/include/osmium/io/detail/read_thread.hpp b/contrib/libosmium/include/osmium/io/detail/read_thread.hpp
index 607ecae9a..e0077585b 100644
--- a/contrib/libosmium/include/osmium/io/detail/read_thread.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/read_thread.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/read_write.hpp b/contrib/libosmium/include/osmium/io/detail/read_write.hpp
index bde056b6d..dffc6e7ec 100644
--- a/contrib/libosmium/include/osmium/io/detail/read_write.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/read_write.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -36,6 +36,7 @@ DEALINGS IN THE SOFTWARE.
 #include <osmium/io/writer_options.hpp>
 #include <osmium/util/file.hpp>
 
+#include <cassert>
 #include <cerrno>
 #include <cstddef>
 #include <fcntl.h>
@@ -201,6 +202,29 @@ namespace osmium {
                 return nread;
             }
 
+            /**
+             * Read exactly size bytes from fd into buffer. In contrast to reliable_read,
+             * this function will continue reading until either EOF or an error is encountered.
+             *
+             * @pre buffer Buffer for data to be read. Must be at least size bytes long.
+             * @returns true if size bytes could be read
+             *          false if EOF was encountered
+             */
+            inline bool read_exactly(int fd, char* buffer, unsigned int size) {
+                unsigned int to_read = size;
+
+                while (to_read > 0) {
+                    auto const read_size = reliable_read(fd, buffer + (size - to_read), to_read);
+                    if (read_size == 0) { // EOF
+                        return false;
+                    }
+                    assert(read_size <= to_read);
+                    to_read -= static_cast<unsigned int>(read_size);
+                }
+
+                return true;
+            }
+
             inline void reliable_fsync(const int fd) {
 #ifdef _MSC_VER
                 osmium::detail::disable_invalid_parameter_handler diph;
diff --git a/contrib/libosmium/include/osmium/io/detail/string_table.hpp b/contrib/libosmium/include/osmium/io/detail/string_table.hpp
index f378dbb73..5045c8d6c 100644
--- a/contrib/libosmium/include/osmium/io/detail/string_table.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/string_table.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -115,7 +115,7 @@ namespace osmium {
                     using it_type = std::list<std::string>::const_iterator;
 
                     it_type m_it;
-                    const it_type m_last;
+                    it_type m_last;
                     const char* m_pos;
 
                 public:
diff --git a/contrib/libosmium/include/osmium/io/detail/string_util.hpp b/contrib/libosmium/include/osmium/io/detail/string_util.hpp
index ea5855613..381e84aed 100644
--- a/contrib/libosmium/include/osmium/io/detail/string_util.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/string_util.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/write_thread.hpp b/contrib/libosmium/include/osmium/io/detail/write_thread.hpp
index e4d9e9efe..8f00896d8 100644
--- a/contrib/libosmium/include/osmium/io/detail/write_thread.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/write_thread.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/xml_input_format.hpp b/contrib/libosmium/include/osmium/io/detail/xml_input_format.hpp
index 1b0fd8b37..9ee85dee5 100644
--- a/contrib/libosmium/include/osmium/io/detail/xml_input_format.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/xml_input_format.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -150,17 +150,17 @@ namespace osmium {
 
                 std::vector<context> m_context_stack;
 
-                osmium::io::Header m_header{};
+                osmium::io::Header m_header;
 
-                std::unique_ptr<osmium::builder::NodeBuilder>                m_node_builder{};
-                std::unique_ptr<osmium::builder::WayBuilder>                 m_way_builder{};
-                std::unique_ptr<osmium::builder::RelationBuilder>            m_relation_builder{};
-                std::unique_ptr<osmium::builder::ChangesetBuilder>           m_changeset_builder{};
-                std::unique_ptr<osmium::builder::ChangesetDiscussionBuilder> m_changeset_discussion_builder{};
+                std::unique_ptr<osmium::builder::NodeBuilder>                m_node_builder;
+                std::unique_ptr<osmium::builder::WayBuilder>                 m_way_builder;
+                std::unique_ptr<osmium::builder::RelationBuilder>            m_relation_builder;
+                std::unique_ptr<osmium::builder::ChangesetBuilder>           m_changeset_builder;
+                std::unique_ptr<osmium::builder::ChangesetDiscussionBuilder> m_changeset_discussion_builder;
 
-                std::unique_ptr<osmium::builder::TagListBuilder>             m_tl_builder{};
-                std::unique_ptr<osmium::builder::WayNodeListBuilder>         m_wnl_builder{};
-                std::unique_ptr<osmium::builder::RelationMemberListBuilder>  m_rml_builder{};
+                std::unique_ptr<osmium::builder::TagListBuilder>             m_tl_builder;
+                std::unique_ptr<osmium::builder::WayNodeListBuilder>         m_wnl_builder;
+                std::unique_ptr<osmium::builder::RelationMemberListBuilder>  m_rml_builder;
 
                 std::string m_comment_text;
 
@@ -338,7 +338,7 @@ namespace osmium {
                     });
 
                     if (!m_tl_builder) {
-                        m_tl_builder.reset(new osmium::builder::TagListBuilder{builder});
+                        m_tl_builder = std::make_unique<osmium::builder::TagListBuilder>(builder);
                     }
                     m_tl_builder->add_tag(k, v);
                 }
@@ -391,7 +391,7 @@ namespace osmium {
                         mark_header_as_done();
                         if (read_types() & osmium::osm_entity_bits::node) {
                             maybe_new_buffer(osmium::item_type::node);
-                            m_node_builder.reset(new osmium::builder::NodeBuilder{buffer()});
+                            m_node_builder = std::make_unique<osmium::builder::NodeBuilder>(buffer());
                             m_node_builder->set_user(init_object(m_node_builder->object(), attrs));
                         }
                         return;
@@ -402,7 +402,7 @@ namespace osmium {
                         mark_header_as_done();
                         if (read_types() & osmium::osm_entity_bits::way) {
                             maybe_new_buffer(osmium::item_type::way);
-                            m_way_builder.reset(new osmium::builder::WayBuilder{buffer()});
+                            m_way_builder = std::make_unique<osmium::builder::WayBuilder>(buffer());
                             m_way_builder->set_user(init_object(m_way_builder->object(), attrs));
                         }
                         return;
@@ -413,7 +413,7 @@ namespace osmium {
                         mark_header_as_done();
                         if (read_types() & osmium::osm_entity_bits::relation) {
                             maybe_new_buffer(osmium::item_type::relation);
-                            m_relation_builder.reset(new osmium::builder::RelationBuilder{buffer()});
+                            m_relation_builder = std::make_unique<osmium::builder::RelationBuilder>(buffer());
                             m_relation_builder->set_user(init_object(m_relation_builder->object(), attrs));
                         }
                         return;
@@ -428,7 +428,7 @@ namespace osmium {
                         mark_header_as_done();
                         if (read_types() & osmium::osm_entity_bits::changeset) {
                             maybe_new_buffer(osmium::item_type::changeset);
-                            m_changeset_builder.reset(new osmium::builder::ChangesetBuilder{buffer()});
+                            m_changeset_builder = std::make_unique<osmium::builder::ChangesetBuilder>(buffer());
                             init_changeset(*m_changeset_builder, attrs);
                         }
                     } else if (!std::strcmp(element, "create")) {
@@ -508,7 +508,7 @@ namespace osmium {
                                     m_tl_builder.reset();
 
                                     if (!m_wnl_builder) {
-                                        m_wnl_builder.reset(new osmium::builder::WayNodeListBuilder{*m_way_builder});
+                                        m_wnl_builder = std::make_unique<osmium::builder::WayNodeListBuilder>(*m_way_builder);
                                     }
 
                                     NodeRef nr;
@@ -542,7 +542,7 @@ namespace osmium {
                                     m_tl_builder.reset();
 
                                     if (!m_rml_builder) {
-                                        m_rml_builder.reset(new osmium::builder::RelationMemberListBuilder{*m_relation_builder});
+                                        m_rml_builder = std::make_unique<osmium::builder::RelationMemberListBuilder>(*m_relation_builder);
                                     }
 
                                     item_type type = item_type::undefined;
@@ -591,7 +591,7 @@ namespace osmium {
                                 if (read_types() & osmium::osm_entity_bits::changeset) {
                                     m_tl_builder.reset();
                                     if (!m_changeset_discussion_builder) {
-                                        m_changeset_discussion_builder.reset(new osmium::builder::ChangesetDiscussionBuilder{*m_changeset_builder});
+                                        m_changeset_discussion_builder = std::make_unique<osmium::builder::ChangesetDiscussionBuilder>(*m_changeset_builder);
                                     }
                                 }
                             } else if (!std::strcmp(element, "tag")) {
@@ -776,6 +776,9 @@ namespace osmium {
 
                     mark_header_as_done();
                     flush_final_buffer();
+
+                    // so we don't have a dangling link to local parser variable
+                    m_expat_xml_parser = nullptr;
                 }
 
             }; // class XMLParser
diff --git a/contrib/libosmium/include/osmium/io/detail/xml_output_format.hpp b/contrib/libosmium/include/osmium/io/detail/xml_output_format.hpp
index b02f27fec..88a4a0b29 100644
--- a/contrib/libosmium/include/osmium/io/detail/xml_output_format.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/xml_output_format.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/zlib.hpp b/contrib/libosmium/include/osmium/io/detail/zlib.hpp
index bf70a8322..502fe9d35 100644
--- a/contrib/libosmium/include/osmium/io/detail/zlib.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/zlib.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -55,7 +55,7 @@ namespace osmium {
 
         namespace detail {
 
-            constexpr inline int zlib_default_compression_level() noexcept {
+            constexpr int zlib_default_compression_level() noexcept {
                 return Z_DEFAULT_COMPRESSION;
             }
 
diff --git a/contrib/libosmium/include/osmium/io/error.hpp b/contrib/libosmium/include/osmium/io/error.hpp
index 3064373be..eabdcde39 100644
--- a/contrib/libosmium/include/osmium/io/error.hpp
+++ b/contrib/libosmium/include/osmium/io/error.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/file.hpp b/contrib/libosmium/include/osmium/io/file.hpp
index c1f8eade6..7c8e6345a 100644
--- a/contrib/libosmium/include/osmium/io/file.hpp
+++ b/contrib/libosmium/include/osmium/io/file.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -73,7 +73,7 @@ namespace osmium {
 
         private:
 
-            std::string m_filename{};
+            std::string m_filename;
 
             const char* m_buffer = nullptr;
             size_t m_buffer_size = 0;
diff --git a/contrib/libosmium/include/osmium/io/file_compression.hpp b/contrib/libosmium/include/osmium/io/file_compression.hpp
index 86ba32574..79f20e34d 100644
--- a/contrib/libosmium/include/osmium/io/file_compression.hpp
+++ b/contrib/libosmium/include/osmium/io/file_compression.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/file_format.hpp b/contrib/libosmium/include/osmium/io/file_format.hpp
index d90ded854..35fbb46a9 100644
--- a/contrib/libosmium/include/osmium/io/file_format.hpp
+++ b/contrib/libosmium/include/osmium/io/file_format.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/gzip_compression.hpp b/contrib/libosmium/include/osmium/io/gzip_compression.hpp
index 1331b98ab..ed7fa2b6e 100644
--- a/contrib/libosmium/include/osmium/io/gzip_compression.hpp
+++ b/contrib/libosmium/include/osmium/io/gzip_compression.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -131,7 +131,7 @@ namespace osmium {
             ~GzipCompressor() noexcept override {
                 try {
                     close();
-                } catch (...) {
+                } catch (...) { // NOLINT(bugprone-empty-catch)
                     // Ignore any exceptions because destructor must not throw.
                 }
             }
@@ -196,7 +196,7 @@ namespace osmium {
                 if (!m_gzfile) {
                     try {
                         osmium::io::detail::reliable_close(fd);
-                    } catch (...) {
+                    } catch (...) { // NOLINT(bugprone-empty-catch)
                     }
                     throw gzip_error{"gzip error: read initialization failed"};
                 }
@@ -211,7 +211,7 @@ namespace osmium {
             ~GzipDecompressor() noexcept override {
                 try {
                     close();
-                } catch (...) {
+                } catch (...) { // NOLINT(bugprone-empty-catch)
                     // Ignore any exceptions because destructor must not throw.
                 }
             }
@@ -293,7 +293,7 @@ namespace osmium {
             ~GzipBufferDecompressor() noexcept override {
                 try {
                     close();
-                } catch (...) {
+                } catch (...) { // NOLINT(bugprone-empty-catch)
                     // Ignore any exceptions because destructor must not throw.
                 }
             }
diff --git a/contrib/libosmium/include/osmium/io/header.hpp b/contrib/libosmium/include/osmium/io/header.hpp
index 2a652f70e..9c2903111 100644
--- a/contrib/libosmium/include/osmium/io/header.hpp
+++ b/contrib/libosmium/include/osmium/io/header.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -68,7 +68,7 @@ namespace osmium {
         class Header : public osmium::Options {
 
             /// Bounding boxes
-            std::vector<osmium::Box> m_boxes{};
+            std::vector<osmium::Box> m_boxes;
 
             /**
              * Are there possibly multiple versions of the same object in
diff --git a/contrib/libosmium/include/osmium/io/ids_output.hpp b/contrib/libosmium/include/osmium/io/ids_output.hpp
index 3992642b0..fe09c5f59 100644
--- a/contrib/libosmium/include/osmium/io/ids_output.hpp
+++ b/contrib/libosmium/include/osmium/io/ids_output.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/input_iterator.hpp b/contrib/libosmium/include/osmium/io/input_iterator.hpp
index 4c6690d70..e8196268e 100644
--- a/contrib/libosmium/include/osmium/io/input_iterator.hpp
+++ b/contrib/libosmium/include/osmium/io/input_iterator.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/o5m_input.hpp b/contrib/libosmium/include/osmium/io/o5m_input.hpp
index 320651a94..e2df6fcd0 100644
--- a/contrib/libosmium/include/osmium/io/o5m_input.hpp
+++ b/contrib/libosmium/include/osmium/io/o5m_input.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/opl_input.hpp b/contrib/libosmium/include/osmium/io/opl_input.hpp
index be2914d3b..bde901863 100644
--- a/contrib/libosmium/include/osmium/io/opl_input.hpp
+++ b/contrib/libosmium/include/osmium/io/opl_input.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/opl_output.hpp b/contrib/libosmium/include/osmium/io/opl_output.hpp
index d79d14bb5..521dac34a 100644
--- a/contrib/libosmium/include/osmium/io/opl_output.hpp
+++ b/contrib/libosmium/include/osmium/io/opl_output.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/output_iterator.hpp b/contrib/libosmium/include/osmium/io/output_iterator.hpp
index 6c0445a4e..7aeb75089 100644
--- a/contrib/libosmium/include/osmium/io/output_iterator.hpp
+++ b/contrib/libosmium/include/osmium/io/output_iterator.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/overwrite.hpp b/contrib/libosmium/include/osmium/io/overwrite.hpp
index 0bec8d99f..37c011d3e 100644
--- a/contrib/libosmium/include/osmium/io/overwrite.hpp
+++ b/contrib/libosmium/include/osmium/io/overwrite.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/pbf.hpp b/contrib/libosmium/include/osmium/io/pbf.hpp
index f48659ff1..2205b9de9 100644
--- a/contrib/libosmium/include/osmium/io/pbf.hpp
+++ b/contrib/libosmium/include/osmium/io/pbf.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/pbf_input.hpp b/contrib/libosmium/include/osmium/io/pbf_input.hpp
index 1a1a4a4dd..e2a1f2b80 100644
--- a/contrib/libosmium/include/osmium/io/pbf_input.hpp
+++ b/contrib/libosmium/include/osmium/io/pbf_input.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/pbf_output.hpp b/contrib/libosmium/include/osmium/io/pbf_output.hpp
index 2a06e0903..83f1048b0 100644
--- a/contrib/libosmium/include/osmium/io/pbf_output.hpp
+++ b/contrib/libosmium/include/osmium/io/pbf_output.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/reader.hpp b/contrib/libosmium/include/osmium/io/reader.hpp
index 643ffcd0c..d6680555d 100644
--- a/contrib/libosmium/include/osmium/io/reader.hpp
+++ b/contrib/libosmium/include/osmium/io/reader.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -92,7 +92,7 @@ namespace osmium {
             // The Reader::read() function reads from a queue of buffers which
             // can contain nested buffers. These nested buffers will be in
             // here, because read() can only return a single unnested buffer.
-            osmium::memory::Buffer m_back_buffers{};
+            osmium::memory::Buffer m_back_buffers;
 
             osmium::io::File m_file;
 
@@ -124,10 +124,10 @@ namespace osmium {
             detail::future_buffer_queue_type m_osmdata_queue;
             detail::queue_wrapper<osmium::memory::Buffer> m_osmdata_queue_wrapper;
 
-            std::future<osmium::io::Header> m_header_future{};
-            osmium::io::Header m_header{};
+            std::future<osmium::io::Header> m_header_future;
+            osmium::io::Header m_header;
 
-            osmium::thread::thread_handler m_thread{};
+            osmium::thread::thread_handler m_thread;
 
             osmium::osm_entity_bits::type m_read_which_entities = osmium::osm_entity_bits::all;
             osmium::io::read_meta m_read_metadata = osmium::io::read_meta::yes;
@@ -368,7 +368,7 @@ namespace osmium {
             ~Reader() noexcept {
                 try {
                     close();
-                } catch (...) {
+                } catch (...) { // NOLINT(bugprone-empty-catch)
                     // Ignore any exceptions because destructor must not throw.
                 }
             }
diff --git a/contrib/libosmium/include/osmium/io/reader_iterator.hpp b/contrib/libosmium/include/osmium/io/reader_iterator.hpp
index daff71a00..632cbbbe7 100644
--- a/contrib/libosmium/include/osmium/io/reader_iterator.hpp
+++ b/contrib/libosmium/include/osmium/io/reader_iterator.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/reader_with_progress_bar.hpp b/contrib/libosmium/include/osmium/io/reader_with_progress_bar.hpp
index c3bae9d65..88323488a 100644
--- a/contrib/libosmium/include/osmium/io/reader_with_progress_bar.hpp
+++ b/contrib/libosmium/include/osmium/io/reader_with_progress_bar.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -91,7 +91,7 @@ namespace osmium {
         }
 
         inline InputIterator<ReaderWithProgressBar> end(ReaderWithProgressBar& /*reader*/) {
-            return InputIterator<ReaderWithProgressBar>();
+            return {};
         }
 
     } // namespace io
diff --git a/contrib/libosmium/include/osmium/io/writer.hpp b/contrib/libosmium/include/osmium/io/writer.hpp
index e23045cef..ecd4ea473 100644
--- a/contrib/libosmium/include/osmium/io/writer.hpp
+++ b/contrib/libosmium/include/osmium/io/writer.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -109,15 +109,15 @@ namespace osmium {
 
             std::unique_ptr<osmium::io::detail::OutputFormat> m_output{nullptr};
 
-            osmium::memory::Buffer m_buffer{};
+            osmium::memory::Buffer m_buffer;
 
             osmium::io::Header m_header;
 
             size_t m_buffer_size = default_buffer_size;
 
-            std::future<std::size_t> m_write_future{};
+            std::future<std::size_t> m_write_future;
 
-            osmium::thread::thread_handler m_thread{};
+            osmium::thread::thread_handler m_thread;
 
             // Checking the m_write_future is much more expensive then checking
             // one atomic bool, so we set this bool in the write_thread when
@@ -308,7 +308,7 @@ namespace osmium {
             ~Writer() noexcept {
                 try {
                     do_close();
-                } catch (...) {
+                } catch (...) { // NOLINT(bugprone-empty-catch)
                     // Ignore any exceptions because destructor must not throw.
                 }
             }
diff --git a/contrib/libosmium/include/osmium/io/writer_options.hpp b/contrib/libosmium/include/osmium/io/writer_options.hpp
index 26d7ff44f..dddb2918e 100644
--- a/contrib/libosmium/include/osmium/io/writer_options.hpp
+++ b/contrib/libosmium/include/osmium/io/writer_options.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/xml_input.hpp b/contrib/libosmium/include/osmium/io/xml_input.hpp
index 7101d6291..8681a4736 100644
--- a/contrib/libosmium/include/osmium/io/xml_input.hpp
+++ b/contrib/libosmium/include/osmium/io/xml_input.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/xml_output.hpp b/contrib/libosmium/include/osmium/io/xml_output.hpp
index 3420e3182..3110c4317 100644
--- a/contrib/libosmium/include/osmium/io/xml_output.hpp
+++ b/contrib/libosmium/include/osmium/io/xml_output.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/memory/buffer.hpp b/contrib/libosmium/include/osmium/memory/buffer.hpp
index e51f5deb3..a1fe3c168 100644
--- a/contrib/libosmium/include/osmium/memory/buffer.hpp
+++ b/contrib/libosmium/include/osmium/memory/buffer.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -104,7 +104,7 @@ namespace osmium {
         private:
 
             std::unique_ptr<Buffer> m_next_buffer;
-            std::unique_ptr<unsigned char[]> m_memory{};
+            std::unique_ptr<unsigned char[]> m_memory;
             unsigned char* m_data = nullptr;
             std::size_t m_capacity = 0;
             std::size_t m_written = 0;
diff --git a/contrib/libosmium/include/osmium/memory/callback_buffer.hpp b/contrib/libosmium/include/osmium/memory/callback_buffer.hpp
index 76fea0594..4c55b8146 100644
--- a/contrib/libosmium/include/osmium/memory/callback_buffer.hpp
+++ b/contrib/libosmium/include/osmium/memory/callback_buffer.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/memory/collection.hpp b/contrib/libosmium/include/osmium/memory/collection.hpp
index e30113fbc..01b127dc3 100644
--- a/contrib/libosmium/include/osmium/memory/collection.hpp
+++ b/contrib/libosmium/include/osmium/memory/collection.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -49,7 +49,7 @@ namespace osmium {
             // This data_type is either 'unsigned char*' or 'const unsigned
             // char*' depending on whether TMember is const. This allows this
             // class to be used as an iterator and as a const_iterator.
-            using data_type = typename std::conditional<std::is_const<TMember>::value, const unsigned char*, unsigned char*>::type;
+            using data_type = std::conditional_t<std::is_const<TMember>::value, const unsigned char*, unsigned char*>;
 
             data_type m_data;
 
diff --git a/contrib/libosmium/include/osmium/memory/item.hpp b/contrib/libosmium/include/osmium/memory/item.hpp
index a262371dd..19e9e5bcb 100644
--- a/contrib/libosmium/include/osmium/memory/item.hpp
+++ b/contrib/libosmium/include/osmium/memory/item.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -61,7 +61,7 @@ namespace osmium {
             align_bytes = 8UL
         };
 
-        inline constexpr std::size_t padded_length(std::size_t length) noexcept {
+        constexpr std::size_t padded_length(std::size_t length) noexcept {
             return (length + align_bytes - 1) & ~(align_bytes - 1);
         }
 
diff --git a/contrib/libosmium/include/osmium/memory/item_iterator.hpp b/contrib/libosmium/include/osmium/memory/item_iterator.hpp
index 348d52a73..132bb8ea2 100644
--- a/contrib/libosmium/include/osmium/memory/item_iterator.hpp
+++ b/contrib/libosmium/include/osmium/memory/item_iterator.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -49,7 +49,7 @@ namespace osmium {
         namespace detail {
 
             template <typename T>
-            constexpr inline bool type_is_compatible(const osmium::item_type t) noexcept {
+            constexpr bool type_is_compatible(const osmium::item_type t) noexcept {
                 return T::is_compatible_to(t);
             }
 
@@ -63,7 +63,7 @@ namespace osmium {
             // This data_type is either 'unsigned char*' or 'const unsigned char*' depending
             // on whether TMember is const. This allows this class to be used as an iterator and
             // as a const_iterator.
-            using data_type = typename std::conditional<std::is_const<TMember>::value, const unsigned char*, unsigned char*>::type;
+            using data_type = std::conditional_t<std::is_const<TMember>::value, const unsigned char*, unsigned char*>;
 
             data_type m_data;
             data_type m_end;
@@ -179,7 +179,7 @@ namespace osmium {
 
             // This data_type is either 'unsigned char*' or
             // 'const unsigned char*' depending on whether T is const.
-            using data_type = typename std::conditional<std::is_const<T>::value, const unsigned char*, unsigned char*>::type;
+            using data_type = std::conditional_t<std::is_const<T>::value, const unsigned char*, unsigned char*>;
 
             data_type m_begin;
             data_type m_end;
diff --git a/contrib/libosmium/include/osmium/object_pointer_collection.hpp b/contrib/libosmium/include/osmium/object_pointer_collection.hpp
index 3cd0ed6ca..4a03f5a42 100644
--- a/contrib/libosmium/include/osmium/object_pointer_collection.hpp
+++ b/contrib/libosmium/include/osmium/object_pointer_collection.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -90,7 +90,7 @@ namespace osmium {
      */
     class ObjectPointerCollection : public osmium::handler::Handler {
 
-        std::vector<osmium::OSMObject*> m_objects{};
+        std::vector<osmium::OSMObject*> m_objects;
 
     public:
 
diff --git a/contrib/libosmium/include/osmium/opl.hpp b/contrib/libosmium/include/osmium/opl.hpp
index 2f9b85af4..d4d280241 100644
--- a/contrib/libosmium/include/osmium/opl.hpp
+++ b/contrib/libosmium/include/osmium/opl.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm.hpp b/contrib/libosmium/include/osmium/osm.hpp
index f1f956e6f..23e2b7537 100644
--- a/contrib/libosmium/include/osmium/osm.hpp
+++ b/contrib/libosmium/include/osmium/osm.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/area.hpp b/contrib/libosmium/include/osmium/osm/area.hpp
index fcaf0f8cf..1d3fa603a 100644
--- a/contrib/libosmium/include/osmium/osm/area.hpp
+++ b/contrib/libosmium/include/osmium/osm/area.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/box.hpp b/contrib/libosmium/include/osmium/osm/box.hpp
index f477a4f81..5ad763932 100644
--- a/contrib/libosmium/include/osmium/osm/box.hpp
+++ b/contrib/libosmium/include/osmium/osm/box.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -48,8 +48,8 @@ namespace osmium {
      */
     class Box {
 
-        osmium::Location m_bottom_left{};
-        osmium::Location m_top_right{};
+        osmium::Location m_bottom_left;
+        osmium::Location m_top_right;
 
     public:
 
@@ -248,7 +248,7 @@ namespace osmium {
      * Boxes are equal if both locations are equal. Undefined boxes will
      * compare equal.
      */
-    inline constexpr bool operator==(const Box& lhs, const Box& rhs) noexcept {
+    constexpr bool operator==(const Box& lhs, const Box& rhs) noexcept {
         return lhs.bottom_left() == rhs.bottom_left() &&
                lhs.top_right() == rhs.top_right();
     }
diff --git a/contrib/libosmium/include/osmium/osm/changeset.hpp b/contrib/libosmium/include/osmium/osm/changeset.hpp
index ea678628a..bf9030d96 100644
--- a/contrib/libosmium/include/osmium/osm/changeset.hpp
+++ b/contrib/libosmium/include/osmium/osm/changeset.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/crc.hpp b/contrib/libosmium/include/osmium/osm/crc.hpp
index 88441cae2..508e361f6 100644
--- a/contrib/libosmium/include/osmium/osm/crc.hpp
+++ b/contrib/libosmium/include/osmium/osm/crc.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/crc_zlib.hpp b/contrib/libosmium/include/osmium/osm/crc_zlib.hpp
index be9e6a5c1..3b300463a 100644
--- a/contrib/libosmium/include/osmium/osm/crc_zlib.hpp
+++ b/contrib/libosmium/include/osmium/osm/crc_zlib.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/diff_object.hpp b/contrib/libosmium/include/osmium/osm/diff_object.hpp
index adf8006a7..393234250 100644
--- a/contrib/libosmium/include/osmium/osm/diff_object.hpp
+++ b/contrib/libosmium/include/osmium/osm/diff_object.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/entity.hpp b/contrib/libosmium/include/osmium/osm/entity.hpp
index f2a04e698..16534c78b 100644
--- a/contrib/libosmium/include/osmium/osm/entity.hpp
+++ b/contrib/libosmium/include/osmium/osm/entity.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/entity_bits.hpp b/contrib/libosmium/include/osmium/osm/entity_bits.hpp
index 6c84bef8d..f082cd9f9 100644
--- a/contrib/libosmium/include/osmium/osm/entity_bits.hpp
+++ b/contrib/libosmium/include/osmium/osm/entity_bits.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -67,9 +67,18 @@ namespace osmium {
             nothing   = 0x00,
             node      = 0x01,
             way       = 0x02,
+            nw        = 0x03, ///< node or way object
             relation  = 0x04,
+            nr        = 0x05, ///< node or relation object
+            wr        = 0x06, ///< way or relation object
             nwr       = 0x07, ///< node, way, or relation object
             area      = 0x08,
+            na        = 0x09, ///< node or area object
+            wa        = 0x0a, ///< way or area object
+            nwa       = 0x0b, ///< node, way or area object
+            ra        = 0x0c, ///< relation or area object
+            nra       = 0x0d, ///< node, relation or area object
+            wra       = 0x0e, ///< way, relation or area object
             nwra      = 0x0f, ///< node, way, relation, or area object
             object    = 0x0f, ///< node, way, relation, or area object
             changeset = 0x10,
@@ -77,15 +86,15 @@ namespace osmium {
 
         }; // enum type
 
-        inline constexpr type operator|(const type lhs, const type rhs) noexcept {
+        constexpr type operator|(const type lhs, const type rhs) noexcept {
             return static_cast<type>(static_cast<unsigned char>(lhs) | static_cast<unsigned char>(rhs));
         }
 
-        inline constexpr type operator&(const type lhs, const type rhs) noexcept {
+        constexpr type operator&(const type lhs, const type rhs) noexcept {
             return static_cast<type>(static_cast<unsigned char>(lhs) & static_cast<unsigned char>(rhs));
         }
 
-        inline constexpr type operator~(const type value) noexcept {
+        constexpr type operator~(const type value) noexcept {
             return all & static_cast<type>(~static_cast<unsigned char>(value));
         }
 
@@ -106,7 +115,7 @@ namespace osmium {
          *      changeset.
          */
         inline type from_item_type(osmium::item_type item_type) noexcept {
-            const auto ut = static_cast<std::underlying_type<osmium::item_type>::type>(item_type);
+            const auto ut = static_cast<std::underlying_type_t<osmium::item_type>>(item_type);
             assert(ut <= 0x05);
             if (ut == 0) {
                 return nothing;
diff --git a/contrib/libosmium/include/osmium/osm/item_type.hpp b/contrib/libosmium/include/osmium/osm/item_type.hpp
index c10eca7d6..3556bb4f0 100644
--- a/contrib/libosmium/include/osmium/osm/item_type.hpp
+++ b/contrib/libosmium/include/osmium/osm/item_type.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/location.hpp b/contrib/libosmium/include/osmium/osm/location.hpp
index a18855472..2fcf75f30 100644
--- a/contrib/libosmium/include/osmium/osm/location.hpp
+++ b/contrib/libosmium/include/osmium/osm/location.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -490,11 +490,11 @@ namespace osmium {
     /**
      * Locations are equal if both coordinates are equal.
      */
-    inline constexpr bool operator==(const Location& lhs, const Location& rhs) noexcept {
+    constexpr bool operator==(const Location& lhs, const Location& rhs) noexcept {
         return lhs.x() == rhs.x() && lhs.y() == rhs.y();
     }
 
-    inline constexpr bool operator!=(const Location& lhs, const Location& rhs) noexcept {
+    constexpr bool operator!=(const Location& lhs, const Location& rhs) noexcept {
         return !(lhs == rhs);
     }
 
@@ -503,19 +503,19 @@ namespace osmium {
      * the y coordinate. If either of the locations is
      * undefined the result is undefined.
      */
-    inline constexpr bool operator<(const Location& lhs, const Location& rhs) noexcept {
+    constexpr bool operator<(const Location& lhs, const Location& rhs) noexcept {
         return (lhs.x() == rhs.x() && lhs.y() < rhs.y()) || lhs.x() < rhs.x();
     }
 
-    inline constexpr bool operator>(const Location& lhs, const Location& rhs) noexcept {
+    constexpr bool operator>(const Location& lhs, const Location& rhs) noexcept {
         return rhs < lhs;
     }
 
-    inline constexpr bool operator<=(const Location& lhs, const Location& rhs) noexcept {
+    constexpr bool operator<=(const Location& lhs, const Location& rhs) noexcept {
         return !(rhs < lhs);
     }
 
-    inline constexpr bool operator>=(const Location& lhs, const Location& rhs) noexcept {
+    constexpr bool operator>=(const Location& lhs, const Location& rhs) noexcept {
         return !(lhs < rhs);
     }
 
diff --git a/contrib/libosmium/include/osmium/osm/metadata_options.hpp b/contrib/libosmium/include/osmium/osm/metadata_options.hpp
index 683d81654..85d05fea3 100644
--- a/contrib/libosmium/include/osmium/osm/metadata_options.hpp
+++ b/contrib/libosmium/include/osmium/osm/metadata_options.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/node.hpp b/contrib/libosmium/include/osmium/osm/node.hpp
index e09243312..fa3544f66 100644
--- a/contrib/libosmium/include/osmium/osm/node.hpp
+++ b/contrib/libosmium/include/osmium/osm/node.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/node_ref.hpp b/contrib/libosmium/include/osmium/osm/node_ref.hpp
index 06f9cc0d3..bb8138f0c 100644
--- a/contrib/libosmium/include/osmium/osm/node_ref.hpp
+++ b/contrib/libosmium/include/osmium/osm/node_ref.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -150,7 +150,7 @@ namespace osmium {
     /**
      * Compare two NodeRefs. They are equal if they reference the same Node ID.
      */
-    inline constexpr bool operator==(const NodeRef& lhs, const NodeRef& rhs) noexcept {
+    constexpr bool operator==(const NodeRef& lhs, const NodeRef& rhs) noexcept {
         return lhs.ref() == rhs.ref();
     }
 
@@ -158,7 +158,7 @@ namespace osmium {
      * Compare two NodeRefs. They are not equal if they reference different
      * Node IDs.
      */
-    inline constexpr bool operator!=(const NodeRef& lhs, const NodeRef& rhs) noexcept {
+    constexpr bool operator!=(const NodeRef& lhs, const NodeRef& rhs) noexcept {
         return !(lhs == rhs);
     }
 
@@ -166,7 +166,7 @@ namespace osmium {
      * Compare two NodeRefs. NodeRefs are ordered according to the Node ID
      * they reference.
      */
-    inline constexpr bool operator<(const NodeRef& lhs, const NodeRef& rhs) noexcept {
+    constexpr bool operator<(const NodeRef& lhs, const NodeRef& rhs) noexcept {
         return lhs.ref() < rhs.ref();
     }
 
@@ -174,7 +174,7 @@ namespace osmium {
      * Compare two NodeRefs. NodeRefs are ordered according to the Node ID
      * they reference.
      */
-    inline constexpr bool operator>(const NodeRef& lhs, const NodeRef& rhs) noexcept {
+    constexpr bool operator>(const NodeRef& lhs, const NodeRef& rhs) noexcept {
         return rhs < lhs;
     }
 
@@ -182,7 +182,7 @@ namespace osmium {
      * Compare two NodeRefs. NodeRefs are ordered according to the Node ID
      * they reference.
      */
-    inline constexpr bool operator<=(const NodeRef& lhs, const NodeRef& rhs) noexcept {
+    constexpr bool operator<=(const NodeRef& lhs, const NodeRef& rhs) noexcept {
         return !(rhs < lhs);
     }
 
@@ -190,7 +190,7 @@ namespace osmium {
      * Compare two NodeRefs. NodeRefs are ordered according to the Node ID
      * they reference.
      */
-    inline constexpr bool operator>=(const NodeRef& lhs, const NodeRef& rhs) noexcept {
+    constexpr bool operator>=(const NodeRef& lhs, const NodeRef& rhs) noexcept {
         return !(lhs < rhs);
     }
 
diff --git a/contrib/libosmium/include/osmium/osm/node_ref_list.hpp b/contrib/libosmium/include/osmium/osm/node_ref_list.hpp
index 6d7c67b77..ba8bbe3e0 100644
--- a/contrib/libosmium/include/osmium/osm/node_ref_list.hpp
+++ b/contrib/libosmium/include/osmium/osm/node_ref_list.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/object.hpp b/contrib/libosmium/include/osmium/osm/object.hpp
index a62c7603a..38c17f244 100644
--- a/contrib/libosmium/include/osmium/osm/object.hpp
+++ b/contrib/libosmium/include/osmium/osm/object.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -69,7 +69,7 @@ namespace osmium {
         object_id_type      m_id = 0;
         bool                m_deleted : 1;
         object_version_type m_version : 31;
-        osmium::Timestamp   m_timestamp{};
+        osmium::Timestamp   m_timestamp;
         user_id_type        m_uid = 0;
         changeset_id_type   m_changeset = 0;
 
diff --git a/contrib/libosmium/include/osmium/osm/object_comparisons.hpp b/contrib/libosmium/include/osmium/osm/object_comparisons.hpp
index fe14ffd41..eff811fd0 100644
--- a/contrib/libosmium/include/osmium/osm/object_comparisons.hpp
+++ b/contrib/libosmium/include/osmium/osm/object_comparisons.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -160,9 +160,11 @@ namespace osmium {
 
         bool operator()(const osmium::OSMObject& lhs, const osmium::OSMObject& rhs) const noexcept {
             return const_tie(lhs.type(), lhs.id() > 0, lhs.positive_id(), rhs.version(),
-                        ((lhs.timestamp().valid() && rhs.timestamp().valid()) ? rhs.timestamp() : osmium::Timestamp())) <
+                        ((lhs.timestamp().valid() && rhs.timestamp().valid()) ? rhs.timestamp() : osmium::Timestamp()),
+                        rhs.visible()) <
                    const_tie(rhs.type(), rhs.id() > 0, rhs.positive_id(), lhs.version(),
-                        ((lhs.timestamp().valid() && rhs.timestamp().valid()) ? lhs.timestamp() : osmium::Timestamp()));
+                        ((lhs.timestamp().valid() && rhs.timestamp().valid()) ? lhs.timestamp() : osmium::Timestamp()),
+                        lhs.visible());
         }
 
         /// @pre lhs and rhs must not be nullptr
diff --git a/contrib/libosmium/include/osmium/osm/relation.hpp b/contrib/libosmium/include/osmium/osm/relation.hpp
index d848e6a08..c457b5fae 100644
--- a/contrib/libosmium/include/osmium/osm/relation.hpp
+++ b/contrib/libosmium/include/osmium/osm/relation.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/segment.hpp b/contrib/libosmium/include/osmium/osm/segment.hpp
index 403c24485..04598d180 100644
--- a/contrib/libosmium/include/osmium/osm/segment.hpp
+++ b/contrib/libosmium/include/osmium/osm/segment.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -75,11 +75,11 @@ namespace osmium {
     }; // class Segment
 
     /// Segments are equal if both their locations are equal
-    inline constexpr bool operator==(const Segment& lhs, const Segment& rhs) noexcept {
+    constexpr bool operator==(const Segment& lhs, const Segment& rhs) noexcept {
         return lhs.first() == rhs.first() && lhs.second() == rhs.second();
     }
 
-    inline constexpr bool operator!=(const Segment& lhs, const Segment& rhs) noexcept {
+    constexpr bool operator!=(const Segment& lhs, const Segment& rhs) noexcept {
         return !(lhs == rhs);
     }
 
diff --git a/contrib/libosmium/include/osmium/osm/tag.hpp b/contrib/libosmium/include/osmium/osm/tag.hpp
index ac2d0f0c4..e1538a9ae 100644
--- a/contrib/libosmium/include/osmium/osm/tag.hpp
+++ b/contrib/libosmium/include/osmium/osm/tag.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/timestamp.hpp b/contrib/libosmium/include/osmium/osm/timestamp.hpp
index e6cf1c458..f91747448 100644
--- a/contrib/libosmium/include/osmium/osm/timestamp.hpp
+++ b/contrib/libosmium/include/osmium/osm/timestamp.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -220,7 +220,7 @@ namespace osmium {
          * The constructor is not declared "explicit" so that conversions
          * like @code node.set_timestamp(123); @endcode work.
          */
-        template <typename T, typename std::enable_if<std::is_integral<T>::value, int>::type = 0>
+        template <typename T, typename std::enable_if_t<std::is_integral<T>::value, int> = 0>
         constexpr Timestamp(T timestamp) noexcept : // NOLINT(google-explicit-constructor, hicpp-explicit-conversions)
             m_timestamp(static_cast<uint32_t>(timestamp)) {
         }
@@ -317,7 +317,7 @@ namespace osmium {
      * A special Timestamp guaranteed to be ordered before any other valid
      * Timestamp.
      */
-    inline constexpr Timestamp start_of_time() noexcept {
+    constexpr Timestamp start_of_time() noexcept {
         return {1};
     }
 
@@ -325,7 +325,7 @@ namespace osmium {
      * A special Timestamp guaranteed to be ordered after any other valid
      * Timestamp.
      */
-    inline constexpr Timestamp end_of_time() noexcept {
+    constexpr Timestamp end_of_time() noexcept {
         return {std::numeric_limits<uint32_t>::max()};
     }
 
diff --git a/contrib/libosmium/include/osmium/osm/types.hpp b/contrib/libosmium/include/osmium/osm/types.hpp
index f206cac96..154329d7a 100644
--- a/contrib/libosmium/include/osmium/osm/types.hpp
+++ b/contrib/libosmium/include/osmium/osm/types.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/types_from_string.hpp b/contrib/libosmium/include/osmium/osm/types_from_string.hpp
index fc9c41a4e..8471a7f16 100644
--- a/contrib/libosmium/include/osmium/osm/types_from_string.hpp
+++ b/contrib/libosmium/include/osmium/osm/types_from_string.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/undirected_segment.hpp b/contrib/libosmium/include/osmium/osm/undirected_segment.hpp
index e34b5e4c6..ad68e2f0b 100644
--- a/contrib/libosmium/include/osmium/osm/undirected_segment.hpp
+++ b/contrib/libosmium/include/osmium/osm/undirected_segment.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/way.hpp b/contrib/libosmium/include/osmium/osm/way.hpp
index 54ef617e1..71f535910 100644
--- a/contrib/libosmium/include/osmium/osm/way.hpp
+++ b/contrib/libosmium/include/osmium/osm/way.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/relations/collector.hpp b/contrib/libosmium/include/osmium/relations/collector.hpp
index ac44ddab8..e61574936 100644
--- a/contrib/libosmium/include/osmium/relations/collector.hpp
+++ b/contrib/libosmium/include/osmium/relations/collector.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/relations/detail/member_meta.hpp b/contrib/libosmium/include/osmium/relations/detail/member_meta.hpp
index b1242f01e..3df887b66 100644
--- a/contrib/libosmium/include/osmium/relations/detail/member_meta.hpp
+++ b/contrib/libosmium/include/osmium/relations/detail/member_meta.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/relations/detail/relation_meta.hpp b/contrib/libosmium/include/osmium/relations/detail/relation_meta.hpp
index ed639b7cc..87678a70f 100644
--- a/contrib/libosmium/include/osmium/relations/detail/relation_meta.hpp
+++ b/contrib/libosmium/include/osmium/relations/detail/relation_meta.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/relations/manager_util.hpp b/contrib/libosmium/include/osmium/relations/manager_util.hpp
index f49fb6c83..929c97dd5 100644
--- a/contrib/libosmium/include/osmium/relations/manager_util.hpp
+++ b/contrib/libosmium/include/osmium/relations/manager_util.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/relations/members_database.hpp b/contrib/libosmium/include/osmium/relations/members_database.hpp
index 028ede7aa..36f205d12 100644
--- a/contrib/libosmium/include/osmium/relations/members_database.hpp
+++ b/contrib/libosmium/include/osmium/relations/members_database.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -135,7 +135,7 @@ namespace osmium {
                 }
             };
 
-            std::vector<element> m_elements{};
+            std::vector<element> m_elements;
 
         protected:
 
@@ -185,7 +185,7 @@ namespace osmium {
              * in the stash. Used for debugging.
              */
             std::size_t used_memory() const noexcept {
-                return sizeof(element) * m_elements.capacity() +
+                return (sizeof(element) * m_elements.capacity()) +
                        sizeof(MembersDatabaseCommon);
             }
 
diff --git a/contrib/libosmium/include/osmium/relations/relations_database.hpp b/contrib/libosmium/include/osmium/relations/relations_database.hpp
index f3492cb2e..a3b8573a8 100644
--- a/contrib/libosmium/include/osmium/relations/relations_database.hpp
+++ b/contrib/libosmium/include/osmium/relations/relations_database.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -142,7 +142,7 @@ namespace osmium {
              * Complexity: Constant.
              */
             std::size_t used_memory() const noexcept {
-                return sizeof(element) * m_elements.capacity() +
+                return (sizeof(element) * m_elements.capacity()) +
                        sizeof(RelationsDatabase);
             }
 
diff --git a/contrib/libosmium/include/osmium/relations/relations_manager.hpp b/contrib/libosmium/include/osmium/relations/relations_manager.hpp
index edd6c0b0c..1bee78cce 100644
--- a/contrib/libosmium/include/osmium/relations/relations_manager.hpp
+++ b/contrib/libosmium/include/osmium/relations/relations_manager.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -75,7 +75,7 @@ namespace osmium {
 
             // All relations and members we are interested in will be kept
             // in here.
-            osmium::ItemStash m_stash{};
+            osmium::ItemStash m_stash;
 
             /// Database of all relations we are interested in.
             relations::RelationsDatabase m_relations_db;
@@ -86,7 +86,7 @@ namespace osmium {
             relations::MembersDatabase<osmium::Relation> m_member_relations_db;
 
             /// Output buffer.
-            osmium::memory::CallbackBuffer m_output{};
+            osmium::memory::CallbackBuffer m_output;
 
         public:
 
@@ -304,7 +304,7 @@ namespace osmium {
         template <typename TManager, bool TNodes, bool TWays, bool TRelations, bool TCheckOrder = true>
         class RelationsManager : public RelationsManagerBase {
 
-            using check_order_handler = typename std::conditional<TCheckOrder, osmium::handler::CheckOrder, osmium::handler::Handler>::type;
+            using check_order_handler = std::conditional_t<TCheckOrder, osmium::handler::CheckOrder, osmium::handler::Handler>;
 
             check_order_handler m_check_order_handler;
 
diff --git a/contrib/libosmium/include/osmium/storage/item_stash.hpp b/contrib/libosmium/include/osmium/storage/item_stash.hpp
index fc1fbd0f0..e42836df9 100644
--- a/contrib/libosmium/include/osmium/storage/item_stash.hpp
+++ b/contrib/libosmium/include/osmium/storage/item_stash.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -102,7 +102,7 @@ namespace osmium {
              * be printed as a unique (for an ItemStash object) number.
              */
             template <typename TChar, typename TTraits>
-            friend inline std::basic_ostream<TChar, TTraits>& operator<<(std::basic_ostream<TChar, TTraits>& out, const ItemStash::handle_type& handle) {
+            friend inline std::basic_ostream<TChar, TTraits>& operator<<(std::basic_ostream<TChar, TTraits>& out, const ItemStash::handle_type& handle) { // NOLINT(readability-redundant-inline-specifier)
                 if (handle.valid()) {
                     out << handle.value;
                 } else {
@@ -208,7 +208,7 @@ namespace osmium {
         std::size_t used_memory() const noexcept {
             return sizeof(ItemStash) +
                    m_buffer.capacity() +
-                   m_index.capacity() * sizeof(std::size_t);
+                   (m_index.capacity() * sizeof(std::size_t));
         }
 
         /**
diff --git a/contrib/libosmium/include/osmium/tags/filter.hpp b/contrib/libosmium/include/osmium/tags/filter.hpp
index 0081f00ff..45c5e6d6b 100644
--- a/contrib/libosmium/include/osmium/tags/filter.hpp
+++ b/contrib/libosmium/include/osmium/tags/filter.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -92,7 +92,7 @@ namespace osmium {
         class Filter {
 
             using key_type   = TKey;
-            using value_type = typename std::conditional<std::is_void<TValue>::value, bool, TValue>::type;
+            using value_type = std::conditional_t<std::is_void<TValue>::value, bool, TValue>;
 
             struct Rule {
                 key_type key;
@@ -130,7 +130,7 @@ namespace osmium {
                 m_default_result(default_result) {
             }
 
-            template <typename V = TValue, typename std::enable_if<!std::is_void<V>::value, int>::type = 0>
+            template <typename V = TValue, typename std::enable_if_t<!std::is_void<V>::value, int> = 0>
             Filter& add(bool result, const key_type& key, const value_type& value) {
                 m_rules.emplace_back(result, false, key, value);
                 return *this;
diff --git a/contrib/libosmium/include/osmium/tags/matcher.hpp b/contrib/libosmium/include/osmium/tags/matcher.hpp
index 42dd47aaa..50eb110c8 100644
--- a/contrib/libosmium/include/osmium/tags/matcher.hpp
+++ b/contrib/libosmium/include/osmium/tags/matcher.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -72,8 +72,8 @@ namespace osmium {
          *
          * @param key_matcher StringMatcher for matching the key.
          */
-        template <typename TKey, typename X = typename std::enable_if<
-            std::is_convertible<TKey, osmium::StringMatcher>::value, void>::type>
+        template <typename TKey, typename X = std::enable_if_t<
+            std::is_convertible<TKey, osmium::StringMatcher>::value, void>>
         explicit TagMatcher(TKey&& key_matcher) :
             m_key_matcher(std::forward<TKey>(key_matcher)),
             m_value_matcher(osmium::StringMatcher::always_true{}) {
@@ -88,8 +88,8 @@ namespace osmium {
          * @param invert If set to true, invert the result of the value_matcher.
          */
         template <typename TKey, typename TValue,
-            typename std::enable_if<std::is_convertible<TKey, osmium::StringMatcher>::value, int>::type = 0,
-            typename std::enable_if<std::is_convertible<TValue, osmium::StringMatcher>::value, int>::type = 0>
+            typename std::enable_if_t<std::is_convertible<TKey, osmium::StringMatcher>::value, int> = 0,
+            typename std::enable_if_t<std::is_convertible<TValue, osmium::StringMatcher>::value, int> = 0>
         TagMatcher(TKey&& key_matcher, TValue&& value_matcher, bool invert = false) :
             m_key_matcher(std::forward<TKey>(key_matcher)),
             m_value_matcher(std::forward<TValue>(value_matcher)),
diff --git a/contrib/libosmium/include/osmium/tags/regex_filter.hpp b/contrib/libosmium/include/osmium/tags/regex_filter.hpp
index 271212527..f741c31b3 100644
--- a/contrib/libosmium/include/osmium/tags/regex_filter.hpp
+++ b/contrib/libosmium/include/osmium/tags/regex_filter.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/tags/taglist.hpp b/contrib/libosmium/include/osmium/tags/taglist.hpp
index 7f2b433ba..d5ec309a3 100644
--- a/contrib/libosmium/include/osmium/tags/taglist.hpp
+++ b/contrib/libosmium/include/osmium/tags/taglist.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/tags/tags_filter.hpp b/contrib/libosmium/include/osmium/tags/tags_filter.hpp
index 81638dd19..61d20e20c 100644
--- a/contrib/libosmium/include/osmium/tags/tags_filter.hpp
+++ b/contrib/libosmium/include/osmium/tags/tags_filter.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/thread/function_wrapper.hpp b/contrib/libosmium/include/osmium/thread/function_wrapper.hpp
index a633c1f02..d0ec3509d 100644
--- a/contrib/libosmium/include/osmium/thread/function_wrapper.hpp
+++ b/contrib/libosmium/include/osmium/thread/function_wrapper.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -87,8 +87,8 @@ namespace osmium {
 
             // Constructor must not be "explicit" for wrapper
             // to work seemlessly.
-            template <typename TFunction, typename X = typename std::enable_if<
-                !std::is_same<TFunction, function_wrapper>::value, void>::type>
+            template <typename TFunction, typename X = std::enable_if_t<
+                !std::is_same<TFunction, function_wrapper>::value, void>>
             // cppcheck-suppress noExplicitConstructor
             function_wrapper(TFunction&& f) : // NOLINT(google-explicit-constructor, hicpp-explicit-conversions)
                 impl(new impl_type<TFunction>(std::forward<TFunction>(f))) {
diff --git a/contrib/libosmium/include/osmium/thread/pool.hpp b/contrib/libosmium/include/osmium/thread/pool.hpp
index 889113289..059f761d3 100644
--- a/contrib/libosmium/include/osmium/thread/pool.hpp
+++ b/contrib/libosmium/include/osmium/thread/pool.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -120,7 +120,7 @@ namespace osmium {
             }; // class thread_joiner
 
             osmium::thread::Queue<function_wrapper> m_work_queue;
-            std::vector<std::thread> m_threads{};
+            std::vector<std::thread> m_threads;
             thread_joiner m_joiner;
             int m_num_threads;
 
@@ -225,7 +225,7 @@ namespace osmium {
 #else
             // For C++11 and C++14
             template <typename TFunction>
-            using submit_func_result_type = typename std::result_of<TFunction()>::type;
+            using submit_func_result_type = std::result_of_t<TFunction()>;
 #endif
 
             template <typename TFunction>
diff --git a/contrib/libosmium/include/osmium/thread/queue.hpp b/contrib/libosmium/include/osmium/thread/queue.hpp
index ad7f3d2e8..950b60227 100644
--- a/contrib/libosmium/include/osmium/thread/queue.hpp
+++ b/contrib/libosmium/include/osmium/thread/queue.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/thread/util.hpp b/contrib/libosmium/include/osmium/thread/util.hpp
index b5a2ef10d..0817d93e1 100644
--- a/contrib/libosmium/include/osmium/thread/util.hpp
+++ b/contrib/libosmium/include/osmium/thread/util.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/compatibility.hpp b/contrib/libosmium/include/osmium/util/compatibility.hpp
index c37ef586d..1b6ac56d1 100644
--- a/contrib/libosmium/include/osmium/util/compatibility.hpp
+++ b/contrib/libosmium/include/osmium/util/compatibility.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -33,15 +33,6 @@ DEALINGS IN THE SOFTWARE.
 
 */
 
-// [[deprecated]] is only available in C++14, use this for the time being
-#ifdef __GNUC__
-# define OSMIUM_DEPRECATED __attribute__((deprecated))
-#elif defined(_MSC_VER)
-# define OSMIUM_DEPRECATED __declspec(deprecated)
-#else
-# define OSMIUM_DEPRECATED
-#endif
-
 // Set OSMIUM_DEFINE_EXPORT before including any osmium headers to add
 // the special attributes to all exception classes.
 #ifdef OSMIUM_DEFINE_EXPORT
diff --git a/contrib/libosmium/include/osmium/util/config.hpp b/contrib/libosmium/include/osmium/util/config.hpp
index 44719f783..eaa887848 100644
--- a/contrib/libosmium/include/osmium/util/config.hpp
+++ b/contrib/libosmium/include/osmium/util/config.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/delta.hpp b/contrib/libosmium/include/osmium/util/delta.hpp
index d5df1e270..6033e6474 100644
--- a/contrib/libosmium/include/osmium/util/delta.hpp
+++ b/contrib/libosmium/include/osmium/util/delta.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/double.hpp b/contrib/libosmium/include/osmium/util/double.hpp
index 4275f1502..4e8dfb90b 100644
--- a/contrib/libosmium/include/osmium/util/double.hpp
+++ b/contrib/libosmium/include/osmium/util/double.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/endian.hpp b/contrib/libosmium/include/osmium/util/endian.hpp
index a6e191f4f..17be6a2ff 100644
--- a/contrib/libosmium/include/osmium/util/endian.hpp
+++ b/contrib/libosmium/include/osmium/util/endian.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/file.hpp b/contrib/libosmium/include/osmium/util/file.hpp
index 23c53db8a..1d7737e0c 100644
--- a/contrib/libosmium/include/osmium/util/file.hpp
+++ b/contrib/libosmium/include/osmium/util/file.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -222,6 +222,22 @@ namespace osmium {
             return static_cast<std::size_t>(offset);
         }
 
+        /**
+         * Set current offset into file.
+         *
+         * @param fd Open file descriptor.
+         * @param offset Desired absolute offset into the file
+         */
+        inline void file_seek(int fd, std::size_t offset) noexcept {
+#ifdef _MSC_VER
+            osmium::detail::disable_invalid_parameter_handler diph;
+            // https://msdn.microsoft.com/en-us/library/1yee101t.aspx
+            _lseeki64(fd, static_cast<__int64>(offset), SEEK_SET);
+#else
+            ::lseek(fd, static_cast<off_t>(offset), SEEK_SET);
+#endif
+        }
+
         /**
          * Check whether the file descriptor refers to a TTY.
          *
diff --git a/contrib/libosmium/include/osmium/util/iterator.hpp b/contrib/libosmium/include/osmium/util/iterator.hpp
index 9ee99a5ce..8fcb497e3 100644
--- a/contrib/libosmium/include/osmium/util/iterator.hpp
+++ b/contrib/libosmium/include/osmium/util/iterator.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/memory.hpp b/contrib/libosmium/include/osmium/util/memory.hpp
index 9e8996787..7ccb388c5 100644
--- a/contrib/libosmium/include/osmium/util/memory.hpp
+++ b/contrib/libosmium/include/osmium/util/memory.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/memory_mapping.hpp b/contrib/libosmium/include/osmium/util/memory_mapping.hpp
index f7059147b..38ca38ed7 100644
--- a/contrib/libosmium/include/osmium/util/memory_mapping.hpp
+++ b/contrib/libosmium/include/osmium/util/memory_mapping.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -228,7 +228,7 @@ namespace osmium {
             ~MemoryMapping() noexcept {
                 try {
                     unmap();
-                } catch (const std::system_error&) {
+                } catch (const std::system_error&) { // NOLINT(bugprone-empty-catch)
                     // Ignore any exceptions because destructor must not throw.
                 }
             }
@@ -591,7 +591,7 @@ inline osmium::util::MemoryMapping::MemoryMapping(MemoryMapping&& other) noexcep
 inline osmium::util::MemoryMapping& osmium::util::MemoryMapping::operator=(osmium::util::MemoryMapping&& other) noexcept {
     try {
         unmap();
-    } catch (const std::system_error&) {
+    } catch (const std::system_error&) { // NOLINT(bugprone-empty-catch)
         // Ignore unmap error. It should never happen anyway and we can't do
         // anything about it here.
     }
@@ -761,7 +761,7 @@ inline osmium::util::MemoryMapping::MemoryMapping(MemoryMapping&& other) noexcep
 inline osmium::util::MemoryMapping& osmium::util::MemoryMapping::operator=(osmium::util::MemoryMapping&& other) noexcept {
     try {
         unmap();
-    } catch (const std::system_error&) {
+    } catch (const std::system_error&) { // NOLINT(bugprone-empty-catch)
         // Ignore unmap error. It should never happen anyway and we can't do
         // anything about it here.
     }
diff --git a/contrib/libosmium/include/osmium/util/minmax.hpp b/contrib/libosmium/include/osmium/util/minmax.hpp
index a73e95afa..1f0931d4d 100644
--- a/contrib/libosmium/include/osmium/util/minmax.hpp
+++ b/contrib/libosmium/include/osmium/util/minmax.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/misc.hpp b/contrib/libosmium/include/osmium/util/misc.hpp
index 2088df237..824e57131 100644
--- a/contrib/libosmium/include/osmium/util/misc.hpp
+++ b/contrib/libosmium/include/osmium/util/misc.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -69,7 +69,7 @@ namespace osmium {
         template <typename TReturn>
         inline TReturn str_to_int(const char* str) {
             static_assert(std::is_integral<TReturn>::value, "Must be integral type");
-            using r_type = typename std::conditional<std::is_unsigned<TReturn>::value, unsigned long long, long long>::type; // NOLINT(google-runtime-int)
+            using r_type = std::conditional_t<std::is_unsigned<TReturn>::value, unsigned long long, long long>; // NOLINT(google-runtime-int)
             assert(str);
             char* end = nullptr;
             const auto value = std::strtoll(str, &end, 10);
diff --git a/contrib/libosmium/include/osmium/util/options.hpp b/contrib/libosmium/include/osmium/util/options.hpp
index 23bd38c78..a31d9084a 100644
--- a/contrib/libosmium/include/osmium/util/options.hpp
+++ b/contrib/libosmium/include/osmium/util/options.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/progress_bar.hpp b/contrib/libosmium/include/osmium/util/progress_bar.hpp
index 85aeefe54..13a6f0c36 100644
--- a/contrib/libosmium/include/osmium/util/progress_bar.hpp
+++ b/contrib/libosmium/include/osmium/util/progress_bar.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/string.hpp b/contrib/libosmium/include/osmium/util/string.hpp
index 7ca579fa2..2a1557e83 100644
--- a/contrib/libosmium/include/osmium/util/string.hpp
+++ b/contrib/libosmium/include/osmium/util/string.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/string_matcher.hpp b/contrib/libosmium/include/osmium/util/string_matcher.hpp
index 814c022dd..7a87cba0c 100644
--- a/contrib/libosmium/include/osmium/util/string_matcher.hpp
+++ b/contrib/libosmium/include/osmium/util/string_matcher.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -419,8 +419,8 @@ namespace osmium {
          *                  equal, prefix, substring, regex or list.
          */
         // cppcheck-suppress noExplicitConstructor
-        template <typename TMatcher, typename X = typename std::enable_if<
-            std::is_base_of<matcher, TMatcher>::value, void>::type>
+        template <typename TMatcher, typename X = std::enable_if_t<
+            std::is_base_of<matcher, TMatcher>::value, void>>
         StringMatcher(TMatcher&& matcher) : // NOLINT(google-explicit-constructor, hicpp-explicit-conversions)
             m_matcher(std::forward<TMatcher>(matcher)) {
         }
diff --git a/contrib/libosmium/include/osmium/util/timer.hpp b/contrib/libosmium/include/osmium/util/timer.hpp
index 58ea1deb3..312c34536 100644
--- a/contrib/libosmium/include/osmium/util/timer.hpp
+++ b/contrib/libosmium/include/osmium/util/timer.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/verbose_output.hpp b/contrib/libosmium/include/osmium/util/verbose_output.hpp
index 680271cd7..cfc774307 100644
--- a/contrib/libosmium/include/osmium/util/verbose_output.hpp
+++ b/contrib/libosmium/include/osmium/util/verbose_output.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/version.hpp b/contrib/libosmium/include/osmium/version.hpp
index 1ecfc3c7f..55d4ac103 100644
--- a/contrib/libosmium/include/osmium/version.hpp
+++ b/contrib/libosmium/include/osmium/version.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -37,11 +37,11 @@ DEALINGS IN THE SOFTWARE.
 #define LIBOSMIUM_VERSION_MAJOR 2
 
 // NOLINTNEXTLINE(modernize-macro-to-enum)
-#define LIBOSMIUM_VERSION_MINOR 20
+#define LIBOSMIUM_VERSION_MINOR 21
 
 // NOLINTNEXTLINE(modernize-macro-to-enum)
 #define LIBOSMIUM_VERSION_PATCH 0
 
-#define LIBOSMIUM_VERSION_STRING "2.20.0"
+#define LIBOSMIUM_VERSION_STRING "2.21.0"
 
 #endif // OSMIUM_VERSION_HPP
diff --git a/contrib/libosmium/include/osmium/visitor.hpp b/contrib/libosmium/include/osmium/visitor.hpp
index c53eaf23c..9b0320c96 100644
--- a/contrib/libosmium/include/osmium/visitor.hpp
+++ b/contrib/libosmium/include/osmium/visitor.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -49,7 +49,7 @@ namespace osmium {
     namespace detail {
 
         template <typename T, typename U>
-        using ConstIfConst = typename std::conditional<std::is_const<T>::value, typename std::add_const<U>::type, U>::type;
+        using ConstIfConst = std::conditional_t<std::is_const<T>::value, std::add_const_t<U>, U>;
 
         template <typename THandler, typename TItem>
         inline void apply_item_impl(TItem& item, THandler&& handler) {
@@ -286,18 +286,18 @@ namespace osmium {
 
         // Is the class T derived from osmium::handler::Handler?
         template <typename T>
-        using is_handler = std::is_base_of<osmium::handler::Handler, typename std::remove_reference<T>::type>;
+        using is_handler = std::is_base_of<osmium::handler::Handler, std::remove_reference_t<T>>;
 
         // This is already a handler, use it as it is.
-        template <typename T, typename = typename std::enable_if<is_handler<T>::value>::type>
+        template <typename T, typename = std::enable_if_t<is_handler<T>::value>>
         T make_handler(T&& func) {
             return std::forward<T>(func);
         }
 
         // This is not a handler, but a functor. Wrap a handler around it.
-        template <typename T, typename = typename std::enable_if<!is_handler<T>::value>::type>
-        wrapper_handler<typename std::decay<T>::type> make_handler(T&& func) {
-            return wrapper_handler<typename std::decay<T>::type>(std::forward<T>(func));
+        template <typename T, typename = std::enable_if_t<!is_handler<T>::value>>
+        wrapper_handler<std::decay_t<T>> make_handler(T&& func) {
+            return wrapper_handler<std::decay_t<T>>(std::forward<T>(func));
         }
 
     } // namespace detail

From 8d1a55e5e6dd9fe5465fee78c87d41bda4ce8446 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 28 Jan 2025 17:59:11 +0100
Subject: [PATCH 248/430] Fix problem in slim mode with two-state processing of
 nodes

In two-stage processing when getting nodes from the middle we are
running the same SQL query as when getting the node locations. But that
doesn't work. We need more information, the tags (and possibly the
attributes). This fixes this by running a different prepared query in
this case.

Fixes #2298
---
 src/middle-pgsql.cpp                 |  18 ++-
 tests/bdd/flex/node-add.feature      | 164 +++++++++++++++++++++++++++
 tests/data/test_output_flex_node.lua |  86 ++++++++++++++
 3 files changed, 264 insertions(+), 4 deletions(-)
 create mode 100644 tests/bdd/flex/node-add.feature
 create mode 100644 tests/data/test_output_flex_node.lua

diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index 2e0eb995b..c0fd0c36f 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -522,7 +522,7 @@ std::size_t middle_query_pgsql_t::get_way_node_locations_flatnodes(
 
 osmium::Location middle_query_pgsql_t::get_node_location_db(osmid_t id) const
 {
-    auto const res = m_db_connection.exec_prepared("get_node", id);
+    auto const res = m_db_connection.exec_prepared("get_node_location", id);
     if (res.num_tuples() == 0) {
         return osmium::Location{};
     }
@@ -729,11 +729,14 @@ void build_node(osmid_t id, pg_result_t const &res, int res_num, int offset,
 {
     osmium::builder::NodeBuilder builder{*buffer};
     builder.set_id(id);
+    builder.set_location(osmium::Location{
+        (int)std::strtol(res.get_value(res_num, offset + 0), nullptr, 10),
+        (int)std::strtol(res.get_value(res_num, offset + 1), nullptr, 10)});
 
     if (with_attributes) {
-        set_attributes_on_builder(&builder, res, res_num, offset);
+        set_attributes_on_builder(&builder, res, res_num, offset + 3);
     }
-    pgsql_parse_json_tags(res.get_value(res_num, offset + 1), buffer, &builder);
+    pgsql_parse_json_tags(res.get_value(res_num, offset + 2), buffer, &builder);
 }
 
 /**
@@ -1261,7 +1264,7 @@ middle_pgsql_t::get_query_instance()
         m_store_options);
 
     if (m_store_options.nodes) {
-        mid->prepare("get_node",
+        mid->prepare("get_node_location",
                      render_template(
                          "SELECT id, lon, lat FROM {schema}\"{prefix}_nodes\""
                          " WHERE id = $1::int8"));
@@ -1270,6 +1273,13 @@ middle_pgsql_t::get_query_instance()
                      render_template(
                          "SELECT id, lon, lat FROM {schema}\"{prefix}_nodes\""
                          " WHERE id = ANY($1::int8[])"));
+
+        mid->prepare(
+            "get_node",
+            render_template("SELECT lon, lat, tags{attribute_columns_use}"
+                            " FROM {schema}\"{prefix}_nodes\" o"
+                            " {users_table_access}"
+                            " WHERE o.id = $1::int8"));
     }
 
     mid->prepare("get_way",
diff --git a/tests/bdd/flex/node-add.feature b/tests/bdd/flex/node-add.feature
new file mode 100644
index 000000000..178ba81b1
--- /dev/null
+++ b/tests/bdd/flex/node-add.feature
@@ -0,0 +1,164 @@
+Feature: Adding nodes to a flex database
+
+    Background:
+        Given the style file 'test_output_flex_node.lua'
+
+        And the OSM data
+            """
+            n11 v1 dV Tt1=yes x1 y1
+            n12 v1 dV Tt2=yes x2 y2
+            n13 v1 dV Ttboth=yes x3 y3
+            n14 v1 dV Ttboth=yes x4 y4
+            r30 v1 dV Tt=ag Mn11@,n12@mark,n13@,n14@mark
+            """
+        When running osm2pgsql flex with parameters
+            | --slim |
+
+        Then table osm2pgsql_test_t1 contains exactly
+            | node_id |
+            | 11     |
+        Then table osm2pgsql_test_t2 contains exactly
+            | node_id |
+            | 12     |
+        Then table osm2pgsql_test_tboth contains exactly
+            | node_id |
+            | 13     |
+            | 14     |
+
+
+    Scenario: node is not relevant
+        Given an empty grid
+        And the OSM data
+            """
+            n10 v1 dV Tt=ag x0 y0
+            r30 v2 dV Tt=ag Mn10@,n11@,n12@mark,n13@,n14@mark
+            """
+        When running osm2pgsql flex with parameters
+            | --slim | -a |
+
+        Then table osm2pgsql_test_t1 contains exactly
+            | node_id |
+            | 11     |
+        Then table osm2pgsql_test_t2 contains exactly
+            | node_id |
+            | 12     |
+        Then table osm2pgsql_test_tboth contains exactly
+            | node_id |
+            | 13     |
+            | 14     |
+
+
+    Scenario: add to t1
+        Given an empty grid
+        And the OSM data
+            """
+            n10 v1 dV Tt1=yes x0 y0
+            r30 v2 dV Tt=ag Mn10@,n11@,n12@mark,n13@,n14@mark
+            """
+        When running osm2pgsql flex with parameters
+            | --slim | -a |
+
+        Then table osm2pgsql_test_t1 contains exactly
+            | node_id |
+            | 10     |
+            | 11     |
+        Then table osm2pgsql_test_t2 contains exactly
+            | node_id |
+            | 12     |
+        Then table osm2pgsql_test_tboth contains exactly
+            | node_id |
+            | 13     |
+            | 14     |
+
+
+    Scenario: add to t2
+        Given an empty grid
+        And the OSM data
+            """
+            n10 v1 dV Tt2=yes x0 y0
+            r30 v2 dV Tt=ag Mn10@mark,n11@,n12@mark,n13@,n14@mark
+            """
+        When running osm2pgsql flex with parameters
+            | --slim | -a |
+
+        Then table osm2pgsql_test_t1 contains exactly
+            | node_id |
+            | 11     |
+        Then table osm2pgsql_test_t2 contains exactly
+            | node_id | rel_ids |
+            | 10     | {30}    |
+            | 12     | {30}    |
+        Then table osm2pgsql_test_tboth contains exactly
+            | node_id |
+            | 13     |
+            | 14     |
+
+
+    Scenario: add to t1 and t2
+        Given an empty grid
+        And the OSM data
+            """
+            n10 v1 dV Tt1=yes,t2=yes x0 y0
+            r30 v2 dV Tt=ag Mn10@mark,n11@,n12@mark,n13@,n14@mark
+            """
+        When running osm2pgsql flex with parameters
+            | --slim | -a |
+
+        Then table osm2pgsql_test_t1 contains exactly
+            | node_id |
+            | 10     |
+            | 11     |
+        Then table osm2pgsql_test_t2 contains exactly
+            | node_id | rel_ids |
+            | 10     | {30}    |
+            | 12     | {30}    |
+        Then table osm2pgsql_test_tboth contains exactly
+            | node_id |
+            | 13     |
+            | 14     |
+
+
+    Scenario: add to tboth (only stage1)
+        Given an empty grid
+        And the OSM data
+            """
+            n10 v1 dV Ttboth=yes x0 y0
+            r30 v2 dV Tt=ag Mn10@,n11@,n12@mark,n13@,n14@mark
+            """
+        When running osm2pgsql flex with parameters
+            | --slim | -a |
+
+        Then table osm2pgsql_test_t1 contains exactly
+            | node_id |
+            | 11     |
+        Then table osm2pgsql_test_t2 contains exactly
+            | node_id |
+            | 12     |
+        Then table osm2pgsql_test_tboth contains exactly
+            | node_id | rel_ids |
+            | 10     | NULL    |
+            | 13     | NULL    |
+            | 14     | {30}    |
+
+
+    Scenario: add to tboth (stage1 and stage2)
+        Given an empty grid
+        And the OSM data
+            """
+            n10 v1 dV Ttboth=yes x0 y0
+            r30 v2 dV Tt=ag Mn10@mark,n11@,n12@mark,n13@,n14@mark
+            """
+        When running osm2pgsql flex with parameters
+            | --slim | -a |
+
+        Then table osm2pgsql_test_t1 contains exactly
+            | node_id |
+            | 11     |
+        Then table osm2pgsql_test_t2 contains exactly
+            | node_id |
+            | 12     |
+        Then table osm2pgsql_test_tboth contains exactly
+            | node_id | rel_ids |
+            | 10     | {30}    |
+            | 13     | NULL    |
+            | 14     | {30}    |
diff --git a/tests/data/test_output_flex_node.lua b/tests/data/test_output_flex_node.lua
new file mode 100644
index 000000000..bf5cc3a57
--- /dev/null
+++ b/tests/data/test_output_flex_node.lua
@@ -0,0 +1,86 @@
+
+local tables = {}
+
+tables.t1 = osm2pgsql.define_node_table('osm2pgsql_test_t1', {
+    { column = 'tags', type = 'hstore' },
+    { column = 'geom', type = 'point', not_null = true },
+})
+
+tables.t2 = osm2pgsql.define_node_table('osm2pgsql_test_t2', {
+    { column = 'tags', type = 'hstore' },
+    { column = 'rel_ids', type = 'text' },
+    { column = 'geom', type = 'point', not_null = true },
+})
+
+tables.tboth = osm2pgsql.define_node_table('osm2pgsql_test_tboth', {
+    { column = 'tags', type = 'hstore' },
+    { column = 'rel_ids', type = 'text' },
+    { column = 'geom', type = 'point', not_null = true },
+})
+
+local n2r = {}
+
+local function get_ids(data)
+    if data then
+        local ids = {}
+        for rel_id, _ in pairs(data) do
+            ids[#ids + 1] = rel_id
+        end
+        table.sort(ids)
+        return '{' .. table.concat(ids, ',') .. '}'
+    end
+end
+
+function osm2pgsql.process_node(object)
+    if object.tags.t1 then
+        tables.t1:insert{
+            tags = object.tags,
+            geom = object:as_point()
+        }
+    end
+
+    if osm2pgsql.stage == 2 and object.tags.t2 then
+        local ids = get_ids(n2r[object.id])
+        if ids then
+            tables.t2:insert{
+                rel_ids = ids,
+                geom = object:as_point()
+            }
+        end
+    end
+
+    if object.tags.tboth then
+        local ids = get_ids(n2r[object.id])
+        tables.tboth:insert{
+            tags = object.tags,
+            rel_ids = ids,
+            geom = object:as_point()
+        }
+    end
+end
+
+local function node_member_ids(relation)
+    local ids = {}
+    for _, member in ipairs(relation.members) do
+        if member.type == 'n' and member.role == 'mark' then
+            ids[#ids + 1] = member.ref
+        end
+    end
+    return ids
+end
+
+function osm2pgsql.select_relation_members(relation)
+    return { nodes = node_member_ids(relation) }
+end
+
+function osm2pgsql.process_relation(object)
+    for _, member in ipairs(object.members) do
+        if member.type == 'n' and member.role == 'mark' then
+            if not n2r[member.ref] then
+                n2r[member.ref] = {}
+            end
+            n2r[member.ref][object.id] = true
+        end
+    end
+end
+

From c90e1a3cc3dc351cfbba22507e2b294a4b7ace8b Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 12 Feb 2025 10:15:36 +0100
Subject: [PATCH 249/430] CI: move to newer ubuntu versions

Ubuntu20 is being retired, so move everything one release forward.
Requires to test on newer versions of Postgresql/Postgis and
compilers.
---
 .github/workflows/ci.yml           | 165 +++++++++++++----------------
 .github/workflows/test-install.yml |   4 +-
 2 files changed, 74 insertions(+), 95 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2deae7e40..9cd9ffd27 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,17 +4,16 @@ on: [ push, pull_request ]
 
 jobs:
 
-  ubuntu20-pg96-gcc10-jit:
-    runs-on: ubuntu-20.04
+  ubuntu22-pg11-gcc10-jit:
+    runs-on: ubuntu-22.04
 
     env:
       CC: gcc-10
       CXX: g++-10
-      EXTRA_FLAGS: -Wno-unused-but-set-parameter # workaround for GCC bug
       LUA_VERSION: 5.3
       LUAJIT_OPTION: ON
-      POSTGRESQL_VERSION: 9.6
-      POSTGIS_VERSION: 2.5
+      POSTGRESQL_VERSION: 11
+      POSTGIS_VERSION: 3
       BUILD_TYPE: Release
       PSYCOPG: 2
 
@@ -24,16 +23,16 @@ jobs:
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
-  ubuntu20-pg96-clang10-jit:
-    runs-on: ubuntu-20.04
+  ubuntu22-pg11-clang13-jit:
+    runs-on: ubuntu-22.04
 
     env:
-      CC: clang-10
-      CXX: clang++-10
+      CC: clang-13
+      CXX: clang++-13
       LUA_VERSION: 5.3
       LUAJIT_OPTION: ON
-      POSTGRESQL_VERSION: 9.6
-      POSTGIS_VERSION: 2.5
+      POSTGRESQL_VERSION: 11
+      POSTGIS_VERSION: 3
       BUILD_TYPE: Release
       PSYCOPG: 2
 
@@ -43,16 +42,15 @@ jobs:
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
-  ubuntu20-pg10-gcc10:
-    runs-on: ubuntu-20.04
+  ubuntu22-pg11-gcc10:
+    runs-on: ubuntu-22.04
 
     env:
       CC: gcc-10
       CXX: g++-10
-      EXTRA_FLAGS: -Wno-unused-but-set-parameter # workaround for GCC bug
       LUA_VERSION: 5.3
       LUAJIT_OPTION: OFF
-      POSTGRESQL_VERSION: 10
+      POSTGRESQL_VERSION: 11
       POSTGIS_VERSION: 3
       BUILD_TYPE: Debug
       PSYCOPG: 2
@@ -64,16 +62,16 @@ jobs:
       - uses: ./.github/actions/build-and-test
 
 
-  ubuntu20-pg11-clang10:
-    runs-on: ubuntu-20.04
+  ubuntu22-pg11-clang13:
+    runs-on: ubuntu-22.04
 
     env:
-      CC: clang-10
-      CXX: clang++-10
+      CC: clang-13
+      CXX: clang++-13
       LUA_VERSION: 5.3
       LUAJIT_OPTION: OFF
       POSTGRESQL_VERSION: 11
-      POSTGIS_VERSION: 2.5
+      POSTGIS_VERSION: 3
       BUILD_TYPE: Debug
       PSYCOPG: 2
 
@@ -83,16 +81,16 @@ jobs:
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
-  ubuntu20-pg13-gcc10-jit:
-    runs-on: ubuntu-20.04
+  ubuntu22-pg13-gcc11-jit:
+    runs-on: ubuntu-22.04
 
     env:
-      CC: gcc-10
-      CXX: g++-10
+      CC: gcc-11
+      CXX: g++-11
       LUA_VERSION: 5.3
       LUAJIT_OPTION: ON
       POSTGRESQL_VERSION: 13
-      POSTGIS_VERSION: 2.5
+      POSTGIS_VERSION: 3
       BUILD_TYPE: Debug
       PSYCOPG: 2
 
@@ -103,15 +101,15 @@ jobs:
       - uses: ./.github/actions/build-and-test
 
 
-  ubuntu20-pg15-clang10-jit:
-    runs-on: ubuntu-20.04
+  ubuntu22-pg12-clang14-jit:
+    runs-on: ubuntu-22.04
 
     env:
-      CC: clang-10
-      CXX: clang++-10
+      CC: clang-14
+      CXX: clang++-14
       LUA_VERSION: 5.3
       LUAJIT_OPTION: ON
-      POSTGRESQL_VERSION: 15
+      POSTGRESQL_VERSION: 12
       POSTGIS_VERSION: 3
       BUILD_TYPE: Debug
       PSYCOPG: 2
@@ -122,15 +120,15 @@ jobs:
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
-  ubuntu20-pg15-clang10-noproj:
-    runs-on: ubuntu-20.04
+  ubuntu22-pg12-clang15-noproj:
+    runs-on: ubuntu-22.04
 
     env:
-      CC: clang-10
-      CXX: clang++-10
+      CC: clang-15
+      CXX: clang++-15
       LUA_VERSION: 5.3
       LUAJIT_OPTION: OFF
-      POSTGRESQL_VERSION: 15
+      POSTGRESQL_VERSION: 12
       POSTGIS_VERSION: 3
       WITH_PROJ: OFF
       BUILD_TYPE: Debug
@@ -142,12 +140,12 @@ jobs:
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
-  ubuntu20-pg16-clang10:
-    runs-on: ubuntu-20.04
+  ubuntu22-pg16-clang15:
+    runs-on: ubuntu-22.04
 
     env:
-      CC: clang-10
-      CXX: clang++-10
+      CC: clang-15
+      CXX: clang++-15
       LUA_VERSION: 5.3
       LUAJIT_OPTION: OFF
       POSTGRESQL_VERSION: 16
@@ -161,16 +159,17 @@ jobs:
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
-  ubuntu20-pg13-gcc10-release:
-    runs-on: ubuntu-20.04
+  ubuntu22-pg13-gcc12-release:
+    runs-on: ubuntu-22.04
 
     env:
-      CC: gcc-10
-      CXX: g++-10
+      CC: gcc-12
+      CXX: g++-12
+      EXTRA_FLAGS: -Wno-stringop-overread
       LUA_VERSION: 5.3
       LUAJIT_OPTION: ON
       POSTGRESQL_VERSION: 13
-      POSTGIS_VERSION: 2.5
+      POSTGIS_VERSION: 3
       BUILD_TYPE: Release
       PSYCOPG: 2
 
@@ -180,15 +179,15 @@ jobs:
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
-  ubuntu22-pg16-clang14-jit:
-    runs-on: ubuntu-22.04
+  ubuntu24-pg14-clang16-jit:
+    runs-on: ubuntu-24.04
 
     env:
-      CC: clang-14
-      CXX: clang++-14
+      CC: clang-16
+      CXX: clang++-16
       LUA_VERSION: 5.4
       LUAJIT_OPTION: ON
-      POSTGRESQL_VERSION: 16
+      POSTGRESQL_VERSION: 14
       POSTGIS_VERSION: 3
       BUILD_TYPE: Debug
       PSYCOPG: 2
@@ -199,15 +198,15 @@ jobs:
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
-  ubuntu22-pg16-clang14-proj:
-    runs-on: ubuntu-22.04
+  ubuntu24-pg14-clang17-proj:
+    runs-on: ubuntu-24.04
 
     env:
-      CC: clang-14
-      CXX: clang++-14
+      CC: clang-17
+      CXX: clang++-17
       LUA_VERSION: 5.4
       LUAJIT_OPTION: OFF
-      POSTGRESQL_VERSION: 16
+      POSTGRESQL_VERSION: 14
       POSTGIS_VERSION: 3
       BUILD_TYPE: Debug
       PSYCOPG: 2
@@ -218,15 +217,15 @@ jobs:
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
-  ubuntu22-pg16-clang14-noproj:
-    runs-on: ubuntu-22.04
+  ubuntu24-pg15-clang17-noproj:
+    runs-on: ubuntu-24.04
 
     env:
-      CC: clang-14
-      CXX: clang++-14
+      CC: clang-17
+      CXX: clang++-17
       LUA_VERSION: 5.3
       LUAJIT_OPTION: OFF
-      POSTGRESQL_VERSION: 16
+      POSTGRESQL_VERSION: 15
       POSTGIS_VERSION: 3
       WITH_PROJ: OFF
       BUILD_TYPE: Debug
@@ -238,12 +237,12 @@ jobs:
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
-  ubuntu22-pg15-clang14:
-    runs-on: ubuntu-22.04
+  ubuntu24-pg15-clang18:
+    runs-on: ubuntu-24.04
 
     env:
-      CC: clang-14
-      CXX: clang++-14
+      CC: clang-18
+      CXX: clang++-18
       LUA_VERSION: 5.4
       LUAJIT_OPTION: OFF
       POSTGRESQL_VERSION: 15
@@ -257,8 +256,8 @@ jobs:
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
-  ubuntu22-pg16-gcc12-release:
-    runs-on: ubuntu-22.04
+  ubuntu24-pg16-gcc12-release:
+    runs-on: ubuntu-24.04
 
     env:
       CC: gcc-12
@@ -277,15 +276,15 @@ jobs:
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
-  ubuntu22-pg16-clang15-cpp20:
-    runs-on: ubuntu-22.04
+  ubuntu24-pg17-clang16-cpp20:
+    runs-on: ubuntu-24.04
 
     env:
-      CC: clang-15
-      CXX: clang++-15
+      CC: clang-16
+      CXX: clang++-16
       LUA_VERSION: 5.3
       LUAJIT_OPTION: OFF
-      POSTGRESQL_VERSION: 16
+      POSTGRESQL_VERSION: 17
       POSTGIS_VERSION: 3
       CPP_VERSION: 20
       BUILD_TYPE: Debug
@@ -297,15 +296,15 @@ jobs:
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
-  ubuntu22-pg16-gcc12-cpp20:
-    runs-on: ubuntu-22.04
+  ubuntu24-pg17-gcc12-cpp20:
+    runs-on: ubuntu-24.04
 
     env:
       CC: gcc-12
       CXX: g++-12
       LUA_VERSION: 5.3
       LUAJIT_OPTION: OFF
-      POSTGRESQL_VERSION: 16
+      POSTGRESQL_VERSION: 17
       POSTGIS_VERSION: 3
       CPP_VERSION: 20
       BUILD_TYPE: Debug
@@ -317,26 +316,6 @@ jobs:
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
-  ubuntu24-pg16-gcc14:
-    runs-on: ubuntu-24.04
-
-    env:
-      CC: gcc-14
-      CXX: g++-14
-      LUA_VERSION: 5.4
-      LUAJIT_OPTION: OFF
-      POSTGRESQL_VERSION: 16
-      POSTGIS_VERSION: 3
-      BUILD_TYPE: Debug
-      PSYCOPG: 3
-      PIP_OPTION: --break-system-packages
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/ubuntu-prerequisites
-      - uses: ./.github/actions/linux-cmake
-      - uses: ./.github/actions/build-and-test
-
   windows:
     strategy:
       fail-fast: false
diff --git a/.github/workflows/test-install.yml b/.github/workflows/test-install.yml
index 81eeb3a36..1581280d1 100644
--- a/.github/workflows/test-install.yml
+++ b/.github/workflows/test-install.yml
@@ -4,7 +4,7 @@ on: [ push, pull_request ]
 
 jobs:
   ubuntu-test-install:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     strategy:
       matrix:
@@ -19,7 +19,7 @@ jobs:
 
     env:
       LUA_VERSION: 5.3
-      POSTGRESQL_VERSION: 14
+      POSTGRESQL_VERSION: 16
       POSTGIS_VERSION: 3
       BUILD_TYPE: Release
       CXXFLAGS: -pedantic -Wextra -Wno-stringop-overread -Werror

From 4be07f6d2add90d966df3480525ed8ee9c14d2f2 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 12 Feb 2025 11:21:30 +0100
Subject: [PATCH 250/430] increase minimum required versions for dependencies

This is in line with what can be tested in the CI.
---
 CMakeLists.txt         |  6 +++---
 README.md              |  6 +++---
 src/flex-lua-index.cpp | 24 +++++++++---------------
 src/osm2pgsql.cpp      |  4 ++--
 4 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ed00e3b7..de800513a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,10 +64,10 @@ if (NOT WIN32 AND NOT APPLE)
     set(PostgreSQL_TYPE_INCLUDE_DIR /usr/include)
 endif()
 
-set(MINIMUM_POSTGRESQL_SERVER_VERSION "9.6")
-set(MINIMUM_POSTGRESQL_SERVER_VERSION_NUM "90600")
+set(MINIMUM_POSTGRESQL_SERVER_VERSION "11")
+set(MINIMUM_POSTGRESQL_SERVER_VERSION_NUM "110000")
 
-set(PostgreSQL_ADDITIONAL_VERSIONS "17" "16" "15" "14" "13" "12" "11" "10" "9.6")
+set(PostgreSQL_ADDITIONAL_VERSIONS "17" "16" "15" "14" "13" "12" "11")
 
 #############################################################
 # Version
diff --git a/README.md b/README.md
index c6565e0a8..137ed3975 100644
--- a/README.md
+++ b/README.md
@@ -66,12 +66,12 @@ with other versions of those libraries (set the `EXTERNAL_*libname*` option to
 * [protozero](https://github.com/mapbox/protozero) (>= 1.6.3)
 
 It also requires access to a database server running
-[PostgreSQL](https://www.postgresql.org/) (version 9.6+ works, 13+ strongly
-recommended) and [PostGIS](https://www.postgis.net/) (version 2.5+).
+[PostgreSQL](https://www.postgresql.org/) (version 11+ works, 13+ strongly
+recommended) and [PostGIS](https://www.postgis.net/) (version 3.0+).
 
 Make sure you have installed the development packages for the libraries
 mentioned in the requirements section and a C++ compiler which supports C++17.
-We officially support gcc >= 8.0 and clang >= 8.
+We officially support gcc >= 10.0 and clang >= 13.
 
 To rebuild the included man page you'll need the [pandoc](https://pandoc.org/)
 tool.
diff --git a/src/flex-lua-index.cpp b/src/flex-lua-index.cpp
index 2b2ce34e3..31085e236 100644
--- a/src/flex-lua-index.cpp
+++ b/src/flex-lua-index.cpp
@@ -105,23 +105,17 @@ void flex_lua_setup_index(lua_State *lua_state, flex_table_t *table)
     // get include columns
     std::vector<std::string> include_columns;
     lua_getfield(lua_state, -1, "include");
-    if (get_database_version() >= 110000) {
-        if (lua_isstring(lua_state, -1)) {
-            check_and_add_column(*table, &include_columns,
-                                 lua_tostring(lua_state, -1));
-        } else if (lua_istable(lua_state, -1)) {
-            check_and_add_columns(*table, &include_columns, lua_state);
-        } else if (!lua_isnil(lua_state, -1)) {
-            throw std::runtime_error{
-                "The 'include' field in an index definition must contain a "
-                "string or an array."};
-        }
-        index.set_include_columns(include_columns);
+    if (lua_isstring(lua_state, -1)) {
+        check_and_add_column(*table, &include_columns,
+                             lua_tostring(lua_state, -1));
+    } else if (lua_istable(lua_state, -1)) {
+        check_and_add_columns(*table, &include_columns, lua_state);
     } else if (!lua_isnil(lua_state, -1)) {
-        throw fmt_error("Database version ({}) doesn't support"
-                        " include columns in indexes.",
-                        get_database_version());
+        throw std::runtime_error{
+            "The 'include' field in an index definition must contain a "
+            "string or an array."};
     }
+    index.set_include_columns(include_columns);
     lua_pop(lua_state, 1);
 
     // get tablespace
diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
index cd2b1b5b9..f07a6b413 100644
--- a/src/osm2pgsql.cpp
+++ b/src/osm2pgsql.cpp
@@ -89,8 +89,8 @@ void check_db(options_t const &options)
     init_database_capabilities(db_connection);
 
     auto const pv = get_postgis_version();
-    if (pv.major < 2 || (pv.major == 2 && pv.minor < 5)) {
-        throw std::runtime_error{"Need at least PostGIS version 2.5"};
+    if (pv.major < 3) {
+        throw std::runtime_error{"Need at least PostGIS version 3.0"};
     }
 
     check_schema(options.dbschema);

From d33cd9c042df3d0ea161adce8f925145754a296b Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 12 Feb 2025 11:54:10 +0100
Subject: [PATCH 251/430] increase minimum required version of cmake to 3.10

Silences a warning by newer versions of cmake.
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de800513a..9c913bfa7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.10.0)
 
 project(osm2pgsql VERSION 2.0.1 LANGUAGES CXX C)
 

From ce75b4c6174daa71e11d37e8c4cc7e4e15e56b04 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 13 Feb 2025 10:00:44 +0100
Subject: [PATCH 252/430] Fix two-stage processing when flat node file is used

This is an additional fix to the fix in 8d1a55e5. If a flat node file is
used, nodes are not stored in the database (unless --middle-with-nodes
is specified, but also then only nodes with tags are stored in the
database).

There are two problems here:

1. The "get_node" prepared statement was not prepared in this case,
   so it fails when executes. This is fixed by only executing that
   statement if m_store_options.nodes is set in the middle.
2. If there is no node in the database, there might still be one
   in the flat node file. So we need to try this and create the
   node from the information in there. (It will only have the node
   id and location in it, but at least we get the location.)

This commit contains both fixes.
---
 src/middle-pgsql.cpp | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index c0fd0c36f..655617ddb 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -762,17 +762,33 @@ bool middle_query_pgsql_t::node_get(osmid_t id,
 {
     assert(buffer);
 
-    auto const res = m_db_connection.exec_prepared("get_node", id);
+    if (m_store_options.nodes) {
+        auto const res = m_db_connection.exec_prepared("get_node", id);
 
-    if (res.num_tuples() != 1) {
-        return false;
+        if (res.num_tuples() == 1) {
+            build_node(id, res, 0, 0, buffer, m_store_options.with_attributes);
+            buffer->commit();
+            return true;
+        }
     }
 
-    build_node(id, res, 0, 0, buffer, m_store_options.with_attributes);
+    if (m_store_options.use_flat_node_file) {
+        auto const location = get_node_location_flatnodes(id);
+        if (!location.valid()) {
+            return false;
+        }
 
-    buffer->commit();
+        {
+            osmium::builder::NodeBuilder builder{*buffer};
+            builder.set_id(id);
+            builder.set_location(location);
+        }
 
-    return true;
+        buffer->commit();
+        return true;
+    }
+
+    return false;
 }
 
 bool middle_query_pgsql_t::way_get(osmid_t id,

From 45d16e0562d0b41301eea5375db5603421344ac4 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 13 Feb 2025 10:46:20 +0100
Subject: [PATCH 253/430] Look for nodes in cache in non-slim mode in two-stage
 processing

Another addition to the same issue as in the previews commit: In
non-slim mode look for node locations in the (on disk and ram)
caches and create a node from there is a node is requested for
further processing in two-stage processing.
---
 src/middle-ram.cpp | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/middle-ram.cpp b/src/middle-ram.cpp
index 4c5bf995b..10c095960 100644
--- a/src/middle-ram.cpp
+++ b/src/middle-ram.cpp
@@ -283,8 +283,32 @@ bool middle_ram_t::node_get(osmid_t id, osmium::memory::Buffer *buffer) const
     assert(buffer);
 
     if (m_store_options.nodes) {
-        return get_object(osmium::item_type::node, id, buffer);
+        auto const got_it = get_object(osmium::item_type::node, id, buffer);
+        if (got_it) {
+            return true;
+        }
     }
+
+    if (m_store_options.locations) {
+        osmium::Location location{};
+        if (m_persistent_cache) {
+            location = m_persistent_cache->get(id);
+        }
+        if (!location.valid()) {
+            location = m_node_locations.get(id);
+        }
+        if (location.valid()) {
+            {
+                osmium::builder::NodeBuilder builder{*buffer};
+                builder.set_id(id);
+                builder.set_location(location);
+            }
+
+            buffer->commit();
+            return true;
+        }
+    }
+
     return false;
 }
 

From bf2fe15520ad376a74dcb8a7d8438defc53e56ba Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 16 Feb 2025 15:50:13 +0100
Subject: [PATCH 254/430] actions: purge existing postgres version

apt won't set up a database for the differently installed postgresql
otherwise
---
 .github/actions/ubuntu-prerequisites/action.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/actions/ubuntu-prerequisites/action.yml b/.github/actions/ubuntu-prerequisites/action.yml
index 1d3f95d8f..795623882 100644
--- a/.github/actions/ubuntu-prerequisites/action.yml
+++ b/.github/actions/ubuntu-prerequisites/action.yml
@@ -6,10 +6,8 @@ runs:
   steps:
     - name: Remove preinstalled PostgreSQL
       run: |
-        sudo apt-get remove -yq postgresql*
-        sudo apt-get install curl ca-certificates gnupg
-        curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null
-        sudo sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+        sudo /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y
+        sudo apt-get purge -yq postgresql*
         sudo apt-get update -qq
       shell: bash
 

From bee627af3caf0abcded099b14f2c3ce1054110d7 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 16 Feb 2025 15:51:18 +0100
Subject: [PATCH 255/430] actions: remove outdated clang install

---
 .github/actions/ubuntu-prerequisites/action.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/actions/ubuntu-prerequisites/action.yml b/.github/actions/ubuntu-prerequisites/action.yml
index 795623882..ecc250da5 100644
--- a/.github/actions/ubuntu-prerequisites/action.yml
+++ b/.github/actions/ubuntu-prerequisites/action.yml
@@ -30,7 +30,6 @@ runs:
           python3-setuptools \
           zlib1g-dev
         pip3 install $PIP_OPTION behave osmium
-        if [ "$CC" = clang-8 ]; then sudo apt-get install -yq --no-install-suggests --no-install-recommends clang-8; fi
         if [ "$PSYCOPG" = "2"]; then
             sudo apt-get install -yq --no-install-suggests --no-install-recommends python3-psycopg2
         else

From f55a192c15f5f176efb994e1b03f869d814c1a62 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 14 Feb 2025 15:54:35 +0100
Subject: [PATCH 256/430] Fix include guard names

They were not in line with the file names.
---
 src/expire-config.hpp | 6 +++---
 src/lua-setup.hpp     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/expire-config.hpp b/src/expire-config.hpp
index 832ba6d64..2ce64fd57 100644
--- a/src/expire-config.hpp
+++ b/src/expire-config.hpp
@@ -1,5 +1,5 @@
-#ifndef OSM2PGSQL_FLEX_EXPIRE_CONFIG_HPP
-#define OSM2PGSQL_FLEX_EXPIRE_CONFIG_HPP
+#ifndef OSM2PGSQL_EXPIRE_CONFIG_HPP
+#define OSM2PGSQL_EXPIRE_CONFIG_HPP
 
 /**
  * SPDX-License-Identifier: GPL-2.0-or-later
@@ -45,4 +45,4 @@ struct expire_config_t
 
 }; // struct expire_config_t
 
-#endif // OSM2PGSQL_FLEX_EXPIRE_CONFIG_HPP
+#endif // OSM2PGSQL_EXPIRE_CONFIG_HPP
diff --git a/src/lua-setup.hpp b/src/lua-setup.hpp
index 6d6fa0b12..95dbff626 100644
--- a/src/lua-setup.hpp
+++ b/src/lua-setup.hpp
@@ -1,5 +1,5 @@
-#ifndef OSM2PGSQL_LUA_CONFIG_HPP
-#define OSM2PGSQL_LUA_CONFIG_HPP
+#ifndef OSM2PGSQL_LUA_SETUP_HPP
+#define OSM2PGSQL_LUA_SETUP_HPP
 
 /**
  * SPDX-License-Identifier: GPL-2.0-or-later
@@ -17,4 +17,4 @@ struct lua_State;
 void setup_lua_environment(lua_State *lua_state, std::string const &filename,
                            bool append_mode);
 
-#endif // OSM2PGSQL_LUA_CONFIG_HPP
+#endif // OSM2PGSQL_LUA_SETUP_HPP

From f80854d75a893f0f0869d540e26d110c303301f0 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 25 Feb 2025 20:35:45 +0100
Subject: [PATCH 257/430] Remove comment that doesn't apply any more

In 6bd67a749d890a092557c8812fd67c0d3f170dce we changed the code to not
copy the connection parameters but the connection.
---
 src/db-copy.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/db-copy.cpp b/src/db-copy.cpp
index c33156f69..b02975f04 100644
--- a/src/db-copy.cpp
+++ b/src/db-copy.cpp
@@ -88,9 +88,6 @@ void db_deleter_by_type_and_id_t::delete_rows(std::string const &table,
 
 db_copy_thread_t::db_copy_thread_t(connection_params_t const &connection_params)
 {
-    // Connection params are captured by copy here, because we don't know
-    // whether the reference will still be valid once we get around to running
-    // the thread.
     m_worker =
         std::thread{thread_t{pg_conn_t{connection_params, "copy"}, &m_shared}};
 }

From 0182197d36f7ddf0a222f9b8a77c7c046d6f6fe5 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 19 Mar 2025 14:45:55 +0100
Subject: [PATCH 258/430] Update included libosmium to version 2.22.0

---
 contrib/libosmium/README.contrib              |   2 +-
 contrib/libosmium/README.md                   |   5 +-
 .../osmium/area/detail/segment_list.hpp       |   7 +-
 .../include/osmium/index/relations_map.hpp    | 181 +++++++++++-------
 .../include/osmium/io/detail/read_thread.hpp  |   2 +-
 .../osmium/io/detail/xml_input_format.hpp     |   8 +-
 .../libosmium/include/osmium/io/reader.hpp    |   4 +-
 .../libosmium/include/osmium/io/writer.hpp    |   2 +-
 .../osmium/relations/members_database.hpp     |   3 +-
 .../osmium/relations/relations_database.hpp   |   2 +-
 .../include/osmium/tags/regex_filter.hpp      |  66 -------
 .../include/osmium/util/progress_bar.hpp      |   2 +-
 .../include/osmium/util/string_matcher.hpp    |  30 ---
 contrib/libosmium/include/osmium/version.hpp  |   4 +-
 contrib/libosmium/include/osmium/visitor.hpp  |  98 +++++-----
 15 files changed, 179 insertions(+), 237 deletions(-)
 delete mode 100644 contrib/libosmium/include/osmium/tags/regex_filter.hpp

diff --git a/contrib/libosmium/README.contrib b/contrib/libosmium/README.contrib
index 997cc5923..955da97f3 100644
--- a/contrib/libosmium/README.contrib
+++ b/contrib/libosmium/README.contrib
@@ -1,2 +1,2 @@
 Source: https://github.com/osmcode/libosmium
-Revision: v2.21.0
+Revision: v2.22.0
diff --git a/contrib/libosmium/README.md b/contrib/libosmium/README.md
index 4d73ed7a8..29b86f4a4 100644
--- a/contrib/libosmium/README.md
+++ b/contrib/libosmium/README.md
@@ -6,7 +6,7 @@ A fast and flexible C++ library for working with OpenStreetMap data.
 
 Libosmium works on Linux, macOS and Windows.
 
-[![Github Build Status](https://github.com/osmcode/libosmium/workflows/CI/badge.svg?branch=master)](https://github.com/osmcode/libosmium/actions)
+[![Build Status](https://github.com/osmcode/libosmium/actions/workflows/ci.yml/badge.svg)](https://github.com/osmcode/libosmium/actions)
 [![Packaging status](https://repology.org/badge/tiny-repos/libosmium.svg)](https://repology.org/metapackage/libosmium)
 
 Please see the [Libosmium manual](https://osmcode.org/libosmium/manual.html)
@@ -15,8 +15,7 @@ for more details than this README can provide.
 
 ## Prerequisites
 
-You need a C++11 compiler and standard C++ library. Osmium needs at least GCC
-4.8 or clang (LLVM) 3.4. (Some parts may work with older versions.)
+You need a C++14 compiler and standard C++ library.
 
 Different parts of Libosmium (and the applications built on top of it) need
 different libraries. You DO NOT NEED to install all of them, just install those
diff --git a/contrib/libosmium/include/osmium/area/detail/segment_list.hpp b/contrib/libosmium/include/osmium/area/detail/segment_list.hpp
index 9f0e4c4f8..ed07fe198 100644
--- a/contrib/libosmium/include/osmium/area/detail/segment_list.hpp
+++ b/contrib/libosmium/include/osmium/area/detail/segment_list.hpp
@@ -50,6 +50,7 @@ DEALINGS IN THE SOFTWARE.
 #include <iterator>
 #include <numeric>
 #include <unordered_set>
+#include <utility>
 #include <vector>
 
 namespace osmium {
@@ -64,13 +65,13 @@ namespace osmium {
              * way as parameter. This takes into account that there might be
              * non-way members in the relation.
              */
-            template <typename F>
-            inline void for_each_member(const osmium::Relation& relation, const std::vector<const osmium::Way*>& ways, F&& func) {
+            template <typename TFunc>
+            inline void for_each_member(const osmium::Relation& relation, const std::vector<const osmium::Way*>& ways, TFunc&& func) {
                 auto way_it = ways.cbegin();
                 for (const osmium::RelationMember& member : relation.members()) {
                     if (member.type() == osmium::item_type::way) {
                         assert(way_it != ways.cend());
-                        func(member, **way_it);
+                        std::forward<TFunc>(func)(member, **way_it);
                         ++way_it;
                     }
                 }
diff --git a/contrib/libosmium/include/osmium/index/relations_map.hpp b/contrib/libosmium/include/osmium/index/relations_map.hpp
index 2cfcfc93b..57a214968 100644
--- a/contrib/libosmium/include/osmium/index/relations_map.hpp
+++ b/contrib/libosmium/include/osmium/index/relations_map.hpp
@@ -41,6 +41,7 @@ DEALINGS IN THE SOFTWARE.
 #include <cassert>
 #include <cstddef>
 #include <cstdint>
+#include <limits>
 #include <tuple>
 #include <type_traits>
 #include <utility>
@@ -137,8 +138,25 @@ namespace osmium {
                     m_map.reserve(size);
                 }
 
+                void clear() {
+                    m_map.clear();
+                    m_map.shrink_to_fit();
+                }
+
+                typename std::vector<kv_pair>::const_iterator begin() const noexcept {
+                    return m_map.cbegin();
+                }
+
+                typename std::vector<kv_pair>::const_iterator end() const noexcept {
+                    return m_map.cend();
+                }
+
             }; // class flat_map
 
+            template <typename VType>
+            using rel_index_map_type = detail::flat_map<osmium::unsigned_object_id_type, VType,
+                                                        osmium::unsigned_object_id_type, VType>;
+
         } // namespace detail
 
         /**
@@ -171,13 +189,17 @@ namespace osmium {
             friend class RelationsMapStash;
             friend class RelationsMapIndexes;
 
-            using map_type = detail::flat_map<osmium::unsigned_object_id_type, uint32_t,
-                                              osmium::unsigned_object_id_type, uint32_t>;
+            detail::rel_index_map_type<uint32_t> m_map32;
+            detail::rel_index_map_type<uint64_t> m_map64;
 
-            map_type m_map;
+            bool m_small;
 
-            explicit RelationsMapIndex(map_type&& map) :
-                m_map(std::move(map)) {
+            explicit RelationsMapIndex(detail::rel_index_map_type<uint32_t>&& map) :
+                m_map32(std::move(map)), m_small(true) {
+            }
+
+            explicit RelationsMapIndex(detail::rel_index_map_type<uint64_t>&& map) :
+                m_map64(std::move(map)), m_small(false) {
             }
 
         public:
@@ -187,35 +209,11 @@ namespace osmium {
             RelationsMapIndex(const RelationsMapIndex&) = delete;
             RelationsMapIndex& operator=(const RelationsMapIndex&) = delete;
 
-            RelationsMapIndex(RelationsMapIndex&& /*other*/) noexcept(std::is_nothrow_move_constructible<map_type>::value);
-            RelationsMapIndex& operator=(RelationsMapIndex&& /*other*/) noexcept(std::is_nothrow_move_assignable<map_type>::value);
+            RelationsMapIndex(RelationsMapIndex&& /*other*/) noexcept;
+            RelationsMapIndex& operator=(RelationsMapIndex&& /*other*/) noexcept;
 
             ~RelationsMapIndex() noexcept = default;
 
-            /**
-             * Find the given relation id in the index and call the given
-             * function with all parent relation ids.
-             *
-             * @code
-             * osmium::unsigned_object_id_type member_id = 17;
-             * index.for_each_parent(member_id, [](osmium::unsigned_object_id_type id) {
-             *   ...
-             * });
-             * @endcode
-             *
-             * @deprecated Use for_each() instead.
-             *
-             * Complexity: Logarithmic in the number of elements in the index.
-             *             (Lookup uses binary search.)
-             */
-            template <typename TFunc>
-            void for_each_parent(const osmium::unsigned_object_id_type member_id, TFunc&& func) const {
-                const auto parents = m_map.get(member_id);
-                for (auto it = parents.first; it != parents.second; ++it) {
-                    func(it->value);
-                }
-            }
-
             /**
              * Find the given relation id in the index and call the given
              * function with all related relation ids.
@@ -232,9 +230,16 @@ namespace osmium {
              */
             template <typename TFunc>
             void for_each(const osmium::unsigned_object_id_type id, TFunc&& func) const {
-                const auto parents = m_map.get(id);
-                for (auto it = parents.first; it != parents.second; ++it) {
-                    func(it->value);
+                if (m_small) {
+                    const auto parents = m_map32.get(id);
+                    for (auto it = parents.first; it != parents.second; ++it) {
+                        std::forward<TFunc>(func)(it->value);
+                    }
+                } else {
+                    const auto parents = m_map64.get(id);
+                    for (auto it = parents.first; it != parents.second; ++it) {
+                        std::forward<TFunc>(func)(it->value);
+                    }
                 }
             }
 
@@ -244,7 +249,7 @@ namespace osmium {
              * Complexity: Constant.
              */
             bool empty() const noexcept {
-                return m_map.empty();
+                return m_small ? m_map32.empty() : m_map64.empty();
             }
 
             /**
@@ -253,15 +258,15 @@ namespace osmium {
              * Complexity: Constant.
              */
             std::size_t size() const noexcept {
-                return m_map.size();
+                return m_small ? m_map32.size() : m_map64.size();
             }
 
         }; // class RelationsMapIndex
 
         // defined outside the class on purpose
         // see https://akrzemi1.wordpress.com/2015/09/11/declaring-the-move-constructor/
-        inline RelationsMapIndex::RelationsMapIndex(RelationsMapIndex&&) noexcept(std::is_nothrow_move_constructible<map_type>::value) = default; // NOLINT(readability-redundant-inline-specifier)
-        inline RelationsMapIndex& RelationsMapIndex::operator=(RelationsMapIndex&&) noexcept(std::is_nothrow_move_assignable<map_type>::value) = default; // NOLINT(readability-redundant-inline-specifier)
+        inline RelationsMapIndex::RelationsMapIndex(RelationsMapIndex&&) noexcept = default; // NOLINT(readability-redundant-inline-specifier)
+        inline RelationsMapIndex& RelationsMapIndex::operator=(RelationsMapIndex&&) noexcept = default; // NOLINT(readability-redundant-inline-specifier)
 
         class RelationsMapIndexes {
 
@@ -270,7 +275,12 @@ namespace osmium {
             RelationsMapIndex m_member_to_parent;
             RelationsMapIndex m_parent_to_member;
 
-            RelationsMapIndexes(RelationsMapIndex::map_type&& map1, RelationsMapIndex::map_type&& map2) :
+            RelationsMapIndexes(detail::rel_index_map_type<uint32_t>&& map1, detail::rel_index_map_type<uint32_t>&& map2) :
+                m_member_to_parent(std::move(map1)),
+                m_parent_to_member(std::move(map2)) {
+            }
+
+            RelationsMapIndexes(detail::rel_index_map_type<uint64_t>&& map1, detail::rel_index_map_type<uint64_t>&& map2) :
                 m_member_to_parent(std::move(map1)),
                 m_parent_to_member(std::move(map2)) {
             }
@@ -312,15 +322,23 @@ namespace osmium {
          */
         class RelationsMapStash {
 
-            using map_type = detail::flat_map<osmium::unsigned_object_id_type, uint32_t,
-                                              osmium::unsigned_object_id_type, uint32_t>;
-
-            map_type m_map;
+            detail::rel_index_map_type<uint32_t> m_map32;
+            detail::rel_index_map_type<uint64_t> m_map64;
 
 #ifndef NDEBUG
             bool m_valid = true;
 #endif
 
+            static void append32to64(detail::rel_index_map_type<uint32_t>& map32, detail::rel_index_map_type<uint64_t>& map64) {
+                map64.sort_unique();
+                map64.reserve(map64.size() + map32.size());
+                for (const auto& item : map32) {
+                    map64.set(item.key, item.value);
+                }
+                map64.sort_unique();
+                map32.clear();
+            }
+
         public:
 
             RelationsMapStash() = default;
@@ -328,8 +346,8 @@ namespace osmium {
             RelationsMapStash(const RelationsMapStash&) = delete;
             RelationsMapStash& operator=(const RelationsMapStash&) = delete;
 
-            RelationsMapStash(RelationsMapStash&& /*other*/) noexcept(std::is_nothrow_move_constructible<map_type>::value);
-            RelationsMapStash& operator=(RelationsMapStash&& /*other*/) noexcept(std::is_nothrow_move_assignable<map_type>::value);
+            RelationsMapStash(RelationsMapStash&& /*other*/) noexcept;
+            RelationsMapStash& operator=(RelationsMapStash&& /*other*/) noexcept;
 
             ~RelationsMapStash() noexcept = default;
 
@@ -338,7 +356,12 @@ namespace osmium {
              */
             void add(const osmium::unsigned_object_id_type member_id, const osmium::unsigned_object_id_type relation_id) {
                 assert(m_valid && "You can't use the RelationsMap any more after calling build_index()");
-                m_map.set(member_id, relation_id);
+                constexpr const osmium::unsigned_object_id_type max32 = std::numeric_limits<uint32_t>::max();
+                if (member_id <= max32 && relation_id <= max32) {
+                    m_map32.set(member_id, relation_id);
+                } else {
+                    m_map64.set(member_id, relation_id);
+                }
             }
 
             /**
@@ -348,7 +371,7 @@ namespace osmium {
                 assert(m_valid && "You can't use the RelationsMap any more after calling build_index()");
                 for (const auto& member : relation.members()) {
                     if (member.type() == osmium::item_type::relation) {
-                        m_map.set(member.positive_ref(), relation.positive_id());
+                        add(member.positive_ref(), relation.positive_id());
                     }
                 }
             }
@@ -360,7 +383,7 @@ namespace osmium {
              */
             bool empty() const noexcept {
                 assert(m_valid && "You can't use the RelationsMap any more after calling build_index()");
-                return m_map.empty();
+                return m_map32.empty() && m_map64.empty();
             }
 
             /**
@@ -370,24 +393,17 @@ namespace osmium {
              */
             std::size_t size() const noexcept {
                 assert(m_valid && "You can't use the RelationsMap any more after calling build_index()");
-                return m_map.size();
+                return m_map32.size() + m_map64.size();
             }
 
             /**
-             * Build an index for member to parent lookups from the contents
-             * of this stash and return it.
+             * How many "small" and "large" entries are in this stash?
+             * For tests and debugging only!
              *
-             * After you get the index you can not use the stash any more!
-             *
-             * @deprecated Use build_member_to_parent_index() instead.
+             * Complexity: Constant.
              */
-            RelationsMapIndex build_index() {
-                assert(m_valid && "You can't use the RelationsMap any more after calling build_index()");
-                m_map.sort_unique();
-#ifndef NDEBUG
-                m_valid = false;
-#endif
-                return RelationsMapIndex{std::move(m_map)};
+            std::pair<std::size_t, std::size_t> sizes() const noexcept {
+                return std::make_pair(m_map32.size(), m_map64.size());
             }
 
             /**
@@ -398,11 +414,17 @@ namespace osmium {
              */
             RelationsMapIndex build_member_to_parent_index() {
                 assert(m_valid && "You can't use the RelationsMap any more after calling build_member_to_parent_index()");
-                m_map.sort_unique();
 #ifndef NDEBUG
                 m_valid = false;
 #endif
-                return RelationsMapIndex{std::move(m_map)};
+                m_map32.sort_unique();
+                if (m_map64.empty()) {
+                    return RelationsMapIndex{std::move(m_map32)};
+                }
+
+                append32to64(m_map32, m_map64);
+
+                return RelationsMapIndex{std::move(m_map64)};
             }
 
             /**
@@ -413,12 +435,19 @@ namespace osmium {
              */
             RelationsMapIndex build_parent_to_member_index() {
                 assert(m_valid && "You can't use the RelationsMap any more after calling build_parent_to_member_index()");
-                m_map.flip_in_place();
-                m_map.sort_unique();
 #ifndef NDEBUG
                 m_valid = false;
 #endif
-                return RelationsMapIndex{std::move(m_map)};
+                m_map32.flip_in_place();
+                m_map32.sort_unique();
+                if (m_map64.empty()) {
+                    return RelationsMapIndex{std::move(m_map32)};
+                }
+
+                m_map64.flip_in_place();
+                append32to64(m_map32, m_map64);
+
+                return RelationsMapIndex{std::move(m_map64)};
             }
 
             /**
@@ -429,21 +458,29 @@ namespace osmium {
              */
             RelationsMapIndexes build_indexes() {
                 assert(m_valid && "You can't use the RelationsMap any more after calling build_indexes()");
-                auto reverse_map = m_map.flip_copy();
-                reverse_map.sort_unique();
-                m_map.sort_unique();
 #ifndef NDEBUG
                 m_valid = false;
 #endif
-                return RelationsMapIndexes{std::move(m_map), std::move(reverse_map)};
+                auto reverse_map32 = m_map32.flip_copy();
+                reverse_map32.sort_unique();
+                m_map32.sort_unique();
+                if (m_map64.empty()) {
+                    return RelationsMapIndexes{std::move(m_map32), std::move(reverse_map32)};
+                }
+
+                auto reverse_map64 = m_map64.flip_copy();
+                append32to64(reverse_map32, reverse_map64);
+                append32to64(m_map32, m_map64);
+
+                return RelationsMapIndexes{std::move(m_map64), std::move(reverse_map64)};
             }
 
         }; // class RelationsMapStash
 
         // defined outside the class on purpose
         // see https://akrzemi1.wordpress.com/2015/09/11/declaring-the-move-constructor/
-        inline RelationsMapStash::RelationsMapStash(RelationsMapStash&&) noexcept(std::is_nothrow_move_constructible<map_type>::value) = default; // NOLINT(readability-redundant-inline-specifier)
-        inline RelationsMapStash& RelationsMapStash::operator=(RelationsMapStash&&) noexcept(std::is_nothrow_move_assignable<map_type>::value) = default; // NOLINT(readability-redundant-inline-specifier)
+        inline RelationsMapStash::RelationsMapStash(RelationsMapStash&&) noexcept = default; // NOLINT(readability-redundant-inline-specifier)
+        inline RelationsMapStash& RelationsMapStash::operator=(RelationsMapStash&&) noexcept = default; // NOLINT(readability-redundant-inline-specifier)
 
     } // namespace index
 
diff --git a/contrib/libosmium/include/osmium/io/detail/read_thread.hpp b/contrib/libosmium/include/osmium/io/detail/read_thread.hpp
index e0077585b..cf92440df 100644
--- a/contrib/libosmium/include/osmium/io/detail/read_thread.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/read_thread.hpp
@@ -106,7 +106,7 @@ namespace osmium {
                 ~ReadThreadManager() noexcept {
                     try {
                         close();
-                    } catch (...) {
+                    } catch (...) { // NOLINT(bugprone-empty-catch)
                         // Ignore any exceptions because destructor must not throw.
                     }
                 }
diff --git a/contrib/libosmium/include/osmium/io/detail/xml_input_format.hpp b/contrib/libosmium/include/osmium/io/detail/xml_input_format.hpp
index 9ee85dee5..bf5e8c61f 100644
--- a/contrib/libosmium/include/osmium/io/detail/xml_input_format.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/xml_input_format.hpp
@@ -179,7 +179,7 @@ namespace osmium {
                             return;
                         }
                         try {
-                            func(xml_parser);
+                            std::forward<TFunc>(func)(xml_parser);
                         } catch (...) {
                             m_exception_ptr = std::current_exception();
                             XML_StopParser(m_parser, 0);
@@ -267,10 +267,10 @@ namespace osmium {
 
                 ExpatXMLParser* m_expat_xml_parser{nullptr};
 
-                template <typename T>
-                static void check_attributes(const XML_Char** attrs, T&& check) {
+                template <typename TFunc>
+                static void check_attributes(const XML_Char** attrs, TFunc&& check) {
                     while (*attrs) {
-                        check(attrs[0], attrs[1]);
+                        std::forward<TFunc>(check)(attrs[0], attrs[1]);
                         attrs += 2;
                     }
                 }
diff --git a/contrib/libosmium/include/osmium/io/reader.hpp b/contrib/libosmium/include/osmium/io/reader.hpp
index d6680555d..2e63bc6b1 100644
--- a/contrib/libosmium/include/osmium/io/reader.hpp
+++ b/contrib/libosmium/include/osmium/io/reader.hpp
@@ -327,7 +327,7 @@ namespace osmium {
                 m_osmdata_queue(detail::get_osmdata_queue_size(), "parser_results"),
                 m_osmdata_queue_wrapper(m_osmdata_queue) {
 
-                (void)std::initializer_list<int>{(set_option(args), 0)...};
+                (void)std::initializer_list<int>{(set_option(std::forward<TArgs>(args)), 0)...};
 
                 if (!m_pool) {
                     m_pool = &thread::Pool::default_instance();
@@ -390,7 +390,7 @@ namespace osmium {
 
                 try {
                     m_read_thread_manager.close();
-                } catch (...) {
+                } catch (...) { // NOLINT(bugprone-empty-catch)
                     // Ignore any exceptions.
                 }
 
diff --git a/contrib/libosmium/include/osmium/io/writer.hpp b/contrib/libosmium/include/osmium/io/writer.hpp
index ecd4ea473..52346a379 100644
--- a/contrib/libosmium/include/osmium/io/writer.hpp
+++ b/contrib/libosmium/include/osmium/io/writer.hpp
@@ -269,7 +269,7 @@ namespace osmium {
                 assert(!m_file.buffer()); // XXX can't handle pseudo-files
 
                 options_type options;
-                (void)std::initializer_list<int>{(set_option(options, args), 0)...};
+                (void)std::initializer_list<int>{(set_option(options, std::forward<TArgs>(args)), 0)...};
 
                 if (!options.pool) {
                     options.pool = &thread::Pool::default_instance();
diff --git a/contrib/libosmium/include/osmium/relations/members_database.hpp b/contrib/libosmium/include/osmium/relations/members_database.hpp
index 36f205d12..1702658de 100644
--- a/contrib/libosmium/include/osmium/relations/members_database.hpp
+++ b/contrib/libosmium/include/osmium/relations/members_database.hpp
@@ -46,6 +46,7 @@ DEALINGS IN THE SOFTWARE.
 #include <limits>
 #include <tuple>
 #include <type_traits>
+#include <utility>
 #include <vector>
 
 namespace osmium {
@@ -384,7 +385,7 @@ namespace osmium {
                     rel_handle.decrement_members();
 
                     if (rel_handle.has_all_members()) {
-                        func(rel_handle);
+                        std::forward<TFunc>(func)(rel_handle);
                     }
                 }
 
diff --git a/contrib/libosmium/include/osmium/relations/relations_database.hpp b/contrib/libosmium/include/osmium/relations/relations_database.hpp
index a3b8573a8..e31d237e0 100644
--- a/contrib/libosmium/include/osmium/relations/relations_database.hpp
+++ b/contrib/libosmium/include/osmium/relations/relations_database.hpp
@@ -323,7 +323,7 @@ namespace osmium {
         void RelationsDatabase::for_each_relation(TFunc&& func) {
             for (std::size_t pos = 0; pos < m_elements.size(); ++pos) {
                 if (m_elements[pos].handle.valid()) {
-                    func(RelationHandle{this, pos});
+                    std::forward<TFunc>(func)(RelationHandle{this, pos});
                 }
             }
         }
diff --git a/contrib/libosmium/include/osmium/tags/regex_filter.hpp b/contrib/libosmium/include/osmium/tags/regex_filter.hpp
deleted file mode 100644
index f741c31b3..000000000
--- a/contrib/libosmium/include/osmium/tags/regex_filter.hpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef OSMIUM_TAGS_REGEX_FILTER_HPP
-#define OSMIUM_TAGS_REGEX_FILTER_HPP
-
-/*
-
-This file is part of Osmium (https://osmcode.org/libosmium).
-
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
-
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-*/
-
-#include <osmium/tags/filter.hpp>
-
-#include <regex>
-#include <string>
-
-namespace osmium {
-
-    namespace tags {
-
-        template <>
-        struct match_key<std::regex> {
-            bool operator()(const std::regex& rule_key, const char* tag_key) const {
-                return std::regex_match(tag_key, rule_key);
-            }
-        }; // struct match_key<std::regex>
-
-        template <>
-        struct match_value<std::regex> {
-            bool operator()(const std::regex& rule_value, const char* tag_value) const {
-                return std::regex_match(tag_value, rule_value);
-            }
-        }; // struct match_value<std::regex>
-
-        /// @deprecated Use osmium::TagsFilter instead.
-        using RegexFilter = Filter<std::string, std::regex>;
-
-    } // namespace tags
-
-} // namespace osmium
-
-#endif // OSMIUM_TAGS_REGEX_FILTER_HPP
diff --git a/contrib/libosmium/include/osmium/util/progress_bar.hpp b/contrib/libosmium/include/osmium/util/progress_bar.hpp
index 13a6f0c36..2329bdaa8 100644
--- a/contrib/libosmium/include/osmium/util/progress_bar.hpp
+++ b/contrib/libosmium/include/osmium/util/progress_bar.hpp
@@ -132,7 +132,7 @@ namespace osmium {
             if (m_do_cleanup) {
                 try {
                     done();
-                } catch (...) {
+                } catch (...) { // NOLINT(bugprone-empty-catch)
                     // Swallow any exceptions, because a destructor should
                     // not throw.
                 }
diff --git a/contrib/libosmium/include/osmium/util/string_matcher.hpp b/contrib/libosmium/include/osmium/util/string_matcher.hpp
index 7a87cba0c..1d11e1926 100644
--- a/contrib/libosmium/include/osmium/util/string_matcher.hpp
+++ b/contrib/libosmium/include/osmium/util/string_matcher.hpp
@@ -54,30 +54,6 @@ DEALINGS IN THE SOFTWARE.
 # include <boost/variant.hpp>
 #endif
 
-
-// std::regex isn't implemented properly in glibc++ (before the version
-// delivered with GCC 4.9) and libc++ before the version 3.6, so the use is
-// disabled by these checks. Checks for GLIBC were based on
-// https://stackoverflow.com/questions/12530406/is-gcc-4-8-or-earlier-buggy-about-regular-expressions
-// Checks for libc++ are simply based on compiler defines. This is probably
-// not optimal but seems to work for now.
-#if defined(__GLIBCXX__)
-# if ((__cplusplus >= 201402L) || \
-        defined(_GLIBCXX_REGEX_DFS_QUANTIFIERS_LIMIT) || \
-        defined(_GLIBCXX_REGEX_STATE_LIMIT))
-#  define OSMIUM_WITH_REGEX
-# else
-#  pragma message("Disabling regex functionality. See source code for info.")
-# endif
-#elif defined(__clang__)
-# if ((__clang_major__ > 3) || \
-      (__clang_minor__ == 3 && __clang_minor__ > 5))
-#  define OSMIUM_WITH_REGEX
-# else
-#  pragma message("Disabling regex functionality")
-# endif
-#endif
-
 namespace osmium {
 
     /**
@@ -211,7 +187,6 @@ namespace osmium {
 
         }; // class substring
 
-#ifdef OSMIUM_WITH_REGEX
         /**
          * Matches if the test string matches the regular expression.
          */
@@ -235,7 +210,6 @@ namespace osmium {
             }
 
         }; // class regex
-#endif
 
         /**
          * Matches if the test string is equal to any of the stored strings.
@@ -293,9 +267,7 @@ namespace osmium {
                  equal,
                  prefix,
                  substring,
-#ifdef OSMIUM_WITH_REGEX
                  regex,
-#endif
                  list>;
 
         matcher_type m_matcher;
@@ -388,7 +360,6 @@ namespace osmium {
             m_matcher(equal{str}) {
         }
 
-#ifdef OSMIUM_WITH_REGEX
         /**
          * Create a string matcher that will match the specified regex.
          * Shortcut for
@@ -398,7 +369,6 @@ namespace osmium {
         StringMatcher(const std::regex& aregex) : // NOLINT(google-explicit-constructor, hicpp-explicit-conversions)
             m_matcher(regex{aregex}) {
         }
-#endif
 
         /**
          * Create a string matcher that will match if any of the strings
diff --git a/contrib/libosmium/include/osmium/version.hpp b/contrib/libosmium/include/osmium/version.hpp
index 55d4ac103..585f999e2 100644
--- a/contrib/libosmium/include/osmium/version.hpp
+++ b/contrib/libosmium/include/osmium/version.hpp
@@ -37,11 +37,11 @@ DEALINGS IN THE SOFTWARE.
 #define LIBOSMIUM_VERSION_MAJOR 2
 
 // NOLINTNEXTLINE(modernize-macro-to-enum)
-#define LIBOSMIUM_VERSION_MINOR 21
+#define LIBOSMIUM_VERSION_MINOR 22
 
 // NOLINTNEXTLINE(modernize-macro-to-enum)
 #define LIBOSMIUM_VERSION_PATCH 0
 
-#define LIBOSMIUM_VERSION_STRING "2.21.0"
+#define LIBOSMIUM_VERSION_STRING "2.22.0"
 
 #endif // OSMIUM_VERSION_HPP
diff --git a/contrib/libosmium/include/osmium/visitor.hpp b/contrib/libosmium/include/osmium/visitor.hpp
index 9b0320c96..fdd5ce1c7 100644
--- a/contrib/libosmium/include/osmium/visitor.hpp
+++ b/contrib/libosmium/include/osmium/visitor.hpp
@@ -57,42 +57,42 @@ namespace osmium {
                 case osmium::item_type::undefined:
                     break;
                 case osmium::item_type::node:
-                    handler.osm_object(static_cast<ConstIfConst<TItem, osmium::OSMObject>&>(item));
-                    handler.node(static_cast<ConstIfConst<TItem, osmium::Node>&>(item));
+                    std::forward<THandler>(handler).osm_object(static_cast<ConstIfConst<TItem, osmium::OSMObject>&>(item));
+                    std::forward<THandler>(handler).node(static_cast<ConstIfConst<TItem, osmium::Node>&>(item));
                     break;
                 case osmium::item_type::way:
-                    handler.osm_object(static_cast<ConstIfConst<TItem, osmium::OSMObject>&>(item));
-                    handler.way(static_cast<ConstIfConst<TItem, osmium::Way>&>(item));
+                    std::forward<THandler>(handler).osm_object(static_cast<ConstIfConst<TItem, osmium::OSMObject>&>(item));
+                    std::forward<THandler>(handler).way(static_cast<ConstIfConst<TItem, osmium::Way>&>(item));
                     break;
                 case osmium::item_type::relation:
-                    handler.osm_object(static_cast<ConstIfConst<TItem, osmium::OSMObject>&>(item));
-                    handler.relation(static_cast<ConstIfConst<TItem, osmium::Relation>&>(item));
+                    std::forward<THandler>(handler).osm_object(static_cast<ConstIfConst<TItem, osmium::OSMObject>&>(item));
+                    std::forward<THandler>(handler).relation(static_cast<ConstIfConst<TItem, osmium::Relation>&>(item));
                     break;
                 case osmium::item_type::area:
-                    handler.osm_object(static_cast<ConstIfConst<TItem, osmium::OSMObject>&>(item));
-                    handler.area(static_cast<ConstIfConst<TItem, osmium::Area>&>(item));
+                    std::forward<THandler>(handler).osm_object(static_cast<ConstIfConst<TItem, osmium::OSMObject>&>(item));
+                    std::forward<THandler>(handler).area(static_cast<ConstIfConst<TItem, osmium::Area>&>(item));
                     break;
                 case osmium::item_type::changeset:
-                    handler.changeset(static_cast<ConstIfConst<TItem, osmium::Changeset>&>(item));
+                    std::forward<THandler>(handler).changeset(static_cast<ConstIfConst<TItem, osmium::Changeset>&>(item));
                     break;
                 case osmium::item_type::tag_list:
-                    handler.tag_list(static_cast<ConstIfConst<TItem, osmium::TagList>&>(item));
+                    std::forward<THandler>(handler).tag_list(static_cast<ConstIfConst<TItem, osmium::TagList>&>(item));
                     break;
                 case osmium::item_type::way_node_list:
-                    handler.way_node_list(static_cast<ConstIfConst<TItem, osmium::WayNodeList>&>(item));
+                    std::forward<THandler>(handler).way_node_list(static_cast<ConstIfConst<TItem, osmium::WayNodeList>&>(item));
                     break;
                 case osmium::item_type::relation_member_list:
                 case osmium::item_type::relation_member_list_with_full_members:
-                    handler.relation_member_list(static_cast<ConstIfConst<TItem, osmium::RelationMemberList>&>(item));
+                    std::forward<THandler>(handler).relation_member_list(static_cast<ConstIfConst<TItem, osmium::RelationMemberList>&>(item));
                     break;
                 case osmium::item_type::outer_ring:
-                    handler.outer_ring(static_cast<ConstIfConst<TItem, osmium::OuterRing>&>(item));
+                    std::forward<THandler>(handler).outer_ring(static_cast<ConstIfConst<TItem, osmium::OuterRing>&>(item));
                     break;
                 case osmium::item_type::inner_ring:
-                    handler.inner_ring(static_cast<ConstIfConst<TItem, osmium::InnerRing>&>(item));
+                    std::forward<THandler>(handler).inner_ring(static_cast<ConstIfConst<TItem, osmium::InnerRing>&>(item));
                     break;
                 case osmium::item_type::changeset_discussion:
-                    handler.changeset_discussion(static_cast<ConstIfConst<TItem, osmium::ChangesetDiscussion>&>(item));
+                    std::forward<THandler>(handler).changeset_discussion(static_cast<ConstIfConst<TItem, osmium::ChangesetDiscussion>&>(item));
                     break;
             }
         }
@@ -101,23 +101,23 @@ namespace osmium {
         inline void apply_item_impl(const osmium::OSMEntity& item, THandler&& handler) {
             switch (item.type()) {
                 case osmium::item_type::node:
-                    handler.osm_object(static_cast<const osmium::OSMObject&>(item));
-                    handler.node(static_cast<const osmium::Node&>(item));
+                    std::forward<THandler>(handler).osm_object(static_cast<const osmium::OSMObject&>(item));
+                    std::forward<THandler>(handler).node(static_cast<const osmium::Node&>(item));
                     break;
                 case osmium::item_type::way:
-                    handler.osm_object(static_cast<const osmium::OSMObject&>(item));
-                    handler.way(static_cast<const osmium::Way&>(item));
+                    std::forward<THandler>(handler).osm_object(static_cast<const osmium::OSMObject&>(item));
+                    std::forward<THandler>(handler).way(static_cast<const osmium::Way&>(item));
                     break;
                 case osmium::item_type::relation:
-                    handler.osm_object(static_cast<const osmium::OSMObject&>(item));
-                    handler.relation(static_cast<const osmium::Relation&>(item));
+                    std::forward<THandler>(handler).osm_object(static_cast<const osmium::OSMObject&>(item));
+                    std::forward<THandler>(handler).relation(static_cast<const osmium::Relation&>(item));
                     break;
                 case osmium::item_type::area:
-                    handler.osm_object(static_cast<const osmium::OSMObject&>(item));
-                    handler.area(static_cast<const osmium::Area&>(item));
+                    std::forward<THandler>(handler).osm_object(static_cast<const osmium::OSMObject&>(item));
+                    std::forward<THandler>(handler).area(static_cast<const osmium::Area&>(item));
                     break;
                 case osmium::item_type::changeset:
-                    handler.changeset(static_cast<const osmium::Changeset&>(item));
+                    std::forward<THandler>(handler).changeset(static_cast<const osmium::Changeset&>(item));
                     break;
                 default:
                     throw osmium::unknown_type{};
@@ -128,23 +128,23 @@ namespace osmium {
         inline void apply_item_impl(osmium::OSMEntity& item, THandler&& handler) {
             switch (item.type()) {
                 case osmium::item_type::node:
-                    handler.osm_object(static_cast<osmium::OSMObject&>(item));
-                    handler.node(static_cast<osmium::Node&>(item));
+                    std::forward<THandler>(handler).osm_object(static_cast<osmium::OSMObject&>(item));
+                    std::forward<THandler>(handler).node(static_cast<osmium::Node&>(item));
                     break;
                 case osmium::item_type::way:
-                    handler.osm_object(static_cast<osmium::OSMObject&>(item));
-                    handler.way(static_cast<osmium::Way&>(item));
+                    std::forward<THandler>(handler).osm_object(static_cast<osmium::OSMObject&>(item));
+                    std::forward<THandler>(handler).way(static_cast<osmium::Way&>(item));
                     break;
                 case osmium::item_type::relation:
-                    handler.osm_object(static_cast<osmium::OSMObject&>(item));
-                    handler.relation(static_cast<osmium::Relation&>(item));
+                    std::forward<THandler>(handler).osm_object(static_cast<osmium::OSMObject&>(item));
+                    std::forward<THandler>(handler).relation(static_cast<osmium::Relation&>(item));
                     break;
                 case osmium::item_type::area:
-                    handler.osm_object(static_cast<osmium::OSMObject&>(item));
-                    handler.area(static_cast<osmium::Area&>(item));
+                    std::forward<THandler>(handler).osm_object(static_cast<osmium::OSMObject&>(item));
+                    std::forward<THandler>(handler).area(static_cast<osmium::Area&>(item));
                     break;
                 case osmium::item_type::changeset:
-                    handler.changeset(static_cast<osmium::Changeset&>(item));
+                    std::forward<THandler>(handler).changeset(static_cast<osmium::Changeset&>(item));
                     break;
                 default:
                     throw osmium::unknown_type{};
@@ -155,20 +155,20 @@ namespace osmium {
         inline void apply_item_impl(const osmium::OSMObject& item, THandler&& handler) {
             switch (item.type()) {
                 case osmium::item_type::node:
-                    handler.osm_object(item);
-                    handler.node(static_cast<const osmium::Node&>(item));
+                    std::forward<THandler>(handler).osm_object(item);
+                    std::forward<THandler>(handler).node(static_cast<const osmium::Node&>(item));
                     break;
                 case osmium::item_type::way:
-                    handler.osm_object(item);
-                    handler.way(static_cast<const osmium::Way&>(item));
+                    std::forward<THandler>(handler).osm_object(item);
+                    std::forward<THandler>(handler).way(static_cast<const osmium::Way&>(item));
                     break;
                 case osmium::item_type::relation:
-                    handler.osm_object(item);
-                    handler.relation(static_cast<const osmium::Relation&>(item));
+                    std::forward<THandler>(handler).osm_object(item);
+                    std::forward<THandler>(handler).relation(static_cast<const osmium::Relation&>(item));
                     break;
                 case osmium::item_type::area:
-                    handler.osm_object(item);
-                    handler.area(static_cast<const osmium::Area&>(item));
+                    std::forward<THandler>(handler).osm_object(item);
+                    std::forward<THandler>(handler).area(static_cast<const osmium::Area&>(item));
                     break;
                 default:
                     throw osmium::unknown_type{};
@@ -179,20 +179,20 @@ namespace osmium {
         inline void apply_item_impl(osmium::OSMObject& item, THandler&& handler) {
             switch (item.type()) {
                 case osmium::item_type::node:
-                    handler.osm_object(item);
-                    handler.node(static_cast<osmium::Node&>(item));
+                    std::forward<THandler>(handler).osm_object(item);
+                    std::forward<THandler>(handler).node(static_cast<osmium::Node&>(item));
                     break;
                 case osmium::item_type::way:
-                    handler.osm_object(item);
-                    handler.way(static_cast<osmium::Way&>(item));
+                    std::forward<THandler>(handler).osm_object(item);
+                    std::forward<THandler>(handler).way(static_cast<osmium::Way&>(item));
                     break;
                 case osmium::item_type::relation:
-                    handler.osm_object(item);
-                    handler.relation(static_cast<osmium::Relation&>(item));
+                    std::forward<THandler>(handler).osm_object(item);
+                    std::forward<THandler>(handler).relation(static_cast<osmium::Relation&>(item));
                     break;
                 case osmium::item_type::area:
-                    handler.osm_object(item);
-                    handler.area(static_cast<osmium::Area&>(item));
+                    std::forward<THandler>(handler).osm_object(item);
+                    std::forward<THandler>(handler).area(static_cast<osmium::Area&>(item));
                     break;
                 default:
                     throw osmium::unknown_type{};

From 126434529b9dc842788250820e7608cd05877009 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 7 Apr 2025 11:25:02 +0200
Subject: [PATCH 259/430] prepare relase 2.1.0

---
 CMakeLists.txt              | 2 +-
 man/osm2pgsql-gen.1         | 2 +-
 man/osm2pgsql-replication.1 | 2 +-
 man/osm2pgsql.1             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c913bfa7..98ea79d32 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 cmake_minimum_required(VERSION 3.10.0)
 
-project(osm2pgsql VERSION 2.0.1 LANGUAGES CXX C)
+project(osm2pgsql VERSION 2.1.0 LANGUAGES CXX C)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
diff --git a/man/osm2pgsql-gen.1 b/man/osm2pgsql-gen.1
index 583a3aefd..70912b8d2 100644
--- a/man/osm2pgsql-gen.1
+++ b/man/osm2pgsql-gen.1
@@ -1,4 +1,4 @@
-.TH "OSM2PGSQL" "1" "2.0.1" "" ""
+.TH "OSM2PGSQL" "1" "2.1.0" "" ""
 .SH NAME
 .PP
 osm2pgsql-gen - Generalize OpenStreetMap data - EXPERIMENTAL!
diff --git a/man/osm2pgsql-replication.1 b/man/osm2pgsql-replication.1
index 01308dabb..b60f46975 100644
--- a/man/osm2pgsql-replication.1
+++ b/man/osm2pgsql-replication.1
@@ -1,4 +1,4 @@
-.TH "OSM2PGSQL-REPLICATION" "1" "2.0.1" "" ""
+.TH "OSM2PGSQL-REPLICATION" "1" "2.1.0" "" ""
 .SH NAME
 osm2pgsql-replication \- osm2pgsql database updater
 .SH SYNOPSIS
diff --git a/man/osm2pgsql.1 b/man/osm2pgsql.1
index e1adf414c..f06c95140 100644
--- a/man/osm2pgsql.1
+++ b/man/osm2pgsql.1
@@ -1,4 +1,4 @@
-.TH "OSM2PGSQL" "1" "2.0.1" "" ""
+.TH "OSM2PGSQL" "1" "2.1.0" "" ""
 .SH NAME
 .PP
 osm2pgsql - OpenStreetMap data to PostgreSQL converter

From 9e2962755979c45453a7c286b447c28a78d3d5f5 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 10 Apr 2025 10:47:46 +0200
Subject: [PATCH 260/430] Add failing test for non-existent flat node file

See #2315
---
 tests/test-persistent-cache.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/test-persistent-cache.cpp b/tests/test-persistent-cache.cpp
index 0d91ad49b..dfb9c0f3f 100644
--- a/tests/test-persistent-cache.cpp
+++ b/tests/test-persistent-cache.cpp
@@ -107,3 +107,12 @@ TEST_CASE("Persistent cache", "[NoDB]")
         read_location(cache, 9934, -179.999, 89.1);
     }
 }
+
+TEST_CASE("Opening non-existent persistent cache should fail in append mode", "[NoDB]")
+{
+    std::string const flat_node_file =
+        "test_middle_flat.nonexistent.flat.nodes.bin";
+    testing::cleanup::file_t const flatnode_cleaner{flat_node_file};
+
+    REQUIRE_THROWS(node_persistent_cache(flat_node_file, false));
+}

From 4493319968698b193024a965217ee196229d3b1f Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 10 Apr 2025 10:41:56 +0200
Subject: [PATCH 261/430] Do not create flat node file in append mode

It must already exist.

Fixes #2315
---
 src/middle-pgsql.cpp                    |  2 +-
 src/middle-ram.cpp                      |  2 +-
 src/node-persistent-cache.cpp           | 11 ++++++++---
 src/node-persistent-cache.hpp           |  3 ++-
 tests/bdd/regression/properties.feature | 17 ++++++++++++++++-
 tests/test-persistent-cache.cpp         |  6 +++---
 6 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index 655617ddb..7bae3ec67 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -1248,7 +1248,7 @@ middle_pgsql_t::middle_pgsql_t(std::shared_ptr<thread_pool_t> thread_pool,
     } else {
         m_store_options.use_flat_node_file = true;
         m_persistent_cache = std::make_shared<node_persistent_cache>(
-            options->flat_node_file, options->droptemp);
+            options->flat_node_file, !options->append, options->droptemp);
     }
 
     log_debug("Mid: pgsql, cache={}", options->cache);
diff --git a/src/middle-ram.cpp b/src/middle-ram.cpp
index 10c095960..e670fecf3 100644
--- a/src/middle-ram.cpp
+++ b/src/middle-ram.cpp
@@ -80,7 +80,7 @@ middle_ram_t::middle_ram_t(std::shared_ptr<thread_pool_t> thread_pool,
 
     if (!options->flat_node_file.empty()) {
         m_persistent_cache = std::make_shared<node_persistent_cache>(
-            options->flat_node_file, options->droptemp);
+            options->flat_node_file, !options->append, options->droptemp);
     }
 }
 
diff --git a/src/node-persistent-cache.cpp b/src/node-persistent-cache.cpp
index 7b5fb8453..6e07675dd 100644
--- a/src/node-persistent-cache.cpp
+++ b/src/node-persistent-cache.cpp
@@ -29,15 +29,20 @@ osmium::Location node_persistent_cache::get(osmid_t id) const noexcept
 }
 
 node_persistent_cache::node_persistent_cache(std::string file_name,
-                                             bool remove_file)
+                                             bool create_file, bool remove_file)
 : m_file_name(std::move(file_name)), m_remove_file(remove_file)
 {
     assert(!m_file_name.empty());
 
     log_debug("Loading persistent node cache from '{}'.", m_file_name);
 
-    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg, hicpp-signed-bitwise)
-    m_fd = open(m_file_name.c_str(), O_RDWR | O_CREAT, 0644);
+    int flags = O_RDWR; // NOLINT(hicpp-signed-bitwise)
+    if (create_file) {
+        flags |= O_CREAT; // NOLINT(hicpp-signed-bitwise)
+    }
+
+    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg)
+    m_fd = open(m_file_name.c_str(), flags, 0644);
     if (m_fd < 0) {
         throw std::system_error{
             errno, std::system_category(),
diff --git a/src/node-persistent-cache.hpp b/src/node-persistent-cache.hpp
index 933efc47e..936771723 100644
--- a/src/node-persistent-cache.hpp
+++ b/src/node-persistent-cache.hpp
@@ -21,7 +21,8 @@
 class node_persistent_cache
 {
 public:
-    node_persistent_cache(std::string file_name, bool remove_file);
+    node_persistent_cache(std::string file_name, bool create_file,
+                          bool remove_file);
     ~node_persistent_cache() noexcept;
 
     node_persistent_cache(node_persistent_cache const &) = delete;
diff --git a/tests/bdd/regression/properties.feature b/tests/bdd/regression/properties.feature
index 37c8bf379..e22e299d4 100644
--- a/tests/bdd/regression/properties.feature
+++ b/tests/bdd/regression/properties.feature
@@ -62,10 +62,25 @@ Feature: Updates to the test database with properties check
             |                |                | Not using flat node file (same as on import). |
             | --flat-nodes=x |                | Using flat node file                          |
             | --flat-nodes=x | --flat-nodes=x | Using flat node file                          |
-            | --flat-nodes=x | --flat-nodes=y | Using the flat node file you specified        |
             | --prefix=abc   |                | Using prefix 'abc' (same as on import).       |
 
 
+    Scenario: Create, then append with non-existent flat node file
+        When running osm2pgsql pgsql with parameters
+            | --slim         |
+            | --flat-nodes=x |
+
+        Given the input file '000466354.osc.gz'
+        Then running osm2pgsql pgsql with parameters fails
+            | -a             |
+            | --slim         |
+            | --flat-nodes=y |
+        And the error output contains
+            """
+            Unable to open flatnode file
+            """
+
+
     Scenario: Create with different output than append
         When running osm2pgsql pgsql with parameters
             | --slim |
diff --git a/tests/test-persistent-cache.cpp b/tests/test-persistent-cache.cpp
index dfb9c0f3f..96cf150ac 100644
--- a/tests/test-persistent-cache.cpp
+++ b/tests/test-persistent-cache.cpp
@@ -43,7 +43,7 @@ TEST_CASE("Persistent cache", "[NoDB]")
 
     // create a new cache
     {
-        node_persistent_cache cache{flat_node_file, false};
+        node_persistent_cache cache{flat_node_file, true, false};
 
         // write in order
         write_and_read_location(&cache, 10, 10.01, -45.3);
@@ -66,7 +66,7 @@ TEST_CASE("Persistent cache", "[NoDB]")
 
     // reopen the cache
     {
-        node_persistent_cache cache{flat_node_file, false};
+        node_persistent_cache cache{flat_node_file, false, false};
 
         // read all previously written locations
         read_location(cache, 10, 10.01, -45.3);
@@ -114,5 +114,5 @@ TEST_CASE("Opening non-existent persistent cache should fail in append mode", "[
         "test_middle_flat.nonexistent.flat.nodes.bin";
     testing::cleanup::file_t const flatnode_cleaner{flat_node_file};
 
-    REQUIRE_THROWS(node_persistent_cache(flat_node_file, false));
+    REQUIRE_THROWS(node_persistent_cache(flat_node_file, false, false));
 }

From b245ed6a6ee7a60557dc05b964c2f283ca94c6f5 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 10 Apr 2025 11:18:12 +0200
Subject: [PATCH 262/430] Use binary mode files for flat node files on Windows

---
 src/node-persistent-cache.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/node-persistent-cache.cpp b/src/node-persistent-cache.cpp
index 6e07675dd..5b918b54e 100644
--- a/src/node-persistent-cache.cpp
+++ b/src/node-persistent-cache.cpp
@@ -41,6 +41,10 @@ node_persistent_cache::node_persistent_cache(std::string file_name,
         flags |= O_CREAT; // NOLINT(hicpp-signed-bitwise)
     }
 
+#ifdef _WIN32
+    flags |= O_BINARY; // NOLINT(hicpp-signed-bitwise)
+#endif
+
     // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg)
     m_fd = open(m_file_name.c_str(), flags, 0644);
     if (m_fd < 0) {

From 608faefaf5246efaf5c3897955ad57feadbba178 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 13 Apr 2025 17:59:54 +0200
Subject: [PATCH 263/430] always allow table insertion for id-less tables

---
 src/flex-table.cpp                  |  5 ++-
 tests/bdd/flex/table-ids.feature    | 57 +++++++++++++++++++++++++++++
 tests/bdd/steps/geometry_factory.py |  2 +-
 3 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 tests/bdd/flex/table-ids.feature

diff --git a/src/flex-table.cpp b/src/flex-table.cpp
index e5686ae1b..7d40bb59d 100644
--- a/src/flex-table.cpp
+++ b/src/flex-table.cpp
@@ -76,8 +76,9 @@ bool flex_table_t::has_id_column() const noexcept
 
 bool flex_table_t::matches_type(osmium::item_type type) const noexcept
 {
-    // This table takes any type -> okay
-    if (m_id_type == flex_table_index_type::any_object) {
+    // This table takes any type or has no ids -> okay
+    if (m_id_type == flex_table_index_type::any_object ||
+        m_id_type == flex_table_index_type::no_index) {
         return true;
     }
 
diff --git a/tests/bdd/flex/table-ids.feature b/tests/bdd/flex/table-ids.feature
new file mode 100644
index 000000000..0b9841704
--- /dev/null
+++ b/tests/bdd/flex/table-ids.feature
@@ -0,0 +1,57 @@
+Feature: Test for correct id column generation
+
+    Background:
+        Given the 0.1 grid
+           | 1 |   |  2 |
+           | 3 |   |  4 |
+
+    Scenario: Data can be inserted into tables without an iD column
+        Given the lua style
+            """
+            local simple = osm2pgsql.define_table{
+                name = 'simple',
+                columns = {{ column = 'id', type = 'bigint'}}
+            }
+
+            function osm2pgsql.process_node(object)
+                simple:insert{ id = object.id }
+            end
+
+            function osm2pgsql.process_way(object)
+                simple:insert{ id = object.id }
+            end
+
+            function osm2pgsql.process_relation(object)
+                simple:insert{ id = object.id }
+            end
+            """
+        And the OSM data
+            """
+            n1 Tp=1
+            n2 Tp=2
+            w10 Tp=10 Nn1,n2,n4
+            r100 Tp=100 Mn1@,n2@
+            """
+        When running osm2pgsql flex with parameters
+            | --slim |
+        Then table simple contains
+            | id  |
+            | 1   |
+            | 2   |
+            | 10  |
+            | 100 |
+        Given the OSM data
+            """
+            n1 v2 dD
+            w11 Tp=11 Nn1,n3
+            """
+        When running osm2pgsql flex with parameters
+            | --slim | -a |
+        Then table simple contains
+            | id  |
+            | 1   |
+            | 2   |
+            | 10  |
+            | 11  |
+            | 100 |
+
diff --git a/tests/bdd/steps/geometry_factory.py b/tests/bdd/steps/geometry_factory.py
index 9ba7f9f5f..41e3f18ee 100644
--- a/tests/bdd/steps/geometry_factory.py
+++ b/tests/bdd/steps/geometry_factory.py
@@ -104,7 +104,7 @@ def complete_node_list(self, nodes):
                 assert ' y' not in line
 
                 coords = self.grid_node(nid)
-                assert coords is not None, f"Coordinates missing for node {node}"
+                assert coords is not None, f"Coordinates missing for node {nid}"
                 nodes[i] = f"{line} x{coords[0]:.{self.grid_precision}f} y{coords[1]:.{self.grid_precision}f}"
 
             todos.discard(nid)

From da5a1d51ea94877ba59d8cadb16f5e9af1464c2a Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 14 Apr 2025 09:52:23 +0200
Subject: [PATCH 264/430] prepare relase 2.1.1

---
 CMakeLists.txt                | 2 +-
 CONTRIBUTING.md               | 4 +++-
 man/osm2pgsql-gen.1           | 2 +-
 man/osm2pgsql-replication.1   | 2 +-
 man/osm2pgsql.1               | 2 +-
 scripts/osm2pgsql-replication | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98ea79d32..9a5fbadd5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 cmake_minimum_required(VERSION 3.10.0)
 
-project(osm2pgsql VERSION 2.1.0 LANGUAGES CXX C)
+project(osm2pgsql VERSION 2.1.1 LANGUAGES CXX C)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 448f42ed9..5c5b10040 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -213,7 +213,9 @@ the report.
 
 * Decide on a new version. (See [semantic versioning](https://semver.org/).)
 * Update version in [CMakeLists.txt](CMakeLists.txt), look for `project` function.
-* Build man page (`make man`) and copy it to `man/osm2pgsql.1`.
+* Update man pages
+  * Build man page: `make man`
+  * Copy to source: `cp man/*1 ../man/`
 * Tag release with release notes in commit message and upload the tag to Github.
 * Fill out release notes on Github.
 * Copy Windows binaries and source tarball to osm2pgsql.org.
diff --git a/man/osm2pgsql-gen.1 b/man/osm2pgsql-gen.1
index 70912b8d2..e5d2cfbd0 100644
--- a/man/osm2pgsql-gen.1
+++ b/man/osm2pgsql-gen.1
@@ -1,4 +1,4 @@
-.TH "OSM2PGSQL" "1" "2.1.0" "" ""
+.TH "OSM2PGSQL" "1" "2.1.1" "" ""
 .SH NAME
 .PP
 osm2pgsql-gen - Generalize OpenStreetMap data - EXPERIMENTAL!
diff --git a/man/osm2pgsql-replication.1 b/man/osm2pgsql-replication.1
index b60f46975..19aeb9192 100644
--- a/man/osm2pgsql-replication.1
+++ b/man/osm2pgsql-replication.1
@@ -1,4 +1,4 @@
-.TH "OSM2PGSQL-REPLICATION" "1" "2.1.0" "" ""
+.TH "OSM2PGSQL-REPLICATION" "1" "2.1.1" "" ""
 .SH NAME
 osm2pgsql-replication \- osm2pgsql database updater
 .SH SYNOPSIS
diff --git a/man/osm2pgsql.1 b/man/osm2pgsql.1
index f06c95140..126515213 100644
--- a/man/osm2pgsql.1
+++ b/man/osm2pgsql.1
@@ -1,4 +1,4 @@
-.TH "OSM2PGSQL" "1" "2.1.0" "" ""
+.TH "OSM2PGSQL" "1" "2.1.1" "" ""
 .SH NAME
 .PP
 osm2pgsql - OpenStreetMap data to PostgreSQL converter
diff --git a/scripts/osm2pgsql-replication b/scripts/osm2pgsql-replication
index 09719f789..58e2215c6 100755
--- a/scripts/osm2pgsql-replication
+++ b/scripts/osm2pgsql-replication
@@ -676,7 +676,7 @@ def get_parser():
     cmd.add_argument('--max-diff-size', type=int, default=500,
                      help='Maximum data to load in MB (default: 500MB)')
     cmd.add_argument('--osm2pgsql-cmd', default=str(OSM2PGSQL_PATH),
-                     help=f'Path to osm2pgsql command (default: {OSM2PGSQL_PATH})')
+                     help=f'Path to osm2pgsql command')
     cmd.add_argument('--once', action='store_true',
                      help='Run updates only once, even when more data is available.')
     cmd.add_argument('--post-processing', metavar='SCRIPT',

From 426796a4e76bdfd7c2533d1325f8742e9a51da3a Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 19 Apr 2025 16:09:16 +0200
Subject: [PATCH 265/430] Fix inner/outer ring accessor boost::geometry adaptor
 types/functions

These types/functions are used to let boost functions access our
polygon/ring types. They are supposed to return (const) references.

I found the bug while doing more complicated geometry processing,
working on some future code for osm2pgsql. It seems the buggy code does
not produce any problems in current code, but I can not guarantee it.
Theoretically it could lead to crashes. It might make some code slower,
though, because of unnecessary copying.
---
 src/geom-boost-adaptor.hpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/geom-boost-adaptor.hpp b/src/geom-boost-adaptor.hpp
index c5af2d03c..c0e165ada 100644
--- a/src/geom-boost-adaptor.hpp
+++ b/src/geom-boost-adaptor.hpp
@@ -54,12 +54,12 @@ struct ring_mutable_type<::geom::polygon_t>
 template <>
 struct interior_const_type<::geom::polygon_t>
 {
-    using type = std::vector<::geom::ring_t> const;
+    using type = std::vector<::geom::ring_t> const &;
 };
 template <>
 struct interior_mutable_type<::geom::polygon_t>
 {
-    using type = std::vector<::geom::ring_t>;
+    using type = std::vector<::geom::ring_t> &;
 };
 
 template <>
@@ -67,16 +67,17 @@ struct exterior_ring<::geom::polygon_t>
 {
     // NOLINTNEXTLINE(google-runtime-references)
     static auto &get(::geom::polygon_t &p) { return p.outer(); }
-    static auto &get(::geom::polygon_t const &p) { return p.outer(); }
+    static auto const &get(::geom::polygon_t const &p) { return p.outer(); }
 };
 
 template <>
 struct interior_rings<::geom::polygon_t>
 {
     // NOLINTNEXTLINE(google-runtime-references)
-    static auto get(::geom::polygon_t &p) { return p.inners(); }
-    static auto get(::geom::polygon_t const &p) { return p.inners(); }
+    static auto &get(::geom::polygon_t &p) { return p.inners(); }
+    static auto const &get(::geom::polygon_t const &p) { return p.inners(); }
 };
+
 } // namespace boost::geometry::traits
 
 #endif // OSM2PGSQL_GEOM_BOOST_ADAPTOR_HPP

From 706313c5468cb6ace2debed6ac7056e63ee1dfbd Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 19 Apr 2025 17:18:00 +0200
Subject: [PATCH 266/430] Disable some clang-tidy warnings

---
 .clang-tidy | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.clang-tidy b/.clang-tidy
index 1bae03965..b4e660b85 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,5 +1,5 @@
 ---
-Checks: '*,-abseil-*,-altera-*,-android-cloexec-*,-bugprone-easily-swappable-parameters,-cert-err58-cpp,-cppcoreguidelines-avoid-do-while,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-cstyle-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-vararg,-fuchsia-*,-google-readability-casting,-google-readability-todo,-hicpp-named-parameter,-hicpp-no-array-decay,-hicpp-vararg,-llvm-include-order,-llvm-header-guard,-llvmlibc-*,-misc-include-cleaner,-misc-no-recursion,-modernize-use-nodiscard,-modernize-use-trailing-return-type,-readability-identifier-length,-readability-implicit-bool-conversion,-readability-named-parameter,-readability-magic-numbers'
+Checks: '*,-abseil-*,-altera-*,-android-cloexec-*,-boost-use-ranges,-bugprone-chained-comparison,-bugprone-easily-swappable-parameters,-cert-err58-cpp,-cppcoreguidelines-avoid-do-while,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-cstyle-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-vararg,-fuchsia-*,-google-readability-casting,-google-readability-todo,-hicpp-named-parameter,-hicpp-no-array-decay,-hicpp-vararg,-llvm-include-order,-llvm-header-guard,-llvmlibc-*,-misc-include-cleaner,-misc-no-recursion,-modernize-use-nodiscard,-modernize-use-trailing-return-type,-readability-identifier-length,-readability-implicit-bool-conversion,-readability-math-missing-parentheses,-readability-named-parameter,-readability-magic-numbers'
 #
 #  cppcoreguidelines-pro-type-cstyle-cast
 #  google-build-using-namespace
@@ -7,6 +7,7 @@ Checks: '*,-abseil-*,-altera-*,-android-cloexec-*,-bugprone-easily-swappable-par
 #  llvm-header-guard
 #  llvm-include-order
 #  hicpp-named-parameter
+#  readability-math-missing-parentheses
 #  readability-named-parameter
 #    Differ from our style guidelines
 #
@@ -19,6 +20,12 @@ Checks: '*,-abseil-*,-altera-*,-android-cloexec-*,-bugprone-easily-swappable-par
 #  android-cloexec-*
 #    O_CLOEXEC isn't available on Windows
 #
+#  boost-use-ranges
+#    Not applicable, we don't want to rely on more code from boost.
+#
+#  bugprone-chained-comparison
+#    Triggerd by the Catch library in many places.
+#
 #  bugprone-easily-swappable-parameters
 #    Can't always be avoided.
 #

From 7215cfa7531936618d849f3d23b068780c8f5f7b Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 19 Apr 2025 17:26:58 +0200
Subject: [PATCH 267/430] Move internal linkage code into anonymous namespace

---
 src/flex-lua-geom.cpp                      |  4 +-
 src/gen/gen-rivers.cpp                     |  4 +-
 src/gen/raster.cpp                         |  4 +
 src/output-flex.cpp                        | 96 +++++++++++-----------
 tests/test-lua-utils.cpp                   |  4 +
 tests/test-output-flex-example-configs.cpp |  4 +-
 tests/test-output-flex-update.cpp          | 18 ++--
 7 files changed, 71 insertions(+), 63 deletions(-)

diff --git a/src/flex-lua-geom.cpp b/src/flex-lua-geom.cpp
index 03184b1b3..dc4772905 100644
--- a/src/flex-lua-geom.cpp
+++ b/src/flex-lua-geom.cpp
@@ -36,6 +36,8 @@ geom::geometry_t *unpack_geometry(lua_State *lua_state, int n) noexcept
     return static_cast<geom::geometry_t *>(user_data);
 }
 
+namespace {
+
 /**
  * This function is called by Lua garbage collection when a geometry object
  * needs cleaning up. It calls the destructor of the C++ object. After that
@@ -51,8 +53,6 @@ int geom_gc(lua_State *lua_state) noexcept
     return 0;
 }
 
-namespace {
-
 // The following functions are called when their counterparts in Lua are
 // called on geometry objects.
 
diff --git a/src/gen/gen-rivers.cpp b/src/gen/gen-rivers.cpp
index 66d028a20..8c94510fc 100644
--- a/src/gen/gen-rivers.cpp
+++ b/src/gen/gen-rivers.cpp
@@ -41,6 +41,8 @@ gen_rivers_t::gen_rivers_t(pg_conn_t *connection, bool append, params_t *params)
                                get_params().get_string("src_areas")));
 }
 
+namespace {
+
 /// The data for a graph edge in the waterway network.
 struct edge_t
 {
@@ -76,8 +78,6 @@ bool operator<(geom::point_t a, edge_t const &b) noexcept
     return a < b.points[0];
 }
 
-namespace {
-
 void follow_chain_and_set_width(
     edge_t const &edge, std::vector<edge_t> *edges,
     std::map<geom::point_t, uint8_t> const &node_order,
diff --git a/src/gen/raster.cpp b/src/gen/raster.cpp
index 9bbb4667a..26eddf5ff 100644
--- a/src/gen/raster.cpp
+++ b/src/gen/raster.cpp
@@ -16,12 +16,16 @@
 
 #include <string>
 
+namespace {
+
 template <typename T>
 void append(std::string *str, T value)
 {
     str->append(reinterpret_cast<char *>(&value), sizeof(T));
 }
 
+} // anonymous namespace
+
 void add_raster_header(std::string *wkb, wkb_raster_header const &data)
 {
     append(wkb, data.endianness);
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 22e8aa2e6..e1f92215e 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -334,6 +334,54 @@ void check_for_object(lua_State *lua_state, char const *const function_name)
              function_name);
 }
 
+/**
+ * Expects a Lua (hash) table on the stack, reads the field with name of the
+ * 'type' parameter which must be either nil or a Lua (array) table, in which
+ * case all (integer) ids in that table are reads into the 'ids' out
+ * parameter.
+ */
+void get_object_ids(lua_State *lua_state, char const *const type, idlist_t *ids)
+{
+    lua_getfield(lua_state, -1, type);
+    int const ltype = lua_type(lua_state, -1);
+
+    if (ltype == LUA_TNIL) {
+        lua_pop(lua_state, 1);
+        return;
+    }
+
+    if (ltype != LUA_TTABLE) {
+        lua_pop(lua_state, 1);
+        throw fmt_error(
+            "Table returned from select_relation_members() contains '{}' "
+            "field, but it isn't an array table.",
+            type);
+    }
+
+    if (!luaX_is_array(lua_state)) {
+        lua_pop(lua_state, 1);
+        throw fmt_error(
+            "Table returned from select_relation_members() contains '{}' "
+            "field, but it isn't an array table.",
+            type);
+    }
+
+    luaX_for_each(lua_state, [&]() {
+        osmid_t const id = lua_tointeger(lua_state, -1);
+        if (id == 0) {
+            throw fmt_error(
+                "Table returned from select_relation_members() contains "
+                "'{}' field, which must contain an array of non-zero "
+                "integer node ids.",
+                type);
+        }
+
+        ids->push_back(id);
+    });
+
+    lua_pop(lua_state, 1);
+}
+
 } // anonymous namespace
 
 /**
@@ -899,54 +947,6 @@ void output_flex_t::pending_way(osmid_t id)
     get_mutex_and_call_lua_function(m_process_way, m_way_cache.get());
 }
 
-/**
- * Expects a Lua (hash) table on the stack, reads the field with name of the
- * 'type' parameter which must be either nil or a Lua (array) table, in which
- * case all (integer) ids in that table are reads into the 'ids' out
- * parameter.
- */
-void get_object_ids(lua_State *lua_state, char const *const type, idlist_t *ids)
-{
-    lua_getfield(lua_state, -1, type);
-    int const ltype = lua_type(lua_state, -1);
-
-    if (ltype == LUA_TNIL) {
-        lua_pop(lua_state, 1);
-        return;
-    }
-
-    if (ltype != LUA_TTABLE) {
-        lua_pop(lua_state, 1);
-        throw fmt_error(
-            "Table returned from select_relation_members() contains '{}' "
-            "field, but it isn't an array table.",
-            type);
-    }
-
-    if (!luaX_is_array(lua_state)) {
-        lua_pop(lua_state, 1);
-        throw fmt_error(
-            "Table returned from select_relation_members() contains '{}' "
-            "field, but it isn't an array table.",
-            type);
-    }
-
-    luaX_for_each(lua_state, [&]() {
-        osmid_t const id = lua_tointeger(lua_state, -1);
-        if (id == 0) {
-            throw fmt_error(
-                "Table returned from select_relation_members() contains "
-                "'{}' field, which must contain an array of non-zero "
-                "integer node ids.",
-                type);
-        }
-
-        ids->push_back(id);
-    });
-
-    lua_pop(lua_state, 1);
-}
-
 void output_flex_t::select_relation_members()
 {
     if (!m_select_relation_members) {
diff --git a/tests/test-lua-utils.cpp b/tests/test-lua-utils.cpp
index 6da752042..49af80dcc 100644
--- a/tests/test-lua-utils.cpp
+++ b/tests/test-lua-utils.cpp
@@ -13,6 +13,8 @@
 
 #include <lua.hpp>
 
+namespace {
+
 // Run the Lua code in "code" and then execute the function "func".
 template <typename FUNC>
 void test_lua(lua_State *lua_state, char const *code, FUNC&& func) {
@@ -25,6 +27,8 @@ void test_lua(lua_State *lua_state, char const *code, FUNC&& func) {
     REQUIRE(lua_gettop(lua_state) == 0);
 }
 
+} // anonymous namespace
+
 TEST_CASE("check luaX_is_empty_table", "[NoDB]")
 {
     std::shared_ptr<lua_State> lua_state{
diff --git a/tests/test-output-flex-example-configs.cpp b/tests/test-output-flex-example-configs.cpp
index e49c45542..3d1bcfba3 100644
--- a/tests/test-output-flex-example-configs.cpp
+++ b/tests/test-output-flex-example-configs.cpp
@@ -25,8 +25,6 @@ testing::db::import_t db;
 
 char const *const data_file = "liechtenstein-2013-08-03.osm.pbf";
 
-} // anonymous namespace
-
 std::vector<std::string> get_files() {
     // NOLINTNEXTLINE(concurrency-mt-unsafe)
     char const *env = std::getenv("EXAMPLE_FILES");
@@ -34,6 +32,8 @@ std::vector<std::string> get_files() {
     return osmium::split_string(env, ',', true);
 }
 
+} // anonymous namespace
+
 TEST_CASE("minimal test for flex example configs")
 {
     auto const files = get_files();
diff --git a/tests/test-output-flex-update.cpp b/tests/test-output-flex-update.cpp
index 4c31b31d1..a6a6b0d4f 100644
--- a/tests/test-output-flex-update.cpp
+++ b/tests/test-output-flex-update.cpp
@@ -19,6 +19,15 @@ testing::db::import_t db;
 
 char const *const conf_file = "test_output_flex.lua";
 
+// Return a string with the schema name prepended to the table name.
+std::string with_schema(char const *table_name, options_t const &options)
+{
+    if (options.dbschema.empty()) {
+        return {table_name};
+    }
+    return options.dbschema + "." + table_name;
+}
+
 } // anonymous namespace
 
 struct options_slim_default
@@ -72,15 +81,6 @@ END
     }
 };
 
-// Return a string with the schema name prepended to the table name.
-std::string with_schema(char const *table_name, options_t const &options)
-{
-    if (options.dbschema.empty()) {
-        return {table_name};
-    }
-    return options.dbschema + "." + table_name;
-}
-
 TEMPLATE_TEST_CASE("updating a node", "", options_slim_default,
                    options_slim_expire, options_slim_schema)
 {

From 6a9e32562490dce2b57fa018822ef024ba5b1b3a Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 19 Apr 2025 17:44:53 +0200
Subject: [PATCH 268/430] Remove return with parameter in void function

---
 src/gen/gen-base.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gen/gen-base.cpp b/src/gen/gen-base.cpp
index b14259f97..cdf553041 100644
--- a/src/gen/gen-base.cpp
+++ b/src/gen/gen-base.cpp
@@ -103,7 +103,7 @@ void gen_base_t::dbprepare(std::string_view stmt, std::string const &templ)
 {
     template_t sql_template{templ};
     sql_template.set_params(get_params());
-    return connection().prepare(stmt, fmt::runtime(sql_template.render()));
+    connection().prepare(stmt, fmt::runtime(sql_template.render()));
 }
 
 void gen_base_t::dbprepare(std::string_view stmt, params_t const &tmp_params,
@@ -112,7 +112,7 @@ void gen_base_t::dbprepare(std::string_view stmt, params_t const &tmp_params,
     template_t sql_template{templ};
     sql_template.set_params(get_params());
     sql_template.set_params(tmp_params);
-    return connection().prepare(stmt, fmt::runtime(sql_template.render()));
+    connection().prepare(stmt, fmt::runtime(sql_template.render()));
 }
 
 void gen_base_t::raster_table_preprocess(std::string const &table)

From a082a29ce15badc6402744736137732550ffdd67 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 19 Apr 2025 19:33:32 +0200
Subject: [PATCH 269/430] CI: Also build with address and UB sanitizer

---
 .github/workflows/ci.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9cd9ffd27..61fa6faea 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -296,6 +296,27 @@ jobs:
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
 
+  ubuntu24-pg17-clang16-san:
+    runs-on: ubuntu-24.04
+
+    env:
+      CC: clang-16
+      CXX: clang++-16
+      EXTRA_FLAGS: -fsanitize=address,undefined -fno-sanitize-recover=all -fno-omit-frame-pointer
+      LDFLAGS: -fsanitize=address,undefined
+      LUA_VERSION: 5.3
+      LUAJIT_OPTION: OFF
+      POSTGRESQL_VERSION: 17
+      POSTGIS_VERSION: 3
+      BUILD_TYPE: Debug
+      PSYCOPG: 3
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/ubuntu-prerequisites
+      - uses: ./.github/actions/linux-cmake
+      - uses: ./.github/actions/build-and-test
+
   ubuntu24-pg17-gcc12-cpp20:
     runs-on: ubuntu-24.04
 

From 6b343cf4097dd69ec15391abb400a91857077b7e Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 19 Apr 2025 17:40:08 +0200
Subject: [PATCH 270/430] Fix two bugs in wildcard match

Two or more consecutive * characters were not handled. A fix was on the
web site this code comes from.

Before calling wildMatch recursively with "str + 1", the code did not
check whether *str was zero, in which case the "str + 1" is illegal.

This also changes the names of the function parameters which were not
consistent in .hpp and .cpp files.
---
 src/wildcmp.cpp               | 27 ++++++++++++++++++---------
 src/wildcmp.hpp               |  2 +-
 tests/test-wildcard-match.cpp |  5 +++++
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/wildcmp.cpp b/src/wildcmp.cpp
index 40b1d35a7..bc7365194 100644
--- a/src/wildcmp.cpp
+++ b/src/wildcmp.cpp
@@ -15,28 +15,37 @@
  * Case sensitive wild card match with a string.
  * * matches any string or no character.
  * ? matches any single character.
- * anything else etc must match the character exactly.
+ * anything else must match the character exactly.
  *
  * Returns if a match was found.
  */
-bool wildMatch(char const *first, char const *second)
+bool wildMatch(char const *expr, char const *str) noexcept
 {
-    // Code borrowed from
+    // Code based on
     // http://www.geeksforgeeks.org/wildcard-character-matching/
-    if (*first == '\0' && *second == '\0') {
+    if (*expr == '\0' && *str == '\0') {
         return true;
     }
 
-    if (*first == '*' && *(first + 1) != '\0' && *second == '\0') {
+    if (*expr == '*') {
+        while (*(expr + 1) == '*') {
+            ++expr;
+        }
+    }
+
+    if (*expr == '*' && *(expr + 1) != '\0' && *str == '\0') {
         return false;
     }
 
-    if (*first == '?' || *first == *second) {
-        return wildMatch(first + 1, second + 1);
+    if (*expr == '?' || *expr == *str) {
+        if (*str == '\0') {
+            return false;
+        }
+        return wildMatch(expr + 1, str + 1);
     }
 
-    if (*first == '*') {
-        return wildMatch(first + 1, second) || wildMatch(first, second + 1);
+    if (*expr == '*') {
+        return wildMatch(expr + 1, str) || wildMatch(expr, str + 1);
     }
 
     return false;
diff --git a/src/wildcmp.hpp b/src/wildcmp.hpp
index 2ad8a080d..e6a4c84e3 100644
--- a/src/wildcmp.hpp
+++ b/src/wildcmp.hpp
@@ -10,6 +10,6 @@
  * For a full list of authors see the git log.
  */
 
-bool wildMatch(char const *wildCard, char const *string);
+bool wildMatch(char const *expr, char const *str) noexcept;
 
 #endif // OSM2PGSQL_WILDCMP_HPP
diff --git a/tests/test-wildcard-match.cpp b/tests/test-wildcard-match.cpp
index 5eb10c7bd..0676d23c4 100644
--- a/tests/test-wildcard-match.cpp
+++ b/tests/test-wildcard-match.cpp
@@ -17,14 +17,17 @@ TEST_CASE("Wildcard matching", "[NoDB]")
     CHECK_FALSE(wildMatch("fhwieurwe", "fhwieurw"));
     CHECK_FALSE(wildMatch("fhwieurw", "fhwieurwe"));
     CHECK(wildMatch("*", "foo"));
+    CHECK(wildMatch("**", "foo"));
     CHECK_FALSE(wildMatch("r*", "foo"));
     CHECK(wildMatch("r*", "roo"));
     CHECK(wildMatch("*bar", "Hausbar"));
     CHECK_FALSE(wildMatch("*bar", "Haustar"));
     CHECK(wildMatch("*", ""));
+    CHECK(wildMatch("**", ""));
     CHECK(wildMatch("kin*la", "kinla"));
     CHECK(wildMatch("kin*la", "kinLLla"));
     CHECK(wildMatch("kin*la", "kinlalalala"));
+    CHECK(wildMatch("kin**la", "kinlalalala"));
     CHECK_FALSE(wildMatch("kin*la", "kinlaa"));
     CHECK_FALSE(wildMatch("kin*la", "ki??laa"));
     CHECK(wildMatch("1*2*3", "123"));
@@ -35,4 +38,6 @@ TEST_CASE("Wildcard matching", "[NoDB]")
     CHECK_FALSE(wildMatch("bo??f", "boxf"));
     CHECK(wildMatch("?5?", "?5?"));
     CHECK(wildMatch("?5?", "x5x"));
+    CHECK_FALSE(wildMatch("?abc", ""));
+    CHECK_FALSE(wildMatch("?", ""));
 }

From 1d693eba90cb1910e578459e586a9f3af13f2571 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 19 Apr 2025 20:21:25 +0200
Subject: [PATCH 271/430] Rename wildMatch() to wild_match()

To use our normal naming convention.
---
 src/tagtransform-c.cpp        |  2 +-
 src/wildcmp.cpp               |  6 ++--
 src/wildcmp.hpp               |  2 +-
 tests/test-wildcard-match.cpp | 54 +++++++++++++++++------------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/tagtransform-c.cpp b/src/tagtransform-c.cpp
index c471d8541..9c1e34153 100644
--- a/src/tagtransform-c.cpp
+++ b/src/tagtransform-c.cpp
@@ -112,7 +112,7 @@ bool c_tagtransform_t::check_key(std::vector<taginfo> const &infos,
     //go through the actual tags found on the item and keep the ones in the export list
     for (auto const &info : infos) {
         if (info.flags & FLAG_DELETE) {
-            if (wildMatch(info.name.c_str(), k)) {
+            if (wild_match(info.name.c_str(), k)) {
                 return false;
             }
         } else if (std::strcmp(info.name.c_str(), k) == 0) {
diff --git a/src/wildcmp.cpp b/src/wildcmp.cpp
index bc7365194..9ae36d49b 100644
--- a/src/wildcmp.cpp
+++ b/src/wildcmp.cpp
@@ -19,7 +19,7 @@
  *
  * Returns if a match was found.
  */
-bool wildMatch(char const *expr, char const *str) noexcept
+bool wild_match(char const *expr, char const *str) noexcept
 {
     // Code based on
     // http://www.geeksforgeeks.org/wildcard-character-matching/
@@ -41,11 +41,11 @@ bool wildMatch(char const *expr, char const *str) noexcept
         if (*str == '\0') {
             return false;
         }
-        return wildMatch(expr + 1, str + 1);
+        return wild_match(expr + 1, str + 1);
     }
 
     if (*expr == '*') {
-        return wildMatch(expr + 1, str) || wildMatch(expr, str + 1);
+        return wild_match(expr + 1, str) || wild_match(expr, str + 1);
     }
 
     return false;
diff --git a/src/wildcmp.hpp b/src/wildcmp.hpp
index e6a4c84e3..b471fa5aa 100644
--- a/src/wildcmp.hpp
+++ b/src/wildcmp.hpp
@@ -10,6 +10,6 @@
  * For a full list of authors see the git log.
  */
 
-bool wildMatch(char const *expr, char const *str) noexcept;
+bool wild_match(char const *expr, char const *str) noexcept;
 
 #endif // OSM2PGSQL_WILDCMP_HPP
diff --git a/tests/test-wildcard-match.cpp b/tests/test-wildcard-match.cpp
index 0676d23c4..b7d82cef1 100644
--- a/tests/test-wildcard-match.cpp
+++ b/tests/test-wildcard-match.cpp
@@ -13,31 +13,31 @@
 
 TEST_CASE("Wildcard matching", "[NoDB]")
 {
-    CHECK(wildMatch("fhwieurwe", "fhwieurwe"));
-    CHECK_FALSE(wildMatch("fhwieurwe", "fhwieurw"));
-    CHECK_FALSE(wildMatch("fhwieurw", "fhwieurwe"));
-    CHECK(wildMatch("*", "foo"));
-    CHECK(wildMatch("**", "foo"));
-    CHECK_FALSE(wildMatch("r*", "foo"));
-    CHECK(wildMatch("r*", "roo"));
-    CHECK(wildMatch("*bar", "Hausbar"));
-    CHECK_FALSE(wildMatch("*bar", "Haustar"));
-    CHECK(wildMatch("*", ""));
-    CHECK(wildMatch("**", ""));
-    CHECK(wildMatch("kin*la", "kinla"));
-    CHECK(wildMatch("kin*la", "kinLLla"));
-    CHECK(wildMatch("kin*la", "kinlalalala"));
-    CHECK(wildMatch("kin**la", "kinlalalala"));
-    CHECK_FALSE(wildMatch("kin*la", "kinlaa"));
-    CHECK_FALSE(wildMatch("kin*la", "ki??laa"));
-    CHECK(wildMatch("1*2*3", "123"));
-    CHECK(wildMatch("1*2*3", "1xX23"));
-    CHECK(wildMatch("1*2*3", "12y23"));
-    CHECK_FALSE(wildMatch("1*2*3", "12"));
-    CHECK(wildMatch("bo??f", "boxxf"));
-    CHECK_FALSE(wildMatch("bo??f", "boxf"));
-    CHECK(wildMatch("?5?", "?5?"));
-    CHECK(wildMatch("?5?", "x5x"));
-    CHECK_FALSE(wildMatch("?abc", ""));
-    CHECK_FALSE(wildMatch("?", ""));
+    CHECK(wild_match("fhwieurwe", "fhwieurwe"));
+    CHECK_FALSE(wild_match("fhwieurwe", "fhwieurw"));
+    CHECK_FALSE(wild_match("fhwieurw", "fhwieurwe"));
+    CHECK(wild_match("*", "foo"));
+    CHECK(wild_match("**", "foo"));
+    CHECK_FALSE(wild_match("r*", "foo"));
+    CHECK(wild_match("r*", "roo"));
+    CHECK(wild_match("*bar", "Hausbar"));
+    CHECK_FALSE(wild_match("*bar", "Haustar"));
+    CHECK(wild_match("*", ""));
+    CHECK(wild_match("**", ""));
+    CHECK(wild_match("kin*la", "kinla"));
+    CHECK(wild_match("kin*la", "kinLLla"));
+    CHECK(wild_match("kin*la", "kinlalalala"));
+    CHECK(wild_match("kin**la", "kinlalalala"));
+    CHECK_FALSE(wild_match("kin*la", "kinlaa"));
+    CHECK_FALSE(wild_match("kin*la", "ki??laa"));
+    CHECK(wild_match("1*2*3", "123"));
+    CHECK(wild_match("1*2*3", "1xX23"));
+    CHECK(wild_match("1*2*3", "12y23"));
+    CHECK_FALSE(wild_match("1*2*3", "12"));
+    CHECK(wild_match("bo??f", "boxxf"));
+    CHECK_FALSE(wild_match("bo??f", "boxf"));
+    CHECK(wild_match("?5?", "?5?"));
+    CHECK(wild_match("?5?", "x5x"));
+    CHECK_FALSE(wild_match("?abc", ""));
+    CHECK_FALSE(wild_match("?", ""));
 }

From 2b5a46147074fc2d871e4ce64b4b863556c7fbd6 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 28 Apr 2025 17:57:08 +0200
Subject: [PATCH 272/430] Fix clang-tidy complaints about value parameters

---
 src/geom-functions.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/geom-functions.cpp b/src/geom-functions.cpp
index 741354eec..a6db4c9ca 100644
--- a/src/geom-functions.cpp
+++ b/src/geom-functions.cpp
@@ -125,6 +125,7 @@ namespace {
 
 void set_to_same_type(geometry_t *output, geometry_t const &input)
 {
+    // NOLINTNEXTLINE(performance-unnecessary-value-param)
     input.visit([&](auto in) { output->set<decltype(in)>(); });
 }
 
@@ -434,7 +435,7 @@ class split_visitor
     {}
 
     template <typename T>
-    void operator()(T) const
+    void operator()(T const &) const
     {}
 
     // false positive https://github.com/llvm/llvm-project/issues/74738
@@ -544,8 +545,9 @@ namespace {
  * empty, do not add the first point returned by *it.
  */
 template <typename ITERATOR>
-void add_nodes_to_linestring(linestring_t *linestring, ITERATOR it,
-                             ITERATOR end)
+void add_nodes_to_linestring(
+    linestring_t *linestring, ITERATOR it,
+    ITERATOR end) // NOLINT(performance-unnecessary-value-param)
 {
     if (!linestring->empty()) {
         assert(it != end);

From 31650f2a29170208e8b829d49426ec96c9e3f1ad Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 28 Apr 2025 18:17:15 +0200
Subject: [PATCH 273/430] Disable a warning that's clearly wrong here

---
 src/wildcmp.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/wildcmp.cpp b/src/wildcmp.cpp
index 9ae36d49b..219fb03a9 100644
--- a/src/wildcmp.cpp
+++ b/src/wildcmp.cpp
@@ -19,6 +19,7 @@
  *
  * Returns if a match was found.
  */
+// NOLINTNEXTLINE(misc-use-internal-linkage) Seems there is a bug in the checker
 bool wild_match(char const *expr, char const *str) noexcept
 {
     // Code based on

From 87b9417205cc67bb3169fa43192bfc2eed0c4bfb Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 23 Apr 2025 08:56:25 +0200
Subject: [PATCH 274/430] Refactor: Split out some code from output_flex_t
 class

The class output_flex_t is huge, output-flex.cpp with over 1000 lines is
the largest source code file we have. This change moves some code out of
there.

This change introduces a new templated wrapper base class
(lua_wrapper_base) for wrapping C++ objects in Lua. It is then used for
the "Table" and "ExpireOutput" Lua objects. Functions that are called
from Lua on those objects are called through the wrapper on the
underlying C++ objects using little wrapper functions in the wrapper
classes. A new macro TRAMPOLINE_WRAPPED_OBJECT() is used to call these
functions where we used the TRAMPOLINE() macro before.

One problem is though that more complex functions need more of the
machinery in the output_flex_t class to work, specifically this is the
"insert" function for tables which can not be implemented without full
access to the output_flex_t class. So this function keeps using the old
mechanism.

This also changes the get_from_idx_param() helper function and the
functions using it
(output_flex_t::[get_table|expire_output]_from_param()) to return a
reference instead of a const reference so that the wrapper will be
initialized with a mutable pointer to the underlying C++ class.
Currently all functions that can be called through the wrapper are const
functions, but this will not necessarily always be the case in the
future.
---
 src/flex-lua-expire-output.cpp |  83 ++++++++++++-
 src/flex-lua-expire-output.hpp |  24 +++-
 src/flex-lua-table.cpp         |  86 +++++++++++++
 src/flex-lua-table.hpp         |  20 +++
 src/flex-lua-wrapper.hpp       |  60 +++++++++
 src/output-flex.cpp            | 218 +++------------------------------
 src/output-flex.hpp            |  27 ++--
 7 files changed, 295 insertions(+), 223 deletions(-)
 create mode 100644 src/flex-lua-wrapper.hpp

diff --git a/src/flex-lua-expire-output.cpp b/src/flex-lua-expire-output.cpp
index e86c73d78..1ec5f23d3 100644
--- a/src/flex-lua-expire-output.cpp
+++ b/src/flex-lua-expire-output.cpp
@@ -12,8 +12,6 @@
 #include "expire-output.hpp"
 #include "format.hpp"
 #include "lua-utils.hpp"
-#include "pgsql.hpp"
-#include "util.hpp"
 
 #include <lua.hpp>
 
@@ -67,6 +65,13 @@ create_expire_output(lua_State *lua_state, std::string const &default_schema,
     return new_expire_output;
 }
 
+TRAMPOLINE_WRAPPED_OBJECT(expire_output, __tostring)
+TRAMPOLINE_WRAPPED_OBJECT(expire_output, filename)
+TRAMPOLINE_WRAPPED_OBJECT(expire_output, maxzoom)
+TRAMPOLINE_WRAPPED_OBJECT(expire_output, minzoom)
+TRAMPOLINE_WRAPPED_OBJECT(expire_output, schema)
+TRAMPOLINE_WRAPPED_OBJECT(expire_output, table)
+
 } // anonymous namespace
 
 int setup_flex_expire_output(lua_State *lua_state,
@@ -88,3 +93,77 @@ int setup_flex_expire_output(lua_State *lua_state,
 
     return 1;
 }
+
+/**
+ * Define the osm2pgsql.ExpireOutput class/metatable.
+ */
+void lua_wrapper_expire_output::init(lua_State *lua_state)
+{
+    lua_getglobal(lua_state, "osm2pgsql");
+    if (luaL_newmetatable(lua_state, osm2pgsql_expire_output_name) != 1) {
+        throw std::runtime_error{"Internal error: Lua newmetatable failed."};
+    }
+    lua_pushvalue(lua_state, -1); // Copy of new metatable
+
+    // Add metatable as osm2pgsql.ExpireOutput so we can access it from Lua
+    lua_setfield(lua_state, -3, "ExpireOutput");
+
+    // Now add functions to metatable
+    lua_pushvalue(lua_state, -1);
+    lua_setfield(lua_state, -2, "__index");
+    luaX_add_table_func(lua_state, "__tostring",
+                        lua_trampoline_expire_output___tostring);
+    luaX_add_table_func(lua_state, "filename",
+                        lua_trampoline_expire_output_filename);
+    luaX_add_table_func(lua_state, "maxzoom",
+                        lua_trampoline_expire_output_maxzoom);
+    luaX_add_table_func(lua_state, "minzoom",
+                        lua_trampoline_expire_output_minzoom);
+    luaX_add_table_func(lua_state, "schema",
+                        lua_trampoline_expire_output_schema);
+    luaX_add_table_func(lua_state, "table", lua_trampoline_expire_output_table);
+
+    lua_pop(lua_state, 2);
+}
+
+int lua_wrapper_expire_output::__tostring() const
+{
+    std::string const str =
+        fmt::format("osm2pgsql.ExpireOutput[minzoom={},maxzoom={},filename={},"
+                    "schema={},table={}]",
+                    self().minzoom(), self().maxzoom(), self().filename(),
+                    self().schema(), self().table());
+    luaX_pushstring(lua_state(), str);
+
+    return 1;
+}
+
+int lua_wrapper_expire_output::filename() const
+{
+    luaX_pushstring(lua_state(), self().filename());
+    return 1;
+}
+
+int lua_wrapper_expire_output::maxzoom() const
+{
+    lua_pushinteger(lua_state(), self().maxzoom());
+    return 1;
+}
+
+int lua_wrapper_expire_output::minzoom() const
+{
+    lua_pushinteger(lua_state(), self().minzoom());
+    return 1;
+}
+
+int lua_wrapper_expire_output::schema() const
+{
+    luaX_pushstring(lua_state(), self().schema());
+    return 1;
+}
+
+int lua_wrapper_expire_output::table() const
+{
+    luaX_pushstring(lua_state(), self().table());
+    return 1;
+}
diff --git a/src/flex-lua-expire-output.hpp b/src/flex-lua-expire-output.hpp
index 5c13f1a69..aa3bfac76 100644
--- a/src/flex-lua-expire-output.hpp
+++ b/src/flex-lua-expire-output.hpp
@@ -10,10 +10,12 @@
  * For a full list of authors see the git log.
  */
 
-#include "expire-output.hpp"
+#include "flex-lua-wrapper.hpp"
 
+#include <string>
 #include <vector>
 
+class expire_output_t;
 struct lua_State;
 
 static char const *const osm2pgsql_expire_output_name =
@@ -23,4 +25,24 @@ int setup_flex_expire_output(lua_State *lua_state,
                              std::string const &default_schema,
                              std::vector<expire_output_t> *expire_outputs);
 
+class lua_wrapper_expire_output : public lua_wrapper_base<expire_output_t>
+{
+public:
+    static void init(lua_State *lua_state);
+
+    lua_wrapper_expire_output(lua_State *lua_state,
+                              expire_output_t *expire_output)
+    : lua_wrapper_base(lua_state, expire_output)
+    {
+    }
+
+    int __tostring() const;
+    int filename() const;
+    int maxzoom() const;
+    int minzoom() const;
+    int schema() const;
+    int table() const;
+
+}; // class lua_wrapper_expire_output
+
 #endif // OSM2PGSQL_FLEX_LUA_EXPIRE_OUTPUT_HPP
diff --git a/src/flex-lua-table.cpp b/src/flex-lua-table.cpp
index 8dd8f647b..3fca95e6f 100644
--- a/src/flex-lua-table.cpp
+++ b/src/flex-lua-table.cpp
@@ -14,7 +14,9 @@
 #include "flex-lua-index.hpp"
 #include "flex-table.hpp"
 #include "lua-utils.hpp"
+#include "output-flex.hpp"
 #include "pgsql-capabilities.hpp"
+#include "util.hpp"
 
 #include <lua.hpp>
 
@@ -416,6 +418,12 @@ void setup_flex_table_indexes(lua_State *lua_state, flex_table_t *table,
     lua_pop(lua_state, 1); // "indexes"
 }
 
+TRAMPOLINE_WRAPPED_OBJECT(table, __tostring)
+TRAMPOLINE_WRAPPED_OBJECT(table, cluster)
+TRAMPOLINE_WRAPPED_OBJECT(table, columns)
+TRAMPOLINE_WRAPPED_OBJECT(table, name)
+TRAMPOLINE_WRAPPED_OBJECT(table, schema)
+
 } // anonymous namespace
 
 int setup_flex_table(lua_State *lua_state, std::vector<flex_table_t> *tables,
@@ -442,3 +450,81 @@ int setup_flex_table(lua_State *lua_state, std::vector<flex_table_t> *tables,
 
     return 1;
 }
+
+/**
+ * Define the osm2pgsql.Table class/metatable.
+ */
+void lua_wrapper_table::init(lua_State *lua_state)
+{
+    lua_getglobal(lua_state, "osm2pgsql");
+    if (luaL_newmetatable(lua_state, osm2pgsql_table_name) != 1) {
+        throw std::runtime_error{"Internal error: Lua newmetatable failed."};
+    }
+    lua_pushvalue(lua_state, -1); // Copy of new metatable
+
+    // Add metatable as osm2pgsql.Table so we can access it from Lua
+    lua_setfield(lua_state, -3, "Table");
+
+    // Now add functions to metatable
+    lua_pushvalue(lua_state, -1);
+    lua_setfield(lua_state, -2, "__index");
+    luaX_add_table_func(lua_state, "__tostring",
+                        lua_trampoline_table___tostring);
+    luaX_add_table_func(lua_state, "insert", lua_trampoline_table_insert);
+    luaX_add_table_func(lua_state, "name", lua_trampoline_table_name);
+    luaX_add_table_func(lua_state, "schema", lua_trampoline_table_schema);
+    luaX_add_table_func(lua_state, "cluster", lua_trampoline_table_cluster);
+    luaX_add_table_func(lua_state, "columns", lua_trampoline_table_columns);
+
+    lua_pop(lua_state, 2);
+}
+
+int lua_wrapper_table::__tostring() const
+{
+    std::string const str{fmt::format("osm2pgsql.Table[{}]", self().name())};
+    luaX_pushstring(lua_state(), str);
+
+    return 1;
+}
+
+int lua_wrapper_table::cluster() const
+{
+    lua_pushboolean(lua_state(), self().cluster_by_geom());
+    return 1;
+}
+
+int lua_wrapper_table::columns() const
+{
+    lua_createtable(lua_state(), (int)self().num_columns(), 0);
+
+    int n = 0;
+    for (auto const &column : self().columns()) {
+        lua_pushinteger(lua_state(), ++n);
+        lua_newtable(lua_state());
+
+        luaX_add_table_str(lua_state(), "name", column.name().c_str());
+        luaX_add_table_str(lua_state(), "type", column.type_name().c_str());
+        luaX_add_table_str(lua_state(), "sql_type",
+                           column.sql_type_name().c_str());
+        luaX_add_table_str(lua_state(), "sql_modifiers",
+                           column.sql_modifiers().c_str());
+        luaX_add_table_bool(lua_state(), "not_null", column.not_null());
+        luaX_add_table_bool(lua_state(), "create_only", column.create_only());
+
+        lua_rawset(lua_state(), -3);
+    }
+
+    return 1;
+}
+
+int lua_wrapper_table::name() const
+{
+    luaX_pushstring(lua_state(), self().name());
+    return 1;
+}
+
+int lua_wrapper_table::schema() const
+{
+    luaX_pushstring(lua_state(), self().schema());
+    return 1;
+}
diff --git a/src/flex-lua-table.hpp b/src/flex-lua-table.hpp
index 6f82ca00e..6e83634ea 100644
--- a/src/flex-lua-table.hpp
+++ b/src/flex-lua-table.hpp
@@ -10,6 +10,8 @@
  * For a full list of authors see the git log.
  */
 
+#include "flex-lua-wrapper.hpp"
+
 #include <string>
 #include <vector>
 
@@ -24,4 +26,22 @@ int setup_flex_table(lua_State *lua_state, std::vector<flex_table_t> *tables,
                      std::string const &default_schema, bool updatable,
                      bool append_mode);
 
+class lua_wrapper_table : public lua_wrapper_base<flex_table_t>
+{
+public:
+    static void init(lua_State *lua_state);
+
+    lua_wrapper_table(lua_State *lua_state, flex_table_t *table)
+    : lua_wrapper_base(lua_state, table)
+    {
+    }
+
+    int __tostring() const;
+    int cluster() const;
+    int columns() const;
+    int name() const;
+    int schema() const;
+
+}; // class lua_wrapper_table
+
 #endif // OSM2PGSQL_FLEX_LUA_TABLE_HPP
diff --git a/src/flex-lua-wrapper.hpp b/src/flex-lua-wrapper.hpp
new file mode 100644
index 000000000..7577e7c71
--- /dev/null
+++ b/src/flex-lua-wrapper.hpp
@@ -0,0 +1,60 @@
+#ifndef OSM2PGSQL_FLEX_LUA_WRAPPER_HPP
+#define OSM2PGSQL_FLEX_LUA_WRAPPER_HPP
+
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+#include "output-flex.hpp"
+
+#include <exception>
+
+#define TRAMPOLINE_WRAPPED_OBJECT(obj_name, func_name)                         \
+    int lua_trampoline_##obj_name##_##func_name(lua_State *lua_state)          \
+    {                                                                          \
+        try {                                                                  \
+            auto *flex =                                                       \
+                static_cast<output_flex_t *>(luaX_get_context(lua_state));     \
+            auto &obj = flex->get_##obj_name##_from_param();                   \
+            return lua_wrapper_##obj_name{lua_state, &obj}.func_name();        \
+        } catch (std::exception const &e) {                                    \
+            return luaL_error(lua_state, "Error in '" #func_name "': %s\n",    \
+                              e.what());                                       \
+        } catch (...) {                                                        \
+            return luaL_error(lua_state,                                       \
+                              "Unknown error in '" #func_name "'.\n");         \
+        }                                                                      \
+    }
+
+struct lua_State;
+
+/**
+ * Helper class for wrapping C++ classes in Lua "classes".
+ */
+template <typename WRAPPED>
+class lua_wrapper_base
+{
+public:
+    lua_wrapper_base(lua_State *lua_state, WRAPPED *wrapped)
+    : m_lua_state(lua_state), m_self(wrapped)
+    {
+    }
+
+protected:
+    lua_State *lua_state() const noexcept { return m_lua_state; }
+
+    WRAPPED const &self() const noexcept { return *m_self; }
+    WRAPPED &self() noexcept { return *m_self; }
+
+private:
+    lua_State *m_lua_state;
+    WRAPPED *m_self;
+
+}; // class lua_wrapper_base;
+
+#endif // OSM2PGSQL_FLEX_LUA_WRAPPER_HPP
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index e1f92215e..164d81b5e 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -7,15 +7,18 @@
  * For a full list of authors see the git log.
  */
 
+#include "output-flex.hpp"
+
 #include "db-copy.hpp"
 #include "debug-output.hpp"
 #include "expire-output.hpp"
 #include "expire-tiles.hpp"
 #include "flex-index.hpp"
+#include "flex-lua-expire-output.hpp"
 #include "flex-lua-geom.hpp"
 #include "flex-lua-index.hpp"
 #include "flex-lua-table.hpp"
-#include "flex-lua-expire-output.hpp"
+#include "flex-lua-wrapper.hpp"
 #include "flex-write.hpp"
 #include "format.hpp"
 #include "geom-from-osm.hpp"
@@ -27,9 +30,8 @@
 #include "middle.hpp"
 #include "options.hpp"
 #include "osmtypes.hpp"
-#include "output-flex.hpp"
-#include "pgsql.hpp"
 #include "pgsql-capabilities.hpp"
+#include "pgsql.hpp"
 #include "properties.hpp"
 #include "reprojection.hpp"
 #include "thread-pool.hpp"
@@ -87,22 +89,10 @@ TRAMPOLINE(app_as_multilinestring, as_multilinestring)
 TRAMPOLINE(app_as_multipolygon, as_multipolygon)
 TRAMPOLINE(app_as_geometrycollection, as_geometrycollection)
 
-TRAMPOLINE(table_name, name)
-TRAMPOLINE(table_schema, schema)
-TRAMPOLINE(table_cluster, cluster)
-TRAMPOLINE(table_insert, insert)
-TRAMPOLINE(table_columns, columns)
-TRAMPOLINE(table_tostring, __tostring)
-
-TRAMPOLINE(expire_output_minzoom, minzoom)
-TRAMPOLINE(expire_output_maxzoom, maxzoom)
-TRAMPOLINE(expire_output_filename, filename)
-TRAMPOLINE(expire_output_schema, schema)
-TRAMPOLINE(expire_output_table, table)
-TRAMPOLINE(expire_output_tostring, __tostring)
-
 } // anonymous namespace
 
+TRAMPOLINE(table_insert, insert)
+
 prepared_lua_function_t::prepared_lua_function_t(lua_State *lua_state,
                                                  calling_context context,
                                                  char const *name, int nresults)
@@ -233,15 +223,15 @@ std::size_t idx_from_param(lua_State *lua_state, char const *type_name)
 }
 
 template <typename CONTAINER>
-typename CONTAINER::value_type const &get_from_idx_param(lua_State *lua_state,
-                                                         CONTAINER *container,
-                                                         char const *type_name)
+typename CONTAINER::value_type &get_from_idx_param(lua_State *lua_state,
+                                                   CONTAINER *container,
+                                                   char const *type_name)
 {
-    if (lua_gettop(lua_state) != 1) {
-        throw fmt_error("Need exactly one parameter of type {}.", type_name);
+    if (lua_gettop(lua_state) < 1) {
+        throw fmt_error("Argument #1 has to be of type {}.", type_name);
     }
 
-    auto const &item = container->at(idx_from_param(lua_state, type_name));
+    auto &item = container->at(idx_from_param(lua_state, type_name));
     lua_remove(lua_state, 1);
     return item;
 }
@@ -602,28 +592,18 @@ int output_flex_t::app_define_expire_output()
                                     m_expire_outputs.get());
 }
 
-flex_table_t const &output_flex_t::get_table_from_param()
+flex_table_t &output_flex_t::get_table_from_param()
 {
     return get_from_idx_param(lua_state(), m_tables.get(),
                               osm2pgsql_table_name);
 }
 
-expire_output_t const &output_flex_t::get_expire_output_from_param()
+expire_output_t &output_flex_t::get_expire_output_from_param()
 {
     return get_from_idx_param(lua_state(), m_expire_outputs.get(),
                               osm2pgsql_expire_output_name);
 }
 
-int output_flex_t::table_tostring()
-{
-    auto const &table = get_table_from_param();
-
-    std::string const str{fmt::format("osm2pgsql.Table[{}]", table.name())};
-    luaX_pushstring(lua_state(), str);
-
-    return 1;
-}
-
 bool output_flex_t::way_cache_t::init(middle_query_t const &middle, osmid_t id)
 {
     m_buffer.clear();
@@ -791,107 +771,6 @@ int output_flex_t::table_insert()
     return 1;
 }
 
-int output_flex_t::table_columns()
-{
-    auto const &table = get_table_from_param();
-
-    lua_createtable(lua_state(), (int)table.num_columns(), 0);
-
-    int n = 0;
-    for (auto const &column : table.columns()) {
-        lua_pushinteger(lua_state(), ++n);
-        lua_newtable(lua_state());
-
-        luaX_add_table_str(lua_state(), "name", column.name().c_str());
-        luaX_add_table_str(lua_state(), "type", column.type_name().c_str());
-        luaX_add_table_str(lua_state(), "sql_type",
-                           column.sql_type_name().c_str());
-        luaX_add_table_str(lua_state(), "sql_modifiers",
-                           column.sql_modifiers().c_str());
-        luaX_add_table_bool(lua_state(), "not_null", column.not_null());
-        luaX_add_table_bool(lua_state(), "create_only", column.create_only());
-
-        lua_rawset(lua_state(), -3);
-    }
-    return 1;
-}
-
-int output_flex_t::table_name()
-{
-    auto const &table = get_table_from_param();
-    luaX_pushstring(lua_state(), table.name());
-    return 1;
-}
-
-int output_flex_t::table_schema()
-{
-    auto const &table = get_table_from_param();
-    luaX_pushstring(lua_state(), table.schema());
-    return 1;
-}
-
-int output_flex_t::table_cluster()
-{
-    auto const &table = get_table_from_param();
-    lua_pushboolean(lua_state(), table.cluster_by_geom());
-    return 1;
-}
-
-int output_flex_t::expire_output_tostring()
-{
-    auto const &expire_output = get_expire_output_from_param();
-
-    std::string const str =
-        fmt::format("osm2pgsql.ExpireOutput[minzoom={},maxzoom={},filename={},"
-                    "schema={},table={}]",
-                    expire_output.minzoom(), expire_output.maxzoom(),
-                    expire_output.filename(), expire_output.schema(),
-                    expire_output.table());
-    luaX_pushstring(lua_state(), str);
-
-    return 1;
-}
-
-int output_flex_t::expire_output_minzoom()
-{
-    auto const &expire_output = get_expire_output_from_param();
-
-    lua_pushinteger(lua_state(), expire_output.minzoom());
-    return 1;
-}
-
-int output_flex_t::expire_output_maxzoom()
-{
-    auto const &expire_output = get_expire_output_from_param();
-
-    lua_pushinteger(lua_state(), expire_output.maxzoom());
-    return 1;
-}
-
-int output_flex_t::expire_output_filename()
-{
-    auto const &expire_output = get_expire_output_from_param();
-
-    luaX_pushstring(lua_state(), expire_output.filename());
-    return 1;
-}
-
-int output_flex_t::expire_output_schema()
-{
-    auto const &expire_output = get_expire_output_from_param();
-
-    luaX_pushstring(lua_state(), expire_output.schema());
-    return 1;
-}
-
-int output_flex_t::expire_output_table()
-{
-    auto const &expire_output = get_expire_output_from_param();
-
-    luaX_pushstring(lua_state(), expire_output.table());
-    return 1;
-}
-
 void output_flex_t::call_lua_function(prepared_lua_function_t func)
 {
     lua_pushvalue(lua_state(), func.index());
@@ -1325,69 +1204,6 @@ output_flex_t::output_flex_t(std::shared_ptr<middle_query_t> const &mid,
     create_expire_tables(*m_expire_outputs, get_options()->connection_params);
 }
 
-namespace {
-
-/**
- * Define the osm2pgsql.Table class/metatable.
- */
-void init_table_class(lua_State *lua_state)
-{
-    lua_getglobal(lua_state, "osm2pgsql");
-    if (luaL_newmetatable(lua_state, osm2pgsql_table_name) != 1) {
-        throw std::runtime_error{"Internal error: Lua newmetatable failed."};
-    }
-    lua_pushvalue(lua_state, -1); // Copy of new metatable
-
-    // Add metatable as osm2pgsql.Table so we can access it from Lua
-    lua_setfield(lua_state, -3, "Table");
-
-    // Now add functions to metatable
-    lua_pushvalue(lua_state, -1);
-    lua_setfield(lua_state, -2, "__index");
-    luaX_add_table_func(lua_state, "__tostring", lua_trampoline_table_tostring);
-    luaX_add_table_func(lua_state, "insert", lua_trampoline_table_insert);
-    luaX_add_table_func(lua_state, "name", lua_trampoline_table_name);
-    luaX_add_table_func(lua_state, "schema", lua_trampoline_table_schema);
-    luaX_add_table_func(lua_state, "cluster", lua_trampoline_table_cluster);
-    luaX_add_table_func(lua_state, "columns", lua_trampoline_table_columns);
-
-    lua_pop(lua_state, 2);
-}
-
-/**
- * Define the osm2pgsql.ExpireOutput class/metatable.
- */
-void init_expire_output_class(lua_State *lua_state)
-{
-    lua_getglobal(lua_state, "osm2pgsql");
-    if (luaL_newmetatable(lua_state, osm2pgsql_expire_output_name) != 1) {
-        throw std::runtime_error{"Internal error: Lua newmetatable failed."};
-    }
-    lua_pushvalue(lua_state, -1); // Copy of new metatable
-
-    // Add metatable as osm2pgsql.ExpireOutput so we can access it from Lua
-    lua_setfield(lua_state, -3, "ExpireOutput");
-
-    // Now add functions to metatable
-    lua_pushvalue(lua_state, -1);
-    lua_setfield(lua_state, -2, "__index");
-    luaX_add_table_func(lua_state, "__tostring",
-                        lua_trampoline_expire_output_tostring);
-    luaX_add_table_func(lua_state, "minzoom",
-                        lua_trampoline_expire_output_minzoom);
-    luaX_add_table_func(lua_state, "maxzoom",
-                        lua_trampoline_expire_output_maxzoom);
-    luaX_add_table_func(lua_state, "filename",
-                        lua_trampoline_expire_output_filename);
-    luaX_add_table_func(lua_state, "schema",
-                        lua_trampoline_expire_output_schema);
-    luaX_add_table_func(lua_state, "table", lua_trampoline_expire_output_table);
-
-    lua_pop(lua_state, 2);
-}
-
-} // anonymous namespace
-
 void output_flex_t::init_lua(std::string const &filename,
                              properties_t const &properties)
 {
@@ -1412,8 +1228,8 @@ void output_flex_t::init_lua(std::string const &filename,
     luaX_add_table_func(lua_state(), "define_expire_output",
                         lua_trampoline_app_define_expire_output);
 
-    init_table_class(lua_state());
-    init_expire_output_class(lua_state());
+    lua_wrapper_expire_output::init(lua_state());
+    lua_wrapper_table::init(lua_state());
 
     // Clean up stack
     lua_settop(lua_state(), 0);
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index cc7bd1095..39cd1da70 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -164,20 +164,13 @@ class output_flex_t : public output_t
     int app_define_expire_output();
     int app_get_bbox();
 
-    int table_tostring();
     int table_insert();
-    int table_name();
-    int table_schema();
-    int table_cluster();
-    int table_columns();
-
-    int expire_output_tostring();
-    int expire_output_name();
-    int expire_output_minzoom();
-    int expire_output_maxzoom();
-    int expire_output_filename();
-    int expire_output_schema();
-    int expire_output_table();
+
+    // Get the flex table that is as first parameter on the Lua stack.
+    flex_table_t &get_table_from_param();
+
+    // Get the expire output that is as first parameter on the Lua stack.
+    expire_output_t &get_expire_output_from_param();
 
 private:
     void select_relation_members();
@@ -200,12 +193,6 @@ class output_flex_t : public output_t
 
     void init_lua(std::string const &filename, properties_t const &properties);
 
-    // Get the flex table that is as first parameter on the Lua stack.
-    flex_table_t const &get_table_from_param();
-
-    // Get the expire output that is as first parameter on the Lua stack.
-    expire_output_t const &get_expire_output_from_param();
-
     void check_context_and_state(char const *name, char const *context,
                                  bool condition);
 
@@ -324,4 +311,6 @@ class output_flex_t : public output_t
     bool m_disable_insert = false;
 };
 
+int lua_trampoline_table_insert(lua_State *lua_state);
+
 #endif // OSM2PGSQL_OUTPUT_FLEX_HPP

From a9a23e055bc3513c2d604688488a1c4d6ec9c7a3 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 3 May 2025 09:48:28 +0200
Subject: [PATCH 275/430] Don't mention the Lua inspect library any more in
 example configs

It is probably more confusing than useful here for the beginner. I have
added something about the library to the manual instead.
---
 flex-config/README.md    | 12 ------------
 flex-config/simple.lua   | 13 -------------
 flex-config/unitable.lua |  4 ----
 3 files changed, 29 deletions(-)

diff --git a/flex-config/README.md b/flex-config/README.md
index 0a2b9a256..9a8f10894 100644
--- a/flex-config/README.md
+++ b/flex-config/README.md
@@ -52,18 +52,6 @@ and when you need that functionality.
 The subdirectory [gen](gen/) contains example configurations for
 generalization support.
 
-## Dependencies
-
-Some of the example files use the `inspect` Lua library to show debugging
-output. It is not needed for the actual functionality of the examples, so if
-you don't have the library, you can remove all uses of `inspect` and the
-scripts should still work.
-
-The library is available from [the
-source](https://github.com/kikito/inspect.lua) or using
-[LuaRocks](https://luarocks.org/modules/kikito/inspect). Debian/Ubuntu users
-can install the `lua-inspect` package.
-
 ## Public Domain
 
 All the example config files in this directory are released into the Public
diff --git a/flex-config/simple.lua b/flex-config/simple.lua
index c0b33db21..513f4b92a 100644
--- a/flex-config/simple.lua
+++ b/flex-config/simple.lua
@@ -5,9 +5,6 @@
 -- configuration. After reading and understanding this, have a look at
 -- "geometries.lua".
 
--- For debugging
--- inspect = require('inspect')
-
 -- The global variable "osm2pgsql" is used to talk to the main osm2pgsql code.
 -- You can, for instance, get the version of osm2pgsql:
 print('osm2pgsql version: ' .. osm2pgsql.version)
@@ -66,7 +63,6 @@ tables.polygons = osm2pgsql.define_area_table('polygons', {
 for name, dtable in pairs(tables) do
     print("\ntable '" .. name .. "':")
     print("  name='" .. dtable:name() .. "'")
---    print("  columns=" .. inspect(dtable:columns()))
 end
 
 -- Helper function to remove some of the tags we usually are not interested in.
@@ -84,9 +80,6 @@ end
 -- attributes of the node like `id`, `version`, etc. as well as all tags as a
 -- Lua table (`object.tags`).
 function osm2pgsql.process_node(object)
-    --  Uncomment next line to look at the object data:
-    --  print(inspect(object))
-
     if clean_tags(object.tags) then
         return
     end
@@ -114,9 +107,6 @@ end
 -- information as with nodes and additionally a boolean `is_closed` flag and
 -- the list of node IDs referenced by the way (`object.nodes`).
 function osm2pgsql.process_way(object)
-    --  Uncomment next line to look at the object data:
-    --  print(inspect(object))
-
     if clean_tags(object.tags) then
         return
     end
@@ -141,9 +131,6 @@ end
 -- same information as with nodes and additionally an array of members
 -- (`object.members`).
 function osm2pgsql.process_relation(object)
-    --  Uncomment next line to look at the object data:
-    --  print(inspect(object))
-
     if clean_tags(object.tags) then
         return
     end
diff --git a/flex-config/unitable.lua b/flex-config/unitable.lua
index 26cb86b87..6c17ad8b3 100644
--- a/flex-config/unitable.lua
+++ b/flex-config/unitable.lua
@@ -2,8 +2,6 @@
 
 -- Put all OSM data into a single table
 
--- inspect = require('inspect')
-
 -- We define a single table that can take any OSM object and any geometry.
 -- OSM nodes are converted to Points, ways to LineStrings and relations
 -- to GeometryCollections. If an object would create an invalid geometry
@@ -21,8 +19,6 @@ local dtable = osm2pgsql.define_table{
     }
 }
 
--- print("columns=" .. inspect(dtable:columns()))
-
 -- Helper function to remove some of the tags we usually are not interested in.
 -- Returns true if there are no tags left.
 local function clean_tags(tags)

From fde70ad861d743ad81d72e5112c618c2508e45e5 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 3 May 2025 10:00:12 +0200
Subject: [PATCH 276/430] Remove comment that's not applicable any more

---
 flex-config/unitable.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/flex-config/unitable.lua b/flex-config/unitable.lua
index 6c17ad8b3..8af35c75f 100644
--- a/flex-config/unitable.lua
+++ b/flex-config/unitable.lua
@@ -6,7 +6,6 @@
 -- OSM nodes are converted to Points, ways to LineStrings and relations
 -- to GeometryCollections. If an object would create an invalid geometry
 -- it is still added to the table with a NULL geometry.
--- XXX expire will currently not work on these tables.
 local dtable = osm2pgsql.define_table{
     name = "data",
     -- This will generate a column "osm_id INT8" for the id, and a column

From d4225a029edb805b41b6ac89b32bffa7ce5c33a3 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 3 May 2025 10:46:18 +0200
Subject: [PATCH 277/430] Various cleanups in flex example config files

* Remove use of the clean_tags() function in some files
* Formatting changes
* Fix outdated or wrong comments
---
 flex-config/attributes.lua       |  7 +++----
 flex-config/bbox.lua             | 23 ---------------------
 flex-config/data-types.lua       | 20 ++++++++++---------
 flex-config/expire.lua           |  4 +++-
 flex-config/geometries.lua       | 23 ---------------------
 flex-config/public-transport.lua | 31 ++++++++++-------------------
 flex-config/route-relations.lua  | 17 +++-------------
 flex-config/simple.lua           | 34 +++++++-------------------------
 flex-config/untagged.lua         |  1 -
 9 files changed, 37 insertions(+), 123 deletions(-)

diff --git a/flex-config/attributes.lua b/flex-config/attributes.lua
index c39dd6132..3e61ad626 100644
--- a/flex-config/attributes.lua
+++ b/flex-config/attributes.lua
@@ -1,10 +1,9 @@
 -- This config example file is released into the Public Domain.
 
 -- This config shows how to access the attributes of OSM objects: the version,
--- changeset id, timestamp, user id and user name. For this to work the
--- command line option --extra-attributes/-x must be set, otherwise those
--- fields will be empty. Also note that some OSM files do not contain all
--- of those attributes, so check your input data if you get empty fields.
+-- changeset id, timestamp, user id and user name. Note that some OSM files do
+-- not contain all of those attributes, so check your input data if you get
+-- empty fields.
 
 -- Set this to the projection you want to use
 local srid = 4326
diff --git a/flex-config/bbox.lua b/flex-config/bbox.lua
index 920772859..3c9093b74 100644
--- a/flex-config/bbox.lua
+++ b/flex-config/bbox.lua
@@ -30,17 +30,6 @@ tables.boundaries = osm2pgsql.define_relation_table('boundaries', {
     { column = 'geom', type = 'multilinestring' },
 })
 
--- Helper function to remove some of the tags we usually are not interested in.
--- Returns true if there are no tags left.
-local function clean_tags(tags)
-    tags.odbl = nil
-    tags.created_by = nil
-    tags.source = nil
-    tags['source:ref'] = nil
-
-    return next(tags) == nil
-end
-
 -- Helper function that looks at the tags and decides if this is possibly
 -- an area.
 local function has_area_tags(tags)
@@ -91,10 +80,6 @@ local function format_bbox(object)
 end
 
 function osm2pgsql.process_node(object)
-    if clean_tags(object.tags) then
-        return
-    end
-
     tables.pois:insert({
         tags = object.tags,
         bbox = format_bbox(object),
@@ -103,10 +88,6 @@ function osm2pgsql.process_node(object)
 end
 
 function osm2pgsql.process_way(object)
-    if clean_tags(object.tags) then
-        return
-    end
-
     -- A closed way that also has the right tags for an area is a polygon.
     if object.is_closed and has_area_tags(object.tags) then
         tables.polygons:insert({
@@ -124,10 +105,6 @@ function osm2pgsql.process_way(object)
 end
 
 function osm2pgsql.process_relation(object)
-    if clean_tags(object.tags) then
-        return
-    end
-
     local relation_type = object:grab_tag('type')
 
     -- Store boundary relations as multilinestrings
diff --git a/flex-config/data-types.lua b/flex-config/data-types.lua
index d480e9145..082e0a18f 100644
--- a/flex-config/data-types.lua
+++ b/flex-config/data-types.lua
@@ -5,31 +5,33 @@
 -- at this file. This file demonstrates some column data type options.
 
 local highways = osm2pgsql.define_way_table('highways', {
-    { column = 'name',     type = 'text' },
+    { column = 'name', type = 'text' },
     -- We always need a highway type, so we can declare the column as NOT NULL
-    { column = 'type',     type = 'text', not_null = true },
+    { column = 'type', type = 'text', not_null = true },
 
     -- Add a SERIAL column and tell osm2pgsql not to fill it (PostgreSQL will
     -- do that for us)
-    { column = 'id',       sql_type = 'serial', create_only = true },
+    { column = 'id', sql_type = 'serial', create_only = true },
 
     -- type "direction" is special, see below
-    { column = 'oneway',   type = 'direction' },
+    { column = 'oneway', type = 'direction' },
     { column = 'maxspeed', type = 'int' },
 
     -- type "bool" is special, see below
-    { column = 'lit',      type = 'bool' },
-    { column = 'tags',     type = 'jsonb' }, -- also available: 'json', 'hstore'
+    { column = 'lit', type = 'bool' },
+    { column = 'tags', type = 'jsonb' }, -- also available: 'json', 'hstore'
 
     -- osm2pgsql doesn't know about PostgreSQL arrays, so we define the SQL
     -- type of this column and then have to convert our array data into a
     -- valid text representation for that type, see below.
-    { column = 'nodes',    sql_type = 'int8[]' },
-    { column = 'geom',     type = 'linestring' },
+    { column = 'nodes', sql_type = 'int8[]' },
+    { column = 'geom', type = 'linestring' },
 })
 
 -- Helper function to remove some of the tags we usually are not interested in.
--- Returns true if there are no tags left.
+-- Something like this can be useful if you are writing all tags to the
+-- database in a JSON(B) column and don't want that cluttered with lots of tags
+-- nobody cares about. Returns true if there are no tags left.
 local function clean_tags(tags)
     tags.odbl = nil
     tags.created_by = nil
diff --git a/flex-config/expire.lua b/flex-config/expire.lua
index 8a905c383..9912e3faa 100644
--- a/flex-config/expire.lua
+++ b/flex-config/expire.lua
@@ -45,7 +45,9 @@ tables.pois = osm2pgsql.define_node_table('pois', {
     -- Zero, one or more expire outputs are referenced in an `expire` field in
     -- the definition of any geometry column using the Web Mercator (3857)
     -- projection.
-    { column = 'geom', type = 'point', not_null = true, expire = { { output = expire_outputs.pois } } },
+    { column = 'geom', type = 'point', not_null = true, expire = {
+        { output = expire_outputs.pois }
+    }},
 })
 
 tables.lines = osm2pgsql.define_way_table('lines', {
diff --git a/flex-config/geometries.lua b/flex-config/geometries.lua
index b9a8f5e79..46741eea2 100644
--- a/flex-config/geometries.lua
+++ b/flex-config/geometries.lua
@@ -55,17 +55,6 @@ tables.pubs = osm2pgsql.define_node_table('pubs', {
     { column = 'name', type = 'text' }
 })
 
--- Helper function to remove some of the tags we usually are not interested in.
--- Returns true if there are no tags left.
-local function clean_tags(tags)
-    tags.odbl = nil
-    tags.created_by = nil
-    tags.source = nil
-    tags['source:ref'] = nil
-
-    return next(tags) == nil
-end
-
 -- Helper function that looks at the tags and decides if this is possibly
 -- an area.
 local function has_area_tags(tags)
@@ -105,10 +94,6 @@ local function has_area_tags(tags)
 end
 
 function osm2pgsql.process_node(object)
-    if clean_tags(object.tags) then
-        return
-    end
-
     local geom = object:as_point()
 
     tables.pois:insert({
@@ -124,10 +109,6 @@ function osm2pgsql.process_node(object)
 end
 
 function osm2pgsql.process_way(object)
-    if clean_tags(object.tags) then
-        return
-    end
-
     -- A closed way that also has the right tags for an area is a polygon.
     if object.is_closed and has_area_tags(object.tags) then
         -- Creating the polygon geometry takes time, so we do it once here
@@ -166,10 +147,6 @@ function osm2pgsql.process_way(object)
 end
 
 function osm2pgsql.process_relation(object)
-    if clean_tags(object.tags) then
-        return
-    end
-
     local relation_type = object:grab_tag('type')
 
     -- Store boundary relations as multilinestrings
diff --git a/flex-config/public-transport.lua b/flex-config/public-transport.lua
index a0b97539a..65c665e80 100644
--- a/flex-config/public-transport.lua
+++ b/flex-config/public-transport.lua
@@ -20,25 +20,25 @@
 local tables = {}
 
 tables.stops = osm2pgsql.define_node_table('stops', {
-    { column = 'tags',     type = 'jsonb' },
+    { column = 'tags', type = 'jsonb' },
     { column = 'rel_refs', type = 'text' }, -- for the refs from the relations
-    { column = 'rel_ids',  sql_type = 'int8[]' }, -- array with integers (for relation IDs)
-    { column = 'geom',     type = 'point', not_null = true },
+    { column = 'rel_ids', sql_type = 'int8[]' }, -- array with integers (for relation IDs)
+    { column = 'geom', type = 'point', not_null = true },
 })
 
 tables.lines = osm2pgsql.define_way_table('lines', {
-    { column = 'tags',     type = 'jsonb' },
+    { column = 'tags', type = 'jsonb' },
     { column = 'rel_refs', type = 'text' }, -- for the refs from the relations
-    { column = 'rel_ids',  sql_type = 'int8[]' }, -- array with integers (for relation IDs)
-    { column = 'geom',     type = 'linestring', not_null = true },
+    { column = 'rel_ids', sql_type = 'int8[]' }, -- array with integers (for relation IDs)
+    { column = 'geom', type = 'linestring', not_null = true },
 })
 
 -- Tables don't have to have a geometry column
 tables.routes = osm2pgsql.define_relation_table('routes', {
-    { column = 'ref',  type = 'text' },
+    { column = 'ref', type = 'text' },
     { column = 'type', type = 'text' },
     { column = 'from', type = 'text' },
-    { column = 'to',   type = 'text' },
+    { column = 'to', type = 'text' },
     { column = 'tags', type = 'jsonb' },
 })
 
@@ -46,9 +46,9 @@ tables.routes = osm2pgsql.define_relation_table('routes', {
 -- stop. We model them here by adding a center point as geometry plus the
 -- radius of a circle that contains everything in that stop.
 tables.stop_areas = osm2pgsql.define_relation_table('stop_areas', {
-    { column = 'tags',   type = 'jsonb' },
+    { column = 'tags', type = 'jsonb' },
     { column = 'radius', type = 'real', not_null = true },
-    { column = 'geom',   type = 'point', not_null = true },
+    { column = 'geom', type = 'point', not_null = true },
 })
 
 -- This will be used to store information about relations queryable by member
@@ -61,15 +61,6 @@ tables.stop_areas = osm2pgsql.define_relation_table('stop_areas', {
 local n2r = {}
 local w2r = {}
 
-local function clean_tags(tags)
-    tags.odbl = nil
-    tags.created_by = nil
-    tags.source = nil
-    tags['source:ref'] = nil
-
-    return next(tags) == nil
-end
-
 local function unique_array(array)
     local result = {}
 
@@ -128,8 +119,6 @@ function osm2pgsql.process_way(object)
         return
     end
 
-    clean_tags(object.tags)
-
     -- Data we will store in the 'lines' table always has the tags from
     -- the way
     local row = {
diff --git a/flex-config/route-relations.lua b/flex-config/route-relations.lua
index 245a5d6ff..a93101252 100644
--- a/flex-config/route-relations.lua
+++ b/flex-config/route-relations.lua
@@ -12,10 +12,10 @@
 local tables = {}
 
 tables.highways = osm2pgsql.define_way_table('highways', {
-    { column = 'tags',     type = 'jsonb' },
+    { column = 'tags', type = 'jsonb' },
     { column = 'rel_refs', type = 'text' }, -- for the refs from the relations
-    { column = 'rel_ids',  sql_type = 'int8[]' }, -- array with integers (for relation IDs)
-    { column = 'geom',     type = 'linestring', not_null = true },
+    { column = 'rel_ids', sql_type = 'int8[]' }, -- array with integers (for relation IDs)
+    { column = 'geom', type = 'linestring', not_null = true },
 })
 
 -- Tables don't have to have a geometry column
@@ -31,23 +31,12 @@ tables.routes = osm2pgsql.define_relation_table('routes', {
 -- it can be called any number of times and will lead to the same result.
 local w2r = {}
 
-local function clean_tags(tags)
-    tags.odbl = nil
-    tags.created_by = nil
-    tags.source = nil
-    tags['source:ref'] = nil
-
-    return next(tags) == nil
-end
-
 function osm2pgsql.process_way(object)
     -- We are only interested in highways
     if not object.tags.highway then
         return
     end
 
-    clean_tags(object.tags)
-
     -- Data we will store in the "highways" table always has the tags from
     -- the way
     local row = {
diff --git a/flex-config/simple.lua b/flex-config/simple.lua
index 513f4b92a..7a439ca0b 100644
--- a/flex-config/simple.lua
+++ b/flex-config/simple.lua
@@ -22,20 +22,23 @@ local tables = {}
 -- ids.
 tables.pois = osm2pgsql.define_node_table('pois', {
     { column = 'tags', type = 'jsonb' },
-    { column = 'geom', type = 'point', not_null = true }, -- will be something like `GEOMETRY(Point, 4326)` in SQL
+    -- In most cases we'll need a column for the geometry. The default
+    -- projection is Web Mercator (3857), so this will result in an SQL
+    -- type `geometry(Point, 3857)`.
+    { column = 'geom', type = 'point', not_null = true },
 })
 
 -- A special table for restaurants to demonstrate that we can have any tables
 -- with any columns we want.
 tables.restaurants = osm2pgsql.define_node_table('restaurants', {
-    { column = 'name',    type = 'text' },
+    { column = 'name', type = 'text' },
     { column = 'cuisine', type = 'text' },
     -- We declare all geometry columns as "NOT NULL". If osm2pgsql encounters
     -- an invalid geometry (for whatever reason) it will generate a null
     -- geometry which will not be written to the database if "not_null" is
     -- set. The result is that broken geometries will just be silently
     -- ignored.
-    { column = 'geom',    type = 'point', not_null = true },
+    { column = 'geom', type = 'point', not_null = true },
 })
 
 -- This is a "way table", it can only contain data derived from ways and will
@@ -65,29 +68,14 @@ for name, dtable in pairs(tables) do
     print("  name='" .. dtable:name() .. "'")
 end
 
--- Helper function to remove some of the tags we usually are not interested in.
--- Returns true if there are no tags left.
-local function clean_tags(tags)
-    tags.odbl = nil
-    tags.created_by = nil
-    tags.source = nil
-    tags['source:ref'] = nil
-
-    return next(tags) == nil
-end
-
 -- Called for every node in the input. The `object` argument contains all the
 -- attributes of the node like `id`, `version`, etc. as well as all tags as a
 -- Lua table (`object.tags`).
 function osm2pgsql.process_node(object)
-    if clean_tags(object.tags) then
-        return
-    end
-
     if object.tags.amenity == 'restaurant' then
         -- Add a row to the SQL table. The keys in the parameter table
         -- correspond to the table columns, if one is missing the column will
-        -- be NULL. Id and geometry columns will be filled automatically.
+        -- be NULL. The id column will be filled automatically.
         tables.restaurants:insert({
             name = object.tags.name,
             cuisine = object.tags.cuisine,
@@ -107,10 +95,6 @@ end
 -- information as with nodes and additionally a boolean `is_closed` flag and
 -- the list of node IDs referenced by the way (`object.nodes`).
 function osm2pgsql.process_way(object)
-    if clean_tags(object.tags) then
-        return
-    end
-
     -- Very simple check to decide whether a way is a polygon or not, in a
     -- real stylesheet we'd have to also look at the tags...
     if object.is_closed then
@@ -131,10 +115,6 @@ end
 -- same information as with nodes and additionally an array of members
 -- (`object.members`).
 function osm2pgsql.process_relation(object)
-    if clean_tags(object.tags) then
-        return
-    end
-
     -- Store multipolygons and boundaries as polygons
     if object.tags.type == 'multipolygon' or
        object.tags.type == 'boundary' then
diff --git a/flex-config/untagged.lua b/flex-config/untagged.lua
index b88955e39..e79a2f9f0 100644
--- a/flex-config/untagged.lua
+++ b/flex-config/untagged.lua
@@ -41,4 +41,3 @@ end
 osm2pgsql.process_way = do_way
 osm2pgsql.process_untagged_way = do_way
 
-

From 60e7abaff5c16dde69cf1c1d0e1dced12c45e2c5 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 17 Apr 2025 15:32:49 +0200
Subject: [PATCH 278/430] Make box_t type available to boost as box type

This will be useful later when we index geometries.
---
 src/geom-boost-adaptor.hpp | 44 ++++++++++++++++++++++++++++++++++++++
 src/geom-box.hpp           |  5 +++++
 tests/test-geom-box.cpp    | 42 ++++++++++++++++++++++++++++++++++++
 3 files changed, 91 insertions(+)

diff --git a/src/geom-boost-adaptor.hpp b/src/geom-boost-adaptor.hpp
index c0e165ada..4ca489ce5 100644
--- a/src/geom-boost-adaptor.hpp
+++ b/src/geom-boost-adaptor.hpp
@@ -11,8 +11,10 @@
  */
 
 #include "geom.hpp"
+#include "geom-box.hpp"
 
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/register/box.hpp>
 #include <boost/geometry/geometries/register/linestring.hpp>
 #include <boost/geometry/geometries/register/multi_linestring.hpp>
 #include <boost/geometry/geometries/register/multi_point.hpp>
@@ -78,6 +80,48 @@ struct interior_rings<::geom::polygon_t>
     static auto const &get(::geom::polygon_t const &p) { return p.inners(); }
 };
 
+BOOST_GEOMETRY_DETAIL_SPECIALIZE_BOX_TRAITS(::geom::box_t, ::geom::point_t)
+
+template <>
+struct indexed_access<::geom::box_t, min_corner, 0>
+{
+    static inline double get(::geom::box_t const &b) { return b.min_x(); }
+    static inline void set(::geom::box_t &b, double value)
+    {
+        b.set_min_x(value);
+    }
+};
+
+template <>
+struct indexed_access<::geom::box_t, min_corner, 1>
+{
+    static inline double get(::geom::box_t const &b) { return b.min_y(); }
+    static inline void set(::geom::box_t &b, double value)
+    {
+        b.set_min_y(value);
+    }
+};
+
+template <>
+struct indexed_access<::geom::box_t, max_corner, 0>
+{
+    static inline double get(::geom::box_t const &b) { return b.max_x(); }
+    static inline void set(::geom::box_t &b, double value)
+    {
+        b.set_max_x(value);
+    }
+};
+
+template <>
+struct indexed_access<::geom::box_t, max_corner, 1>
+{
+    static inline double get(::geom::box_t const &b) { return b.max_y(); }
+    static inline void set(::geom::box_t &b, double value)
+    {
+        b.set_max_y(value);
+    }
+};
+
 } // namespace boost::geometry::traits
 
 #endif // OSM2PGSQL_GEOM_BOOST_ADAPTOR_HPP
diff --git a/src/geom-box.hpp b/src/geom-box.hpp
index eb07cf632..e2f241da2 100644
--- a/src/geom-box.hpp
+++ b/src/geom-box.hpp
@@ -45,6 +45,11 @@ class box_t
     constexpr double max_x() const noexcept { return m_max_x; }
     constexpr double max_y() const noexcept { return m_max_y; }
 
+    void set_min_x(double value) noexcept { m_min_x = value; }
+    void set_min_y(double value) noexcept { m_min_y = value; }
+    void set_max_x(double value) noexcept { m_max_x = value; }
+    void set_max_y(double value) noexcept { m_max_y = value; }
+
     constexpr double width() const noexcept { return m_max_x - m_min_x; }
     constexpr double height() const noexcept { return m_max_y - m_min_y; }
 
diff --git a/tests/test-geom-box.cpp b/tests/test-geom-box.cpp
index 5fb257cb9..134697de7 100644
--- a/tests/test-geom-box.cpp
+++ b/tests/test-geom-box.cpp
@@ -9,8 +9,50 @@
 
 #include <catch.hpp>
 
+#include "geom-boost-adaptor.hpp"
 #include "geom-box.hpp"
 
+TEST_CASE("box_t getter/setter", "[NoDB]")
+{
+    geom::box_t box{1.0, 2.0, 3.0, 4.0};
+
+    REQUIRE(box.min_x() == Approx(1.0));
+    REQUIRE(box.max_x() == Approx(3.0));
+    REQUIRE(box.min_y() == Approx(2.0));
+    REQUIRE(box.max_y() == Approx(4.0));
+
+    box.set_min_x(1.5);
+    box.set_min_y(2.5);
+    box.set_max_x(3.5);
+    box.set_max_y(4.5);
+
+    REQUIRE(box.min_x() == Approx(1.5));
+    REQUIRE(box.max_x() == Approx(3.5));
+    REQUIRE(box.min_y() == Approx(2.5));
+    REQUIRE(box.max_y() == Approx(4.5));
+}
+
+TEST_CASE("box_t getter/setter through boost", "[NoDB]")
+{
+    geom::box_t box{1.0, 2.0, 3.0, 4.0};
+
+    namespace bg = ::boost::geometry;
+    REQUIRE(bg::get<bg::min_corner, 0>(box) == Approx(1.0));
+    REQUIRE(bg::get<bg::min_corner, 1>(box) == Approx(2.0));
+    REQUIRE(bg::get<bg::max_corner, 0>(box) == Approx(3.0));
+    REQUIRE(bg::get<bg::max_corner, 1>(box) == Approx(4.0));
+
+    bg::set<bg::min_corner, 0>(box, 1.5);
+    bg::set<bg::min_corner, 1>(box, 2.5);
+    bg::set<bg::max_corner, 0>(box, 3.5);
+    bg::set<bg::max_corner, 1>(box, 4.5);
+
+    REQUIRE(box.min_x() == Approx(1.5));
+    REQUIRE(box.min_y() == Approx(2.5));
+    REQUIRE(box.max_x() == Approx(3.5));
+    REQUIRE(box.max_y() == Approx(4.5));
+}
+
 TEST_CASE("Extend box_t with points", "[NoDB]")
 {
     geom::box_t box;

From 24ce38f232ed39b8d0e77de1fac47569223cf864 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 25 Mar 2025 15:19:11 +0100
Subject: [PATCH 279/430] New feature: Check location of OSM objects against
 list of regions

This commit introduces a new feature: Locators. A locator is initialized
with one or more regions, each region has a name and a polygon or
bounding box. A geometry of an OSM object can then be checked against
this region list to figure out in which region(s) it is located.
This check is much faster than it would be to do this inside the
database after import.

Locators can be used for all sorts of interesting features:
* Read larger OSM file but import only data inside some area.
* Annotate each OSM object with the country (or other region) it
  is in. This can then, for instance, be used to show special
  highway shields for each country.
* Use the information which region the data is in for further
  processing, for instance setting of default values for the
  speed limit or using special language transliterations rules
  based on country.

Locators are created in Lua with `define_locator()`. Bounding boxes can
be added with `add_bbox()`. Polygons can be added from the database by
calling `add_from_db()` and specifiying an SQL query which can return
any number of rows each defining a region with the name and the
(multi)polygon as columns.

A locator can then be queried using `all_intersecting()` returning a
list of names of all regions that intersect the specified OSM object
geometry. Or the `first_intersecting()` function can be used which only
returns a single region for those cases where there can be no
overlapping data or where the details of objects straddling region
boundaries don't matter.

Several example config files are provided in the flex-config/locator
directory.
---
 .github/workflows/luacheck.yml           |   2 +-
 flex-config/locator/README.md            |   9 +
 flex-config/locator/buildings.lua        |  74 +++++++
 flex-config/locator/iceland.lua          |  32 ++++
 flex-config/locator/import-countries.lua |  35 ++++
 flex-config/locator/motorway-colours.lua |  40 ++++
 src/CMakeLists.txt                       |   2 +
 src/flex-lua-locator.cpp                 | 188 ++++++++++++++++++
 src/flex-lua-locator.hpp                 |  53 ++++++
 src/flex-lua-wrapper.hpp                 |   3 +
 src/locator.cpp                          | 129 +++++++++++++
 src/locator.hpp                          | 147 ++++++++++++++
 src/output-flex.cpp                      |  31 ++-
 src/output-flex.hpp                      |   8 +
 src/pgsql-capabilities-int.hpp           |   1 +
 src/pgsql-capabilities.cpp               |  19 ++
 src/pgsql-capabilities.hpp               |   2 +
 src/pgsql.hpp                            |   6 +
 tests/CMakeLists.txt                     |   1 +
 tests/bdd/flex/locator.feature           | 233 +++++++++++++++++++++++
 tests/bdd/steps/steps_execute.py         |  11 +-
 tests/test-locator.cpp                   | 136 +++++++++++++
 22 files changed, 1156 insertions(+), 6 deletions(-)
 create mode 100644 flex-config/locator/README.md
 create mode 100644 flex-config/locator/buildings.lua
 create mode 100644 flex-config/locator/iceland.lua
 create mode 100644 flex-config/locator/import-countries.lua
 create mode 100644 flex-config/locator/motorway-colours.lua
 create mode 100644 src/flex-lua-locator.cpp
 create mode 100644 src/flex-lua-locator.hpp
 create mode 100644 src/locator.cpp
 create mode 100644 src/locator.hpp
 create mode 100644 tests/bdd/flex/locator.feature
 create mode 100644 tests/test-locator.cpp

diff --git a/.github/workflows/luacheck.yml b/.github/workflows/luacheck.yml
index 785b2b89a..a21a9053f 100644
--- a/.github/workflows/luacheck.yml
+++ b/.github/workflows/luacheck.yml
@@ -15,5 +15,5 @@ jobs:
           sudo apt-get install -yq --no-install-suggests --no-install-recommends lua-check
 
       - name: Run luacheck
-        run: luacheck flex-config/*.lua flex-config/gen/*.lua tests/data/*.lua tests/lua/tests.lua
+        run: luacheck flex-config/*.lua flex-config/*/*.lua tests/data/*.lua tests/lua/tests.lua
 
diff --git a/flex-config/locator/README.md b/flex-config/locator/README.md
new file mode 100644
index 000000000..ed58943a9
--- /dev/null
+++ b/flex-config/locator/README.md
@@ -0,0 +1,9 @@
+# Flex Output Configuration for Locator
+
+These are config file examples for use with the *locator* functionality.
+
+First use the `import-countries.lua` to import country boundaries, then
+use these with the other config files.
+
+You should be able to run this on the planet file or on any extracts you want.
+
diff --git a/flex-config/locator/buildings.lua b/flex-config/locator/buildings.lua
new file mode 100644
index 000000000..8455a8bce
--- /dev/null
+++ b/flex-config/locator/buildings.lua
@@ -0,0 +1,74 @@
+-- This config example file is released into the Public Domain.
+
+-- This file shows how to use a locator to tag all buildings with the country
+-- they are in.
+
+-- Define the "countries" locator and get all country geometries from the
+-- database. Use the import-countries.lua file to import them first, before
+-- you run this.
+local countries = osm2pgsql.define_locator({ name = 'countries' })
+
+-- The SELECT query must return the regions the locator will use. The first
+-- column must contain the name of the region, the second the geometry in
+-- WGS84 lon/lat coordinates.
+-- To improve the efficiency of the country lookup, we'll subdivide the
+-- country polygons into smaller pieces. (If you run this often, for instance
+-- when doing updates, do the subdivide first in the database and store the
+-- result in its own table.)
+countries:add_from_db('SELECT code, ST_Subdivide(geom, 200) FROM countries')
+
+-- You have to decide whether you are interested in getting all regions
+-- intersecting with any of the objects or only one of them.
+--
+-- * Getting all regions makes sure that you get everything, even if regions
+--   overlap or objects straddle the border between regions. Use the function
+--   all_intersecting() for that.
+-- * Getting only one region is faster because osm2pgsql can stop looking
+--   for matches after the first one. Use first_intersecting() for that.
+--   This makes sense if you only have a single region anyway or if your
+--   regions don't overlap or you are not so concerned with what happens at
+--   the borders.
+--
+-- Just for demonstration, we do both in this example, in the "country" and
+-- "countries" columns, respectively.
+local buildings = osm2pgsql.define_area_table('buildings', {
+
+    -- This will contain the country code of the first matching country
+    -- (which can be any of the countries because there is no order here).
+    { column = 'country', type = 'text' },
+
+    -- This array will contain the country codes of all matching countries.
+    { column = 'countries', sql_type = 'text[]' },
+    { column = 'tags', type = 'jsonb' },
+    { column = 'geom', type = 'polygon', not_null = true },
+})
+
+local function add(geom, tags)
+    buildings:insert({
+        country = countries:first_intersecting(geom), -- or use geom:centroid()
+
+        -- We have to create the format that PostgreSQL expects for text
+        -- arrays. We assume that the region names do not contain any special
+        -- characters, otherwise we would need to do some escaping here.
+        countries = '{' .. table.concat(countries:all_intersecting(geom), ',') .. '}',
+
+        tags = tags,
+        geom = geom,
+    })
+end
+
+function osm2pgsql.process_way(object)
+    if object.tags.building then
+        add(object:as_polygon(), object.tags)
+    end
+end
+
+function osm2pgsql.process_relation(object)
+    if object.tags.building then
+        local geom = object:as_multipolygon()
+        for p in geom:geometries() do
+            add(p, object.tags)
+        end
+    end
+end
+
diff --git a/flex-config/locator/iceland.lua b/flex-config/locator/iceland.lua
new file mode 100644
index 000000000..ebf36266b
--- /dev/null
+++ b/flex-config/locator/iceland.lua
@@ -0,0 +1,32 @@
+-- This config example file is released into the Public Domain.
+
+-- This file shows how to use a locator with a bounding box to import only
+-- the data for a region. In this case only highways in Iceland are imported
+-- even if you run this on the full planet file.
+
+local iceland = osm2pgsql.define_locator({ name = 'iceland' })
+
+iceland:add_bbox('IS', -25.0, 62.0, -12.0, 68.0)
+
+local highways = osm2pgsql.define_way_table('highways', {
+    { column = 'hwtype', type = 'text', not_null = true },
+    { column = 'name', type = 'text' },
+    { column = 'ref', type = 'text' },
+    { column = 'geom', type = 'linestring', not_null = true },
+})
+
+function osm2pgsql.process_way(object)
+    local t = object.tags
+    if t.highway then
+        local geom = object:as_linestring()
+        local region = iceland:first_intersecting(geom)
+        if region then
+            highways:insert({
+                hwtype = t.highway,
+                name = t.name,
+                ref = t.ref,
+                geom = geom,
+            })
+        end
+    end
+end
diff --git a/flex-config/locator/import-countries.lua b/flex-config/locator/import-countries.lua
new file mode 100644
index 000000000..ba468c3ea
--- /dev/null
+++ b/flex-config/locator/import-countries.lua
@@ -0,0 +1,35 @@
+-- This config example file is released into the Public Domain.
+
+-- This file is part of the examples for using the locator function of
+-- osm2pgsql. It is used to import all country boundaries into a database.
+
+local countries = osm2pgsql.define_relation_table('countries', {
+    -- For the ISO3166-1 Alpha-2 country code
+    -- https://en.wikipedia.org/wiki/ISO_3166-1
+    { column = 'code', type = 'text', not_null = true },
+    -- Because we want to use the geometries for the locator feature they
+    -- must be in 4326! We use a polygon type here and will later split
+    -- multipolygons into their parts.
+    { column = 'geom', type = 'polygon', not_null = true, projection = 4326 },
+})
+
+function osm2pgsql.process_relation(object)
+    local t = object.tags
+
+    if t.boundary == 'administrative' and t.admin_level == '2' then
+        local code = t['ISO3166-1']
+
+        -- Ignore entries with syntactically invalid ISO code
+        if not code or not string.match(code, '^%u%u$') then
+            return
+        end
+
+        for geom in object:as_multipolygon():geometries() do
+            countries:insert({
+                code = code,
+                geom = geom,
+            })
+        end
+    end
+end
+
diff --git a/flex-config/locator/motorway-colours.lua b/flex-config/locator/motorway-colours.lua
new file mode 100644
index 000000000..74287c78f
--- /dev/null
+++ b/flex-config/locator/motorway-colours.lua
@@ -0,0 +1,40 @@
+-- This config example file is released into the Public Domain.
+
+-- This file shows how to use a locator to find the country-specific colour
+
+-- Define the "countries" locator and get all country geometries from the
+-- database. Use the import-countries.lua file to import them first, before
+-- you run this.
+local countries = osm2pgsql.define_locator({ name = 'countries' })
+countries:add_from_db('SELECT code, ST_Subdivide(geom, 200) FROM countries')
+
+local highways = osm2pgsql.define_way_table('highways', {
+    { column = 'hwtype', type = 'text' },
+    { column = 'country', type = 'text' },
+    { column = 'colour', type = 'text' },
+    { column = 'geom', type = 'linestring', not_null = true },
+})
+
+-- Each country uses their own colour for motorways. Here is the beginning
+-- of a list of some countries in Europe. Source:
+-- https://en.wikipedia.org/wiki/Comparison_of_European_road_signs
+local cc2colour = {
+    BE = '#2d00e5',
+    CH = '#128044',
+    DE = '#174688',
+    FR = '#333b97',
+    NL = '#064269',
+}
+
+function osm2pgsql.process_way(object)
+    if object.tags.highway then
+        local geom = object:as_linestring()
+        local cc = countries:first_intersecting(geom)
+        highways:insert({
+            hwtype = object.tags.highway,
+            country = cc,
+            colour = cc2colour[cc],
+            geom = geom,
+        })
+    end
+end
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e10db77e6..ba1f0346f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,6 +21,7 @@ target_sources(osm2pgsql_lib PRIVATE
     flex-lua-expire-output.cpp
     flex-lua-geom.cpp
     flex-lua-index.cpp
+    flex-lua-locator.cpp
     flex-lua-table.cpp
     flex-table-column.cpp
     flex-table.cpp
@@ -33,6 +34,7 @@ target_sources(osm2pgsql_lib PRIVATE
     geom.cpp
     idlist.cpp
     input.cpp
+    locator.cpp
     logging.cpp
     lua-setup.cpp
     lua-utils.cpp
diff --git a/src/flex-lua-locator.cpp b/src/flex-lua-locator.cpp
new file mode 100644
index 000000000..536fdf1cc
--- /dev/null
+++ b/src/flex-lua-locator.cpp
@@ -0,0 +1,188 @@
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+#include "flex-lua-locator.hpp"
+
+#include "flex-lua-geom.hpp"
+#include "flex-lua-wrapper.hpp"
+#include "lua-utils.hpp"
+#include "pgsql.hpp"
+
+#include <stdexcept>
+#include <string>
+#include <vector>
+
+#include <lua.hpp>
+
+namespace {
+
+locator_t &create_locator(lua_State *lua_state,
+                          std::vector<locator_t> *locators)
+{
+    auto &new_locator = locators->emplace_back();
+
+    // optional "name" field
+    auto const *name =
+        luaX_get_table_string(lua_state, "name", -1, "The locator", "");
+    new_locator.set_name(name);
+    lua_pop(lua_state, 1); // "name"
+
+    return new_locator;
+}
+
+TRAMPOLINE_WRAPPED_OBJECT(locator, __tostring)
+TRAMPOLINE_WRAPPED_OBJECT(locator, name)
+TRAMPOLINE_WRAPPED_OBJECT(locator, add_bbox)
+TRAMPOLINE_WRAPPED_OBJECT(locator, add_from_db)
+TRAMPOLINE_WRAPPED_OBJECT(locator, all_intersecting)
+TRAMPOLINE_WRAPPED_OBJECT(locator, first_intersecting)
+
+} // anonymous namespace
+
+connection_params_t lua_wrapper_locator::s_connection_params;
+
+int setup_flex_locator(lua_State *lua_state, std::vector<locator_t> *locators)
+{
+    if (lua_type(lua_state, 1) != LUA_TTABLE) {
+        throw std::runtime_error{
+            "Argument #1 to 'define_locator' must be a Lua table."};
+    }
+
+    create_locator(lua_state, locators);
+
+    void *ptr = lua_newuserdata(lua_state, sizeof(std::size_t));
+    auto *num = new (ptr) std::size_t{};
+    *num = locators->size() - 1;
+    luaL_getmetatable(lua_state, osm2pgsql_locator_name);
+    lua_setmetatable(lua_state, -2);
+
+    return 1;
+}
+
+void lua_wrapper_locator::init(lua_State *lua_state,
+                               connection_params_t const &connection_params)
+{
+    s_connection_params = connection_params;
+
+    lua_getglobal(lua_state, "osm2pgsql");
+    if (luaL_newmetatable(lua_state, osm2pgsql_locator_name) != 1) {
+        throw std::runtime_error{"Internal error: Lua newmetatable failed."};
+    }
+    lua_pushvalue(lua_state, -1); // Copy of new metatable
+
+    // Add metatable as osm2pgsql.Locator so we can access it from Lua
+    lua_setfield(lua_state, -3, "Locator");
+
+    // Now add functions to metatable
+    lua_pushvalue(lua_state, -1);
+    lua_setfield(lua_state, -2, "__index");
+    luaX_add_table_func(lua_state, "__tostring",
+                        lua_trampoline_locator___tostring);
+    luaX_add_table_func(lua_state, "name", lua_trampoline_locator_name);
+    luaX_add_table_func(lua_state, "add_bbox", lua_trampoline_locator_add_bbox);
+    luaX_add_table_func(lua_state, "add_from_db",
+                        lua_trampoline_locator_add_from_db);
+    luaX_add_table_func(lua_state, "all_intersecting",
+                        lua_trampoline_locator_all_intersecting);
+    luaX_add_table_func(lua_state, "first_intersecting",
+                        lua_trampoline_locator_first_intersecting);
+
+    lua_pop(lua_state, 2);
+}
+
+int lua_wrapper_locator::__tostring() const
+{
+    std::string const str{fmt::format("osm2pgsql.Locator[name={},size={}]",
+                                      self().name(), self().size())};
+    luaX_pushstring(lua_state(), str);
+    return 1;
+}
+
+int lua_wrapper_locator::name() const
+{
+    luaX_pushstring(lua_state(), self().name());
+    return 1;
+}
+
+int lua_wrapper_locator::add_bbox()
+{
+    if (lua_gettop(lua_state()) < 5) {
+        throw fmt_error("Need locator, name and 4 coordinates as arguments");
+    }
+
+    std::string const name = lua_tostring(lua_state(), 1);
+    double const min_x = lua_tonumber(lua_state(), 2);
+    double const min_y = lua_tonumber(lua_state(), 3);
+    double const max_x = lua_tonumber(lua_state(), 4);
+    double const max_y = lua_tonumber(lua_state(), 5);
+
+    self().add_region(name, geom::box_t{min_x, min_y, max_x, max_y});
+
+    return 0;
+}
+
+int lua_wrapper_locator::add_from_db()
+{
+    if (lua_gettop(lua_state()) < 1) {
+        throw fmt_error("Need locator and SQL query arguments");
+    }
+
+    std::string const query = lua_tostring(lua_state(), 1);
+
+    pg_conn_t const db_connection{s_connection_params, "flex.locator"};
+    self().add_regions(db_connection, query);
+
+    return 0;
+}
+
+int lua_wrapper_locator::all_intersecting()
+{
+    if (lua_gettop(lua_state()) < 1) {
+        throw fmt_error("Need locator and geometry arguments");
+    }
+
+    auto const *geometry = unpack_geometry(lua_state());
+
+    if (!geometry) {
+        throw fmt_error("Second argument must be a geometry");
+    }
+
+    auto const names = self().all_intersecting(*geometry);
+    lua_createtable(lua_state(), (int)names.size(), 0);
+    int n = 0;
+    for (auto const& name : names) {
+        lua_pushinteger(lua_state(), ++n);
+        lua_pushstring(lua_state(), name.c_str());
+        lua_rawset(lua_state(), -3);
+    }
+
+    return 1;
+}
+
+int lua_wrapper_locator::first_intersecting()
+{
+    if (lua_gettop(lua_state()) < 1) {
+        throw fmt_error("Need locator and geometry arguments");
+    }
+
+    auto const *geometry = unpack_geometry(lua_state());
+
+    if (!geometry) {
+        throw fmt_error("Second argument must be a geometry");
+    }
+
+    auto const name = self().first_intersecting(*geometry);
+    if (name.empty()) {
+        return 0;
+    }
+
+    lua_pushstring(lua_state(), name.c_str());
+
+    return 1;
+}
diff --git a/src/flex-lua-locator.hpp b/src/flex-lua-locator.hpp
new file mode 100644
index 000000000..cf560702a
--- /dev/null
+++ b/src/flex-lua-locator.hpp
@@ -0,0 +1,53 @@
+#ifndef OSM2PGSQL_FLEX_LUA_LOCATOR_HPP
+#define OSM2PGSQL_FLEX_LUA_LOCATOR_HPP
+
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+/**
+ * \file
+ *
+ * Functions implementing the Lua interface for the locator.
+ */
+
+#include "flex-lua-wrapper.hpp"
+#include "locator.hpp"
+
+class pg_conn_t;
+
+struct lua_State;
+
+static char const *const osm2pgsql_locator_name = "osm2pgsql.Locator";
+
+int setup_flex_locator(lua_State *lua_state, std::vector<locator_t> *locators);
+
+class lua_wrapper_locator : public lua_wrapper_base<locator_t>
+{
+public:
+    static void init(lua_State *lua_state,
+                     connection_params_t const &connection_params);
+
+    lua_wrapper_locator(lua_State *lua_state, locator_t *locator)
+    : lua_wrapper_base(lua_state, locator)
+    {
+    }
+
+    int __tostring() const;
+    int name() const;
+    int add_bbox();
+    int add_from_db();
+    int all_intersecting();
+    int first_intersecting();
+
+private:
+    static connection_params_t s_connection_params;
+
+}; // class lua_wrapper_locator
+
+#endif // OSM2PGSQL_FLEX_LUA_LOCATOR_HPP
diff --git a/src/flex-lua-wrapper.hpp b/src/flex-lua-wrapper.hpp
index 7577e7c71..6f590d532 100644
--- a/src/flex-lua-wrapper.hpp
+++ b/src/flex-lua-wrapper.hpp
@@ -12,6 +12,7 @@
 
 #include "output-flex.hpp"
 
+#include <cassert>
 #include <exception>
 
 #define TRAMPOLINE_WRAPPED_OBJECT(obj_name, func_name)                         \
@@ -43,6 +44,8 @@ class lua_wrapper_base
     lua_wrapper_base(lua_State *lua_state, WRAPPED *wrapped)
     : m_lua_state(lua_state), m_self(wrapped)
     {
+        assert(lua_state);
+        assert(wrapped);
     }
 
 protected:
diff --git a/src/locator.cpp b/src/locator.cpp
new file mode 100644
index 000000000..7b983751d
--- /dev/null
+++ b/src/locator.cpp
@@ -0,0 +1,129 @@
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+#include "locator.hpp"
+
+#include "geom-boost-adaptor.hpp"
+#include "geom-box.hpp"
+#include "geom-functions.hpp"
+#include "overloaded.hpp"
+#include "pgsql-capabilities.hpp"
+#include "pgsql.hpp"
+#include "wkb.hpp"
+
+#include <iterator>
+
+void locator_t::add_region(std::string const &name, geom::box_t const &box)
+{
+    m_regions.emplace_back(name, box);
+}
+
+void locator_t::add_region(std::string const &name,
+                           geom::geometry_t const &geom)
+{
+    if (geom.is_polygon()) {
+        m_regions.emplace_back(name, geom.get<geom::polygon_t>());
+        return;
+    }
+
+    if (geom.is_multipolygon()) {
+        for (auto const &polygon : geom.get<geom::multipolygon_t>()) {
+            m_regions.emplace_back(name, polygon);
+        }
+        return;
+    }
+
+    throw std::runtime_error{
+        "Invalid geometry type: Need (multi)polygon for region."};
+}
+
+void locator_t::add_regions(pg_conn_t const &db_connection,
+                            std::string const &query)
+{
+    log_debug("Querying database for locator '{}'...", name());
+    auto const result = db_connection.exec(query);
+    if (result.num_fields() != 2) {
+        throw std::runtime_error{"Locator queries must return exactly two "
+                                 "columns with the name and the geometry."};
+    }
+
+    if (!is_geometry_type(result.field_type(1))) {
+        throw std::runtime_error{
+            "Second column in Locator query results must be a geometry."};
+    }
+
+    for (int n = 0; n < result.num_tuples(); ++n) {
+        std::string const name = result.get_value(n, 0);
+        auto geometry = ewkb_to_geom(decode_hex(result.get(n, 1)));
+
+        if (geometry.srid() == 4326) {
+            add_region(name, geometry);
+        } else {
+            log_warn("Ignoring locator geometry that is not in WGS84 (4326)");
+        }
+    }
+    log_info("Added {} regions to locator '{}'.", result.num_tuples(), name());
+}
+
+void locator_t::build_index()
+{
+    log_debug("Building index for locator '{}'", name());
+    std::vector<idx_value_t> m_data;
+    m_data.reserve(m_regions.size());
+
+    std::size_t n = 0;
+    for (auto const &region : m_regions) {
+        m_data.emplace_back(region.box(), n++);
+    }
+
+    m_rtree.clear();
+    m_rtree.insert(m_data.cbegin(), m_data.cend());
+}
+
+std::set<std::string> locator_t::all_intersecting(geom::geometry_t const &geom)
+{
+    if (m_rtree.size() < m_regions.size()) {
+        build_index();
+    }
+
+    std::set<std::string> results;
+
+    geom.visit(overloaded{[&](geom::nullgeom_t const & /*input*/) {},
+                          [&](geom::collection_t const & /*input*/) {}, // TODO
+                          [&](auto const &val) {
+                              for (auto it = begin_intersects(val);
+                                   it != end_query(); ++it) {
+                                  auto const &region = m_regions[it->second];
+                                  results.emplace(region.name());
+                              }
+                          }});
+
+    return results;
+}
+
+std::string locator_t::first_intersecting(geom::geometry_t const &geom)
+{
+    if (m_rtree.size() < m_regions.size()) {
+        build_index();
+    }
+
+    std::string result;
+
+    geom.visit(overloaded{[&](geom::nullgeom_t const & /*input*/) {},
+                          [&](geom::collection_t const & /*input*/) {}, // TODO
+                          [&](auto const &val) {
+                              auto const it = begin_intersects(val);
+                              if (it != end_query()) {
+                                  auto const &region = m_regions[it->second];
+                                  result = region.name();
+                              }
+                          }});
+
+    return result;
+}
diff --git a/src/locator.hpp b/src/locator.hpp
new file mode 100644
index 000000000..b8d6e44a1
--- /dev/null
+++ b/src/locator.hpp
@@ -0,0 +1,147 @@
+#ifndef OSM2PGSQL_LOCATOR_HPP
+#define OSM2PGSQL_LOCATOR_HPP
+
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+/**
+ * \file
+ *
+ * For the region_t and locator_t classes.
+ */
+
+#include "geom-boost-adaptor.hpp"
+#include "geom-box.hpp"
+#include "geom.hpp"
+#include "logging.hpp"
+
+#include <boost/geometry/index/rtree.hpp>
+
+#include <set>
+#include <string>
+#include <utility>
+#include <variant>
+#include <vector>
+
+class pg_conn_t;
+
+namespace bgi = ::boost::geometry::index;
+
+/**
+ * A locator stores a number of regions. Each region has a name and a bounding
+ * box or polygon geometry. The locator can then check efficiently which
+ * regions a specified geometry is intersecting.
+ *
+ * Names don't have to be unique. Geometries of regions can overlap. In fact it
+ * is best to subdivide larger polygons into smaller ones, because the
+ * intersection will be much faster to calculate that way. This will
+ * automatically lead to lots of small polygons with the same name.
+ */
+class locator_t
+{
+private:
+    class region_t
+    {
+    public:
+        region_t(std::string name, geom::box_t const &box)
+        : m_name(std::move(name)), m_box(box),
+          m_polygon(
+              geom::polygon_t{geom::ring_t{{m_box.min_x(), m_box.min_y()},
+                                           {m_box.max_x(), m_box.min_y()},
+                                           {m_box.max_x(), m_box.max_y()},
+                                           {m_box.min_x(), m_box.max_y()},
+                                           {m_box.min_x(), m_box.min_y()}}})
+        {
+        }
+
+        region_t(std::string name, geom::polygon_t const &polygon)
+        : m_name(std::move(name)), m_box(envelope(polygon)), m_polygon(polygon)
+        {
+        }
+
+        std::string const &name() const noexcept { return m_name; }
+
+        geom::box_t const &box() const noexcept { return m_box; }
+
+        geom::polygon_t const &polygon() const noexcept { return m_polygon; }
+
+    private:
+        std::string m_name;
+        geom::box_t m_box;
+        geom::polygon_t m_polygon;
+
+    }; // class region_t
+
+    std::string m_name;
+    std::vector<region_t> m_regions;
+
+    using idx_value_t = std::pair<geom::box_t, std::size_t>;
+
+    using tree_t = bgi::rtree<idx_value_t, bgi::rstar<16>>;
+    tree_t m_rtree;
+
+    template <typename T>
+    tree_t::const_query_iterator begin_intersects(T const &geom)
+    {
+        return m_rtree.qbegin(
+            bgi::intersects(geom) && bgi::satisfies([&](idx_value_t const &v) {
+                auto const &region = m_regions[v.second];
+                return boost::geometry::intersects(region.polygon(), geom);
+            }));
+    }
+
+    tree_t::const_query_iterator end_query() { return m_rtree.qend(); }
+
+public:
+    /// The name of this locator (for logging only)
+    std::string const &name() const noexcept { return m_name; }
+
+    /// Are there any regions stored in this locator?
+    bool empty() const noexcept { return m_regions.empty(); }
+
+    /// Return the number of regions stored in this locator.
+    std::size_t size() const noexcept { return m_regions.size(); }
+
+    /// Set the name of this locator.
+    void set_name(std::string name) { m_name = std::move(name); }
+
+    /// Add a bounding box as region.
+    void add_region(std::string const &name, geom::box_t const &box);
+
+    /**
+     * Add a (multi)polygon as region.
+     *
+     * Throws an exception if geom is not a (multi)polygon.
+     */
+    void add_region(std::string const &name, geom::geometry_t const &geom);
+
+    void add_regions(pg_conn_t const &db_connection, std::string const &query);
+
+    /// Build index containing all regions.
+    void build_index();
+
+    /**
+     * Find all regions intersecting the specified geometry. Returns a set
+     * of (unique) names of those regions.
+     *
+     * Automatically calls build_index() if needed.
+     */
+    std::set<std::string> all_intersecting(geom::geometry_t const &geom);
+
+    /**
+     * Find a region intersecting the specified geometry. If there is more
+     * than one, a random one will be returned. Returns the name of the region.
+     *
+     * Automatically calls build_index() if needed.
+     */
+    std::string first_intersecting(geom::geometry_t const &geom);
+
+}; // class locator_t
+
+#endif // OSM2PGSQL_LOCATOR_HPP
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 164d81b5e..31bb167fa 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -17,6 +17,7 @@
 #include "flex-lua-expire-output.hpp"
 #include "flex-lua-geom.hpp"
 #include "flex-lua-index.hpp"
+#include "flex-lua-locator.hpp"
 #include "flex-lua-table.hpp"
 #include "flex-lua-wrapper.hpp"
 #include "flex-write.hpp"
@@ -77,6 +78,7 @@ std::mutex lua_mutex;
         }                                                                      \
     }
 
+TRAMPOLINE(app_define_locator, define_locator)
 TRAMPOLINE(app_define_table, define_table)
 TRAMPOLINE(app_define_expire_output, define_expire_output)
 TRAMPOLINE(app_get_bbox, get_bbox)
@@ -566,6 +568,17 @@ int output_flex_t::app_as_geometrycollection()
     return 1;
 }
 
+int output_flex_t::app_define_locator()
+{
+    if (m_calling_context != calling_context::main) {
+        throw std::runtime_error{
+            "Locators have to be defined in the"
+            " main Lua code, not in any of the callbacks."};
+    }
+
+    return setup_flex_locator(lua_state(), m_locators.get());
+}
+
 int output_flex_t::app_define_table()
 {
     if (m_calling_context != calling_context::main) {
@@ -604,6 +617,12 @@ expire_output_t &output_flex_t::get_expire_output_from_param()
                               osm2pgsql_expire_output_name);
 }
 
+locator_t &output_flex_t::get_locator_from_param()
+{
+    return get_from_idx_param(lua_state(), m_locators.get(),
+                              osm2pgsql_locator_name);
+}
+
 bool output_flex_t::way_cache_t::init(middle_query_t const &middle, osmid_t id)
 {
     m_buffer.clear();
@@ -1107,13 +1126,17 @@ void output_flex_t::start()
     for (auto &table : m_table_connections) {
         table.start(m_db_connection, get_options()->append);
     }
+
+    for (auto &locator : *m_locators) {
+        locator.build_index();
+    }
 }
 
 output_flex_t::output_flex_t(output_flex_t const *other,
                              std::shared_ptr<middle_query_t> mid,
                              std::shared_ptr<db_copy_thread_t> copy_thread)
-: output_t(other, std::move(mid)), m_tables(other->m_tables),
-  m_expire_outputs(other->m_expire_outputs),
+: output_t(other, std::move(mid)), m_locators(other->m_locators),
+  m_tables(other->m_tables), m_expire_outputs(other->m_expire_outputs),
   m_db_connection(get_options()->connection_params, "out.flex.thread"),
   m_stage2_way_ids(other->m_stage2_way_ids),
   m_copy_thread(std::move(copy_thread)), m_lua_state(other->m_lua_state),
@@ -1222,6 +1245,9 @@ void output_flex_t::init_lua(std::string const &filename,
     }
     lua_rawset(lua_state(), -3);
 
+    luaX_add_table_func(lua_state(), "define_locator",
+                        lua_trampoline_app_define_locator);
+
     luaX_add_table_func(lua_state(), "define_table",
                         lua_trampoline_app_define_table);
 
@@ -1229,6 +1255,7 @@ void output_flex_t::init_lua(std::string const &filename,
                         lua_trampoline_app_define_expire_output);
 
     lua_wrapper_expire_output::init(lua_state());
+    lua_wrapper_locator::init(lua_state(), get_options()->connection_params);
     lua_wrapper_table::init(lua_state());
 
     // Clean up stack
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index 39cd1da70..c803d3a30 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -17,6 +17,7 @@
 #include "flex-table.hpp"
 #include "geom.hpp"
 #include "idlist.hpp"
+#include "locator.hpp"
 #include "output.hpp"
 
 #include <osmium/osm/item_type.hpp>
@@ -160,6 +161,7 @@ class output_flex_t : public output_t
     int app_as_multipolygon();
     int app_as_geometrycollection();
 
+    int app_define_locator();
     int app_define_table();
     int app_define_expire_output();
     int app_get_bbox();
@@ -172,6 +174,9 @@ class output_flex_t : public output_t
     // Get the expire output that is as first parameter on the Lua stack.
     expire_output_t &get_expire_output_from_param();
 
+    // Get the flex locator that is as first parameter on the Lua stack.
+    locator_t &get_locator_from_param();
+
 private:
     void select_relation_members();
 
@@ -258,6 +263,9 @@ class output_flex_t : public output_t
 
     }; // relation_cache_t
 
+    std::shared_ptr<std::vector<locator_t>> m_locators =
+        std::make_shared<std::vector<locator_t>>();
+
     std::shared_ptr<std::vector<flex_table_t>> m_tables =
         std::make_shared<std::vector<flex_table_t>>();
 
diff --git a/src/pgsql-capabilities-int.hpp b/src/pgsql-capabilities-int.hpp
index 0fa779837..993f7dbc6 100644
--- a/src/pgsql-capabilities-int.hpp
+++ b/src/pgsql-capabilities-int.hpp
@@ -27,6 +27,7 @@ struct database_capabilities_t
     std::set<std::string> tables;
 
     std::string database_name;
+    unsigned int geometry_type_oid = 0;
 
     uint32_t database_version = 0;
     postgis_version postgis{};
diff --git a/src/pgsql-capabilities.cpp b/src/pgsql-capabilities.cpp
index b04c26f9d..7c22ef0a1 100644
--- a/src/pgsql-capabilities.cpp
+++ b/src/pgsql-capabilities.cpp
@@ -71,6 +71,19 @@ void init_database_name(pg_conn_t const &db_connection)
     capabilities().database_name = res.get(0, 0);
 }
 
+void init_geometry_oid(pg_conn_t const &db_connection)
+{
+    auto const res =
+        db_connection.exec("SELECT oid FROM pg_type WHERE typname='geometry'");
+
+    if (res.num_tuples() != 1) {
+        throw std::runtime_error{"Database error: Can not get geometry type. "
+                                 "Is PostGIS extension loaded?"};
+    }
+
+    capabilities().geometry_type_oid = std::stoul(std::string{res.get(0, 0)});
+}
+
 void init_postgis_version(pg_conn_t const &db_connection)
 {
     auto const res = db_connection.exec(
@@ -96,6 +109,7 @@ void init_database_capabilities(pg_conn_t const &db_connection)
     init_settings(db_connection);
     init_database_name(db_connection);
     init_postgis_version(db_connection);
+    init_geometry_oid(db_connection);
 
     try {
         log_info("Database version: {}",
@@ -173,6 +187,11 @@ bool has_table(std::string schema, std::string const &name)
     return capabilities().tables.count(schema);
 }
 
+bool is_geometry_type(unsigned int oid)
+{
+    return capabilities().geometry_type_oid == oid;
+}
+
 void check_schema(std::string const &schema)
 {
     if (has_schema(schema)) {
diff --git a/src/pgsql-capabilities.hpp b/src/pgsql-capabilities.hpp
index a9aba9269..4eb766e69 100644
--- a/src/pgsql-capabilities.hpp
+++ b/src/pgsql-capabilities.hpp
@@ -23,6 +23,8 @@ bool has_tablespace(std::string const &value);
 bool has_index_method(std::string const &value);
 bool has_table(std::string schema, std::string const &name);
 
+bool is_geometry_type(unsigned int oid);
+
 void check_schema(std::string const &schema);
 
 /// Get PostgreSQL version in the format (major * 10000 + minor).
diff --git a/src/pgsql.hpp b/src/pgsql.hpp
index 33c398fbf..01a0f617f 100644
--- a/src/pgsql.hpp
+++ b/src/pgsql.hpp
@@ -115,6 +115,12 @@ class pg_result_t
         return PQfnumber(m_result.get(), ('"' + name + '"').c_str());
     }
 
+    /// Get the PostgreSQL internal type of a field.
+    unsigned int field_type(int col) const noexcept {
+        assert(col >= 0 && col < num_fields());
+        return PQftype(m_result.get(), col);
+    }
+
     /// Return true if this holds an actual result.
     explicit operator bool() const noexcept { return m_result.get(); }
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 41456d7cf..93fd0eded 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -58,6 +58,7 @@ set_test(test-geom-pole-of-inaccessibility LABELS NoDB)
 set_test(test-geom-polygons LABELS NoDB)
 set_test(test-geom-transform LABELS NoDB)
 set_test(test-json-writer LABELS NoDB)
+set_test(test-locator LABELS NoDB)
 set_test(test-lua-utils LABELS NoDB)
 set_test(test-middle)
 set_test(test-node-locations LABELS NoDB)
diff --git a/tests/bdd/flex/locator.feature b/tests/bdd/flex/locator.feature
new file mode 100644
index 000000000..e4343a241
--- /dev/null
+++ b/tests/bdd/flex/locator.feature
@@ -0,0 +1,233 @@
+Feature: Locators
+
+    Scenario: Define a locator without parameter
+        Given the OSM data
+            """
+            """
+        And the lua style
+            """
+            local regions = osm2pgsql.define_locator()
+            print(regions:name())
+            """
+        Then running osm2pgsql flex fails
+        And the error output contains
+            """
+            Argument #1 to 'define_locator' must be a Lua table.
+            """
+
+    Scenario: Define a locator with a name
+        Given the OSM data
+            """
+            """
+        And the lua style
+            """
+            local regions = osm2pgsql.define_locator({ name = 'aname' })
+            print('NAME[' .. regions:name() .. ']')
+            """
+        When running osm2pgsql flex
+        Then the standard output contains
+            """
+            NAME[aname]
+            """
+
+    Scenario: Define a locator without name is okay
+        Given the OSM data
+            """
+            """
+        And the lua style
+            """
+            local regions = osm2pgsql.define_locator({})
+            print('NAME[' .. regions:name() .. ']')
+            """
+        When running osm2pgsql flex
+        Then the standard output contains
+            """
+            NAME[]
+            """
+
+    Scenario: Calling name() on locator with . instead of : does not work
+        Given the OSM data
+            """
+            """
+        And the lua style
+            """
+            local regions = osm2pgsql.define_locator({ name = 'test' })
+            print(regions.name())
+            """
+        Then running osm2pgsql flex fails
+        And the error output contains
+            """
+            Argument #1 has to be of type osm2pgsql.Locator.
+            """
+
+    Scenario: Use a first_intersecting() without geometry fails
+        Given the OSM data
+            """
+            n10 v1 dV Tamenity=post_box x0.5 y0.5
+            """
+        And the lua style
+            """
+            local regions = osm2pgsql.define_locator({ name = 'regions' })
+            regions:add_bbox('B1', 0.0, 0.0, 1.0, 1.0)
+
+            function osm2pgsql.process_node(object)
+                local r = regions:first_intersecting()
+            end
+            """
+        Then running osm2pgsql flex fails
+        And the error output contains
+            """
+            Error in 'first_intersecting': Need locator and geometry arguments
+            """
+
+    Scenario: Use a all_intersecting() without geometry fails
+        Given the OSM data
+            """
+            n10 v1 dV Tamenity=post_box x0.5 y0.5
+            """
+        And the lua style
+            """
+            local regions = osm2pgsql.define_locator({ name = 'regions' })
+            regions:add_bbox('B1', 0.0, 0.0, 1.0, 1.0)
+
+            function osm2pgsql.process_node(object)
+                local r = regions:all_intersecting()
+            end
+            """
+        Then running osm2pgsql flex fails
+        And the error output contains
+            """
+            Error in 'all_intersecting': Need locator and geometry arguments
+            """
+
+    Scenario: Define and use a locator with first_intersecting
+        Given the OSM data
+            """
+            n10 v1 dV Tamenity=post_box x0.5 y0.5
+            n11 v1 dV Tamenity=post_box x2.5 y2.5
+            n12 v1 dV Tamenity=post_box x1.5 y1.5
+            """
+        And the lua style
+            """
+            local regions = osm2pgsql.define_locator({ name = 'regions' })
+            regions:add_bbox('B1', 0.0, 0.0, 1.0, 1.0)
+            regions:add_bbox('B2', 1.0, 1.0, 2.0, 2.0)
+
+            local points = osm2pgsql.define_node_table('osm2pgsql_test_points', {
+                { column = 'region', type = 'text' },
+                { column = 'geom', type = 'point', projection = 4326 },
+            })
+
+            function osm2pgsql.process_node(object)
+                local g = object:as_point()
+                local r = regions:first_intersecting(g)
+                if r then
+                    points:insert({
+                        region = r,
+                        geom = g,
+                    })
+                end
+            end
+            """
+        When running osm2pgsql flex
+        Then table osm2pgsql_test_points contains exactly
+            | node_id | region | ST_AsText(geom) |
+            | 10      | B1     | 0.5 0.5         |
+            | 12      | B2     | 1.5 1.5         |
+
+    Scenario: Define and use a locator with all_intersecting
+        Given the OSM data
+            """
+            n10 v1 dV Tamenity=post_box x0.5 y0.5
+            n11 v1 dV Tamenity=post_box x2.5 y2.5
+            n12 v1 dV Tamenity=post_box x1.5 y1.5
+            n13 v1 dV Tamenity=post_box x1.0 y1.0
+            """
+        And the lua style
+            """
+            local regions = osm2pgsql.define_locator({ name = 'regions' })
+            regions:add_bbox('B1', 0.0, 0.0, 1.0, 1.0)
+            regions:add_bbox('B2', 1.0, 1.0, 2.0, 2.0)
+
+            local points = osm2pgsql.define_node_table('osm2pgsql_test_points', {
+                { column = 'num_regions', type = 'int' },
+                { column = 'geom', type = 'point', projection = 4326 },
+            })
+
+            function osm2pgsql.process_node(object)
+                local g = object:as_point()
+                local r = regions:all_intersecting(g)
+                if #r > 0 then
+                    points:insert({
+                        num_regions = #r,
+                        geom = g,
+                    })
+                end
+            end
+            """
+        When running osm2pgsql flex
+        Then table osm2pgsql_test_points contains exactly
+            | node_id | num_regions | ST_AsText(geom) |
+            | 10      | 1           | 0.5 0.5         |
+            | 12      | 1           | 1.5 1.5         |
+            | 13      | 2           | 1 1             |
+
+    Scenario: Define and use a locator with polygon from db
+        Given the 10.0 grid with origin 10.0 10.0
+            | 10 | 11 |
+            | 12 |    |
+        And the OSM data
+            """
+            w20 v1 dV Tsome=boundary Nn10,n11,n12,n10
+            """
+        And the lua style
+            """
+            local regions = osm2pgsql.define_way_table('osm2pgsql_test_regions', {
+                { column = 'region', type = 'text' },
+                { column = 'geom', type = 'polygon', projection = 4326 },
+            })
+
+            function osm2pgsql.process_way(object)
+                regions:insert({
+                    region = 'P1',
+                    geom = object:as_polygon(),
+                })
+            end
+            """
+        When running osm2pgsql flex
+        Then table osm2pgsql_test_regions contains exactly
+            | way_id | region | ST_AsText(geom)         |
+            | 20     | P1     | (10 0,20 10,10 10,10 0) |
+
+        Given an empty grid
+        And the OSM data
+            """
+            n10 v1 dV Tamenity=post_box x15.0 y8.0
+            n11 v1 dV Tamenity=post_box x15.0 y2.0
+            """
+        And the lua style
+            """
+            local regions = osm2pgsql.define_locator({ name = 'regions' })
+            regions:add_from_db('SELECT region, geom FROM osm2pgsql_test_regions')
+
+            local points = osm2pgsql.define_node_table('osm2pgsql_test_points', {
+                { column = 'region', type = 'text' },
+                { column = 'geom', type = 'point', projection = 4326 },
+            })
+
+            function osm2pgsql.process_node(object)
+                local g = object:as_point()
+                local r = regions:first_intersecting(g)
+                if r then
+                    points:insert({
+                        region = r,
+                        geom = g,
+                    })
+                end
+            end
+            """
+        When running osm2pgsql flex
+        Then table osm2pgsql_test_points contains exactly
+            | node_id | region | ST_AsText(geom) |
+            | 10      | P1     | 15 8            |
+
diff --git a/tests/bdd/steps/steps_execute.py b/tests/bdd/steps/steps_execute.py
index d731ab582..b2d4bd6d6 100644
--- a/tests/bdd/steps/steps_execute.py
+++ b/tests/bdd/steps/steps_execute.py
@@ -128,12 +128,17 @@ def setup_lua_tagtransform(context):
 def setup_inline_lua_style(context):
     outfile = context.workdir / 'inline_style.lua'
     outfile.write_text(context.text)
-    context.osm2pgsql_params.extend(('-S', str(outfile)))
-
+    if '-S' in context.osm2pgsql_params:
+        context.osm2pgsql_params[context.osm2pgsql_params.index('-S') + 1] = str(outfile)
+    else:
+        context.osm2pgsql_params.extend(('-S', str(outfile)))
 
 @given("the style file '(?P<style>.+)'")
 def setup_style_file(context, style):
-    context.osm2pgsql_params.extend(('-S', str(context.test_data_dir / style)))
+    if '-S' in context.osm2pgsql_params:
+        context.osm2pgsql_params[context.osm2pgsql_params.index('-S') + 1] = str(context.test_data_dir / style)
+    else:
+        context.osm2pgsql_params.extend(('-S', str(context.test_data_dir / style)))
 
 
 @when(r"running osm2pgsql (?P<output>\w+)(?: with parameters)?")
diff --git a/tests/test-locator.cpp b/tests/test-locator.cpp
new file mode 100644
index 000000000..2b0cb2db9
--- /dev/null
+++ b/tests/test-locator.cpp
@@ -0,0 +1,136 @@
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+#include <catch.hpp>
+
+#include "locator.hpp"
+
+TEST_CASE("Create empty locator", "[NoDB]")
+{
+    locator_t locator;
+    REQUIRE(locator.name().empty());
+    REQUIRE(locator.empty());
+    REQUIRE(locator.size() == 0); // NOLINT(readability-container-size-empty)
+
+    locator.set_name("foo");
+    REQUIRE(locator.name() == "foo");
+}
+
+TEST_CASE("Create locator with single box and check it", "[NoDB]")
+{
+    locator_t locator;
+    locator.set_name("box");
+    locator.add_region("in", geom::box_t{0, 0, 10, 10});
+
+    REQUIRE_FALSE(locator.empty());
+    REQUIRE(locator.size() == 1);
+
+    locator.build_index();
+
+    geom::geometry_t const p1{geom::point_t{0.5, 0.5}}; // in box
+    geom::geometry_t const p2{geom::point_t{20, 20}}; // outside box
+    geom::geometry_t const p3{geom::point_t{0, 0}}; // on boundary
+
+    REQUIRE(locator.first_intersecting(p1) == "in");
+    REQUIRE(locator.first_intersecting(p2).empty());
+    REQUIRE(locator.first_intersecting(p3) == "in");
+
+    auto const a1 = locator.all_intersecting(p1);
+    auto const a2 = locator.all_intersecting(p2);
+    auto const a3 = locator.all_intersecting(p3);
+
+    REQUIRE(a1.size() == 1);
+    REQUIRE(a1.count("in") == 1);
+    REQUIRE(a2.empty());
+    REQUIRE(a3.size() == 1);
+    REQUIRE(a3.count("in") == 1);
+}
+
+TEST_CASE("Create locator with multiple boxes and check it", "[NoDB]")
+{
+    locator_t locator;
+    locator.set_name("box");
+    locator.add_region("b1", geom::box_t{0, 0, 20, 20});
+    locator.add_region("b2", geom::box_t{10, 10, 30, 30});
+
+    REQUIRE_FALSE(locator.empty());
+    REQUIRE(locator.size() == 2);
+
+    geom::geometry_t const p1{geom::point_t{1, 1}}; // in 1
+    geom::geometry_t const p2{geom::point_t{11, 21}}; // in 2
+    geom::geometry_t const p3{geom::point_t{11, 11}}; // in 1 and 2
+    geom::geometry_t const p4{geom::point_t{1, 40}}; // outside
+
+    REQUIRE(locator.first_intersecting(p1) == "b1");
+    REQUIRE(locator.first_intersecting(p2) == "b2");
+    REQUIRE(((locator.first_intersecting(p3) == "b1") ||
+             (locator.first_intersecting(p3) == "b2")));
+    REQUIRE(locator.first_intersecting(p4).empty());
+
+    auto const a1 = locator.all_intersecting(p1);
+    auto const a2 = locator.all_intersecting(p2);
+    auto const a3 = locator.all_intersecting(p3);
+    auto const a4 = locator.all_intersecting(p4);
+
+    REQUIRE(a1.size() == 1);
+    REQUIRE(a2.size() == 1);
+    REQUIRE(a3.size() == 2);
+    REQUIRE(a4.empty());
+
+    REQUIRE(a1.count("b1") == 1);
+    REQUIRE(a2.count("b2") == 1);
+    REQUIRE(a3.count("b1") == 1);
+    REQUIRE(a3.count("b2") == 1);
+}
+
+TEST_CASE("Locator with polygon regions", "[NoDB]")
+{
+    locator_t locator;
+    locator.set_name("box");
+    locator.add_region("b1", geom::box_t{0, 0, 5, 5});
+
+    geom::point_t const c1{0, 0};
+    geom::point_t const c2{0, 5};
+    geom::point_t const c3{5, 0};
+    geom::point_t const c4{5, 5};
+
+    geom::polygon_t polygon1{geom::ring_t{c1, c2, c3, c1}};
+    geom::polygon_t polygon2{geom::ring_t{c4, c2, c3, c4}};
+
+    locator.add_region("p1", geom::geometry_t{std::move(polygon1)});
+    locator.add_region("p2", geom::geometry_t{std::move(polygon2)});
+
+    REQUIRE_FALSE(locator.empty());
+    REQUIRE(locator.size() == 3);
+
+    geom::geometry_t const p1{geom::point_t{1, 1}}; // in b1, p1
+    geom::geometry_t const p2{geom::point_t{4, 4}}; // in b1, p2
+    geom::geometry_t const p3{geom::point_t{1, 10}}; // outside
+
+    REQUIRE(((locator.first_intersecting(p1) == "b1") ||
+             (locator.first_intersecting(p1) == "p1")));
+
+    REQUIRE(((locator.first_intersecting(p2) == "b1") ||
+             (locator.first_intersecting(p2) == "p2")));
+
+    REQUIRE(locator.first_intersecting(p3).empty());
+
+    auto const a1 = locator.all_intersecting(p1);
+    auto const a2 = locator.all_intersecting(p2);
+    auto const a3 = locator.all_intersecting(p3);
+
+    REQUIRE(a1.size() == 2);
+    REQUIRE(a2.size() == 2);
+    REQUIRE(a3.empty());
+
+    REQUIRE(a1.count("b1") == 1);
+    REQUIRE(a1.count("p1") == 1);
+    REQUIRE(a2.count("b1") == 1);
+    REQUIRE(a2.count("p2") == 1);
+}

From d7d6fd81be968b00c552d0b07d31a8c0b7f4ad41 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 30 May 2025 18:26:48 +0200
Subject: [PATCH 280/430] remove CI check for Windows-2019

The Windows 2019 image will be retired by Github by end of June.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 61fa6faea..3e3d8b3ef 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -341,7 +341,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2019, windows-2022, windows-2025]
+        os: [windows-2022, windows-2025]
     runs-on: ${{ matrix.os }}
 
     env:

From f27aa34ed218c4a14465b5e90653790a4d078ca5 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 30 May 2025 18:30:26 +0200
Subject: [PATCH 281/430] move building Windows package to Windows-2025 build

---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3e3d8b3ef..459e474bc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -371,17 +371,17 @@ jobs:
           cp -r Release/* ../README.md ../COPYING ../*.style ../scripts ../flex-config c:/vcpkg/installed/x64-windows/share/proj/proj.db c:/artifact/osm2pgsql-bin/
         shell: bash
         working-directory: build
-        if: matrix.os == 'windows-2022'
+        if: matrix.os == 'windows-2025'
       - name: 'Upload Artifact'
         uses: actions/upload-artifact@v4
         with:
           name: osm2pgsql-win64
           path: c:/artifact
-        if: matrix.os == 'windows-2022'
+        if: matrix.os == 'windows-2025'
 
   windows-package:
     needs: windows
-    runs-on: windows-2022
+    runs-on: windows-2025
 
     env:
       OSMURL: https://download.geofabrik.de/europe/monaco-latest.osm.bz2

From 3c5d105e5252c40d47c8d427f323fb9a101e0489 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 30 May 2025 15:05:54 +0200
Subject: [PATCH 282/430] Don't use __tostring as function name

Because names with two underscores are reserved in C++.
---
 src/flex-lua-expire-output.cpp | 6 +++---
 src/flex-lua-expire-output.hpp | 2 +-
 src/flex-lua-locator.cpp       | 6 +++---
 src/flex-lua-locator.hpp       | 2 +-
 src/flex-lua-table.cpp         | 6 +++---
 src/flex-lua-table.hpp         | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/flex-lua-expire-output.cpp b/src/flex-lua-expire-output.cpp
index 1ec5f23d3..59cc0c222 100644
--- a/src/flex-lua-expire-output.cpp
+++ b/src/flex-lua-expire-output.cpp
@@ -65,7 +65,7 @@ create_expire_output(lua_State *lua_state, std::string const &default_schema,
     return new_expire_output;
 }
 
-TRAMPOLINE_WRAPPED_OBJECT(expire_output, __tostring)
+TRAMPOLINE_WRAPPED_OBJECT(expire_output, tostring)
 TRAMPOLINE_WRAPPED_OBJECT(expire_output, filename)
 TRAMPOLINE_WRAPPED_OBJECT(expire_output, maxzoom)
 TRAMPOLINE_WRAPPED_OBJECT(expire_output, minzoom)
@@ -112,7 +112,7 @@ void lua_wrapper_expire_output::init(lua_State *lua_state)
     lua_pushvalue(lua_state, -1);
     lua_setfield(lua_state, -2, "__index");
     luaX_add_table_func(lua_state, "__tostring",
-                        lua_trampoline_expire_output___tostring);
+                        lua_trampoline_expire_output_tostring);
     luaX_add_table_func(lua_state, "filename",
                         lua_trampoline_expire_output_filename);
     luaX_add_table_func(lua_state, "maxzoom",
@@ -126,7 +126,7 @@ void lua_wrapper_expire_output::init(lua_State *lua_state)
     lua_pop(lua_state, 2);
 }
 
-int lua_wrapper_expire_output::__tostring() const
+int lua_wrapper_expire_output::tostring() const
 {
     std::string const str =
         fmt::format("osm2pgsql.ExpireOutput[minzoom={},maxzoom={},filename={},"
diff --git a/src/flex-lua-expire-output.hpp b/src/flex-lua-expire-output.hpp
index aa3bfac76..809a8ebc4 100644
--- a/src/flex-lua-expire-output.hpp
+++ b/src/flex-lua-expire-output.hpp
@@ -36,7 +36,7 @@ class lua_wrapper_expire_output : public lua_wrapper_base<expire_output_t>
     {
     }
 
-    int __tostring() const;
+    int tostring() const;
     int filename() const;
     int maxzoom() const;
     int minzoom() const;
diff --git a/src/flex-lua-locator.cpp b/src/flex-lua-locator.cpp
index 536fdf1cc..f5bf027e6 100644
--- a/src/flex-lua-locator.cpp
+++ b/src/flex-lua-locator.cpp
@@ -36,7 +36,7 @@ locator_t &create_locator(lua_State *lua_state,
     return new_locator;
 }
 
-TRAMPOLINE_WRAPPED_OBJECT(locator, __tostring)
+TRAMPOLINE_WRAPPED_OBJECT(locator, tostring)
 TRAMPOLINE_WRAPPED_OBJECT(locator, name)
 TRAMPOLINE_WRAPPED_OBJECT(locator, add_bbox)
 TRAMPOLINE_WRAPPED_OBJECT(locator, add_from_db)
@@ -83,7 +83,7 @@ void lua_wrapper_locator::init(lua_State *lua_state,
     lua_pushvalue(lua_state, -1);
     lua_setfield(lua_state, -2, "__index");
     luaX_add_table_func(lua_state, "__tostring",
-                        lua_trampoline_locator___tostring);
+                        lua_trampoline_locator_tostring);
     luaX_add_table_func(lua_state, "name", lua_trampoline_locator_name);
     luaX_add_table_func(lua_state, "add_bbox", lua_trampoline_locator_add_bbox);
     luaX_add_table_func(lua_state, "add_from_db",
@@ -96,7 +96,7 @@ void lua_wrapper_locator::init(lua_State *lua_state,
     lua_pop(lua_state, 2);
 }
 
-int lua_wrapper_locator::__tostring() const
+int lua_wrapper_locator::tostring() const
 {
     std::string const str{fmt::format("osm2pgsql.Locator[name={},size={}]",
                                       self().name(), self().size())};
diff --git a/src/flex-lua-locator.hpp b/src/flex-lua-locator.hpp
index cf560702a..80f07714d 100644
--- a/src/flex-lua-locator.hpp
+++ b/src/flex-lua-locator.hpp
@@ -38,7 +38,7 @@ class lua_wrapper_locator : public lua_wrapper_base<locator_t>
     {
     }
 
-    int __tostring() const;
+    int tostring() const;
     int name() const;
     int add_bbox();
     int add_from_db();
diff --git a/src/flex-lua-table.cpp b/src/flex-lua-table.cpp
index 3fca95e6f..9932b3c2c 100644
--- a/src/flex-lua-table.cpp
+++ b/src/flex-lua-table.cpp
@@ -418,7 +418,7 @@ void setup_flex_table_indexes(lua_State *lua_state, flex_table_t *table,
     lua_pop(lua_state, 1); // "indexes"
 }
 
-TRAMPOLINE_WRAPPED_OBJECT(table, __tostring)
+TRAMPOLINE_WRAPPED_OBJECT(table, tostring)
 TRAMPOLINE_WRAPPED_OBJECT(table, cluster)
 TRAMPOLINE_WRAPPED_OBJECT(table, columns)
 TRAMPOLINE_WRAPPED_OBJECT(table, name)
@@ -469,7 +469,7 @@ void lua_wrapper_table::init(lua_State *lua_state)
     lua_pushvalue(lua_state, -1);
     lua_setfield(lua_state, -2, "__index");
     luaX_add_table_func(lua_state, "__tostring",
-                        lua_trampoline_table___tostring);
+                        lua_trampoline_table_tostring);
     luaX_add_table_func(lua_state, "insert", lua_trampoline_table_insert);
     luaX_add_table_func(lua_state, "name", lua_trampoline_table_name);
     luaX_add_table_func(lua_state, "schema", lua_trampoline_table_schema);
@@ -479,7 +479,7 @@ void lua_wrapper_table::init(lua_State *lua_state)
     lua_pop(lua_state, 2);
 }
 
-int lua_wrapper_table::__tostring() const
+int lua_wrapper_table::tostring() const
 {
     std::string const str{fmt::format("osm2pgsql.Table[{}]", self().name())};
     luaX_pushstring(lua_state(), str);
diff --git a/src/flex-lua-table.hpp b/src/flex-lua-table.hpp
index 6e83634ea..32b17d564 100644
--- a/src/flex-lua-table.hpp
+++ b/src/flex-lua-table.hpp
@@ -36,7 +36,7 @@ class lua_wrapper_table : public lua_wrapper_base<flex_table_t>
     {
     }
 
-    int __tostring() const;
+    int tostring() const;
     int cluster() const;
     int columns() const;
     int name() const;

From 570ed8c88b38f898b44e4da6d2ae642b1571f6dc Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 30 May 2025 15:14:48 +0200
Subject: [PATCH 283/430] Supress unhelpful clang-tidy warning

---
 src/flex-lua-wrapper.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/flex-lua-wrapper.hpp b/src/flex-lua-wrapper.hpp
index 6f590d532..0b63fd704 100644
--- a/src/flex-lua-wrapper.hpp
+++ b/src/flex-lua-wrapper.hpp
@@ -15,6 +15,7 @@
 #include <cassert>
 #include <exception>
 
+// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
 #define TRAMPOLINE_WRAPPED_OBJECT(obj_name, func_name)                         \
     int lua_trampoline_##obj_name##_##func_name(lua_State *lua_state)          \
     {                                                                          \

From 2e8448c8f35f0ef55810cbd579185ed0d2fcc275 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 30 May 2025 17:00:43 +0200
Subject: [PATCH 284/430] Use const ref instead of forwarding ref

Because we are not forwarding.
---
 src/params.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/params.hpp b/src/params.hpp
index 8337303d7..c5bff5975 100644
--- a/src/params.hpp
+++ b/src/params.hpp
@@ -67,7 +67,7 @@ class params_t
         typename K, typename V,
         std::enable_if_t<!std::is_arithmetic_v<std::remove_reference_t<V>>,
                          bool> = true>
-    void set(K &&key, V &&value)
+    void set(K &&key, V const &value)
     {
         m_map.insert_or_assign(std::forward<K>(key), std::string(value));
     }

From 734f2ad67ed473c91e2b4434649b1fb417380a02 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 30 May 2025 19:45:00 +0200
Subject: [PATCH 285/430] Use anonymous namespace for local linkage

---
 src/logging.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/logging.cpp b/src/logging.cpp
index 3ebb0306a..e5e149490 100644
--- a/src/logging.cpp
+++ b/src/logging.cpp
@@ -11,11 +11,15 @@
 
 #include <osmium/thread/util.hpp>
 
+namespace {
+
 thread_local unsigned int this_thread_num = 0;
 
 /// Global logger singleton
 logger the_logger{};
 
+} // anonymous namespace
+
 /// Access the global logger singleton
 logger &get_logger() noexcept { return the_logger; }
 

From fcf1ddd86d5f42f0234514960479706b09374e20 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 30 May 2025 17:54:36 +0200
Subject: [PATCH 286/430] Use std::min/max instead of hand-rolling the check

clang-tidy check readability-use-std-min-max
Apparently C++ compilers are good enough to optimize this properly
https://stackoverflow.com/questions/15540250/in-c-is-it-better-to-cap-a-value-using-stdmin-or-an-if-branch
---
 src/gen/gen-discrete-isolation.cpp   |  4 +---
 src/geom-box.cpp                     | 34 ++++++++--------------------
 src/geom-pole-of-inaccessibility.cpp |  8 ++-----
 3 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/src/gen/gen-discrete-isolation.cpp b/src/gen/gen-discrete-isolation.cpp
index 39a6b06ef..2ee6d2cf9 100644
--- a/src/gen/gen-discrete-isolation.cpp
+++ b/src/gen/gen-discrete-isolation.cpp
@@ -113,9 +113,7 @@ FROM {src} WHERE {importance_column} > 0
                 double const dx = coords[m].first - coords[n].first;
                 double const dy = coords[m].second - coords[n].second;
                 double const dist = dx * dx + dy * dy;
-                if (dist < min) {
-                    min = dist;
-                }
+                min = std::min(dist, min);
             }
             data[n].di = std::sqrt(min);
         }
diff --git a/src/geom-box.cpp b/src/geom-box.cpp
index 9e80d957e..09812380d 100644
--- a/src/geom-box.cpp
+++ b/src/geom-box.cpp
@@ -9,25 +9,17 @@
 
 #include "geom-box.hpp"
 
+#include <algorithm>
 #include <variant>
 
 namespace geom {
 
 box_t &box_t::extend(point_t const &point) noexcept
 {
-    if (point.x() < m_min_x) {
-        m_min_x = point.x();
-    }
-    if (point.y() < m_min_y) {
-        m_min_y = point.y();
-    }
-    if (point.x() > m_max_x) {
-        m_max_x = point.x();
-    }
-    if (point.y() > m_max_y) {
-        m_max_y = point.y();
-    }
-
+    m_min_x = std::min(point.x(), m_min_x);
+    m_min_y = std::min(point.y(), m_min_y);
+    m_max_x = std::max(point.x(), m_max_x);
+    m_max_y = std::max(point.y(), m_max_y);
     return *this;
 }
 
@@ -40,18 +32,10 @@ void box_t::extend(point_list_t const &list) noexcept
 
 void box_t::extend(box_t const &box) noexcept
 {
-    if (box.min_x() < m_min_x) {
-        m_min_x = box.min_x();
-    }
-    if (box.min_y() < m_min_y) {
-        m_min_y = box.min_y();
-    }
-    if (box.max_x() > m_max_x) {
-        m_max_x = box.max_x();
-    }
-    if (box.max_y() > m_max_y) {
-        m_max_y = box.max_y();
-    }
+    m_min_x = std::min(box.min_x(), m_min_x);
+    m_min_y = std::min(box.min_y(), m_min_y);
+    m_max_x = std::max(box.max_x(), m_max_x);
+    m_max_y = std::max(box.max_y(), m_max_y);
 }
 
 box_t envelope(geom::nullgeom_t const & /*geom*/) { return box_t{}; }
diff --git a/src/geom-pole-of-inaccessibility.cpp b/src/geom-pole-of-inaccessibility.cpp
index 452b84d74..1573828f5 100644
--- a/src/geom-pole-of-inaccessibility.cpp
+++ b/src/geom-pole-of-inaccessibility.cpp
@@ -90,9 +90,7 @@ bool point_to_ring_distance_squared(point_t point, ring_t const &ring,
 
         double const d =
             point_to_segment_distance_squared(point, a, b, stretch);
-        if (d < *min_dist_squared) {
-            *min_dist_squared = d;
-        }
+        *min_dist_squared = std::min(d, *min_dist_squared);
     }
 
     return inside;
@@ -158,9 +156,7 @@ point_t pole_of_inaccessibility(const polygon_t &polygon, double precision,
 
     double const min_precision =
         std::max(envelope.width(), envelope.height()) / 1000.0;
-    if (min_precision > precision) {
-        precision = min_precision;
-    }
+    precision = std::max(min_precision, precision);
 
     box_t const stretched_envelope{envelope.min_x(), envelope.min_y() * stretch,
                                    envelope.max_x(),

From 27e2577f1fc56fa42919071a49863bba8b72fe7e Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 30 May 2025 20:27:34 +0200
Subject: [PATCH 287/430] Use smaller ints as basis for some enum classes

And reorder class members in one case to make the memory footprint
smaller.
---
 src/middle-pgsql.cpp             | 6 +++---
 src/output-flex.hpp              | 2 +-
 src/taginfo.hpp                  | 3 ++-
 tests/test-output-flex-nodes.cpp | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index 7bae3ec67..8aa2194ea 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -235,18 +235,18 @@ class member_list_json_builder
     }
 
 private:
-    osmium::builder::RelationMemberListBuilder *m_builder;
     std::string m_role;
+    osmium::builder::RelationMemberListBuilder *m_builder;
     osmium::object_id_type m_ref = 0;
     osmium::item_type m_type = osmium::item_type::undefined;
-    enum class next_val
+    enum class next_val : std::uint8_t
     {
         none,
         type,
         ref,
         role
     } m_next_val = next_val::none;
-};
+}; // class member_list_json_builder
 
 template <typename T>
 void pgsql_parse_json_members(char const *string,
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index c803d3a30..23dceab08 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -40,7 +40,7 @@ struct options_t;
  * When C++ code is called from the Lua code we sometimes need to know
  * in what context this happens. These are the possible contexts.
  */
-enum class calling_context
+enum class calling_context : std::uint8_t
 {
     main = 0, ///< In main context, i.e. the Lua script outside any callbacks
     process_node = 1, ///< In the process_node() callback
diff --git a/src/taginfo.hpp b/src/taginfo.hpp
index 75fcbefb0..75977541e 100644
--- a/src/taginfo.hpp
+++ b/src/taginfo.hpp
@@ -10,10 +10,11 @@
  * For a full list of authors see the git log.
  */
 
+#include <cstdint>
 #include <string>
 #include <vector>
 
-enum class ColumnType
+enum class ColumnType : std::uint8_t
 {
     INT,
     REAL,
diff --git a/tests/test-output-flex-nodes.cpp b/tests/test-output-flex-nodes.cpp
index 80d9ba732..3dae49be8 100644
--- a/tests/test-output-flex-nodes.cpp
+++ b/tests/test-output-flex-nodes.cpp
@@ -53,7 +53,7 @@ TEST_CASE("add nodes")
     CHECK(1 == conn.get_count("osm2pgsql_test_t1", "node_id = 17"));
 }
 
-enum class node_relationship
+enum class node_relationship : std::uint8_t
 {
     none,
     in_way,

From dde38e0520a5e7ec2b32ee5a114ae626ccdb0345 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 31 May 2025 09:50:33 +0200
Subject: [PATCH 288/430] Remove use of enum for constants

This was a useful trick back in the days, but in C++17 it is not needed
any more. The constexpr expression is more clear in its intent.

See for instance here:
https://stackoverflow.com/questions/37259807/static-constexpr-int-vs-old-fashioned-enum-when-and-why
---
 src/db-copy.hpp | 57 ++++++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/src/db-copy.hpp b/src/db-copy.hpp
index 6a6e46bd1..f843aad8a 100644
--- a/src/db-copy.hpp
+++ b/src/db-copy.hpp
@@ -15,6 +15,7 @@
 #include "pgsql-params.hpp"
 
 #include <cassert>
+#include <cstddef>
 #include <condition_variable>
 #include <deque>
 #include <future>
@@ -74,12 +75,11 @@ class db_target_descr_t
  */
 class db_deleter_by_id_t
 {
-    enum
-    {
-        // There is a trade-off here between sending as few DELETE SQL as
-        // possible and keeping the size of the deletable vector managable.
-        Max_entries = 1000000
-    };
+    /**
+     * There is a trade-off here between sending as few DELETE SQL as
+     * possible and keeping the size of the deletable vector managable.
+     */
+    static constexpr std::size_t Max_entries = 1000000;
 
 public:
     bool has_data() const noexcept { return !m_deletables.empty(); }
@@ -101,12 +101,11 @@ class db_deleter_by_id_t
  */
 class db_deleter_by_type_and_id_t
 {
-    enum
-    {
-        // There is a trade-off here between sending as few DELETE SQL as
-        // possible and keeping the size of the deletable vector managable.
-        Max_entries = 1000000
-    };
+    /**
+     * There is a trade-off here between sending as few DELETE SQL as
+     * possible and keeping the size of the deletable vector managable.
+     */
+    static constexpr std::size_t Max_entries = 1000000;
 
     struct item_t
     {
@@ -140,23 +139,23 @@ class db_deleter_by_type_and_id_t
 
 struct db_cmd_copy_t
 {
-    enum
-    {
-        /** Size of a single buffer with COPY data for Postgresql.
-         *  This is a trade-off between memory usage and sending large chunks
-         *  to speed up processing. Currently a one-size fits all value.
-         *  Needs more testing and individual values per queue.
-         */
-        Max_buf_size = 10 * 1024 * 1024,
-        /** Maximum length of the queue with COPY data.
-         *  In the usual case, PostgreSQL should be faster processing the
-         *  data than it can be produced and there should only be one element
-         *  in the queue. If PostgreSQL is slower, then the queue will always
-         *  be full and it is better to keep the queue smaller to reduce memory
-         *  usage. Current value is just assumed to be a reasonable trade off.
-         */
-        Max_buffers = 10
-    };
+    /**
+     * Size of a single buffer with COPY data for Postgresql.
+     * This is a trade-off between memory usage and sending large chunks
+     * to speed up processing. Currently a one-size fits all value.
+     * Needs more testing and individual values per queue.
+     */
+    static constexpr std::size_t Max_buf_size = 10 * 1024 * 1024;
+
+    /**
+     * Maximum length of the queue with COPY data.
+     * In the usual case, PostgreSQL should be faster processing the
+     * data than it can be produced and there should only be one element
+     * in the queue. If PostgreSQL is slower, then the queue will always
+     * be full and it is better to keep the queue smaller to reduce memory
+     * usage. Current value is just assumed to be a reasonable trade off.
+     */
+    static constexpr std::size_t Max_buffers = 10;
 
     /// Name of the target table for the copy operation
     std::shared_ptr<db_target_descr_t> target;

From a80981962447a397fc5f848a58d347aa3d4a0f24 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 1 Jun 2025 17:26:38 +0200
Subject: [PATCH 289/430] Use UPPERCASE for numerical constants

---
 CONTRIBUTING.md           |  2 +-
 src/db-copy.cpp           |  2 +-
 src/db-copy.hpp           | 16 ++++++-------
 src/expire-tiles.cpp      | 10 ++++----
 src/gen/osm2pgsql-gen.cpp |  4 ++--
 src/gen/tracer.cpp        |  6 ++---
 src/gen/tracer.hpp        |  2 +-
 src/node-locations.cpp    | 12 +++++-----
 src/node-locations.hpp    | 14 +++++------
 src/ordered-index.cpp     |  2 +-
 src/ordered-index.hpp     |  2 +-
 src/output-flex.cpp       | 12 +++++-----
 src/thread-pool.cpp       |  2 +-
 src/thread-pool.hpp       |  2 +-
 src/tile.hpp              | 47 ++++++++++++++++++------------------
 src/util.hpp              |  8 +++----
 src/wkb.cpp               |  6 ++---
 tests/test-tile.cpp       | 50 +++++++++++++++++++--------------------
 18 files changed, 100 insertions(+), 99 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5c5b10040..30125c23f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -36,7 +36,7 @@ Code must be written in the
 always be used for code blocks, even one-liners.
 
 Names should use underscores, not camel case, with class/struct names ending in
-`_t`. Template parameters must use all upper case.
+`_t`. Constants and template parameters must use all upper case.
 
 Header files should be included in the following order, each group in their own
 block:
diff --git a/src/db-copy.cpp b/src/db-copy.cpp
index b02975f04..f0fd0e33a 100644
--- a/src/db-copy.cpp
+++ b/src/db-copy.cpp
@@ -100,7 +100,7 @@ void db_copy_thread_t::send_command(db_cmd_t &&buffer)
 
     std::unique_lock<std::mutex> lock{m_shared.queue_mutex};
     m_shared.queue_full_cond.wait(lock, [&] {
-        return m_shared.worker_queue.size() < db_cmd_copy_t::Max_buffers;
+        return m_shared.worker_queue.size() < db_cmd_copy_t::MAX_BUFFERS;
     });
 
     m_shared.worker_queue.push_back(std::move(buffer));
diff --git a/src/db-copy.hpp b/src/db-copy.hpp
index f843aad8a..c55387a62 100644
--- a/src/db-copy.hpp
+++ b/src/db-copy.hpp
@@ -79,7 +79,7 @@ class db_deleter_by_id_t
      * There is a trade-off here between sending as few DELETE SQL as
      * possible and keeping the size of the deletable vector managable.
      */
-    static constexpr std::size_t Max_entries = 1000000;
+    static constexpr std::size_t MAX_ENTRIES = 1000000;
 
 public:
     bool has_data() const noexcept { return !m_deletables.empty(); }
@@ -89,7 +89,7 @@ class db_deleter_by_id_t
     void delete_rows(std::string const &table, std::string const &column,
                      pg_conn_t const &db_connection);
 
-    bool is_full() const noexcept { return m_deletables.size() > Max_entries; }
+    bool is_full() const noexcept { return m_deletables.size() > MAX_ENTRIES; }
 
 private:
     /// Vector with object to delete before copying
@@ -105,7 +105,7 @@ class db_deleter_by_type_and_id_t
      * There is a trade-off here between sending as few DELETE SQL as
      * possible and keeping the size of the deletable vector managable.
      */
-    static constexpr std::size_t Max_entries = 1000000;
+    static constexpr std::size_t MAX_ENTRIES = 1000000;
 
     struct item_t
     {
@@ -129,7 +129,7 @@ class db_deleter_by_type_and_id_t
     void delete_rows(std::string const &table, std::string const &column,
                      pg_conn_t const &db_connection);
 
-    bool is_full() const noexcept { return m_deletables.size() > Max_entries; }
+    bool is_full() const noexcept { return m_deletables.size() > MAX_ENTRIES; }
 
 private:
     /// Vector with object to delete before copying
@@ -145,7 +145,7 @@ struct db_cmd_copy_t
      * to speed up processing. Currently a one-size fits all value.
      * Needs more testing and individual values per queue.
      */
-    static constexpr std::size_t Max_buf_size = 10 * 1024 * 1024;
+    static constexpr std::size_t MAX_BUF_SIZE = 10 * 1024 * 1024;
 
     /**
      * Maximum length of the queue with COPY data.
@@ -155,7 +155,7 @@ struct db_cmd_copy_t
      * be full and it is better to keep the queue smaller to reduce memory
      * usage. Current value is just assumed to be a reasonable trade off.
      */
-    static constexpr std::size_t Max_buffers = 10;
+    static constexpr std::size_t MAX_BUFFERS = 10;
 
     /// Name of the target table for the copy operation
     std::shared_ptr<db_target_descr_t> target;
@@ -167,7 +167,7 @@ struct db_cmd_copy_t
     explicit db_cmd_copy_t(std::shared_ptr<db_target_descr_t> t)
     : target(std::move(t))
     {
-        buffer.reserve(Max_buf_size);
+        buffer.reserve(MAX_BUF_SIZE);
     }
 
     explicit operator bool() const noexcept { return target != nullptr; }
@@ -182,7 +182,7 @@ class db_cmd_copy_delete_t : public db_cmd_copy_t
     /// Return true if the buffer is filled up.
     bool is_full() const noexcept
     {
-        return (buffer.size() > Max_buf_size - 100) || m_deleter.is_full();
+        return (buffer.size() > MAX_BUF_SIZE - 100) || m_deleter.is_full();
     }
 
     bool has_deletables() const noexcept { return m_deleter.has_data(); }
diff --git a/src/expire-tiles.cpp b/src/expire-tiles.cpp
index 413699025..21eda2df7 100644
--- a/src/expire-tiles.cpp
+++ b/src/expire-tiles.cpp
@@ -63,8 +63,8 @@ geom::point_t expire_tiles::coords_to_tile(geom::point_t const &point)
 {
     auto const c = m_projection->target_to_tile(point);
 
-    return {m_map_width * (0.5 + c.x() / tile_t::earth_circumference),
-            m_map_width * (0.5 - c.y() / tile_t::earth_circumference)};
+    return {m_map_width * (0.5 + c.x() / tile_t::EARTH_CIRCUMFERENCE),
+            m_map_width * (0.5 - c.y() / tile_t::EARTH_CIRCUMFERENCE)};
 }
 
 void expire_tiles::from_point_list(geom::point_list_t const &list,
@@ -224,14 +224,14 @@ int expire_tiles::from_bbox(geom::box_t const &box,
 
     double const width = box.width();
     double const height = box.height();
-    if (width > tile_t::half_earth_circumference + 1) {
+    if (width > tile_t::HALF_EARTH_CIRCUMFERENCE + 1) {
         /* Over half the planet's width within the bounding box - assume the
            box crosses the international date line and split it into two boxes */
-        int ret = from_bbox({-tile_t::half_earth_circumference, box.min_y(),
+        int ret = from_bbox({-tile_t::HALF_EARTH_CIRCUMFERENCE, box.min_y(),
                              box.min_x(), box.max_y()},
                             expire_config);
         ret += from_bbox({box.max_x(), box.min_y(),
-                          tile_t::half_earth_circumference, box.max_y()},
+                          tile_t::HALF_EARTH_CIRCUMFERENCE, box.max_y()},
                          expire_config);
         return ret;
     }
diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index 04c4526ba..8376edc5f 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -76,7 +76,7 @@
 
 namespace {
 
-constexpr std::size_t const max_force_single_thread = 4;
+constexpr std::size_t const MAX_FORCE_SINGLE_THREAD = 4;
 
 struct tile_extent
 {
@@ -496,7 +496,7 @@ class genproc_t
             }
         }
         log_debug("Need to process {} tiles.", tile_list.size());
-        if (m_jobs == 1 || tile_list.size() < max_force_single_thread) {
+        if (m_jobs == 1 || tile_list.size() < MAX_FORCE_SINGLE_THREAD) {
             log_debug("Running in single-threaded mode.");
             tile_processor_t tp{generalizer, tile_list.size()};
             while (!tile_list.empty()) {
diff --git a/src/gen/tracer.cpp b/src/gen/tracer.cpp
index 7d4dcd448..7f9eb9296 100644
--- a/src/gen/tracer.cpp
+++ b/src/gen/tracer.cpp
@@ -42,7 +42,7 @@ tracer_t::trace(canvas_t const &canvas, tile_t const &tile, double min_area)
     prepare(canvas);
 
     potrace_bitmap_t const bitmap{int(canvas.size()), int(canvas.size()),
-                                  int(canvas.size() / bits_per_word),
+                                  int(canvas.size() / BITS_PER_WORD),
                                   m_bits.data()};
 
     std::unique_ptr<potrace_state_t, potrace_state_deleter> state{
@@ -64,9 +64,9 @@ void tracer_t::reset()
 void tracer_t::prepare(canvas_t const &canvas) noexcept
 {
     std::size_t const size = canvas.size();
-    assert(size % bits_per_word == 0);
+    assert(size % BITS_PER_WORD == 0);
 
-    m_bits.reserve((size * size) / bits_per_word);
+    m_bits.reserve((size * size) / BITS_PER_WORD);
 
     for (unsigned char const *d = canvas.begin(); d != canvas.end(); d += 8) {
         auto w = bit_squeeze(0, d);
diff --git a/src/gen/tracer.hpp b/src/gen/tracer.hpp
index 284a3443d..d22d49646 100644
--- a/src/gen/tracer.hpp
+++ b/src/gen/tracer.hpp
@@ -39,7 +39,7 @@ class tracer_t
     std::size_t num_points() const noexcept { return m_num_points; }
 
 private:
-    static constexpr auto const bits_per_word = sizeof(potrace_word) * 8;
+    static constexpr auto const BITS_PER_WORD = sizeof(potrace_word) * 8;
 
     geom::point_t make_point(potrace_dpoint_t const &p) const noexcept;
 
diff --git a/src/node-locations.cpp b/src/node-locations.cpp
index 8b86c880e..9f1a2eac8 100644
--- a/src/node-locations.cpp
+++ b/src/node-locations.cpp
@@ -64,7 +64,7 @@ osmium::Location node_locations_t::get(osmid_t id) const
     osmium::DeltaDecode<int64_t> dx;
     osmium::DeltaDecode<int64_t> dy;
 
-    for (std::size_t n = 0; n < block_size && begin != end; ++n) {
+    for (std::size_t n = 0; n < BLOCK_SIZE && begin != end; ++n) {
         auto const bid = did.update(
             static_cast<int64_t>(protozero::decode_varint(&begin, end)));
         auto const x = static_cast<int32_t>(dx.update(
@@ -83,13 +83,13 @@ osmium::Location node_locations_t::get(osmid_t id) const
 
 void node_locations_t::log_stats()
 {
-    constexpr auto const mbyte = 1024 * 1024;
+    constexpr auto const MBYTE = 1024 * 1024;
     log_debug("Node locations cache:");
     log_debug("  num locations stored: {}", m_count);
-    log_debug("  bytes overall: {}MB", used_memory() / mbyte);
-    log_debug("  data capacity: {}MB", m_data.capacity() / mbyte);
-    log_debug("  data size: {}MB", m_data.size() / mbyte);
-    log_debug("  index used memory: {}MB", m_index.used_memory() / mbyte);
+    log_debug("  bytes overall: {}MB", used_memory() / MBYTE);
+    log_debug("  data capacity: {}MB", m_data.capacity() / MBYTE);
+    log_debug("  data size: {}MB", m_data.size() / MBYTE);
+    log_debug("  index used memory: {}MB", m_index.used_memory() / MBYTE);
 }
 
 void node_locations_t::clear()
diff --git a/src/node-locations.hpp b/src/node-locations.hpp
index 98fa3b8f6..cf50b68a0 100644
--- a/src/node-locations.hpp
+++ b/src/node-locations.hpp
@@ -81,9 +81,15 @@ class node_locations_t
     void clear();
 
 private:
+    /**
+     * The block size used for internal blocks. The larger the block size
+     * the less memory is consumed but the more expensive the access is.
+     */
+    static constexpr const std::size_t BLOCK_SIZE = 32;
+
     bool first_entry_in_block() const noexcept
     {
-        return m_count % block_size == 0;
+        return m_count % BLOCK_SIZE == 0;
     }
 
     /// The maximum number of bytes an entry will need in storage.
@@ -97,12 +103,6 @@ class node_locations_t
                (m_data.size() + max_bytes_per_entry() >= m_data.capacity());
     }
 
-    /**
-     * The block size used for internal blocks. The larger the block size
-     * the less memory is consumed but the more expensive the access is.
-     */
-    static constexpr const std::size_t block_size = 32;
-
     ordered_index_t m_index;
     std::string m_data;
 
diff --git a/src/ordered-index.cpp b/src/ordered-index.cpp
index 701d18883..7803f4a99 100644
--- a/src/ordered-index.cpp
+++ b/src/ordered-index.cpp
@@ -26,7 +26,7 @@ void ordered_index_t::add(osmid_t id, std::size_t offset)
         }
         m_ranges.emplace_back(id, offset, m_block_size);
         m_capacity += m_block_size;
-        if (m_block_size < max_block_size) {
+        if (m_block_size < MAX_BLOCK_SIZE) {
             m_block_size <<= 1U;
         }
     }
diff --git a/src/ordered-index.hpp b/src/ordered-index.hpp
index 47850c138..70790f014 100644
--- a/src/ordered-index.hpp
+++ b/src/ordered-index.hpp
@@ -185,7 +185,7 @@ class ordered_index_t
 
     std::pair<osmid_t, std::size_t> get_internal(osmid_t id) const noexcept;
 
-    static constexpr std::size_t const max_block_size = 16UL * 1024UL * 1024UL;
+    static constexpr std::size_t const MAX_BLOCK_SIZE = 16UL * 1024UL * 1024UL;
 
     std::vector<range_entry> m_ranges;
     std::size_t m_block_size;
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 31bb167fa..1e87b5d03 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -132,9 +132,9 @@ void push_osm_object_to_lua_stack(lua_State *lua_state,
      * timestamp, changeset, uid, user). For ways there are 2 more (is_closed,
      * nodes), for relations 1 more (members).
      */
-    constexpr int const max_table_size = 10;
+    constexpr int const MAX_TABLE_SIZE = 10;
 
-    lua_createtable(lua_state, 0, max_table_size);
+    lua_createtable(lua_state, 0, MAX_TABLE_SIZE);
 
     luaX_add_table_int(lua_state, "id", object.id());
 
@@ -240,12 +240,12 @@ typename CONTAINER::value_type &get_from_idx_param(lua_State *lua_state,
 
 std::size_t get_nodes(middle_query_t const &middle, osmium::Way *way)
 {
-    constexpr std::size_t const max_missing_nodes = 100;
+    constexpr std::size_t const MAX_MISSING_NODES = 100;
     static std::size_t count_missing_nodes = 0;
 
     auto const count = middle.nodes_get_list(&way->nodes());
 
-    if (count_missing_nodes <= max_missing_nodes &&
+    if (count_missing_nodes <= MAX_MISSING_NODES &&
         count != way->nodes().size()) {
         util::string_joiner_t id_list{','};
         for (auto const &nr : way->nodes()) {
@@ -257,10 +257,10 @@ std::size_t get_nodes(middle_query_t const &middle, osmium::Way *way)
 
         log_debug("Missing nodes in way {}: {}", way->id(), id_list());
 
-        if (count_missing_nodes > max_missing_nodes) {
+        if (count_missing_nodes > MAX_MISSING_NODES) {
             log_debug("Reported more than {} missing nodes, no further missing "
                       "nodes will be reported!",
-                      max_missing_nodes);
+                      MAX_MISSING_NODES);
         }
     }
 
diff --git a/src/thread-pool.cpp b/src/thread-pool.cpp
index 7eadd5a04..aa8a430e9 100644
--- a/src/thread-pool.cpp
+++ b/src/thread-pool.cpp
@@ -27,7 +27,7 @@ std::chrono::microseconds task_result_t::wait()
 }
 
 thread_pool_t::thread_pool_t(unsigned int num_threads)
-: m_work_queue(max_queue_size, "work"), m_joiner(&m_threads)
+: m_work_queue(MAX_QUEUE_SIZE, "work"), m_joiner(&m_threads)
 {
     assert(num_threads > 0);
     try {
diff --git a/src/thread-pool.hpp b/src/thread-pool.hpp
index f65e07e6b..11d1afac9 100644
--- a/src/thread-pool.hpp
+++ b/src/thread-pool.hpp
@@ -151,7 +151,7 @@ class thread_pool_t
 
     }; // class thread_joiner
 
-    static constexpr std::size_t const max_queue_size = 32;
+    static constexpr std::size_t const MAX_QUEUE_SIZE = 32;
 
     osmium::thread::Queue<osmium::thread::function_wrapper> m_work_queue;
     std::vector<std::thread> m_threads;
diff --git a/src/tile.hpp b/src/tile.hpp
index bcda0a1c3..c95a376e9 100644
--- a/src/tile.hpp
+++ b/src/tile.hpp
@@ -73,9 +73,9 @@ using quadkey_list_t = std::vector<quadkey_t>;
 class tile_t
 {
 public:
-    static constexpr double const earth_circumference = 40075016.68;
-    static constexpr double const half_earth_circumference =
-        earth_circumference / 2;
+    static constexpr double const EARTH_CIRCUMFERENCE = 40075016.68;
+    static constexpr double const HALF_EARTH_CIRCUMFERENCE =
+        EARTH_CIRCUMFERENCE / 2;
 
     /// Construct an invalid tile.
     tile_t() noexcept = default;
@@ -90,7 +90,7 @@ class tile_t
     tile_t(uint32_t zoom, uint32_t x, uint32_t y) noexcept
     : m_x(x), m_y(y), m_zoom(zoom)
     {
-        assert(m_zoom < max_zoom);
+        assert(m_zoom < MAX_ZOOM);
         assert(x < (1UL << m_zoom));
         assert(y < (1UL << m_zoom));
     }
@@ -113,64 +113,64 @@ class tile_t
         return m_y;
     }
 
-    bool valid() const noexcept { return m_zoom != invalid_zoom; }
+    bool valid() const noexcept { return m_zoom != INVALID_ZOOM; }
 
     /// The width/height of the tile in web mercator (EPSG:3857) coordinates.
     double extent() const noexcept
     {
-        return earth_circumference / static_cast<double>(1UL << m_zoom);
+        return EARTH_CIRCUMFERENCE / static_cast<double>(1UL << m_zoom);
     }
 
     /// Minimum X coordinate of this tile in web mercator (EPSG:3857) units.
     double xmin() const noexcept
     {
-        return -half_earth_circumference + m_x * extent();
+        return -HALF_EARTH_CIRCUMFERENCE + m_x * extent();
     }
 
     /// Maximum X coordinate of this tile in web mercator (EPSG:3857) units.
     double xmax() const noexcept
     {
-        return -half_earth_circumference + (m_x + 1) * extent();
+        return -HALF_EARTH_CIRCUMFERENCE + (m_x + 1) * extent();
     }
 
     /// Minimum Y coordinate of this tile in web mercator (EPSG:3857) units.
     double ymin() const noexcept
     {
-        return half_earth_circumference - (m_y + 1) * extent();
+        return HALF_EARTH_CIRCUMFERENCE - (m_y + 1) * extent();
     }
 
     /// Maximum Y coordinate of this tile in web mercator (EPSG:3857) units.
     double ymax() const noexcept
     {
-        return half_earth_circumference - m_y * extent();
+        return HALF_EARTH_CIRCUMFERENCE - m_y * extent();
     }
 
     /// Same as box(margin).min_x().
     double xmin(double margin) const noexcept
     {
-        return std::clamp(xmin() - margin * extent(), -half_earth_circumference,
-                          half_earth_circumference);
+        return std::clamp(xmin() - margin * extent(), -HALF_EARTH_CIRCUMFERENCE,
+                          HALF_EARTH_CIRCUMFERENCE);
     }
 
     /// Same as box(margin).max_x().
     double xmax(double margin) const noexcept
     {
-        return std::clamp(xmax() + margin * extent(), -half_earth_circumference,
-                          half_earth_circumference);
+        return std::clamp(xmax() + margin * extent(), -HALF_EARTH_CIRCUMFERENCE,
+                          HALF_EARTH_CIRCUMFERENCE);
     }
 
     /// Same as box(margin).min_y().
     double ymin(double margin) const noexcept
     {
-        return std::clamp(ymin() - margin * extent(), -half_earth_circumference,
-                          half_earth_circumference);
+        return std::clamp(ymin() - margin * extent(), -HALF_EARTH_CIRCUMFERENCE,
+                          HALF_EARTH_CIRCUMFERENCE);
     }
 
     /// Same as box(margin).max_y().
     double ymax(double margin) const noexcept
     {
-        return std::clamp(ymax() + margin * extent(), -half_earth_circumference,
-                          half_earth_circumference);
+        return std::clamp(ymax() + margin * extent(), -HALF_EARTH_CIRCUMFERENCE,
+                          HALF_EARTH_CIRCUMFERENCE);
     }
 
     /**
@@ -187,8 +187,8 @@ class tile_t
      * the bounding box twice as wide and twice as heigh.
      *
      * The bounding box is clamped to the extent of the earth, so there will
-     * be no coordinates smaller than -half_earth_circumference or larger than
-     * half_earth_circumference.
+     * be no coordinates smaller than -HALF_EARTH_CIRCUMFERENCE or larger than
+     * HALF_EARTH_CIRCUMFERENCE.
      */
     geom::box_t box(double margin) const noexcept
     {
@@ -258,13 +258,14 @@ class tile_t
     static tile_t from_quadkey(quadkey_t quadkey, uint32_t zoom) noexcept;
 
 private:
-    static constexpr uint32_t const invalid_zoom =
+    static constexpr uint32_t const INVALID_ZOOM =
         std::numeric_limits<uint32_t>::max();
-    static constexpr uint32_t const max_zoom = 32;
+
+    static constexpr uint32_t const MAX_ZOOM = 32;
 
     uint32_t m_x = 0;
     uint32_t m_y = 0;
-    uint32_t m_zoom = invalid_zoom;
+    uint32_t m_zoom = INVALID_ZOOM;
 }; // class tile_t
 
 /**
diff --git a/src/util.hpp b/src/util.hpp
index 2938f224c..3ea12f6af 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -27,21 +27,21 @@ namespace util {
 
 class double_to_buffer
 {
-    static constexpr std::size_t buffer_size = 32;
+    static constexpr std::size_t BUFFER_SIZE = 32;
 
 public:
     explicit double_to_buffer(double value)
     {
         auto const result =
-            fmt::format_to_n(m_buffer.begin(), buffer_size - 1, "{:g}", value);
-        assert(result.size < buffer_size);
+            fmt::format_to_n(m_buffer.begin(), BUFFER_SIZE - 1, "{:g}", value);
+        assert(result.size < BUFFER_SIZE);
         *result.out = '\0';
     }
 
     char const *c_str() const noexcept { return m_buffer.data(); }
 
 private:
-    std::array<char, buffer_size> m_buffer{};
+    std::array<char, BUFFER_SIZE> m_buffer{};
 };
 
 /**
diff --git a/src/wkb.cpp b/src/wkb.cpp
index 519988dc3..0353baf0f 100644
--- a/src/wkb.cpp
+++ b/src/wkb.cpp
@@ -217,10 +217,10 @@ class make_ewkb_visitor
             write_point(&data, geom);
         } else {
             // 9 byte header plus one set of coordinates
-            constexpr const std::size_t size = 9 + 2 * 8;
-            data.reserve(size);
+            constexpr const std::size_t SIZE = 9 + 2 * 8;
+            data.reserve(SIZE);
             write_point(&data, geom, m_srid);
-            assert(data.size() == size);
+            assert(data.size() == SIZE);
         }
 
         return data;
diff --git a/tests/test-tile.cpp b/tests/test-tile.cpp
index fe81d8158..e75d29e37 100644
--- a/tests/test-tile.cpp
+++ b/tests/test-tile.cpp
@@ -55,31 +55,31 @@ TEST_CASE("tile_t coordinates zoom=0", "[NoDB]")
 {
     tile_t const tile{0, 0, 0};
 
-    REQUIRE(tile.xmin() == Approx(-tile_t::half_earth_circumference));
-    REQUIRE(tile.ymin() == Approx(-tile_t::half_earth_circumference));
-    REQUIRE(tile.xmax() == Approx(tile_t::half_earth_circumference));
-    REQUIRE(tile.ymax() == Approx(tile_t::half_earth_circumference));
-    REQUIRE(tile.box().min_x() == Approx(-tile_t::half_earth_circumference));
-    REQUIRE(tile.box().min_y() == Approx(-tile_t::half_earth_circumference));
-    REQUIRE(tile.box().max_x() == Approx(tile_t::half_earth_circumference));
-    REQUIRE(tile.box().max_y() == Approx(tile_t::half_earth_circumference));
+    REQUIRE(tile.xmin() == Approx(-tile_t::HALF_EARTH_CIRCUMFERENCE));
+    REQUIRE(tile.ymin() == Approx(-tile_t::HALF_EARTH_CIRCUMFERENCE));
+    REQUIRE(tile.xmax() == Approx(tile_t::HALF_EARTH_CIRCUMFERENCE));
+    REQUIRE(tile.ymax() == Approx(tile_t::HALF_EARTH_CIRCUMFERENCE));
+    REQUIRE(tile.box().min_x() == Approx(-tile_t::HALF_EARTH_CIRCUMFERENCE));
+    REQUIRE(tile.box().min_y() == Approx(-tile_t::HALF_EARTH_CIRCUMFERENCE));
+    REQUIRE(tile.box().max_x() == Approx(tile_t::HALF_EARTH_CIRCUMFERENCE));
+    REQUIRE(tile.box().max_y() == Approx(tile_t::HALF_EARTH_CIRCUMFERENCE));
 
     // Bounding box with margin will not get larger, because it is always
     // clamped to the full extent of the map.
-    REQUIRE(tile.xmin(0.1) == Approx(-tile_t::half_earth_circumference));
-    REQUIRE(tile.ymin(0.1) == Approx(-tile_t::half_earth_circumference));
-    REQUIRE(tile.xmax(0.1) == Approx(tile_t::half_earth_circumference));
-    REQUIRE(tile.ymax(0.1) == Approx(tile_t::half_earth_circumference));
-    REQUIRE(tile.box(0.1).min_x() == Approx(-tile_t::half_earth_circumference));
-    REQUIRE(tile.box(0.1).min_y() == Approx(-tile_t::half_earth_circumference));
-    REQUIRE(tile.box(0.1).max_x() == Approx(tile_t::half_earth_circumference));
-    REQUIRE(tile.box(0.1).max_y() == Approx(tile_t::half_earth_circumference));
+    REQUIRE(tile.xmin(0.1) == Approx(-tile_t::HALF_EARTH_CIRCUMFERENCE));
+    REQUIRE(tile.ymin(0.1) == Approx(-tile_t::HALF_EARTH_CIRCUMFERENCE));
+    REQUIRE(tile.xmax(0.1) == Approx(tile_t::HALF_EARTH_CIRCUMFERENCE));
+    REQUIRE(tile.ymax(0.1) == Approx(tile_t::HALF_EARTH_CIRCUMFERENCE));
+    REQUIRE(tile.box(0.1).min_x() == Approx(-tile_t::HALF_EARTH_CIRCUMFERENCE));
+    REQUIRE(tile.box(0.1).min_y() == Approx(-tile_t::HALF_EARTH_CIRCUMFERENCE));
+    REQUIRE(tile.box(0.1).max_x() == Approx(tile_t::HALF_EARTH_CIRCUMFERENCE));
+    REQUIRE(tile.box(0.1).max_y() == Approx(tile_t::HALF_EARTH_CIRCUMFERENCE));
 
     REQUIRE(tile.center().x() == Approx(0.0));
     REQUIRE(tile.center().y() == Approx(0.0));
     REQUIRE(tile.center() == geom::point_t{0.0, 0.0});
 
-    REQUIRE(tile.extent() == Approx(tile_t::earth_circumference));
+    REQUIRE(tile.extent() == Approx(tile_t::EARTH_CIRCUMFERENCE));
 
     geom::point_t const p{12345.6, 7891.0};
     auto const tp = tile.to_tile_coords(p, 256);
@@ -94,7 +94,7 @@ TEST_CASE("tile_t coordinates zoom=2", "[NoDB]")
 {
     tile_t const tile{2, 1, 2};
 
-    double min = -tile_t::half_earth_circumference / 2;
+    double min = -tile_t::HALF_EARTH_CIRCUMFERENCE / 2;
     double max = 0.0;
     REQUIRE(tile.xmin() == Approx(min));
     REQUIRE(tile.ymin() == Approx(min));
@@ -106,8 +106,8 @@ TEST_CASE("tile_t coordinates zoom=2", "[NoDB]")
     CHECK(tile.box().max_y() == tile.ymax());
 
     // Bounding box of tile with 50% margin on all sides.
-    min -= tile_t::half_earth_circumference / 4;
-    max += tile_t::half_earth_circumference / 4;
+    min -= tile_t::HALF_EARTH_CIRCUMFERENCE / 4;
+    max += tile_t::HALF_EARTH_CIRCUMFERENCE / 4;
     CHECK(tile.xmin(0.5) == Approx(min));
     CHECK(tile.ymin(0.5) == Approx(min));
     CHECK(tile.xmax(0.5) == Approx(max));
@@ -117,13 +117,13 @@ TEST_CASE("tile_t coordinates zoom=2", "[NoDB]")
     CHECK(tile.box(0.5).max_x() == tile.xmax(0.5));
     CHECK(tile.box(0.5).max_y() == tile.ymax(0.5));
 
-    REQUIRE(tile.center().x() == Approx(-tile_t::half_earth_circumference / 4));
-    REQUIRE(tile.center().y() == Approx(-tile_t::half_earth_circumference / 4));
+    REQUIRE(tile.center().x() == Approx(-tile_t::HALF_EARTH_CIRCUMFERENCE / 4));
+    REQUIRE(tile.center().y() == Approx(-tile_t::HALF_EARTH_CIRCUMFERENCE / 4));
 
-    REQUIRE(tile.extent() == Approx(tile_t::half_earth_circumference / 2));
+    REQUIRE(tile.extent() == Approx(tile_t::HALF_EARTH_CIRCUMFERENCE / 2));
 
-    geom::point_t const p{-tile_t::half_earth_circumference / 4,
-                          -tile_t::half_earth_circumference / 8};
+    geom::point_t const p{-tile_t::HALF_EARTH_CIRCUMFERENCE / 4,
+                          -tile_t::HALF_EARTH_CIRCUMFERENCE / 8};
     auto const tp = tile.to_tile_coords(p, 4096);
     REQUIRE(tp.x() == Approx(2048));
     REQUIRE(tp.y() == Approx(2048 + 1024));

From c72a9166bef85a891f72fd33c56fc4fd34704d9b Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 1 Jun 2025 17:28:50 +0200
Subject: [PATCH 290/430] Use UPPERCASE for array constants

---
 src/tagtransform-c.cpp | 4 ++--
 src/wkb.cpp            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/tagtransform-c.cpp b/src/tagtransform-c.cpp
index 9c1e34153..27addf710 100644
--- a/src/tagtransform-c.cpp
+++ b/src/tagtransform-c.cpp
@@ -26,7 +26,7 @@ struct layers_type
     bool roads;
 };
 
-constexpr std::array<layers_type, 25> const layers = {
+constexpr std::array<layers_type, 25> const LAYERS = {
     {{"proposed", 1, false},       {"construction", 2, false},
      {"steps", 10, false},         {"cycleway", 10, false},
      {"bridleway", 10, false},     {"footway", 10, false},
@@ -60,7 +60,7 @@ void add_z_order(taglist_t *tags, bool *roads)
     *roads = false;
 
     if (highway) {
-        for (auto const &layer : layers) {
+        for (auto const &layer : LAYERS) {
             if (*highway == layer.highway) {
                 z_order += layer.offset;
                 *roads = layer.roads;
diff --git a/src/wkb.cpp b/src/wkb.cpp
index 0353baf0f..facae2ad4 100644
--- a/src/wkb.cpp
+++ b/src/wkb.cpp
@@ -578,7 +578,7 @@ geom::geometry_t ewkb_to_geom(std::string_view wkb)
 
 namespace {
 
-constexpr std::array<char, 256> const hex_table = {
+constexpr std::array<char, 256> const HEX_TABLE = {
     0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
     0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
     0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
@@ -594,7 +594,7 @@ constexpr std::array<char, 256> const hex_table = {
 unsigned char decode_hex_char(char c) noexcept
 {
     // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-constant-array-index)
-    return hex_table[static_cast<std::size_t>(static_cast<unsigned char>(c))];
+    return HEX_TABLE[static_cast<std::size_t>(static_cast<unsigned char>(c))];
 }
 
 std::string decode_hex(std::string_view hex_string)

From 142857d32b7b5d3022087c6f8507a89fe48932a2 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 1 Jun 2025 17:34:41 +0200
Subject: [PATCH 291/430] Use UPPERCASE for string constants

---
 src/lua-utils.cpp        |  6 +++---
 src/properties.cpp       |  8 ++++----
 src/tagtransform-lua.cpp | 16 ++++++++--------
 src/tagtransform-lua.hpp |  8 ++++----
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/lua-utils.cpp b/src/lua-utils.cpp
index 928bc9222..376d460a9 100644
--- a/src/lua-utils.cpp
+++ b/src/lua-utils.cpp
@@ -36,7 +36,7 @@ void *luaX_get_context(lua_State *lua_state) noexcept
 namespace {
 
 // Unique key for lua registry
-constexpr char const *const osm2pgsql_output_flex = "osm2pgsql_output_flex";
+constexpr char const *const OSM2PGSQL_OUTPUT_FLEX = "osm2pgsql_output_flex";
 
 } // anonymous namespace
 
@@ -44,7 +44,7 @@ void luaX_set_context(lua_State *lua_state, void *ptr) noexcept
 {
     assert(lua_state);
     assert(ptr);
-    lua_pushlightuserdata(lua_state, (void *)osm2pgsql_output_flex);
+    lua_pushlightuserdata(lua_state, (void *)OSM2PGSQL_OUTPUT_FLEX);
     lua_pushlightuserdata(lua_state, ptr);
     lua_settable(lua_state, LUA_REGISTRYINDEX);
 }
@@ -52,7 +52,7 @@ void luaX_set_context(lua_State *lua_state, void *ptr) noexcept
 void *luaX_get_context(lua_State *lua_state) noexcept
 {
     assert(lua_state);
-    lua_pushlightuserdata(lua_state, (void *)osm2pgsql_output_flex);
+    lua_pushlightuserdata(lua_state, (void *)OSM2PGSQL_OUTPUT_FLEX);
     lua_gettable(lua_state, LUA_REGISTRYINDEX);
     auto *const ptr = lua_touserdata(lua_state, -1);
     assert(ptr);
diff --git a/src/properties.cpp b/src/properties.cpp
index b959c0726..b7872cc8c 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -19,7 +19,7 @@
 
 namespace {
 
-constexpr char const *const properties_table = "osm2pgsql_properties";
+constexpr char const *const PROPERTIES_TABLE = "osm2pgsql_properties";
 
 } // anonymous namespace
 
@@ -27,10 +27,10 @@ properties_t::properties_t(connection_params_t connection_params,
                            std::string schema)
 : m_connection_params(std::move(connection_params)),
   m_schema(std::move(schema)),
-  m_has_properties_table(has_table(m_schema, properties_table))
+  m_has_properties_table(has_table(m_schema, PROPERTIES_TABLE))
 {
     assert(!m_schema.empty());
-    log_debug("Found properties table '{}': {}.", properties_table,
+    log_debug("Found properties table '{}': {}.", PROPERTIES_TABLE,
               m_has_properties_table);
 }
 
@@ -159,5 +159,5 @@ bool properties_t::load()
 
 std::string properties_t::table_name() const
 {
-    return qualified_name(m_schema, properties_table);
+    return qualified_name(m_schema, PROPERTIES_TABLE);
 }
diff --git a/src/tagtransform-lua.cpp b/src/tagtransform-lua.cpp
index efbab0651..b22c6d28f 100644
--- a/src/tagtransform-lua.cpp
+++ b/src/tagtransform-lua.cpp
@@ -24,10 +24,10 @@ lua_tagtransform_t::lua_tagtransform_t(std::string const *tag_transform_script,
                         lua_tostring(lua_state(), -1));
     }
 
-    check_lua_function_exists(node_func);
-    check_lua_function_exists(way_func);
-    check_lua_function_exists(rel_func);
-    check_lua_function_exists(rel_mem_func);
+    check_lua_function_exists(NODE_FUNC);
+    check_lua_function_exists(WAY_FUNC);
+    check_lua_function_exists(REL_FUNC);
+    check_lua_function_exists(REL_MEM_FUNC);
 }
 
 std::unique_ptr<tagtransform_t> lua_tagtransform_t::clone() const
@@ -86,13 +86,13 @@ bool lua_tagtransform_t::filter_tags(osmium::OSMObject const &o, bool *polygon,
 {
     switch (o.type()) {
     case osmium::item_type::node:
-        lua_getglobal(lua_state(), node_func);
+        lua_getglobal(lua_state(), NODE_FUNC);
         break;
     case osmium::item_type::way:
-        lua_getglobal(lua_state(), way_func);
+        lua_getglobal(lua_state(), WAY_FUNC);
         break;
     case osmium::item_type::relation:
-        lua_getglobal(lua_state(), rel_func);
+        lua_getglobal(lua_state(), REL_FUNC);
         break;
     default:
         throw std::runtime_error{"Unknown OSM type."};
@@ -153,7 +153,7 @@ bool lua_tagtransform_t::filter_rel_member_tags(
     bool *roads, taglist_t *out_tags)
 {
     size_t const num_members = member_roles.size();
-    lua_getglobal(lua_state(), rel_mem_func);
+    lua_getglobal(lua_state(), REL_MEM_FUNC);
 
     lua_newtable(lua_state()); /* relations key value table */
 
diff --git a/src/tagtransform-lua.hpp b/src/tagtransform-lua.hpp
index c0d8e0e28..861417384 100644
--- a/src/tagtransform-lua.hpp
+++ b/src/tagtransform-lua.hpp
@@ -36,10 +36,10 @@ class lua_tagtransform_t : public tagtransform_t
                                 bool *roads, taglist_t *out_tags) override;
 
 private:
-    constexpr static char const *const node_func = "filter_tags_node";
-    constexpr static char const *const way_func = "filter_tags_way";
-    constexpr static char const *const rel_func = "filter_basic_tags_rel";
-    constexpr static char const *const rel_mem_func =
+    constexpr static char const *const NODE_FUNC = "filter_tags_node";
+    constexpr static char const *const WAY_FUNC = "filter_tags_way";
+    constexpr static char const *const REL_FUNC = "filter_basic_tags_rel";
+    constexpr static char const *const REL_MEM_FUNC =
         "filter_tags_relation_member";
 
     void check_lua_function_exists(char const *func_name);

From 64d4c96a25f567862ed979f66c326150b49ca1fe Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 1 Jun 2025 17:35:20 +0200
Subject: [PATCH 292/430] Use UPPERCASE for constants used in templates

---
 src/geom.hpp  | 4 ++--
 src/pgsql.hpp | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/geom.hpp b/src/geom.hpp
index b87cae0d3..250f88081 100644
--- a/src/geom.hpp
+++ b/src/geom.hpp
@@ -198,7 +198,7 @@ class multigeometry_t
     using iterator = typename std::vector<GEOM>::iterator;
     using value_type = GEOM;
 
-    static constexpr bool const for_point = std::is_same_v<GEOM, point_t>;
+    static constexpr bool const FOR_POINT = std::is_same_v<GEOM, point_t>;
 
     [[nodiscard]] std::size_t num_geometries() const noexcept
     {
@@ -206,7 +206,7 @@ class multigeometry_t
     }
 
     GEOM &
-    add_geometry(typename std::conditional_t<for_point, point_t, GEOM &&> geom)
+    add_geometry(typename std::conditional_t<FOR_POINT, point_t, GEOM &&> geom)
     {
         m_geometry.push_back(std::forward<GEOM>(geom));
         return m_geometry.back();
diff --git a/src/pgsql.hpp b/src/pgsql.hpp
index 01a0f617f..8b1a93322 100644
--- a/src/pgsql.hpp
+++ b/src/pgsql.hpp
@@ -318,10 +318,11 @@ class pg_conn_t
         // It needs to be large enough to hold all parameters without resizing
         // so that pointers into the strings in that vector remain valid
         // after new parameters have been added.
-        constexpr auto const total_buffers_needed =
+        constexpr auto const TOTAL_BUFFERS_NEEDED =
             (0 + ... + buffers_needed<std::decay_t<TArgs>>());
+
         std::vector<std::string> exec_params;
-        exec_params.reserve(total_buffers_needed);
+        exec_params.reserve(TOTAL_BUFFERS_NEEDED);
 
         std::array<int, sizeof...(params)> lengths = {0};
         std::array<int, sizeof...(params)> bins = {0};

From 4a0243f6cd35915b3cc75fd2164f4725e7199278 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 1 Jun 2025 22:40:44 +0200
Subject: [PATCH 293/430] Avoid warnings about implicit widening of
 multiplication result

from clang-tidy
---
 src/db-copy.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/db-copy.hpp b/src/db-copy.hpp
index c55387a62..c1c1c3a57 100644
--- a/src/db-copy.hpp
+++ b/src/db-copy.hpp
@@ -145,7 +145,7 @@ struct db_cmd_copy_t
      * to speed up processing. Currently a one-size fits all value.
      * Needs more testing and individual values per queue.
      */
-    static constexpr std::size_t MAX_BUF_SIZE = 10 * 1024 * 1024;
+    static constexpr std::size_t MAX_BUF_SIZE = 10UL * 1024UL * 1024UL;
 
     /**
      * Maximum length of the queue with COPY data.

From e39172ccd4b8275574786c79871fa791c464af70 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 2 Jun 2025 22:18:39 +0200
Subject: [PATCH 294/430] Consistent naming and type for "Lua class names"

* Using uppercase, because they are constants
* Using the word "CLASS" because it is easier to understand then
  the generic "name" or the Luaish "metatable"
* Using char* not std::string_view, because its simpler use
  (no .data() needed)

This is for all the Lua "classes" that we use in flex config files:

* ExpireOutput
* Geometry
* Locator
* OSMObject
* Table
---
 src/flex-lua-expire-output.cpp |  4 ++--
 src/flex-lua-expire-output.hpp |  2 +-
 src/flex-lua-geom.cpp          |  8 ++++----
 src/flex-lua-locator.cpp       |  4 ++--
 src/flex-lua-locator.hpp       |  2 +-
 src/flex-lua-table.cpp         |  6 +++---
 src/flex-lua-table.hpp         |  2 +-
 src/gen/osm2pgsql-gen.cpp      |  2 +-
 src/output-flex.cpp            | 18 +++++++++---------
 9 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/flex-lua-expire-output.cpp b/src/flex-lua-expire-output.cpp
index 59cc0c222..aac3ba2f3 100644
--- a/src/flex-lua-expire-output.cpp
+++ b/src/flex-lua-expire-output.cpp
@@ -88,7 +88,7 @@ int setup_flex_expire_output(lua_State *lua_state,
     void *ptr = lua_newuserdata(lua_state, sizeof(std::size_t));
     auto *num = new (ptr) std::size_t{};
     *num = expire_outputs->size() - 1;
-    luaL_getmetatable(lua_state, osm2pgsql_expire_output_name);
+    luaL_getmetatable(lua_state, OSM2PGSQL_EXPIRE_OUTPUT_CLASS);
     lua_setmetatable(lua_state, -2);
 
     return 1;
@@ -100,7 +100,7 @@ int setup_flex_expire_output(lua_State *lua_state,
 void lua_wrapper_expire_output::init(lua_State *lua_state)
 {
     lua_getglobal(lua_state, "osm2pgsql");
-    if (luaL_newmetatable(lua_state, osm2pgsql_expire_output_name) != 1) {
+    if (luaL_newmetatable(lua_state, OSM2PGSQL_EXPIRE_OUTPUT_CLASS) != 1) {
         throw std::runtime_error{"Internal error: Lua newmetatable failed."};
     }
     lua_pushvalue(lua_state, -1); // Copy of new metatable
diff --git a/src/flex-lua-expire-output.hpp b/src/flex-lua-expire-output.hpp
index 809a8ebc4..29dc0ae68 100644
--- a/src/flex-lua-expire-output.hpp
+++ b/src/flex-lua-expire-output.hpp
@@ -18,7 +18,7 @@
 class expire_output_t;
 struct lua_State;
 
-static char const *const osm2pgsql_expire_output_name =
+static char const *const OSM2PGSQL_EXPIRE_OUTPUT_CLASS =
     "osm2pgsql.ExpireOutput";
 
 int setup_flex_expire_output(lua_State *lua_state,
diff --git a/src/flex-lua-geom.cpp b/src/flex-lua-geom.cpp
index dc4772905..ed48b5da3 100644
--- a/src/flex-lua-geom.cpp
+++ b/src/flex-lua-geom.cpp
@@ -15,7 +15,7 @@
 
 #include <lua.hpp>
 
-static char const *const osm2pgsql_geometry_class = "osm2pgsql.Geometry";
+static char const *const OSM2PGSQL_GEOMETRY_CLASS = "osm2pgsql.Geometry";
 
 geom::geometry_t *create_lua_geometry_object(lua_State *lua_state)
 {
@@ -23,7 +23,7 @@ geom::geometry_t *create_lua_geometry_object(lua_State *lua_state)
     new (ptr) geom::geometry_t{};
 
     // Set the metatable of this object
-    luaL_getmetatable(lua_state, osm2pgsql_geometry_class);
+    luaL_getmetatable(lua_state, OSM2PGSQL_GEOMETRY_CLASS);
     lua_setmetatable(lua_state, -2);
 
     return static_cast<geom::geometry_t *>(ptr);
@@ -31,7 +31,7 @@ geom::geometry_t *create_lua_geometry_object(lua_State *lua_state)
 
 geom::geometry_t *unpack_geometry(lua_State *lua_state, int n) noexcept
 {
-    void *user_data = luaL_checkudata(lua_state, n, osm2pgsql_geometry_class);
+    void *user_data = luaL_checkudata(lua_state, n, OSM2PGSQL_GEOMETRY_CLASS);
     luaL_argcheck(lua_state, user_data != nullptr, n, "'Geometry' expected");
     return static_cast<geom::geometry_t *>(user_data);
 }
@@ -300,7 +300,7 @@ int geom_transform(lua_State *lua_state)
 void init_geometry_class(lua_State *lua_state)
 {
     lua_getglobal(lua_state, "osm2pgsql");
-    if (luaL_newmetatable(lua_state, osm2pgsql_geometry_class) != 1) {
+    if (luaL_newmetatable(lua_state, OSM2PGSQL_GEOMETRY_CLASS) != 1) {
         throw std::runtime_error{"Internal error: Lua newmetatable failed."};
     }
     lua_pushvalue(lua_state, -1); // Copy of new metatable
diff --git a/src/flex-lua-locator.cpp b/src/flex-lua-locator.cpp
index f5bf027e6..4598a7854 100644
--- a/src/flex-lua-locator.cpp
+++ b/src/flex-lua-locator.cpp
@@ -59,7 +59,7 @@ int setup_flex_locator(lua_State *lua_state, std::vector<locator_t> *locators)
     void *ptr = lua_newuserdata(lua_state, sizeof(std::size_t));
     auto *num = new (ptr) std::size_t{};
     *num = locators->size() - 1;
-    luaL_getmetatable(lua_state, osm2pgsql_locator_name);
+    luaL_getmetatable(lua_state, OSM2PGSQL_LOCATOR_CLASS);
     lua_setmetatable(lua_state, -2);
 
     return 1;
@@ -71,7 +71,7 @@ void lua_wrapper_locator::init(lua_State *lua_state,
     s_connection_params = connection_params;
 
     lua_getglobal(lua_state, "osm2pgsql");
-    if (luaL_newmetatable(lua_state, osm2pgsql_locator_name) != 1) {
+    if (luaL_newmetatable(lua_state, OSM2PGSQL_LOCATOR_CLASS) != 1) {
         throw std::runtime_error{"Internal error: Lua newmetatable failed."};
     }
     lua_pushvalue(lua_state, -1); // Copy of new metatable
diff --git a/src/flex-lua-locator.hpp b/src/flex-lua-locator.hpp
index 80f07714d..6dcbea93f 100644
--- a/src/flex-lua-locator.hpp
+++ b/src/flex-lua-locator.hpp
@@ -23,7 +23,7 @@ class pg_conn_t;
 
 struct lua_State;
 
-static char const *const osm2pgsql_locator_name = "osm2pgsql.Locator";
+static char const *const OSM2PGSQL_LOCATOR_CLASS = "osm2pgsql.Locator";
 
 int setup_flex_locator(lua_State *lua_state, std::vector<locator_t> *locators);
 
diff --git a/src/flex-lua-table.cpp b/src/flex-lua-table.cpp
index 9932b3c2c..3a41bcc1e 100644
--- a/src/flex-lua-table.cpp
+++ b/src/flex-lua-table.cpp
@@ -195,7 +195,7 @@ std::size_t idx_from_userdata(lua_State *lua_state, int idx,
         throw std::runtime_error{"Expire output must be of type ExpireOutput."};
     }
 
-    luaL_getmetatable(lua_state, osm2pgsql_expire_output_name);
+    luaL_getmetatable(lua_state, OSM2PGSQL_EXPIRE_OUTPUT_CLASS);
     if (!lua_rawequal(lua_state, -1, -2)) {
         throw std::runtime_error{"Expire output must be of type ExpireOutput."};
     }
@@ -445,7 +445,7 @@ int setup_flex_table(lua_State *lua_state, std::vector<flex_table_t> *tables,
     void *ptr = lua_newuserdata(lua_state, sizeof(std::size_t));
     auto *num = new (ptr) std::size_t{};
     *num = tables->size() - 1;
-    luaL_getmetatable(lua_state, osm2pgsql_table_name);
+    luaL_getmetatable(lua_state, OSM2PGSQL_TABLE_CLASS);
     lua_setmetatable(lua_state, -2);
 
     return 1;
@@ -457,7 +457,7 @@ int setup_flex_table(lua_State *lua_state, std::vector<flex_table_t> *tables,
 void lua_wrapper_table::init(lua_State *lua_state)
 {
     lua_getglobal(lua_state, "osm2pgsql");
-    if (luaL_newmetatable(lua_state, osm2pgsql_table_name) != 1) {
+    if (luaL_newmetatable(lua_state, OSM2PGSQL_TABLE_CLASS) != 1) {
         throw std::runtime_error{"Internal error: Lua newmetatable failed."};
     }
     lua_pushvalue(lua_state, -1); // Copy of new metatable
diff --git a/src/flex-lua-table.hpp b/src/flex-lua-table.hpp
index 32b17d564..29d8b9ef4 100644
--- a/src/flex-lua-table.hpp
+++ b/src/flex-lua-table.hpp
@@ -19,7 +19,7 @@ class expire_output_t;
 class flex_table_t;
 struct lua_State;
 
-static char const *const osm2pgsql_table_name = "osm2pgsql.Table";
+static char const *const OSM2PGSQL_TABLE_CLASS = "osm2pgsql.Table";
 
 int setup_flex_table(lua_State *lua_state, std::vector<flex_table_t> *tables,
                      std::vector<expire_output_t> *expire_outputs,
diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index 8376edc5f..84b1a5830 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -565,7 +565,7 @@ genproc_t::genproc_t(std::string const &filename,
     luaX_add_table_func(lua_state(), "run_sql", lua_trampoline_app_run_sql);
 
     lua_getglobal(lua_state(), "osm2pgsql");
-    if (luaL_newmetatable(lua_state(), osm2pgsql_expire_output_name) != 1) {
+    if (luaL_newmetatable(lua_state(), OSM2PGSQL_EXPIRE_OUTPUT_CLASS) != 1) {
         throw std::runtime_error{"Internal error: Lua newmetatable failed."};
     }
     lua_pushvalue(lua_state(), -1); // Copy of new metatable
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 1e87b5d03..bd12a6248 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -120,7 +120,7 @@ prepared_lua_function_t::prepared_lua_function_t(lua_State *lua_state,
 
 namespace {
 
-std::string_view const osm2pgsql_object_metatable = "osm2pgsql.OSMObject";
+char const *const OSM2PGSQL_OSMOBJECT_CLASS = "osm2pgsql.OSMObject";
 
 void push_osm_object_to_lua_stack(lua_State *lua_state,
                                   osmium::OSMObject const &object)
@@ -188,7 +188,7 @@ void push_osm_object_to_lua_stack(lua_State *lua_state,
     lua_rawset(lua_state, -3);
 
     // Set the metatable of this object
-    luaX_pushstring(lua_state, osm2pgsql_object_metatable);
+    lua_pushstring(lua_state, OSM2PGSQL_OSMOBJECT_CLASS);
     lua_gettable(lua_state, LUA_REGISTRYINDEX);
     lua_setmetatable(lua_state, -2);
 }
@@ -312,7 +312,7 @@ void check_for_object(lua_State *lua_state, char const *const function_name)
     }
 
     if (lua_getmetatable(lua_state, 1)) {
-        luaL_getmetatable(lua_state, osm2pgsql_object_metatable.data());
+        luaL_getmetatable(lua_state, OSM2PGSQL_OSMOBJECT_CLASS);
         if (lua_rawequal(lua_state, -1, -2)) {
             lua_pop(lua_state, 2); // remove the two metatables
             return;
@@ -608,19 +608,19 @@ int output_flex_t::app_define_expire_output()
 flex_table_t &output_flex_t::get_table_from_param()
 {
     return get_from_idx_param(lua_state(), m_tables.get(),
-                              osm2pgsql_table_name);
+                              OSM2PGSQL_TABLE_CLASS);
 }
 
 expire_output_t &output_flex_t::get_expire_output_from_param()
 {
     return get_from_idx_param(lua_state(), m_expire_outputs.get(),
-                              osm2pgsql_expire_output_name);
+                              OSM2PGSQL_EXPIRE_OUTPUT_CLASS);
 }
 
 locator_t &output_flex_t::get_locator_from_param()
 {
     return get_from_idx_param(lua_state(), m_locators.get(),
-                              osm2pgsql_locator_name);
+                              OSM2PGSQL_LOCATOR_CLASS);
 }
 
 bool output_flex_t::way_cache_t::init(middle_query_t const &middle, osmid_t id)
@@ -745,7 +745,7 @@ int output_flex_t::table_insert()
 
     // The first parameter is the table object.
     auto &table_connection = m_table_connections.at(
-        idx_from_param(lua_state(), osm2pgsql_table_name));
+        idx_from_param(lua_state(), OSM2PGSQL_TABLE_CLASS));
 
     // The second parameter must be a Lua table with the contents for the
     // fields.
@@ -1273,7 +1273,7 @@ void output_flex_t::init_lua(std::string const &filename,
 
     // Store the methods on OSM objects in its metatable.
     lua_getglobal(lua_state(), "object_metatable");
-    luaX_pushstring(lua_state(), osm2pgsql_object_metatable);
+    lua_pushstring(lua_state(), OSM2PGSQL_OSMOBJECT_CLASS);
     lua_setfield(lua_state(), -2, "__name");
     lua_getfield(lua_state(), -1, "__index");
     luaX_add_table_func(lua_state(), "get_bbox", lua_trampoline_app_get_bbox);
@@ -1296,7 +1296,7 @@ void output_flex_t::init_lua(std::string const &filename,
     // Store the global object "object_metatable" defined in the init.lua
     // script in the registry and then remove the global object. It will
     // later be used as metatable for OSM objects.
-    luaX_pushstring(lua_state(), osm2pgsql_object_metatable);
+    lua_pushstring(lua_state(), OSM2PGSQL_OSMOBJECT_CLASS);
     lua_getglobal(lua_state(), "object_metatable");
     lua_settable(lua_state(), LUA_REGISTRYINDEX);
     lua_pushnil(lua_state());

From c56a935567d02a08ddda97e853f53bba5a0ec5ee Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 5 Jun 2025 10:37:15 +0200
Subject: [PATCH 295/430] Allow --username and --user in osm2pgsql and
 osm2pgsql-replication

This was inconsistent and documented wrong. We prefer the --username
variant, because that is consistent with psql, but both work now
everwhere.

See #2342
---
 man/osm2pgsql.md              | 2 +-
 scripts/osm2pgsql-replication | 2 +-
 src/command-line-app.cpp      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/man/osm2pgsql.md b/man/osm2pgsql.md
index 19ea5b9c8..637191eea 100644
--- a/man/osm2pgsql.md
+++ b/man/osm2pgsql.md
@@ -79,7 +79,7 @@ mandatory for short options too.
     `postgres://`), it is treated as a conninfo string. See the PostgreSQL
     manual for details.
 
--U, \--username=NAME
+-U, \--username=NAME, \--user=NAME
 :   Postgresql user name.
 
 -W, \--password
diff --git a/scripts/osm2pgsql-replication b/scripts/osm2pgsql-replication
index 58e2215c6..297084140 100755
--- a/scripts/osm2pgsql-replication
+++ b/scripts/osm2pgsql-replication
@@ -627,7 +627,7 @@ def get_parser():
       "see https://www.postgresql.org/docs/current/libpq-pgpass.html.")
     group.add_argument('-d', '--database', metavar='DB',
                        help='Name of PostgreSQL database to connect to or conninfo string')
-    group.add_argument('-U', '--username', metavar='NAME',
+    group.add_argument('-U', '--username', '--user', metavar='NAME',
                        help='PostgreSQL user name')
     group.add_argument('-H', '--host', metavar='HOST',
                        help='Database server host name or socket location')
diff --git a/src/command-line-app.cpp b/src/command-line-app.cpp
index 8fd20d506..03e319ab0 100644
--- a/src/command-line-app.cpp
+++ b/src/command-line-app.cpp
@@ -41,7 +41,7 @@ void command_line_app_t::init_database_options()
         ->type_name("DB")
         ->group("Database options");
 
-    add_option_function<std::string>("-U,--user",
+    add_option_function<std::string>("-U,--username,--user",
                                      [&](std::string const &value) {
                                          m_connection_params.set("user", value);
                                      })

From 1ee13a96c7451dc3521bc5ef45186ce1d4889bbb Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 5 Jun 2025 23:06:21 +0200
Subject: [PATCH 296/430] move special handling of untagged objects into pgsql
 output

This special handling has been already disabled for flex output
when we introduced the untagged callbacks.
---
 src/osmdata.cpp                 | 31 +++++++------------------------
 src/osmdata.hpp                 |  1 -
 src/output-pgsql.cpp            | 15 +++++++++++++++
 src/output-pgsql.hpp            |  2 ++
 tests/test-osm-file-parsing.cpp | 12 ++++++------
 5 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/src/osmdata.cpp b/src/osmdata.cpp
index 82dc262db..84dde3b5f 100644
--- a/src/osmdata.cpp
+++ b/src/osmdata.cpp
@@ -31,9 +31,7 @@ osmdata_t::osmdata_t(std::shared_ptr<middle_t> mid,
 : m_mid(std::move(mid)), m_output(std::move(output)),
   m_connection_params(options.connection_params), m_bbox(options.bbox),
   m_num_procs(options.num_procs), m_append(options.append),
-  m_droptemp(options.droptemp),
-  m_with_extra_attrs(options.extra_attributes ||
-                     options.output_backend == "flex")
+  m_droptemp(options.droptemp)
 {
     assert(m_mid);
     assert(m_output);
@@ -60,13 +58,8 @@ void osmdata_t::node(osmium::Node const &node)
         return;
     }
 
-    bool const has_tags_or_attrs = m_with_extra_attrs || !node.tags().empty();
     if (m_append) {
-        if (has_tags_or_attrs) {
-            m_output->node_modify(node);
-        } else {
-            m_output->node_delete(node.id());
-        }
+        m_output->node_modify(node);
 
         // Version 1 means this is a new node, so there can't be an existing
         // way or relation referencing it, so we don't have to add that node
@@ -75,7 +68,7 @@ void osmdata_t::node(osmium::Node const &node)
         if (node.version() != 1) {
             m_changed_nodes.push_back(node.id());
         }
-    } else if (has_tags_or_attrs) {
+    } else {
         m_output->node_add(node);
     }
 }
@@ -105,13 +98,8 @@ void osmdata_t::way(osmium::Way &way)
         return;
     }
 
-    bool const has_tags_or_attrs = m_with_extra_attrs || !way.tags().empty();
     if (m_append) {
-        if (has_tags_or_attrs) {
-            m_output->way_modify(&way);
-        } else {
-            m_output->way_delete(way.id());
-        }
+        m_output->way_modify(&way);
 
         // Version 1 means this is a new way, so there can't be an existing
         // relation referencing it, so we don't have to add that way to the
@@ -120,7 +108,7 @@ void osmdata_t::way(osmium::Way &way)
         if (way.version() != 1) {
             m_changed_ways.push_back(way.id());
         }
-    } else if (has_tags_or_attrs) {
+    } else {
         m_output->way_add(&way);
     }
 }
@@ -177,15 +165,10 @@ void osmdata_t::relation(osmium::Relation const &rel)
         return;
     }
 
-    bool const has_tags_or_attrs = m_with_extra_attrs || !rel.tags().empty();
     if (m_append) {
-        if (has_tags_or_attrs) {
-            m_output->relation_modify(rel);
-        } else {
-            m_output->relation_delete(rel.id());
-        }
+        m_output->relation_modify(rel);
         m_changed_relations.push_back(rel.id());
-    } else if (has_tags_or_attrs) {
+    } else {
         m_output->relation_add(rel);
     }
 }
diff --git a/src/osmdata.hpp b/src/osmdata.hpp
index dcbe74b12..4054222b0 100644
--- a/src/osmdata.hpp
+++ b/src/osmdata.hpp
@@ -117,7 +117,6 @@ class osmdata_t : public osmium::handler::Handler
     unsigned int m_num_procs;
     bool m_append;
     bool m_droptemp;
-    bool m_with_extra_attrs;
 };
 
 #endif // OSM2PGSQL_OSMDATA_HPP
diff --git a/src/output-pgsql.cpp b/src/output-pgsql.cpp
index e7c1023eb..e1dabef66 100644
--- a/src/output-pgsql.cpp
+++ b/src/output-pgsql.cpp
@@ -206,6 +206,10 @@ void output_pgsql_t::wait()
 
 void output_pgsql_t::node_add(osmium::Node const &node)
 {
+    if (m_ignore_untagged_objects && node.tags().empty()) {
+        return;
+    }
+
     taglist_t outtags;
     if (m_tagtransform->filter_tags(node, nullptr, nullptr, &outtags)) {
         return;
@@ -219,6 +223,10 @@ void output_pgsql_t::node_add(osmium::Node const &node)
 
 void output_pgsql_t::way_add(osmium::Way *way)
 {
+    if (m_ignore_untagged_objects && way->tags().empty()) {
+        return;
+    }
+
     bool polygon = false;
     bool roads = false;
     taglist_t outtags;
@@ -317,6 +325,10 @@ void output_pgsql_t::pgsql_process_relation(osmium::Relation const &rel)
 
 void output_pgsql_t::relation_add(osmium::Relation const &rel)
 {
+    if (m_ignore_untagged_objects && rel.tags().empty()) {
+        return;
+    }
+
     char const *const type = rel.tags()["type"];
 
     /* Must have a type field or we ignore it */
@@ -458,6 +470,8 @@ output_pgsql_t::output_pgsql_t(std::shared_ptr<middle_query_t> const &mid,
 
     m_enable_way_area = read_style_file(options.style, &exlist);
 
+    m_ignore_untagged_objects = !options.extra_attributes;
+
     m_tagtransform = tagtransform_t::make_tagtransform(&options, exlist);
 
     auto copy_thread =
@@ -507,6 +521,7 @@ output_pgsql_t::output_pgsql_t(
     std::shared_ptr<db_copy_thread_t> const &copy_thread)
 : output_t(other, mid), m_tagtransform(other->m_tagtransform->clone()),
   m_enable_way_area(other->m_enable_way_area),
+  m_ignore_untagged_objects(other->m_ignore_untagged_objects),
   m_proj(get_options()->projection), m_expire_config(other->m_expire_config),
   m_expire(get_options()->expire_tiles_zoom, get_options()->projection),
   m_buffer(1024, osmium::memory::Buffer::auto_grow::yes),
diff --git a/src/output-pgsql.hpp b/src/output-pgsql.hpp
index b99b64eca..cdfa6cdc2 100644
--- a/src/output-pgsql.hpp
+++ b/src/output-pgsql.hpp
@@ -100,6 +100,8 @@ class output_pgsql_t : public output_t
 
     //enable output of a generated way_area tag to either hstore or its own column
     bool m_enable_way_area;
+    // handle objects without tags as if they were not there
+    bool m_ignore_untagged_objects;
 
     std::array<std::unique_ptr<table_t>, t_MAX> m_tables;
 
diff --git a/tests/test-osm-file-parsing.cpp b/tests/test-osm-file-parsing.cpp
index 838b7fc80..834275481 100644
--- a/tests/test-osm-file-parsing.cpp
+++ b/tests/test-osm-file-parsing.cpp
@@ -154,13 +154,13 @@ TEST_CASE("parse xml file")
     testing::parse_file(options, middle, output, "test_multipolygon.osm",
                         false);
 
-    REQUIRE(output->sum_ids == 4728);
-    REQUIRE(output->sum_nds == 186);
+    REQUIRE(output->sum_ids == 73514);
+    REQUIRE(output->sum_nds == 495);
     REQUIRE(output->sum_members == 146);
-    REQUIRE(output->node.added == 0);
+    REQUIRE(output->node.added == 353);
     REQUIRE(output->node.modified == 0);
     REQUIRE(output->node.deleted == 0);
-    REQUIRE(output->way.added == 48);
+    REQUIRE(output->way.added == 140);
     REQUIRE(output->way.modified == 0);
     REQUIRE(output->way.deleted == 0);
     REQUIRE(output->relation.added == 40);
@@ -188,8 +188,8 @@ TEST_CASE("parse diff file")
     testing::parse_file(options, middle, output, "008-ch.osc.gz", false);
 
     REQUIRE(output->node.added == 0);
-    REQUIRE(output->node.modified == 153);
-    REQUIRE(output->node.deleted == 17796);
+    REQUIRE(output->node.modified == 1176);
+    REQUIRE(output->node.deleted == 16773);
     REQUIRE(output->way.added == 0);
     REQUIRE(output->way.modified == 161);
     REQUIRE(output->way.deleted == 4);

From 993bc74c24740f2ab2146f25ea0c71d0acf04ef0 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 1 Jun 2025 21:55:41 +0200
Subject: [PATCH 297/430] Consolidate hex encoding functions into their own
 file

Consolidate multiple functions doing basically the same hex encoding
and add some tests.
---
 src/CMakeLists.txt           |  1 +
 src/db-copy-mgr.hpp          | 10 ++--------
 src/gen/canvas.cpp           | 17 +----------------
 src/gen/canvas.hpp           |  2 --
 src/gen/gen-tile-builtup.cpp |  5 +++--
 src/gen/gen-tile-raster.cpp  |  3 ++-
 src/hex.cpp                  | 37 ++++++++++++++++++++++++++++++++++++
 src/hex.hpp                  | 35 ++++++++++++++++++++++++++++++++++
 tests/CMakeLists.txt         |  1 +
 tests/test-hex.cpp           | 37 ++++++++++++++++++++++++++++++++++++
 10 files changed, 119 insertions(+), 29 deletions(-)
 create mode 100644 src/hex.cpp
 create mode 100644 src/hex.hpp
 create mode 100644 tests/test-hex.cpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ba1f0346f..2622af063 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -32,6 +32,7 @@ target_sources(osm2pgsql_lib PRIVATE
     geom-functions.cpp
     geom-pole-of-inaccessibility.cpp
     geom.cpp
+    hex.cpp
     idlist.cpp
     input.cpp
     locator.cpp
diff --git a/src/db-copy-mgr.hpp b/src/db-copy-mgr.hpp
index f56251f30..7585e87de 100644
--- a/src/db-copy-mgr.hpp
+++ b/src/db-copy-mgr.hpp
@@ -15,7 +15,7 @@
 #include <string>
 
 #include "db-copy.hpp"
-#include "util.hpp"
+#include "hex.hpp"
 
 /**
  * Management class that fills and manages copy buffers.
@@ -237,13 +237,7 @@ class db_copy_mgr_t
      */
     void add_hex_geom(std::string const &wkb)
     {
-        char const *const lookup_hex = "0123456789ABCDEF";
-
-        for (auto c : wkb) {
-            unsigned int const num = static_cast<unsigned char>(c);
-            m_current.buffer += lookup_hex[(num >> 4U) & 0xfU];
-            m_current.buffer += lookup_hex[num & 0xfU];
-        }
+        util::encode_hex(wkb, &m_current.buffer);
         m_current.buffer += '\t';
     }
 
diff --git a/src/gen/canvas.cpp b/src/gen/canvas.cpp
index 0d6cf0d55..e0dd41a64 100644
--- a/src/gen/canvas.cpp
+++ b/src/gen/canvas.cpp
@@ -9,6 +9,7 @@
 
 #include "canvas.hpp"
 
+#include "hex.hpp"
 #include "raster.hpp"
 #include "tile.hpp"
 
@@ -139,19 +140,3 @@ void canvas_t::merge(canvas_t const &other)
 {
     cv::bitwise_or(m_rast, other.m_rast, m_rast);
 }
-
-std::string to_hex(std::string const &in)
-{
-    std::string result;
-    result.reserve(in.size() * 2);
-
-    char const *const lookup_hex = "0123456789ABCDEF";
-
-    for (const auto c : in) {
-        unsigned int const num = static_cast<unsigned char>(c);
-        result += lookup_hex[(num >> 4U) & 0xfU];
-        result += lookup_hex[num & 0xfU];
-    }
-
-    return result;
-}
diff --git a/src/gen/canvas.hpp b/src/gen/canvas.hpp
index 3ea6a7f21..65bc0b913 100644
--- a/src/gen/canvas.hpp
+++ b/src/gen/canvas.hpp
@@ -77,6 +77,4 @@ class canvas_t
     image_type m_rast;
 }; // class canvas_t
 
-std::string to_hex(std::string const &in);
-
 #endif // OSM2PGSQL_CANVAS_HPP
diff --git a/src/gen/gen-tile-builtup.cpp b/src/gen/gen-tile-builtup.cpp
index e04cd5a37..1ef915383 100644
--- a/src/gen/gen-tile-builtup.cpp
+++ b/src/gen/gen-tile-builtup.cpp
@@ -11,6 +11,7 @@
 
 #include "canvas.hpp"
 #include "geom-functions.hpp"
+#include "hex.hpp"
 #include "logging.hpp"
 #include "params.hpp"
 #include "pgsql.hpp"
@@ -33,7 +34,7 @@ void save_image_to_table(pg_conn_t *connection, canvas_t const &canvas,
                          std::string const &table, char const *variant,
                          std::string const &table_prefix)
 {
-    auto const wkb = to_hex(canvas.to_wkb(tile, margin));
+    auto const wkb = util::encode_hex(canvas.to_wkb(tile, margin));
 
     connection->exec("INSERT INTO \"{}_{}_{}\" (zoom, x, y, rast)"
                      " VALUES ({}, {}, {}, '{}')",
@@ -251,7 +252,7 @@ void gen_tile_builtup_t::process(tile_t const &tile)
     log_gen("Write geometries to destination table...");
     timer(m_timer_write).start();
     for (auto const &geom : geometries) {
-        auto const wkb = to_hex(geom_to_ewkb(geom));
+        auto const wkb = util::encode_hex(geom_to_ewkb(geom));
         if (m_has_area_column) {
             connection().exec_prepared("insert_geoms", wkb, tile.x(), tile.y(),
                                        geom::area(geom));
diff --git a/src/gen/gen-tile-raster.cpp b/src/gen/gen-tile-raster.cpp
index ae34bc943..1a8971979 100644
--- a/src/gen/gen-tile-raster.cpp
+++ b/src/gen/gen-tile-raster.cpp
@@ -10,6 +10,7 @@
 #include "gen-tile-raster.hpp"
 
 #include "canvas.hpp"
+#include "hex.hpp"
 #include "logging.hpp"
 #include "params.hpp"
 #include "pgsql.hpp"
@@ -63,7 +64,7 @@ void save_image_to_table(pg_conn_t *connection, canvas_t const &canvas,
                          std::string const &param, char const *variant,
                          std::string const &table_prefix)
 {
-    auto const wkb = to_hex(canvas.to_wkb(tile, margin));
+    auto const wkb = util::encode_hex(canvas.to_wkb(tile, margin));
 
     connection->exec("INSERT INTO \"{}_{}\" (type, zoom, x, y, rast)"
                      " VALUES ('{}', {}, {}, {}, '{}')",
diff --git a/src/hex.cpp b/src/hex.cpp
new file mode 100644
index 000000000..c3bf6d68f
--- /dev/null
+++ b/src/hex.cpp
@@ -0,0 +1,37 @@
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+#include "hex.hpp"
+
+#include <cassert>
+
+namespace util {
+
+void encode_hex(std::string const &in, std::string *out)
+{
+    assert(out);
+
+    constexpr char const *const LOOKUP_HEX = "0123456789ABCDEF";
+
+    for (auto const c : in) {
+        unsigned int const num = static_cast<unsigned char>(c);
+        (*out) += LOOKUP_HEX[(num >> 4U) & 0xfU];
+        (*out) += LOOKUP_HEX[num & 0xfU];
+    }
+}
+
+std::string encode_hex(std::string const &in)
+{
+    std::string result;
+    result.reserve(in.size() * 2);
+    encode_hex(in, &result);
+    return result;
+}
+
+} // namespace util
diff --git a/src/hex.hpp b/src/hex.hpp
new file mode 100644
index 000000000..93925f39f
--- /dev/null
+++ b/src/hex.hpp
@@ -0,0 +1,35 @@
+#ifndef OSM2PGSQL_HEX_HPP
+#define OSM2PGSQL_HEX_HPP
+
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+#include <string>
+
+namespace util {
+
+/**
+ * Convert content of input string to hex and append to output.
+ *
+ * \param in The input data.
+ * \param out Pointer to output string.
+ */
+void encode_hex(std::string const &in, std::string *out);
+
+/**
+ * Convert content of input string to hex and return it.
+ *
+ * \param in The input data.
+ * \returns Hex encoded string.
+ */
+std::string encode_hex(std::string const &in);
+
+} // namespace util
+
+#endif // OSM2PGSQL_HEX_HPP
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 93fd0eded..4b946be34 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -57,6 +57,7 @@ set_test(test-geom-points LABELS NoDB)
 set_test(test-geom-pole-of-inaccessibility LABELS NoDB)
 set_test(test-geom-polygons LABELS NoDB)
 set_test(test-geom-transform LABELS NoDB)
+set_test(test-hex LABELS NoDB)
 set_test(test-json-writer LABELS NoDB)
 set_test(test-locator LABELS NoDB)
 set_test(test-lua-utils LABELS NoDB)
diff --git a/tests/test-hex.cpp b/tests/test-hex.cpp
new file mode 100644
index 000000000..e4df18218
--- /dev/null
+++ b/tests/test-hex.cpp
@@ -0,0 +1,37 @@
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+#include <catch.hpp>
+
+#include "hex.hpp"
+
+#include <string>
+
+TEST_CASE("hex encode a string", "[NoDB]")
+{
+    std::string result;
+    util::encode_hex("ab~", &result);
+    REQUIRE(result.size() == 6);
+    REQUIRE(result == "61627E");
+}
+
+TEST_CASE("hex encode a string adding to existing string", "[NoDB]")
+{
+    std::string result{"0x"};
+    util::encode_hex("\xca\xfe", &result);
+    REQUIRE(result.size() == 6);
+    REQUIRE(result == "0xCAFE");
+}
+
+TEST_CASE("hex encoding an empty string doesn't change output string", "[NoDB]")
+{
+    std::string result{"foo"};
+    util::encode_hex("", &result);
+    REQUIRE(result == "foo");
+}

From fb631b084718516b60d42ea1f48497035bcb52c5 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 2 Jun 2025 11:51:41 +0200
Subject: [PATCH 298/430] Move hex decoding functions into new hex.hpp/cpp

---
 src/gen/gen-rivers.cpp       |  3 ++-
 src/gen/gen-tile-builtup.cpp |  2 +-
 src/gen/gen-tile-raster.cpp  |  2 +-
 src/hex.cpp                  | 41 ++++++++++++++++++++++++++++++
 src/hex.hpp                  | 14 ++++++++++-
 src/locator.cpp              |  3 ++-
 src/wkb.cpp                  | 39 ----------------------------
 src/wkb.hpp                  | 12 ---------
 tests/test-hex.cpp           | 49 ++++++++++++++++++++++++++++++++++++
 tests/test-wkb.cpp           | 43 -------------------------------
 10 files changed, 109 insertions(+), 99 deletions(-)

diff --git a/src/gen/gen-rivers.cpp b/src/gen/gen-rivers.cpp
index 8c94510fc..54aaba8ef 100644
--- a/src/gen/gen-rivers.cpp
+++ b/src/gen/gen-rivers.cpp
@@ -10,6 +10,7 @@
 #include "gen-rivers.hpp"
 
 #include "geom-functions.hpp"
+#include "hex.hpp"
 #include "logging.hpp"
 #include "params.hpp"
 #include "pgsql.hpp"
@@ -264,7 +265,7 @@ SELECT "{id_column}", "{width_column}", "{name_column}", "{geom_column}"
             if (!name.empty()) {
                 names.emplace(id, name);
             }
-            auto const geom = ewkb_to_geom(decode_hex(result.get(i, 3)));
+            auto const geom = ewkb_to_geom(util::decode_hex(result.get(i, 3)));
 
             if (geom.is_linestring()) {
                 auto const &ls = geom.get<geom::linestring_t>();
diff --git a/src/gen/gen-tile-builtup.cpp b/src/gen/gen-tile-builtup.cpp
index 1ef915383..4be8fe1ac 100644
--- a/src/gen/gen-tile-builtup.cpp
+++ b/src/gen/gen-tile-builtup.cpp
@@ -62,7 +62,7 @@ void draw_from_db(double margin, canvas_list_t *canvas_list, pg_conn_t *conn,
                                 box.max_x(), box.max_y());
 
         for (int n = 0; n < result.num_tuples(); ++n) {
-            auto const geom = ewkb_to_geom(decode_hex(result.get(n, 0)));
+            auto const geom = ewkb_to_geom(util::decode_hex(result.get(n, 0)));
             cc.canvas.draw(geom, tile);
         }
     }
diff --git a/src/gen/gen-tile-raster.cpp b/src/gen/gen-tile-raster.cpp
index 1a8971979..c0720ad63 100644
--- a/src/gen/gen-tile-raster.cpp
+++ b/src/gen/gen-tile-raster.cpp
@@ -50,7 +50,7 @@ void draw_from_db(double margin, unsigned int image_extent,
 
     for (int n = 0; n < result.num_tuples(); ++n) {
         std::string param = result.get_value(n, 1);
-        auto const geom = ewkb_to_geom(decode_hex(result.get(n, 0)));
+        auto const geom = ewkb_to_geom(util::decode_hex(result.get(n, 0)));
 
         auto const [it, success] = canvas_list->try_emplace(
             std::move(param), image_extent, image_buffer);
diff --git a/src/hex.cpp b/src/hex.cpp
index c3bf6d68f..aec5bca2b 100644
--- a/src/hex.cpp
+++ b/src/hex.cpp
@@ -9,7 +9,9 @@
 
 #include "hex.hpp"
 
+#include <array>
 #include <cassert>
+#include <stdexcept>
 
 namespace util {
 
@@ -34,4 +36,43 @@ std::string encode_hex(std::string const &in)
     return result;
 }
 
+namespace {
+
+constexpr std::array<char, 256> const HEX_TABLE = {
+    0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
+    0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
+    0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
+    0, 1, 2, 3,   4, 5, 6, 7,   8, 9, 0, 0,   0, 0, 0, 0,
+
+    0, 10, 11, 12,   13, 14, 15, 0,   0, 0, 0, 0,   0, 0, 0, 0,
+    0,  0,  0,  0,    0,  0,  0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
+    0, 10, 11, 12,   13, 14, 15, 0,   0, 0, 0, 0,   0, 0, 0, 0,
+};
+
+} // anonymous namespace
+
+unsigned char decode_hex_char(char c) noexcept
+{
+    // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-constant-array-index)
+    return HEX_TABLE[static_cast<std::size_t>(static_cast<unsigned char>(c))];
+}
+
+std::string decode_hex(std::string_view hex_string)
+{
+    if (hex_string.size() % 2 != 0) {
+        throw std::runtime_error{"Invalid wkb: Not a valid hex string"};
+    }
+
+    std::string wkb;
+    wkb.reserve(hex_string.size() / 2);
+
+    // NOLINTNEXTLINE(llvm-qualified-auto, readability-qualified-auto)
+    for (auto hex = hex_string.begin(); hex != hex_string.end();) {
+        unsigned int const c = decode_hex_char(*hex++);
+        wkb += static_cast<char>((c << 4U) | decode_hex_char(*hex++));
+    }
+
+    return wkb;
+}
+
 } // namespace util
diff --git a/src/hex.hpp b/src/hex.hpp
index 93925f39f..a085e32fe 100644
--- a/src/hex.hpp
+++ b/src/hex.hpp
@@ -28,7 +28,19 @@ void encode_hex(std::string const &in, std::string *out);
  * \param in The input data.
  * \returns Hex encoded string.
  */
-std::string encode_hex(std::string const &in);
+[[nodiscard]] std::string encode_hex(std::string const &in);
+
+/**
+ * Decode one hex character (0-9A-F or 0-9a-f) and return its value.
+ * Returns 0 for characters that are not hex characters.
+ */
+[[nodiscard]] unsigned char decode_hex_char(char c) noexcept;
+
+/**
+ * Decode a string of hex characters. Throws an exception if the input is not
+ * a valid hex encoding.
+ */
+[[nodiscard]] std::string decode_hex(std::string_view hex);
 
 } // namespace util
 
diff --git a/src/locator.cpp b/src/locator.cpp
index 7b983751d..844eae364 100644
--- a/src/locator.cpp
+++ b/src/locator.cpp
@@ -12,6 +12,7 @@
 #include "geom-boost-adaptor.hpp"
 #include "geom-box.hpp"
 #include "geom-functions.hpp"
+#include "hex.hpp"
 #include "overloaded.hpp"
 #include "pgsql-capabilities.hpp"
 #include "pgsql.hpp"
@@ -60,7 +61,7 @@ void locator_t::add_regions(pg_conn_t const &db_connection,
 
     for (int n = 0; n < result.num_tuples(); ++n) {
         std::string const name = result.get_value(n, 0);
-        auto geometry = ewkb_to_geom(decode_hex(result.get(n, 1)));
+        auto geometry = ewkb_to_geom(util::decode_hex(result.get(n, 1)));
 
         if (geometry.srid() == 4326) {
             add_region(name, geometry);
diff --git a/src/wkb.cpp b/src/wkb.cpp
index facae2ad4..07efec0fd 100644
--- a/src/wkb.cpp
+++ b/src/wkb.cpp
@@ -575,42 +575,3 @@ geom::geometry_t ewkb_to_geom(std::string_view wkb)
 
     return geom;
 }
-
-namespace {
-
-constexpr std::array<char, 256> const HEX_TABLE = {
-    0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
-    0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
-    0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
-    0, 1, 2, 3,   4, 5, 6, 7,   8, 9, 0, 0,   0, 0, 0, 0,
-
-    0, 10, 11, 12,   13, 14, 15, 0,   0, 0, 0, 0,   0, 0, 0, 0,
-    0,  0,  0,  0,    0,  0,  0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
-    0, 10, 11, 12,   13, 14, 15, 0,   0, 0, 0, 0,   0, 0, 0, 0,
-};
-
-} // anonymous namespace
-
-unsigned char decode_hex_char(char c) noexcept
-{
-    // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-constant-array-index)
-    return HEX_TABLE[static_cast<std::size_t>(static_cast<unsigned char>(c))];
-}
-
-std::string decode_hex(std::string_view hex_string)
-{
-    if (hex_string.size() % 2 != 0) {
-        throw std::runtime_error{"Invalid wkb: Not a valid hex string"};
-    }
-
-    std::string wkb;
-    wkb.reserve(hex_string.size() / 2);
-
-    // NOLINTNEXTLINE(llvm-qualified-auto, readability-qualified-auto)
-    for (auto hex = hex_string.begin(); hex != hex_string.end();) {
-        unsigned int const c = decode_hex_char(*hex++);
-        wkb += static_cast<char>((c << 4U) | decode_hex_char(*hex++));
-    }
-
-    return wkb;
-}
diff --git a/src/wkb.hpp b/src/wkb.hpp
index cb38177e6..b43d4ed63 100644
--- a/src/wkb.hpp
+++ b/src/wkb.hpp
@@ -40,16 +40,4 @@
  */
 [[nodiscard]] geom::geometry_t ewkb_to_geom(std::string_view wkb);
 
-/**
- * Decode one hex character (0-9A-F or 0-9a-f) and return its value.
- * Returns 0 for characters that are not hex characters.
- */
-[[nodiscard]] unsigned char decode_hex_char(char c) noexcept;
-
-/**
- * Decode a string of hex characters. Throws an exception if the input is not
- * a valid hex encoding.
- */
-[[nodiscard]] std::string decode_hex(std::string_view hex);
-
 #endif // OSM2PGSQL_WKB_HPP
diff --git a/tests/test-hex.cpp b/tests/test-hex.cpp
index e4df18218..4b6df6a2a 100644
--- a/tests/test-hex.cpp
+++ b/tests/test-hex.cpp
@@ -35,3 +35,52 @@ TEST_CASE("hex encoding an empty string doesn't change output string", "[NoDB]")
     util::encode_hex("", &result);
     REQUIRE(result == "foo");
 }
+
+TEST_CASE("wkb hex decode of valid and invalid hex characters")
+{
+    REQUIRE(util::decode_hex_char('0') == 0);
+    REQUIRE(util::decode_hex_char('9') == 9);
+    REQUIRE(util::decode_hex_char('a') == 0x0a);
+    REQUIRE(util::decode_hex_char('f') == 0x0f);
+    REQUIRE(util::decode_hex_char('A') == 0x0a);
+    REQUIRE(util::decode_hex_char('F') == 0x0f);
+    REQUIRE(util::decode_hex_char('#') == 0);
+    REQUIRE(util::decode_hex_char('@') == 0);
+    REQUIRE(util::decode_hex_char('g') == 0);
+    REQUIRE(util::decode_hex_char('G') == 0);
+    REQUIRE(util::decode_hex_char(0x7f) == 0);
+}
+
+TEST_CASE("wkb hex decode of valid hex string")
+{
+    std::string const hex{"0001020F1099FF"};
+    std::string const data = {0x00,
+                              0x01,
+                              0x02,
+                              0x0f,
+                              0x10,
+                              static_cast<char>(0x99),
+                              static_cast<char>(0xff)};
+
+    auto const result = util::decode_hex(hex);
+    REQUIRE(result.size() == hex.size() / 2);
+    REQUIRE(result == data);
+}
+
+TEST_CASE("wkb hex decode of empty string is okay")
+{
+    std::string const hex{};
+    REQUIRE(util::decode_hex(hex).empty());
+}
+
+TEST_CASE("wkb hex decode of string with odd number of characters fails")
+{
+    REQUIRE_THROWS(util::decode_hex("a"));
+    REQUIRE_THROWS(util::decode_hex("abc"));
+    REQUIRE_THROWS(util::decode_hex("00000"));
+}
+
+TEST_CASE("hex encode and decode") {
+    std::string const str{"something somewhere"};
+    REQUIRE(util::decode_hex(util::encode_hex(str)) == str);
+}
diff --git a/tests/test-wkb.cpp b/tests/test-wkb.cpp
index 6e28e8bd0..1f1c796d4 100644
--- a/tests/test-wkb.cpp
+++ b/tests/test-wkb.cpp
@@ -189,46 +189,3 @@ TEST_CASE("wkb: geometrycollection", "[NoDB]")
 
 TEST_CASE("wkb: invalid", "[NoDB]") { REQUIRE_THROWS(ewkb_to_geom("INVALID")); }
 
-TEST_CASE("wkb hex decode of valid and invalid hex characters")
-{
-    REQUIRE(decode_hex_char('0') == 0);
-    REQUIRE(decode_hex_char('9') == 9);
-    REQUIRE(decode_hex_char('a') == 0x0a);
-    REQUIRE(decode_hex_char('f') == 0x0f);
-    REQUIRE(decode_hex_char('A') == 0x0a);
-    REQUIRE(decode_hex_char('F') == 0x0f);
-    REQUIRE(decode_hex_char('#') == 0);
-    REQUIRE(decode_hex_char('@') == 0);
-    REQUIRE(decode_hex_char('g') == 0);
-    REQUIRE(decode_hex_char('G') == 0);
-    REQUIRE(decode_hex_char(0x7f) == 0);
-}
-
-TEST_CASE("wkb hex decode of valid hex string")
-{
-    std::string const hex{"0001020F1099FF"};
-    std::string const data = {0x00,
-                              0x01,
-                              0x02,
-                              0x0f,
-                              0x10,
-                              static_cast<char>(0x99),
-                              static_cast<char>(0xff)};
-
-    auto const result = decode_hex(hex);
-    REQUIRE(result.size() == hex.size() / 2);
-    REQUIRE(result == data);
-}
-
-TEST_CASE("wkb hex decode of empty string is okay")
-{
-    std::string const hex{};
-    REQUIRE(decode_hex(hex).empty());
-}
-
-TEST_CASE("wkb hex decode of string with odd number of characters fails")
-{
-    REQUIRE_THROWS(decode_hex("a"));
-    REQUIRE_THROWS(decode_hex("abc"));
-    REQUIRE_THROWS(decode_hex("00000"));
-}

From 64c2ca9deca69092c461e367d9e658ebcc1bbd0a Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 5 Jun 2025 23:34:13 +0200
Subject: [PATCH 299/430] add callbacks for deletion to flex

---
 src/osmdata.cpp                 |  6 ++---
 src/output-flex.cpp             | 40 +++++++++++++++++++++++++++++++++
 src/output-flex.hpp             | 14 +++++++++---
 src/output-null.hpp             |  6 ++---
 src/output-pgsql.cpp            | 28 +++++++++++------------
 src/output-pgsql.hpp            |  6 ++---
 src/output.hpp                  |  6 ++---
 tests/test-osm-file-parsing.cpp |  6 ++---
 8 files changed, 80 insertions(+), 32 deletions(-)

diff --git a/src/osmdata.cpp b/src/osmdata.cpp
index 84dde3b5f..1bfb556a2 100644
--- a/src/osmdata.cpp
+++ b/src/osmdata.cpp
@@ -54,7 +54,7 @@ void osmdata_t::node(osmium::Node const &node)
     m_mid->node(node);
 
     if (node.deleted()) {
-        m_output->node_delete(node.id());
+        m_output->node_delete(node);
         return;
     }
 
@@ -94,7 +94,7 @@ void osmdata_t::way(osmium::Way &way)
     m_mid->way(way);
 
     if (way.deleted()) {
-        m_output->way_delete(way.id());
+        m_output->way_delete(&way);
         return;
     }
 
@@ -161,7 +161,7 @@ void osmdata_t::relation(osmium::Relation const &rel)
     m_mid->relation(rel);
 
     if (rel.deleted()) {
-        m_output->relation_delete(rel.id());
+        m_output->relation_delete(rel);
         return;
     }
 
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index bd12a6248..32db8b47d 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -1084,6 +1084,37 @@ void output_flex_t::delete_from_tables(osmium::item_type type, osmid_t osm_id)
     }
 }
 
+void output_flex_t::node_delete(osmium::Node const &node)
+{
+    if (m_delete_node) {
+        m_context_node = &node;
+        get_mutex_and_call_lua_function(m_delete_node, node);
+        m_context_node = nullptr;
+    }
+
+    node_delete(node.id());
+}
+
+void output_flex_t::way_delete(osmium::Way *way)
+{
+    if (m_delete_way) {
+        m_way_cache.init(way);
+        get_mutex_and_call_lua_function(m_delete_way, m_way_cache.get());
+    }
+
+    way_delete(way->id());
+}
+
+void output_flex_t::relation_delete(osmium::Relation const &rel)
+{
+    if (m_delete_relation) {
+        m_relation_cache.init(rel);
+        get_mutex_and_call_lua_function(m_delete_relation, rel);
+    }
+
+    relation_delete(rel.id());
+}
+
 /* Delete is easy, just remove all traces of this object. We don't need to
  * worry about finding objects that depend on it, since the same diff must
  * contain the change for that also. */
@@ -1146,6 +1177,8 @@ output_flex_t::output_flex_t(output_flex_t const *other,
   m_process_untagged_node(other->m_process_untagged_node),
   m_process_untagged_way(other->m_process_untagged_way),
   m_process_untagged_relation(other->m_process_untagged_relation),
+  m_delete_node(other->m_delete_node), m_delete_way(other->m_delete_way),
+  m_delete_relation(other->m_delete_relation),
   m_select_relation_members(other->m_select_relation_members),
   m_after_nodes(other->m_after_nodes), m_after_ways(other->m_after_ways),
   m_after_relations(other->m_after_relations)
@@ -1330,6 +1363,13 @@ void output_flex_t::init_lua(std::string const &filename,
         prepared_lua_function_t{lua_state(), calling_context::process_relation,
                                 "process_untagged_relation"};
 
+    m_delete_node = prepared_lua_function_t{
+        lua_state(), calling_context::process_node, "delete_node"};
+    m_delete_way = prepared_lua_function_t{
+        lua_state(), calling_context::process_way, "delete_way"};
+    m_delete_relation = prepared_lua_function_t{
+        lua_state(), calling_context::process_relation, "delete_relation"};
+
     m_select_relation_members = prepared_lua_function_t{
         lua_state(), calling_context::select_relation_members,
         "select_relation_members", 1};
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index 23dceab08..c819c4b6d 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -147,9 +147,9 @@ class output_flex_t : public output_t
     void way_modify(osmium::Way *way) override;
     void relation_modify(osmium::Relation const &rel) override;
 
-    void node_delete(osmid_t id) override;
-    void way_delete(osmid_t id) override;
-    void relation_delete(osmid_t id) override;
+    void node_delete(osmium::Node const &node) override;
+    void way_delete(osmium::Way *way) override;
+    void relation_delete(osmium::Relation const &rel) override;
 
     void merge_expire_trees(output_t *other) override;
 
@@ -204,6 +204,10 @@ class output_flex_t : public output_t
     osmium::OSMObject const &
     check_and_get_context_object(flex_table_t const &table);
 
+    void node_delete(osmid_t id);
+    void way_delete(osmid_t id);
+    void relation_delete(osmid_t id);
+
     void delete_from_table(table_connection_t *table_connection,
                            pg_conn_t const &db_connection,
                            osmium::item_type type, osmid_t osm_id);
@@ -304,6 +308,10 @@ class output_flex_t : public output_t
     prepared_lua_function_t m_process_untagged_way;
     prepared_lua_function_t m_process_untagged_relation;
 
+    prepared_lua_function_t m_delete_node;
+    prepared_lua_function_t m_delete_way;
+    prepared_lua_function_t m_delete_relation;
+
     prepared_lua_function_t m_select_relation_members;
 
     prepared_lua_function_t m_after_nodes;
diff --git a/src/output-null.hpp b/src/output-null.hpp
index 75b93425c..a7ad82b50 100644
--- a/src/output-null.hpp
+++ b/src/output-null.hpp
@@ -50,9 +50,9 @@ class output_null_t : public output_t
     void way_modify(osmium::Way * /*way*/) override {}
     void relation_modify(osmium::Relation const & /*rel*/) override {}
 
-    void node_delete(osmid_t /*id*/) override {}
-    void way_delete(osmid_t /*id*/) override {}
-    void relation_delete(osmid_t /*id*/) override {}
+    void node_delete(osmium::Node const & /*node*/) override {}
+    void way_delete(osmium::Way * /*way*/) override {}
+    void relation_delete(osmium::Relation const & /*rel*/) override {}
 };
 
 #endif // OSM2PGSQL_OUTPUT_NULL_HPP
diff --git a/src/output-pgsql.cpp b/src/output-pgsql.cpp
index e1dabef66..51b078d8d 100644
--- a/src/output-pgsql.cpp
+++ b/src/output-pgsql.cpp
@@ -349,15 +349,15 @@ void output_pgsql_t::relation_add(osmium::Relation const &rel)
 /* Delete is easy, just remove all traces of this object. We don't need to
  * worry about finding objects that depend on it, since the same diff must
  * contain the change for that also. */
-void output_pgsql_t::node_delete(osmid_t osm_id)
+void output_pgsql_t::node_delete(osmium::Node const &node)
 {
     if (m_expire.enabled()) {
-        auto const results = m_tables[t_point]->get_wkb(osm_id);
+        auto const results = m_tables[t_point]->get_wkb(node.id());
         if (expire_from_result(&m_expire, results, m_expire_config) != 0) {
-            m_tables[t_point]->delete_row(osm_id);
+            m_tables[t_point]->delete_row(node.id());
         }
     } else {
-        m_tables[t_point]->delete_row(osm_id);
+        m_tables[t_point]->delete_row(node.id());
     }
 }
 
@@ -392,9 +392,9 @@ void output_pgsql_t::pgsql_delete_way_from_output(osmid_t osm_id)
     delete_from_output_and_expire(osm_id);
 }
 
-void output_pgsql_t::way_delete(osmid_t osm_id)
+void output_pgsql_t::way_delete(osmium::Way *way)
 {
-    pgsql_delete_way_from_output(osm_id);
+    pgsql_delete_way_from_output(way->id());
 }
 
 /* Relations are identified by using negative IDs */
@@ -403,9 +403,9 @@ void output_pgsql_t::pgsql_delete_relation_from_output(osmid_t osm_id)
     delete_from_output_and_expire(-osm_id);
 }
 
-void output_pgsql_t::relation_delete(osmid_t osm_id)
+void output_pgsql_t::relation_delete(osmium::Relation const &rel)
 {
-    pgsql_delete_relation_from_output(osm_id);
+    pgsql_delete_relation_from_output(rel.id());
 }
 
 /* Modify is slightly trickier. The basic idea is we simply delete the
@@ -413,19 +413,19 @@ void output_pgsql_t::relation_delete(osmid_t osm_id)
  * objects that depend on this one */
 void output_pgsql_t::node_modify(osmium::Node const &node)
 {
-    node_delete(node.id());
+    node_delete(node);
     node_add(node);
 }
 
 void output_pgsql_t::way_modify(osmium::Way *way)
 {
-    way_delete(way->id());
+    way_delete(way);
     way_add(way);
 }
 
 void output_pgsql_t::relation_modify(osmium::Relation const &rel)
 {
-    relation_delete(rel.id());
+    relation_delete(rel);
     relation_add(rel);
 }
 
@@ -448,7 +448,9 @@ std::shared_ptr<output_t> output_pgsql_t::clone(
 output_pgsql_t::output_pgsql_t(std::shared_ptr<middle_query_t> const &mid,
                                std::shared_ptr<thread_pool_t> thread_pool,
                                options_t const &options)
-: output_t(mid, std::move(thread_pool), options), m_proj(options.projection),
+: output_t(mid, std::move(thread_pool), options),
+  m_ignore_untagged_objects(!options.extra_attributes),
+  m_proj(options.projection),
   m_expire(options.expire_tiles_zoom, options.projection),
   m_buffer(32768, osmium::memory::Buffer::auto_grow::yes),
   m_rels_buffer(1024, osmium::memory::Buffer::auto_grow::yes),
@@ -470,8 +472,6 @@ output_pgsql_t::output_pgsql_t(std::shared_ptr<middle_query_t> const &mid,
 
     m_enable_way_area = read_style_file(options.style, &exlist);
 
-    m_ignore_untagged_objects = !options.extra_attributes;
-
     m_tagtransform = tagtransform_t::make_tagtransform(&options, exlist);
 
     auto copy_thread =
diff --git a/src/output-pgsql.hpp b/src/output-pgsql.hpp
index cdfa6cdc2..82aab120e 100644
--- a/src/output-pgsql.hpp
+++ b/src/output-pgsql.hpp
@@ -76,9 +76,9 @@ class output_pgsql_t : public output_t
     void way_modify(osmium::Way *way) override;
     void relation_modify(osmium::Relation const &rel) override;
 
-    void node_delete(osmid_t id) override;
-    void way_delete(osmid_t id) override;
-    void relation_delete(osmid_t id) override;
+    void node_delete(osmium::Node const &node) override;
+    void way_delete(osmium::Way *way) override;
+    void relation_delete(osmium::Relation const &rel) override;
 
     void merge_expire_trees(output_t *other) override;
 
diff --git a/src/output.hpp b/src/output.hpp
index e6b75b402..3993a7585 100644
--- a/src/output.hpp
+++ b/src/output.hpp
@@ -98,9 +98,9 @@ class output_t
     virtual void way_modify(osmium::Way *way) = 0;
     virtual void relation_modify(osmium::Relation const &rel) = 0;
 
-    virtual void node_delete(osmid_t id) = 0;
-    virtual void way_delete(osmid_t id) = 0;
-    virtual void relation_delete(osmid_t id) = 0;
+    virtual void node_delete(osmium::Node const &node) = 0;
+    virtual void way_delete(osmium::Way *way) = 0;
+    virtual void relation_delete(osmium::Relation const &rel) = 0;
 
     virtual void merge_expire_trees(output_t * /*other*/) {}
 
diff --git a/tests/test-osm-file-parsing.cpp b/tests/test-osm-file-parsing.cpp
index 834275481..712e95986 100644
--- a/tests/test-osm-file-parsing.cpp
+++ b/tests/test-osm-file-parsing.cpp
@@ -130,11 +130,11 @@ struct counting_output_t : public output_null_t
         ++relation.modified;
     }
 
-    void node_delete(osmid_t) override { ++node.deleted; }
+    void node_delete(osmium::Node const &) override { ++node.deleted; }
 
-    void way_delete(osmid_t) override { ++way.deleted; }
+    void way_delete(osmium::Way *) override { ++way.deleted; }
 
-    void relation_delete(osmid_t) override { ++relation.deleted; }
+    void relation_delete(osmium::Relation const &) override { ++relation.deleted; }
 
     type_stats_t node, way, relation;
     uint64_t sum_ids = 0;

From 70ed61dc1644c43ffcea5b2624634aeda486498b Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 9 Jun 2025 22:46:55 +0200
Subject: [PATCH 300/430] disable tags, nodes, members and geometries for
 deleted objecs

---
 src/output-flex.cpp | 68 +++++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 32db8b47d..1428f102f 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -158,39 +158,41 @@ void push_osm_object_to_lua_stack(lua_State *lua_state,
         luaX_add_table_str(lua_state, "user", object.user());
     }
 
-    if (object.type() == osmium::item_type::way) {
-        auto const &way = static_cast<osmium::Way const &>(object);
-        luaX_add_table_bool(lua_state, "is_closed",
-                            !way.nodes().empty() && way.is_closed());
-        luaX_add_table_array(lua_state, "nodes", way.nodes(),
-                             [&](osmium::NodeRef const &wn) {
-                                 lua_pushinteger(lua_state, wn.ref());
-                             });
-    } else if (object.type() == osmium::item_type::relation) {
-        auto const &relation = static_cast<osmium::Relation const &>(object);
-        luaX_add_table_array(
-            lua_state, "members", relation.members(),
-            [&](osmium::RelationMember const &member) {
-                lua_createtable(lua_state, 0, 3);
-                std::array<char, 2> tmp{"x"};
-                tmp[0] = osmium::item_type_to_char(member.type());
-                luaX_add_table_str(lua_state, "type", tmp.data());
-                luaX_add_table_int(lua_state, "ref", member.ref());
-                luaX_add_table_str(lua_state, "role", member.role());
-            });
-    }
-
-    lua_pushliteral(lua_state, "tags");
-    lua_createtable(lua_state, 0, (int)object.tags().size());
-    for (auto const &tag : object.tags()) {
-        luaX_add_table_str(lua_state, tag.key(), tag.value());
-    }
-    lua_rawset(lua_state, -3);
-
-    // Set the metatable of this object
-    lua_pushstring(lua_state, OSM2PGSQL_OSMOBJECT_CLASS);
-    lua_gettable(lua_state, LUA_REGISTRYINDEX);
-    lua_setmetatable(lua_state, -2);
+    if (!object.deleted()) {
+        if (object.type() == osmium::item_type::way) {
+            auto const &way = static_cast<osmium::Way const &>(object);
+            luaX_add_table_bool(lua_state, "is_closed",
+                                !way.nodes().empty() && way.is_closed());
+            luaX_add_table_array(lua_state, "nodes", way.nodes(),
+                                 [&](osmium::NodeRef const &wn) {
+                                     lua_pushinteger(lua_state, wn.ref());
+                                 });
+        } else if (object.type() == osmium::item_type::relation) {
+            auto const &relation = static_cast<osmium::Relation const &>(object);
+            luaX_add_table_array(
+                lua_state, "members", relation.members(),
+                [&](osmium::RelationMember const &member) {
+                    lua_createtable(lua_state, 0, 3);
+                    std::array<char, 2> tmp{"x"};
+                    tmp[0] = osmium::item_type_to_char(member.type());
+                    luaX_add_table_str(lua_state, "type", tmp.data());
+                    luaX_add_table_int(lua_state, "ref", member.ref());
+                    luaX_add_table_str(lua_state, "role", member.role());
+                });
+        }
+
+        lua_pushliteral(lua_state, "tags");
+        lua_createtable(lua_state, 0, (int)object.tags().size());
+        for (auto const &tag : object.tags()) {
+            luaX_add_table_str(lua_state, tag.key(), tag.value());
+        }
+        lua_rawset(lua_state, -3);
+
+        // Set the metatable of this object
+        lua_pushstring(lua_state, OSM2PGSQL_OSMOBJECT_CLASS);
+        lua_gettable(lua_state, LUA_REGISTRYINDEX);
+        lua_setmetatable(lua_state, -2);
+    }
 }
 
 /**

From 96b6bd7ba7bc05ee924ec782a00ff092865d5052 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 9 Jun 2025 22:47:26 +0200
Subject: [PATCH 301/430] add tests for delete callback

---
 tests/bdd/flex/delete-callbacks.feature | 112 ++++++++++++++++++++++++
 1 file changed, 112 insertions(+)
 create mode 100644 tests/bdd/flex/delete-callbacks.feature

diff --git a/tests/bdd/flex/delete-callbacks.feature b/tests/bdd/flex/delete-callbacks.feature
new file mode 100644
index 000000000..75d6207ea
--- /dev/null
+++ b/tests/bdd/flex/delete-callbacks.feature
@@ -0,0 +1,112 @@
+Feature: Test for delete callbacks
+
+    Background:
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            local change = osm2pgsql.define_table{
+                name = 'change',
+                ids = {type = 'any', id_column = 'osm_id', type_column = 'osm_type'},
+                columns = {
+                    { column = 'extra', type = 'int' }
+                }}
+
+            local function process_delete(object)
+                change:insert{extra = object.version}
+            end
+
+            osm2pgsql.delete_node = process_delete
+            osm2pgsql.delete_way = process_delete
+            osm2pgsql.delete_relation = process_delete
+            """
+        When running osm2pgsql flex with parameters
+            | --slim |
+
+        Then table change contains exactly
+            | osm_type | osm_id |
+
+        Given the input file '008-ch.osc.gz'
+
+    Scenario: Delete callbacks are called
+        When running osm2pgsql flex with parameters
+            | --slim | -a |
+
+        Then SELECT osm_type, count(*), sum(extra) FROM change GROUP BY osm_type
+            | osm_type | count | sum |
+            | N        | 16773 | 16779 |
+            | W        | 4     | 9 |
+            | R        | 1     | 3 |
+
+        When running osm2pgsql flex with parameters
+            | --slim | -a |
+
+        Then SELECT osm_type, count(*), sum(osm_id) FROM change GROUP BY osm_type
+            | osm_type | count | sum |
+            | N        | 16773 | 37856781001834 |
+            | W        | 4     | 350933407 |
+            | R        | 1     | 2871571 |
+
+    Scenario: No object payload is available
+        Given the lua style
+            """
+            local change = osm2pgsql.define_table{
+                name = 'change',
+                ids = {type = 'any', id_column = 'osm_id', type_column = 'osm_type'},
+                columns = {
+                    { column = 'extra', type = 'int' }
+                }}
+
+            function osm2pgsql.delete_node(object)
+                change:insert{extra = object.tags == nil and 1 or 0}
+            end
+
+            function osm2pgsql.delete_way(object)
+                change:insert{extra = object.nodes == nil and 1 or 0}
+            end
+
+            function osm2pgsql.delete_relation(object)
+                change:insert{extra = object.members == nil and 1 or 0}
+            end
+
+
+            """
+        When running osm2pgsql flex with parameters
+            | --slim | -a |
+        Then SELECT osm_type, count(*), sum(extra) FROM change GROUP BY osm_type
+            | osm_type | count | sum |
+            | N        | 16773 | 16773 |
+            | W        | 4     | 4 |
+            | R        | 1     | 1 |
+
+
+    Scenario: Geometries are not valid for deleted objects
+        Given the lua style
+            """
+            change = osm2pgsql.define_table{
+                name = 'change',
+                ids = {type = 'any', id_column = 'osm_id', type_column = 'osm_type'},
+                columns = {
+                    { column = 'extra', sql_type = 'int' }
+                }}
+
+            function osm2pgsql.delete_node(object)
+                change:insert{extra = object.as_point == nil and 1 or 0}
+            end
+
+            function osm2pgsql.delete_way(object)
+                change:insert{extra = object.as_linestring == nil and 1 or 0}
+            end
+
+            function osm2pgsql.delete_relation(object)
+                change:insert{extra = object.as_geometrycollection == nil and 1 or 0}
+            end
+
+
+            """
+        When running osm2pgsql flex with parameters
+            | --slim | -a |
+        Then SELECT osm_type, count(*), sum(extra) FROM change GROUP BY osm_type
+            | osm_type | count | sum |
+            | N        | 16773 | 16773|
+            | W        | 4     | 4|
+            | R        | 1     | 1|

From 47ee919c5f92b9a4d1d455fa6bb4546c9f85848a Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 25 Jun 2025 21:21:04 +0200
Subject: [PATCH 302/430] adapt documentation for contexts

---
 src/output-flex.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index c819c4b6d..1f8a4a87f 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -43,9 +43,9 @@ struct options_t;
 enum class calling_context : std::uint8_t
 {
     main = 0, ///< In main context, i.e. the Lua script outside any callbacks
-    process_node = 1, ///< In the process_node() callback
-    process_way = 2, ///< In the process_way() callback
-    process_relation = 3, ///< In the process_relation() callback
+    process_node = 1, ///< Inside a callback where a node is handled
+    process_way = 2, ///< Inside a callback where a way is handled
+    process_relation = 3, ///< Inside a callback where a relation is handled
     select_relation_members = 4 ///< In the select_relation_members() callback
 };
 

From ee34d25eae28e92cb3e49c2e4a0e9f4215d316c8 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 25 Jun 2025 22:18:35 +0200
Subject: [PATCH 303/430] Refactor: Use std::string not std::string_view in
 copy_start()

Because std::string guarantees that there is a \0 at the end which we
need for the C interface of the PostgreSQL library.

Gets rid of clang-tidy warnings.
---
 src/db-copy.cpp | 2 +-
 src/pgsql.cpp   | 4 ++--
 src/pgsql.hpp   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/db-copy.cpp b/src/db-copy.cpp
index f0fd0e33a..be2eee2e0 100644
--- a/src/db-copy.cpp
+++ b/src/db-copy.cpp
@@ -221,7 +221,7 @@ void db_copy_thread_t::thread_t::start_copy(
     }
 
     sql.push_back('\0');
-    m_db_connection.copy_start(sql.data());
+    m_db_connection.copy_start(to_string(sql));
 
     m_inflight = target;
 }
diff --git a/src/pgsql.cpp b/src/pgsql.cpp
index 905bf51e7..9d01a88fc 100644
--- a/src/pgsql.cpp
+++ b/src/pgsql.cpp
@@ -136,12 +136,12 @@ pg_result_t pg_conn_t::exec(std::string const &sql) const
     return exec(sql.c_str());
 }
 
-void pg_conn_t::copy_start(std::string_view sql) const
+void pg_conn_t::copy_start(std::string const &sql) const
 {
     assert(m_conn);
 
     log_sql("(C{}) {}", m_connection_id, sql);
-    pg_result_t const res{PQexec(m_conn.get(), sql.data())};
+    pg_result_t const res{PQexec(m_conn.get(), sql.c_str())};
     if (res.status() != PGRES_COPY_IN) {
         throw fmt_error("Database error on COPY: {}", error_msg());
     }
diff --git a/src/pgsql.hpp b/src/pgsql.hpp
index 8b1a93322..d8a43c67a 100644
--- a/src/pgsql.hpp
+++ b/src/pgsql.hpp
@@ -241,7 +241,7 @@ class pg_conn_t
      */
     void set_config(char const *setting, char const *value) const;
 
-    void copy_start(std::string_view sql) const;
+    void copy_start(std::string const &sql) const;
     void copy_send(std::string_view data, std::string_view context) const;
     void copy_end(std::string_view context) const;
 

From ce0524d9cbfd294c5fbe64e53df59e25d445d748 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 25 Jun 2025 22:18:35 +0200
Subject: [PATCH 304/430] Refactor: Use std::string not std::string_view in
 prepare()

Because std::string guarantees that there is a \0 at the end which we
need for the C interface of the PostgreSQL library.

Gets rid of clang-tidy warnings.
---
 src/gen/gen-base.cpp | 4 ++--
 src/gen/gen-base.hpp | 4 ++--
 src/middle-pgsql.cpp | 2 +-
 src/middle-pgsql.hpp | 2 +-
 src/pgsql.cpp        | 6 +++---
 src/pgsql.hpp        | 5 +++--
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/gen/gen-base.cpp b/src/gen/gen-base.cpp
index cdf553041..7a7123bb6 100644
--- a/src/gen/gen-base.cpp
+++ b/src/gen/gen-base.cpp
@@ -99,14 +99,14 @@ pg_result_t gen_base_t::dbexec(params_t const &tmp_params,
     return connection().exec(sql_template.render());
 }
 
-void gen_base_t::dbprepare(std::string_view stmt, std::string const &templ)
+void gen_base_t::dbprepare(std::string const &stmt, std::string const &templ)
 {
     template_t sql_template{templ};
     sql_template.set_params(get_params());
     connection().prepare(stmt, fmt::runtime(sql_template.render()));
 }
 
-void gen_base_t::dbprepare(std::string_view stmt, params_t const &tmp_params,
+void gen_base_t::dbprepare(std::string const &stmt, params_t const &tmp_params,
                            std::string const &templ)
 {
     template_t sql_template{templ};
diff --git a/src/gen/gen-base.hpp b/src/gen/gen-base.hpp
index 875cbbac6..26588ba97 100644
--- a/src/gen/gen-base.hpp
+++ b/src/gen/gen-base.hpp
@@ -101,9 +101,9 @@ class gen_base_t
 
     pg_result_t dbexec(params_t const &tmp_params, std::string const &templ);
 
-    void dbprepare(std::string_view stmt, std::string const &templ);
+    void dbprepare(std::string const &stmt, std::string const &templ);
 
-    void dbprepare(std::string_view stmt, params_t const &tmp_params,
+    void dbprepare(std::string const &stmt, params_t const &tmp_params,
                    std::string const &templ);
 
     void raster_table_preprocess(std::string const &table);
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index 8aa2194ea..a52aad1a4 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -93,7 +93,7 @@ void middle_pgsql_t::dbexec(std::string_view templ) const
     m_db_connection.exec(render_template(templ));
 }
 
-void middle_query_pgsql_t::prepare(std::string_view stmt,
+void middle_query_pgsql_t::prepare(std::string const &stmt,
                                    std::string const &sql_cmd) const
 {
     m_db_connection.prepare(stmt, fmt::runtime(sql_cmd));
diff --git a/src/middle-pgsql.hpp b/src/middle-pgsql.hpp
index 54164c39c..2ef73c887 100644
--- a/src/middle-pgsql.hpp
+++ b/src/middle-pgsql.hpp
@@ -71,7 +71,7 @@ class middle_query_pgsql_t : public middle_query_t
     bool relation_get(osmid_t id,
                       osmium::memory::Buffer *buffer) const override;
 
-    void prepare(std::string_view stmt, std::string const &sql_cmd) const;
+    void prepare(std::string const &stmt, std::string const &sql_cmd) const;
 
 private:
     osmium::Location get_node_location_flatnodes(osmid_t id) const;
diff --git a/src/pgsql.cpp b/src/pgsql.cpp
index 9d01a88fc..8e9b906e3 100644
--- a/src/pgsql.cpp
+++ b/src/pgsql.cpp
@@ -194,15 +194,15 @@ void pg_conn_t::copy_end(std::string_view context) const
     }
 }
 
-void pg_conn_t::prepare_internal(std::string_view stmt,
-                                 std::string_view sql) const
+void pg_conn_t::prepare_internal(std::string const &stmt,
+                                 std::string const &sql) const
 {
     if (get_logger().log_sql()) {
         log_sql("(C{}) PREPARE {} AS {}", m_connection_id, stmt, sql);
     }
 
     pg_result_t const res{
-        PQprepare(m_conn.get(), stmt.data(), sql.data(), 0, nullptr)};
+        PQprepare(m_conn.get(), stmt.c_str(), sql.c_str(), 0, nullptr)};
     if (res.status() != PGRES_COMMAND_OK) {
         throw fmt_error("Prepare failed for '{}': {}.", sql, error_msg());
     }
diff --git a/src/pgsql.hpp b/src/pgsql.hpp
index d8a43c67a..be2d6f9ad 100644
--- a/src/pgsql.hpp
+++ b/src/pgsql.hpp
@@ -195,7 +195,7 @@ class pg_conn_t
      *         status code PGRES_COMMAND_OK).
      */
     template <typename... TArgs>
-    void prepare(std::string_view stmt, fmt::format_string<TArgs...> sql,
+    void prepare(std::string const &stmt, fmt::format_string<TArgs...> sql,
                  TArgs... params) const
     {
         std::string const query =
@@ -252,7 +252,8 @@ class pg_conn_t
     void close();
 
 private:
-    void prepare_internal(std::string_view stmt, std::string_view sql) const;
+    void prepare_internal(std::string const &stmt,
+                          std::string const &sql) const;
 
     pg_result_t exec_prepared_internal(char const *stmt, int num_params,
                                        char const *const *param_values,

From 04e14876f59b4fd80017517b307e91b7b9b410f7 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 25 Jun 2025 22:38:24 +0200
Subject: [PATCH 305/430] Use symbolic names for projections

---
 src/command-line-parser.cpp          |  3 ++-
 src/expire-tiles.cpp                 |  3 ++-
 src/flex-lua-geom.cpp                |  5 +++--
 src/flex-lua-table.cpp               |  3 ++-
 src/flex-table-column.cpp            |  7 ++++---
 src/flex-table-column.hpp            |  5 +++--
 src/flex-table.hpp                   |  3 ++-
 src/gen/gen-rivers.cpp               |  3 ++-
 src/gen/raster.hpp                   |  4 +++-
 src/gen/tracer.cpp                   |  3 ++-
 src/geom-functions.cpp               |  5 +++--
 src/geom.hpp                         | 20 ++++++++++++--------
 src/locator.cpp                      |  3 ++-
 src/output-flex.cpp                  | 14 +++++++++-----
 src/output-pgsql.cpp                 |  3 ++-
 src/projection.hpp                   | 16 ++++++++++++++++
 src/reprojection.hpp                 |  7 +------
 tests/test-expire-from-geometry.cpp  | 21 +++++++++++----------
 tests/test-geom-multilinestrings.cpp |  7 ++++---
 tests/test-geom-transform.cpp        | 17 +++++++++--------
 tests/test-reprojection.cpp          |  7 ++++---
 21 files changed, 98 insertions(+), 61 deletions(-)
 create mode 100644 src/projection.hpp

diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index f5d96f059..568d9f5f5 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -14,6 +14,7 @@
 #include "logging.hpp"
 #include "options.hpp"
 #include "pgsql.hpp"
+#include "projection.hpp"
 #include "reprojection.hpp"
 #include "util.hpp"
 #include "version.hpp"
@@ -244,7 +245,7 @@ void check_options_expire(options_t *options) {
     }
 
     if (options->expire_tiles_zoom != 0 &&
-        options->projection->target_srs() != 3857) {
+        options->projection->target_srs() != PROJ_SPHERE_MERC) {
         log_warn("Expire has been enabled (with -e or --expire-tiles) but "
                  "target SRS is not Mercator (EPSG:3857). Expire disabled!");
         options->expire_tiles_zoom = 0;
diff --git a/src/expire-tiles.cpp b/src/expire-tiles.cpp
index 21eda2df7..d2325f9a1 100644
--- a/src/expire-tiles.cpp
+++ b/src/expire-tiles.cpp
@@ -28,6 +28,7 @@
 #include "format.hpp"
 #include "geom-functions.hpp"
 #include "options.hpp"
+#include "projection.hpp"
 #include "reprojection.hpp"
 #include "table.hpp"
 #include "tile.hpp"
@@ -146,7 +147,7 @@ void expire_tiles::from_geometry(geom::geometry_t const &geom,
 void expire_tiles::from_geometry_if_3857(geom::geometry_t const &geom,
                                          expire_config_t const &expire_config)
 {
-    if (geom.srid() == 3857) {
+    if (geom.srid() == PROJ_SPHERE_MERC) {
         from_geometry(geom, expire_config);
     }
 }
diff --git a/src/flex-lua-geom.cpp b/src/flex-lua-geom.cpp
index ed48b5da3..4fc2880ee 100644
--- a/src/flex-lua-geom.cpp
+++ b/src/flex-lua-geom.cpp
@@ -12,6 +12,7 @@
 #include "geom-functions.hpp"
 #include "geom-pole-of-inaccessibility.hpp"
 #include "lua-utils.hpp"
+#include "projection.hpp"
 
 #include <lua.hpp>
 
@@ -73,7 +74,7 @@ int geom_spherical_area(lua_State *lua_state)
 {
     auto const *const input_geometry = unpack_geometry(lua_state);
 
-    if (input_geometry->srid() != 4326) {
+    if (input_geometry->srid() != PROJ_LATLONG) {
         throw std::runtime_error{"Can only calculate spherical area for "
                                  "geometries in WGS84 (4326) coordinates."};
     }
@@ -282,7 +283,7 @@ int geom_transform(lua_State *lua_state)
     auto const srid = static_cast<int>(luaL_checkinteger(lua_state, 2));
 
     try {
-        if (input_geometry->srid() != 4326) {
+        if (input_geometry->srid() != PROJ_LATLONG) {
             throw std::runtime_error{
                 "Can not transform already transformed geometry."};
         }
diff --git a/src/flex-lua-table.cpp b/src/flex-lua-table.cpp
index 3a41bcc1e..d7239706a 100644
--- a/src/flex-lua-table.cpp
+++ b/src/flex-lua-table.cpp
@@ -16,6 +16,7 @@
 #include "lua-utils.hpp"
 #include "output-flex.hpp"
 #include "pgsql-capabilities.hpp"
+#include "projection.hpp"
 #include "util.hpp"
 
 #include <lua.hpp>
@@ -219,7 +220,7 @@ void parse_and_set_expire_options(lua_State *lua_state,
         return;
     }
 
-    if (!column->is_geometry_column() || column->srid() != 3857) {
+    if (!column->is_geometry_column() || column->srid() != PROJ_SPHERE_MERC) {
         throw std::runtime_error{"Expire only allowed for geometry"
                                  " columns in Web Mercator projection."};
     }
diff --git a/src/flex-table-column.cpp b/src/flex-table-column.cpp
index 3ba3c4b67..57ed471ff 100644
--- a/src/flex-table-column.cpp
+++ b/src/flex-table-column.cpp
@@ -11,6 +11,7 @@
 
 #include "format.hpp"
 #include "pgsql-capabilities.hpp"
+#include "projection.hpp"
 #include "util.hpp"
 
 #include <cassert>
@@ -105,12 +106,12 @@ void flex_table_column_t::set_projection(char const *projection)
     auto const proj = lowercase(projection);
 
     if (proj == "merc" || proj == "mercator") {
-        m_srid = 3857;
+        m_srid = PROJ_SPHERE_MERC;
         return;
     }
 
     if (proj == "latlong" || proj == "latlon" || proj == "wgs84") {
-        m_srid = 4326;
+        m_srid = PROJ_LATLONG;
         return;
     }
 
@@ -197,7 +198,7 @@ std::string flex_table_column_t::sql_create() const
 void flex_table_column_t::add_expire(expire_config_t const &config)
 {
     assert(is_geometry_column());
-    assert(srid() == 3857);
+    assert(srid() == PROJ_SPHERE_MERC);
     m_expires.push_back(config);
 }
 
diff --git a/src/flex-table-column.hpp b/src/flex-table-column.hpp
index 4d445ed71..d19edef5b 100644
--- a/src/flex-table-column.hpp
+++ b/src/flex-table-column.hpp
@@ -13,6 +13,7 @@
 #include "expire-config.hpp"
 #include "expire-tiles.hpp"
 #include "geom.hpp"
+#include "projection.hpp"
 
 #include <cassert>
 #include <cstdint>
@@ -99,7 +100,7 @@ class flex_table_column_t
     bool needs_isvalid() const noexcept
     {
         assert(is_geometry_column());
-        return !m_create_only && m_srid != 4326 &&
+        return !m_create_only && m_srid != PROJ_LATLONG &&
                m_type != table_column_type::point;
     }
 
@@ -158,7 +159,7 @@ class flex_table_column_t
     /**
      * For geometry columns only: The projection SRID. Default is web mercator.
      */
-    int m_srid = 3857;
+    int m_srid = PROJ_SPHERE_MERC;
 
     /// NOT NULL constraint
     bool m_not_null = false;
diff --git a/src/flex-table.hpp b/src/flex-table.hpp
index d5bd5198f..489496bf2 100644
--- a/src/flex-table.hpp
+++ b/src/flex-table.hpp
@@ -14,6 +14,7 @@
 #include "flex-index.hpp"
 #include "flex-table-column.hpp"
 #include "pgsql.hpp"
+#include "projection.hpp"
 #include "reprojection.hpp"
 #include "thread-pool.hpp"
 #include "util.hpp"
@@ -145,7 +146,7 @@ class flex_table_t
 
     int srid() const noexcept
     {
-        return has_geom_column() ? geom_column().srid() : 4326;
+        return has_geom_column() ? geom_column().srid() : PROJ_LATLONG;
     }
 
     std::string build_sql_prepare_get_wkb() const;
diff --git a/src/gen/gen-rivers.cpp b/src/gen/gen-rivers.cpp
index 54aaba8ef..111291738 100644
--- a/src/gen/gen-rivers.cpp
+++ b/src/gen/gen-rivers.cpp
@@ -14,6 +14,7 @@
 #include "logging.hpp"
 #include "params.hpp"
 #include "pgsql.hpp"
+#include "projection.hpp"
 #include "util.hpp"
 #include "wkb.hpp"
 
@@ -341,7 +342,7 @@ SELECT "{id_column}", "{width_column}", "{name_column}", "{geom_column}"
     timer(m_timer_write).start();
     connection().exec("BEGIN");
     for (auto &edge : edges) {
-        geom::geometry_t const geom{std::move(edge.points), 3857};
+        geom::geometry_t const geom{std::move(edge.points), PROJ_SPHERE_MERC};
         auto const wkb = geom_to_ewkb(geom);
         connection().exec_prepared("ins", edge.id, edge.width,
                                    get_name(names, edge.id), binary_param(wkb));
diff --git a/src/gen/raster.hpp b/src/gen/raster.hpp
index 8708789a2..c1cf895bc 100644
--- a/src/gen/raster.hpp
+++ b/src/gen/raster.hpp
@@ -10,6 +10,8 @@
  * For a full list of authors see the git log.
  */
 
+#include "projection.hpp"
+
 #include <cstdint>
 #include <string>
 
@@ -41,7 +43,7 @@ struct wkb_raster_header
     double ipY = 0.0;
     double skewX = 0.0;
     double skewY = 0.0;
-    int32_t srid = 3857;
+    int32_t srid = PROJ_SPHERE_MERC;
     uint16_t width = 0;
     uint16_t height = 0;
 };
diff --git a/src/gen/tracer.cpp b/src/gen/tracer.cpp
index 7f9eb9296..b8e54826e 100644
--- a/src/gen/tracer.cpp
+++ b/src/gen/tracer.cpp
@@ -11,6 +11,7 @@
 
 #include "canvas.hpp"
 #include "geom-boost-adaptor.hpp"
+#include "projection.hpp"
 #include "tile.hpp"
 
 #include <cassert>
@@ -114,7 +115,7 @@ tracer_t::build_geometries(tile_t const &tile, potrace_path_t const *plist,
             m_num_points += ring.size();
 
             if (path->sign == '+') {
-                geometries.emplace_back(geom::polygon_t{}, 3857)
+                geometries.emplace_back(geom::polygon_t{}, PROJ_SPHERE_MERC)
                     .get<geom::polygon_t>()
                     .outer() = std::move(ring);
             } else {
diff --git a/src/geom-functions.cpp b/src/geom-functions.cpp
index a6db4c9ca..369f9f32c 100644
--- a/src/geom-functions.cpp
+++ b/src/geom-functions.cpp
@@ -11,6 +11,7 @@
 
 #include "geom-boost-adaptor.hpp"
 #include "overloaded.hpp"
+#include "projection.hpp"
 
 #include <algorithm>
 #include <cmath>
@@ -228,7 +229,7 @@ class transform_visitor
 void transform(geometry_t *output, geometry_t const &input,
                reprojection const &reprojection)
 {
-    assert(input.srid() == 4326);
+    assert(input.srid() == PROJ_LATLONG);
 
     set_to_same_type(output, input);
     output->set_srid(reprojection.target_srs());
@@ -385,7 +386,7 @@ double spherical_area(polygon_t const &geom)
 
 double spherical_area(geometry_t const &geom)
 {
-    assert(geom.srid() == 4326);
+    assert(geom.srid() == PROJ_LATLONG);
 
     return std::abs(geom.visit(overloaded{
         [&](geom::nullgeom_t const & /*input*/) { return 0.0; },
diff --git a/src/geom.hpp b/src/geom.hpp
index 250f88081..ac71c7653 100644
--- a/src/geom.hpp
+++ b/src/geom.hpp
@@ -16,6 +16,8 @@
  * Basic geometry types and functions.
  */
 
+#include "projection.hpp"
+
 #include <osmium/osm/location.hpp>
 
 #include <algorithm>
@@ -274,31 +276,33 @@ class geometry_t
 
     // point_t is small and trivially copyable, no move needed like for the
     // other constructors.
-    constexpr explicit geometry_t(point_t geom, int srid = 4326)
+    constexpr explicit geometry_t(point_t geom, int srid = PROJ_LATLONG)
     : m_geom(geom), m_srid(srid)
     {}
 
-    constexpr explicit geometry_t(linestring_t &&geom, int srid = 4326)
+    constexpr explicit geometry_t(linestring_t &&geom, int srid = PROJ_LATLONG)
     : m_geom(std::move(geom)), m_srid(srid)
     {}
 
-    constexpr explicit geometry_t(polygon_t &&geom, int srid = 4326)
+    constexpr explicit geometry_t(polygon_t &&geom, int srid = PROJ_LATLONG)
     : m_geom(std::move(geom)), m_srid(srid)
     {}
 
-    constexpr explicit geometry_t(multipoint_t &&geom, int srid = 4326)
+    constexpr explicit geometry_t(multipoint_t &&geom, int srid = PROJ_LATLONG)
     : m_geom(std::move(geom)), m_srid(srid)
     {}
 
-    constexpr explicit geometry_t(multilinestring_t &&geom, int srid = 4326)
+    constexpr explicit geometry_t(multilinestring_t &&geom,
+                                  int srid = PROJ_LATLONG)
     : m_geom(std::move(geom)), m_srid(srid)
     {}
 
-    constexpr explicit geometry_t(multipolygon_t &&geom, int srid = 4326)
+    constexpr explicit geometry_t(multipolygon_t &&geom,
+                                  int srid = PROJ_LATLONG)
     : m_geom(std::move(geom)), m_srid(srid)
     {}
 
-    constexpr explicit geometry_t(collection_t &&geom, int srid = 4326)
+    constexpr explicit geometry_t(collection_t &&geom, int srid = PROJ_LATLONG)
     : m_geom(std::move(geom)), m_srid(srid)
     {}
 
@@ -397,7 +401,7 @@ class geometry_t
                  multilinestring_t, multipolygon_t, collection_t>
         m_geom = nullgeom_t{};
 
-    int m_srid = 4326;
+    int m_srid = PROJ_LATLONG;
 
 }; // class geometry_t
 
diff --git a/src/locator.cpp b/src/locator.cpp
index 844eae364..73e49ef87 100644
--- a/src/locator.cpp
+++ b/src/locator.cpp
@@ -16,6 +16,7 @@
 #include "overloaded.hpp"
 #include "pgsql-capabilities.hpp"
 #include "pgsql.hpp"
+#include "projection.hpp"
 #include "wkb.hpp"
 
 #include <iterator>
@@ -63,7 +64,7 @@ void locator_t::add_regions(pg_conn_t const &db_connection,
         std::string const name = result.get_value(n, 0);
         auto geometry = ewkb_to_geom(util::decode_hex(result.get(n, 1)));
 
-        if (geometry.srid() == 4326) {
+        if (geometry.srid() == PROJ_LATLONG) {
             add_region(name, geometry);
         } else {
             log_warn("Ignoring locator geometry that is not in WGS84 (4326)");
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 1428f102f..197d77937 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -33,6 +33,7 @@
 #include "osmtypes.hpp"
 #include "pgsql-capabilities.hpp"
 #include "pgsql.hpp"
+#include "projection.hpp"
 #include "properties.hpp"
 #include "reprojection.hpp"
 #include "thread-pool.hpp"
@@ -1191,8 +1192,9 @@ output_flex_t::output_flex_t(output_flex_t const *other,
     }
 
     for (auto &expire_output : *m_expire_outputs) {
-        m_expire_tiles.emplace_back(expire_output.maxzoom(),
-                                    reprojection::create_projection(3857));
+        m_expire_tiles.emplace_back(
+            expire_output.maxzoom(),
+            reprojection::create_projection(PROJ_SPHERE_MERC));
     }
 }
 
@@ -1235,7 +1237,8 @@ output_flex_t::output_flex_t(std::shared_ptr<middle_query_t> const &mid,
         eo.set_maxzoom(options.expire_tiles_zoom);
 
         for (auto &table : *m_tables) {
-            if (table.has_geom_column() && table.geom_column().srid() == 3857) {
+            if (table.has_geom_column() &&
+                table.geom_column().srid() == PROJ_SPHERE_MERC) {
                 expire_config_t config{};
                 config.expire_output = m_expire_outputs->size() - 1;
                 if (options.expire_tiles_max_bbox > 0.0) {
@@ -1255,8 +1258,9 @@ output_flex_t::output_flex_t(std::shared_ptr<middle_query_t> const &mid,
     }
 
     for (auto &expire_output : *m_expire_outputs) {
-        m_expire_tiles.emplace_back(expire_output.maxzoom(),
-                                    reprojection::create_projection(3857));
+        m_expire_tiles.emplace_back(
+            expire_output.maxzoom(),
+            reprojection::create_projection(PROJ_SPHERE_MERC));
     }
 
     create_expire_tables(*m_expire_outputs, get_options()->connection_params);
diff --git a/src/output-pgsql.cpp b/src/output-pgsql.cpp
index 51b078d8d..8167645d4 100644
--- a/src/output-pgsql.cpp
+++ b/src/output-pgsql.cpp
@@ -38,6 +38,7 @@
 #include "osmtypes.hpp"
 #include "output-pgsql.hpp"
 #include "pgsql.hpp"
+#include "projection.hpp"
 #include "reprojection.hpp"
 #include "taginfo-impl.hpp"
 #include "tagtransform.hpp"
@@ -51,7 +52,7 @@ double calculate_area(bool reproject_area, geom::geometry_t const &geom4326,
                       geom::geometry_t const &projected_geom)
 {
     static thread_local auto const proj3857 =
-        reprojection::create_projection(3857);
+        reprojection::create_projection(PROJ_SPHERE_MERC);
 
     if (reproject_area) {
         auto const ogeom = geom::transform(geom4326, *proj3857);
diff --git a/src/projection.hpp b/src/projection.hpp
new file mode 100644
index 000000000..b3230039a
--- /dev/null
+++ b/src/projection.hpp
@@ -0,0 +1,16 @@
+#ifndef OSM2PGSQL_PROJECTION_HPP
+#define OSM2PGSQL_PROJECTION_HPP
+
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+constexpr int PROJ_LATLONG = 4326;
+constexpr int PROJ_SPHERE_MERC = 3857;
+
+#endif // OSM2PGSQL_PROJECTION_HPP
diff --git a/src/reprojection.hpp b/src/reprojection.hpp
index 50d17e65a..e1de8c90f 100644
--- a/src/reprojection.hpp
+++ b/src/reprojection.hpp
@@ -17,16 +17,11 @@
  */
 
 #include "geom.hpp"
+#include "projection.hpp"
 
 #include <memory>
 #include <string>
 
-enum Projection
-{
-    PROJ_LATLONG = 4326,
-    PROJ_SPHERE_MERC = 3857
-};
-
 /**
  * Virtual base class used for projecting OSM WGS84 coordinates into a
  * different coordinate system. Most commonly this will be used to convert
diff --git a/tests/test-expire-from-geometry.cpp b/tests/test-expire-from-geometry.cpp
index ae5f5f532..f0c73c47f 100644
--- a/tests/test-expire-from-geometry.cpp
+++ b/tests/test-expire-from-geometry.cpp
@@ -13,6 +13,7 @@
 #include <set>
 
 #include "expire-tiles.hpp"
+#include "projection.hpp"
 #include "reprojection.hpp"
 #include "tile-output.hpp"
 #include "tile.hpp"
@@ -42,7 +43,7 @@ TEST_CASE("expire null geometry does nothing", "[NoDB]")
     SECTION("geom with check")
     {
         geom::geometry_t geom{};
-        geom.set_srid(3857);
+        geom.set_srid(PROJ_SPHERE_MERC);
         et.from_geometry_if_3857(geom, expire_config);
     }
 
@@ -67,7 +68,7 @@ TEST_CASE("expire point at tile boundary", "[NoDB]")
     SECTION("geom with check")
     {
         geom::geometry_t geom{pt};
-        geom.set_srid(3857);
+        geom.set_srid(PROJ_SPHERE_MERC);
         et.from_geometry_if_3857(geom, expire_config);
     }
 
@@ -97,7 +98,7 @@ TEST_CASE("expire point away from tile boundary", "[NoDB]")
     SECTION("geom with check")
     {
         geom::geometry_t geom{pt};
-        geom.set_srid(3857);
+        geom.set_srid(PROJ_SPHERE_MERC);
         et.from_geometry_if_3857(geom, expire_config);
     }
 
@@ -128,7 +129,7 @@ TEST_CASE("expire linestring away from tile boundary", "[NoDB]")
     {
         geom::linestring_t line{{5000.0, 4000.0}, {5100.0, 4200.0}};
         geom::geometry_t geom{std::move(line)};
-        geom.set_srid(3857);
+        geom.set_srid(PROJ_SPHERE_MERC);
         et.from_geometry_if_3857(geom, expire_config);
     }
 
@@ -159,7 +160,7 @@ TEST_CASE("expire linestring crossing tile boundary", "[NoDB]")
     {
         geom::linestring_t line{{5000.0, 5000.0}, {5000.0, 15000.0}};
         geom::geometry_t geom{std::move(line)};
-        geom.set_srid(3857);
+        geom.set_srid(PROJ_SPHERE_MERC);
         et.from_geometry_if_3857(geom, expire_config);
     }
 
@@ -203,7 +204,7 @@ TEST_CASE("expire small polygon", "[NoDB]")
                               {5000.0, 5100.0},
                               {5000.0, 5000.0}}};
         geom::geometry_t geom{std::move(poly)};
-        geom.set_srid(3857);
+        geom.set_srid(PROJ_SPHERE_MERC);
         et.from_geometry_if_3857(geom, expire_config);
     }
 
@@ -248,7 +249,7 @@ TEST_CASE("expire large polygon as bbox", "[NoDB]")
                               {5000.0, 25000.0},
                               {5000.0, 5000.0}}};
         geom::geometry_t geom{std::move(poly)};
-        geom.set_srid(3857);
+        geom.set_srid(PROJ_SPHERE_MERC);
         et.from_geometry_if_3857(geom, expire_config);
     }
 
@@ -313,7 +314,7 @@ TEST_CASE("expire large polygon as boundary", "[NoDB]")
                               {5000.0, 25000.0},
                               {5000.0, 5000.0}}};
         geom::geometry_t geom{std::move(poly)};
-        geom.set_srid(3857);
+        geom.set_srid(PROJ_SPHERE_MERC);
         et.from_geometry_if_3857(geom, expire_config);
     }
 
@@ -362,7 +363,7 @@ TEST_CASE("expire multipoint geometry", "[NoDB]")
         mpt.add_geometry(p1);
         mpt.add_geometry(p2);
         geom::geometry_t geom{std::move(mpt)};
-        geom.set_srid(3857);
+        geom.set_srid(PROJ_SPHERE_MERC);
         et.from_geometry_if_3857(geom, expire_config);
     }
 
@@ -485,7 +486,7 @@ TEST_CASE("expire works if in 3857", "[NoDB]")
     expire_tiles et{zoom, defproj};
 
     geom::geometry_t geom{geom::point_t{0.0, 0.0}};
-    geom.set_srid(3857);
+    geom.set_srid(PROJ_SPHERE_MERC);
     et.from_geometry_if_3857(geom, expire_config);
 
     auto const tiles = et.get_tiles();
diff --git a/tests/test-geom-multilinestrings.cpp b/tests/test-geom-multilinestrings.cpp
index 0ae2e0e63..2fbeb54d9 100644
--- a/tests/test-geom-multilinestrings.cpp
+++ b/tests/test-geom-multilinestrings.cpp
@@ -15,6 +15,7 @@
 #include "geom-functions.hpp"
 #include "geom-output.hpp"
 #include "geom.hpp"
+#include "projection.hpp"
 
 #include <array>
 
@@ -343,7 +344,7 @@ TEST_CASE("create_multilinestring and simplify", "[NoDB]")
         geom::create_multilinestring(buffer.buffer());
 
     REQUIRE(geom.is_multilinestring());
-    REQUIRE(geom.srid() == 4326);
+    REQUIRE(geom.srid() == PROJ_LATLONG);
     auto const &mls = geom.get<geom::multilinestring_t>();
     REQUIRE(mls.num_geometries() == 2);
     REQUIRE(mls[0] == geom::linestring_t{{1, 1}, {1, 2}, {1, 3}});
@@ -353,7 +354,7 @@ TEST_CASE("create_multilinestring and simplify", "[NoDB]")
     {
         auto const simplified_geom = geom::simplify(geom, 0.1);
         REQUIRE(simplified_geom.is_multilinestring());
-        REQUIRE(simplified_geom.srid() == 4326);
+        REQUIRE(simplified_geom.srid() == PROJ_LATLONG);
         auto const &simplified_mls =
             simplified_geom.get<geom::multilinestring_t>();
         REQUIRE(simplified_mls.num_geometries() == 2);
@@ -366,7 +367,7 @@ TEST_CASE("create_multilinestring and simplify", "[NoDB]")
     {
         auto const simplified_geom = geom::simplify(geom, 10.0);
         REQUIRE(simplified_geom.is_multilinestring());
-        REQUIRE(simplified_geom.srid() == 4326);
+        REQUIRE(simplified_geom.srid() == PROJ_LATLONG);
         auto const &simplified_mls =
             simplified_geom.get<geom::multilinestring_t>();
         REQUIRE(simplified_mls.num_geometries() == 2);
diff --git a/tests/test-geom-transform.cpp b/tests/test-geom-transform.cpp
index 8481b1313..10a7ed775 100644
--- a/tests/test-geom-transform.cpp
+++ b/tests/test-geom-transform.cpp
@@ -12,6 +12,7 @@
 #include "geom-functions.hpp"
 #include "geom-output.hpp"
 #include "geom.hpp"
+#include "projection.hpp"
 #include "reprojection.hpp"
 
 namespace {
@@ -47,7 +48,7 @@ TEST_CASE("Transform geom::null_t", "[NoDB]")
     geom::geometry_t const geom{};
     auto const result = geom::transform(geom, *reprojection);
     REQUIRE(result.is_null());
-    REQUIRE(result.srid() == 3857);
+    REQUIRE(result.srid() == PROJ_SPHERE_MERC);
 }
 
 TEST_CASE("Transform geom::point_t", "[NoDB]")
@@ -58,7 +59,7 @@ TEST_CASE("Transform geom::point_t", "[NoDB]")
     geom::geometry_t const geom{geom::point_t{5.5, 4.4}};
     auto const result = geom::transform(geom, *reprojection);
     REQUIRE(result.is_point());
-    REQUIRE(result.srid() == 3857);
+    REQUIRE(result.srid() == PROJ_SPHERE_MERC);
 
     check(result.get<geom::point_t>(),
           geom::point_t{612257.1993630046, 490287.90003313165});
@@ -72,7 +73,7 @@ TEST_CASE("Transform geom::linestring_t", "[NoDB]")
     geom::geometry_t const geom{geom::linestring_t{{5.5, 4.4}, {3.3, 2.2}}};
     auto const result = geom::transform(geom, *reprojection);
     REQUIRE(result.is_linestring());
-    REQUIRE(result.srid() == 3857);
+    REQUIRE(result.srid() == PROJ_SPHERE_MERC);
 
     auto const &r = result.get<geom::linestring_t>();
     check(r[0], geom::point_t{X55, Y44});
@@ -91,7 +92,7 @@ TEST_CASE("Transform geom::polygon_t", "[NoDB]")
 
     auto const result = geom::transform(geom, *reprojection);
     REQUIRE(result.is_polygon());
-    REQUIRE(result.srid() == 3857);
+    REQUIRE(result.srid() == PROJ_SPHERE_MERC);
 
     auto const &polygon = result.get<geom::polygon_t>();
     auto const &outer = polygon.outer();
@@ -125,7 +126,7 @@ TEST_CASE("Transform geom::multipoint_t", "[NoDB]")
 
     auto const result = geom::transform(geom, *reprojection);
     REQUIRE(result.is_multipoint());
-    REQUIRE(result.srid() == 3857);
+    REQUIRE(result.srid() == PROJ_SPHERE_MERC);
 
     auto const &rmp = result.get<geom::multipoint_t>();
     REQUIRE(rmp.num_geometries() == 2);
@@ -145,7 +146,7 @@ TEST_CASE("Transform geom::multilinestring_t", "[NoDB]")
 
     auto const result = geom::transform(geom, *reprojection);
     REQUIRE(result.is_multilinestring());
-    REQUIRE(result.srid() == 3857);
+    REQUIRE(result.srid() == PROJ_SPHERE_MERC);
 
     auto const &rml = result.get<geom::multilinestring_t>();
     REQUIRE(rml.num_geometries() == 2);
@@ -173,7 +174,7 @@ TEST_CASE("Transform geom::multipolygon_t", "[NoDB]")
 
     auto const result = geom::transform(geom, *reprojection);
     REQUIRE(result.is_multipolygon());
-    REQUIRE(result.srid() == 3857);
+    REQUIRE(result.srid() == PROJ_SPHERE_MERC);
 
     auto const &rmp = result.get<geom::multipolygon_t>();
     REQUIRE(rmp.num_geometries() == 2);
@@ -218,7 +219,7 @@ TEST_CASE("Transform geom::collection_t", "[NoDB]")
 
     auto const result = geom::transform(geom, *reprojection);
     REQUIRE(result.is_collection());
-    REQUIRE(result.srid() == 3857);
+    REQUIRE(result.srid() == PROJ_SPHERE_MERC);
 
     auto const &rc = result.get<geom::collection_t>();
     REQUIRE(rc.num_geometries() == 4);
diff --git a/tests/test-reprojection.cpp b/tests/test-reprojection.cpp
index fa14af84a..0818d477c 100644
--- a/tests/test-reprojection.cpp
+++ b/tests/test-reprojection.cpp
@@ -9,12 +9,13 @@
 
 #include <catch.hpp>
 
+#include "projection.hpp"
 #include "reprojection.hpp"
 
 TEST_CASE("projection 4326", "[NoDB]")
 {
     osmium::Location const loc{10.0, 53.0};
-    int const srs = 4326;
+    int const srs = PROJ_LATLONG;
 
     auto const reprojection = reprojection::create_projection(srs);
     REQUIRE(reprojection->target_srs() == srs);
@@ -32,7 +33,7 @@ TEST_CASE("projection 4326", "[NoDB]")
 TEST_CASE("projection 3857", "[NoDB]")
 {
     osmium::Location const loc{10.0, 53.0};
-    int const srs = 3857;
+    int const srs = PROJ_SPHERE_MERC;
 
     auto const reprojection = reprojection::create_projection(srs);
     REQUIRE(reprojection->target_srs() == srs);
@@ -52,7 +53,7 @@ TEST_CASE("projection 3857 bounds", "[NoDB]")
     osmium::Location const loc1{0.0, 0.0};
     osmium::Location const loc2{-180.0, -85.0511288};
     osmium::Location const loc3{180.0, 85.0511288};
-    int const srs = 3857;
+    int const srs = PROJ_SPHERE_MERC;
     auto const reprojection = reprojection::create_projection(srs);
 
     {

From c47baa63a039e35015e8ca3478d5903425ba5670 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 30 Jun 2025 08:45:25 +0200
Subject: [PATCH 306/430] rename delete callbacks to process_deleted_*

This is more in line with the names of the other callbacks.
---
 src/output-flex.cpp                     | 29 +++++++++++++------------
 src/output-flex.hpp                     |  6 ++---
 tests/bdd/flex/delete-callbacks.feature | 18 +++++++--------
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 197d77937..52f65fe47 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -1089,9 +1089,9 @@ void output_flex_t::delete_from_tables(osmium::item_type type, osmid_t osm_id)
 
 void output_flex_t::node_delete(osmium::Node const &node)
 {
-    if (m_delete_node) {
+    if (m_process_deleted_node) {
         m_context_node = &node;
-        get_mutex_and_call_lua_function(m_delete_node, node);
+        get_mutex_and_call_lua_function(m_process_deleted_node, node);
         m_context_node = nullptr;
     }
 
@@ -1100,9 +1100,9 @@ void output_flex_t::node_delete(osmium::Node const &node)
 
 void output_flex_t::way_delete(osmium::Way *way)
 {
-    if (m_delete_way) {
+    if (m_process_deleted_way) {
         m_way_cache.init(way);
-        get_mutex_and_call_lua_function(m_delete_way, m_way_cache.get());
+        get_mutex_and_call_lua_function(m_process_deleted_way, m_way_cache.get());
     }
 
     way_delete(way->id());
@@ -1110,9 +1110,9 @@ void output_flex_t::way_delete(osmium::Way *way)
 
 void output_flex_t::relation_delete(osmium::Relation const &rel)
 {
-    if (m_delete_relation) {
+    if (m_process_deleted_relation) {
         m_relation_cache.init(rel);
-        get_mutex_and_call_lua_function(m_delete_relation, rel);
+        get_mutex_and_call_lua_function(m_process_deleted_relation, rel);
     }
 
     relation_delete(rel.id());
@@ -1180,8 +1180,9 @@ output_flex_t::output_flex_t(output_flex_t const *other,
   m_process_untagged_node(other->m_process_untagged_node),
   m_process_untagged_way(other->m_process_untagged_way),
   m_process_untagged_relation(other->m_process_untagged_relation),
-  m_delete_node(other->m_delete_node), m_delete_way(other->m_delete_way),
-  m_delete_relation(other->m_delete_relation),
+  m_process_deleted_node(other->m_process_deleted_node),
+  m_process_deleted_way(other->m_process_deleted_way),
+  m_process_deleted_relation(other->m_process_deleted_relation),
   m_select_relation_members(other->m_select_relation_members),
   m_after_nodes(other->m_after_nodes), m_after_ways(other->m_after_ways),
   m_after_relations(other->m_after_relations)
@@ -1369,12 +1370,12 @@ void output_flex_t::init_lua(std::string const &filename,
         prepared_lua_function_t{lua_state(), calling_context::process_relation,
                                 "process_untagged_relation"};
 
-    m_delete_node = prepared_lua_function_t{
-        lua_state(), calling_context::process_node, "delete_node"};
-    m_delete_way = prepared_lua_function_t{
-        lua_state(), calling_context::process_way, "delete_way"};
-    m_delete_relation = prepared_lua_function_t{
-        lua_state(), calling_context::process_relation, "delete_relation"};
+    m_process_deleted_node = prepared_lua_function_t{
+        lua_state(), calling_context::process_node, "process_deleted_node"};
+    m_process_deleted_way = prepared_lua_function_t{
+        lua_state(), calling_context::process_way, "process_deleted_way"};
+    m_process_deleted_relation = prepared_lua_function_t{
+        lua_state(), calling_context::process_relation, "process_deleted_relation"};
 
     m_select_relation_members = prepared_lua_function_t{
         lua_state(), calling_context::select_relation_members,
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index 1f8a4a87f..e9d7b6330 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -308,9 +308,9 @@ class output_flex_t : public output_t
     prepared_lua_function_t m_process_untagged_way;
     prepared_lua_function_t m_process_untagged_relation;
 
-    prepared_lua_function_t m_delete_node;
-    prepared_lua_function_t m_delete_way;
-    prepared_lua_function_t m_delete_relation;
+    prepared_lua_function_t m_process_deleted_node;
+    prepared_lua_function_t m_process_deleted_way;
+    prepared_lua_function_t m_process_deleted_relation;
 
     prepared_lua_function_t m_select_relation_members;
 
diff --git a/tests/bdd/flex/delete-callbacks.feature b/tests/bdd/flex/delete-callbacks.feature
index 75d6207ea..2d2a3ec02 100644
--- a/tests/bdd/flex/delete-callbacks.feature
+++ b/tests/bdd/flex/delete-callbacks.feature
@@ -15,9 +15,9 @@ Feature: Test for delete callbacks
                 change:insert{extra = object.version}
             end
 
-            osm2pgsql.delete_node = process_delete
-            osm2pgsql.delete_way = process_delete
-            osm2pgsql.delete_relation = process_delete
+            osm2pgsql.process_deleted_node = process_delete
+            osm2pgsql.process_deleted_way = process_delete
+            osm2pgsql.process_deleted_relation = process_delete
             """
         When running osm2pgsql flex with parameters
             | --slim |
@@ -56,15 +56,15 @@ Feature: Test for delete callbacks
                     { column = 'extra', type = 'int' }
                 }}
 
-            function osm2pgsql.delete_node(object)
+            function osm2pgsql.process_deleted_node(object)
                 change:insert{extra = object.tags == nil and 1 or 0}
             end
 
-            function osm2pgsql.delete_way(object)
+            function osm2pgsql.process_deleted_way(object)
                 change:insert{extra = object.nodes == nil and 1 or 0}
             end
 
-            function osm2pgsql.delete_relation(object)
+            function osm2pgsql.process_deleted_relation(object)
                 change:insert{extra = object.members == nil and 1 or 0}
             end
 
@@ -89,15 +89,15 @@ Feature: Test for delete callbacks
                     { column = 'extra', sql_type = 'int' }
                 }}
 
-            function osm2pgsql.delete_node(object)
+            function osm2pgsql.process_deleted_node(object)
                 change:insert{extra = object.as_point == nil and 1 or 0}
             end
 
-            function osm2pgsql.delete_way(object)
+            function osm2pgsql.process_deleted_way(object)
                 change:insert{extra = object.as_linestring == nil and 1 or 0}
             end
 
-            function osm2pgsql.delete_relation(object)
+            function osm2pgsql.process_deleted_relation(object)
                 change:insert{extra = object.as_geometrycollection == nil and 1 or 0}
             end
 

From fe3d7bb00211660c2dc4f545cb8264bf66cd5b85 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 3 Jul 2025 11:51:17 +0200
Subject: [PATCH 307/430] Make locator also work with geometry collections

---
 src/locator.cpp                | 53 +++++++++++++++++---------
 src/locator.hpp                |  6 +++
 tests/bdd/flex/locator.feature | 68 +++++++++++++++++++++++++++++++++-
 3 files changed, 109 insertions(+), 18 deletions(-)

diff --git a/src/locator.cpp b/src/locator.cpp
index 73e49ef87..35fcbd584 100644
--- a/src/locator.cpp
+++ b/src/locator.cpp
@@ -88,44 +88,63 @@ void locator_t::build_index()
     m_rtree.insert(m_data.cbegin(), m_data.cend());
 }
 
-std::set<std::string> locator_t::all_intersecting(geom::geometry_t const &geom)
+void locator_t::all_intersecting_visit(geom::geometry_t const &geom,
+                                       std::set<std::string> *results)
 {
-    if (m_rtree.size() < m_regions.size()) {
-        build_index();
-    }
-
-    std::set<std::string> results;
-
-    geom.visit(overloaded{[&](geom::nullgeom_t const & /*input*/) {},
-                          [&](geom::collection_t const & /*input*/) {}, // TODO
+    geom.visit(overloaded{[&](geom::nullgeom_t const & /*val*/) {},
+                          [&](geom::collection_t const &val) {
+                              for (auto const &sgeom : val) {
+                                  all_intersecting_visit(sgeom, results);
+                              }
+                          },
                           [&](auto const &val) {
                               for (auto it = begin_intersects(val);
                                    it != end_query(); ++it) {
                                   auto const &region = m_regions[it->second];
-                                  results.emplace(region.name());
+                                  results->emplace(region.name());
                               }
                           }});
-
-    return results;
 }
 
-std::string locator_t::first_intersecting(geom::geometry_t const &geom)
+std::set<std::string> locator_t::all_intersecting(geom::geometry_t const &geom)
 {
     if (m_rtree.size() < m_regions.size()) {
         build_index();
     }
 
-    std::string result;
+    std::set<std::string> results;
+    all_intersecting_visit(geom, &results);
+    return results;
+}
 
-    geom.visit(overloaded{[&](geom::nullgeom_t const & /*input*/) {},
-                          [&](geom::collection_t const & /*input*/) {}, // TODO
+void locator_t::first_intersecting_visit(geom::geometry_t const &geom,
+                                         std::string *result)
+{
+    geom.visit(overloaded{[&](geom::nullgeom_t const & /*val*/) {},
+                          [&](geom::collection_t const &val) {
+                              for (auto const &sgeom : val) {
+                                  first_intersecting_visit(sgeom, result);
+                                  if (!result->empty()) {
+                                      return;
+                                  }
+                              }
+                          },
                           [&](auto const &val) {
                               auto const it = begin_intersects(val);
                               if (it != end_query()) {
                                   auto const &region = m_regions[it->second];
-                                  result = region.name();
+                                  *result = region.name();
                               }
                           }});
+}
 
+std::string locator_t::first_intersecting(geom::geometry_t const &geom)
+{
+    if (m_rtree.size() < m_regions.size()) {
+        build_index();
+    }
+
+    std::string result;
+    first_intersecting_visit(geom, &result);
     return result;
 }
diff --git a/src/locator.hpp b/src/locator.hpp
index b8d6e44a1..5fdc17b35 100644
--- a/src/locator.hpp
+++ b/src/locator.hpp
@@ -98,6 +98,12 @@ class locator_t
 
     tree_t::const_query_iterator end_query() { return m_rtree.qend(); }
 
+    void all_intersecting_visit(geom::geometry_t const &geom,
+                                std::set<std::string> *results);
+
+    void first_intersecting_visit(geom::geometry_t const &geom,
+                                  std::string *result);
+
 public:
     /// The name of this locator (for logging only)
     std::string const &name() const noexcept { return m_name; }
diff --git a/tests/bdd/flex/locator.feature b/tests/bdd/flex/locator.feature
index e4343a241..7a97b6b8f 100644
--- a/tests/bdd/flex/locator.feature
+++ b/tests/bdd/flex/locator.feature
@@ -80,7 +80,7 @@ Feature: Locators
             Error in 'first_intersecting': Need locator and geometry arguments
             """
 
-    Scenario: Use a all_intersecting() without geometry fails
+    Scenario: Use of all_intersecting() without geometry fails
         Given the OSM data
             """
             n10 v1 dV Tamenity=post_box x0.5 y0.5
@@ -231,3 +231,69 @@ Feature: Locators
             | node_id | region | ST_AsText(geom) |
             | 10      | P1     | 15 8            |
 
+    Scenario: Define and use a locator with relation from db
+        Given the 10.0 grid with origin 10.0 10.0
+            | 10 | 11 | 12 |
+            | 13 | 14 | 15 |
+        And the OSM data
+            """
+            w29 v1 dV Tregion=P1 Nn10,n11,n14,n13,n10
+            """
+        And the lua style
+            """
+            local regions = osm2pgsql.define_way_table('osm2pgsql_test_regions', {
+                { column = 'region', type = 'text' },
+                { column = 'geom', type = 'polygon', projection = 4326 },
+            })
+
+            function osm2pgsql.process_way(object)
+                regions:insert({
+                    region = object.tags.region,
+                    geom = object:as_polygon(),
+                })
+            end
+            """
+        When running osm2pgsql flex
+        Then table osm2pgsql_test_regions contains exactly
+            | way_id | region | ST_AsText(geom)               |
+            | 29     | P1     | (10 0,20 0,20 10,10 10, 10 0) |
+
+        Given the 10.0 grid with origin 10.0 10.0
+            | 10 | 11 | 12 |
+            | 13 | 14 | 15 |
+        And the OSM data
+            """
+            w20 v1 dV Nn10,n11,n13
+            w21 v1 dV Nn13,n10
+            w22 v1 dV Nn14,n15
+            w23 v1 dV Nn12,n15
+            r30 v1 dV Tfoo=bar Mw20@,w21@,w22@,n12@
+            r31 v1 dV Tfoo=bar Mn12@,n15@
+            r32 v1 dV Tfoo=bar Mw23@
+            """
+        And the lua style
+            """
+            local regions = osm2pgsql.define_locator({ name = 'regions' })
+            regions:add_from_db('SELECT region, geom FROM osm2pgsql_test_regions')
+
+            local points = osm2pgsql.define_relation_table('osm2pgsql_test_rels', {
+                { column = 'region', type = 'text' },
+                { column = 'geom', type = 'geometry', projection = 4326 },
+            })
+
+            function osm2pgsql.process_relation(object)
+                local g = object:as_geometrycollection()
+                local r = regions:first_intersecting(g)
+                if r then
+                    points:insert({
+                        region = r,
+                        geom = g,
+                    })
+                end
+            end
+            """
+        When running osm2pgsql flex
+        Then table osm2pgsql_test_rels contains exactly
+            | relation_id | region | ST_GeometryType(geom) |
+            | 30          | P1     | ST_GeometryCollection |
+

From acbdfcf3dd9e99247e1a0d5aa269114da23e8539 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 5 Jul 2025 14:54:38 +0200
Subject: [PATCH 308/430] Use cbegin()/cend() instead of begin()/end() to
 signal const use

---
 src/expire-tiles.cpp         |  6 +++---
 src/geom-from-osm.cpp        |  6 +++---
 src/geom-functions.cpp       |  4 ++--
 src/hex.cpp                  |  2 +-
 src/output-flex.cpp          |  2 +-
 tests/common-import.hpp      |  6 +++---
 tests/test-expire-tiles.cpp  | 22 +++++++++++-----------
 tests/test-middle.cpp        | 19 ++++++++++---------
 tests/test-options-parse.cpp |  4 ++--
 9 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/src/expire-tiles.cpp b/src/expire-tiles.cpp
index d2325f9a1..1cd584f25 100644
--- a/src/expire-tiles.cpp
+++ b/src/expire-tiles.cpp
@@ -270,7 +270,7 @@ quadkey_list_t expire_tiles::get_tiles()
 {
     quadkey_list_t tiles;
     tiles.reserve(m_dirty_tiles.size());
-    tiles.assign(m_dirty_tiles.begin(), m_dirty_tiles.end());
+    tiles.assign(m_dirty_tiles.cbegin(), m_dirty_tiles.cend());
     std::sort(tiles.begin(), tiles.end());
     m_dirty_tiles.clear();
     return tiles;
@@ -288,8 +288,8 @@ void expire_tiles::merge_and_destroy(expire_tiles *other)
         using std::swap;
         swap(m_dirty_tiles, other->m_dirty_tiles);
     } else {
-        m_dirty_tiles.insert(other->m_dirty_tiles.begin(),
-                             other->m_dirty_tiles.end());
+        m_dirty_tiles.insert(other->m_dirty_tiles.cbegin(),
+                             other->m_dirty_tiles.cend());
         other->m_dirty_tiles.clear();
     }
 }
diff --git a/src/geom-from-osm.cpp b/src/geom-from-osm.cpp
index 71c586519..c1f0f10d8 100644
--- a/src/geom-from-osm.cpp
+++ b/src/geom-from-osm.cpp
@@ -110,7 +110,7 @@ void create_polygon(geometry_t *geom, osmium::Way const &way,
     }
 
     auto const &area = assembler.get_area();
-    auto const &ring = *area.begin<osmium::OuterRing>();
+    auto const &ring = *area.cbegin<osmium::OuterRing>();
 
     fill_point_list(&polygon.outer(), ring);
 }
@@ -169,7 +169,7 @@ void create_multilinestring(geometry_t *geom,
     auto ways = buffer.select<osmium::Way>();
     if (ways.size() == 1 && !force_multi) {
         auto &line = geom->set<linestring_t>();
-        auto const &way = *ways.begin();
+        auto const &way = *ways.cbegin();
         if (!fill_point_list(&line, way.nodes())) {
             geom->reset();
         }
@@ -228,7 +228,7 @@ void create_multipolygon(geometry_t *geom, osmium::Relation const &relation,
         }
     } else {
         auto &polygon = geom->set<polygon_t>();
-        fill_polygon(&polygon, area, *area.outer_rings().begin());
+        fill_polygon(&polygon, area, *area.outer_rings().cbegin());
     }
 }
 
diff --git a/src/geom-functions.cpp b/src/geom-functions.cpp
index 369f9f32c..95c64efee 100644
--- a/src/geom-functions.cpp
+++ b/src/geom-functions.cpp
@@ -258,8 +258,8 @@ class without_first
 
     point_list_t::const_iterator begin()
     {
-        assert(m_list->begin() != m_list->end());
-        return std::next(m_list->begin());
+        assert(m_list->cbegin() != m_list->cend());
+        return std::next(m_list->cbegin());
     }
 
     point_list_t::const_iterator end() { return m_list->end(); }
diff --git a/src/hex.cpp b/src/hex.cpp
index aec5bca2b..09868f6cd 100644
--- a/src/hex.cpp
+++ b/src/hex.cpp
@@ -67,7 +67,7 @@ std::string decode_hex(std::string_view hex_string)
     wkb.reserve(hex_string.size() / 2);
 
     // NOLINTNEXTLINE(llvm-qualified-auto, readability-qualified-auto)
-    for (auto hex = hex_string.begin(); hex != hex_string.end();) {
+    for (auto hex = hex_string.cbegin(); hex != hex_string.cend();) {
         unsigned int const c = decode_hex_char(*hex++);
         wkb += static_cast<char>((c << 4U) | decode_hex_char(*hex++));
     }
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 52f65fe47..50d5f0ecf 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -280,7 +280,7 @@ void flush_tables(std::vector<table_connection_t> &table_connections)
 void create_expire_tables(std::vector<expire_output_t> const &expire_outputs,
                           connection_params_t const &connection_params)
 {
-    if (std::all_of(expire_outputs.begin(), expire_outputs.end(),
+    if (std::all_of(expire_outputs.cbegin(), expire_outputs.cend(),
                     [](auto const &expire_output) {
                         return expire_output.table().empty();
                     })) {
diff --git a/tests/common-import.hpp b/tests/common-import.hpp
index 8112cd1d4..532d84a7c 100644
--- a/tests/common-import.hpp
+++ b/tests/common-import.hpp
@@ -69,7 +69,7 @@ class data_t
     template <typename CONTAINER>
     explicit data_t(CONTAINER const &objects)
     {
-        std::copy(std::begin(objects), std::end(objects),
+        std::copy(std::cbegin(objects), std::cend(objects),
                   std::back_inserter(m_objects));
     }
 
@@ -78,13 +78,13 @@ class data_t
     template <typename CONTAINER>
     void add(CONTAINER const &objects)
     {
-        std::copy(std::begin(objects), std::end(objects),
+        std::copy(std::cbegin(objects), std::cend(objects),
                   std::back_inserter(m_objects));
     }
 
     void add(std::initializer_list<char const *> const &objects)
     {
-        std::copy(std::begin(objects), std::end(objects),
+        std::copy(std::cbegin(objects), std::cend(objects),
                   std::back_inserter(m_objects));
     }
 
diff --git a/tests/test-expire-tiles.cpp b/tests/test-expire-tiles.cpp
index b1e970283..72717ec87 100644
--- a/tests/test-expire-tiles.cpp
+++ b/tests/test-expire-tiles.cpp
@@ -100,7 +100,7 @@ TEST_CASE("simple expire z1", "[NoDB]")
     auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
     CHECK(tiles.size() == 4);
 
-    auto itr = tiles.begin();
+    auto itr = tiles.cbegin();
     CHECK(*(itr++) == tile_t(1, 0, 0));
     CHECK(*(itr++) == tile_t(1, 1, 0));
     CHECK(*(itr++) == tile_t(1, 0, 1));
@@ -120,7 +120,7 @@ TEST_CASE("simple expire z3", "[NoDB]")
     auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
     CHECK(tiles.size() == 4);
 
-    auto itr = tiles.begin();
+    auto itr = tiles.cbegin();
     CHECK(*(itr++) == tile_t(3, 3, 3));
     CHECK(*(itr++) == tile_t(3, 4, 3));
     CHECK(*(itr++) == tile_t(3, 3, 4));
@@ -140,7 +140,7 @@ TEST_CASE("simple expire z18", "[NoDB]")
     auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
     CHECK(tiles.size() == 4);
 
-    auto itr = tiles.begin();
+    auto itr = tiles.cbegin();
     CHECK(*(itr++) == tile_t(18, 131071, 131071));
     CHECK(*(itr++) == tile_t(18, 131072, 131071));
     CHECK(*(itr++) == tile_t(18, 131071, 131072));
@@ -159,7 +159,7 @@ TEST_CASE("simple expire z10 bounds 0, 0", "[NoDB]")
     auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
     CHECK(tiles.size() == 1);
 
-    auto itr = tiles.begin();
+    auto itr = tiles.cbegin();
     CHECK(*(itr++) == tile_t(10, 0, 0));
 }
 
@@ -175,7 +175,7 @@ TEST_CASE("simple expire z10 bounds 0, 1023", "[NoDB]")
     auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
     CHECK(tiles.size() == 1);
 
-    auto itr = tiles.begin();
+    auto itr = tiles.cbegin();
     CHECK(*(itr++) == tile_t(10, 0, 1023));
 }
 
@@ -191,7 +191,7 @@ TEST_CASE("simple expire z10 bounds 1023, 0", "[NoDB]")
     auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
     CHECK(tiles.size() == 1);
 
-    auto itr = tiles.begin();
+    auto itr = tiles.cbegin();
     CHECK(*(itr++) == tile_t(10, 1023, 0));
 }
 
@@ -207,7 +207,7 @@ TEST_CASE("simple expire z10 bounds 1023, 1023", "[NoDB]")
     auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
     CHECK(tiles.size() == 1);
 
-    auto itr = tiles.begin();
+    auto itr = tiles.cbegin();
     CHECK(*(itr++) == tile_t(10, 1023, 1023));
 }
 
@@ -223,7 +223,7 @@ TEST_CASE("expire a simple line", "[NoDB]")
     auto const tiles = get_tiles_ordered(&et, zoom, zoom);
     CHECK(tiles.size() == 3);
 
-    auto itr = tiles.begin();
+    auto itr = tiles.cbegin();
     CHECK(*(itr++) == tile_t(18, 140221, 82055));
     CHECK(*(itr++) == tile_t(18, 140222, 82055));
     CHECK(*(itr++) == tile_t(18, 140223, 82055));
@@ -241,7 +241,7 @@ TEST_CASE("expire a line near the tile border", "[NoDB]")
     auto const tiles = get_tiles_ordered(&et, zoom, zoom);
     REQUIRE(tiles.size() == 4);
 
-    auto itr = tiles.begin();
+    auto itr = tiles.cbegin();
     CHECK(*(itr++) == tile_t(18, 140222, 82055));
     CHECK(*(itr++) == tile_t(18, 140223, 82055));
     CHECK(*(itr++) == tile_t(18, 140222, 82056));
@@ -331,7 +331,7 @@ TEST_CASE("simple expire z17 and z18", "[NoDB]")
     auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
     CHECK(tiles.size() == 8);
 
-    auto itr = tiles.begin();
+    auto itr = tiles.cbegin();
     CHECK(*(itr++) == tile_t(18, 131071, 131071));
     CHECK(*(itr++) == tile_t(17, 65535, 65535));
     CHECK(*(itr++) == tile_t(18, 131072, 131071));
@@ -356,7 +356,7 @@ TEST_CASE("simple expire z17 and z18 in one superior tile", "[NoDB]")
     auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
     CHECK(tiles.size() == 5);
 
-    auto itr = tiles.begin();
+    auto itr = tiles.cbegin();
     CHECK(*(itr++) == tile_t(18, 131070, 131070));
     CHECK(*(itr++) == tile_t(17, 65535, 65535));
     CHECK(*(itr++) == tile_t(18, 131071, 131070));
diff --git a/tests/test-middle.cpp b/tests/test-middle.cpp
index 51d3ea453..5c52a4e84 100644
--- a/tests/test-middle.cpp
+++ b/tests/test-middle.cpp
@@ -517,14 +517,14 @@ void check_way(std::shared_ptr<middle_pgsql_t> const &mid,
     CHECK(std::strcmp(orig_way.user(), way.user()) == 0);
 
     REQUIRE(orig_way.tags().size() == way.tags().size());
-    for (auto it1 = orig_way.tags().begin(), it2 = way.tags().begin();
-         it1 != orig_way.tags().end(); ++it1, ++it2) {
+    for (auto it1 = orig_way.tags().cbegin(), it2 = way.tags().cbegin();
+         it1 != orig_way.tags().cend(); ++it1, ++it2) {
         CHECK(*it1 == *it2);
     }
 
     REQUIRE(orig_way.nodes().size() == way.nodes().size());
-    for (auto it1 = orig_way.nodes().begin(), it2 = way.nodes().begin();
-         it1 != orig_way.nodes().end(); ++it1, ++it2) {
+    for (auto it1 = orig_way.nodes().cbegin(), it2 = way.nodes().cbegin();
+         it1 != orig_way.nodes().cend(); ++it1, ++it2) {
         CHECK(*it1 == *it2);
     }
 
@@ -792,15 +792,16 @@ void check_relation(std::shared_ptr<middle_pgsql_t> const &mid,
     CHECK(std::strcmp(orig_relation.user(), relation.user()) == 0);
 
     REQUIRE(orig_relation.tags().size() == relation.tags().size());
-    for (auto it1 = orig_relation.tags().begin(), it2 = relation.tags().begin();
-         it1 != orig_relation.tags().end(); ++it1, ++it2) {
+    for (auto it1 = orig_relation.tags().cbegin(),
+              it2 = relation.tags().cbegin();
+         it1 != orig_relation.tags().cend(); ++it1, ++it2) {
         CHECK(*it1 == *it2);
     }
 
     REQUIRE(orig_relation.members().size() == relation.members().size());
-    for (auto it1 = orig_relation.members().begin(),
-              it2 = relation.members().begin();
-         it1 != orig_relation.members().end(); ++it1, ++it2) {
+    for (auto it1 = orig_relation.members().cbegin(),
+              it2 = relation.members().cbegin();
+         it1 != orig_relation.members().cend(); ++it1, ++it2) {
         CHECK(it1->type() == it2->type());
         CHECK(it1->ref() == it2->ref());
         CHECK(std::strcmp(it1->role(), it2->role()) == 0);
diff --git a/tests/test-options-parse.cpp b/tests/test-options-parse.cpp
index 641fbb283..b2ca41f41 100644
--- a/tests/test-options-parse.cpp
+++ b/tests/test-options-parse.cpp
@@ -21,7 +21,7 @@ char const *const TEST_PBF = "foo.pbf";
 
 void bad_opt(std::vector<char const *> opts, char const *msg)
 {
-    opts.insert(opts.begin(), "osm2pgsql");
+    opts.insert(opts.cbegin(), "osm2pgsql");
     opts.push_back(TEST_PBF);
 
     REQUIRE_THROWS_WITH(
@@ -31,7 +31,7 @@ void bad_opt(std::vector<char const *> opts, char const *msg)
 
 options_t opt(std::vector<char const *> opts)
 {
-    opts.insert(opts.begin(), "osm2pgsql");
+    opts.insert(opts.cbegin(), "osm2pgsql");
     opts.push_back(TEST_PBF);
 
     return parse_command_line((int)opts.size(), (char **)opts.data());

From c3cd871db5240c1a6d4510eb4f715ab11dea9990 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 5 Jul 2025 15:21:54 +0200
Subject: [PATCH 309/430] Use const (ref) variables for loops where possible

---
 src/db-copy.cpp                      | 2 +-
 src/geom-pole-of-inaccessibility.cpp | 4 ++--
 src/middle-pgsql.cpp                 | 2 +-
 src/output-flex.cpp                  | 2 +-
 src/output-pgsql.cpp                 | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/db-copy.cpp b/src/db-copy.cpp
index be2eee2e0..300be9bd2 100644
--- a/src/db-copy.cpp
+++ b/src/db-copy.cpp
@@ -31,7 +31,7 @@ void db_deleter_by_id_t::delete_rows(std::string const &table,
     fmt::format_to(std::back_inserter(sql),
                    FMT_STRING("DELETE FROM {} WHERE {} IN ("), table, column);
 
-    for (auto id : m_deletables) {
+    for (auto const id : m_deletables) {
         format_to(std::back_inserter(sql), FMT_STRING("{},"), id);
     }
     sql[sql.size() - 1] = ')';
diff --git a/src/geom-pole-of-inaccessibility.cpp b/src/geom-pole-of-inaccessibility.cpp
index 1573828f5..3e11d1810 100644
--- a/src/geom-pole-of-inaccessibility.cpp
+++ b/src/geom-pole-of-inaccessibility.cpp
@@ -225,8 +225,8 @@ point_t pole_of_inaccessibility(const polygon_t &polygon, double precision,
         auto const h = cell.half_size / 2.0;
         auto const center = cell.center;
 
-        for (auto dy : {-h, h}) {
-            for (auto dx : {-h, h}) {
+        for (auto const dy : {-h, h}) {
+            for (auto const dx : {-h, h}) {
                 Cell const c{point_t{center.x() + dx, center.y() + dy}, h,
                              polygon, stretch};
                 if (c.max > best_cell.dist) {
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index a52aad1a4..77e3695de 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -1168,7 +1168,7 @@ void middle_pgsql_t::stop()
     if (m_options->droptemp) {
         // Dropping the tables is fast, so do it synchronously to guarantee
         // that the space is freed before creating the other indices.
-        for (auto &table : m_tables) {
+        for (auto const &table : m_tables) {
             table.drop_table(m_db_connection);
         }
     } else if (!m_options->append) {
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 50d5f0ecf..67413d278 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -1258,7 +1258,7 @@ output_flex_t::output_flex_t(std::shared_ptr<middle_query_t> const &mid,
         m_table_connections.emplace_back(&table, m_copy_thread);
     }
 
-    for (auto &expire_output : *m_expire_outputs) {
+    for (auto const &expire_output : *m_expire_outputs) {
         m_expire_tiles.emplace_back(
             expire_output.maxzoom(),
             reprojection::create_projection(PROJ_SPHERE_MERC));
diff --git a/src/output-pgsql.cpp b/src/output-pgsql.cpp
index 8167645d4..e0756bff0 100644
--- a/src/output-pgsql.cpp
+++ b/src/output-pgsql.cpp
@@ -366,7 +366,7 @@ void output_pgsql_t::delete_from_output_and_expire(osmid_t id)
 {
     m_tables[t_roads]->delete_row(id);
 
-    for (auto table : {t_line, t_poly}) {
+    for (auto const table : {t_line, t_poly}) {
         if (m_expire.enabled()) {
             auto const results = m_tables.at(table)->get_wkb(id);
             if (expire_from_result(&m_expire, results, m_expire_config) != 0) {

From cec20ae09bbcfc4420f209cd0fc6e828d9a34a03 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 5 Jul 2025 15:32:08 +0200
Subject: [PATCH 310/430] Use east const consistently

---
 src/geom-area-assembler.cpp          | 10 +++++-----
 src/geom-area-assembler.hpp          |  6 +++---
 src/geom-pole-of-inaccessibility.cpp |  2 +-
 src/geom-pole-of-inaccessibility.hpp |  2 +-
 src/idlist.cpp                       |  2 +-
 src/middle-pgsql.cpp                 | 10 +++++-----
 src/osm2pgsql.cpp                    |  4 ++--
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/geom-area-assembler.cpp b/src/geom-area-assembler.cpp
index 99e9633ff..332bd83c3 100644
--- a/src/geom-area-assembler.cpp
+++ b/src/geom-area-assembler.cpp
@@ -13,7 +13,7 @@
 
 namespace geom {
 
-const osmium::area::AssemblerConfig area_config;
+osmium::area::AssemblerConfig const area_config;
 
 area_assembler_t::area_assembler_t(osmium::memory::Buffer *buffer)
 : osmium::area::detail::BasicAssembler(area_config), m_buffer(buffer)
@@ -36,7 +36,7 @@ bool area_assembler_t::make_area()
     return true;
 }
 
-bool area_assembler_t::operator()(const osmium::Way &way)
+bool area_assembler_t::operator()(osmium::Way const &way)
 {
     segment_list().extract_segments_from_way(nullptr, stats().duplicate_nodes,
                                              way);
@@ -46,10 +46,10 @@ bool area_assembler_t::operator()(const osmium::Way &way)
 // Currently the relation is not needed for assembling the area, because
 // the roles on the members are ignored. In the future we might want to use
 // the roles, so we leave the function signature as it is.
-bool area_assembler_t::operator()(const osmium::Relation & /*relation*/,
-                                  const osmium::memory::Buffer &ways_buffer)
+bool area_assembler_t::operator()(osmium::Relation const & /*relation*/,
+                                  osmium::memory::Buffer const &ways_buffer)
 {
-    for (const auto &way : ways_buffer.select<osmium::Way>()) {
+    for (auto const &way : ways_buffer.select<osmium::Way>()) {
         segment_list().extract_segments_from_way(nullptr,
                                                  stats().duplicate_nodes, way);
     }
diff --git a/src/geom-area-assembler.hpp b/src/geom-area-assembler.hpp
index e00f95f26..a83c27ee6 100644
--- a/src/geom-area-assembler.hpp
+++ b/src/geom-area-assembler.hpp
@@ -35,7 +35,7 @@ class area_assembler_t : public osmium::area::detail::BasicAssembler
      * @returns false if there was some kind of error building the
      *          area, true otherwise.
      */
-    bool operator()(const osmium::Way &way);
+    bool operator()(osmium::Way const &way);
 
     /**
      * Assemble an area from the given relation and its member ways
@@ -44,8 +44,8 @@ class area_assembler_t : public osmium::area::detail::BasicAssembler
      * @returns false if there was some kind of error building the
      *          area, true otherwise.
      */
-    bool operator()(const osmium::Relation &relation,
-                    const osmium::memory::Buffer &ways_buffer);
+    bool operator()(osmium::Relation const &relation,
+                    osmium::memory::Buffer const &ways_buffer);
 
     /**
      * Access the area that was built last.
diff --git a/src/geom-pole-of-inaccessibility.cpp b/src/geom-pole-of-inaccessibility.cpp
index 3e11d1810..72c578a0d 100644
--- a/src/geom-pole-of-inaccessibility.cpp
+++ b/src/geom-pole-of-inaccessibility.cpp
@@ -147,7 +147,7 @@ Cell make_centroid_cell(polygon_t const &polygon, double stretch)
 
 } // anonymous namespace
 
-point_t pole_of_inaccessibility(const polygon_t &polygon, double precision,
+point_t pole_of_inaccessibility(polygon_t const &polygon, double precision,
                                 double stretch)
 {
     assert(stretch > 0);
diff --git a/src/geom-pole-of-inaccessibility.hpp b/src/geom-pole-of-inaccessibility.hpp
index d4a2d5a76..6b9c46b2f 100644
--- a/src/geom-pole-of-inaccessibility.hpp
+++ b/src/geom-pole-of-inaccessibility.hpp
@@ -28,7 +28,7 @@ namespace geom {
  *
  * \pre \code stretch > 0 \endcode
  */
-point_t pole_of_inaccessibility(const polygon_t &polygon, double precision,
+point_t pole_of_inaccessibility(polygon_t const &polygon, double precision,
                                 double stretch = 1.0);
 
 void pole_of_inaccessibility(geometry_t *output, geometry_t const &input,
diff --git a/src/idlist.cpp b/src/idlist.cpp
index 44dc7cd7d..3a2581ae5 100644
--- a/src/idlist.cpp
+++ b/src/idlist.cpp
@@ -25,7 +25,7 @@ osmid_t idlist_t::pop_id()
 void idlist_t::sort_unique()
 {
     std::sort(m_list.begin(), m_list.end());
-    const auto last = std::unique(m_list.begin(), m_list.end());
+    auto const last = std::unique(m_list.begin(), m_list.end());
     m_list.erase(last, m_list.end());
 }
 
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index 77e3695de..7d6aae5ee 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -47,8 +47,8 @@
 
 namespace {
 
-void send_id_list(pg_conn_t const &db_connection,
-                         std::string const &table, idlist_t const &ids)
+void send_id_list(pg_conn_t const &db_connection, std::string const &table,
+                  idlist_t const &ids)
 {
     std::string data;
     for (auto const id : ids) {
@@ -171,7 +171,7 @@ class member_list_json_builder
     }
 
     static bool number_float(nlohmann::json::number_float_t /*val*/,
-                             const nlohmann::json::string_t & /*s*/)
+                             nlohmann::json::string_t const & /*s*/)
     {
         return true;
     }
@@ -228,8 +228,8 @@ class member_list_json_builder
     static bool end_array() { return true; }
 
     static bool parse_error(std::size_t /*position*/,
-                            const std::string & /*last_token*/,
-                            const nlohmann::json::exception &ex)
+                            std::string const & /*last_token*/,
+                            nlohmann::json::exception const &ex)
     {
         throw ex;
     }
diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
index f07a6b413..10960162e 100644
--- a/src/osm2pgsql.cpp
+++ b/src/osm2pgsql.cpp
@@ -188,7 +188,7 @@ void check_and_update_flat_node_file(properties_t *properties,
                      flat_node_file_from_import);
         }
     } else {
-        const auto absolute_path =
+        auto const absolute_path =
             std::filesystem::absolute(
                 std::filesystem::path{options->flat_node_file})
                 .string();
@@ -279,7 +279,7 @@ void check_and_update_style_file(properties_t *properties, options_t *options)
         throw std::runtime_error{"Style file from import is empty!?"};
     }
 
-    const auto absolute_path =
+    auto const absolute_path =
         std::filesystem::absolute(std::filesystem::path{options->style})
             .string();
 

From fec8513aa4380a6c752d9d8b7bdaf903438aedf6 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 5 Jul 2025 15:37:48 +0200
Subject: [PATCH 311/430] constexpr const is redundant

---
 src/gen/osm2pgsql-gen.cpp            | 2 +-
 src/gen/tracer.hpp                   | 2 +-
 src/geom-functions.cpp               | 2 +-
 src/geom-pole-of-inaccessibility.cpp | 2 +-
 src/geom.hpp                         | 2 +-
 src/hex.cpp                          | 2 +-
 src/node-locations.cpp               | 2 +-
 src/node-locations.hpp               | 2 +-
 src/ordered-index.hpp                | 2 +-
 src/output-flex.cpp                  | 4 ++--
 src/pgsql.hpp                        | 2 +-
 src/tagtransform-c.cpp               | 2 +-
 src/thread-pool.hpp                  | 2 +-
 src/tile.hpp                         | 9 ++++-----
 src/wkb.cpp                          | 2 +-
 tests/test-expire-from-geometry.cpp  | 2 +-
 tests/test-ordered-index.cpp         | 8 ++++----
 tests/test-output-flex-nodes.cpp     | 2 +-
 18 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index 84b1a5830..0be98a874 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -76,7 +76,7 @@
 
 namespace {
 
-constexpr std::size_t const MAX_FORCE_SINGLE_THREAD = 4;
+constexpr std::size_t MAX_FORCE_SINGLE_THREAD = 4;
 
 struct tile_extent
 {
diff --git a/src/gen/tracer.hpp b/src/gen/tracer.hpp
index d22d49646..1171f1d5a 100644
--- a/src/gen/tracer.hpp
+++ b/src/gen/tracer.hpp
@@ -39,7 +39,7 @@ class tracer_t
     std::size_t num_points() const noexcept { return m_num_points; }
 
 private:
-    static constexpr auto const BITS_PER_WORD = sizeof(potrace_word) * 8;
+    static constexpr std::size_t BITS_PER_WORD = sizeof(potrace_word) * 8;
 
     geom::point_t make_point(potrace_dpoint_t const &p) const noexcept;
 
diff --git a/src/geom-functions.cpp b/src/geom-functions.cpp
index 95c64efee..4d53c3d43 100644
--- a/src/geom-functions.cpp
+++ b/src/geom-functions.cpp
@@ -607,7 +607,7 @@ void line_merge(geometry_t *output, geometry_t const &input)
     std::vector<endpoint_t> endpoints;
 
     // ...and a list of connections.
-    constexpr auto const NOCONN = std::numeric_limits<std::size_t>::max();
+    constexpr std::size_t NOCONN = std::numeric_limits<std::size_t>::max();
 
     struct connection_t
     {
diff --git a/src/geom-pole-of-inaccessibility.cpp b/src/geom-pole-of-inaccessibility.cpp
index 72c578a0d..daa6e2173 100644
--- a/src/geom-pole-of-inaccessibility.cpp
+++ b/src/geom-pole-of-inaccessibility.cpp
@@ -118,7 +118,7 @@ auto point_to_polygon_distance(point_t point, polygon_t const &polygon,
 
 struct Cell
 {
-    static constexpr double const SQRT2 = 1.4142135623730951;
+    static constexpr double SQRT2 = 1.4142135623730951;
 
     Cell(point_t c, double h, polygon_t const &polygon, double stretch)
     : center(c), half_size(h),
diff --git a/src/geom.hpp b/src/geom.hpp
index ac71c7653..24915524d 100644
--- a/src/geom.hpp
+++ b/src/geom.hpp
@@ -200,7 +200,7 @@ class multigeometry_t
     using iterator = typename std::vector<GEOM>::iterator;
     using value_type = GEOM;
 
-    static constexpr bool const FOR_POINT = std::is_same_v<GEOM, point_t>;
+    static constexpr bool FOR_POINT = std::is_same_v<GEOM, point_t>;
 
     [[nodiscard]] std::size_t num_geometries() const noexcept
     {
diff --git a/src/hex.cpp b/src/hex.cpp
index 09868f6cd..51cf01cad 100644
--- a/src/hex.cpp
+++ b/src/hex.cpp
@@ -38,7 +38,7 @@ std::string encode_hex(std::string const &in)
 
 namespace {
 
-constexpr std::array<char, 256> const HEX_TABLE = {
+constexpr std::array<char, 256> HEX_TABLE = {
     0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
     0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
     0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
diff --git a/src/node-locations.cpp b/src/node-locations.cpp
index 9f1a2eac8..1ce3787b2 100644
--- a/src/node-locations.cpp
+++ b/src/node-locations.cpp
@@ -83,7 +83,7 @@ osmium::Location node_locations_t::get(osmid_t id) const
 
 void node_locations_t::log_stats()
 {
-    constexpr auto const MBYTE = 1024 * 1024;
+    constexpr auto MBYTE = 1024 * 1024;
     log_debug("Node locations cache:");
     log_debug("  num locations stored: {}", m_count);
     log_debug("  bytes overall: {}MB", used_memory() / MBYTE);
diff --git a/src/node-locations.hpp b/src/node-locations.hpp
index cf50b68a0..d520d03d5 100644
--- a/src/node-locations.hpp
+++ b/src/node-locations.hpp
@@ -85,7 +85,7 @@ class node_locations_t
      * The block size used for internal blocks. The larger the block size
      * the less memory is consumed but the more expensive the access is.
      */
-    static constexpr const std::size_t BLOCK_SIZE = 32;
+    static constexpr std::size_t BLOCK_SIZE = 32;
 
     bool first_entry_in_block() const noexcept
     {
diff --git a/src/ordered-index.hpp b/src/ordered-index.hpp
index 70790f014..f8792b975 100644
--- a/src/ordered-index.hpp
+++ b/src/ordered-index.hpp
@@ -185,7 +185,7 @@ class ordered_index_t
 
     std::pair<osmid_t, std::size_t> get_internal(osmid_t id) const noexcept;
 
-    static constexpr std::size_t const MAX_BLOCK_SIZE = 16UL * 1024UL * 1024UL;
+    static constexpr std::size_t MAX_BLOCK_SIZE = 16UL * 1024UL * 1024UL;
 
     std::vector<range_entry> m_ranges;
     std::size_t m_block_size;
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 67413d278..3a3b4e625 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -133,7 +133,7 @@ void push_osm_object_to_lua_stack(lua_State *lua_state,
      * timestamp, changeset, uid, user). For ways there are 2 more (is_closed,
      * nodes), for relations 1 more (members).
      */
-    constexpr int const MAX_TABLE_SIZE = 10;
+    constexpr int MAX_TABLE_SIZE = 10;
 
     lua_createtable(lua_state, 0, MAX_TABLE_SIZE);
 
@@ -243,7 +243,7 @@ typename CONTAINER::value_type &get_from_idx_param(lua_State *lua_state,
 
 std::size_t get_nodes(middle_query_t const &middle, osmium::Way *way)
 {
-    constexpr std::size_t const MAX_MISSING_NODES = 100;
+    constexpr std::size_t MAX_MISSING_NODES = 100;
     static std::size_t count_missing_nodes = 0;
 
     auto const count = middle.nodes_get_list(&way->nodes());
diff --git a/src/pgsql.hpp b/src/pgsql.hpp
index be2d6f9ad..17a28f54e 100644
--- a/src/pgsql.hpp
+++ b/src/pgsql.hpp
@@ -319,7 +319,7 @@ class pg_conn_t
         // It needs to be large enough to hold all parameters without resizing
         // so that pointers into the strings in that vector remain valid
         // after new parameters have been added.
-        constexpr auto const TOTAL_BUFFERS_NEEDED =
+        constexpr auto TOTAL_BUFFERS_NEEDED =
             (0 + ... + buffers_needed<std::decay_t<TArgs>>());
 
         std::vector<std::string> exec_params;
diff --git a/src/tagtransform-c.cpp b/src/tagtransform-c.cpp
index 27addf710..c1b87b69c 100644
--- a/src/tagtransform-c.cpp
+++ b/src/tagtransform-c.cpp
@@ -26,7 +26,7 @@ struct layers_type
     bool roads;
 };
 
-constexpr std::array<layers_type, 25> const LAYERS = {
+constexpr std::array<layers_type, 25> LAYERS = {
     {{"proposed", 1, false},       {"construction", 2, false},
      {"steps", 10, false},         {"cycleway", 10, false},
      {"bridleway", 10, false},     {"footway", 10, false},
diff --git a/src/thread-pool.hpp b/src/thread-pool.hpp
index 11d1afac9..0b66f115e 100644
--- a/src/thread-pool.hpp
+++ b/src/thread-pool.hpp
@@ -151,7 +151,7 @@ class thread_pool_t
 
     }; // class thread_joiner
 
-    static constexpr std::size_t const MAX_QUEUE_SIZE = 32;
+    static constexpr std::size_t MAX_QUEUE_SIZE = 32;
 
     osmium::thread::Queue<osmium::thread::function_wrapper> m_work_queue;
     std::vector<std::thread> m_threads;
diff --git a/src/tile.hpp b/src/tile.hpp
index c95a376e9..99b248f32 100644
--- a/src/tile.hpp
+++ b/src/tile.hpp
@@ -73,9 +73,8 @@ using quadkey_list_t = std::vector<quadkey_t>;
 class tile_t
 {
 public:
-    static constexpr double const EARTH_CIRCUMFERENCE = 40075016.68;
-    static constexpr double const HALF_EARTH_CIRCUMFERENCE =
-        EARTH_CIRCUMFERENCE / 2;
+    static constexpr double EARTH_CIRCUMFERENCE = 40075016.68;
+    static constexpr double HALF_EARTH_CIRCUMFERENCE = EARTH_CIRCUMFERENCE / 2;
 
     /// Construct an invalid tile.
     tile_t() noexcept = default;
@@ -258,10 +257,10 @@ class tile_t
     static tile_t from_quadkey(quadkey_t quadkey, uint32_t zoom) noexcept;
 
 private:
-    static constexpr uint32_t const INVALID_ZOOM =
+    static constexpr uint32_t INVALID_ZOOM =
         std::numeric_limits<uint32_t>::max();
 
-    static constexpr uint32_t const MAX_ZOOM = 32;
+    static constexpr uint32_t MAX_ZOOM = 32;
 
     uint32_t m_x = 0;
     uint32_t m_y = 0;
diff --git a/src/wkb.cpp b/src/wkb.cpp
index 07efec0fd..cf25f2d7c 100644
--- a/src/wkb.cpp
+++ b/src/wkb.cpp
@@ -217,7 +217,7 @@ class make_ewkb_visitor
             write_point(&data, geom);
         } else {
             // 9 byte header plus one set of coordinates
-            constexpr const std::size_t SIZE = 9 + 2 * 8;
+            constexpr std::size_t SIZE = 9 + 2 * 8;
             data.reserve(SIZE);
             write_point(&data, geom, m_srid);
             assert(data.size() == SIZE);
diff --git a/tests/test-expire-from-geometry.cpp b/tests/test-expire-from-geometry.cpp
index f0c73c47f..0260a7533 100644
--- a/tests/test-expire-from-geometry.cpp
+++ b/tests/test-expire-from-geometry.cpp
@@ -25,7 +25,7 @@ std::shared_ptr<reprojection> defproj{
 
 // We are using zoom level 12 here, because at that level a tile is about
 // 10,000 units wide/high which gives us easy numbers to work with.
-constexpr uint32_t const zoom = 12;
+constexpr uint32_t zoom = 12;
 
 } // anonymous namespace
 
diff --git a/tests/test-ordered-index.cpp b/tests/test-ordered-index.cpp
index da75d89c6..5a06abc00 100644
--- a/tests/test-ordered-index.cpp
+++ b/tests/test-ordered-index.cpp
@@ -13,7 +13,7 @@
 
 TEST_CASE("ordered index basics", "[NoDB]")
 {
-    constexpr std::size_t const block_size = 16;
+    constexpr std::size_t block_size = 16;
     ordered_index_t index{block_size};
 
     REQUIRE(index.size() == 0);
@@ -38,7 +38,7 @@ TEST_CASE("ordered index basics", "[NoDB]")
 
 TEST_CASE("ordered index set/get", "[NoDB]")
 {
-    constexpr std::size_t const block_size = 16;
+    constexpr std::size_t block_size = 16;
     ordered_index_t index{block_size};
 
     index.add(19, 0);
@@ -64,7 +64,7 @@ TEST_CASE("ordered index set/get", "[NoDB]")
 
 TEST_CASE("ordered index set/get with multiple second-level blocks", "[NoDB]")
 {
-    constexpr std::size_t const block_size = 4;
+    constexpr std::size_t block_size = 4;
     ordered_index_t index{block_size};
 
     index.add(19, 0);
@@ -106,7 +106,7 @@ TEST_CASE("ordered index set/get with multiple second-level blocks", "[NoDB]")
 
 TEST_CASE("ordered index with huge gaps in ids", "[NoDB]")
 {
-    constexpr std::size_t const block_size = 4;
+    constexpr std::size_t block_size = 4;
     ordered_index_t index{block_size};
 
     index.add(1, 0);
diff --git a/tests/test-output-flex-nodes.cpp b/tests/test-output-flex-nodes.cpp
index 3dae49be8..9ffbf85ae 100644
--- a/tests/test-output-flex-nodes.cpp
+++ b/tests/test-output-flex-nodes.cpp
@@ -63,7 +63,7 @@ enum class node_relationship : std::uint8_t
 template <node_relationship R>
 struct node_rel
 {
-    static constexpr const node_relationship rs = R;
+    static constexpr node_relationship rs = R;
 };
 
 using node_rel_none = node_rel<node_relationship::none>;

From e792264b4cc0f493a1961338236533bbfee99014 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 5 Jul 2025 17:05:19 +0200
Subject: [PATCH 312/430] Use smaller enums

Found by clang-tidy

In src/taginfo-impl.hpp we can't use a smaller type, because we use bool
operators on those values which promotes them to ints which leads to
other problems.
---
 src/output-pgsql.hpp | 3 ++-
 src/taginfo-impl.hpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/output-pgsql.hpp b/src/output-pgsql.hpp
index 82aab120e..39cde4c5d 100644
--- a/src/output-pgsql.hpp
+++ b/src/output-pgsql.hpp
@@ -23,12 +23,13 @@
 #include "tagtransform.hpp"
 
 #include <array>
+#include <cstdint>
 #include <memory>
 
 class output_pgsql_t : public output_t
 {
 public:
-    enum table_id
+    enum table_id : std::uint8_t
     {
         t_point = 0,
         t_line,
diff --git a/src/taginfo-impl.hpp b/src/taginfo-impl.hpp
index e93296549..8534e9086 100644
--- a/src/taginfo-impl.hpp
+++ b/src/taginfo-impl.hpp
@@ -19,7 +19,7 @@
 #include <utility>
 #include <vector>
 
-enum column_flags : unsigned int
+enum column_flags : unsigned int // NOLINT(performance-enum-size)
 {
     FLAG_POLYGON = 1, /* For polygon table */
     FLAG_LINEAR = 2,  /* For lines table */

From 6518353ade764bef09c9c1bc179a13f6f38f6331 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 5 Jul 2025 17:05:19 +0200
Subject: [PATCH 313/430] Disable clang-tidy warnings in legacy code

This code will be removed with the pgsql output at some point and we
don't want to fiddle with it any more than necessary.
---
 src/table.cpp   | 4 ++++
 src/taginfo.cpp | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/src/table.cpp b/src/table.cpp
index e6a40c010..4d4dc511f 100644
--- a/src/table.cpp
+++ b/src/table.cpp
@@ -355,6 +355,9 @@ void table_t::task_wait()
              util::human_readable_duration(run_time));
 }
 
+// NOLINTBEGIN(google-runtime-int,cert-err34-c)
+// This is legacy code which will be removed anyway.
+
 /* Escape data appropriate to the type */
 void table_t::escape_type(std::string const &value, ColumnType flags)
 {
@@ -423,6 +426,7 @@ void table_t::escape_type(std::string const &value, ColumnType flags)
         break;
     }
 }
+// NOLINTEND(google-runtime-int,cert-err34-c)
 
 pg_result_t table_t::get_wkb(osmid_t id)
 {
diff --git a/src/taginfo.cpp b/src/taginfo.cpp
index 8cfa85892..208f8b019 100644
--- a/src/taginfo.cpp
+++ b/src/taginfo.cpp
@@ -87,6 +87,8 @@ unsigned get_tag_type(std::string const &tag)
 
 } // anonymous namespace
 
+// NOLINTBEGIN(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+// This is legacy code which will be removed anyway.
 bool read_style_file(std::string const &filename, export_list *exlist)
 {
     bool enable_way_area = true;
@@ -195,3 +197,4 @@ bool read_style_file(std::string const &filename, export_list *exlist)
 
     return enable_way_area;
 }
+// NOLINTEND(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)

From 7ab133eaf46f22c78a964f5b55bc09aa17528b1e Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 5 Jul 2025 17:05:19 +0200
Subject: [PATCH 314/430] Remove implied inlines

---
 src/geom-boost-adaptor.hpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/geom-boost-adaptor.hpp b/src/geom-boost-adaptor.hpp
index 4ca489ce5..7eac5fbf9 100644
--- a/src/geom-boost-adaptor.hpp
+++ b/src/geom-boost-adaptor.hpp
@@ -85,8 +85,8 @@ BOOST_GEOMETRY_DETAIL_SPECIALIZE_BOX_TRAITS(::geom::box_t, ::geom::point_t)
 template <>
 struct indexed_access<::geom::box_t, min_corner, 0>
 {
-    static inline double get(::geom::box_t const &b) { return b.min_x(); }
-    static inline void set(::geom::box_t &b, double value)
+    static double get(::geom::box_t const &b) { return b.min_x(); }
+    static void set(::geom::box_t &b, double value)
     {
         b.set_min_x(value);
     }
@@ -95,8 +95,8 @@ struct indexed_access<::geom::box_t, min_corner, 0>
 template <>
 struct indexed_access<::geom::box_t, min_corner, 1>
 {
-    static inline double get(::geom::box_t const &b) { return b.min_y(); }
-    static inline void set(::geom::box_t &b, double value)
+    static double get(::geom::box_t const &b) { return b.min_y(); }
+    static void set(::geom::box_t &b, double value)
     {
         b.set_min_y(value);
     }
@@ -105,8 +105,8 @@ struct indexed_access<::geom::box_t, min_corner, 1>
 template <>
 struct indexed_access<::geom::box_t, max_corner, 0>
 {
-    static inline double get(::geom::box_t const &b) { return b.max_x(); }
-    static inline void set(::geom::box_t &b, double value)
+    static double get(::geom::box_t const &b) { return b.max_x(); }
+    static void set(::geom::box_t &b, double value)
     {
         b.set_max_x(value);
     }
@@ -115,8 +115,8 @@ struct indexed_access<::geom::box_t, max_corner, 0>
 template <>
 struct indexed_access<::geom::box_t, max_corner, 1>
 {
-    static inline double get(::geom::box_t const &b) { return b.max_y(); }
-    static inline void set(::geom::box_t &b, double value)
+    static double get(::geom::box_t const &b) { return b.max_y(); }
+    static void set(::geom::box_t &b, double value)
     {
         b.set_max_y(value);
     }

From 34b01a20f520b0adb5180643568d2e3f58e33f9b Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 5 Jul 2025 17:05:19 +0200
Subject: [PATCH 315/430] Don't use std::forward in a loop

This could be a use after move.
---
 src/geom-functions.hpp | 4 ++--
 src/lua-utils.hpp      | 8 ++++----
 src/tile.hpp           | 9 ++++-----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/geom-functions.hpp b/src/geom-functions.hpp
index 7c22d6298..56ace587d 100644
--- a/src/geom-functions.hpp
+++ b/src/geom-functions.hpp
@@ -43,13 +43,13 @@ point_t interpolate(point_t p1, point_t p2, double frac) noexcept;
  * \pre \code !list.empty() \endcode
  */
 template <typename FUNC>
-void for_each_segment(point_list_t const &list, FUNC &&func)
+void for_each_segment(point_list_t const &list, FUNC const &func)
 {
     assert(!list.empty());
     auto it = list.cbegin();
     auto prev = it;
     for (++it; it != list.cend(); ++it) {
-        std::forward<FUNC>(func)(*prev, *it);
+        func(*prev, *it);
         prev = it;
     }
 }
diff --git a/src/lua-utils.hpp b/src/lua-utils.hpp
index 3ca4ec91b..920d28495 100644
--- a/src/lua-utils.hpp
+++ b/src/lua-utils.hpp
@@ -40,14 +40,14 @@ void luaX_add_table_func(lua_State *lua_state, char const *key,
 
 template <typename COLLECTION, typename FUNC>
 void luaX_add_table_array(lua_State *lua_state, char const *key,
-                          COLLECTION const &collection, FUNC &&func)
+                          COLLECTION const &collection, FUNC const &func)
 {
     lua_pushstring(lua_state, key);
     lua_createtable(lua_state, (int)collection.size(), 0);
     int n = 0;
     for (auto const &member : collection) {
         lua_pushinteger(lua_state, ++n);
-        std::forward<FUNC>(func)(member);
+        func(member);
         lua_rawset(lua_state, -3);
     }
     lua_rawset(lua_state, -3);
@@ -99,7 +99,7 @@ bool luaX_is_array(lua_State *lua_state);
  * \post Stack is unchanged.
  */
 template <typename FUNC>
-void luaX_for_each(lua_State *lua_state, FUNC &&func)
+void luaX_for_each(lua_State *lua_state, FUNC const &func)
 {
     assert(lua_istable(lua_state, -1));
     lua_pushnil(lua_state);
@@ -107,7 +107,7 @@ void luaX_for_each(lua_State *lua_state, FUNC &&func)
 #ifndef NDEBUG
         int const top = lua_gettop(lua_state);
 #endif
-        std::forward<FUNC>(func)();
+        func();
         assert(top == lua_gettop(lua_state));
         lua_pop(lua_state, 1);
     }
diff --git a/src/tile.hpp b/src/tile.hpp
index c95a376e9..c76f97d2e 100644
--- a/src/tile.hpp
+++ b/src/tile.hpp
@@ -281,14 +281,14 @@ class tile_t
  */
 template <class OUTPUT>
 std::size_t for_each_tile(quadkey_list_t const &tiles_at_maxzoom,
-                          uint32_t minzoom, uint32_t maxzoom, OUTPUT &&output)
+                          uint32_t minzoom, uint32_t maxzoom,
+                          OUTPUT const &output)
 {
     assert(minzoom <= maxzoom);
 
     if (minzoom == maxzoom) {
         for (auto const quadkey : tiles_at_maxzoom) {
-            std::forward<OUTPUT>(output)(
-                tile_t::from_quadkey(quadkey, maxzoom));
+            output(tile_t::from_quadkey(quadkey, maxzoom));
         }
         return tiles_at_maxzoom.size();
     }
@@ -309,8 +309,7 @@ std::size_t for_each_tile(quadkey_list_t const &tiles_at_maxzoom,
              * the first sibling.
              */
             if (qt_current != last_quadkey.down(dz)) {
-                std::forward<OUTPUT>(output)(
-                    tile_t::from_quadkey(qt_current, maxzoom - dz));
+                output(tile_t::from_quadkey(qt_current, maxzoom - dz));
                 ++count;
             }
         }

From f971b7169ff5a46b8db2981f03a0541afd5cdc21 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 5 Jul 2025 17:05:19 +0200
Subject: [PATCH 316/430] Use universal ref and std::forward

---
 src/db-copy-mgr.hpp |  4 ++--
 src/pgsql.hpp       | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/db-copy-mgr.hpp b/src/db-copy-mgr.hpp
index 7585e87de..971f17d82 100644
--- a/src/db-copy-mgr.hpp
+++ b/src/db-copy-mgr.hpp
@@ -93,9 +93,9 @@ class db_copy_mgr_t
      * a column delimiter.
      */
     template <typename T>
-    void add_column(T value)
+    void add_column(T &&value)
     {
-        add_value(value);
+        add_value(std::forward<T>(value));
         m_current.buffer += '\t';
     }
 
diff --git a/src/pgsql.hpp b/src/pgsql.hpp
index be2d6f9ad..f6981b8a4 100644
--- a/src/pgsql.hpp
+++ b/src/pgsql.hpp
@@ -180,7 +180,7 @@ class pg_conn_t
      *         status code PGRES_COMMAND_OK or PGRES_TUPLES_OK).
      */
     template <typename... TArgs>
-    pg_result_t exec(fmt::format_string<TArgs...> sql, TArgs... params) const
+    pg_result_t exec(fmt::format_string<TArgs...> sql, TArgs &&...params) const
     {
         return exec(fmt::format(sql, std::forward<TArgs>(params)...));
     }
@@ -196,7 +196,7 @@ class pg_conn_t
      */
     template <typename... TArgs>
     void prepare(std::string const &stmt, fmt::format_string<TArgs...> sql,
-                 TArgs... params) const
+                 TArgs &&...params) const
     {
         std::string const query =
             fmt::format(sql, std::forward<TArgs>(params)...);
@@ -213,7 +213,7 @@ class pg_conn_t
      * \throws exception if the command failed.
      */
     template <typename... TArgs>
-    pg_result_t exec_prepared(char const *stmt, TArgs... params) const
+    pg_result_t exec_prepared(char const *stmt, TArgs &&...params) const
     {
         return exec_prepared_with_result_format(stmt, false,
                                                 std::forward<TArgs>(params)...);
@@ -229,7 +229,8 @@ class pg_conn_t
      * \throws exception if the command failed.
      */
     template <typename... TArgs>
-    pg_result_t exec_prepared_as_binary(char const *stmt, TArgs... params) const
+    pg_result_t exec_prepared_as_binary(char const *stmt,
+                                        TArgs &&...params) const
     {
         return exec_prepared_with_result_format(stmt, true,
                                                 std::forward<TArgs>(params)...);
@@ -312,7 +313,7 @@ class pg_conn_t
     template <typename... TArgs>
     pg_result_t exec_prepared_with_result_format(char const *stmt,
                                                  bool result_as_binary,
-                                                 TArgs... params) const
+                                                 TArgs &&...params) const
     {
         // We have to convert all non-string parameters into strings and
         // store them somewhere. We use the exec_params vector for this.

From b3b1055f2b6697cd09cb1ab6b6c4d610d90c0272 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 5 Jul 2025 17:05:19 +0200
Subject: [PATCH 317/430] Disable unhelpful clang-tidy warning for templated
 code

---
 src/params.hpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/params.hpp b/src/params.hpp
index c5bff5975..a5935393e 100644
--- a/src/params.hpp
+++ b/src/params.hpp
@@ -54,6 +54,7 @@ class params_t
         m_map.insert_or_assign(std::forward<K>(key), value);
     }
 
+    // NOLINTBEGIN(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
     template <typename K, typename V,
               std::enable_if_t<std::is_integral_v<std::remove_reference_t<V>>,
                                bool> = true>
@@ -71,6 +72,7 @@ class params_t
     {
         m_map.insert_or_assign(std::forward<K>(key), std::string(value));
     }
+    // NOLINTEND(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
 
     template <typename K>
     void remove(K &&key)

From 470092dfe452172cba23a1466066c6beb765e33f Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 7 Jul 2025 09:50:20 +0200
Subject: [PATCH 318/430] Accessors should return string references, not copies

---
 src/expire-output.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/expire-output.hpp b/src/expire-output.hpp
index 6325a6960..c25033d96 100644
--- a/src/expire-output.hpp
+++ b/src/expire-output.hpp
@@ -29,16 +29,16 @@ class expire_output_t
 public:
     expire_output_t() = default;
 
-    std::string filename() const noexcept { return m_filename; }
+    std::string const &filename() const noexcept { return m_filename; }
 
     void set_filename(std::string filename)
     {
         m_filename = std::move(filename);
     }
 
-    std::string schema() const noexcept { return m_schema; }
+    std::string const &schema() const noexcept { return m_schema; }
 
-    std::string table() const noexcept { return m_table; }
+    std::string const &table() const noexcept { return m_table; }
 
     void set_schema_and_table(std::string schema, std::string table)
     {

From 4bc74b3a9ff26dce32e67ac29de16c1fcca137f1 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 7 Jul 2025 10:29:04 +0200
Subject: [PATCH 319/430] Refactoring: Use luaX_pushstring() helper more

Gets rid of c_str() in many places
---
 src/flex-lua-locator.cpp | 4 ++--
 src/flex-lua-table.cpp   | 9 ++++-----
 src/lua-setup.cpp        | 2 +-
 src/lua-utils.cpp        | 4 ++--
 src/lua-utils.hpp        | 2 +-
 src/output-flex.cpp      | 2 +-
 src/tagtransform-lua.cpp | 8 ++++----
 7 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/flex-lua-locator.cpp b/src/flex-lua-locator.cpp
index 4598a7854..113675d14 100644
--- a/src/flex-lua-locator.cpp
+++ b/src/flex-lua-locator.cpp
@@ -158,7 +158,7 @@ int lua_wrapper_locator::all_intersecting()
     int n = 0;
     for (auto const& name : names) {
         lua_pushinteger(lua_state(), ++n);
-        lua_pushstring(lua_state(), name.c_str());
+        luaX_pushstring(lua_state(), name);
         lua_rawset(lua_state(), -3);
     }
 
@@ -182,7 +182,7 @@ int lua_wrapper_locator::first_intersecting()
         return 0;
     }
 
-    lua_pushstring(lua_state(), name.c_str());
+    luaX_pushstring(lua_state(), name);
 
     return 1;
 }
diff --git a/src/flex-lua-table.cpp b/src/flex-lua-table.cpp
index d7239706a..6f6ed4064 100644
--- a/src/flex-lua-table.cpp
+++ b/src/flex-lua-table.cpp
@@ -503,12 +503,11 @@ int lua_wrapper_table::columns() const
         lua_pushinteger(lua_state(), ++n);
         lua_newtable(lua_state());
 
-        luaX_add_table_str(lua_state(), "name", column.name().c_str());
-        luaX_add_table_str(lua_state(), "type", column.type_name().c_str());
-        luaX_add_table_str(lua_state(), "sql_type",
-                           column.sql_type_name().c_str());
+        luaX_add_table_str(lua_state(), "name", column.name());
+        luaX_add_table_str(lua_state(), "type", column.type_name());
+        luaX_add_table_str(lua_state(), "sql_type", column.sql_type_name());
         luaX_add_table_str(lua_state(), "sql_modifiers",
-                           column.sql_modifiers().c_str());
+                           column.sql_modifiers());
         luaX_add_table_bool(lua_state(), "not_null", column.not_null());
         luaX_add_table_bool(lua_state(), "create_only", column.create_only());
 
diff --git a/src/lua-setup.cpp b/src/lua-setup.cpp
index e28e65d26..25b0266ff 100644
--- a/src/lua-setup.cpp
+++ b/src/lua-setup.cpp
@@ -33,7 +33,7 @@ void setup_lua_environment(lua_State *lua_state, std::string const &filename,
     if (!dir_path.empty()) {
         dir_path += std::filesystem::path::preferred_separator;
     }
-    luaX_add_table_str(lua_state, "config_dir", dir_path.c_str());
+    luaX_add_table_str(lua_state, "config_dir", dir_path);
 
     luaX_add_table_str(lua_state, "mode", append_mode ? "append" : "create");
 }
diff --git a/src/lua-utils.cpp b/src/lua-utils.cpp
index 376d460a9..c843ec375 100644
--- a/src/lua-utils.cpp
+++ b/src/lua-utils.cpp
@@ -76,10 +76,10 @@ void luaX_add_table_str(lua_State *lua_state, char const *key,
 }
 
 void luaX_add_table_str(lua_State *lua_state, char const *key,
-                        char const *value, std::size_t size) noexcept
+                        std::string_view value) noexcept
 {
     lua_pushstring(lua_state, key);
-    lua_pushlstring(lua_state, value, size);
+    luaX_pushstring(lua_state, value);
     lua_rawset(lua_state, -3);
 }
 
diff --git a/src/lua-utils.hpp b/src/lua-utils.hpp
index 920d28495..cd0919f12 100644
--- a/src/lua-utils.hpp
+++ b/src/lua-utils.hpp
@@ -28,7 +28,7 @@ void luaX_pushstring(lua_State *lua_state, std::string_view str) noexcept;
 void luaX_add_table_str(lua_State *lua_state, char const *key,
                         char const *value) noexcept;
 void luaX_add_table_str(lua_State *lua_state, char const *key,
-                        char const *value, std::size_t size) noexcept;
+                        std::string_view value) noexcept;
 void luaX_add_table_int(lua_State *lua_state, char const *key,
                         int64_t value) noexcept;
 void luaX_add_table_num(lua_State *lua_state, char const *key,
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 3a3b4e625..a806a5c80 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -1281,7 +1281,7 @@ void output_flex_t::init_lua(std::string const &filename,
     lua_createtable(lua_state(), 0, (int)properties.size());
     for (auto const &property : properties) {
         luaX_add_table_str(lua_state(), property.first.c_str(),
-                           property.second.c_str());
+                           property.second);
     }
     lua_rawset(lua_state(), -3);
 
diff --git a/src/tagtransform-lua.cpp b/src/tagtransform-lua.cpp
index b22c6d28f..678bdd2f0 100644
--- a/src/tagtransform-lua.cpp
+++ b/src/tagtransform-lua.cpp
@@ -111,8 +111,8 @@ bool lua_tagtransform_t::filter_tags(osmium::OSMObject const &o, bool *polygon,
         taglist_t tags;
         tags.add_attributes(o);
         for (auto const &t : tags) {
-            lua_pushstring(lua_state(), t.key.c_str());
-            lua_pushstring(lua_state(), t.value.c_str());
+            luaX_pushstring(lua_state(), t.key);
+            luaX_pushstring(lua_state(), t.value);
             lua_rawset(lua_state(), -3);
             ++sz;
         }
@@ -158,8 +158,8 @@ bool lua_tagtransform_t::filter_rel_member_tags(
     lua_newtable(lua_state()); /* relations key value table */
 
     for (auto const &rel_tag : rel_tags) {
-        lua_pushstring(lua_state(), rel_tag.key.c_str());
-        lua_pushstring(lua_state(), rel_tag.value.c_str());
+        luaX_pushstring(lua_state(), rel_tag.key);
+        luaX_pushstring(lua_state(), rel_tag.value);
         lua_rawset(lua_state(), -3);
     }
 

From 7f5da49804dc578c09cfd1d52df5f72ddbf104c2 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 7 Jul 2025 09:49:04 +0200
Subject: [PATCH 320/430] Make some simple functions noexcept

---
 src/flex-lua-expire-output.cpp | 10 +++++-----
 src/flex-lua-expire-output.hpp | 10 +++++-----
 src/flex-lua-locator.cpp       |  2 +-
 src/flex-lua-locator.hpp       |  2 +-
 src/flex-lua-table.cpp         |  6 +++---
 src/flex-lua-table.hpp         |  6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/flex-lua-expire-output.cpp b/src/flex-lua-expire-output.cpp
index aac3ba2f3..e3609de33 100644
--- a/src/flex-lua-expire-output.cpp
+++ b/src/flex-lua-expire-output.cpp
@@ -138,31 +138,31 @@ int lua_wrapper_expire_output::tostring() const
     return 1;
 }
 
-int lua_wrapper_expire_output::filename() const
+int lua_wrapper_expire_output::filename() const noexcept
 {
     luaX_pushstring(lua_state(), self().filename());
     return 1;
 }
 
-int lua_wrapper_expire_output::maxzoom() const
+int lua_wrapper_expire_output::maxzoom() const noexcept
 {
     lua_pushinteger(lua_state(), self().maxzoom());
     return 1;
 }
 
-int lua_wrapper_expire_output::minzoom() const
+int lua_wrapper_expire_output::minzoom() const noexcept
 {
     lua_pushinteger(lua_state(), self().minzoom());
     return 1;
 }
 
-int lua_wrapper_expire_output::schema() const
+int lua_wrapper_expire_output::schema() const noexcept
 {
     luaX_pushstring(lua_state(), self().schema());
     return 1;
 }
 
-int lua_wrapper_expire_output::table() const
+int lua_wrapper_expire_output::table() const noexcept
 {
     luaX_pushstring(lua_state(), self().table());
     return 1;
diff --git a/src/flex-lua-expire-output.hpp b/src/flex-lua-expire-output.hpp
index 29dc0ae68..dcdc4be4a 100644
--- a/src/flex-lua-expire-output.hpp
+++ b/src/flex-lua-expire-output.hpp
@@ -37,11 +37,11 @@ class lua_wrapper_expire_output : public lua_wrapper_base<expire_output_t>
     }
 
     int tostring() const;
-    int filename() const;
-    int maxzoom() const;
-    int minzoom() const;
-    int schema() const;
-    int table() const;
+    int filename() const noexcept;
+    int maxzoom() const noexcept;
+    int minzoom() const noexcept;
+    int schema() const noexcept;
+    int table() const noexcept;
 
 }; // class lua_wrapper_expire_output
 
diff --git a/src/flex-lua-locator.cpp b/src/flex-lua-locator.cpp
index 113675d14..65bc7bfb5 100644
--- a/src/flex-lua-locator.cpp
+++ b/src/flex-lua-locator.cpp
@@ -104,7 +104,7 @@ int lua_wrapper_locator::tostring() const
     return 1;
 }
 
-int lua_wrapper_locator::name() const
+int lua_wrapper_locator::name() const noexcept
 {
     luaX_pushstring(lua_state(), self().name());
     return 1;
diff --git a/src/flex-lua-locator.hpp b/src/flex-lua-locator.hpp
index 6dcbea93f..186256780 100644
--- a/src/flex-lua-locator.hpp
+++ b/src/flex-lua-locator.hpp
@@ -39,7 +39,7 @@ class lua_wrapper_locator : public lua_wrapper_base<locator_t>
     }
 
     int tostring() const;
-    int name() const;
+    int name() const noexcept;
     int add_bbox();
     int add_from_db();
     int all_intersecting();
diff --git a/src/flex-lua-table.cpp b/src/flex-lua-table.cpp
index 6f6ed4064..9bff4d543 100644
--- a/src/flex-lua-table.cpp
+++ b/src/flex-lua-table.cpp
@@ -488,7 +488,7 @@ int lua_wrapper_table::tostring() const
     return 1;
 }
 
-int lua_wrapper_table::cluster() const
+int lua_wrapper_table::cluster() const noexcept
 {
     lua_pushboolean(lua_state(), self().cluster_by_geom());
     return 1;
@@ -517,13 +517,13 @@ int lua_wrapper_table::columns() const
     return 1;
 }
 
-int lua_wrapper_table::name() const
+int lua_wrapper_table::name() const noexcept
 {
     luaX_pushstring(lua_state(), self().name());
     return 1;
 }
 
-int lua_wrapper_table::schema() const
+int lua_wrapper_table::schema() const noexcept
 {
     luaX_pushstring(lua_state(), self().schema());
     return 1;
diff --git a/src/flex-lua-table.hpp b/src/flex-lua-table.hpp
index 29d8b9ef4..9bda81830 100644
--- a/src/flex-lua-table.hpp
+++ b/src/flex-lua-table.hpp
@@ -37,10 +37,10 @@ class lua_wrapper_table : public lua_wrapper_base<flex_table_t>
     }
 
     int tostring() const;
-    int cluster() const;
+    int cluster() const noexcept;
     int columns() const;
-    int name() const;
-    int schema() const;
+    int name() const noexcept;
+    int schema() const noexcept;
 
 }; // class lua_wrapper_table
 

From 4be9356a8a265696c8916f90cf348a63f544860e Mon Sep 17 00:00:00 2001
From: Amanda McCann <amanda@technomancy.org>
Date: Mon, 7 Jul 2025 14:43:04 +0200
Subject: [PATCH 321/430] Log message improvement

This log message implies all these changes will be applied.
But with high lag, that might not happen.
Clarify the log message
---
 scripts/osm2pgsql-replication | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/osm2pgsql-replication b/scripts/osm2pgsql-replication
index 297084140..3cc31037f 100755
--- a/scripts/osm2pgsql-replication
+++ b/scripts/osm2pgsql-replication
@@ -517,7 +517,7 @@ def update(props, args):
         return 0
 
     remote_server_age_sec = int((dt.datetime.now(dt.timezone.utc) - current.timestamp).total_seconds())
-    LOG.debug("Applying %d sequence(s) (%d → %d), covering %s (%s sec) of changes (%s → %s)",
+    LOG.debug("Need to apply %d sequence(s) (%d → %d), covering %s (%s sec) of changes (%s → %s)",
         current.sequence - seq, current.sequence, seq,
         pretty_format_timedelta((current.timestamp - ts).total_seconds()),
         int((current.timestamp - ts).total_seconds()),

From 1c5a607890cb5cd99995ffc114e4ab02d3791658 Mon Sep 17 00:00:00 2001
From: Amanda McCann <amanda@technomancy.org>
Date: Mon, 7 Jul 2025 14:47:54 +0200
Subject: [PATCH 322/430] =?UTF-8?q?correct=20log=20message=20(to=E2=86=92f?=
 =?UTF-8?q?rom)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The order of “previous seq num” & “current seq num” were incorrect
---
 scripts/osm2pgsql-replication | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/osm2pgsql-replication b/scripts/osm2pgsql-replication
index 3cc31037f..c99c95217 100755
--- a/scripts/osm2pgsql-replication
+++ b/scripts/osm2pgsql-replication
@@ -518,7 +518,7 @@ def update(props, args):
 
     remote_server_age_sec = int((dt.datetime.now(dt.timezone.utc) - current.timestamp).total_seconds())
     LOG.debug("Need to apply %d sequence(s) (%d → %d), covering %s (%s sec) of changes (%s → %s)",
-        current.sequence - seq, current.sequence, seq,
+        current.sequence - seq, seq, current.sequence,
         pretty_format_timedelta((current.timestamp - ts).total_seconds()),
         int((current.timestamp - ts).total_seconds()),
         osm_date(ts.astimezone(dt.timezone.utc)),

From 9ba473189672ec0a62fd960f1ae9866c5b3bd24c Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 7 Jul 2025 09:46:29 +0200
Subject: [PATCH 323/430] Simplify code order

---
 src/flex-lua-geom.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/flex-lua-geom.cpp b/src/flex-lua-geom.cpp
index 4fc2880ee..8856c03d2 100644
--- a/src/flex-lua-geom.cpp
+++ b/src/flex-lua-geom.cpp
@@ -309,11 +309,11 @@ void init_geometry_class(lua_State *lua_state)
     // Add metatable as osm2pgsql.Geometry so we can access it from Lua
     lua_setfield(lua_state, -3, "Geometry");
 
+    lua_pushvalue(lua_state, -1);
+    lua_setfield(lua_state, -2, "__index");
     luaX_add_table_func(lua_state, "__gc", geom_gc);
     luaX_add_table_func(lua_state, "__len", geom_num_geometries);
     luaX_add_table_func(lua_state, "__tostring", geom_tostring);
-    lua_pushvalue(lua_state, -1);
-    lua_setfield(lua_state, -2, "__index");
     luaX_add_table_func(lua_state, "area", geom_area);
     luaX_add_table_func(lua_state, "length", geom_length);
     luaX_add_table_func(lua_state, "centroid", geom_centroid);

From 48a6bd4d77c4d2395e9a5354f0db4c57ebe4c933 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 7 Jul 2025 09:46:29 +0200
Subject: [PATCH 324/430] Simplify setup of OSMObject Lua metatable

Uses the same mechanism as the other metatables now.
---
 src/init.lua        | 22 +++++++++-------------
 src/output-flex.cpp | 33 ++++++++++++++-------------------
 2 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/src/init.lua b/src/init.lua
index 9d0c76413..1b2ab61e2 100644
--- a/src/init.lua
+++ b/src/init.lua
@@ -176,20 +176,16 @@ function osm2pgsql.split_string(str, separator)
     return result
 end
 
--- This will be the metatable for the OSM objects given to the process callback
--- functions.
-object_metatable = {
-    __index =  {
-        grab_tag = function(data, tag)
-            if not tag then
-                error("Missing tag key", 2)
-            end
-            local v = data.tags[tag]
-            data.tags[tag] = nil
-            return v
+if osm2pgsql.OSMObject then
+    osm2pgsql.OSMObject.__index.grab_tag = function(data, tag)
+        if not tag then
+            error("Missing tag key", 2)
         end
-    }
-}
+        local v = data.tags[tag]
+        data.tags[tag] = nil
+        return v
+    end
+end
 
 -- This is used to iterate over (multi)geometries.
 function osm2pgsql.Geometry.geometries(geom)
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index a806a5c80..07bfa8b82 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -1305,17 +1305,17 @@ void output_flex_t::init_lua(std::string const &filename,
 
     assert(lua_gettop(lua_state()) == 0);
 
-    // Load compiled in init.lua
-    if (luaL_dostring(lua_state(), lua_init())) {
-        throw fmt_error("Internal error in Lua setup: {}.",
-                        lua_tostring(lua_state(), -1));
+    lua_getglobal(lua_state(), "osm2pgsql");
+    if (luaL_newmetatable(lua_state(), OSM2PGSQL_OSMOBJECT_CLASS) != 1) {
+        throw std::runtime_error{"Internal error: Lua newmetatable failed."};
     }
+    lua_pushvalue(lua_state(), -1); // Copy of new metatable
+
+    // Add metatable as osm2pgsql.OSMObject so we can access it from Lua
+    lua_setfield(lua_state(), -3, "OSMObject");
 
-    // Store the methods on OSM objects in its metatable.
-    lua_getglobal(lua_state(), "object_metatable");
-    lua_pushstring(lua_state(), OSM2PGSQL_OSMOBJECT_CLASS);
-    lua_setfield(lua_state(), -2, "__name");
-    lua_getfield(lua_state(), -1, "__index");
+    lua_pushvalue(lua_state(), -1);
+    lua_setfield(lua_state(), -2, "__index");
     luaX_add_table_func(lua_state(), "get_bbox", lua_trampoline_app_get_bbox);
     luaX_add_table_func(lua_state(), "as_linestring",
                         lua_trampoline_app_as_linestring);
@@ -1333,16 +1333,11 @@ void output_flex_t::init_lua(std::string const &filename,
                         lua_trampoline_app_as_geometrycollection);
     lua_settop(lua_state(), 0);
 
-    // Store the global object "object_metatable" defined in the init.lua
-    // script in the registry and then remove the global object. It will
-    // later be used as metatable for OSM objects.
-    lua_pushstring(lua_state(), OSM2PGSQL_OSMOBJECT_CLASS);
-    lua_getglobal(lua_state(), "object_metatable");
-    lua_settable(lua_state(), LUA_REGISTRYINDEX);
-    lua_pushnil(lua_state());
-    lua_setglobal(lua_state(), "object_metatable");
-
-    assert(lua_gettop(lua_state()) == 0);
+    // Load compiled in init.lua
+    if (luaL_dostring(lua_state(), lua_init())) {
+        throw fmt_error("Internal error in Lua setup: {}.",
+                        lua_tostring(lua_state(), -1));
+    }
 
     // Load user config file
     luaX_set_context(lua_state(), this);

From 20f061d844b38c460168b598775402c5504bb62e Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 7 Jul 2025 09:46:29 +0200
Subject: [PATCH 325/430] New luaX_set_up_metatable() helper function

Reduces boilerplate code for initialization of Lua classes.
---
 src/flex-lua-expire-output.cpp | 33 +++++----------------
 src/flex-lua-geom.cpp          | 54 +++++++++++++---------------------
 src/flex-lua-locator.cpp       | 32 +++++---------------
 src/flex-lua-table.cpp         | 28 +++++-------------
 src/lua-utils.cpp              | 26 ++++++++++++++++
 src/lua-utils.hpp              |  5 ++++
 src/output-flex.cpp            | 37 +++++++----------------
 7 files changed, 85 insertions(+), 130 deletions(-)

diff --git a/src/flex-lua-expire-output.cpp b/src/flex-lua-expire-output.cpp
index e3609de33..49d8d876c 100644
--- a/src/flex-lua-expire-output.cpp
+++ b/src/flex-lua-expire-output.cpp
@@ -99,31 +99,14 @@ int setup_flex_expire_output(lua_State *lua_state,
  */
 void lua_wrapper_expire_output::init(lua_State *lua_state)
 {
-    lua_getglobal(lua_state, "osm2pgsql");
-    if (luaL_newmetatable(lua_state, OSM2PGSQL_EXPIRE_OUTPUT_CLASS) != 1) {
-        throw std::runtime_error{"Internal error: Lua newmetatable failed."};
-    }
-    lua_pushvalue(lua_state, -1); // Copy of new metatable
-
-    // Add metatable as osm2pgsql.ExpireOutput so we can access it from Lua
-    lua_setfield(lua_state, -3, "ExpireOutput");
-
-    // Now add functions to metatable
-    lua_pushvalue(lua_state, -1);
-    lua_setfield(lua_state, -2, "__index");
-    luaX_add_table_func(lua_state, "__tostring",
-                        lua_trampoline_expire_output_tostring);
-    luaX_add_table_func(lua_state, "filename",
-                        lua_trampoline_expire_output_filename);
-    luaX_add_table_func(lua_state, "maxzoom",
-                        lua_trampoline_expire_output_maxzoom);
-    luaX_add_table_func(lua_state, "minzoom",
-                        lua_trampoline_expire_output_minzoom);
-    luaX_add_table_func(lua_state, "schema",
-                        lua_trampoline_expire_output_schema);
-    luaX_add_table_func(lua_state, "table", lua_trampoline_expire_output_table);
-
-    lua_pop(lua_state, 2);
+    luaX_set_up_metatable(
+        lua_state, "ExpireOutput", OSM2PGSQL_EXPIRE_OUTPUT_CLASS,
+        {{"__tostring", lua_trampoline_expire_output_tostring},
+         {"filename", lua_trampoline_expire_output_filename},
+         {"maxzoom", lua_trampoline_expire_output_maxzoom},
+         {"minzoom", lua_trampoline_expire_output_minzoom},
+         {"schema", lua_trampoline_expire_output_schema},
+         {"table", lua_trampoline_expire_output_table}});
 }
 
 int lua_wrapper_expire_output::tostring() const
diff --git a/src/flex-lua-geom.cpp b/src/flex-lua-geom.cpp
index 8856c03d2..3aa0788da 100644
--- a/src/flex-lua-geom.cpp
+++ b/src/flex-lua-geom.cpp
@@ -300,37 +300,25 @@ int geom_transform(lua_State *lua_state)
 
 void init_geometry_class(lua_State *lua_state)
 {
-    lua_getglobal(lua_state, "osm2pgsql");
-    if (luaL_newmetatable(lua_state, OSM2PGSQL_GEOMETRY_CLASS) != 1) {
-        throw std::runtime_error{"Internal error: Lua newmetatable failed."};
-    }
-    lua_pushvalue(lua_state, -1); // Copy of new metatable
-
-    // Add metatable as osm2pgsql.Geometry so we can access it from Lua
-    lua_setfield(lua_state, -3, "Geometry");
-
-    lua_pushvalue(lua_state, -1);
-    lua_setfield(lua_state, -2, "__index");
-    luaX_add_table_func(lua_state, "__gc", geom_gc);
-    luaX_add_table_func(lua_state, "__len", geom_num_geometries);
-    luaX_add_table_func(lua_state, "__tostring", geom_tostring);
-    luaX_add_table_func(lua_state, "area", geom_area);
-    luaX_add_table_func(lua_state, "length", geom_length);
-    luaX_add_table_func(lua_state, "centroid", geom_centroid);
-    luaX_add_table_func(lua_state, "get_bbox", geom_get_bbox);
-    luaX_add_table_func(lua_state, "geometry_n", geom_geometry_n);
-    luaX_add_table_func(lua_state, "geometry_type", geom_geometry_type);
-    luaX_add_table_func(lua_state, "is_null", geom_is_null);
-    luaX_add_table_func(lua_state, "line_merge", geom_line_merge);
-    luaX_add_table_func(lua_state, "reverse", geom_reverse);
-    luaX_add_table_func(lua_state, "num_geometries", geom_num_geometries);
-    luaX_add_table_func(lua_state, "pole_of_inaccessibility",
-                        geom_pole_of_inaccessibility);
-    luaX_add_table_func(lua_state, "segmentize", geom_segmentize);
-    luaX_add_table_func(lua_state, "simplify", geom_simplify);
-    luaX_add_table_func(lua_state, "spherical_area", geom_spherical_area);
-    luaX_add_table_func(lua_state, "srid", geom_srid);
-    luaX_add_table_func(lua_state, "transform", geom_transform);
-
-    lua_pop(lua_state, 2); // __index, global osmp2gsql
+    luaX_set_up_metatable(
+        lua_state, "Geometry", OSM2PGSQL_GEOMETRY_CLASS,
+        {{"__gc", geom_gc},
+         {"__len", geom_num_geometries},
+         {"__tostring", geom_tostring},
+         {"area", geom_area},
+         {"length", geom_length},
+         {"centroid", geom_centroid},
+         {"get_bbox", geom_get_bbox},
+         {"geometry_n", geom_geometry_n},
+         {"geometry_type", geom_geometry_type},
+         {"is_null", geom_is_null},
+         {"line_merge", geom_line_merge},
+         {"reverse", geom_reverse},
+         {"num_geometries", geom_num_geometries},
+         {"pole_of_inaccessibility", geom_pole_of_inaccessibility},
+         {"segmentize", geom_segmentize},
+         {"simplify", geom_simplify},
+         {"spherical_area", geom_spherical_area},
+         {"srid", geom_srid},
+         {"transform", geom_transform}});
 }
diff --git a/src/flex-lua-locator.cpp b/src/flex-lua-locator.cpp
index 65bc7bfb5..002e1c000 100644
--- a/src/flex-lua-locator.cpp
+++ b/src/flex-lua-locator.cpp
@@ -70,30 +70,14 @@ void lua_wrapper_locator::init(lua_State *lua_state,
 {
     s_connection_params = connection_params;
 
-    lua_getglobal(lua_state, "osm2pgsql");
-    if (luaL_newmetatable(lua_state, OSM2PGSQL_LOCATOR_CLASS) != 1) {
-        throw std::runtime_error{"Internal error: Lua newmetatable failed."};
-    }
-    lua_pushvalue(lua_state, -1); // Copy of new metatable
-
-    // Add metatable as osm2pgsql.Locator so we can access it from Lua
-    lua_setfield(lua_state, -3, "Locator");
-
-    // Now add functions to metatable
-    lua_pushvalue(lua_state, -1);
-    lua_setfield(lua_state, -2, "__index");
-    luaX_add_table_func(lua_state, "__tostring",
-                        lua_trampoline_locator_tostring);
-    luaX_add_table_func(lua_state, "name", lua_trampoline_locator_name);
-    luaX_add_table_func(lua_state, "add_bbox", lua_trampoline_locator_add_bbox);
-    luaX_add_table_func(lua_state, "add_from_db",
-                        lua_trampoline_locator_add_from_db);
-    luaX_add_table_func(lua_state, "all_intersecting",
-                        lua_trampoline_locator_all_intersecting);
-    luaX_add_table_func(lua_state, "first_intersecting",
-                        lua_trampoline_locator_first_intersecting);
-
-    lua_pop(lua_state, 2);
+    luaX_set_up_metatable(
+        lua_state, "Locator", OSM2PGSQL_LOCATOR_CLASS,
+        {{"__tostring", lua_trampoline_locator_tostring},
+         {"name", lua_trampoline_locator_name},
+         {"add_bbox", lua_trampoline_locator_add_bbox},
+         {"add_from_db", lua_trampoline_locator_add_from_db},
+         {"all_intersecting", lua_trampoline_locator_all_intersecting},
+         {"first_intersecting", lua_trampoline_locator_first_intersecting}});
 }
 
 int lua_wrapper_locator::tostring() const
diff --git a/src/flex-lua-table.cpp b/src/flex-lua-table.cpp
index 9bff4d543..ea82beed8 100644
--- a/src/flex-lua-table.cpp
+++ b/src/flex-lua-table.cpp
@@ -457,27 +457,13 @@ int setup_flex_table(lua_State *lua_state, std::vector<flex_table_t> *tables,
  */
 void lua_wrapper_table::init(lua_State *lua_state)
 {
-    lua_getglobal(lua_state, "osm2pgsql");
-    if (luaL_newmetatable(lua_state, OSM2PGSQL_TABLE_CLASS) != 1) {
-        throw std::runtime_error{"Internal error: Lua newmetatable failed."};
-    }
-    lua_pushvalue(lua_state, -1); // Copy of new metatable
-
-    // Add metatable as osm2pgsql.Table so we can access it from Lua
-    lua_setfield(lua_state, -3, "Table");
-
-    // Now add functions to metatable
-    lua_pushvalue(lua_state, -1);
-    lua_setfield(lua_state, -2, "__index");
-    luaX_add_table_func(lua_state, "__tostring",
-                        lua_trampoline_table_tostring);
-    luaX_add_table_func(lua_state, "insert", lua_trampoline_table_insert);
-    luaX_add_table_func(lua_state, "name", lua_trampoline_table_name);
-    luaX_add_table_func(lua_state, "schema", lua_trampoline_table_schema);
-    luaX_add_table_func(lua_state, "cluster", lua_trampoline_table_cluster);
-    luaX_add_table_func(lua_state, "columns", lua_trampoline_table_columns);
-
-    lua_pop(lua_state, 2);
+    luaX_set_up_metatable(lua_state, "Table", OSM2PGSQL_TABLE_CLASS,
+                          {{"__tostring", lua_trampoline_table_tostring},
+                           {"insert", lua_trampoline_table_insert},
+                           {"name", lua_trampoline_table_name},
+                           {"schema", lua_trampoline_table_schema},
+                           {"cluster", lua_trampoline_table_cluster},
+                           {"columns", lua_trampoline_table_columns}});
 }
 
 int lua_wrapper_table::tostring() const
diff --git a/src/lua-utils.cpp b/src/lua-utils.cpp
index c843ec375..6b5b0ff6f 100644
--- a/src/lua-utils.cpp
+++ b/src/lua-utils.cpp
@@ -115,6 +115,32 @@ void luaX_add_table_func(lua_State *lua_state, char const *key,
     lua_rawset(lua_state, -3);
 }
 
+void luaX_set_up_metatable(
+    lua_State *lua_state, char const *name, char const *luaclass,
+    std::initializer_list<std::pair<char const *, lua_CFunction>> map)
+
+{
+    lua_getglobal(lua_state, "osm2pgsql");
+    if (luaL_newmetatable(lua_state, luaclass) != 1) {
+        throw std::runtime_error{"Internal error: Lua newmetatable failed."};
+    }
+    lua_pushvalue(lua_state, -1); // Copy of new metatable
+
+    // Add metatable under the specified name so we can access it from Lua
+    lua_setfield(lua_state, -3, name);
+
+    // Now add functions to metatable
+    lua_pushvalue(lua_state, -1);
+    lua_setfield(lua_state, -2, "__index");
+    for (auto const &[key, func] : map) {
+        lua_pushstring(lua_state, key);
+        lua_pushcfunction(lua_state, func);
+        lua_rawset(lua_state, -3);
+    }
+
+    lua_settop(lua_state, 0);
+}
+
 char const *luaX_get_table_string(lua_State *lua_state, char const *key,
                                   int table_index, char const *error_msg)
 {
diff --git a/src/lua-utils.hpp b/src/lua-utils.hpp
index cd0919f12..d595b4eed 100644
--- a/src/lua-utils.hpp
+++ b/src/lua-utils.hpp
@@ -17,6 +17,7 @@
 
 #include <cassert>
 #include <cstdint>
+#include <initializer_list>
 #include <string_view>
 #include <utility>
 
@@ -38,6 +39,10 @@ void luaX_add_table_bool(lua_State *lua_state, char const *key,
 void luaX_add_table_func(lua_State *lua_state, char const *key,
                          lua_CFunction func) noexcept;
 
+void luaX_set_up_metatable(
+    lua_State *lua_state, char const *name, char const *luaclass,
+    std::initializer_list<std::pair<char const *, lua_CFunction>> map);
+
 template <typename COLLECTION, typename FUNC>
 void luaX_add_table_array(lua_State *lua_state, char const *key,
                           COLLECTION const &collection, FUNC const &func)
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 07bfa8b82..31980384c 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -1305,33 +1305,16 @@ void output_flex_t::init_lua(std::string const &filename,
 
     assert(lua_gettop(lua_state()) == 0);
 
-    lua_getglobal(lua_state(), "osm2pgsql");
-    if (luaL_newmetatable(lua_state(), OSM2PGSQL_OSMOBJECT_CLASS) != 1) {
-        throw std::runtime_error{"Internal error: Lua newmetatable failed."};
-    }
-    lua_pushvalue(lua_state(), -1); // Copy of new metatable
-
-    // Add metatable as osm2pgsql.OSMObject so we can access it from Lua
-    lua_setfield(lua_state(), -3, "OSMObject");
-
-    lua_pushvalue(lua_state(), -1);
-    lua_setfield(lua_state(), -2, "__index");
-    luaX_add_table_func(lua_state(), "get_bbox", lua_trampoline_app_get_bbox);
-    luaX_add_table_func(lua_state(), "as_linestring",
-                        lua_trampoline_app_as_linestring);
-    luaX_add_table_func(lua_state(), "as_point",
-                        lua_trampoline_app_as_point);
-    luaX_add_table_func(lua_state(), "as_polygon",
-                        lua_trampoline_app_as_polygon);
-    luaX_add_table_func(lua_state(), "as_multipoint",
-                        lua_trampoline_app_as_multipoint);
-    luaX_add_table_func(lua_state(), "as_multilinestring",
-                        lua_trampoline_app_as_multilinestring);
-    luaX_add_table_func(lua_state(), "as_multipolygon",
-                        lua_trampoline_app_as_multipolygon);
-    luaX_add_table_func(lua_state(), "as_geometrycollection",
-                        lua_trampoline_app_as_geometrycollection);
-    lua_settop(lua_state(), 0);
+    luaX_set_up_metatable(
+        lua_state(), "OSMObject", OSM2PGSQL_OSMOBJECT_CLASS,
+        {{"get_bbox", lua_trampoline_app_get_bbox},
+         {"as_linestring", lua_trampoline_app_as_linestring},
+         {"as_point", lua_trampoline_app_as_point},
+         {"as_polygon", lua_trampoline_app_as_polygon},
+         {"as_multipoint", lua_trampoline_app_as_multipoint},
+         {"as_multilinestring", lua_trampoline_app_as_multilinestring},
+         {"as_multipolygon", lua_trampoline_app_as_multipolygon},
+         {"as_geometrycollection", lua_trampoline_app_as_geometrycollection}});
 
     // Load compiled in init.lua
     if (luaL_dostring(lua_state(), lua_init())) {

From 2aab60a5782087487fe8ba0e8b88c8171d9aa680 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 16 Jul 2025 16:55:18 +0200
Subject: [PATCH 326/430] Update included protozero to current version 1.8.1

---
 contrib/protozero/README.contrib                   | 2 +-
 contrib/protozero/include/protozero/pbf_reader.hpp | 4 ++--
 contrib/protozero/include/protozero/version.hpp    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/protozero/README.contrib b/contrib/protozero/README.contrib
index 90eaeaaa8..784993a4c 100644
--- a/contrib/protozero/README.contrib
+++ b/contrib/protozero/README.contrib
@@ -1,2 +1,2 @@
 Source: https://github.com/mapbox/protozero
-Revision: v1.8.0
+Revision: v1.8.1
diff --git a/contrib/protozero/include/protozero/pbf_reader.hpp b/contrib/protozero/include/protozero/pbf_reader.hpp
index 297683afe..fab4dceb7 100644
--- a/contrib/protozero/include/protozero/pbf_reader.hpp
+++ b/contrib/protozero/include/protozero/pbf_reader.hpp
@@ -494,9 +494,9 @@ class pbf_reader {
     bool get_bool() {
         protozero_assert(tag() != 0 && "call next() before accessing field value");
         protozero_assert(has_wire_type(pbf_wire_type::varint) && "not a varint");
-        const bool result = m_data[0] != 0;
+        const char* value = m_data;
         skip_varint(&m_data, m_end);
-        return result;
+        return *value != 0;
     }
 
     /**
diff --git a/contrib/protozero/include/protozero/version.hpp b/contrib/protozero/include/protozero/version.hpp
index fc9b92879..760870f97 100644
--- a/contrib/protozero/include/protozero/version.hpp
+++ b/contrib/protozero/include/protozero/version.hpp
@@ -20,7 +20,7 @@ documentation.
 #define PROTOZERO_VERSION_MAJOR 1
 
 /// The minor version number
-#define PROTOZERO_VERSION_MINOR 7
+#define PROTOZERO_VERSION_MINOR 8
 
 /// The patch number
 #define PROTOZERO_VERSION_PATCH 1
@@ -29,6 +29,6 @@ documentation.
 #define PROTOZERO_VERSION_CODE (PROTOZERO_VERSION_MAJOR * 10000 + PROTOZERO_VERSION_MINOR * 100 + PROTOZERO_VERSION_PATCH)
 
 /// Version number as string
-#define PROTOZERO_VERSION_STRING "1.7.1"
+#define PROTOZERO_VERSION_STRING "1.8.1"
 
 #endif // PROTOZERO_VERSION_HPP

From af9c22ec311660d36f0777e4466cd63c366a313a Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 18 Jul 2025 16:23:43 +0200
Subject: [PATCH 327/430] Workaround for int that is too large

Fixes MSVC warning. This is due to the way integer literals are parsed.
---
 tests/test-output-pgsql-int4.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test-output-pgsql-int4.cpp b/tests/test-output-pgsql-int4.cpp
index f821c2499..604cb589f 100644
--- a/tests/test-output-pgsql-int4.cpp
+++ b/tests/test-output-pgsql-int4.cpp
@@ -44,7 +44,7 @@ TEST_CASE("int4 conversion")
     CHECK(2147483647 == conn.result_as_int(population(4)));
     CHECK(10000 == conn.result_as_int(population(5)));
     CHECK(-10000 == conn.result_as_int(population(6)));
-    CHECK(-2147483648 == conn.result_as_int(population(7)));
+    CHECK((-2147483647 - 1) == conn.result_as_int(population(7)));
 
     // More out of range negative values
     conn.assert_null(population(8));
@@ -59,7 +59,7 @@ TEST_CASE("int4 conversion")
     CHECK(2147483647 == conn.result_as_int(population(13)));
     CHECK(15000 == conn.result_as_int(population(14)));
     CHECK(-15000 == conn.result_as_int(population(15)));
-    CHECK(-2147483648 == conn.result_as_int(population(16)));
+    CHECK((-2147483647 - 1) == conn.result_as_int(population(16)));
 
     // More out of range negative values
     conn.assert_null(population(17));

From f2f2808fee890f8bcd5338d7e41b67ba592370ee Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 19 Jul 2025 14:48:37 +0200
Subject: [PATCH 328/430] fix grammar issues in osm2pgsql-replication docs

Thanks to @SergeCroise for spotting those.
---
 scripts/osm2pgsql-replication | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/osm2pgsql-replication b/scripts/osm2pgsql-replication
index c99c95217..5f9120c20 100755
--- a/scripts/osm2pgsql-replication
+++ b/scripts/osm2pgsql-replication
@@ -8,7 +8,7 @@
 # For a full list of authors see the git log.
 
 """
-Update an osm2pgsql database with changes from a OSM replication server.
+Update an osm2pgsql database with changes from an OSM replication server.
 
 This tool initialises the updating process by looking at the import file
 or the newest object in the database. The state is then saved in a table
@@ -363,11 +363,11 @@ def status(props, args):
 
 
     `status` is 0 if there were no problems getting the status. 1 & 2 for
-    improperly set up replication. 3 for network issues. If status ≠ 0, then
-    the `error` key is an error message (as string). `status` is used as the
-    exit code.
+    improperly set up replication. 3 for network issues. If status is greater 0,
+    then the `error` key is an error message (as string). `status` is used as
+    the exit code.
 
-    `server` is the replication server's current status. `sequence` is it's
+    `server` is the replication server's current status. `sequence` is its
     sequence number, `timestamp` the time of that, and 'age_sec' the age of the
     data in seconds.
 

From cf6b10164e5b958618e7c7c7bfe679f2821aa37d Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 2 Jul 2025 21:04:04 +0200
Subject: [PATCH 329/430] update feature and installation sections in the
 README

Also moves the maintainer section here from CONTRIBUTING.md.
---
 README.md | 58 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 137ed3975..baa5a74ba 100644
--- a/README.md
+++ b/README.md
@@ -14,20 +14,24 @@ to install and run osm2pgsql.
 
 ## Features
 
-* Converts OSM files to a PostgreSQL DB
-* Conversion of tags to columns is configurable in the style file
-* Able to read .gz, .bz2, .pbf and .o5m files directly
-* Can apply diffs to keep the database up to date
-* Support the choice of output projection
-* Configurable table names
-* Support for hstore field type to store the complete set of tags in one database
-  field if desired
+* freely configurable table layout and content using the LUA scripting language
+* support for building geometries in simple feature format and for generalization
+* read OSM data from OSM, PBF and O5M formats
+* update the database from OSM change files and replication diffs
+* usable for importing a small geographic area on a tiny laptop up to
+  importing the whole world on a large server machine
+* runs on Linux, Windows and MacOS
+* [and more](https://osm2pgsql.org/about/features/)
 
 ## Installing
 
-Most Linux distributions include osm2pgsql. It is available on macOS with
-[Homebrew](https://brew.sh/) and Windows builds are also available. See
-https://osm2pgsql.org/doc/install.html for details.
+* __Linux__: most distributions include osm2pgsql. Debian always offers
+  the latest version via backports.
+* __macOS__: osm2pgsql is available through [Homebrew](https://brew.sh/)
+* __Windows__: use our [binary builds](https://osm2pgsql.org/download/windows/)
+
+For detailed instructions, visit
+the [Installation page](https://osm2pgsql.org/doc/install.html).
 
 ## Building
 
@@ -35,10 +39,10 @@ The latest source code is available in the osm2pgsql git repository on GitHub
 and can be downloaded as follows:
 
 ```sh
-git clone https://github.com/openstreetmap/osm2pgsql.git
+git clone https://github.com/osm2pgsql-dev/osm2pgsql.git
 ```
 
-Osm2pgsql uses the cross-platform [CMake build system](https://cmake.org/)
+osm2pgsql uses the cross-platform [CMake build system](https://cmake.org/)
 to configure and build itself.
 
 Required libraries are
@@ -50,16 +54,16 @@ Required libraries are
 * [zlib](https://www.zlib.net/)
 * [Boost libraries](https://www.boost.org/) (for boost geometry)
 * [nlohmann/json](https://json.nlohmann.me/)
-* [OpenCV](https://opencv.org/) (Optional, for generalization only)
-* [potrace](https://potrace.sourceforge.net/) (Optional, for generalization only)
-* [PostgreSQL](https://www.postgresql.org/) client libraries
+* [PostgreSQL](https://www.postgresql.org/) client library
 * [Lua](https://www.lua.org/)
+* [OpenCV](https://opencv.org/) (optional, for generalization only)
+* [potrace](https://potrace.sourceforge.net/) (optional, for generalization only)
 * [Python](https://python.org/) (only for running tests)
 * [Psycopg](https://www.psycopg.org/) (only for running tests)
 
 The following libraries are included in the `contrib` directory. You can build
-with other versions of those libraries (set the `EXTERNAL_*libname*` option to
-`ON`) but make sure you are using a compatible version:
+with other versions of those libraries (set the `EXTERNAL_*libname*` CMake
+option to `ON`) but make sure you are using a compatible version:
 
 * [fmt](https://fmt.dev/) (>= 7.1.3)
 * [libosmium](https://osmcode.org/libosmium/) (>= 2.17.0)
@@ -73,7 +77,7 @@ Make sure you have installed the development packages for the libraries
 mentioned in the requirements section and a C++ compiler which supports C++17.
 We officially support gcc >= 10.0 and clang >= 13.
 
-To rebuild the included man page you'll need the [pandoc](https://pandoc.org/)
+To rebuild the included man page you need the [pandoc](https://pandoc.org/)
 tool.
 
 First install the dependencies.
@@ -150,8 +154,8 @@ The compiled files can be installed with
 sudo make install
 ```
 
-By default, the Release build with debug info is created and no tests are
-compiled. You can change that behavior by using additional options like
+By default, a Release build with debug info is created and tests are
+disabled. You can change that behavior by using additional options like
 following:
 
 ```sh
@@ -163,12 +167,13 @@ Note that `Debug` builds will be much slower than release build. For production
 
 ### Using the PROJ library
 
-Osm2pgsql has builtin support for the Latlong (WGS84, EPSG:4326) and the
+osm2pgsql has builtin support for the Latlong (WGS84, EPSG:4326) and the
 WebMercator (EPSG:3857) projection. Other projections are supported through
-the [Proj library](https://proj.org/) which is used by default. Set the CMake
+the [Proj library](https://proj.org/). Support will be automatically compiled
+in, when CMake can find the library in the system. Set the CMake
 option `WITH_PROJ` to `OFF` to disable use of that library.
 
-## Using LuaJIT
+### Using LuaJIT
 
 To speed up Lua tag transformations, [LuaJIT](https://luajit.org/) can be
 optionally enabled on supported platforms. This can speed up processing
@@ -216,6 +221,11 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
+## Maintainers
+
+The current maintainers of osm2pgsql are [Sarah Hoffmann](https://github.com/lonvia/)
+and [Paul Norman](https://github.com/pnorman/).
+
 ## Contributing
 
 We welcome contributions to osm2pgsql. See [CONTRIBUTING.md](CONTRIBUTING.md)

From 912de14d7c84df68778cffc6becce0f228815997 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 19 Jul 2025 14:45:03 +0200
Subject: [PATCH 330/430] rework content of CONTRIBUTING

Now only contains hints directly relevant for development,
making a PR and making releases. Everything else will be moved
to the Contribution Guide on the website.
---
 CONTRIBUTING.md | 83 ++++++++++++++++++++++---------------------------
 1 file changed, 38 insertions(+), 45 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 30125c23f..a169f050f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,34 +1,41 @@
-# Osm2pgsql contribution guidelines
+# osm2pgsql contribution guidelines
 
-## Workflow
-
-We operate the "Fork & Pull" model explained at
-
-https://help.github.com/articles/using-pull-requests
-
-You should fork the project into your own repo, create a topic branch there and
-then make one or more pull requests back to the OpenStreetMap repository. Your
-pull requests will then be reviewed and discussed.
-
-## History
-
-To understand the osm2pgsql code, it helps to know some history on it.
-Osm2pgsql was written in C in 2007 as a port of an older Python utility. In
-2014 it was ported to C++ by MapQuest and the last C version was released as
-0.86.0. In its time, it has had varying contribution activity, including times
-with no maintainer or active developers.
-
-Very few parts of the code now show their C origin, most has been transformed
-to modern C++. We are currently targeting C++17.
-
-## Versioning
+The following section describes our work flow, coding style and give some
+hints on developer setup.
+For more information about what to contribute and an overview
+of the general roadmap, visit the [Contribution guide](https://osm2pgsql.org/contribute/)
+on the osm2pgsql website.
 
-Osm2pgsql uses [semantic versioning](https://semver.org/).
-
-Bugs and known issues are fixed on the main branch only. Exceptions may be made
-for severe bugs.
+## Workflow
 
-## Code style
+We operate with the
+["Fork & Pull"](https://help.github.com/articles/using-pull-requests) model
+and try to stick to a four-eyes review mode, meaning that PRs should be merged
+by a different person than the author.
+
+Here are a few simple rules you should follow with your code and pull request (PR).
+They will maximize your chances that a PR gets reviewed and merged.
+
+* Split your PR into functionally sensible commits. Describe each commit with
+  a relevant commit message. If you need to do fix-up commits, please, merge
+  them into the functional commits. Interactive rebasing (`git rebase -i`) is
+  very useful for this. Then force-push to your PR branch.
+* Avoid merge commits. If you have to catch up with changes from master,
+  rather use rebasing.
+* Split up larger PRs into smaller units if possible. Never mix two different
+  topics or fixes in a single PR.
+* Decorate your PR with an informative but succinct description. Do not post
+  AI-generated PR descriptions without having reviewed (and preferably heavily
+  shortened) the text.
+* Try to follow the style of existing code as close as possible. Use
+  clang-format to follow the formal coding style (see below).
+
+> [!IMPORTANT]
+> Any use of generative AI for writing code, documentation or PR descriptions
+> must be disclosed. You must further be able to show that you have understood
+> the generated parts. Your code, your responsibility.
+
+## Coding style
 
 Code must be written in the
 [K&R 1TBS style](https://en.wikipedia.org/wiki/Indent_style#Variant:_1TBS) with
@@ -75,17 +82,8 @@ installed with:
 sudo apt-get install pandoc python3-argparse-manpage
 ```
 
-Results should be checked into the repository.
-
-## Platforms targeted
-
-Osm2pgsql must compile and pass all tests at least on Linux, OS X and Windows.
-Tests run on Github action to make sure that it does.
-
-On Linux the latest stable versions of popular distributions and the stable
-version before that are supported if possible.
-
-All maintained versions of PostgreSQL are supported.
+The manpages are rebuilt and checked into the repository as part of the
+release process.
 
 ## Testing
 
@@ -107,7 +105,7 @@ against it. This is most easily done using `pg_virtualenv`. Just run
 pg_virtualenv ctest
 ```
 
-`pg_virtualenv` creates a separate postgres server instance. The test databases
+`pg_virtualenv` creates a separate PostgreSQL server instance. The test databases
 are created in this instance and the complete server is destroyed after the
 tests are finished. ctest also calls appropriate fixtures that create the
 separate tablespace required for some tests.
@@ -221,8 +219,3 @@ the report.
 * Copy Windows binaries and source tarball to osm2pgsql.org.
 * Add release info to osm2pgsql.org.
 * Publish release notes as News article on osm2pgsql.org.
-
-## Maintainers
-
-The current maintainers of osm2pgsql are [Sarah Hoffmann](https://github.com/lonvia/)
-and [Paul Norman](https://github.com/pnorman/).

From 279158e874fecc289467be1d0ad9ea05ec31cd79 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 20 Jul 2025 21:31:27 +0200
Subject: [PATCH 331/430] adapt CI status for new repo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index baa5a74ba..8d0e74fc8 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Nominatim, or general analysis.
 See the [documentation](https://osm2pgsql.org/doc/) for instructions on how
 to install and run osm2pgsql.
 
-[![Github Actions Build Status](https://github.com/openstreetmap/osm2pgsql/workflows/CI/badge.svg?branch=master)](https://github.com/openstreetmap/osm2pgsql/actions)
+[![Github Actions Build Status](https://github.com/osm2pgsql-dev/osm2pgsql/workflows/CI/badge.svg)](https://github.com/osm2pgsql-dev/osm2pgsql/actions)
 [![Packaging Status](https://repology.org/badge/tiny-repos/osm2pgsql.svg)](https://repology.org/project/osm2pgsql/versions)
 
 ## Features

From b4312816f447be74e085a2ab469d62ac1466fa1c Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 29 Jul 2025 21:55:39 +0200
Subject: [PATCH 332/430] Fix bbox calculation for relation with node members

The old code is some left-over from before that was not working any
more.
---
 src/output-flex.cpp         |  6 +++---
 tests/bdd/flex/bbox.feature | 36 +++++++++++++++++++++++++++++++++++-
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 31980384c..4c9e052c7 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -430,9 +430,9 @@ int output_flex_t::app_get_bbox()
         osmium::Box bbox;
 
         // Bounding boxes of all the member nodes
-        for (auto const &wnl :
-             m_relation_cache.members_buffer().select<osmium::WayNodeList>()) {
-            bbox.extend(wnl.envelope());
+        for (auto const &node :
+             m_relation_cache.members_buffer().select<osmium::Node>()) {
+            bbox.extend(node.location());
         }
 
         // Bounding boxes of all the member ways
diff --git a/tests/bdd/flex/bbox.feature b/tests/bdd/flex/bbox.feature
index da1e606c2..6daadbd9e 100644
--- a/tests/bdd/flex/bbox.feature
+++ b/tests/bdd/flex/bbox.feature
@@ -77,7 +77,7 @@ Feature: Test get_bbox() function
             | 4326       | 20 10.1,20.1 10.1,20.1 10                                   |
             | 3857       | 2226389.8 1130195.4,2237521.8 1130195.4,2237521.8 1118890.0 |
 
-    Scenario Outline: for relations
+    Scenario Outline: for relations with way members only
         Given the 0.1 grid with origin 20.0 10.1
             | 10 | 11 |
             |    | 12 |
@@ -124,3 +124,37 @@ Feature: Test get_bbox() function
             | 4326       | 10, 11                                  | 10, 11, 12                                                  |
             | 3857       | 2226389.8 1130195.4,2237521.8 1130195.4 | 2226389.8 1130195.4,2237521.8 1130195.4,2237521.8 1118890.0 |
 
+    Scenario: for relations with node and way members
+        Given the 0.1 grid with origin 20.0 10.1
+            | 10 | 11 |    |
+            |    | 12 | 13 |
+            | 14 |    |    |
+        And the OSM data
+            """
+            w20 v1 dV Nn10,n11
+            w21 v1 dV Nn11,n12
+            r30 v1 dV Ttype=route,route=bus Mw20@,w21@,n13@,n14@
+            """
+        And the lua style
+            """
+            local rels = osm2pgsql.define_relation_table('osm2pgsql_test_routes', {
+                { column = 'min_x', type = 'real' },
+                { column = 'min_y', type = 'real' },
+                { column = 'max_x', type = 'real' },
+                { column = 'max_y', type = 'real' },
+                { column = 'geom',  type = 'geometry', projection = 4326, not_null = true },
+            })
+
+            function osm2pgsql.process_relation(object)
+                local row = {}
+                row.min_x, row.min_y, row.max_x, row.max_y = object:get_bbox()
+                row.geom = object:as_geometrycollection()
+                rels:insert(row)
+            end
+            """
+        When running osm2pgsql flex
+
+        Then table osm2pgsql_test_routes contains exactly
+            | relation_id | min_x | max_x | min_y | max_y |
+            | 30          | 20.0  | 20.2  | 9.9   | 10.1  |
+

From 5f4983d6dab4101ab07da4c0227f6d8103cb9c3a Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 28 Jul 2025 19:46:35 +0200
Subject: [PATCH 333/430] Fix: Untagged member nodes of relations not found

When looking up member nodes in the RAM middle: Only tagged nodes are in
the object store, untagged nodes were not added to the result. This
change adds nodes not found in the object store with just their ID.
Later code will then find and add the locations.
---
 src/middle-ram.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/middle-ram.cpp b/src/middle-ram.cpp
index e670fecf3..2a06201c9 100644
--- a/src/middle-ram.cpp
+++ b/src/middle-ram.cpp
@@ -341,21 +341,20 @@ middle_ram_t::rel_members_get(osmium::Relation const &rel,
         switch (member.type()) {
         case osmium::item_type::node:
             if (m_store_options.nodes) {
-                auto const offset =
-                    m_object_index.nodes().get(member.ref());
+                auto const offset = m_object_index.nodes().get(member.ref());
                 if (offset != ordered_index_t::not_found_value()) {
                     buffer->add_item(m_object_buffer.get<osmium::Node>(offset));
                     buffer->commit();
                     ++count;
+                    continue;
                 }
-            } else {
-                {
-                    osmium::builder::NodeBuilder builder{*buffer};
-                    builder.set_id(member.ref());
-                }
-                buffer->commit();
-                ++count;
             }
+            {
+                osmium::builder::NodeBuilder builder{*buffer};
+                builder.set_id(member.ref());
+            }
+            buffer->commit();
+            ++count;
             break;
         case osmium::item_type::way:
             if (m_store_options.ways) {

From 8feb76a37f9539752d50d93c2ddc705d921aace6 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 30 Jul 2025 15:41:40 +0200
Subject: [PATCH 334/430] Reorganize the way we are printing version numbers

To unify the way we print the version number on startup and when using
--version for the osm2pgsql and osm2pgsql-gen commands, respectively.

Also show more libraries used with --version.
---
 src/command-line-parser.cpp | 18 ------------------
 src/command-line-parser.hpp |  2 --
 src/gen/osm2pgsql-gen.cpp   | 13 ++++++++++---
 src/osm2pgsql.cpp           |  2 +-
 src/version.cpp.in          | 23 +++++++++++++++++++++++
 src/version.hpp             |  3 +++
 6 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index 568d9f5f5..51d728d88 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -10,7 +10,6 @@
 #include "command-line-parser.hpp"
 
 #include "command-line-app.hpp"
-#include "format.hpp"
 #include "logging.hpp"
 #include "options.hpp"
 #include "pgsql.hpp"
@@ -20,12 +19,9 @@
 #include "version.hpp"
 
 #include <osmium/util/string.hpp>
-#include <osmium/version.hpp>
 
 #include <CLI/CLI.hpp>
 
-#include <lua.hpp>
-
 #include <algorithm>
 #include <cmath>
 #include <cstdio>
@@ -254,20 +250,6 @@ void check_options_expire(options_t *options) {
 
 } // anonymous namespace
 
-void print_version()
-{
-    fmt::print(stderr, "osm2pgsql version {}\n", get_osm2pgsql_version());
-    fmt::print(stderr, "Build: {}\n", get_build_type());
-    fmt::print(stderr, "Compiled using the following library versions:\n");
-    fmt::print(stderr, "Libosmium {}\n", LIBOSMIUM_VERSION_STRING);
-    fmt::print(stderr, "Proj {}\n", get_proj_version());
-#ifdef HAVE_LUAJIT
-    fmt::print(stderr, "{} ({})\n", LUA_RELEASE, LUAJIT_VERSION);
-#else
-    fmt::print(stderr, "{}\n", LUA_RELEASE);
-#endif
-}
-
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
 options_t parse_command_line(int argc, char *argv[])
 {
diff --git a/src/command-line-parser.hpp b/src/command-line-parser.hpp
index a3fe81891..0f481d5b2 100644
--- a/src/command-line-parser.hpp
+++ b/src/command-line-parser.hpp
@@ -15,6 +15,4 @@
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
 options_t parse_command_line(int argc, char *argv[]);
 
-void print_version();
-
 #endif // OSM2PGSQL_COMMAND_LINE_PARSER_HPP
diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index 0be98a874..852fb66da 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -42,6 +42,10 @@
 
 #include <lua.hpp>
 
+#include <potracelib.h>
+
+#include <opencv2/core/version.hpp>
+
 #include <algorithm>
 #include <atomic>
 #include <chrono>
@@ -685,13 +689,16 @@ int main(int argc, char *argv[])
             return 0;
         }
 
-        log_info("osm2pgsql-gen version {}", get_osm2pgsql_version());
-        log_warn("This is an EXPERIMENTAL extension to osm2pgsql.");
-
         if (app.want_version()) {
+            print_version("osm2pgsql-gen");
+            fmt::print(stderr, "OpenCV {}\n", CV_VERSION);
+            fmt::print(stderr, "{}\n", potrace_version());
             return 0;
         }
 
+        log_info("osm2pgsql-gen version {}", get_osm2pgsql_version());
+        log_warn("This is an EXPERIMENTAL extension to osm2pgsql.");
+
         if (dbschema.empty()) {
             log_error("Schema must not be empty");
             return 2;
diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
index 10960162e..3fc355dca 100644
--- a/src/osm2pgsql.cpp
+++ b/src/osm2pgsql.cpp
@@ -339,7 +339,7 @@ int main(int argc, char *argv[])
         }
 
         if (options.command == command_t::version) {
-            print_version();
+            print_version("osm2pgsql");
             return 0;
         }
 
diff --git a/src/version.cpp.in b/src/version.cpp.in
index f560d4a39..a02c364f6 100644
--- a/src/version.cpp.in
+++ b/src/version.cpp.in
@@ -7,8 +7,16 @@
  * For a full list of authors see the git log.
  */
 
+#include "format.hpp"
+#include "reprojection.hpp"
 #include "version.hpp"
 
+#include <osmium/version.hpp>
+
+#include <lua.hpp>
+
+#include <nlohmann/json.hpp>
+
 char const *get_build_type() noexcept
 {
     return "@CMAKE_BUILD_TYPE@";
@@ -34,3 +42,18 @@ uint32_t get_minimum_postgresql_server_version_num() noexcept
     return @MINIMUM_POSTGRESQL_SERVER_VERSION_NUM@;
 }
 
+void print_version(std::string const &command)
+{
+    fmt::print(stderr, "{} version {}\n", command, get_osm2pgsql_version());
+    fmt::print(stderr, "Build: {}\n", get_build_type());
+    fmt::print(stderr, "Compiled using the following library versions:\n");
+    fmt::print(stderr, "Libosmium {}\n", LIBOSMIUM_VERSION_STRING);
+    fmt::print(stderr, "Proj {}\n", get_proj_version());
+    fmt::print(stderr, "nlohmann JSON {}.{}.{}\n", NLOHMANN_JSON_VERSION_MAJOR,
+               NLOHMANN_JSON_VERSION_MINOR, NLOHMANN_JSON_VERSION_PATCH);
+#ifdef HAVE_LUAJIT
+    fmt::print(stderr, "{} ({})\n", LUA_RELEASE, LUAJIT_VERSION);
+#else
+    fmt::print(stderr, "{}\n", LUA_RELEASE);
+#endif
+}
diff --git a/src/version.hpp b/src/version.hpp
index d545b2912..c4eeec53c 100644
--- a/src/version.hpp
+++ b/src/version.hpp
@@ -11,6 +11,7 @@
  */
 
 #include <cstdint>
+#include <string>
 
 char const *get_build_type() noexcept;
 char const *get_osm2pgsql_version() noexcept;
@@ -18,4 +19,6 @@ char const *get_osm2pgsql_short_version() noexcept;
 char const *get_minimum_postgresql_server_version() noexcept;
 uint32_t get_minimum_postgresql_server_version_num() noexcept;
 
+void print_version(std::string const &command);
+
 #endif // OSM2PGSQL_VERSION_HPP

From 515df2c74975a47a766da8628aecb2892d6bface Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 4 Aug 2025 18:04:42 +0200
Subject: [PATCH 335/430] Fix: Remove extra colon that messes up the test

---
 tests/bdd/flex/way-change.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/bdd/flex/way-change.feature b/tests/bdd/flex/way-change.feature
index 9e98564ea..941c8d319 100644
--- a/tests/bdd/flex/way-change.feature
+++ b/tests/bdd/flex/way-change.feature
@@ -8,7 +8,7 @@ Feature: Changing ways in a flex database
             | 10 | 12 | 14 | 16 | 18 |
 
     Scenario Outline:
-        Given the OSM data:
+        Given the OSM data
             """
             w10 v1 dV Tt1=yes Nn10,n11
             w11 v1 dV Tt1=yes Nn12,n13

From 879002bab961ddbf6b298b5ad52172ec55e0dd96 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 4 Aug 2025 16:23:52 +0200
Subject: [PATCH 336/430] Use UPPER_CASE for more global constants

---
 src/flex-table-column.cpp                     |   4 +-
 src/geom-area-assembler.cpp                   |   4 +-
 tests/test-expire-from-geometry.cpp           | 114 +++++++++---------
 tests/test-output-flex-example-configs.cpp    |   4 +-
 tests/test-output-flex-multi-input.cpp        |  40 +++---
 tests/test-output-flex-nodes.cpp              |   8 +-
 ...test-output-flex-relation-combinations.cpp |   8 +-
 tests/test-output-flex-relations.cpp          |   8 +-
 tests/test-output-flex-schema.cpp             |   8 +-
 tests/test-output-flex-stage2.cpp             |  16 +--
 tests/test-output-flex-tablespace.cpp         |   4 +-
 tests/test-output-flex-types.cpp              |  32 ++---
 tests/test-output-flex-uni.cpp                |   4 +-
 tests/test-output-flex-update.cpp             |   6 +-
 tests/test-output-flex-validgeom.cpp          |   8 +-
 tests/test-output-flex.cpp                    |   6 +-
 16 files changed, 137 insertions(+), 137 deletions(-)

diff --git a/src/flex-table-column.cpp b/src/flex-table-column.cpp
index 57ed471ff..9fea319bc 100644
--- a/src/flex-table-column.cpp
+++ b/src/flex-table-column.cpp
@@ -31,7 +31,7 @@ struct column_type_lookup
     char const *name() const noexcept { return m_name; }
 };
 
-std::vector<column_type_lookup> const column_types = {
+std::vector<column_type_lookup> const COLUMN_TYPES = {
     {{"text", table_column_type::text},
      {"boolean", table_column_type::boolean},
      {"bool", table_column_type::boolean},
@@ -60,7 +60,7 @@ std::vector<column_type_lookup> const column_types = {
 
 table_column_type get_column_type_from_string(std::string const &type)
 {
-    auto const *column_type = util::find_by_name(column_types, type);
+    auto const *column_type = util::find_by_name(COLUMN_TYPES, type);
     if (!column_type) {
         throw fmt_error("Unknown column type '{}'.", type);
     }
diff --git a/src/geom-area-assembler.cpp b/src/geom-area-assembler.cpp
index 332bd83c3..c2163b841 100644
--- a/src/geom-area-assembler.cpp
+++ b/src/geom-area-assembler.cpp
@@ -13,10 +13,10 @@
 
 namespace geom {
 
-osmium::area::AssemblerConfig const area_config;
+osmium::area::AssemblerConfig const AREA_CONFIG;
 
 area_assembler_t::area_assembler_t(osmium::memory::Buffer *buffer)
-: osmium::area::detail::BasicAssembler(area_config), m_buffer(buffer)
+: osmium::area::detail::BasicAssembler(AREA_CONFIG), m_buffer(buffer)
 {
 }
 
diff --git a/tests/test-expire-from-geometry.cpp b/tests/test-expire-from-geometry.cpp
index 0260a7533..90623ae68 100644
--- a/tests/test-expire-from-geometry.cpp
+++ b/tests/test-expire-from-geometry.cpp
@@ -25,14 +25,14 @@ std::shared_ptr<reprojection> defproj{
 
 // We are using zoom level 12 here, because at that level a tile is about
 // 10,000 units wide/high which gives us easy numbers to work with.
-constexpr uint32_t zoom = 12;
+constexpr uint32_t ZOOM = 12;
 
 } // anonymous namespace
 
 TEST_CASE("expire null geometry does nothing", "[NoDB]")
 {
     expire_config_t const expire_config;
-    expire_tiles et{zoom, defproj};
+    expire_tiles et{ZOOM, defproj};
 
     SECTION("geom")
     {
@@ -53,7 +53,7 @@ TEST_CASE("expire null geometry does nothing", "[NoDB]")
 TEST_CASE("expire point at tile boundary", "[NoDB]")
 {
     expire_config_t const expire_config;
-    expire_tiles et{zoom, defproj};
+    expire_tiles et{ZOOM, defproj};
 
     geom::point_t const pt{0.0, 0.0};
 
@@ -74,16 +74,16 @@ TEST_CASE("expire point at tile boundary", "[NoDB]")
 
     auto const tiles = et.get_tiles();
     REQUIRE(tiles.size() == 4);
-    CHECK(tile_t::from_quadkey(tiles[0], zoom) == tile_t{zoom, 2047, 2047});
-    CHECK(tile_t::from_quadkey(tiles[1], zoom) == tile_t{zoom, 2048, 2047});
-    CHECK(tile_t::from_quadkey(tiles[2], zoom) == tile_t{zoom, 2047, 2048});
-    CHECK(tile_t::from_quadkey(tiles[3], zoom) == tile_t{zoom, 2048, 2048});
+    CHECK(tile_t::from_quadkey(tiles[0], ZOOM) == tile_t{ZOOM, 2047, 2047});
+    CHECK(tile_t::from_quadkey(tiles[1], ZOOM) == tile_t{ZOOM, 2048, 2047});
+    CHECK(tile_t::from_quadkey(tiles[2], ZOOM) == tile_t{ZOOM, 2047, 2048});
+    CHECK(tile_t::from_quadkey(tiles[3], ZOOM) == tile_t{ZOOM, 2048, 2048});
 }
 
 TEST_CASE("expire point away from tile boundary", "[NoDB]")
 {
     expire_config_t const expire_config;
-    expire_tiles et{zoom, defproj};
+    expire_tiles et{ZOOM, defproj};
 
     geom::point_t const pt{5000.0, 5000.0};
 
@@ -104,13 +104,13 @@ TEST_CASE("expire point away from tile boundary", "[NoDB]")
 
     auto const tiles = et.get_tiles();
     REQUIRE(tiles.size() == 1);
-    CHECK(tile_t::from_quadkey(tiles[0], zoom) == tile_t{zoom, 2048, 2047});
+    CHECK(tile_t::from_quadkey(tiles[0], ZOOM) == tile_t{ZOOM, 2048, 2047});
 }
 
 TEST_CASE("expire linestring away from tile boundary", "[NoDB]")
 {
     expire_config_t const expire_config;
-    expire_tiles et{zoom, defproj};
+    expire_tiles et{ZOOM, defproj};
 
     SECTION("line")
     {
@@ -135,13 +135,13 @@ TEST_CASE("expire linestring away from tile boundary", "[NoDB]")
 
     auto const tiles = et.get_tiles();
     REQUIRE(tiles.size() == 1);
-    CHECK(tile_t::from_quadkey(tiles[0], zoom) == tile_t{zoom, 2048, 2047});
+    CHECK(tile_t::from_quadkey(tiles[0], ZOOM) == tile_t{ZOOM, 2048, 2047});
 }
 
 TEST_CASE("expire linestring crossing tile boundary", "[NoDB]")
 {
     expire_config_t const expire_config;
-    expire_tiles et{zoom, defproj};
+    expire_tiles et{ZOOM, defproj};
 
     SECTION("line")
     {
@@ -166,14 +166,14 @@ TEST_CASE("expire linestring crossing tile boundary", "[NoDB]")
 
     auto const tiles = et.get_tiles();
     REQUIRE(tiles.size() == 2);
-    CHECK(tile_t::from_quadkey(tiles[0], zoom) == tile_t{zoom, 2048, 2046});
-    CHECK(tile_t::from_quadkey(tiles[1], zoom) == tile_t{zoom, 2048, 2047});
+    CHECK(tile_t::from_quadkey(tiles[0], ZOOM) == tile_t{ZOOM, 2048, 2046});
+    CHECK(tile_t::from_quadkey(tiles[1], ZOOM) == tile_t{ZOOM, 2048, 2047});
 }
 
 TEST_CASE("expire small polygon", "[NoDB]")
 {
     expire_config_t const expire_config;
-    expire_tiles et{zoom, defproj};
+    expire_tiles et{ZOOM, defproj};
 
     SECTION("polygon")
     {
@@ -210,7 +210,7 @@ TEST_CASE("expire small polygon", "[NoDB]")
 
     auto const tiles = et.get_tiles();
     REQUIRE(tiles.size() == 1);
-    CHECK(tile_t::from_quadkey(tiles[0], zoom) == tile_t{zoom, 2048, 2047});
+    CHECK(tile_t::from_quadkey(tiles[0], ZOOM) == tile_t{ZOOM, 2048, 2047});
 }
 
 TEST_CASE("expire large polygon as bbox", "[NoDB]")
@@ -218,7 +218,7 @@ TEST_CASE("expire large polygon as bbox", "[NoDB]")
     expire_config_t expire_config;
     expire_config.mode = expire_mode::hybrid;
     expire_config.full_area_limit = 40000;
-    expire_tiles et{zoom, defproj};
+    expire_tiles et{ZOOM, defproj};
 
     SECTION("polygon")
     {
@@ -255,17 +255,17 @@ TEST_CASE("expire large polygon as bbox", "[NoDB]")
 
     auto const tiles = et.get_tiles();
     REQUIRE(tiles.size() == 9);
-    CHECK(tile_t::from_quadkey(tiles[0], zoom) == tile_t{zoom, 2048, 2045});
-    CHECK(tile_t::from_quadkey(tiles[1], zoom) == tile_t{zoom, 2049, 2045});
-    CHECK(tile_t::from_quadkey(tiles[2], zoom) == tile_t{zoom, 2050, 2045});
+    CHECK(tile_t::from_quadkey(tiles[0], ZOOM) == tile_t{ZOOM, 2048, 2045});
+    CHECK(tile_t::from_quadkey(tiles[1], ZOOM) == tile_t{ZOOM, 2049, 2045});
+    CHECK(tile_t::from_quadkey(tiles[2], ZOOM) == tile_t{ZOOM, 2050, 2045});
 
-    CHECK(tile_t::from_quadkey(tiles[3], zoom) == tile_t{zoom, 2048, 2046});
-    CHECK(tile_t::from_quadkey(tiles[4], zoom) == tile_t{zoom, 2049, 2046});
-    CHECK(tile_t::from_quadkey(tiles[7], zoom) == tile_t{zoom, 2050, 2046});
+    CHECK(tile_t::from_quadkey(tiles[3], ZOOM) == tile_t{ZOOM, 2048, 2046});
+    CHECK(tile_t::from_quadkey(tiles[4], ZOOM) == tile_t{ZOOM, 2049, 2046});
+    CHECK(tile_t::from_quadkey(tiles[7], ZOOM) == tile_t{ZOOM, 2050, 2046});
 
-    CHECK(tile_t::from_quadkey(tiles[5], zoom) == tile_t{zoom, 2048, 2047});
-    CHECK(tile_t::from_quadkey(tiles[6], zoom) == tile_t{zoom, 2049, 2047});
-    CHECK(tile_t::from_quadkey(tiles[8], zoom) == tile_t{zoom, 2050, 2047});
+    CHECK(tile_t::from_quadkey(tiles[5], ZOOM) == tile_t{ZOOM, 2048, 2047});
+    CHECK(tile_t::from_quadkey(tiles[6], ZOOM) == tile_t{ZOOM, 2049, 2047});
+    CHECK(tile_t::from_quadkey(tiles[8], ZOOM) == tile_t{ZOOM, 2050, 2047});
 }
 
 TEST_CASE("expire large polygon as boundary", "[NoDB]")
@@ -273,7 +273,7 @@ TEST_CASE("expire large polygon as boundary", "[NoDB]")
     expire_config_t expire_config;
     expire_config.mode = expire_mode::hybrid;
     expire_config.full_area_limit = 10000;
-    expire_tiles et{zoom, defproj};
+    expire_tiles et{ZOOM, defproj};
 
     SECTION("polygon")
     {
@@ -320,22 +320,22 @@ TEST_CASE("expire large polygon as boundary", "[NoDB]")
 
     auto const tiles = et.get_tiles();
     REQUIRE(tiles.size() == 8);
-    CHECK(tile_t::from_quadkey(tiles[0], zoom) == tile_t{zoom, 2048, 2045});
-    CHECK(tile_t::from_quadkey(tiles[1], zoom) == tile_t{zoom, 2049, 2045});
-    CHECK(tile_t::from_quadkey(tiles[2], zoom) == tile_t{zoom, 2050, 2045});
+    CHECK(tile_t::from_quadkey(tiles[0], ZOOM) == tile_t{ZOOM, 2048, 2045});
+    CHECK(tile_t::from_quadkey(tiles[1], ZOOM) == tile_t{ZOOM, 2049, 2045});
+    CHECK(tile_t::from_quadkey(tiles[2], ZOOM) == tile_t{ZOOM, 2050, 2045});
 
-    CHECK(tile_t::from_quadkey(tiles[3], zoom) == tile_t{zoom, 2048, 2046});
-    CHECK(tile_t::from_quadkey(tiles[6], zoom) == tile_t{zoom, 2050, 2046});
+    CHECK(tile_t::from_quadkey(tiles[3], ZOOM) == tile_t{ZOOM, 2048, 2046});
+    CHECK(tile_t::from_quadkey(tiles[6], ZOOM) == tile_t{ZOOM, 2050, 2046});
 
-    CHECK(tile_t::from_quadkey(tiles[4], zoom) == tile_t{zoom, 2048, 2047});
-    CHECK(tile_t::from_quadkey(tiles[5], zoom) == tile_t{zoom, 2049, 2047});
-    CHECK(tile_t::from_quadkey(tiles[7], zoom) == tile_t{zoom, 2050, 2047});
+    CHECK(tile_t::from_quadkey(tiles[4], ZOOM) == tile_t{ZOOM, 2048, 2047});
+    CHECK(tile_t::from_quadkey(tiles[5], ZOOM) == tile_t{ZOOM, 2049, 2047});
+    CHECK(tile_t::from_quadkey(tiles[7], ZOOM) == tile_t{ZOOM, 2050, 2047});
 }
 
 TEST_CASE("expire multipoint geometry", "[NoDB]")
 {
     expire_config_t const expire_config;
-    expire_tiles et{zoom, defproj};
+    expire_tiles et{ZOOM, defproj};
 
     geom::point_t const p1{0.0, 0.0};
     geom::point_t const p2{15000.0, 15000.0};
@@ -369,17 +369,17 @@ TEST_CASE("expire multipoint geometry", "[NoDB]")
 
     auto const tiles = et.get_tiles();
     REQUIRE(tiles.size() == 5);
-    CHECK(tile_t::from_quadkey(tiles[0], zoom) == tile_t{zoom, 2047, 2047});
-    CHECK(tile_t::from_quadkey(tiles[1], zoom) == tile_t{zoom, 2049, 2046});
-    CHECK(tile_t::from_quadkey(tiles[2], zoom) == tile_t{zoom, 2048, 2047});
-    CHECK(tile_t::from_quadkey(tiles[3], zoom) == tile_t{zoom, 2047, 2048});
-    CHECK(tile_t::from_quadkey(tiles[4], zoom) == tile_t{zoom, 2048, 2048});
+    CHECK(tile_t::from_quadkey(tiles[0], ZOOM) == tile_t{ZOOM, 2047, 2047});
+    CHECK(tile_t::from_quadkey(tiles[1], ZOOM) == tile_t{ZOOM, 2049, 2046});
+    CHECK(tile_t::from_quadkey(tiles[2], ZOOM) == tile_t{ZOOM, 2048, 2047});
+    CHECK(tile_t::from_quadkey(tiles[3], ZOOM) == tile_t{ZOOM, 2047, 2048});
+    CHECK(tile_t::from_quadkey(tiles[4], ZOOM) == tile_t{ZOOM, 2048, 2048});
 }
 
 TEST_CASE("expire multilinestring geometry", "[NoDB]")
 {
     expire_config_t const expire_config;
-    expire_tiles et{zoom, defproj};
+    expire_tiles et{ZOOM, defproj};
 
     geom::linestring_t l1{{2000.0, 2000.0}, {3000.0, 3000.0}};
     geom::linestring_t l2{{15000.0, 15000.0}, {25000.0, 15000.0}};
@@ -397,9 +397,9 @@ TEST_CASE("expire multilinestring geometry", "[NoDB]")
 
     auto const tiles = et.get_tiles();
     REQUIRE(tiles.size() == 3);
-    CHECK(tile_t::from_quadkey(tiles[0], zoom) == tile_t{zoom, 2049, 2046});
-    CHECK(tile_t::from_quadkey(tiles[1], zoom) == tile_t{zoom, 2048, 2047});
-    CHECK(tile_t::from_quadkey(tiles[2], zoom) == tile_t{zoom, 2050, 2046});
+    CHECK(tile_t::from_quadkey(tiles[0], ZOOM) == tile_t{ZOOM, 2049, 2046});
+    CHECK(tile_t::from_quadkey(tiles[1], ZOOM) == tile_t{ZOOM, 2048, 2047});
+    CHECK(tile_t::from_quadkey(tiles[2], ZOOM) == tile_t{ZOOM, 2050, 2046});
 }
 
 TEST_CASE("expire multipolygon geometry", "[NoDB]")
@@ -407,7 +407,7 @@ TEST_CASE("expire multipolygon geometry", "[NoDB]")
     expire_config_t expire_config;
     expire_config.mode = expire_mode::hybrid;
     expire_config.full_area_limit = 10000;
-    expire_tiles et{zoom, defproj};
+    expire_tiles et{ZOOM, defproj};
 
     geom::polygon_t p1{{{2000.0, 2000.0},
                         {2000.0, 3000.0},
@@ -447,11 +447,11 @@ TEST_CASE("expire multipolygon geometry", "[NoDB]")
     }
 
     std::set<quadkey_t> expected;
-    expected.insert(tile_t{zoom, 2048, 2047}.quadkey()); // p1
+    expected.insert(tile_t{ZOOM, 2048, 2047}.quadkey()); // p1
 
     for (uint32_t x = 2049; x <= 2052; ++x) {
         for (uint32_t y = 2043; y <= 2046; ++y) {
-            expected.insert(tile_t{zoom, x, y}.quadkey()); // p2
+            expected.insert(tile_t{ZOOM, x, y}.quadkey()); // p2
         }
     }
     REQUIRE(expected == result);
@@ -460,7 +460,7 @@ TEST_CASE("expire multipolygon geometry", "[NoDB]")
 TEST_CASE("expire geometry collection", "[NoDB]")
 {
     expire_config_t const expire_config;
-    expire_tiles et{zoom, defproj};
+    expire_tiles et{ZOOM, defproj};
 
     geom::collection_t collection;
     collection.add_geometry(geom::geometry_t{geom::point_t{0.0, 0.0}});
@@ -472,18 +472,18 @@ TEST_CASE("expire geometry collection", "[NoDB]")
 
     auto const tiles = et.get_tiles();
     REQUIRE(tiles.size() == 6);
-    CHECK(tile_t::from_quadkey(tiles[0], zoom) == tile_t{zoom, 2047, 2047});
-    CHECK(tile_t::from_quadkey(tiles[1], zoom) == tile_t{zoom, 2049, 2046});
-    CHECK(tile_t::from_quadkey(tiles[2], zoom) == tile_t{zoom, 2048, 2047});
-    CHECK(tile_t::from_quadkey(tiles[3], zoom) == tile_t{zoom, 2050, 2046});
-    CHECK(tile_t::from_quadkey(tiles[4], zoom) == tile_t{zoom, 2047, 2048});
-    CHECK(tile_t::from_quadkey(tiles[5], zoom) == tile_t{zoom, 2048, 2048});
+    CHECK(tile_t::from_quadkey(tiles[0], ZOOM) == tile_t{ZOOM, 2047, 2047});
+    CHECK(tile_t::from_quadkey(tiles[1], ZOOM) == tile_t{ZOOM, 2049, 2046});
+    CHECK(tile_t::from_quadkey(tiles[2], ZOOM) == tile_t{ZOOM, 2048, 2047});
+    CHECK(tile_t::from_quadkey(tiles[3], ZOOM) == tile_t{ZOOM, 2050, 2046});
+    CHECK(tile_t::from_quadkey(tiles[4], ZOOM) == tile_t{ZOOM, 2047, 2048});
+    CHECK(tile_t::from_quadkey(tiles[5], ZOOM) == tile_t{ZOOM, 2048, 2048});
 }
 
 TEST_CASE("expire works if in 3857", "[NoDB]")
 {
     expire_config_t const expire_config;
-    expire_tiles et{zoom, defproj};
+    expire_tiles et{ZOOM, defproj};
 
     geom::geometry_t geom{geom::point_t{0.0, 0.0}};
     geom.set_srid(PROJ_SPHERE_MERC);
@@ -496,7 +496,7 @@ TEST_CASE("expire works if in 3857", "[NoDB]")
 TEST_CASE("expire doesn't do anything if not in 3857", "[NoDB]")
 {
     expire_config_t const expire_config;
-    expire_tiles et{zoom, defproj};
+    expire_tiles et{ZOOM, defproj};
 
     geom::geometry_t geom{geom::point_t{0.0, 0.0}};
     geom.set_srid(1234);
diff --git a/tests/test-output-flex-example-configs.cpp b/tests/test-output-flex-example-configs.cpp
index 3d1bcfba3..f5da24111 100644
--- a/tests/test-output-flex-example-configs.cpp
+++ b/tests/test-output-flex-example-configs.cpp
@@ -23,7 +23,7 @@ namespace {
 
 testing::db::import_t db;
 
-char const *const data_file = "liechtenstein-2013-08-03.osm.pbf";
+char const *const DATA_FILE = "liechtenstein-2013-08-03.osm.pbf";
 
 std::vector<std::string> get_files() {
     // NOLINTNEXTLINE(concurrency-mt-unsafe)
@@ -43,7 +43,7 @@ TEST_CASE("minimal test for flex example configs")
         auto const conf_file = "../../flex-config/" + file + ".lua";
         options_t const options = testing::opt_t().flex(conf_file.c_str());
 
-        REQUIRE_NOTHROW(db.run_file(options, data_file));
+        REQUIRE_NOTHROW(db.run_file(options, DATA_FILE));
 
         auto conn = db.db().connect();
     }
diff --git a/tests/test-output-flex-multi-input.cpp b/tests/test-output-flex-multi-input.cpp
index 3f6b8fd4e..63b8a08e3 100644
--- a/tests/test-output-flex-multi-input.cpp
+++ b/tests/test-output-flex-multi-input.cpp
@@ -16,15 +16,15 @@ namespace {
 
 testing::db::import_t db;
 
-char const *const conf_file = "test_output_flex.lua";
-char const *const points = "osm2pgsql_test_point";
-char const *const lines = "osm2pgsql_test_line";
+char const *const CONF_FILE = "test_output_flex.lua";
+char const *const POINT_TABLE = "osm2pgsql_test_point";
+char const *const LINE_TABLE = "osm2pgsql_test_line";
 
 } // anonymous namespace
 
 TEST_CASE("with three input files")
 {
-    options_t options = testing::opt_t().slim().flex(conf_file);
+    options_t options = testing::opt_t().slim().flex(CONF_FILE);
 
     REQUIRE_NOTHROW(
         db.run_import(options, {"n10 v1 dV x10.0 y10.0\n"
@@ -36,26 +36,26 @@ TEST_CASE("with three input files")
 
     auto conn = db.db().connect();
 
-    CHECK(1 == conn.get_count(points));
-    CHECK(2 == conn.get_count(lines));
-    CHECK(1 == conn.get_count(lines, "tags->'highway' = 'primary'"));
-    CHECK(1 == conn.get_count(lines, "tags->'highway' = 'secondary'"));
-    CHECK(1 == conn.get_count(lines, "ST_NumPoints(geom) = 3"));
-    CHECK(1 == conn.get_count(lines, "ST_NumPoints(geom) = 2"));
+    CHECK(1 == conn.get_count(POINT_TABLE));
+    CHECK(2 == conn.get_count(LINE_TABLE));
+    CHECK(1 == conn.get_count(LINE_TABLE, "tags->'highway' = 'primary'"));
+    CHECK(1 == conn.get_count(LINE_TABLE, "tags->'highway' = 'secondary'"));
+    CHECK(1 == conn.get_count(LINE_TABLE, "ST_NumPoints(geom) = 3"));
+    CHECK(1 == conn.get_count(LINE_TABLE, "ST_NumPoints(geom) = 2"));
 
     options.append = true;
 
     REQUIRE_NOTHROW(db.run_import(options, "n10 v2 dV x11.0 y11.0\n"));
 
-    CHECK(1 == conn.get_count(points));
-    CHECK(2 == conn.get_count(lines));
-    CHECK(1 == conn.get_count(lines, "ST_NumPoints(geom) = 3"));
-    CHECK(1 == conn.get_count(lines, "ST_NumPoints(geom) = 2"));
+    CHECK(1 == conn.get_count(POINT_TABLE));
+    CHECK(2 == conn.get_count(LINE_TABLE));
+    CHECK(1 == conn.get_count(LINE_TABLE, "ST_NumPoints(geom) = 3"));
+    CHECK(1 == conn.get_count(LINE_TABLE, "ST_NumPoints(geom) = 2"));
 }
 
 TEST_CASE("should use newest version of any object")
 {
-    options_t const options = testing::opt_t().slim().flex(conf_file);
+    options_t const options = testing::opt_t().slim().flex(CONF_FILE);
 
     REQUIRE_NOTHROW(
         db.run_import(options, {"n10 v1 dV x10.0 y10.0 Ta=10.1\n"
@@ -68,10 +68,10 @@ TEST_CASE("should use newest version of any object")
 
     auto conn = db.db().connect();
 
-    CHECK(4 == conn.get_count(points));
-    CHECK(1 == conn.get_count(points, "tags->'a' = '10.1'")); // both the same
-    CHECK(1 == conn.get_count(points, "tags->'a' = '11.2'"));
-    CHECK(1 == conn.get_count(points, "tags->'a' = '12.1'")); // only one
-    CHECK(1 == conn.get_count(points, "tags->'a' = '13.2'"));
+    CHECK(4 == conn.get_count(POINT_TABLE));
+    CHECK(1 == conn.get_count(POINT_TABLE, "tags->'a' = '10.1'")); // both the same
+    CHECK(1 == conn.get_count(POINT_TABLE, "tags->'a' = '11.2'"));
+    CHECK(1 == conn.get_count(POINT_TABLE, "tags->'a' = '12.1'")); // only one
+    CHECK(1 == conn.get_count(POINT_TABLE, "tags->'a' = '13.2'"));
 }
 
diff --git a/tests/test-output-flex-nodes.cpp b/tests/test-output-flex-nodes.cpp
index 9ffbf85ae..f4a8ed9ae 100644
--- a/tests/test-output-flex-nodes.cpp
+++ b/tests/test-output-flex-nodes.cpp
@@ -16,13 +16,13 @@ namespace {
 
 testing::db::import_t db;
 
-char const *const conf_file = "test_output_flex_nodes.lua";
+char const *const CONF_FILE = "test_output_flex_nodes.lua";
 
 } // anonymous namespace
 
 TEST_CASE("add nodes")
 {
-    options_t options = testing::opt_t().slim().flex(conf_file);
+    options_t options = testing::opt_t().slim().flex(CONF_FILE);
 
     REQUIRE_NOTHROW(db.run_import(options,
                                   "n10 v1 dV x10.0 y10.0\n"
@@ -73,7 +73,7 @@ using node_rel_in_relation = node_rel<node_relationship::in_relation>;
 TEMPLATE_TEST_CASE("change nodes", "", node_rel_none, node_rel_in_way,
                    node_rel_in_relation)
 {
-    options_t options = testing::opt_t().slim().flex(conf_file);
+    options_t options = testing::opt_t().slim().flex(CONF_FILE);
 
     REQUIRE_NOTHROW(db.run_import(options,
                                   "n10 v1 dV x10.0 y10.0\n"
@@ -160,7 +160,7 @@ TEMPLATE_TEST_CASE("change nodes", "", node_rel_none, node_rel_in_way,
 TEMPLATE_TEST_CASE("delete nodes", "", node_rel_none, node_rel_in_way,
                    node_rel_in_relation)
 {
-    options_t options = testing::opt_t().slim().flex(conf_file);
+    options_t options = testing::opt_t().slim().flex(CONF_FILE);
 
     REQUIRE_NOTHROW(db.run_import(options,
                                   "n10 v1 dV x10.0 y10.0\n"
diff --git a/tests/test-output-flex-relation-combinations.cpp b/tests/test-output-flex-relation-combinations.cpp
index 42ec81e9f..c05ce9414 100644
--- a/tests/test-output-flex-relation-combinations.cpp
+++ b/tests/test-output-flex-relation-combinations.cpp
@@ -16,13 +16,13 @@ namespace {
 
 testing::db::import_t db;
 
-char const *const conf_file = "test_output_flex_relation_combinations.lua";
+char const *const CONF_FILE = "test_output_flex_relation_combinations.lua";
 
 } // anonymous namespace
 
 TEST_CASE("adding common way to relation")
 {
-    options_t options = testing::opt_t().slim().flex(conf_file);
+    options_t options = testing::opt_t().slim().flex(CONF_FILE);
 
     REQUIRE_NOTHROW(db.run_import(options, "n10 v1 dV x10.0 y10.0\n"
                                            "n11 v1 dV x10.0 y10.1\n"
@@ -50,7 +50,7 @@ TEST_CASE("adding common way to relation")
 
 TEST_CASE("remove common way from relation")
 {
-    options_t options = testing::opt_t().slim().flex(conf_file);
+    options_t options = testing::opt_t().slim().flex(CONF_FILE);
 
     REQUIRE_NOTHROW(db.run_import(options, "w20 v1 dV Nn10,n11\n"
                                            "w21 v1 dV Nn12,n13\n"
@@ -74,7 +74,7 @@ TEST_CASE("remove common way from relation")
 
 TEST_CASE("change common way in relation")
 {
-    options_t options = testing::opt_t().slim().flex(conf_file);
+    options_t options = testing::opt_t().slim().flex(CONF_FILE);
 
     REQUIRE_NOTHROW(db.run_import(options, "w20 v1 dV Nn10,n11\n"
                                            "w21 v1 dV Nn12,n13\n"
diff --git a/tests/test-output-flex-relations.cpp b/tests/test-output-flex-relations.cpp
index 0482523e2..0a57b6b2a 100644
--- a/tests/test-output-flex-relations.cpp
+++ b/tests/test-output-flex-relations.cpp
@@ -16,13 +16,13 @@ namespace {
 
 testing::db::import_t db;
 
-char const *const conf_file = "test_output_flex_relations.lua";
+char const *const CONF_FILE = "test_output_flex_relations.lua";
 
 } // anonymous namespace
 
 TEST_CASE("add relations")
 {
-    options_t options = testing::opt_t().slim().flex(conf_file);
+    options_t options = testing::opt_t().slim().flex(CONF_FILE);
 
     REQUIRE_NOTHROW(db.run_import(options, "r30 v1 dV\n"
                                            "r31 v1 dV Tt1=yes\n"
@@ -53,7 +53,7 @@ TEST_CASE("add relations")
 
 TEST_CASE("change relations")
 {
-    options_t options = testing::opt_t().slim().flex(conf_file);
+    options_t options = testing::opt_t().slim().flex(CONF_FILE);
 
     REQUIRE_NOTHROW(db.run_import(options, "r30 v1 dV\n"
                                            "r31 v1 dV Tt1=yes\n"
@@ -127,7 +127,7 @@ TEST_CASE("change relations")
 
 TEST_CASE("delete relation")
 {
-    options_t options = testing::opt_t().slim().flex(conf_file);
+    options_t options = testing::opt_t().slim().flex(CONF_FILE);
 
     REQUIRE_NOTHROW(db.run_import(options, "r30 v1 dV\n"
                                            "r31 v1 dV Tt1=yes\n"
diff --git a/tests/test-output-flex-schema.cpp b/tests/test-output-flex-schema.cpp
index bb6cef9c1..7ae5b5604 100644
--- a/tests/test-output-flex-schema.cpp
+++ b/tests/test-output-flex-schema.cpp
@@ -16,20 +16,20 @@ namespace {
 
 testing::db::import_t db;
 
-char const *const conf_file = "test_output_flex_schema.lua";
-char const *const data_file = "liechtenstein-2013-08-03.osm.pbf";
+char const *const CONF_FILE = "test_output_flex_schema.lua";
+char const *const DATA_FILE = "liechtenstein-2013-08-03.osm.pbf";
 
 } // anonymous namespace
 
 TEST_CASE("config with schema should work")
 {
-    options_t const options = testing::opt_t().slim().flex(conf_file);
+    options_t const options = testing::opt_t().slim().flex(CONF_FILE);
 
     auto conn = db.db().connect();
     conn.exec("CREATE SCHEMA IF NOT EXISTS myschema;");
     init_database_capabilities(conn);
 
-    REQUIRE_NOTHROW(db.run_file(options, data_file));
+    REQUIRE_NOTHROW(db.run_file(options, DATA_FILE));
 
     REQUIRE(1 ==
             conn.get_count("pg_catalog.pg_namespace", "nspname = 'myschema'"));
diff --git a/tests/test-output-flex-stage2.cpp b/tests/test-output-flex-stage2.cpp
index 2e370bddd..d53853dba 100644
--- a/tests/test-output-flex-stage2.cpp
+++ b/tests/test-output-flex-stage2.cpp
@@ -16,13 +16,13 @@ namespace {
 
 testing::db::import_t db;
 
-char const *const conf_file = "test_output_flex_stage2.lua";
+char const *const CONF_FILE = "test_output_flex_stage2.lua";
 
 } // anonymous namespace
 
 TEST_CASE("nodes and ways")
 {
-    options_t options = testing::opt_t().slim().flex(conf_file);
+    options_t options = testing::opt_t().slim().flex(CONF_FILE);
 
     REQUIRE_NOTHROW(db.run_import(options,
                                   "n10 v1 dV x10.0 y10.0\n"
@@ -100,7 +100,7 @@ TEST_CASE("nodes and ways")
 
 TEST_CASE("relation data on ways")
 {
-    options_t options = testing::opt_t().slim().flex(conf_file);
+    options_t options = testing::opt_t().slim().flex(CONF_FILE);
 
     // create database with three ways and a relation on two of them
     REQUIRE_NOTHROW(
@@ -198,7 +198,7 @@ TEST_CASE("relation data on ways")
 
 TEST_CASE("relation data on ways: delete or re-tag relation")
 {
-    options_t options = testing::opt_t().slim().flex(conf_file);
+    options_t options = testing::opt_t().slim().flex(CONF_FILE);
 
     // create database with three ways and a relation on two of them
     REQUIRE_NOTHROW(
@@ -257,7 +257,7 @@ TEST_CASE("relation data on ways: delete or re-tag relation")
 
 TEST_CASE("relation data on ways: delete way in other relation")
 {
-    options_t options = testing::opt_t().slim().flex(conf_file);
+    options_t options = testing::opt_t().slim().flex(CONF_FILE);
 
     // create database with three ways and two relations on them
     REQUIRE_NOTHROW(
@@ -326,7 +326,7 @@ TEST_CASE("relation data on ways: delete way in other relation")
 TEST_CASE("relation data on ways: changing things in one relation should not "
           "change output")
 {
-    options_t options = testing::opt_t().slim().flex(conf_file);
+    options_t options = testing::opt_t().slim().flex(CONF_FILE);
 
     // create database with three ways and two relations on them
     REQUIRE_NOTHROW(
@@ -402,7 +402,7 @@ TEST_CASE("relation data on ways: changing things in one relation should not "
 
 TEST_CASE("relation data on ways: change relation (two rels)")
 {
-    options_t options = testing::opt_t().slim().flex(conf_file);
+    options_t options = testing::opt_t().slim().flex(CONF_FILE);
 
     // create database with three ways and two relations on them
     REQUIRE_NOTHROW(
@@ -458,7 +458,7 @@ TEST_CASE("relation data on ways: change relation (two rels)")
 
 TEST_CASE("relation data on ways: change relation (three rels)")
 {
-    options_t options = testing::opt_t().slim().flex(conf_file);
+    options_t options = testing::opt_t().slim().flex(CONF_FILE);
 
     // create database with three ways and two relations on them
     REQUIRE_NOTHROW(db.run_import(options,
diff --git a/tests/test-output-flex-tablespace.cpp b/tests/test-output-flex-tablespace.cpp
index 65e61a3f2..527784855 100644
--- a/tests/test-output-flex-tablespace.cpp
+++ b/tests/test-output-flex-tablespace.cpp
@@ -16,7 +16,7 @@ namespace {
 
 testing::db::import_t db;
 
-char const *const conf_file = "test_output_flex.lua";
+char const *const CONF_FILE = "test_output_flex.lua";
 
 } // anonymous namespace
 
@@ -28,7 +28,7 @@ TEST_CASE("simple import with tablespaces for middle")
                                     "spcname = 'tablespacetest'"));
     }
 
-    options_t options = testing::opt_t().slim().flex(conf_file);
+    options_t options = testing::opt_t().slim().flex(CONF_FILE);
     options.tblsslim_index = "tablespacetest";
     options.tblsslim_data = "tablespacetest";
 
diff --git a/tests/test-output-flex-types.cpp b/tests/test-output-flex-types.cpp
index cd22c5c59..689208894 100644
--- a/tests/test-output-flex-types.cpp
+++ b/tests/test-output-flex-types.cpp
@@ -18,13 +18,13 @@ namespace {
 
 testing::db::import_t db;
 
-char const *const conf_file = "test_output_flex_types.lua";
+char const *const CONF_FILE = "test_output_flex_types.lua";
 
 } // anonymous namespace
 
 TEST_CASE("type nil")
 {
-    testing::opt_t const options = testing::opt_t().flex(conf_file);
+    testing::opt_t const options = testing::opt_t().flex(CONF_FILE);
 
     REQUIRE_NOTHROW(
         db.run_import(options, "n10 v1 dV x10.0 y10.0 Ttype=nil\n"));
@@ -43,7 +43,7 @@ TEST_CASE("type nil")
 
 TEST_CASE("type boolean")
 {
-    testing::opt_t const options = testing::opt_t().flex(conf_file);
+    testing::opt_t const options = testing::opt_t().flex(CONF_FILE);
 
     REQUIRE_NOTHROW(
         db.run_import(options, "n10 v1 dV x10.0 y10.0 Ttype=boolean\n"));
@@ -61,7 +61,7 @@ TEST_CASE("type boolean")
 
 TEST_CASE("type boolean in column where it doesn't belong")
 {
-    testing::opt_t const options = testing::opt_t().flex(conf_file);
+    testing::opt_t const options = testing::opt_t().flex(CONF_FILE);
 
     REQUIRE_THROWS(db.run_import(
         options, "n10 v1 dV x10.0 y10.0 Ttype=boolean-fail column=ttext\n"));
@@ -79,7 +79,7 @@ TEST_CASE("type boolean in column where it doesn't belong")
 
 TEST_CASE("type number")
 {
-    testing::opt_t const options = testing::opt_t().flex(conf_file);
+    testing::opt_t const options = testing::opt_t().flex(CONF_FILE);
 
     REQUIRE_NOTHROW(
         db.run_import(options, "n10 v1 dV x10.0 y10.0 Ttype=number\n"));
@@ -113,7 +113,7 @@ TEST_CASE("type number")
 
 TEST_CASE("type string (with bool)")
 {
-    testing::opt_t const options = testing::opt_t().flex(conf_file);
+    testing::opt_t const options = testing::opt_t().flex(CONF_FILE);
 
     REQUIRE_NOTHROW(
         db.run_import(options, "n10 v1 dV x10.0 y10.0 Ttype=string-bool\n"));
@@ -128,7 +128,7 @@ TEST_CASE("type string (with bool)")
 
 TEST_CASE("type string (with direction)")
 {
-    testing::opt_t const options = testing::opt_t().flex(conf_file);
+    testing::opt_t const options = testing::opt_t().flex(CONF_FILE);
 
     REQUIRE_NOTHROW(db.run_import(
         options, "n10 v1 dV x10.0 y10.0 Ttype=string-direction\n"));
@@ -142,7 +142,7 @@ TEST_CASE("type string (with direction)")
 
 TEST_CASE("type string (with number)")
 {
-    testing::opt_t const options = testing::opt_t().flex(conf_file);
+    testing::opt_t const options = testing::opt_t().flex(CONF_FILE);
 
     REQUIRE_NOTHROW(db.run_import(
         options, "n10 v1 dV x10.0 y10.0 Ttype=string-with-number\n"));
@@ -175,7 +175,7 @@ TEST_CASE("type string (with number)")
 
 TEST_CASE("type string (with invalid number)")
 {
-    testing::opt_t const options = testing::opt_t().flex(conf_file);
+    testing::opt_t const options = testing::opt_t().flex(CONF_FILE);
 
     REQUIRE_NOTHROW(db.run_import(
         options, "n10 v1 dV x10.0 y10.0 Ttype=string-with-invalid-number\n"));
@@ -197,7 +197,7 @@ TEST_CASE("type string (with invalid number)")
 
 TEST_CASE("type number in column where it doesn't belong")
 {
-    testing::opt_t const options = testing::opt_t().flex(conf_file);
+    testing::opt_t const options = testing::opt_t().flex(CONF_FILE);
 
     REQUIRE_THROWS(db.run_import(
         options, "n10 v1 dV x10.0 y10.0 Ttype=number-fail column=thstr\n"));
@@ -209,7 +209,7 @@ TEST_CASE("type number in column where it doesn't belong")
 
 TEST_CASE("Adding a function should always fail")
 {
-    testing::opt_t const options = testing::opt_t().flex(conf_file);
+    testing::opt_t const options = testing::opt_t().flex(CONF_FILE);
 
     std::array<std::string, 9> const types = {"ttext", "tbool", "tint2",
                                               "tint4", "tint8", "treal",
@@ -228,7 +228,7 @@ TEST_CASE("Adding a function should always fail")
 
 TEST_CASE("type table")
 {
-    testing::opt_t const options = testing::opt_t().flex(conf_file);
+    testing::opt_t const options = testing::opt_t().flex(CONF_FILE);
 
     REQUIRE_NOTHROW(
         db.run_import(options, "n10 v1 dV x10.0 y10.0 Ttype=table\n"));
@@ -245,7 +245,7 @@ TEST_CASE("type table")
 
 TEST_CASE("Adding a table with non-strings should fail for hstore")
 {
-    testing::opt_t const options = testing::opt_t().flex(conf_file);
+    testing::opt_t const options = testing::opt_t().flex(CONF_FILE);
 
     char const *const line = "n10 v1 dV x10.0 y10.0 Ttype=table-hstore-fail\n";
     REQUIRE_THROWS(db.run_import(options, line));
@@ -257,7 +257,7 @@ TEST_CASE("Adding a table with non-strings should fail for hstore")
 
 TEST_CASE("Adding a table should fail except for hstore and json/jsonb")
 {
-    testing::opt_t const options = testing::opt_t().flex(conf_file);
+    testing::opt_t const options = testing::opt_t().flex(CONF_FILE);
 
     std::array<std::string, 8> const types = {
         "ttext", "tbool", "tint2", "tint4", "tint8", "treal", "tdirn", "tsqlt"};
@@ -275,7 +275,7 @@ TEST_CASE("Adding a table should fail except for hstore and json/jsonb")
 
 TEST_CASE("Adding a complex table in jsonb")
 {
-    testing::opt_t const options = testing::opt_t().flex(conf_file);
+    testing::opt_t const options = testing::opt_t().flex(CONF_FILE);
 
     char const *const line = "n10 v1 dV x10.0 y10.0 Ttype=json\n";
     REQUIRE_NOTHROW(db.run_import(options, line));
@@ -295,7 +295,7 @@ TEST_CASE("Adding a complex table in jsonb")
 
 TEST_CASE("Adding a table with a loop should fail")
 {
-    testing::opt_t const options = testing::opt_t().flex(conf_file);
+    testing::opt_t const options = testing::opt_t().flex(CONF_FILE);
 
     char const *const line = "n10 v1 dV x10.0 y10.0 Ttype=json-loop\n";
     REQUIRE_THROWS(db.run_import(options, line));
diff --git a/tests/test-output-flex-uni.cpp b/tests/test-output-flex-uni.cpp
index e42848563..17604b304 100644
--- a/tests/test-output-flex-uni.cpp
+++ b/tests/test-output-flex-uni.cpp
@@ -16,7 +16,7 @@ namespace {
 
 testing::db::import_t db;
 
-char const *const conf_file = "test_output_flex_uni.lua";
+char const *const CONF_FILE = "test_output_flex_uni.lua";
 
 } // anonymous namespace
 
@@ -24,7 +24,7 @@ struct options_slim_default
 {
     static options_t options()
     {
-        return testing::opt_t().slim().flex(conf_file);
+        return testing::opt_t().slim().flex(CONF_FILE);
     }
 };
 
diff --git a/tests/test-output-flex-update.cpp b/tests/test-output-flex-update.cpp
index a6a6b0d4f..879ce2ae1 100644
--- a/tests/test-output-flex-update.cpp
+++ b/tests/test-output-flex-update.cpp
@@ -17,7 +17,7 @@ namespace {
 
 testing::db::import_t db;
 
-char const *const conf_file = "test_output_flex.lua";
+char const *const CONF_FILE = "test_output_flex.lua";
 
 // Return a string with the schema name prepended to the table name.
 std::string with_schema(char const *table_name, options_t const &options)
@@ -34,7 +34,7 @@ struct options_slim_default
 {
     static options_t options()
     {
-        return testing::opt_t().slim().flex(conf_file);
+        return testing::opt_t().slim().flex(CONF_FILE);
     }
 };
 
@@ -75,7 +75,7 @@ END
         conn.close();
         return testing::opt_t()
             .slim()
-            .flex(conf_file)
+            .flex(CONF_FILE)
             .schema("myschema")
             .user("limited", "password_limited");
     }
diff --git a/tests/test-output-flex-validgeom.cpp b/tests/test-output-flex-validgeom.cpp
index 59ae9c69e..73eec6665 100644
--- a/tests/test-output-flex-validgeom.cpp
+++ b/tests/test-output-flex-validgeom.cpp
@@ -16,16 +16,16 @@ namespace {
 
 testing::db::import_t db;
 
-char const *const conf_file = "test_output_flex_validgeom.lua";
-char const *const data_file = "test_output_pgsql_validgeom.osm";
+char const *const CONF_FILE = "test_output_flex_validgeom.lua";
+char const *const DATA_FILE = "test_output_pgsql_validgeom.osm";
 
 } // anonymous namespace
 
 TEST_CASE("no invalid geometries should end up in the database")
 {
-    options_t const options = testing::opt_t().flex(conf_file);
+    options_t const options = testing::opt_t().flex(CONF_FILE);
 
-    REQUIRE_NOTHROW(db.run_file(options, data_file));
+    REQUIRE_NOTHROW(db.run_file(options, DATA_FILE));
 
     auto conn = db.db().connect();
 
diff --git a/tests/test-output-flex.cpp b/tests/test-output-flex.cpp
index 32ef66ea2..ec6dcaf24 100644
--- a/tests/test-output-flex.cpp
+++ b/tests/test-output-flex.cpp
@@ -16,7 +16,7 @@ namespace {
 
 testing::db::import_t db;
 
-char const *const conf_file = "test_output_flex.lua";
+char const *const CONF_FILE = "test_output_flex.lua";
 
 } // anonymous namespace
 
@@ -24,7 +24,7 @@ struct options_slim_default
 {
     static options_t options()
     {
-        return testing::opt_t().slim().flex(conf_file);
+        return testing::opt_t().slim().flex(CONF_FILE);
     }
 };
 
@@ -32,7 +32,7 @@ struct options_slim_latlon
 {
     static options_t options()
     {
-        return testing::opt_t().slim().flex(conf_file).srs(PROJ_LATLONG);
+        return testing::opt_t().slim().flex(CONF_FILE).srs(PROJ_LATLONG);
     }
 };
 

From 79bc89cdead0de30224f9097eb52fb6a46c3ea79 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 14 Aug 2025 15:21:14 +0200
Subject: [PATCH 337/430] Fix problem when detecting PostGIS version

We are accessing data that doesn't exist if we don't get three
rows from the SQL query.

If the PostGIS version could not be detected, we report that.
---
 src/pgsql-capabilities.cpp | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/pgsql-capabilities.cpp b/src/pgsql-capabilities.cpp
index 7c22ef0a1..d568f2eac 100644
--- a/src/pgsql-capabilities.cpp
+++ b/src/pgsql-capabilities.cpp
@@ -98,8 +98,15 @@ void init_postgis_version(pg_conn_t const &db_connection)
             capabilities().database_name);
     }
 
-    capabilities().postgis = {std::stoi(std::string{res.get(0, 0)}),
-                              std::stoi(std::string{res.get(1, 0)})};
+    try {
+        if (res.num_tuples() >= 2) {
+            capabilities().postgis = {std::stoi(std::string{res.get(0, 0)}),
+                                      std::stoi(std::string{res.get(1, 0)})};
+        }
+    } catch (...) {
+        // Fall through if std::stoi() fails in which case the version
+        // is reported as 0.
+    }
 }
 
 } // anonymous namespace
@@ -114,8 +121,13 @@ void init_database_capabilities(pg_conn_t const &db_connection)
     try {
         log_info("Database version: {}",
                  capabilities().settings.at("server_version"));
-        log_info("PostGIS version: {}.{}", capabilities().postgis.major,
-                 capabilities().postgis.minor);
+
+        if (capabilities().postgis.major == 0) {
+            log_info("PostGIS version: could not be detected");
+        } else {
+            log_info("PostGIS version: {}.{}", capabilities().postgis.major,
+                     capabilities().postgis.minor);
+        }
 
         auto const version_str =
             capabilities().settings.at("server_version_num");

From 7faa7d632fbd3d1bb4b15990099416874e84ba43 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 18 Aug 2025 23:07:02 +0200
Subject: [PATCH 338/430] move and fix tests for unique and primary key id
 indexes

Puts the index tests to where all the other tests reside and
adds actual tests for the presence of the indexes. Needs some
regular expression matching of the values.
---
 tests/bdd/flex/lua-index-definitions.feature | 48 ++++++++++++++++++++
 tests/bdd/flex/lua-table-definitions.feature | 34 --------------
 tests/bdd/steps/steps_db.py                  | 14 ++++++
 3 files changed, 62 insertions(+), 34 deletions(-)

diff --git a/tests/bdd/flex/lua-index-definitions.feature b/tests/bdd/flex/lua-index-definitions.feature
index 04b642f61..da77db887 100644
--- a/tests/bdd/flex/lua-index-definitions.feature
+++ b/tests/bdd/flex/lua-index-definitions.feature
@@ -537,3 +537,51 @@ Feature: Index definitions in Lua file
             schemaname = 'public' AND tablename = 'mytable' AND indexname LIKE '%node_id%'
             """
 
+    Scenario: Create a unique id index when requested
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            local t = osm2pgsql.define_table({
+                name = 'foo',
+                ids = { type = 'node', id_column = 'node_id', create_index = 'unique' },
+                columns = {}
+            })
+
+            function osm2pgsql.process_node(object)
+                t:insert({})
+            end
+            """
+        When running osm2pgsql flex
+        Then table foo has 1562 rows
+        And SELECT indexdef FROM pg_indexes WHERE tablename = 'foo'
+            | indexdef@fullmatch |
+            | CREATE UNIQUE INDEX .* USING .*\(node_id\) |
+        And table pg_catalog.pg_index has 0 rows with condition
+            """
+            indrelid = 'foo'::regclass and indisprimary
+            """
+
+    Scenario: Create a primary key id index when requested
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            local t = osm2pgsql.define_table({
+                name = 'foo',
+                ids = { type = 'node', id_column = 'node_id', create_index = 'primary_key' },
+                columns = {}
+            })
+
+            function osm2pgsql.process_node(object)
+                t:insert({})
+            end
+            """
+        When running osm2pgsql flex
+        Then table foo has 1562 rows
+        And SELECT indexdef FROM pg_indexes WHERE tablename = 'foo'
+            | indexdef@fullmatch |
+            | CREATE UNIQUE INDEX .* USING .*\(node_id\) |
+        And table pg_catalog.pg_index has 1 row with condition
+            """
+            indrelid = 'foo'::regclass and indisprimary
+            """
+
diff --git a/tests/bdd/flex/lua-table-definitions.feature b/tests/bdd/flex/lua-table-definitions.feature
index 24364825d..a061b1b28 100644
--- a/tests/bdd/flex/lua-table-definitions.feature
+++ b/tests/bdd/flex/lua-table-definitions.feature
@@ -99,40 +99,6 @@ Feature: Table definitions in Lua file
         When running osm2pgsql flex
         Then table foo has 1562 rows
 
-    Scenario: Unique index is okay
-        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
-        And the lua style
-            """
-            local t = osm2pgsql.define_table({
-                name = 'foo',
-                ids = { type = 'node', id_column = 'node_id', index = 'unique' },
-                columns = {}
-            })
-
-            function osm2pgsql.process_node(object)
-                t:insert({})
-            end
-            """
-        When running osm2pgsql flex
-        Then table foo has 1562 rows
-
-    Scenario: Primary key is okay
-        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
-        And the lua style
-            """
-            local t = osm2pgsql.define_table({
-                name = 'foo',
-                ids = { type = 'node', id_column = 'node_id', index = 'primary_key' },
-                columns = {}
-            })
-
-            function osm2pgsql.process_node(object)
-                t:insert({})
-            end
-            """
-        When running osm2pgsql flex
-        Then table foo has 1562 rows
-
     Scenario: Can not create two tables with the same name
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
         And the lua style
diff --git a/tests/bdd/steps/steps_db.py b/tests/bdd/steps/steps_db.py
index 027d1af92..5d7a99523 100644
--- a/tests/bdd/steps/steps_db.py
+++ b/tests/bdd/steps/steps_db.py
@@ -153,6 +153,8 @@ def __init__(self, row, headings, factory):
                 self.data.append(None)
             elif head.lower().startswith('st_astext('):
                 self.data.append(DBValueGeometry(value, props, factory))
+            elif props == 'fullmatch':
+                self.data.append(DBValueRegex(value))
             else:
                 self.data.append(str(value))
 
@@ -234,3 +236,15 @@ def __eq__(self, other):
 
     def __repr__(self):
         return repr(self.value)
+
+
+class DBValueRegex:
+
+    def __init__(self, value):
+        self.value = str(value)
+
+    def __eq__(self, other):
+        return re.fullmatch(str(other), self.value) is not None
+
+    def __repr__(self):
+        return repr(self.value)

From e76afaaa668a64e5af575b4082f39b87d72933e7 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 19 Aug 2025 10:26:05 +0200
Subject: [PATCH 339/430] Disable clang-tidy error message due to empty catch

---
 src/pgsql-capabilities.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pgsql-capabilities.cpp b/src/pgsql-capabilities.cpp
index d568f2eac..4b45f7c02 100644
--- a/src/pgsql-capabilities.cpp
+++ b/src/pgsql-capabilities.cpp
@@ -103,7 +103,7 @@ void init_postgis_version(pg_conn_t const &db_connection)
             capabilities().postgis = {std::stoi(std::string{res.get(0, 0)}),
                                       std::stoi(std::string{res.get(1, 0)})};
         }
-    } catch (...) {
+    } catch (...) { // NOLINT(bugprone-empty-catch)
         // Fall through if std::stoi() fails in which case the version
         // is reported as 0.
     }

From 19a26d44a82710ed68ed9ad5a69d032fa2496d5c Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 19 Aug 2025 15:34:25 +0200
Subject: [PATCH 340/430] Remove mentioning of verbose help from osm2pgsql man
 page

This has not been working since we switched to the new command line
parsing library...
---
 man/osm2pgsql.1  | 1 -
 man/osm2pgsql.md | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/man/osm2pgsql.1 b/man/osm2pgsql.1
index 126515213..e4864b0dc 100644
--- a/man/osm2pgsql.1
+++ b/man/osm2pgsql.1
@@ -48,7 +48,6 @@ Removes existing data from the database tables!
 .TP
 -h, --help
 Print help.
-Add \f[B]-v, --verbose\f[R] to display more verbose help.
 .TP
 -V, --version
 Print osm2pgsql version.
diff --git a/man/osm2pgsql.md b/man/osm2pgsql.md
index 637191eea..83c79e78b 100644
--- a/man/osm2pgsql.md
+++ b/man/osm2pgsql.md
@@ -46,7 +46,7 @@ mandatory for short options too.
 # HELP/VERSION OPTIONS
 
 -h, \--help
-:   Print help. Add **-v, \--verbose** to display more verbose help.
+:   Print help.
 
 -V, \--version
 :   Print osm2pgsql version.

From cc6ebcef1b93293341c907251c6dd181b632ee63 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 11 Aug 2025 12:02:28 +0200
Subject: [PATCH 341/430] Process untagged ways/relations in stage 1b/c
 correctly

When we introduced the "untagged" callbacks in
bc87ea2c8b4ea0bcac09975627e78765fda8927e, we did not call the
process_untagged_way/relation callbacks for untagged ways/relations  in
stage 1b and 1c, but called the normal process_way/relation callbacks.
That's not correct. So this is changed in this commit.

For stage2 processing the answer which callback to call is a bit more
complicated: On first glance we should also call the "untagged" function
for untagged objects. But if we call the "untagged" function in that
case, we would have to implement that function and it would be called
for the millions of untagged objects we are not interested in. So it is
arguably better to call the normal processing functions here. After all
we explicitly requested the processing function to be called with the
select_relation_members() call. So we are keeping this behaviour.
---
 src/output-flex.cpp                      | 32 +++++---
 src/output-flex.hpp                      |  2 +
 tests/bdd/flex/untagged.feature          | 94 ++++++++++++++++++++++++
 tests/data/test_output_flex_untagged.lua | 53 +++++++++++++
 4 files changed, 170 insertions(+), 11 deletions(-)
 create mode 100644 tests/bdd/flex/untagged.feature
 create mode 100644 tests/data/test_output_flex_untagged.lua

diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 4c9e052c7..d16624a82 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -835,7 +835,7 @@ void output_flex_t::get_mutex_and_call_lua_function(
 
 void output_flex_t::pending_way(osmid_t id)
 {
-    if (!m_process_way) {
+    if (!m_process_way && !m_process_untagged_way) {
         return;
     }
 
@@ -844,8 +844,11 @@ void output_flex_t::pending_way(osmid_t id)
     }
 
     way_delete(id);
-
-    get_mutex_and_call_lua_function(m_process_way, m_way_cache.get());
+    auto const &func = m_way_cache.get().tags().empty() ? m_process_untagged_way
+                                                        : m_process_way;
+    if (func) {
+        get_mutex_and_call_lua_function(func, m_way_cache.get());
+    }
 }
 
 void output_flex_t::select_relation_members()
@@ -892,9 +895,20 @@ void output_flex_t::select_relation_members(osmid_t id)
     select_relation_members();
 }
 
+void output_flex_t::process_relation()
+{
+    auto const &func = m_relation_cache.get().tags().empty()
+                           ? m_process_untagged_relation
+                           : m_process_relation;
+    if (func) {
+        get_mutex_and_call_lua_function(func, m_relation_cache.get());
+    }
+}
+
 void output_flex_t::pending_relation(osmid_t id)
 {
-    if (!m_process_relation && !m_select_relation_members) {
+    if (!m_process_relation && !m_process_untagged_relation &&
+        !m_select_relation_members) {
         return;
     }
 
@@ -904,16 +918,12 @@ void output_flex_t::pending_relation(osmid_t id)
 
     select_relation_members();
     delete_from_tables(osmium::item_type::relation, id);
-
-    if (m_process_relation) {
-        get_mutex_and_call_lua_function(m_process_relation,
-                                        m_relation_cache.get());
-    }
+    process_relation();
 }
 
 void output_flex_t::pending_relation_stage1c(osmid_t id)
 {
-    if (!m_process_relation) {
+    if (!m_process_relation && !m_process_untagged_relation) {
         return;
     }
 
@@ -922,7 +932,7 @@ void output_flex_t::pending_relation_stage1c(osmid_t id)
     }
 
     m_disable_insert = true;
-    get_mutex_and_call_lua_function(m_process_relation, m_relation_cache.get());
+    process_relation();
     m_disable_insert = false;
 }
 
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index e9d7b6330..1cda3068c 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -196,6 +196,8 @@ class output_flex_t : public output_t
     void get_mutex_and_call_lua_function(prepared_lua_function_t func,
                                          osmium::OSMObject const &object);
 
+    void process_relation();
+
     void init_lua(std::string const &filename, properties_t const &properties);
 
     void check_context_and_state(char const *name, char const *context,
diff --git a/tests/bdd/flex/untagged.feature b/tests/bdd/flex/untagged.feature
new file mode 100644
index 000000000..86c641a0b
--- /dev/null
+++ b/tests/bdd/flex/untagged.feature
@@ -0,0 +1,94 @@
+Feature: Adding untagged objects to a flex database
+
+    Scenario: Import with normal and "untagged" callbacks
+        Given the style file 'test_output_flex_untagged.lua'
+        And the OSM data
+            """
+            n11 v1 dV x1 y1
+            n12 v1 dV x2 y2
+            n13 v1 dV x3 y3
+            n14 v1 dV Tamenity=restaurant x4 y4
+            w20 v1 dV Thighway=primary Nn11,n12
+            w21 v1 dV Nn13,n14
+            r30 v1 dV Mn11@,w20@
+            r31 v1 dV Ttype=route Mw20@
+            """
+        When running osm2pgsql flex
+        Then table osm2pgsql_test_nodes contains exactly
+            | node_id | tagged | tags |
+            | 11      | False  | {} |
+            | 12      | False  | {} |
+            | 13      | False  | {} |
+            | 14      | True   | {'amenity': 'restaurant'} |
+
+        Then table osm2pgsql_test_ways contains exactly
+            | way_id | tagged | tags |
+            | 20     | True   | {'highway': 'primary'} |
+            | 21     | False  | {} |
+
+        Then table osm2pgsql_test_relations contains exactly
+            | relation_id | tagged | tags |
+            | 30          | False  | {} |
+            | 31          | True   | {'type': 'route'} |
+
+    Scenario: Import then update with normal and "untagged" callbacks
+        Given the style file 'test_output_flex_untagged.lua'
+        And the OSM data
+            """
+            n11 v1 dV x1 y1
+            n12 v1 dV x2 y2
+            n13 v1 dV x3 y3
+            n14 v1 dV Tamenity=restaurant x4 y4
+            w20 v1 dV Thighway=primary Nn11,n12
+            w21 v1 dV Nn13,n14
+            w22 v1 dV Nn11,n12
+            r30 v1 dV Mn11@,w20@
+            r31 v1 dV Ttype=route Mw20@
+            """
+        When running osm2pgsql flex with parameters
+            | --slim |
+        Then table osm2pgsql_test_nodes contains exactly
+            | node_id | tagged | tags |
+            | 11      | False  | {} |
+            | 12      | False  | {} |
+            | 13      | False  | {} |
+            | 14      | True   | {'amenity': 'restaurant'} |
+
+        Then table osm2pgsql_test_ways contains exactly
+            | way_id | tagged | tags |
+            | 20     | True   | {'highway': 'primary'} |
+            | 21     | False  | {} |
+            | 22     | False  | {} |
+
+        Then table osm2pgsql_test_relations contains exactly
+            | relation_id | tagged | tags |
+            | 30          | False  | {} |
+            | 31          | True   | {'type': 'route'} |
+
+        Given the style file 'test_output_flex_untagged.lua'
+        And the OSM data
+            """
+            n11 v2 dV Tnatural=tree x1 y1
+            n14 v2 dV x4 y4
+            w21 v2 dV Nn14,n13
+            """
+        When running osm2pgsql flex with parameters
+            | --slim | -a |
+        Then table osm2pgsql_test_nodes contains exactly
+            | node_id | tagged | tags |
+            | 11      | True   | {'natural': 'tree'} |
+            | 12      | False  | {} |
+            | 13      | False  | {} |
+            | 14      | False  | {} |
+
+        Then table osm2pgsql_test_ways contains exactly
+            | way_id | tagged | tags |
+            | 20     | True   | {'highway': 'primary'} |
+            | 21     | False  | {} |
+            | 22     | False  | {} |
+
+        Then table osm2pgsql_test_relations contains exactly
+            | relation_id | tagged | tags |
+            | 30          | False  | {} |
+            | 31          | True   | {'type': 'route'} |
+
diff --git a/tests/data/test_output_flex_untagged.lua b/tests/data/test_output_flex_untagged.lua
new file mode 100644
index 000000000..3192e55fc
--- /dev/null
+++ b/tests/data/test_output_flex_untagged.lua
@@ -0,0 +1,53 @@
+
+local tables = {}
+
+tables.nodes = osm2pgsql.define_node_table('osm2pgsql_test_nodes', {
+    { column = 'tags', type = 'jsonb' },
+    { column = 'tagged', type = 'bool' },
+    { column = 'geom', type = 'point', not_null = true },
+})
+
+tables.ways = osm2pgsql.define_way_table('osm2pgsql_test_ways', {
+    { column = 'tags', type = 'jsonb' },
+    { column = 'tagged', type = 'bool' },
+    { column = 'geom', type = 'linestring', not_null = true },
+})
+
+tables.relations = osm2pgsql.define_relation_table('osm2pgsql_test_relations', {
+    { column = 'tags', type = 'jsonb' },
+    { column = 'tagged', type = 'bool' },
+    { column = 'geom', type = 'geometry', not_null = true },
+})
+
+local function insert(dtable, object, tagged, geom)
+    tables[dtable]:insert({
+        tags = object.tags,
+        tagged = tagged,
+        geom = geom,
+    })
+end
+
+function osm2pgsql.process_node(object)
+    insert('nodes', object, true, object:as_point())
+end
+
+function osm2pgsql.process_way(object)
+    insert('ways', object, true, object:as_linestring())
+end
+
+function osm2pgsql.process_relation(object)
+    insert('relations', object, true, object:as_geometrycollection())
+end
+
+function osm2pgsql.process_untagged_node(object)
+    insert('nodes', object, false, object:as_point())
+end
+
+function osm2pgsql.process_untagged_way(object)
+    insert('ways', object, false, object:as_linestring())
+end
+
+function osm2pgsql.process_untagged_relation(object)
+    insert('relations', object, false, object:as_geometrycollection())
+end
+

From 25180ce82c851fed8a01c8505ad1e9c7db1b8561 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 19 Aug 2025 20:43:10 +0200
Subject: [PATCH 342/430] CI: Remove GETOPT settings we haven't been using for
 a long time

---
 .github/actions/win-cmake/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/win-cmake/action.yml b/.github/actions/win-cmake/action.yml
index cb5aa0971..8e1c4b24c 100644
--- a/.github/actions/win-cmake/action.yml
+++ b/.github/actions/win-cmake/action.yml
@@ -9,7 +9,7 @@ runs:
       shell: bash
 
     - name: Configure
-      run: cmake -LA .. -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DBUILD_TESTS=ON -DGETOPT_INCLUDE_DIR=$GETOPT_INCLUDE_DIR -DGETOPT_LIBRARY=$GETOPT_LIBRARY -DBoost_USE_STATIC_LIBS=ON
+      run: cmake -LA .. -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DBUILD_TESTS=ON -DBoost_USE_STATIC_LIBS=ON
       shell: bash
       working-directory: build
 

From 7459bbce5d15b9e141fa4ed1f72b4b29c14b1a9e Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 19 Aug 2025 19:58:27 +0200
Subject: [PATCH 343/430] Remove out-of-date comment

---
 src/expire-tiles.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/expire-tiles.cpp b/src/expire-tiles.cpp
index 1cd584f25..098d8e710 100644
--- a/src/expire-tiles.cpp
+++ b/src/expire-tiles.cpp
@@ -7,14 +7,6 @@
  * For a full list of authors see the git log.
  */
 
-/*
- * Dirty tile list generation
- *
- * Please refer to the OpenPisteMap expire_tiles.py script for a demonstration
- * of how to make use of the output:
- * http://subversion.nexusuk.org/projects/openpistemap/trunk/scripts/expire_tiles.py
- */
-
 #include <algorithm>
 #include <cerrno>
 #include <cmath>

From 9da8045aa4933f16b66dcd7793997b6bd92c878c Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 8 Jul 2025 21:37:19 +0200
Subject: [PATCH 344/430] Fix various clang-tidy issues with the expire code

* Don't use var of type double as loop variable
  clang-analyzer-security.FloatLoopCounter
* Use const where possible
* Explicit conversion
---
 src/expire-tiles.cpp | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/expire-tiles.cpp b/src/expire-tiles.cpp
index 098d8e710..2730b1d2c 100644
--- a/src/expire-tiles.cpp
+++ b/src/expire-tiles.cpp
@@ -173,16 +173,14 @@ void expire_tiles::from_line_segment(geom::point_t const &a,
     double const x_step = x_len / hyp_len;
     double const y_step = y_len / hyp_len;
 
-    for (double step = 0; step <= hyp_len; step += 0.4) {
-        /* Interpolate points 1 tile width apart */
-        double next_step = step + 0.4;
-        if (next_step > hyp_len) {
-            next_step = hyp_len;
-        }
-        double x1 = tilec_a.x() + ((double)step * x_step);
-        double y1 = tilec_a.y() + ((double)step * y_step);
-        double x2 = tilec_a.x() + ((double)next_step * x_step);
-        double y2 = tilec_a.y() + ((double)next_step * y_step);
+    for (int i = 0; i <= hyp_len / 0.4; ++i) {
+        double const step = i * 0.4;
+        double const next_step = std::min(hyp_len, (i + 1) * 0.4);
+
+        double const x1 = tilec_a.x() + (step * x_step);
+        double y1 = tilec_a.y() + (step * y_step);
+        double const x2 = tilec_a.x() + (next_step * x_step);
+        double y2 = tilec_a.y() + (next_step * y_step);
 
         /* The line (x1,y1),(x2,y2) is up to 1 tile width long
            x1 will always be <= x2
@@ -192,11 +190,11 @@ void expire_tiles::from_line_segment(geom::point_t const &a,
         if (y1 > y2) {
             std::swap(y1, y2);
         }
-        for (int x = x1 - expire_config.buffer; x <= x2 + expire_config.buffer;
-             ++x) {
+        for (int x = static_cast<int>(x1 - expire_config.buffer);
+             x <= static_cast<int>(x2 + expire_config.buffer); ++x) {
             uint32_t const norm_x = normalise_tile_x_coord(x);
-            for (int y = y1 - expire_config.buffer;
-                 y <= y2 + expire_config.buffer; ++y) {
+            for (int y = static_cast<int>(y1 - expire_config.buffer);
+                 y <= static_cast<int>(y2 + expire_config.buffer); ++y) {
                 if (y >= 0) {
                     expire_tile(norm_x, static_cast<uint32_t>(y));
                 }

From 3db46e9b805bd3eaa289cd8fb5e692387c20e633 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 20 Aug 2025 13:42:28 +0200
Subject: [PATCH 345/430] Use uppercase for constants

---
 tests/test-ordered-index.cpp     | 32 ++++++++++++++++----------------
 tests/test-output-flex-nodes.cpp | 10 +++++-----
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/tests/test-ordered-index.cpp b/tests/test-ordered-index.cpp
index 5a06abc00..cd9f62afb 100644
--- a/tests/test-ordered-index.cpp
+++ b/tests/test-ordered-index.cpp
@@ -13,8 +13,8 @@
 
 TEST_CASE("ordered index basics", "[NoDB]")
 {
-    constexpr std::size_t block_size = 16;
-    ordered_index_t index{block_size};
+    constexpr std::size_t BLOCK_SIZE = 16;
+    ordered_index_t index{BLOCK_SIZE};
 
     REQUIRE(index.size() == 0);
     REQUIRE(index.capacity() == 0);
@@ -22,12 +22,12 @@ TEST_CASE("ordered index basics", "[NoDB]")
 
     index.add(17, 32);
     REQUIRE(index.size() == 1);
-    REQUIRE(index.capacity() == block_size);
+    REQUIRE(index.capacity() == BLOCK_SIZE);
     REQUIRE(index.used_memory() > 0);
 
     index.add(19, 33);
     REQUIRE(index.size() == 2);
-    REQUIRE(index.capacity() == block_size);
+    REQUIRE(index.capacity() == BLOCK_SIZE);
     REQUIRE(index.used_memory() > 0);
 
     index.clear();
@@ -38,8 +38,8 @@ TEST_CASE("ordered index basics", "[NoDB]")
 
 TEST_CASE("ordered index set/get", "[NoDB]")
 {
-    constexpr std::size_t block_size = 16;
-    ordered_index_t index{block_size};
+    constexpr std::size_t BLOCK_SIZE = 16;
+    ordered_index_t index{BLOCK_SIZE};
 
     index.add(19, 0);
     index.add(22, 10);
@@ -64,15 +64,15 @@ TEST_CASE("ordered index set/get", "[NoDB]")
 
 TEST_CASE("ordered index set/get with multiple second-level blocks", "[NoDB]")
 {
-    constexpr std::size_t block_size = 4;
-    ordered_index_t index{block_size};
+    constexpr std::size_t BLOCK_SIZE = 4;
+    ordered_index_t index{BLOCK_SIZE};
 
     index.add(19, 0);
     index.add(22, 10);
     index.add(23, 22);
     index.add(26, 24);
     REQUIRE(index.size() == 4);
-    REQUIRE(index.capacity() == block_size);
+    REQUIRE(index.capacity() == BLOCK_SIZE);
 
     REQUIRE(index.get(31) == index.not_found_value());
 
@@ -80,7 +80,7 @@ TEST_CASE("ordered index set/get with multiple second-level blocks", "[NoDB]")
     index.add(42, 30);
     index.add(65, 32);
     REQUIRE(index.size() == 7);
-    REQUIRE(index.capacity() == block_size * (1 + 2));
+    REQUIRE(index.capacity() == BLOCK_SIZE * (1 + 2));
 
     REQUIRE(index.get(22) == 10);
     REQUIRE(index.get(23) == 22);
@@ -106,24 +106,24 @@ TEST_CASE("ordered index set/get with multiple second-level blocks", "[NoDB]")
 
 TEST_CASE("ordered index with huge gaps in ids", "[NoDB]")
 {
-    constexpr std::size_t block_size = 4;
-    ordered_index_t index{block_size};
+    constexpr std::size_t BLOCK_SIZE = 4;
+    ordered_index_t index{BLOCK_SIZE};
 
     index.add(1, 0);
     REQUIRE(index.size() == 1);
-    REQUIRE(index.capacity() == block_size);
+    REQUIRE(index.capacity() == BLOCK_SIZE);
 
     index.add((1ULL << 32U) + 3U, 1);
     REQUIRE(index.size() == 2);
-    REQUIRE(index.capacity() == block_size * (1 + 2));
+    REQUIRE(index.capacity() == BLOCK_SIZE * (1 + 2));
 
     index.add((1ULL << 32U) + 4U, 2);
     REQUIRE(index.size() == 3);
-    REQUIRE(index.capacity() == block_size * (1 + 2));
+    REQUIRE(index.capacity() == BLOCK_SIZE * (1 + 2));
 
     index.add((2ULL << 32U) + 9U, 3);
     REQUIRE(index.size() == 4);
-    REQUIRE(index.capacity() == block_size * (1 + 2 + 4));
+    REQUIRE(index.capacity() == BLOCK_SIZE * (1 + 2 + 4));
 
     REQUIRE(index.used_memory() > (index.capacity() * 8));
 
diff --git a/tests/test-output-flex-nodes.cpp b/tests/test-output-flex-nodes.cpp
index f4a8ed9ae..9f999eda3 100644
--- a/tests/test-output-flex-nodes.cpp
+++ b/tests/test-output-flex-nodes.cpp
@@ -63,7 +63,7 @@ enum class node_relationship : std::uint8_t
 template <node_relationship R>
 struct node_rel
 {
-    static constexpr node_relationship rs = R;
+    static constexpr node_relationship RS = R;
 };
 
 using node_rel_none = node_rel<node_relationship::none>;
@@ -87,9 +87,9 @@ TEMPLATE_TEST_CASE("change nodes", "", node_rel_none, node_rel_in_way,
 
     options.append = true;
 
-    if (TestType{}.rs == node_relationship::in_way) {
+    if (TestType{}.RS == node_relationship::in_way) {
         REQUIRE_NOTHROW(db.run_import(options, "w20 v1 dV Nn14,n15,n16\n"));
-    } else if (TestType{}.rs == node_relationship::in_relation) {
+    } else if (TestType{}.RS == node_relationship::in_relation) {
         REQUIRE_NOTHROW(db.run_import(options, "r30 v1 dV Mn14@,n15@,n16@\n"));
     }
 
@@ -174,9 +174,9 @@ TEMPLATE_TEST_CASE("delete nodes", "", node_rel_none, node_rel_in_way,
 
     options.append = true;
 
-    if (TestType{}.rs == node_relationship::in_way) {
+    if (TestType{}.RS == node_relationship::in_way) {
         REQUIRE_NOTHROW(db.run_import(options, "w20 v1 dV Nn14,n15,n16\n"));
-    } else if (TestType{}.rs == node_relationship::in_relation) {
+    } else if (TestType{}.RS == node_relationship::in_relation) {
         REQUIRE_NOTHROW(db.run_import(options, "r30 v1 dV Mn14@,n15@,n16@\n"));
     }
 

From 522d94d118518be90a789a7aa4ecf82f2ae2ca3e Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 20 Aug 2025 13:46:58 +0200
Subject: [PATCH 346/430] Rename Cell struct to cell_t

---
 src/geom-pole-of-inaccessibility.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/geom-pole-of-inaccessibility.cpp b/src/geom-pole-of-inaccessibility.cpp
index daa6e2173..7173c7a39 100644
--- a/src/geom-pole-of-inaccessibility.cpp
+++ b/src/geom-pole-of-inaccessibility.cpp
@@ -116,28 +116,29 @@ auto point_to_polygon_distance(point_t point, polygon_t const &polygon,
     return (inside ? 1 : -1) * std::sqrt(min_dist_squared);
 }
 
-struct Cell
+struct cell_t
 {
     static constexpr double SQRT2 = 1.4142135623730951;
 
-    Cell(point_t c, double h, polygon_t const &polygon, double stretch)
+    cell_t(point_t c, double h, polygon_t const &polygon, double stretch)
     : center(c), half_size(h),
       dist(point_to_polygon_distance(center, polygon, stretch)),
       max(dist + half_size * SQRT2)
-    {}
+    {
+    }
 
     point_t center;   // cell center
     double half_size; // half the cell size
     double dist;      // distance from cell center to polygon
     double max;       // max distance to polygon within a cell
 
-    friend bool operator<(Cell const &a, Cell const &b) noexcept
+    friend bool operator<(cell_t const &a, cell_t const &b) noexcept
     {
         return a.max < b.max;
     }
 };
 
-Cell make_centroid_cell(polygon_t const &polygon, double stretch)
+cell_t make_centroid_cell(polygon_t const &polygon, double stretch)
 {
     point_t centroid{0, 0};
     boost::geometry::centroid(polygon, centroid);
@@ -166,7 +167,7 @@ point_t pole_of_inaccessibility(polygon_t const &polygon, double precision,
         return envelope.min();
     }
 
-    std::priority_queue<Cell, std::vector<Cell>> cell_queue;
+    std::priority_queue<cell_t, std::vector<cell_t>> cell_queue;
 
     // cover polygon with initial cells
     if (stretched_envelope.width() == stretched_envelope.height()) {
@@ -201,7 +202,7 @@ point_t pole_of_inaccessibility(polygon_t const &polygon, double precision,
     auto best_cell = make_centroid_cell(polygon, stretch);
 
     // second guess: bounding box centroid
-    Cell const bbox_cell{stretched_envelope.center(), 0, polygon, stretch};
+    cell_t const bbox_cell{stretched_envelope.center(), 0, polygon, stretch};
     if (bbox_cell.dist > best_cell.dist) {
         best_cell = bbox_cell;
     }
@@ -227,8 +228,8 @@ point_t pole_of_inaccessibility(polygon_t const &polygon, double precision,
 
         for (auto const dy : {-h, h}) {
             for (auto const dx : {-h, h}) {
-                Cell const c{point_t{center.x() + dx, center.y() + dy}, h,
-                             polygon, stretch};
+                cell_t const c{point_t{center.x() + dx, center.y() + dy}, h,
+                               polygon, stretch};
                 if (c.max > best_cell.dist) {
                     cell_queue.push(c);
                 }

From d589ea7c8497cecf959ae933784955e4039472db Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 20 Aug 2025 14:18:06 +0200
Subject: [PATCH 347/430] Use east const

---
 src/geom-boost-adaptor.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/geom-boost-adaptor.hpp b/src/geom-boost-adaptor.hpp
index 7eac5fbf9..fb64d2bf5 100644
--- a/src/geom-boost-adaptor.hpp
+++ b/src/geom-boost-adaptor.hpp
@@ -35,7 +35,7 @@ namespace boost::geometry::traits {
 template <>
 struct point_order<::geom::ring_t>
 {
-    static const order_selector value = counterclockwise;
+    static order_selector const value = counterclockwise;
 };
 
 template <>

From d3b46f68934f37c83cf5e4d1a7e3f559eeb84dfc Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 20 Aug 2025 13:56:02 +0200
Subject: [PATCH 348/430] Fix some formatting issues (clang-format)

---
 .clang-format                              |  6 +++---
 src/command-line-parser.cpp                |  3 ++-
 src/db-copy-mgr.hpp                        |  2 +-
 src/db-copy.hpp                            |  2 +-
 src/expire-tiles.cpp                       |  3 ++-
 src/flex-index.hpp                         |  5 +----
 src/flex-lua-locator.cpp                   |  2 +-
 src/flex-lua-table.cpp                     |  7 +++----
 src/flex-table.hpp                         | 15 ++++++++-------
 src/geom-area-assembler.hpp                |  2 +-
 src/geom-boost-adaptor.hpp                 | 20 ++++----------------
 src/geom-from-osm.hpp                      |  3 +--
 src/logging.cpp                            |  2 +-
 src/middle-pgsql.cpp                       |  9 +++++----
 src/middle-ram.cpp                         |  3 +--
 src/node-locations.hpp                     |  3 ++-
 src/ordered-index.cpp                      |  4 ++--
 src/osmtypes.hpp                           |  2 +-
 src/output-flex.cpp                        | 13 ++++++++-----
 src/output-flex.hpp                        | 11 ++++-------
 src/pgsql-helper.cpp                       |  3 ++-
 src/pgsql-helper.hpp                       |  1 -
 src/pgsql.hpp                              |  3 ++-
 src/progress-display.hpp                   |  1 -
 src/reprojection-generic-none.cpp          |  1 -
 src/reprojection-generic-proj6.cpp         |  7 ++-----
 src/table.cpp                              |  1 -
 src/taginfo.cpp                            |  4 ++--
 src/tagtransform-c.cpp                     | 10 ++++++----
 src/template.cpp                           |  3 ++-
 tests/test-check-input.cpp                 |  1 -
 tests/test-geom-multilinestrings.cpp       |  3 +--
 tests/test-json-writer.cpp                 |  1 -
 tests/test-options-projection.cpp          |  2 +-
 tests/test-ordered-index.cpp               |  1 -
 tests/test-output-flex-example-configs.cpp |  5 +++--
 tests/test-output-flex-types.cpp           | 13 ++++++-------
 tests/test-output-pgsql-style-file.cpp     |  4 +---
 tests/test-persistent-cache.cpp            |  3 ++-
 tests/test-taginfo.cpp                     | 13 ++++++++-----
 tests/test-wkb.cpp                         |  1 -
 41 files changed, 90 insertions(+), 108 deletions(-)

diff --git a/.clang-format b/.clang-format
index 5f5881dc3..747ef09e7 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,9 +1,9 @@
 ---
-Language:        Cpp
-BasedOnStyle:  LLVM
+Language: Cpp
+BasedOnStyle: LLVM
 AccessModifierOffset: -4
 BreakBeforeBraces: Mozilla
-IndentWidth:     4
+IndentWidth: 4
 ConstructorInitializerIndentWidth: 0
 ReflowComments: false
 AlwaysBreakTemplateDeclarations: true
diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index 51d728d88..8d6b1791f 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -225,7 +225,8 @@ void check_options(options_t *options)
     }
 }
 
-void check_options_expire(options_t *options) {
+void check_options_expire(options_t *options)
+{
     // Zoom level 31 is the technical limit because we use 32-bit integers for
     // the x and y index of a tile ID.
     if (options->expire_tiles_zoom_min > 31) {
diff --git a/src/db-copy-mgr.hpp b/src/db-copy-mgr.hpp
index 971f17d82..5e7fdd69f 100644
--- a/src/db-copy-mgr.hpp
+++ b/src/db-copy-mgr.hpp
@@ -248,7 +248,7 @@ class db_copy_mgr_t
      * following the delete_object() are inserted.
      */
     template <typename... ARGS>
-    void delete_object(ARGS &&... args)
+    void delete_object(ARGS &&...args)
     {
         assert(m_current);
         m_current.add_deletable(std::forward<ARGS>(args)...);
diff --git a/src/db-copy.hpp b/src/db-copy.hpp
index c1c1c3a57..6cda44368 100644
--- a/src/db-copy.hpp
+++ b/src/db-copy.hpp
@@ -197,7 +197,7 @@ class db_cmd_copy_delete_t : public db_cmd_copy_t
     }
 
     template <typename... ARGS>
-    void add_deletable(ARGS &&... args)
+    void add_deletable(ARGS &&...args)
     {
         m_deleter.add(std::forward<ARGS>(args)...);
     }
diff --git a/src/expire-tiles.cpp b/src/expire-tiles.cpp
index 1cd584f25..f140ba234 100644
--- a/src/expire-tiles.cpp
+++ b/src/expire-tiles.cpp
@@ -177,7 +177,8 @@ void expire_tiles::from_line_segment(geom::point_t const &a,
     }
 
     double const y_len = tilec_b.y() - tilec_a.y();
-    double const hyp_len = std::sqrt(x_len * x_len + y_len * y_len); /* Pythagoras */
+    double const hyp_len =
+        std::sqrt(x_len * x_len + y_len * y_len); /* Pythagoras */
     double const x_step = x_len / hyp_len;
     double const y_step = y_len / hyp_len;
 
diff --git a/src/flex-index.hpp b/src/flex-index.hpp
index 9b805c135..8432a5dc7 100644
--- a/src/flex-index.hpp
+++ b/src/flex-index.hpp
@@ -50,10 +50,7 @@ class flex_index_t
 
     std::string const &name() const noexcept { return m_name; }
 
-    void set_name(std::string name)
-    {
-        m_name = std::move(name);
-    }
+    void set_name(std::string name) { m_name = std::move(name); }
 
     std::string const &expression() const noexcept { return m_expression; }
 
diff --git a/src/flex-lua-locator.cpp b/src/flex-lua-locator.cpp
index 002e1c000..150457661 100644
--- a/src/flex-lua-locator.cpp
+++ b/src/flex-lua-locator.cpp
@@ -140,7 +140,7 @@ int lua_wrapper_locator::all_intersecting()
     auto const names = self().all_intersecting(*geometry);
     lua_createtable(lua_state(), (int)names.size(), 0);
     int n = 0;
-    for (auto const& name : names) {
+    for (auto const &name : names) {
         lua_pushinteger(lua_state(), ++n);
         luaX_pushstring(lua_state(), name);
         lua_rawset(lua_state(), -3);
diff --git a/src/flex-lua-table.cpp b/src/flex-lua-table.cpp
index ea82beed8..72978ecc5 100644
--- a/src/flex-lua-table.cpp
+++ b/src/flex-lua-table.cpp
@@ -26,10 +26,9 @@ namespace {
 void check_tablespace(std::string const &tablespace)
 {
     if (!has_tablespace(tablespace)) {
-        throw fmt_error(
-            "Tablespace '{0}' not available."
-            " Use 'CREATE TABLESPACE \"{0}\" ...;' to create it.",
-            tablespace);
+        throw fmt_error("Tablespace '{0}' not available."
+                        " Use 'CREATE TABLESPACE \"{0}\" ...;' to create it.",
+                        tablespace);
     }
 }
 
diff --git a/src/flex-table.hpp b/src/flex-table.hpp
index 489496bf2..3616d8393 100644
--- a/src/flex-table.hpp
+++ b/src/flex-table.hpp
@@ -37,12 +37,13 @@
  * output. This is not a real primary key, because the values are not
  * necessarily unique.
  */
-enum class flex_table_index_type : uint8_t {
+enum class flex_table_index_type : uint8_t
+{
     no_index,
-    node, // index by node id
-    way, // index by way id
-    relation, // index by relation id
-    area, // index by way (positive) or relation (negative) id
+    node,       // index by node id
+    way,        // index by way id
+    relation,   // index by relation id
+    area,       // index by way (positive) or relation (negative) id
     any_object, // any OSM object, two columns for type and id
     tile // index by tile with x and y columns (used for generalized data)
 };
@@ -54,12 +55,12 @@ class flex_table_t
 {
 
 public:
-
     /**
      * Table creation type: interim tables are created as UNLOGGED and with
      * autovacuum disabled.
      */
-    enum class table_type : uint8_t {
+    enum class table_type : uint8_t
+    {
         interim,
         permanent
     };
diff --git a/src/geom-area-assembler.hpp b/src/geom-area-assembler.hpp
index a83c27ee6..c7efab075 100644
--- a/src/geom-area-assembler.hpp
+++ b/src/geom-area-assembler.hpp
@@ -58,7 +58,7 @@ class area_assembler_t : public osmium::area::detail::BasicAssembler
 private:
     bool make_area();
 
-    osmium::memory::Buffer* m_buffer;
+    osmium::memory::Buffer *m_buffer;
 
 }; // class area_assembler_t
 
diff --git a/src/geom-boost-adaptor.hpp b/src/geom-boost-adaptor.hpp
index fb64d2bf5..62f882f01 100644
--- a/src/geom-boost-adaptor.hpp
+++ b/src/geom-boost-adaptor.hpp
@@ -86,40 +86,28 @@ template <>
 struct indexed_access<::geom::box_t, min_corner, 0>
 {
     static double get(::geom::box_t const &b) { return b.min_x(); }
-    static void set(::geom::box_t &b, double value)
-    {
-        b.set_min_x(value);
-    }
+    static void set(::geom::box_t &b, double value) { b.set_min_x(value); }
 };
 
 template <>
 struct indexed_access<::geom::box_t, min_corner, 1>
 {
     static double get(::geom::box_t const &b) { return b.min_y(); }
-    static void set(::geom::box_t &b, double value)
-    {
-        b.set_min_y(value);
-    }
+    static void set(::geom::box_t &b, double value) { b.set_min_y(value); }
 };
 
 template <>
 struct indexed_access<::geom::box_t, max_corner, 0>
 {
     static double get(::geom::box_t const &b) { return b.max_x(); }
-    static void set(::geom::box_t &b, double value)
-    {
-        b.set_max_x(value);
-    }
+    static void set(::geom::box_t &b, double value) { b.set_max_x(value); }
 };
 
 template <>
 struct indexed_access<::geom::box_t, max_corner, 1>
 {
     static double get(::geom::box_t const &b) { return b.max_y(); }
-    static void set(::geom::box_t &b, double value)
-    {
-        b.set_max_y(value);
-    }
+    static void set(::geom::box_t &b, double value) { b.set_max_y(value); }
 };
 
 } // namespace boost::geometry::traits
diff --git a/src/geom-from-osm.hpp b/src/geom-from-osm.hpp
index a2c59e4da..4db2c8654 100644
--- a/src/geom-from-osm.hpp
+++ b/src/geom-from-osm.hpp
@@ -200,8 +200,7 @@ create_multipolygon(osmium::Relation const &relation,
  * \param buffer Buffer with OSM objects. Nodes are turned into points,
  *               ways into linestrings, anything else in the buffer is ignored.
  */
-void create_collection(geometry_t *geom,
-                       osmium::memory::Buffer const &buffer);
+void create_collection(geometry_t *geom, osmium::memory::Buffer const &buffer);
 
 /**
  * Create a geometry collection from nodes and ways, usually used for
diff --git a/src/logging.cpp b/src/logging.cpp
index e5e149490..d30c1c5be 100644
--- a/src/logging.cpp
+++ b/src/logging.cpp
@@ -27,7 +27,7 @@ void logger::generate_common_prefix(std::string *str, fmt::text_style const &ts,
                                     char const *prefix) const
 {
     *str += fmt::format("{:%Y-%m-%d %H:%M:%S}  ",
-                       fmt::localtime(std::time(nullptr)));
+                        fmt::localtime(std::time(nullptr)));
 
     if (m_current_level == log_level::debug) {
         *str += fmt::format(ts, "[{:02d}] ", this_thread_num);
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index 7d6aae5ee..a3ee43c64 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -447,7 +447,8 @@ void middle_pgsql_t::node(osmium::Node const &node)
     }
 }
 
-void middle_pgsql_t::way(osmium::Way const &way) {
+void middle_pgsql_t::way(osmium::Way const &way)
+{
     assert(m_middle_state == middle_state::way);
 
     if (way.deleted()) {
@@ -460,7 +461,8 @@ void middle_pgsql_t::way(osmium::Way const &way) {
     }
 }
 
-void middle_pgsql_t::relation(osmium::Relation const &relation) {
+void middle_pgsql_t::relation(osmium::Relation const &relation)
+{
     assert(m_middle_state == middle_state::relation);
 
     if (relation.deleted()) {
@@ -1270,8 +1272,7 @@ void middle_pgsql_t::set_requirements(
     log_debug("  with_attributes: {}", m_store_options.with_attributes);
 }
 
-std::shared_ptr<middle_query_t>
-middle_pgsql_t::get_query_instance()
+std::shared_ptr<middle_query_t> middle_pgsql_t::get_query_instance()
 {
     // NOTE: this is thread safe for use in pending async processing only
     // because during that process they are only read from
diff --git a/src/middle-ram.cpp b/src/middle-ram.cpp
index 2a06201c9..54c87bc23 100644
--- a/src/middle-ram.cpp
+++ b/src/middle-ram.cpp
@@ -358,8 +358,7 @@ middle_ram_t::rel_members_get(osmium::Relation const &rel,
             break;
         case osmium::item_type::way:
             if (m_store_options.ways) {
-                auto const offset =
-                    m_object_index.ways().get(member.ref());
+                auto const offset = m_object_index.ways().get(member.ref());
                 if (offset != ordered_index_t::not_found_value()) {
                     buffer->add_item(m_object_buffer.get<osmium::Way>(offset));
                     buffer->commit();
diff --git a/src/node-locations.hpp b/src/node-locations.hpp
index d520d03d5..83befe2c6 100644
--- a/src/node-locations.hpp
+++ b/src/node-locations.hpp
@@ -93,7 +93,8 @@ class node_locations_t
     }
 
     /// The maximum number of bytes an entry will need in storage.
-    constexpr static std::size_t max_bytes_per_entry() noexcept {
+    constexpr static std::size_t max_bytes_per_entry() noexcept
+    {
         return 10UL /*max varint length*/ * 3UL /*id, x, y*/;
     }
 
diff --git a/src/ordered-index.cpp b/src/ordered-index.cpp
index 7803f4a99..a6901f97b 100644
--- a/src/ordered-index.cpp
+++ b/src/ordered-index.cpp
@@ -40,8 +40,8 @@ void ordered_index_t::add(osmid_t id, std::size_t offset)
     ++m_size;
 }
 
-std::pair<osmid_t, std::size_t> ordered_index_t::get_internal(osmid_t id) const
-    noexcept
+std::pair<osmid_t, std::size_t>
+ordered_index_t::get_internal(osmid_t id) const noexcept
 {
     if (m_ranges.empty()) {
         return {0, not_found_value()};
diff --git a/src/osmtypes.hpp b/src/osmtypes.hpp
index ce9ecc6ac..1ac127506 100644
--- a/src/osmtypes.hpp
+++ b/src/osmtypes.hpp
@@ -188,7 +188,7 @@ class taglist_t
 
     /// Add tag to list without checking for duplicates
     template <typename T>
-    void add_tag(char const *key, T&& value)
+    void add_tag(char const *key, T &&value)
     {
         m_tags.emplace_back(key, std::forward<T>(value));
     }
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index d16624a82..f29ff5f15 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -169,7 +169,8 @@ void push_osm_object_to_lua_stack(lua_State *lua_state,
                                      lua_pushinteger(lua_state, wn.ref());
                                  });
         } else if (object.type() == osmium::item_type::relation) {
-            auto const &relation = static_cast<osmium::Relation const &>(object);
+            auto const &relation =
+                static_cast<osmium::Relation const &>(object);
             luaX_add_table_array(
                 lua_state, "members", relation.members(),
                 [&](osmium::RelationMember const &member) {
@@ -807,7 +808,7 @@ void output_flex_t::call_lua_function(prepared_lua_function_t func,
 {
     m_calling_context = func.context();
 
-    lua_pushvalue(lua_state(), func.index()); // the function to call
+    lua_pushvalue(lua_state(), func.index());          // the function to call
     push_osm_object_to_lua_stack(lua_state(), object); // the single argument
 
     luaX_set_context(lua_state(), this);
@@ -1112,7 +1113,8 @@ void output_flex_t::way_delete(osmium::Way *way)
 {
     if (m_process_deleted_way) {
         m_way_cache.init(way);
-        get_mutex_and_call_lua_function(m_process_deleted_way, m_way_cache.get());
+        get_mutex_and_call_lua_function(m_process_deleted_way,
+                                        m_way_cache.get());
     }
 
     way_delete(way->id());
@@ -1362,8 +1364,9 @@ void output_flex_t::init_lua(std::string const &filename,
         lua_state(), calling_context::process_node, "process_deleted_node"};
     m_process_deleted_way = prepared_lua_function_t{
         lua_state(), calling_context::process_way, "process_deleted_way"};
-    m_process_deleted_relation = prepared_lua_function_t{
-        lua_state(), calling_context::process_relation, "process_deleted_relation"};
+    m_process_deleted_relation =
+        prepared_lua_function_t{lua_state(), calling_context::process_relation,
+                                "process_deleted_relation"};
 
     m_select_relation_members = prepared_lua_function_t{
         lua_state(), calling_context::select_relation_members,
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index 1cda3068c..5af451c3a 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -43,8 +43,8 @@ struct options_t;
 enum class calling_context : std::uint8_t
 {
     main = 0, ///< In main context, i.e. the Lua script outside any callbacks
-    process_node = 1, ///< Inside a callback where a node is handled
-    process_way = 2, ///< Inside a callback where a way is handled
+    process_node = 1,     ///< Inside a callback where a node is handled
+    process_way = 2,      ///< Inside a callback where a way is handled
     process_relation = 3, ///< Inside a callback where a relation is handled
     select_relation_members = 4 ///< In the select_relation_members() callback
 };
@@ -76,7 +76,7 @@ class prepared_lua_function_t
     int index() const noexcept { return m_index; }
 
     /// The name of the function.
-    char const* name() const noexcept { return m_name; }
+    char const *name() const noexcept { return m_name; }
 
     /// The number of results this function is expected to have.
     int nresults() const noexcept { return m_nresults; }
@@ -247,10 +247,7 @@ class output_flex_t : public output_t
          */
         bool add_members(middle_query_t const &middle);
 
-        osmium::Relation const &get() const noexcept
-        {
-            return *m_relation;
-        }
+        osmium::Relation const &get() const noexcept { return *m_relation; }
 
         osmium::memory::Buffer const &members_buffer() const noexcept
         {
diff --git a/src/pgsql-helper.cpp b/src/pgsql-helper.cpp
index de857dd86..cb72891bc 100644
--- a/src/pgsql-helper.cpp
+++ b/src/pgsql-helper.cpp
@@ -15,7 +15,8 @@
 
 #include <cassert>
 
-idlist_t get_ids_from_result(pg_result_t const &result) {
+idlist_t get_ids_from_result(pg_result_t const &result)
+{
     assert(result.num_tuples() >= 0);
 
     idlist_t ids;
diff --git a/src/pgsql-helper.hpp b/src/pgsql-helper.hpp
index b507b4e24..d499f89b3 100644
--- a/src/pgsql-helper.hpp
+++ b/src/pgsql-helper.hpp
@@ -18,7 +18,6 @@
 class pg_conn_t;
 class pg_result_t;
 
-
 /**
  * Iterate over the result from a pgsql query and generate a list of all the
  * ids from the first column.
diff --git a/src/pgsql.hpp b/src/pgsql.hpp
index 38f49a981..0638a5532 100644
--- a/src/pgsql.hpp
+++ b/src/pgsql.hpp
@@ -116,7 +116,8 @@ class pg_result_t
     }
 
     /// Get the PostgreSQL internal type of a field.
-    unsigned int field_type(int col) const noexcept {
+    unsigned int field_type(int col) const noexcept
+    {
         assert(col >= 0 && col < num_fields());
         return PQftype(m_result.get(), col);
     }
diff --git a/src/progress-display.hpp b/src/progress-display.hpp
index 95229f85e..29ceb37de 100644
--- a/src/progress-display.hpp
+++ b/src/progress-display.hpp
@@ -57,7 +57,6 @@ class progress_display_t : public osmium::handler::Handler
         }
     }
 
-
     void relation(osmium::Relation const &)
     {
         if (++m_rel.count % 10 == 0) {
diff --git a/src/reprojection-generic-none.cpp b/src/reprojection-generic-none.cpp
index 25c61b7e4..690363a93 100644
--- a/src/reprojection-generic-none.cpp
+++ b/src/reprojection-generic-none.cpp
@@ -17,4 +17,3 @@ std::shared_ptr<reprojection> reprojection::make_generic_projection(int)
 }
 
 std::string get_proj_version() { return "[disabled]"; }
-
diff --git a/src/reprojection-generic-proj6.cpp b/src/reprojection-generic-proj6.cpp
index 636ccd99a..6efbf56ce 100644
--- a/src/reprojection-generic-proj6.cpp
+++ b/src/reprojection-generic-proj6.cpp
@@ -20,14 +20,12 @@ class generic_reprojection_t : public reprojection
       m_transformation_tile(create_transformation(srs, PROJ_SPHERE_MERC))
     {}
 
-    geom::point_t
-    reproject(geom::point_t point) const noexcept override
+    geom::point_t reproject(geom::point_t point) const noexcept override
     {
         return transform(m_transformation.get(), point);
     }
 
-    geom::point_t
-    target_to_tile(geom::point_t point) const override
+    geom::point_t target_to_tile(geom::point_t point) const override
     {
         return transform(m_transformation_tile.get(), point);
     }
@@ -121,4 +119,3 @@ std::string get_proj_version()
 {
     return fmt::format("{}", proj_info().version);
 }
-
diff --git a/src/table.cpp b/src/table.cpp
index 4d4dc511f..a3dddfb69 100644
--- a/src/table.cpp
+++ b/src/table.cpp
@@ -432,4 +432,3 @@ pg_result_t table_t::get_wkb(osmid_t id)
 {
     return m_db_connection->exec_prepared_as_binary("get_wkb", id);
 }
-
diff --git a/src/taginfo.cpp b/src/taginfo.cpp
index 208f8b019..78d5c2bda 100644
--- a/src/taginfo.cpp
+++ b/src/taginfo.cpp
@@ -24,8 +24,8 @@ void export_list::add(osmium::item_type type, taginfo const &info)
     m_export_list(type).push_back(info);
 }
 
-std::vector<taginfo> const &export_list::get(osmium::item_type type) const
-    noexcept
+std::vector<taginfo> const &
+export_list::get(osmium::item_type type) const noexcept
 {
     return m_export_list(type);
 }
diff --git a/src/tagtransform-c.cpp b/src/tagtransform-c.cpp
index c1b87b69c..dd98a1014 100644
--- a/src/tagtransform-c.cpp
+++ b/src/tagtransform-c.cpp
@@ -220,10 +220,12 @@ bool c_tagtransform_t::filter_tags(osmium::OSMObject const &o, bool *polygon,
     return filter;
 }
 
-bool c_tagtransform_t::filter_rel_member_tags(
-    taglist_t const &rel_tags, osmium::memory::Buffer const &,
-    rolelist_t const &, bool *make_boundary, bool *make_polygon, bool *roads,
-    taglist_t *out_tags)
+bool c_tagtransform_t::filter_rel_member_tags(taglist_t const &rel_tags,
+                                              osmium::memory::Buffer const &,
+                                              rolelist_t const &,
+                                              bool *make_boundary,
+                                              bool *make_polygon, bool *roads,
+                                              taglist_t *out_tags)
 {
     std::string const *type = rel_tags.get("type");
     if (!type) {
diff --git a/src/template.cpp b/src/template.cpp
index 2fc677475..29d17661d 100644
--- a/src/template.cpp
+++ b/src/template.cpp
@@ -9,7 +9,8 @@
 
 #include "template.hpp"
 
-void template_t::set_params(params_t const &params) {
+void template_t::set_params(params_t const &params)
+{
     for (auto const &[key, value] : params) {
         m_format_store.push_back(fmt::arg(key.c_str(), to_string(value)));
     }
diff --git a/tests/test-check-input.cpp b/tests/test-check-input.cpp
index 06f00fda2..edfee76e4 100644
--- a/tests/test-check-input.cpp
+++ b/tests/test-check-input.cpp
@@ -82,4 +82,3 @@ TEST_CASE("no object may appear twice", "[NoDB]")
         check_input(tiv1, tiv2),
         "Input data is not ordered: way id 42 appears more than once.");
 }
-
diff --git a/tests/test-geom-multilinestrings.cpp b/tests/test-geom-multilinestrings.cpp
index 2fbeb54d9..0eee538db 100644
--- a/tests/test-geom-multilinestrings.cpp
+++ b/tests/test-geom-multilinestrings.cpp
@@ -340,8 +340,7 @@ TEST_CASE("create_multilinestring and simplify", "[NoDB]")
     buffer.add_way("w20 Nn10x1y1,n11x1y2,n12x1y3");
     buffer.add_way("w21 Nn12x1y3,n13x2y3,n11x1y2");
 
-    auto const geom =
-        geom::create_multilinestring(buffer.buffer());
+    auto const geom = geom::create_multilinestring(buffer.buffer());
 
     REQUIRE(geom.is_multilinestring());
     REQUIRE(geom.srid() == PROJ_LATLONG);
diff --git a/tests/test-json-writer.cpp b/tests/test-json-writer.cpp
index 5fd39d8b1..734cc8bf5 100644
--- a/tests/test-json-writer.cpp
+++ b/tests/test-json-writer.cpp
@@ -165,4 +165,3 @@ TEST_CASE("json writer with even stranger chars in string", "[NoDB]")
     writer.string("abc-\x01-\x1f-abc");
     REQUIRE(writer.json() == "\"abc-\\u0001-\\u001f-abc\"");
 }
-
diff --git a/tests/test-options-projection.cpp b/tests/test-options-projection.cpp
index 03667b953..204ec5ff1 100644
--- a/tests/test-options-projection.cpp
+++ b/tests/test-options-projection.cpp
@@ -24,7 +24,7 @@ testing::db::import_t db;
 
 TEST_CASE("Projection setup")
 {
-    char const* const style_file = OSM2PGSQLDATA_DIR "default.style";
+    char const *const style_file = OSM2PGSQLDATA_DIR "default.style";
 
     std::vector<char const *> option_params = {"osm2pgsql", "--output=pgsql",
                                                "-S", style_file,
diff --git a/tests/test-ordered-index.cpp b/tests/test-ordered-index.cpp
index cd9f62afb..e75b4a346 100644
--- a/tests/test-ordered-index.cpp
+++ b/tests/test-ordered-index.cpp
@@ -143,4 +143,3 @@ TEST_CASE("ordered index with huge gaps in ids", "[NoDB]")
     REQUIRE(index.get_block((2ULL << 32U) + 9U) == 3);
     REQUIRE(index.get_block((3ULL << 32U) + 2U) == 3);
 }
-
diff --git a/tests/test-output-flex-example-configs.cpp b/tests/test-output-flex-example-configs.cpp
index f5da24111..b745efaee 100644
--- a/tests/test-output-flex-example-configs.cpp
+++ b/tests/test-output-flex-example-configs.cpp
@@ -25,7 +25,8 @@ testing::db::import_t db;
 
 char const *const DATA_FILE = "liechtenstein-2013-08-03.osm.pbf";
 
-std::vector<std::string> get_files() {
+std::vector<std::string> get_files()
+{
     // NOLINTNEXTLINE(concurrency-mt-unsafe)
     char const *env = std::getenv("EXAMPLE_FILES");
     REQUIRE(env);
@@ -38,7 +39,7 @@ TEST_CASE("minimal test for flex example configs")
 {
     auto const files = get_files();
 
-    for (auto const& file : files) {
+    for (auto const &file : files) {
         fmt::print(stderr, "Testing example config '{}.lua'\n", file);
         auto const conf_file = "../../flex-config/" + file + ".lua";
         options_t const options = testing::opt_t().flex(conf_file.c_str());
diff --git a/tests/test-output-flex-types.cpp b/tests/test-output-flex-types.cpp
index 689208894..f28e514ca 100644
--- a/tests/test-output-flex-types.cpp
+++ b/tests/test-output-flex-types.cpp
@@ -32,13 +32,12 @@ TEST_CASE("type nil")
     auto conn = db.db().connect();
 
     CHECK(1 == conn.get_count("nodes"));
-    CHECK(1 ==
-          conn.get_count(
-              "nodes",
-              "ttext IS NULL AND tbool IS NULL AND tint2 IS NULL AND "
-              "tint4 IS NULL AND tint8 IS NULL AND treal IS NULL AND "
-              "thstr IS NULL AND tjson IS NULL AND tdirn IS NULL AND "
-              "tsqlt IS NULL"));
+    CHECK(1 == conn.get_count(
+                   "nodes",
+                   "ttext IS NULL AND tbool IS NULL AND tint2 IS NULL AND "
+                   "tint4 IS NULL AND tint8 IS NULL AND treal IS NULL AND "
+                   "thstr IS NULL AND tjson IS NULL AND tdirn IS NULL AND "
+                   "tsqlt IS NULL"));
 }
 
 TEST_CASE("type boolean")
diff --git a/tests/test-output-pgsql-style-file.cpp b/tests/test-output-pgsql-style-file.cpp
index b52de06ef..268354d89 100644
--- a/tests/test-output-pgsql-style-file.cpp
+++ b/tests/test-output-pgsql-style-file.cpp
@@ -22,7 +22,6 @@ TEST_CASE("Parse default style file")
 
     REQUIRE(exlist.get(osmium::item_type::node).size() == 98);
     REQUIRE(exlist.get(osmium::item_type::way).size() == 104);
-
 }
 
 TEST_CASE("Parse empty style file")
@@ -30,8 +29,7 @@ TEST_CASE("Parse empty style file")
     export_list exlist;
 
     REQUIRE_THROWS_WITH(
-        read_style_file(OSM2PGSQLDATA_DIR "tests/style/empty.style",
-                        &exlist),
+        read_style_file(OSM2PGSQLDATA_DIR "tests/style/empty.style", &exlist),
         "Unable to parse any valid columns from the style file. Aborting.");
 }
 
diff --git a/tests/test-persistent-cache.cpp b/tests/test-persistent-cache.cpp
index 96cf150ac..4cdccdd9d 100644
--- a/tests/test-persistent-cache.cpp
+++ b/tests/test-persistent-cache.cpp
@@ -108,7 +108,8 @@ TEST_CASE("Persistent cache", "[NoDB]")
     }
 }
 
-TEST_CASE("Opening non-existent persistent cache should fail in append mode", "[NoDB]")
+TEST_CASE("Opening non-existent persistent cache should fail in append mode",
+          "[NoDB]")
 {
     std::string const flat_node_file =
         "test_middle_flat.nonexistent.flat.nodes.bin";
diff --git a/tests/test-taginfo.cpp b/tests/test-taginfo.cpp
index 49ef5c7c8..5765dab45 100644
--- a/tests/test-taginfo.cpp
+++ b/tests/test-taginfo.cpp
@@ -21,9 +21,12 @@ TEST_CASE("parse_tag_flags", "[NoDB]")
     CHECK(parse_tag_flags("delete", 0) == FLAG_DELETE);
     CHECK(parse_tag_flags("nocache", 0) == FLAG_NOCACHE);
     CHECK(parse_tag_flags("UNKNOWN", 0) == 0);
-    CHECK(parse_tag_flags("polygon,phstore", 0) == (FLAG_POLYGON | FLAG_PHSTORE));
-    CHECK(parse_tag_flags("polygon\nnocache", 0) == (FLAG_POLYGON | FLAG_NOCACHE));
-    CHECK(parse_tag_flags("polygon\nnocache,delete", 0) == (FLAG_POLYGON | FLAG_NOCACHE | FLAG_DELETE));
-    CHECK(parse_tag_flags("polygon, nocache,delete", 0) == (FLAG_POLYGON | FLAG_DELETE));
+    CHECK(parse_tag_flags("polygon,phstore", 0) ==
+          (FLAG_POLYGON | FLAG_PHSTORE));
+    CHECK(parse_tag_flags("polygon\nnocache", 0) ==
+          (FLAG_POLYGON | FLAG_NOCACHE));
+    CHECK(parse_tag_flags("polygon\nnocache,delete", 0) ==
+          (FLAG_POLYGON | FLAG_NOCACHE | FLAG_DELETE));
+    CHECK(parse_tag_flags("polygon, nocache,delete", 0) ==
+          (FLAG_POLYGON | FLAG_DELETE));
 }
-
diff --git a/tests/test-wkb.cpp b/tests/test-wkb.cpp
index 1f1c796d4..6ce11f474 100644
--- a/tests/test-wkb.cpp
+++ b/tests/test-wkb.cpp
@@ -188,4 +188,3 @@ TEST_CASE("wkb: geometrycollection", "[NoDB]")
 }
 
 TEST_CASE("wkb: invalid", "[NoDB]") { REQUIRE_THROWS(ewkb_to_geom("INVALID")); }
-

From 4af1d4f617d48f9faff594008e95c1e14c83949a Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 20 Aug 2025 14:56:02 +0200
Subject: [PATCH 349/430] Use "east const" in clang-format

---
 .clang-format | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.clang-format b/.clang-format
index 747ef09e7..cf38aeba3 100644
--- a/.clang-format
+++ b/.clang-format
@@ -7,3 +7,4 @@ IndentWidth: 4
 ConstructorInitializerIndentWidth: 0
 ReflowComments: false
 AlwaysBreakTemplateDeclarations: true
+QualifierAlignment: Right

From 47c715943ca721ce7b261e33f118a3f1572d6459 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 20 Aug 2025 16:07:38 +0200
Subject: [PATCH 350/430] Consistently use _t suffix for classes

---
 src/geom-functions.cpp      | 36 ++++++++++++++++++------------------
 src/middle-pgsql.cpp        |  8 ++++----
 src/osmdata.cpp             | 14 +++++++-------
 src/wkb.cpp                 |  8 ++++----
 tests/test-flex-indexes.cpp | 26 +++++++++++++-------------
 tests/test-util.cpp         |  6 +++---
 6 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/src/geom-functions.cpp b/src/geom-functions.cpp
index 4d53c3d43..ca88c2902 100644
--- a/src/geom-functions.cpp
+++ b/src/geom-functions.cpp
@@ -69,10 +69,10 @@ std::size_t num_geometries(geometry_t const &geom)
 
 namespace {
 
-class geometry_n_visitor
+class geometry_n_visitor_t
 {
 public:
-    geometry_n_visitor(geometry_t *output, std::size_t n)
+    geometry_n_visitor_t(geometry_t *output, std::size_t n)
     : m_output(output), m_n(n)
     {}
 
@@ -97,7 +97,7 @@ class geometry_n_visitor
     geometry_t *m_output;
     std::size_t m_n;
 
-}; // class geometry_n_visitor
+}; // class geometry_n_visitor_t
 
 } // anonymous namespace
 
@@ -109,7 +109,7 @@ void geometry_n(geometry_t *output, geometry_t const &input, std::size_t n)
         return;
     }
 
-    input.visit(geometry_n_visitor{output, n - 1});
+    input.visit(geometry_n_visitor_t{output, n - 1});
     output->set_srid(input.srid());
 }
 
@@ -130,11 +130,11 @@ void set_to_same_type(geometry_t *output, geometry_t const &input)
     input.visit([&](auto in) { output->set<decltype(in)>(); });
 }
 
-class transform_visitor
+class transform_visitor_t
 {
 public:
-    explicit transform_visitor(geometry_t *output,
-                               reprojection const *reprojection)
+    explicit transform_visitor_t(geometry_t *output,
+                                 reprojection const *reprojection)
     : m_output(output), m_reprojection(reprojection)
     {}
 
@@ -190,7 +190,7 @@ class transform_visitor
             auto &new_geom = m.add_geometry();
             set_to_same_type(&new_geom, geom);
             new_geom.set_srid(0);
-            geom.visit(transform_visitor{&new_geom, m_reprojection});
+            geom.visit(transform_visitor_t{&new_geom, m_reprojection});
         }
     }
 
@@ -222,7 +222,7 @@ class transform_visitor
     geometry_t *m_output;
     reprojection const *m_reprojection;
 
-}; // class transform_visitor
+}; // class transform_visitor_t
 
 } // anonymous namespace
 
@@ -233,7 +233,7 @@ void transform(geometry_t *output, geometry_t const &input,
 
     set_to_same_type(output, input);
     output->set_srid(reprojection.target_srs());
-    input.visit(transform_visitor{output, &reprojection});
+    input.visit(transform_visitor_t{output, &reprojection});
 }
 
 geometry_t transform(geometry_t const &input, reprojection const &reprojection)
@@ -251,10 +251,10 @@ namespace {
  * Helper class for iterating over all points except the first one in a point
  * list.
  */
-class without_first
+class without_first_t
 {
 public:
-    explicit without_first(point_list_t const &list) : m_list(&list) {}
+    explicit without_first_t(point_list_t const &list) : m_list(&list) {}
 
     point_list_t::const_iterator begin()
     {
@@ -266,7 +266,7 @@ class without_first
 
 private:
     point_list_t const *m_list;
-}; // class without_first
+}; // class without_first_t
 
 void split_linestring(linestring_t const &line, double split_at,
                       multilinestring_t *output)
@@ -276,7 +276,7 @@ void split_linestring(linestring_t const &line, double split_at,
     linestring_t *out = &output->add_geometry();
     out->push_back(prev_pt);
 
-    for (auto const &this_pt : without_first(line)) {
+    for (auto const &this_pt : without_first_t(line)) {
         double const delta = distance(prev_pt, this_pt);
 
         // figure out if the addition of this point would take the total
@@ -428,10 +428,10 @@ double length(geometry_t const &geom)
 
 namespace {
 
-class split_visitor
+class split_visitor_t
 {
 public:
-    split_visitor(std::vector<geometry_t> *output, int srid) noexcept
+    split_visitor_t(std::vector<geometry_t> *output, int srid) noexcept
     : m_output(output), m_srid(srid)
     {}
 
@@ -462,7 +462,7 @@ class split_visitor
     std::vector<geometry_t> *m_output;
     int m_srid;
 
-}; // class split_visitor
+}; // class split_visitor_t
 
 } // anonymous namespace
 
@@ -471,7 +471,7 @@ std::vector<geometry_t> split_multi(geometry_t &&geom, bool split_multi)
     std::vector<geometry_t> output;
 
     if (split_multi && geom.is_multi()) {
-        visit(split_visitor{&output, geom.srid()}, std::move(geom));
+        visit(split_visitor_t{&output, geom.srid()}, std::move(geom));
     } else if (!geom.is_null()) {
         output.push_back(std::move(geom));
     }
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index a3ee43c64..b1cbbb0b5 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -151,10 +151,10 @@ void pgsql_parse_json_tags(char const *string, osmium::memory::Buffer *buffer,
 /**
  * Helper class for parsing relation members encoded in JSON.
  */
-class member_list_json_builder
+class member_list_json_builder_t
 {
 public:
-    explicit member_list_json_builder(
+    explicit member_list_json_builder_t(
         osmium::builder::RelationMemberListBuilder *builder)
     : m_builder(builder)
     {}
@@ -246,7 +246,7 @@ class member_list_json_builder
         ref,
         role
     } m_next_val = next_val::none;
-}; // class member_list_json_builder
+}; // class member_list_json_builder_t
 
 template <typename T>
 void pgsql_parse_json_members(char const *string,
@@ -257,7 +257,7 @@ void pgsql_parse_json_members(char const *string,
     }
 
     osmium::builder::RelationMemberListBuilder builder{*buffer, obuilder};
-    member_list_json_builder parser{&builder};
+    member_list_json_builder_t parser{&builder};
     nlohmann::json::sax_parse(string, &parser);
 }
 
diff --git a/src/osmdata.cpp b/src/osmdata.cpp
index 1bfb556a2..b081da167 100644
--- a/src/osmdata.cpp
+++ b/src/osmdata.cpp
@@ -197,13 +197,13 @@ namespace {
  * handles this extra processing by starting a number of threads and doing
  * the processing in them.
  */
-class multithreaded_processor
+class multithreaded_processor_t
 {
 public:
-    multithreaded_processor(connection_params_t const &connection_params,
-                            std::shared_ptr<middle_t> const &mid,
-                            std::shared_ptr<output_t> output,
-                            std::size_t thread_count)
+    multithreaded_processor_t(connection_params_t const &connection_params,
+                              std::shared_ptr<middle_t> const &mid,
+                              std::shared_ptr<output_t> output,
+                              std::size_t thread_count)
     : m_output(std::move(output))
     {
         assert(mid);
@@ -379,8 +379,8 @@ class multithreaded_processor
 
 void osmdata_t::process_dependents()
 {
-    multithreaded_processor proc{m_connection_params, m_mid, m_output,
-                                 m_num_procs};
+    multithreaded_processor_t proc{m_connection_params, m_mid, m_output,
+                                   m_num_procs};
 
     // stage 1b processing: process parents of changed objects
     if (!m_ways_pending_tracker.empty() || !m_rels_pending_tracker.empty()) {
diff --git a/src/wkb.cpp b/src/wkb.cpp
index cf25f2d7c..4e290df8b 100644
--- a/src/wkb.cpp
+++ b/src/wkb.cpp
@@ -195,10 +195,10 @@ void write_collection(std::string *data, geom::collection_t const &geom,
     }
 }
 
-class make_ewkb_visitor
+class make_ewkb_visitor_t
 {
 public:
-    make_ewkb_visitor(uint32_t srid, bool ensure_multi) noexcept
+    make_ewkb_visitor_t(uint32_t srid, bool ensure_multi) noexcept
     : m_srid(srid), m_ensure_multi(ensure_multi)
     {}
 
@@ -292,7 +292,7 @@ class make_ewkb_visitor
     uint32_t m_srid;
     bool m_ensure_multi;
 
-}; // class make_ewkb_visitor
+}; // class make_ewkb_visitor_t
 
 /**
  * Parser for (E)WKB.
@@ -560,7 +560,7 @@ class ewkb_parser_t
 
 std::string geom_to_ewkb(geom::geometry_t const &geom, bool ensure_multi)
 {
-    return geom.visit(ewkb::make_ewkb_visitor{
+    return geom.visit(ewkb::make_ewkb_visitor_t{
         static_cast<uint32_t>(geom.srid()), ensure_multi});
 }
 
diff --git a/tests/test-flex-indexes.cpp b/tests/test-flex-indexes.cpp
index 53c13da0c..916ba5fe1 100644
--- a/tests/test-flex-indexes.cpp
+++ b/tests/test-flex-indexes.cpp
@@ -15,10 +15,10 @@
 
 #include <lua.hpp>
 
-class test_framework
+class test_framework_t
 {
 public:
-    test_framework()
+    test_framework_t()
     : m_lua_state(luaL_newstate(), [](lua_State *state) { lua_close(state); })
     {
         auto &c = database_capabilities_for_testing();
@@ -46,7 +46,7 @@ class test_framework
 
 TEST_CASE("check index with single column", "[NoDB]")
 {
-    test_framework const tf;
+    test_framework_t const tf;
 
     flex_table_t table{"public", "test_table", 0};
     table.add_column("geom", "geometry", "");
@@ -69,7 +69,7 @@ TEST_CASE("check index with single column", "[NoDB]")
 
 TEST_CASE("check index with multiple columns", "[NoDB]")
 {
-    test_framework const tf;
+    test_framework_t const tf;
 
     flex_table_t table{"public", "test_table", 0};
     table.add_column("a", "int", "");
@@ -91,7 +91,7 @@ TEST_CASE("check index with multiple columns", "[NoDB]")
 
 TEST_CASE("check unique index", "[NoDB]")
 {
-    test_framework const tf;
+    test_framework_t const tf;
 
     flex_table_t table{"public", "test_table", 0};
     table.add_column("col", "int", "");
@@ -113,7 +113,7 @@ TEST_CASE("check unique index", "[NoDB]")
 
 TEST_CASE("check index with tablespace from table", "[NoDB]")
 {
-    test_framework const tf;
+    test_framework_t const tf;
 
     flex_table_t table{"public", "test_table", 0};
     table.set_index_tablespace("foo");
@@ -135,7 +135,7 @@ TEST_CASE("check index with tablespace from table", "[NoDB]")
 
 TEST_CASE("check index with tablespace", "[NoDB]")
 {
-    test_framework const tf;
+    test_framework_t const tf;
 
     flex_table_t table{"public", "test_table", 0};
     table.add_column("col", "int", "");
@@ -157,7 +157,7 @@ TEST_CASE("check index with tablespace", "[NoDB]")
 
 TEST_CASE("check index with expression and where clause", "[NoDB]")
 {
-    test_framework const tf;
+    test_framework_t const tf;
 
     flex_table_t table{"public", "test_table", 0};
     table.add_column("col", "text", "");
@@ -179,7 +179,7 @@ TEST_CASE("check index with expression and where clause", "[NoDB]")
 
 TEST_CASE("check index with include", "[NoDB]")
 {
-    test_framework const tf;
+    test_framework_t const tf;
 
     flex_table_t table{"public", "test_table", 0};
     table.add_column("col", "int", "");
@@ -202,7 +202,7 @@ TEST_CASE("check index with include", "[NoDB]")
 
 TEST_CASE("check index with include as array", "[NoDB]")
 {
-    test_framework const tf;
+    test_framework_t const tf;
 
     flex_table_t table{"public", "test_table", 0};
     table.add_column("col", "int", "");
@@ -225,7 +225,7 @@ TEST_CASE("check index with include as array", "[NoDB]")
 
 TEST_CASE("check index with empty include array", "[NoDB]")
 {
-    test_framework const tf;
+    test_framework_t const tf;
 
     flex_table_t table{"public", "test_table", 0};
     table.add_column("col", "int", "");
@@ -248,7 +248,7 @@ TEST_CASE("check index with empty include array", "[NoDB]")
 
 TEST_CASE("check multiple indexes", "[NoDB]")
 {
-    test_framework const tf;
+    test_framework_t const tf;
 
     flex_table_t table{"public", "test_table", 0};
     table.add_column("a", "int", "");
@@ -271,7 +271,7 @@ TEST_CASE("check multiple indexes", "[NoDB]")
 
 TEST_CASE("check various broken index configs", "[NoDB]")
 {
-    test_framework const tf;
+    test_framework_t const tf;
 
     flex_table_t table{"public", "test_table", 0};
     table.add_column("col", "text", "");
diff --git a/tests/test-util.cpp b/tests/test-util.cpp
index 0037f759c..210cf7be6 100644
--- a/tests/test-util.cpp
+++ b/tests/test-util.cpp
@@ -44,17 +44,17 @@ TEST_CASE("human readable time durations", "[NoDB]")
 
 TEST_CASE("find_by_name()", "[NoDB]")
 {
-    class test_class
+    class test_class_t
     {
     public:
-        explicit test_class(std::string n) : m_name(std::move(n)) {}
+        explicit test_class_t(std::string n) : m_name(std::move(n)) {}
         std::string name() const noexcept { return m_name; }
 
     private:
         std::string m_name;
     };
 
-    std::vector<test_class> t;
+    std::vector<test_class_t> t;
 
     REQUIRE(util::find_by_name(t, "") == nullptr);
     REQUIRE(util::find_by_name(t, "foo") == nullptr);

From 24f0fcdff773b1390ad473cf4c4a73016fb9814e Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 20 Aug 2025 16:37:52 +0200
Subject: [PATCH 351/430] Enable more checks in clang-tidy around naming

---
 .clang-tidy | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/.clang-tidy b/.clang-tidy
index b4e660b85..60dff1777 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -106,4 +106,26 @@ CheckOptions:
       value: true
     - key: bugprone-empty-catch.IgnoreCatchWithKeywords
       value: "@todo;@fixme;exception ignored on purpose"
+    - key: readability-identifier-naming.ClassCase
+      value: lower_case
+    - key: readability-identifier-naming.ClassSuffix
+      value: _t
+    - key: readability-identifier-naming.PrivateMemberPrefix
+      value: m_
+    - key: readability-identifier-naming.StructCase
+      value: lower_case
+    - key: readability-identifier-naming.EnumCase
+      value: lower_case
+    - key: readability-identifier-naming.FunctionCase
+      value: lower_case
+    - key: readability-identifier-naming.FunctionIgnoredRegexp
+      value: luaX.*
+    - key: readability-identifier-naming.VariableCase
+      value: lower_case
+    - key: readability-identifier-naming.ConstexprVariableCase
+      value: UPPER_CASE
+    - key: readability-identifier-naming.GlobalConstantCase
+      value: UPPER_CASE
+    - key: readability-identifier-naming.NamespaceCase
+      value: lower_case
 ...

From a53d78a14fe9e15949420bbe88f836441e40b5dd Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 19 Aug 2025 20:41:47 +0200
Subject: [PATCH 352/430] CI: Treat warnings as errors for MSCV build and for
 clang-tidy

---
 .github/actions/clang-tidy/action.yml | 2 +-
 .github/actions/win-cmake/action.yml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/clang-tidy/action.yml b/.github/actions/clang-tidy/action.yml
index 75a75fcca..c74ec7dfe 100644
--- a/.github/actions/clang-tidy/action.yml
+++ b/.github/actions/clang-tidy/action.yml
@@ -5,5 +5,5 @@ runs:
 
     steps:
       - name: Run clang-tidy
-        run: run-clang-tidy-17 -q -p build
+        run: run-clang-tidy-17 -q -p build -warnings-as-errors=\*
         shell: bash
diff --git a/.github/actions/win-cmake/action.yml b/.github/actions/win-cmake/action.yml
index 8e1c4b24c..8dc05f784 100644
--- a/.github/actions/win-cmake/action.yml
+++ b/.github/actions/win-cmake/action.yml
@@ -9,7 +9,7 @@ runs:
       shell: bash
 
     - name: Configure
-      run: cmake -LA .. -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DBUILD_TESTS=ON -DBoost_USE_STATIC_LIBS=ON
+      run: cmake -LA .. -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DBUILD_TESTS=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -DBoost_USE_STATIC_LIBS=ON
       shell: bash
       working-directory: build
 

From 2319e2d7be82150568f9ba01ca03303d9af269a7 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 21 Aug 2025 19:53:34 +0200
Subject: [PATCH 353/430] Revert "Enable more checks in clang-tidy around
 naming"

This reverts commit 24f0fcdff773b1390ad473cf4c4a73016fb9814e.
---
 .clang-tidy | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index 60dff1777..b4e660b85 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -106,26 +106,4 @@ CheckOptions:
       value: true
     - key: bugprone-empty-catch.IgnoreCatchWithKeywords
       value: "@todo;@fixme;exception ignored on purpose"
-    - key: readability-identifier-naming.ClassCase
-      value: lower_case
-    - key: readability-identifier-naming.ClassSuffix
-      value: _t
-    - key: readability-identifier-naming.PrivateMemberPrefix
-      value: m_
-    - key: readability-identifier-naming.StructCase
-      value: lower_case
-    - key: readability-identifier-naming.EnumCase
-      value: lower_case
-    - key: readability-identifier-naming.FunctionCase
-      value: lower_case
-    - key: readability-identifier-naming.FunctionIgnoredRegexp
-      value: luaX.*
-    - key: readability-identifier-naming.VariableCase
-      value: lower_case
-    - key: readability-identifier-naming.ConstexprVariableCase
-      value: UPPER_CASE
-    - key: readability-identifier-naming.GlobalConstantCase
-      value: UPPER_CASE
-    - key: readability-identifier-naming.NamespaceCase
-      value: lower_case
 ...

From 98eedc2ac86bc8d6cacc6ef81678a7853d0d696e Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 21 Aug 2025 14:42:58 +0200
Subject: [PATCH 354/430] Remove unused DomainMatcher class

Leftover from gazetteer code
---
 src/domain-matcher.hpp        |  50 ---------------
 tests/CMakeLists.txt          |   1 -
 tests/test-domain-matcher.cpp | 116 ----------------------------------
 3 files changed, 167 deletions(-)
 delete mode 100644 src/domain-matcher.hpp
 delete mode 100644 tests/test-domain-matcher.cpp

diff --git a/src/domain-matcher.hpp b/src/domain-matcher.hpp
deleted file mode 100644
index 726230627..000000000
--- a/src/domain-matcher.hpp
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef OSM2PGSQL_DOMAIN_MATCHER_HPP
-#define OSM2PGSQL_DOMAIN_MATCHER_HPP
-
-/**
- * SPDX-License-Identifier: GPL-2.0-or-later
- *
- * This file is part of osm2pgsql (https://osm2pgsql.org/).
- *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
- * For a full list of authors see the git log.
- */
-
-#include <osmium/osm/tag.hpp>
-
-#include <cstring>
-
-/**
- * Returns the tag specific name, if applicable.
- *
- * OSM tags may contain name tags that refer to one of the other tags
- * in the tag set. For example, the name of a bridge is tagged as
- * bridge:name=Foo to not confuse it with the name of the highway
- * going over the bridge. This matcher checks if a tag is such a name tag
- * for the given tag key and returns the name key without the prefix
- * if it matches.
- */
-class DomainMatcher
-{
-public:
-    explicit DomainMatcher(char const *cls) noexcept
-    : m_domain(cls), m_len(std::strlen(cls))
-    {}
-
-    char const *operator()(osmium::Tag const &t) const noexcept
-    {
-        if (std::strncmp(t.key(), m_domain, m_len) == 0 &&
-            std::strncmp(t.key() + m_len, ":name", 5) == 0 &&
-            (t.key()[m_len + 5] == '\0' || t.key()[m_len + 5] == ':')) {
-            return t.key() + m_len + 1;
-        }
-
-        return nullptr;
-    }
-
-private:
-    char const *m_domain;
-    size_t m_len;
-};
-
-#endif // OSM2PGSQL_DOMAIN_MATCHER_HPP
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 4b946be34..14f312cd2 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -41,7 +41,6 @@ target_compile_features(catch_main_lib PUBLIC cxx_std_17)
 set_test(test-check-input LABELS NoDB)
 set_test(test-db-copy-mgr)
 set_test(test-db-copy-thread)
-set_test(test-domain-matcher LABELS NoDB)
 set_test(test-expire-from-geometry LABELS NoDB)
 set_test(test-expire-tiles LABELS NoDB)
 set_test(test-flex-indexes LABELS NoDB)
diff --git a/tests/test-domain-matcher.cpp b/tests/test-domain-matcher.cpp
deleted file mode 100644
index f6356c5e3..000000000
--- a/tests/test-domain-matcher.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * SPDX-License-Identifier: GPL-2.0-or-later
- *
- * This file is part of osm2pgsql (https://osm2pgsql.org/).
- *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
- * For a full list of authors see the git log.
- */
-
-#include <catch.hpp>
-
-#include "domain-matcher.hpp"
-
-#include <osmium/builder/osm_object_builder.hpp>
-#include <osmium/memory/buffer.hpp>
-#include <osmium/osm/tag.hpp>
-
-#include <cstring>
-
-namespace {
-
-osmium::Tag &fill_buffer(osmium::memory::Buffer *buffer, char const *key,
-                         char const *value)
-{
-    {
-        osmium::builder::TagListBuilder builder{*buffer};
-        builder.add_tag(key, value);
-    }
-    buffer->commit();
-
-    return *buffer->get<osmium::TagList>(0).begin();
-}
-
-} // anonymous namespace
-
-TEST_CASE("DomainMatcher: name", "[NoDB]")
-{
-    osmium::memory::Buffer buffer{1024};
-    DomainMatcher const matcher{"bridge"};
-
-    auto const &tag = fill_buffer(&buffer, "bridge:name", "Golden Gate Bridge");
-    char const *result = matcher(tag);
-
-    REQUIRE(result);
-    REQUIRE(std::strcmp(result, "name") == 0);
-}
-
-TEST_CASE("DomainMatcher: name with language", "[NoDB]")
-{
-    osmium::memory::Buffer buffer{1024};
-    DomainMatcher const matcher{"bridge"};
-
-    auto const &tag =
-        fill_buffer(&buffer, "bridge:name:en", "The Bridge on the River Kwai");
-    char const *result = matcher(tag);
-
-    REQUIRE(result);
-    REQUIRE(std::strcmp(result, "name:en") == 0);
-}
-
-TEST_CASE("DomainMatcher: no :name", "[NoDB]")
-{
-    osmium::memory::Buffer buffer{1024};
-    DomainMatcher const matcher{"bridge"};
-
-    auto const &tag = fill_buffer(&buffer, "bridge_name", "A Bridge Too Far");
-    char const *result = matcher(tag);
-
-    REQUIRE_FALSE(result);
-}
-
-TEST_CASE("DomainMatcher: empty matcher", "[NoDB]")
-{
-    osmium::memory::Buffer buffer{1024};
-    DomainMatcher const matcher{""};
-
-    auto const &tag =
-        fill_buffer(&buffer, "bridge:name", "Tacoma Narrows Bridge");
-    char const *result = matcher(tag);
-
-    REQUIRE_FALSE(result);
-}
-
-TEST_CASE("DomainMatcher: names", "[NoDB]")
-{
-    osmium::memory::Buffer buffer{1024};
-    DomainMatcher const matcher{"bridge"};
-
-    auto const &tag =
-        fill_buffer(&buffer, "bridge:names", "Seven Bridges of Königsberg");
-    char const *result = matcher(tag);
-
-    REQUIRE_FALSE(result);
-}
-
-TEST_CASE("DomainMatcher: not matching", "[NoDB]")
-{
-    osmium::memory::Buffer buffer{1024};
-    DomainMatcher const matcher{"bridge"};
-
-    auto const &tag = fill_buffer(&buffer, "the_bridge_tag", "Pont du Gard");
-    char const *result = matcher(tag);
-
-    REQUIRE_FALSE(result);
-}
-
-TEST_CASE("DomainMatcher: empty tag", "[NoDB]")
-{
-    osmium::memory::Buffer buffer{1024};
-    DomainMatcher const matcher{"bridge"};
-
-    auto const &tag = fill_buffer(&buffer, "", "London Bridge");
-    char const *result = matcher(tag);
-
-    REQUIRE_FALSE(result);
-}

From 686c741314232481b91e4e15f5b49efd36cc8c1a Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 21 Aug 2025 16:15:57 +0200
Subject: [PATCH 355/430] Rename enum ColumType to column_type_t

---
 src/table.cpp                          |  8 ++++----
 src/table.hpp                          |  2 +-
 src/taginfo-impl.hpp                   |  8 ++++----
 src/taginfo.hpp                        |  6 +++---
 tests/test-output-pgsql-style-file.cpp | 28 +++++++++++++-------------
 5 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/table.cpp b/src/table.cpp
index a3dddfb69..06a3bb676 100644
--- a/src/table.cpp
+++ b/src/table.cpp
@@ -359,10 +359,10 @@ void table_t::task_wait()
 // This is legacy code which will be removed anyway.
 
 /* Escape data appropriate to the type */
-void table_t::escape_type(std::string const &value, ColumnType flags)
+void table_t::escape_type(std::string const &value, column_type_t flags)
 {
     switch (flags) {
-    case ColumnType::INT: {
+    case column_type_t::INT: {
         // For integers we take the first number, or the average if it's a-b
         long long from = 0;
         long long to = 0;
@@ -387,7 +387,7 @@ void table_t::escape_type(std::string const &value, ColumnType flags)
         }
         break;
     }
-    case ColumnType::REAL:
+    case column_type_t::REAL:
         /* try to "repair" real values as follows:
          * assume "," to be a decimal mark which need to be replaced by "."
          * like int4 take the first number, or the average if it's a-b
@@ -421,7 +421,7 @@ void table_t::escape_type(std::string const &value, ColumnType flags)
             }
             break;
         }
-    case ColumnType::TEXT:
+    case column_type_t::TEXT:
         m_copy.add_column(value);
         break;
     }
diff --git a/src/table.hpp b/src/table.hpp
index 1dcfe1fbf..fbc06290b 100644
--- a/src/table.hpp
+++ b/src/table.hpp
@@ -66,7 +66,7 @@ class table_t
                            std::vector<bool> const &used);
     void write_hstore_columns(taglist_t const &tags);
 
-    void escape_type(std::string const &value, ColumnType flags);
+    void escape_type(std::string const &value, column_type_t flags);
 
     void generate_copy_column_list();
 
diff --git a/src/taginfo-impl.hpp b/src/taginfo-impl.hpp
index 8534e9086..484e5df8a 100644
--- a/src/taginfo-impl.hpp
+++ b/src/taginfo-impl.hpp
@@ -36,15 +36,15 @@ enum column_flags : unsigned int // NOLINT(performance-enum-size)
 /* Table columns, representing key= tags */
 struct taginfo
 {
-    ColumnType column_type() const
+    column_type_t column_type() const
     {
         if (flags & FLAG_INT_TYPE) {
-            return ColumnType::INT;
+            return column_type_t::INT;
         }
         if (flags & FLAG_REAL_TYPE) {
-            return ColumnType::REAL;
+            return column_type_t::REAL;
         }
-        return ColumnType::TEXT;
+        return column_type_t::TEXT;
     }
 
     std::string name;
diff --git a/src/taginfo.hpp b/src/taginfo.hpp
index 75977541e..2b9b693d6 100644
--- a/src/taginfo.hpp
+++ b/src/taginfo.hpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <vector>
 
-enum class ColumnType : std::uint8_t
+enum class column_type_t : std::uint8_t
 {
     INT,
     REAL,
@@ -23,13 +23,13 @@ enum class ColumnType : std::uint8_t
 
 struct Column
 {
-    Column(std::string n, std::string tn, ColumnType t)
+    Column(std::string n, std::string tn, column_type_t t)
     : name(std::move(n)), type_name(std::move(tn)), type(t)
     {}
 
     std::string name;
     std::string type_name;
-    ColumnType type;
+    column_type_t type;
 };
 
 using columns_t = std::vector<Column>;
diff --git a/tests/test-output-pgsql-style-file.cpp b/tests/test-output-pgsql-style-file.cpp
index 268354d89..38eec63d8 100644
--- a/tests/test-output-pgsql-style-file.cpp
+++ b/tests/test-output-pgsql-style-file.cpp
@@ -66,7 +66,7 @@ TEST_CASE("Parse style file with single node entry")
     REQUIRE(ex.name == "access");
     REQUIRE(ex.type == "text");
     REQUIRE(ex.flags == column_flags::FLAG_LINEAR);
-    REQUIRE(ex.column_type() == ColumnType::TEXT);
+    REQUIRE(ex.column_type() == column_type_t::TEXT);
 }
 
 TEST_CASE("Parse style file with a few valid entries")
@@ -85,12 +85,12 @@ TEST_CASE("Parse style file with a few valid entries")
 
     for (auto const &node : nodes) {
         REQUIRE(node.type == "text");
-        REQUIRE(node.column_type() == ColumnType::TEXT);
+        REQUIRE(node.column_type() == column_type_t::TEXT);
     }
 
     for (auto const &way : ways) {
         REQUIRE(way.type == "text");
-        REQUIRE(way.column_type() == ColumnType::TEXT);
+        REQUIRE(way.column_type() == column_type_t::TEXT);
     }
 
     REQUIRE(nodes[0].flags == column_flags::FLAG_LINEAR);
@@ -123,14 +123,14 @@ TEST_CASE("Parse style file with missing fields")
 
     for (auto const &node : nodes) {
         REQUIRE(node.type == "text");
-        REQUIRE(node.column_type() == ColumnType::TEXT);
+        REQUIRE(node.column_type() == column_type_t::TEXT);
     }
     REQUIRE(nodes[0].flags == column_flags::FLAG_LINEAR);
     REQUIRE(nodes[1].flags == 0);
 
     for (auto const &way : ways) {
         REQUIRE(way.type == "text");
-        REQUIRE(way.column_type() == ColumnType::TEXT);
+        REQUIRE(way.column_type() == column_type_t::TEXT);
     }
     REQUIRE(ways[0].flags == column_flags::FLAG_POLYGON);
     REQUIRE(ways[1].flags == 0);
@@ -153,17 +153,17 @@ TEST_CASE("Parse style file with way_area")
     REQUIRE(nodes[0].type == "text");
     REQUIRE(nodes[0].flags ==
             (column_flags::FLAG_POLYGON | column_flags::FLAG_NOCOLUMN));
-    REQUIRE(nodes[0].column_type() == ColumnType::TEXT);
+    REQUIRE(nodes[0].column_type() == column_type_t::TEXT);
 
     REQUIRE(ways[0].type == "text");
     REQUIRE(ways[0].flags ==
             (column_flags::FLAG_POLYGON | column_flags::FLAG_NOCOLUMN));
-    REQUIRE(ways[0].column_type() == ColumnType::TEXT);
+    REQUIRE(ways[0].column_type() == column_type_t::TEXT);
 
     REQUIRE(ways[1].type == "real");
     REQUIRE(ways[1].flags == 0);
     REQUIRE(ways[1].column_type() ==
-            ColumnType::TEXT); // Special case for way_area!
+            column_type_t::TEXT); // Special case for way_area!
 }
 
 TEST_CASE("Parse style file with different data types")
@@ -183,30 +183,30 @@ TEST_CASE("Parse style file with different data types")
     REQUIRE(nodes[0].name == "name");
     REQUIRE(nodes[0].type == "text");
     REQUIRE(nodes[0].flags == column_flags::FLAG_LINEAR);
-    REQUIRE(nodes[0].column_type() == ColumnType::TEXT);
+    REQUIRE(nodes[0].column_type() == column_type_t::TEXT);
 
     REQUIRE(nodes[1].name == "population");
     REQUIRE(nodes[1].type == "integer");
     REQUIRE(nodes[1].flags ==
             (column_flags::FLAG_POLYGON | column_flags::FLAG_INT_TYPE));
-    REQUIRE(nodes[1].column_type() == ColumnType::INT);
+    REQUIRE(nodes[1].column_type() == column_type_t::INT);
 
     REQUIRE(ways[0].name == "name");
     REQUIRE(ways[0].type == "text");
     REQUIRE(ways[0].flags == column_flags::FLAG_LINEAR);
-    REQUIRE(ways[0].column_type() == ColumnType::TEXT);
+    REQUIRE(ways[0].column_type() == column_type_t::TEXT);
 
     REQUIRE(ways[1].name == "width");
     REQUIRE(ways[1].type == "real");
     REQUIRE(ways[1].flags ==
             (column_flags::FLAG_LINEAR | column_flags::FLAG_REAL_TYPE));
-    REQUIRE(ways[1].column_type() == ColumnType::REAL);
+    REQUIRE(ways[1].column_type() == column_type_t::REAL);
 
     REQUIRE(ways[2].name == "population");
     REQUIRE(ways[2].type == "integer");
     REQUIRE(ways[2].flags ==
             (column_flags::FLAG_POLYGON | column_flags::FLAG_INT_TYPE));
-    REQUIRE(ways[2].column_type() == ColumnType::INT);
+    REQUIRE(ways[2].column_type() == column_type_t::INT);
 }
 
 TEST_CASE("Parse style file with invalid data types")
@@ -225,5 +225,5 @@ TEST_CASE("Parse style file with invalid data types")
     REQUIRE(ways[0].name == "highway");
     REQUIRE(ways[0].type == "foo");
     REQUIRE(ways[0].flags == column_flags::FLAG_LINEAR);
-    REQUIRE(ways[0].column_type() == ColumnType::TEXT);
+    REQUIRE(ways[0].column_type() == column_type_t::TEXT);
 }

From b8d1de8057713620ac1cc2e90a5947f33442d0cb Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 21 Aug 2025 16:42:52 +0200
Subject: [PATCH 356/430] Rename struct Column to column_t

---
 src/taginfo.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/taginfo.hpp b/src/taginfo.hpp
index 2b9b693d6..69d080a6c 100644
--- a/src/taginfo.hpp
+++ b/src/taginfo.hpp
@@ -21,9 +21,9 @@ enum class column_type_t : std::uint8_t
     TEXT
 };
 
-struct Column
+struct column_t
 {
-    Column(std::string n, std::string tn, column_type_t t)
+    column_t(std::string n, std::string tn, column_type_t t)
     : name(std::move(n)), type_name(std::move(tn)), type(t)
     {}
 
@@ -32,6 +32,6 @@ struct Column
     column_type_t type;
 };
 
-using columns_t = std::vector<Column>;
+using columns_t = std::vector<column_t>;
 
 #endif // OSM2PGSQL_TAGINFO_HPP

From 8772650717c05587ddd18c0f75847ba0cba29843 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 21 Aug 2025 18:05:31 +0200
Subject: [PATCH 357/430] Make various variable names longer and more
 descriptive

---
 src/gen/osm2pgsql-gen.cpp            |  4 ++--
 src/geom-functions.cpp               | 24 ++++++++++++------------
 src/geom-pole-of-inaccessibility.cpp |  4 ++--
 src/hex.cpp                          | 16 ++++++++--------
 src/pgsql-capabilities.cpp           |  4 ++--
 src/pgsql.cpp                        |  9 +++++----
 src/tile.cpp                         |  8 ++++----
 7 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index 852fb66da..6faf1912a 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -520,8 +520,8 @@ class genproc_t
                                      m_connection_params, generalizer, params,
                                      zoom, &tile_list, &mut, n);
             }
-            for (auto &t : threads) {
-                t.join();
+            for (auto &thread : threads) {
+                thread.join();
             }
             if (error_flag.test_and_set()) {
                 throw std::runtime_error{
diff --git a/src/geom-functions.cpp b/src/geom-functions.cpp
index ca88c2902..f59cbf740 100644
--- a/src/geom-functions.cpp
+++ b/src/geom-functions.cpp
@@ -157,37 +157,37 @@ class transform_visitor_t
 
     void operator()(multipoint_t const &input) const
     {
-        auto &m = m_output->get<multipoint_t>();
-        m.reserve(input.num_geometries());
+        auto &mgeom = m_output->get<multipoint_t>();
+        mgeom.reserve(input.num_geometries());
         for (auto const point : input) {
-            m.add_geometry(project(point));
+            mgeom.add_geometry(project(point));
         }
     }
 
     void operator()(multilinestring_t const &input) const
     {
-        auto &m = m_output->set<multilinestring_t>();
-        m.reserve(input.num_geometries());
+        auto &mgeom = m_output->set<multilinestring_t>();
+        mgeom.reserve(input.num_geometries());
         for (auto const &line : input) {
-            transform_points(&m.add_geometry(), line);
+            transform_points(&mgeom.add_geometry(), line);
         }
     }
 
     void operator()(multipolygon_t const &input) const
     {
-        auto &m = m_output->set<multipolygon_t>();
-        m.reserve(input.num_geometries());
+        auto &mgeom = m_output->set<multipolygon_t>();
+        mgeom.reserve(input.num_geometries());
         for (auto const &polygon : input) {
-            transform_polygon(&m.add_geometry(), polygon);
+            transform_polygon(&mgeom.add_geometry(), polygon);
         }
     }
 
     void operator()(collection_t const &input) const
     {
-        auto &m = m_output->get<collection_t>();
-        m.reserve(input.num_geometries());
+        auto &mgeom = m_output->get<collection_t>();
+        mgeom.reserve(input.num_geometries());
         for (auto const &geom : input) {
-            auto &new_geom = m.add_geometry();
+            auto &new_geom = mgeom.add_geometry();
             set_to_same_type(&new_geom, geom);
             new_geom.set_srid(0);
             geom.visit(transform_visitor_t{&new_geom, m_reprojection});
diff --git a/src/geom-pole-of-inaccessibility.cpp b/src/geom-pole-of-inaccessibility.cpp
index 7173c7a39..dfb5274e7 100644
--- a/src/geom-pole-of-inaccessibility.cpp
+++ b/src/geom-pole-of-inaccessibility.cpp
@@ -88,9 +88,9 @@ bool point_to_ring_distance_squared(point_t point, ring_t const &ring,
             inside = !inside;
         }
 
-        double const d =
+        double const dist_squared =
             point_to_segment_distance_squared(point, a, b, stretch);
-        *min_dist_squared = std::min(d, *min_dist_squared);
+        *min_dist_squared = std::min(dist_squared, *min_dist_squared);
     }
 
     return inside;
diff --git a/src/hex.cpp b/src/hex.cpp
index 51cf01cad..40e8f3945 100644
--- a/src/hex.cpp
+++ b/src/hex.cpp
@@ -15,24 +15,24 @@
 
 namespace util {
 
-void encode_hex(std::string const &in, std::string *out)
+void encode_hex(std::string const &input, std::string *output)
 {
-    assert(out);
+    assert(output);
 
     constexpr char const *const LOOKUP_HEX = "0123456789ABCDEF";
 
-    for (auto const c : in) {
+    for (auto const c : input) {
         unsigned int const num = static_cast<unsigned char>(c);
-        (*out) += LOOKUP_HEX[(num >> 4U) & 0xfU];
-        (*out) += LOOKUP_HEX[num & 0xfU];
+        (*output) += LOOKUP_HEX[(num >> 4U) & 0xfU];
+        (*output) += LOOKUP_HEX[num & 0xfU];
     }
 }
 
-std::string encode_hex(std::string const &in)
+std::string encode_hex(std::string const &input)
 {
     std::string result;
-    result.reserve(in.size() * 2);
-    encode_hex(in, &result);
+    result.reserve(input.size() * 2);
+    encode_hex(input, &result);
     return result;
 }
 
diff --git a/src/pgsql-capabilities.cpp b/src/pgsql-capabilities.cpp
index 4b45f7c02..18c94fc75 100644
--- a/src/pgsql-capabilities.cpp
+++ b/src/pgsql-capabilities.cpp
@@ -20,8 +20,8 @@ namespace {
 
 database_capabilities_t &capabilities() noexcept
 {
-    static database_capabilities_t c;
-    return c;
+    static database_capabilities_t capabilities;
+    return capabilities;
 }
 
 } // anonymous namespace
diff --git a/src/pgsql.cpp b/src/pgsql.cpp
index 8e9b906e3..e3c8dc06e 100644
--- a/src/pgsql.cpp
+++ b/src/pgsql.cpp
@@ -22,8 +22,8 @@
 
 std::size_t pg_result_t::affected_rows() const noexcept
 {
-    char const *const s = PQcmdTuples(m_result.get());
-    return std::strtoull(s, nullptr, 10);
+    char const *const rows_as_string = PQcmdTuples(m_result.get());
+    return std::strtoull(rows_as_string, nullptr, 10);
 }
 
 std::atomic<std::uint32_t> pg_conn_t::connection_id{0};
@@ -153,9 +153,10 @@ void pg_conn_t::copy_send(std::string_view data, std::string_view context) const
 
     log_sql_data("(C{}) Copy data to '{}':\n{}", m_connection_id, context,
                  data);
-    int const r = PQputCopyData(m_conn.get(), data.data(), (int)data.size());
+    int const result =
+        PQputCopyData(m_conn.get(), data.data(), (int)data.size());
 
-    switch (r) {
+    switch (result) {
     case 0: // need to wait for write ready
         log_error("{} - COPY unexpectedly busy", context);
         break;
diff --git a/src/tile.cpp b/src/tile.cpp
index e47f91e7e..76ece1952 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -12,15 +12,15 @@
 geom::point_t tile_t::to_tile_coords(geom::point_t p,
                                      unsigned int pixel_extent) const noexcept
 {
-    double const f = static_cast<double>(pixel_extent) / extent();
-    return {(p.x() - xmin()) * f, (p.y() - ymin()) * f};
+    double const factor = static_cast<double>(pixel_extent) / extent();
+    return {(p.x() - xmin()) * factor, (p.y() - ymin()) * factor};
 }
 
 geom::point_t tile_t::to_world_coords(geom::point_t p,
                                       unsigned int pixel_extent) const noexcept
 {
-    double const f = extent() / static_cast<double>(pixel_extent);
-    return {p.x() * f + xmin(), p.y() * f + ymin()};
+    double const factor = extent() / static_cast<double>(pixel_extent);
+    return {p.x() * factor + xmin(), p.y() * factor + ymin()};
 }
 
 geom::point_t tile_t::center() const noexcept

From 6412a21cec51718ff65fb5644fd4b705c771e493 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 21 Aug 2025 21:03:46 +0200
Subject: [PATCH 358/430] Fix according to our naming rules

---
 src/geom-boost-adaptor.hpp | 1 +
 src/progress-display.hpp   | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/geom-boost-adaptor.hpp b/src/geom-boost-adaptor.hpp
index 62f882f01..2ae4104c1 100644
--- a/src/geom-boost-adaptor.hpp
+++ b/src/geom-boost-adaptor.hpp
@@ -35,6 +35,7 @@ namespace boost::geometry::traits {
 template <>
 struct point_order<::geom::ring_t>
 {
+    // NOLINTNEXTLINE(readability-identifier-naming) - not in our namespace
     static order_selector const value = counterclockwise;
 };
 
diff --git a/src/progress-display.hpp b/src/progress-display.hpp
index 29ceb37de..0efbbe5f0 100644
--- a/src/progress-display.hpp
+++ b/src/progress-display.hpp
@@ -28,7 +28,7 @@
  */
 class progress_display_t : public osmium::handler::Handler
 {
-    struct Counter
+    struct counter_t
     {
         std::size_t count = 0;
         std::time_t start = 0;
@@ -79,9 +79,9 @@ class progress_display_t : public osmium::handler::Handler
     uint64_t rels_time(std::time_t now) const noexcept;
     uint64_t overall_time(std::time_t now) const noexcept;
 
-    Counter m_node{};
-    Counter m_way{};
-    Counter m_rel{};
+    counter_t m_node{};
+    counter_t m_way{};
+    counter_t m_rel{};
     std::time_t m_last_print_time{std::time(nullptr)};
     bool m_enabled;
 };

From 0906d75c9e4c40c7f6e534683a8c0f7fe897f130 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 21 Aug 2025 14:24:57 +0200
Subject: [PATCH 359/430] Add _t suffix to class logger

---
 src/gen/osm2pgsql-gen.cpp |  2 +-
 src/logging.cpp           | 11 ++++++-----
 src/logging.hpp           |  6 +++---
 src/thread-pool.cpp       |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index 6faf1912a..e5fb2541b 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -224,7 +224,7 @@ void run_tile_gen(std::atomic_flag *error_flag,
                   std::mutex *mut, unsigned int n)
 {
     try {
-        logger::init_thread(n);
+        logger_t::init_thread(n);
 
         log_debug("Started generalizer thread for '{}'.",
                   master_generalizer->strategy());
diff --git a/src/logging.cpp b/src/logging.cpp
index d30c1c5be..9d58b5035 100644
--- a/src/logging.cpp
+++ b/src/logging.cpp
@@ -16,15 +16,16 @@ namespace {
 thread_local unsigned int this_thread_num = 0;
 
 /// Global logger singleton
-logger the_logger{};
+logger_t the_logger{};
 
 } // anonymous namespace
 
 /// Access the global logger singleton
-logger &get_logger() noexcept { return the_logger; }
+logger_t &get_logger() noexcept { return the_logger; }
 
-void logger::generate_common_prefix(std::string *str, fmt::text_style const &ts,
-                                    char const *prefix) const
+void logger_t::generate_common_prefix(std::string *str,
+                                      fmt::text_style const &ts,
+                                      char const *prefix) const
 {
     *str += fmt::format("{:%Y-%m-%d %H:%M:%S}  ",
                         fmt::localtime(std::time(nullptr)));
@@ -38,7 +39,7 @@ void logger::generate_common_prefix(std::string *str, fmt::text_style const &ts,
     }
 }
 
-void logger::init_thread(unsigned int num)
+void logger_t::init_thread(unsigned int num)
 {
     // Store thread number in thread local variable
     this_thread_num = num;
diff --git a/src/logging.hpp b/src/logging.hpp
index f1542b67f..9b116685e 100644
--- a/src/logging.hpp
+++ b/src/logging.hpp
@@ -34,7 +34,7 @@ enum class log_level : uint8_t
  * This class contains the logging state and code. It is intended as a
  * singleton class. Its use is mostly wrapped in the log_*() free functions.
  */
-class logger
+class logger_t
 {
 public:
     template <typename... TArgs>
@@ -107,9 +107,9 @@ class logger
     bool m_use_color = osmium::util::isatty(2);
 #endif
 
-}; // class logger
+}; // class logger_t
 
-logger &get_logger() noexcept;
+logger_t &get_logger() noexcept;
 
 template <typename... TArgs>
 void log_debug(fmt::format_string<TArgs...> format_str, TArgs &&...args)
diff --git a/src/thread-pool.cpp b/src/thread-pool.cpp
index aa8a430e9..d4bd67750 100644
--- a/src/thread-pool.cpp
+++ b/src/thread-pool.cpp
@@ -50,7 +50,7 @@ void thread_pool_t::shutdown_all_workers()
 
 void thread_pool_t::worker_thread(unsigned int thread_num)
 {
-    logger::init_thread(thread_num + 1);
+    logger_t::init_thread(thread_num + 1);
 
     while (true) {
         osmium::thread::function_wrapper task;

From de247d3077b259d52b387f15c11549ed053d1d1c Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 21 Aug 2025 14:32:04 +0200
Subject: [PATCH 360/430] Add _t suffix to class binary_param

---
 src/gen/gen-rivers.cpp      | 3 ++-
 src/gen/gen-tile-raster.cpp | 2 +-
 src/pgsql.hpp               | 8 ++++----
 tests/test-pgsql.cpp        | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/gen/gen-rivers.cpp b/src/gen/gen-rivers.cpp
index 111291738..54314ad5b 100644
--- a/src/gen/gen-rivers.cpp
+++ b/src/gen/gen-rivers.cpp
@@ -345,7 +345,8 @@ SELECT "{id_column}", "{width_column}", "{name_column}", "{geom_column}"
         geom::geometry_t const geom{std::move(edge.points), PROJ_SPHERE_MERC};
         auto const wkb = geom_to_ewkb(geom);
         connection().exec_prepared("ins", edge.id, edge.width,
-                                   get_name(names, edge.id), binary_param(wkb));
+                                   get_name(names, edge.id),
+                                   binary_param_t(wkb));
     }
     connection().exec("COMMIT");
     timer(m_timer_write).stop();
diff --git a/src/gen/gen-tile-raster.cpp b/src/gen/gen-tile-raster.cpp
index c0720ad63..b22e929e5 100644
--- a/src/gen/gen-tile-raster.cpp
+++ b/src/gen/gen-tile-raster.cpp
@@ -237,7 +237,7 @@ void gen_tile_raster_union_t::process(tile_t const &tile)
         timer(m_timer_write).start();
         for (auto const &geom : geometries) {
             auto const wkb = geom_to_ewkb(geom);
-            connection().exec_prepared("insert_geoms", binary_param{wkb},
+            connection().exec_prepared("insert_geoms", binary_param_t{wkb},
                                        tile.x(), tile.y(), param);
         }
         timer(m_timer_write).stop();
diff --git a/src/pgsql.hpp b/src/pgsql.hpp
index 0638a5532..5a8e8c677 100644
--- a/src/pgsql.hpp
+++ b/src/pgsql.hpp
@@ -138,12 +138,12 @@ class pg_result_t
  * Wrapper class for query parameters that should be sent to the database
  * as binary parameter.
  */
-class binary_param : public std::string_view
+class binary_param_t : public std::string_view
 {
 public:
     using std::string_view::string_view;
 
-    explicit binary_param(std::string const &str)
+    explicit binary_param_t(std::string const &str)
     : std::string_view(str.data(), str.size())
     {}
 };
@@ -272,7 +272,7 @@ class pg_conn_t
     {
         if constexpr (std::is_same_v<T, char const *> ||
                       std::is_same_v<T, std::string> ||
-                      std::is_same_v<T, binary_param>) {
+                      std::is_same_v<T, binary_param_t>) {
             return 0;
         }
         return 1;
@@ -293,7 +293,7 @@ class pg_conn_t
         } else if constexpr (std::is_same_v<T, std::string>) {
             *length = static_cast<int>(param.size());
             return param.c_str();
-        } else if constexpr (std::is_same_v<T, binary_param>) {
+        } else if constexpr (std::is_same_v<T, binary_param_t>) {
             *length = static_cast<int>(param.size());
             *bin = 1;
             return param.data();
diff --git a/tests/test-pgsql.cpp b/tests/test-pgsql.cpp
index dc0855209..d00b5d42a 100644
--- a/tests/test-pgsql.cpp
+++ b/tests/test-pgsql.cpp
@@ -105,7 +105,7 @@ TEST_CASE("exec_prepared with binary parameter should work")
     auto const conn = db.db().connect();
     conn.exec("PREPARE test(bytea) AS SELECT length($1)");
 
-    binary_param const p{"foo \x01 bar"};
+    binary_param_t const p{"foo \x01 bar"};
     auto const result = conn.exec_prepared("test", p);
     REQUIRE(result.status() == PGRES_TUPLES_OK);
     REQUIRE(result.num_fields() == 1);
@@ -120,7 +120,7 @@ TEST_CASE("exec_prepared with mixed parameter types should work")
               " SELECT length($1) + length($2) + $3");
 
     std::string const p1{"foo bar"};
-    binary_param const p2{"foo \x01 bar"};
+    binary_param_t const p2{"foo \x01 bar"};
     int const p3 = 17;
     auto const result = conn.exec_prepared("test", p1, p2, p3);
     REQUIRE(result.status() == PGRES_TUPLES_OK);

From 049a43a234077cfec1fdd8609bd6f0936f1dbc51 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 21 Aug 2025 22:43:24 +0200
Subject: [PATCH 361/430] Use explicit for single param constructors

---
 tests/common-cleanup.hpp | 3 ++-
 tests/common-pg.hpp      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/common-cleanup.hpp b/tests/common-cleanup.hpp
index 171a97263..46a1dbe5d 100644
--- a/tests/common-cleanup.hpp
+++ b/tests/common-cleanup.hpp
@@ -26,7 +26,8 @@ namespace testing::cleanup {
 class file_t
 {
 public:
-    file_t(std::string const &filename, bool remove_on_construct = true)
+    explicit file_t(std::string const &filename,
+                    bool remove_on_construct = true)
     : m_filename(filename)
     {
         if (remove_on_construct) {
diff --git a/tests/common-pg.hpp b/tests/common-pg.hpp
index 999c686dd..fcf0594e8 100644
--- a/tests/common-pg.hpp
+++ b/tests/common-pg.hpp
@@ -37,7 +37,7 @@ namespace testing::pg {
 class conn_t : public pg_conn_t
 {
 public:
-    conn_t(connection_params_t const &connection_params)
+    explicit conn_t(connection_params_t const &connection_params)
     : pg_conn_t(connection_params, "test")
     {
     }

From 9b0a5ddce39055b3cebba3d047a024f97a1d0f1d Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 21 Aug 2025 22:46:45 +0200
Subject: [PATCH 362/430] Use const where possible

---
 tests/common-import.hpp | 2 +-
 tests/common-pg.hpp     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/common-import.hpp b/tests/common-import.hpp
index 532d84a7c..901df7e9c 100644
--- a/tests/common-import.hpp
+++ b/tests/common-import.hpp
@@ -111,7 +111,7 @@ class data_t
     static std::pair<osmium::item_type, osmium::object_id_type>
     get_type_id(std::string const &str)
     {
-        std::string ti(str, 0, str.find(' '));
+        std::string const ti(str, 0, str.find(' '));
         return osmium::string_to_object_id(ti.c_str(),
                                            osmium::osm_entity_bits::nwr);
     }
diff --git a/tests/common-pg.hpp b/tests/common-pg.hpp
index fcf0594e8..d48628499 100644
--- a/tests/common-pg.hpp
+++ b/tests/common-pg.hpp
@@ -105,7 +105,7 @@ class tempdb_t
         try {
             connection_params_t connection_params;
             connection_params.set("dbname", "postgres");
-            conn_t conn{connection_params};
+            conn_t const conn{connection_params};
 
             m_db_name =
                 fmt::format("osm2pgsql-test-{}-{}", getpid(), time(nullptr));
@@ -113,7 +113,7 @@ class tempdb_t
             conn.exec(R"(CREATE DATABASE "{}" WITH ENCODING 'UTF8')",
                       m_db_name);
 
-            conn_t local = connect();
+            conn_t const local = connect();
             local.exec("CREATE EXTENSION postgis");
             local.exec("CREATE EXTENSION hstore");
             init_database_capabilities(local);
@@ -145,7 +145,7 @@ class tempdb_t
             try {
                 connection_params_t connection_params;
                 connection_params.set("dbname", "postgres");
-                conn_t conn{connection_params};
+                conn_t const conn{connection_params};
                 conn.exec(R"(DROP DATABASE IF EXISTS "{}")", m_db_name);
             } catch (...) {
                 fprintf(stderr, "DROP DATABASE failed. Ignored.\n");

From 3a71de4ddcd025ecfacc7477893d7ab9a8d4af7a Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 21 Aug 2025 14:34:05 +0200
Subject: [PATCH 363/430] Add _t suffix to class thread_joiner

---
 src/thread-pool.hpp | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/thread-pool.hpp b/src/thread-pool.hpp
index 0b66f115e..212d33b68 100644
--- a/src/thread-pool.hpp
+++ b/src/thread-pool.hpp
@@ -124,23 +124,24 @@ class thread_pool_t
      * This class makes sure all pool threads will be joined when
      * the pool is destructed.
      */
-    class thread_joiner
+    class thread_joiner_t
     {
 
         std::vector<std::thread> *m_threads;
 
     public:
-        explicit thread_joiner(std::vector<std::thread> *threads)
+        explicit thread_joiner_t(std::vector<std::thread> *threads)
         : m_threads(threads)
-        {}
+        {
+        }
 
-        thread_joiner(thread_joiner const &) = delete;
-        thread_joiner &operator=(thread_joiner const &) = delete;
+        thread_joiner_t(thread_joiner_t const &) = delete;
+        thread_joiner_t &operator=(thread_joiner_t const &) = delete;
 
-        thread_joiner(thread_joiner &&) = delete;
-        thread_joiner &operator=(thread_joiner &&) = delete;
+        thread_joiner_t(thread_joiner_t &&) = delete;
+        thread_joiner_t &operator=(thread_joiner_t &&) = delete;
 
-        ~thread_joiner()
+        ~thread_joiner_t()
         {
             for (auto &thread : *m_threads) {
                 if (thread.joinable()) {
@@ -149,13 +150,13 @@ class thread_pool_t
             }
         }
 
-    }; // class thread_joiner
+    }; // class thread_joiner_t
 
     static constexpr std::size_t MAX_QUEUE_SIZE = 32;
 
     osmium::thread::Queue<osmium::thread::function_wrapper> m_work_queue;
     std::vector<std::thread> m_threads;
-    thread_joiner m_joiner;
+    thread_joiner_t m_joiner;
 
     /**
      * This is the function run in each worker thread. It will loop over

From 2aac494dff0c582d949043c931cf78ad88db3ca3 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 21 Aug 2025 14:36:25 +0200
Subject: [PATCH 364/430] Add _t suffix to class double_to_buffer

---
 src/output-pgsql.cpp | 4 ++--
 src/util.hpp         | 4 ++--
 tests/test-util.cpp  | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/output-pgsql.cpp b/src/output-pgsql.cpp
index e0756bff0..09b51763d 100644
--- a/src/output-pgsql.cpp
+++ b/src/output-pgsql.cpp
@@ -105,7 +105,7 @@ void output_pgsql_t::pgsql_out_way(osmium::Way const &way, taglist_t *tags,
             if (m_enable_way_area) {
                 double const area = calculate_area(
                     get_options()->reproject_area, geom, projected_geom);
-                util::double_to_buffer const tmp{area};
+                util::double_to_buffer_t const tmp{area};
                 tags->set("way_area", tmp.c_str());
             }
             m_tables[t_poly]->write_row(way.id(), *tags, wkb);
@@ -316,7 +316,7 @@ void output_pgsql_t::pgsql_process_relation(osmium::Relation const &rel)
             if (m_enable_way_area) {
                 double const area = calculate_area(
                     get_options()->reproject_area, sgeom, projected_geom);
-                util::double_to_buffer const tmp{area};
+                util::double_to_buffer_t const tmp{area};
                 outtags.set("way_area", tmp.c_str());
             }
             m_tables[t_poly]->write_row(-rel.id(), outtags, wkb);
diff --git a/src/util.hpp b/src/util.hpp
index 3ea12f6af..67df33019 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -25,12 +25,12 @@
 
 namespace util {
 
-class double_to_buffer
+class double_to_buffer_t
 {
     static constexpr std::size_t BUFFER_SIZE = 32;
 
 public:
-    explicit double_to_buffer(double value)
+    explicit double_to_buffer_t(double value)
     {
         auto const result =
             fmt::format_to_n(m_buffer.begin(), BUFFER_SIZE - 1, "{:g}", value);
diff --git a/tests/test-util.cpp b/tests/test-util.cpp
index 210cf7be6..b9a143c89 100644
--- a/tests/test-util.cpp
+++ b/tests/test-util.cpp
@@ -16,15 +16,15 @@
 #include <string>
 #include <vector>
 
-TEST_CASE("double_to_buffer 0", "[NoDB]")
+TEST_CASE("double_to_buffer_t 0", "[NoDB]")
 {
-    util::double_to_buffer const buffer{0.0};
+    util::double_to_buffer_t const buffer{0.0};
     REQUIRE(std::strcmp(buffer.c_str(), "0") == 0);
 }
 
-TEST_CASE("double_to_buffer 3.141", "[NoDB]")
+TEST_CASE("double_to_buffer_t 3.141", "[NoDB]")
 {
-    util::double_to_buffer const buffer{3.141};
+    util::double_to_buffer_t const buffer{3.141};
     REQUIRE(std::strcmp(buffer.c_str(), "3.141") == 0);
 }
 

From c03742aaf469f7cc8284a11cc722218005a361dd Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 21 Aug 2025 15:52:31 +0200
Subject: [PATCH 365/430] Add _t suffix to class export_list

---
 src/output-pgsql.cpp                   |  2 +-
 src/taginfo-impl.hpp                   |  4 ++--
 src/taginfo.cpp                        |  8 ++++----
 src/tagtransform-c.cpp                 |  3 ++-
 src/tagtransform-c.hpp                 |  4 ++--
 src/tagtransform.cpp                   |  2 +-
 src/tagtransform.hpp                   |  4 ++--
 tests/test-output-pgsql-style-file.cpp | 20 ++++++++++----------
 8 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/output-pgsql.cpp b/src/output-pgsql.cpp
index 09b51763d..8d8fa139c 100644
--- a/src/output-pgsql.cpp
+++ b/src/output-pgsql.cpp
@@ -469,7 +469,7 @@ output_pgsql_t::output_pgsql_t(std::shared_ptr<middle_query_t> const &mid,
     log_debug("Using projection SRS {} ({})", options.projection->target_srs(),
               options.projection->target_desc());
 
-    export_list exlist;
+    export_list_t exlist;
 
     m_enable_way_area = read_style_file(options.style, &exlist);
 
diff --git a/src/taginfo-impl.hpp b/src/taginfo-impl.hpp
index 484e5df8a..a6fdea2fb 100644
--- a/src/taginfo-impl.hpp
+++ b/src/taginfo-impl.hpp
@@ -53,7 +53,7 @@ struct taginfo
 };
 
 /* list of exported tags */
-class export_list
+class export_list_t
 {
 public:
     void add(osmium::item_type type, taginfo const &info);
@@ -76,6 +76,6 @@ unsigned parse_tag_flags(std::string const &flags, int lineno);
  * Returns `true` if the 'way_area' column should (implicitly) exist, or
  * `false` if it should be suppressed.
  */
-bool read_style_file(std::string const &filename, export_list *exlist);
+bool read_style_file(std::string const &filename, export_list_t *exlist);
 
 #endif // OSM2PGSQL_TAGINFO_IMPL_HPP
diff --git a/src/taginfo.cpp b/src/taginfo.cpp
index 78d5c2bda..6b98323a9 100644
--- a/src/taginfo.cpp
+++ b/src/taginfo.cpp
@@ -19,18 +19,18 @@
 
 #include <osmium/util/string.hpp>
 
-void export_list::add(osmium::item_type type, taginfo const &info)
+void export_list_t::add(osmium::item_type type, taginfo const &info)
 {
     m_export_list(type).push_back(info);
 }
 
 std::vector<taginfo> const &
-export_list::get(osmium::item_type type) const noexcept
+export_list_t::get(osmium::item_type type) const noexcept
 {
     return m_export_list(type);
 }
 
-columns_t export_list::normal_columns(osmium::item_type type) const
+columns_t export_list_t::normal_columns(osmium::item_type type) const
 {
     columns_t columns;
 
@@ -89,7 +89,7 @@ unsigned get_tag_type(std::string const &tag)
 
 // NOLINTBEGIN(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
 // This is legacy code which will be removed anyway.
-bool read_style_file(std::string const &filename, export_list *exlist)
+bool read_style_file(std::string const &filename, export_list_t *exlist)
 {
     bool enable_way_area = true;
 
diff --git a/src/tagtransform-c.cpp b/src/tagtransform-c.cpp
index dd98a1014..7adb5564a 100644
--- a/src/tagtransform-c.cpp
+++ b/src/tagtransform-c.cpp
@@ -96,7 +96,8 @@ bool starts_with(char const *input, std::string const &test) noexcept
 
 } // anonymous namespace
 
-c_tagtransform_t::c_tagtransform_t(options_t const *options, export_list exlist)
+c_tagtransform_t::c_tagtransform_t(options_t const *options,
+                                   export_list_t exlist)
 : m_options(options), m_export_list(std::move(exlist))
 {}
 
diff --git a/src/tagtransform-c.hpp b/src/tagtransform-c.hpp
index 190260753..235ff4902 100644
--- a/src/tagtransform-c.hpp
+++ b/src/tagtransform-c.hpp
@@ -16,7 +16,7 @@
 class c_tagtransform_t : public tagtransform_t
 {
 public:
-    c_tagtransform_t(options_t const *options, export_list exlist);
+    c_tagtransform_t(options_t const *options, export_list_t exlist);
 
     std::unique_ptr<tagtransform_t> clone() const override;
 
@@ -34,7 +34,7 @@ class c_tagtransform_t : public tagtransform_t
                    bool *filter, unsigned int *flags);
 
     options_t const *m_options;
-    export_list m_export_list;
+    export_list_t m_export_list;
 };
 
 #endif // OSM2PGSQL_TAGTRANSFORM_C_HPP
diff --git a/src/tagtransform.cpp b/src/tagtransform.cpp
index 18428bccf..d5cd1adbc 100644
--- a/src/tagtransform.cpp
+++ b/src/tagtransform.cpp
@@ -19,7 +19,7 @@
 
 std::unique_ptr<tagtransform_t>
 tagtransform_t::make_tagtransform(options_t const *options,
-                                  export_list const &exlist)
+                                  export_list_t const &exlist)
 {
     if (!options->tag_transform_script.empty()) {
         log_debug("Using lua based tag transformations with script {}",
diff --git a/src/tagtransform.hpp b/src/tagtransform.hpp
index b431848fc..e74c9e5d7 100644
--- a/src/tagtransform.hpp
+++ b/src/tagtransform.hpp
@@ -16,14 +16,14 @@
 
 #include "osmtypes.hpp"
 
-class export_list;
+class export_list_t;
 struct options_t;
 
 class tagtransform_t
 {
 public:
     static std::unique_ptr<tagtransform_t>
-    make_tagtransform(options_t const *options, export_list const &exlist);
+    make_tagtransform(options_t const *options, export_list_t const &exlist);
 
     tagtransform_t() noexcept = default;
 
diff --git a/tests/test-output-pgsql-style-file.cpp b/tests/test-output-pgsql-style-file.cpp
index 38eec63d8..6586aaa81 100644
--- a/tests/test-output-pgsql-style-file.cpp
+++ b/tests/test-output-pgsql-style-file.cpp
@@ -14,7 +14,7 @@
 
 TEST_CASE("Parse default style file")
 {
-    export_list exlist;
+    export_list_t exlist;
     auto const enable_way_area =
         read_style_file(OSM2PGSQLDATA_DIR "default.style", &exlist);
 
@@ -26,7 +26,7 @@ TEST_CASE("Parse default style file")
 
 TEST_CASE("Parse empty style file")
 {
-    export_list exlist;
+    export_list_t exlist;
 
     REQUIRE_THROWS_WITH(
         read_style_file(OSM2PGSQLDATA_DIR "tests/style/empty.style", &exlist),
@@ -35,7 +35,7 @@ TEST_CASE("Parse empty style file")
 
 TEST_CASE("Parse style file with invalid osm type")
 {
-    export_list exlist;
+    export_list_t exlist;
 
     REQUIRE_THROWS(read_style_file(
         OSM2PGSQLDATA_DIR "tests/style/invalid-osm-type.style", &exlist));
@@ -43,7 +43,7 @@ TEST_CASE("Parse style file with invalid osm type")
 
 TEST_CASE("Parse style file with comments only")
 {
-    export_list exlist;
+    export_list_t exlist;
 
     REQUIRE_THROWS_WITH(
         read_style_file(OSM2PGSQLDATA_DIR "tests/style/comments.style",
@@ -53,7 +53,7 @@ TEST_CASE("Parse style file with comments only")
 
 TEST_CASE("Parse style file with single node entry")
 {
-    export_list exlist;
+    export_list_t exlist;
     auto const enable_way_area =
         read_style_file(OSM2PGSQLDATA_DIR "tests/style/node.style", &exlist);
 
@@ -71,7 +71,7 @@ TEST_CASE("Parse style file with single node entry")
 
 TEST_CASE("Parse style file with a few valid entries")
 {
-    export_list exlist;
+    export_list_t exlist;
     auto const enable_way_area =
         read_style_file(OSM2PGSQLDATA_DIR "tests/style/valid.style", &exlist);
 
@@ -109,7 +109,7 @@ TEST_CASE("Parse style file with a few valid entries")
 
 TEST_CASE("Parse style file with missing fields")
 {
-    export_list exlist;
+    export_list_t exlist;
     auto const enable_way_area =
         read_style_file(OSM2PGSQLDATA_DIR "tests/style/missing.style", &exlist);
 
@@ -138,7 +138,7 @@ TEST_CASE("Parse style file with missing fields")
 
 TEST_CASE("Parse style file with way_area")
 {
-    export_list exlist;
+    export_list_t exlist;
     auto const enable_way_area = read_style_file(
         OSM2PGSQLDATA_DIR "tests/style/way-area.style", &exlist);
 
@@ -168,7 +168,7 @@ TEST_CASE("Parse style file with way_area")
 
 TEST_CASE("Parse style file with different data types")
 {
-    export_list exlist;
+    export_list_t exlist;
     auto const enable_way_area = read_style_file(
         OSM2PGSQLDATA_DIR "tests/style/data-types.style", &exlist);
 
@@ -211,7 +211,7 @@ TEST_CASE("Parse style file with different data types")
 
 TEST_CASE("Parse style file with invalid data types")
 {
-    export_list exlist;
+    export_list_t exlist;
     auto const enable_way_area = read_style_file(
         OSM2PGSQLDATA_DIR "tests/style/invalid-data-type.style", &exlist);
 

From 44d4e9e4330ff005cf5a8273f431b0bcdbad4e3c Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 21 Aug 2025 14:17:55 +0200
Subject: [PATCH 366/430] Add _t suffix to class reprojection

---
 src/command-line-parser.cpp         | 10 ++++++----
 src/expire-tiles.cpp                |  2 +-
 src/expire-tiles.hpp                |  6 +++---
 src/flex-table.hpp                  |  6 +++---
 src/geom-functions.cpp              |  9 +++++----
 src/geom-functions.hpp              |  5 +++--
 src/options.hpp                     |  4 ++--
 src/output-flex.cpp                 |  4 ++--
 src/output-pgsql.cpp                |  2 +-
 src/output-pgsql.hpp                |  2 +-
 src/reprojection-generic-none.cpp   |  2 +-
 src/reprojection-generic-proj6.cpp  |  4 ++--
 src/reprojection.cpp                | 12 ++++++------
 src/reprojection.hpp                | 20 ++++++++++----------
 tests/common-options.hpp            |  4 ++--
 tests/test-expire-from-geometry.cpp |  4 ++--
 tests/test-expire-tiles.cpp         |  4 ++--
 tests/test-geom-transform.cpp       | 16 ++++++++--------
 tests/test-reprojection.cpp         |  8 ++++----
 19 files changed, 64 insertions(+), 60 deletions(-)

diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index 8d6b1791f..ca7200d38 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -392,7 +392,8 @@ options_t parse_command_line(int argc, char *argv[])
     app.add_flag_function("-l,--latlong",
                           [&](int64_t) {
                               options.projection =
-                                  reprojection::create_projection(PROJ_LATLONG);
+                                  reprojection_t::create_projection(
+                                      PROJ_LATLONG);
                           })
         ->description("Store data in degrees of latitude & longitude (WGS84).")
         ->group("Pgsql output options");
@@ -401,7 +402,7 @@ options_t parse_command_line(int argc, char *argv[])
     app.add_flag_function("-m,--merc",
                           [&](int64_t) {
                               options.projection =
-                                  reprojection::create_projection(
+                                  reprojection_t::create_projection(
                                       PROJ_SPHERE_MERC);
                           })
         ->description("Store data in Web Mercator [EPSG 3857]. This is the "
@@ -425,7 +426,7 @@ options_t parse_command_line(int argc, char *argv[])
 #ifdef HAVE_GENERIC_PROJ
                                  [&](int arg) {
                                      options.projection =
-                                         reprojection::create_projection(arg);
+                                         reprojection_t::create_projection(arg);
 #else
            [&](int) {
                throw std::runtime_error{
@@ -665,7 +666,8 @@ options_t parse_command_line(int argc, char *argv[])
     }
 
     if (!options.projection) {
-        options.projection = reprojection::create_projection(PROJ_SPHERE_MERC);
+        options.projection =
+            reprojection_t::create_projection(PROJ_SPHERE_MERC);
     }
 
     check_options_expire(&options);
diff --git a/src/expire-tiles.cpp b/src/expire-tiles.cpp
index 45700396b..ceb978119 100644
--- a/src/expire-tiles.cpp
+++ b/src/expire-tiles.cpp
@@ -27,7 +27,7 @@
 #include "wkb.hpp"
 
 expire_tiles::expire_tiles(uint32_t max_zoom,
-                           std::shared_ptr<reprojection> projection)
+                           std::shared_ptr<reprojection_t> projection)
 : m_projection(std::move(projection)), m_maxzoom(max_zoom),
   m_map_width(static_cast<int>(1U << m_maxzoom))
 {}
diff --git a/src/expire-tiles.hpp b/src/expire-tiles.hpp
index eefa3f997..2e4af5e29 100644
--- a/src/expire-tiles.hpp
+++ b/src/expire-tiles.hpp
@@ -25,12 +25,12 @@
 #include "pgsql.hpp"
 #include "tile.hpp"
 
-class reprojection;
+class reprojection_t;
 
 class expire_tiles
 {
 public:
-    expire_tiles(uint32_t max_zoom, std::shared_ptr<reprojection> projection);
+    expire_tiles(uint32_t max_zoom, std::shared_ptr<reprojection_t> projection);
 
     bool empty() const noexcept { return m_dirty_tiles.empty(); }
 
@@ -115,7 +115,7 @@ class expire_tiles
     /// The tile which has been added last to the unordered set.
     tile_t m_prev_tile;
 
-    std::shared_ptr<reprojection> m_projection;
+    std::shared_ptr<reprojection_t> m_projection;
 
     uint32_t m_maxzoom;
     int m_map_width;
diff --git a/src/flex-table.hpp b/src/flex-table.hpp
index 3616d8393..06fe48804 100644
--- a/src/flex-table.hpp
+++ b/src/flex-table.hpp
@@ -278,7 +278,7 @@ class table_connection_t
 public:
     table_connection_t(flex_table_t *table,
                        std::shared_ptr<db_copy_thread_t> const &copy_thread)
-    : m_proj(reprojection::create_projection(table->srid())), m_table(table),
+    : m_proj(reprojection_t::create_projection(table->srid())), m_table(table),
       m_target(std::make_shared<db_target_descr_t>(
           table->schema(), table->name(), table->id_column_names(),
           table->build_sql_column_list())),
@@ -314,7 +314,7 @@ class table_connection_t
 
     void delete_rows_with(osmium::item_type type, osmid_t id);
 
-    reprojection const &proj() const noexcept
+    reprojection_t const &proj() const noexcept
     {
         assert(m_proj);
         return *m_proj;
@@ -335,7 +335,7 @@ class table_connection_t
     }
 
 private:
-    std::shared_ptr<reprojection> m_proj;
+    std::shared_ptr<reprojection_t> m_proj;
 
     flex_table_t *m_table;
 
diff --git a/src/geom-functions.cpp b/src/geom-functions.cpp
index f59cbf740..3ea2e64c2 100644
--- a/src/geom-functions.cpp
+++ b/src/geom-functions.cpp
@@ -134,7 +134,7 @@ class transform_visitor_t
 {
 public:
     explicit transform_visitor_t(geometry_t *output,
-                                 reprojection const *reprojection)
+                                 reprojection_t const *reprojection)
     : m_output(output), m_reprojection(reprojection)
     {}
 
@@ -220,14 +220,14 @@ class transform_visitor_t
     }
 
     geometry_t *m_output;
-    reprojection const *m_reprojection;
+    reprojection_t const *m_reprojection;
 
 }; // class transform_visitor_t
 
 } // anonymous namespace
 
 void transform(geometry_t *output, geometry_t const &input,
-               reprojection const &reprojection)
+               reprojection_t const &reprojection)
 {
     assert(input.srid() == PROJ_LATLONG);
 
@@ -236,7 +236,8 @@ void transform(geometry_t *output, geometry_t const &input,
     input.visit(transform_visitor_t{output, &reprojection});
 }
 
-geometry_t transform(geometry_t const &input, reprojection const &reprojection)
+geometry_t transform(geometry_t const &input,
+                     reprojection_t const &reprojection)
 {
     geometry_t output;
     transform(&output, input, reprojection);
diff --git a/src/geom-functions.hpp b/src/geom-functions.hpp
index 56ace587d..08e26b348 100644
--- a/src/geom-functions.hpp
+++ b/src/geom-functions.hpp
@@ -100,7 +100,7 @@ geometry_t geometry_n(geometry_t const &input, std::size_t n);
  * \pre \code geom.srid() == 4326 \endcode
  */
 void transform(geometry_t *output, geometry_t const &input,
-               reprojection const &reprojection);
+               reprojection_t const &reprojection);
 
 /**
  * Transform a geometry in 4326 into some other projection.
@@ -111,7 +111,8 @@ void transform(geometry_t *output, geometry_t const &input,
  *
  * \pre \code geom.srid() == 4326 \endcode
  */
-geometry_t transform(geometry_t const &input, reprojection const &reprojection);
+geometry_t transform(geometry_t const &input,
+                     reprojection_t const &reprojection);
 
 /**
  * Returns a modified geometry having no segment longer than the given
diff --git a/src/options.hpp b/src/options.hpp
index f81d3e1f3..f15139be4 100644
--- a/src/options.hpp
+++ b/src/options.hpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <vector>
 
-class reprojection;
+class reprojection_t;
 
 enum class command_t : uint8_t
 {
@@ -93,7 +93,7 @@ struct options_t
 
     std::vector<std::string> input_files;
 
-    std::shared_ptr<reprojection> projection; ///< SRS of projection
+    std::shared_ptr<reprojection_t> projection; ///< SRS of projection
 
     /// Max bbox size in either dimension to expire full bbox for a polygon
     double expire_tiles_max_bbox = 20000.0;
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index f29ff5f15..13ab98d1a 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -1207,7 +1207,7 @@ output_flex_t::output_flex_t(output_flex_t const *other,
     for (auto &expire_output : *m_expire_outputs) {
         m_expire_tiles.emplace_back(
             expire_output.maxzoom(),
-            reprojection::create_projection(PROJ_SPHERE_MERC));
+            reprojection_t::create_projection(PROJ_SPHERE_MERC));
     }
 }
 
@@ -1273,7 +1273,7 @@ output_flex_t::output_flex_t(std::shared_ptr<middle_query_t> const &mid,
     for (auto const &expire_output : *m_expire_outputs) {
         m_expire_tiles.emplace_back(
             expire_output.maxzoom(),
-            reprojection::create_projection(PROJ_SPHERE_MERC));
+            reprojection_t::create_projection(PROJ_SPHERE_MERC));
     }
 
     create_expire_tables(*m_expire_outputs, get_options()->connection_params);
diff --git a/src/output-pgsql.cpp b/src/output-pgsql.cpp
index 8d8fa139c..874d5f30b 100644
--- a/src/output-pgsql.cpp
+++ b/src/output-pgsql.cpp
@@ -52,7 +52,7 @@ double calculate_area(bool reproject_area, geom::geometry_t const &geom4326,
                       geom::geometry_t const &projected_geom)
 {
     static thread_local auto const proj3857 =
-        reprojection::create_projection(PROJ_SPHERE_MERC);
+        reprojection_t::create_projection(PROJ_SPHERE_MERC);
 
     if (reproject_area) {
         auto const ogeom = geom::transform(geom4326, *proj3857);
diff --git a/src/output-pgsql.hpp b/src/output-pgsql.hpp
index 39cde4c5d..23d333d1e 100644
--- a/src/output-pgsql.hpp
+++ b/src/output-pgsql.hpp
@@ -106,7 +106,7 @@ class output_pgsql_t : public output_t
 
     std::array<std::unique_ptr<table_t>, t_MAX> m_tables;
 
-    std::shared_ptr<reprojection> m_proj;
+    std::shared_ptr<reprojection_t> m_proj;
     expire_config_t m_expire_config;
     expire_tiles m_expire;
 
diff --git a/src/reprojection-generic-none.cpp b/src/reprojection-generic-none.cpp
index 690363a93..803e8c9de 100644
--- a/src/reprojection-generic-none.cpp
+++ b/src/reprojection-generic-none.cpp
@@ -11,7 +11,7 @@
 
 #include "reprojection.hpp"
 
-std::shared_ptr<reprojection> reprojection::make_generic_projection(int)
+std::shared_ptr<reprojection_t> reprojection_t::make_generic_projection(int)
 {
     throw std::runtime_error{"No generic projection library available."};
 }
diff --git a/src/reprojection-generic-proj6.cpp b/src/reprojection-generic-proj6.cpp
index 6efbf56ce..febfbe1a3 100644
--- a/src/reprojection-generic-proj6.cpp
+++ b/src/reprojection-generic-proj6.cpp
@@ -11,7 +11,7 @@ namespace {
 /**
  * Generic projection using proj library (version 6 and above).
  */
-class generic_reprojection_t : public reprojection
+class generic_reprojection_t : public reprojection_t
 {
 public:
     explicit generic_reprojection_t(int srs)
@@ -110,7 +110,7 @@ class generic_reprojection_t : public reprojection
 
 } // anonymous namespace
 
-std::shared_ptr<reprojection> reprojection::make_generic_projection(int srs)
+std::shared_ptr<reprojection_t> reprojection_t::make_generic_projection(int srs)
 {
     return std::make_shared<generic_reprojection_t>(srs);
 }
diff --git a/src/reprojection.cpp b/src/reprojection.cpp
index d7229b748..d2b512f64 100644
--- a/src/reprojection.cpp
+++ b/src/reprojection.cpp
@@ -28,7 +28,7 @@ geom::point_t lonlat2merc(geom::point_t point)
     return {c.x, c.y};
 }
 
-class latlon_reprojection_t : public reprojection
+class latlon_reprojection_t : public reprojection_t
 {
 public:
     geom::point_t reproject(geom::point_t point) const noexcept override
@@ -46,7 +46,7 @@ class latlon_reprojection_t : public reprojection
     char const *target_desc() const noexcept override { return "Latlong"; }
 };
 
-class merc_reprojection_t : public reprojection
+class merc_reprojection_t : public reprojection_t
 {
 public:
     geom::point_t reproject(geom::point_t coords) const noexcept override
@@ -69,7 +69,7 @@ class merc_reprojection_t : public reprojection
 
 } // anonymous namespace
 
-std::shared_ptr<reprojection> reprojection::create_projection(int srs)
+std::shared_ptr<reprojection_t> reprojection_t::create_projection(int srs)
 {
     switch (srs) {
     case PROJ_LATLONG:
@@ -87,11 +87,11 @@ std::shared_ptr<reprojection> reprojection::create_projection(int srs)
     return make_generic_projection(srs);
 }
 
-reprojection const &get_projection(int srs)
+reprojection_t const &get_projection(int srs)
 {
     // In almost all cases there will be only one or two projections used, so
     // storing them in a vector and doing linear search is totally fine.
-    static std::vector<std::shared_ptr<reprojection>> projections;
+    static std::vector<std::shared_ptr<reprojection_t>> projections;
 
     for (auto const &p : projections) {
         if (p->target_srs() == srs) {
@@ -99,5 +99,5 @@ reprojection const &get_projection(int srs)
         }
     }
 
-    return *projections.emplace_back(reprojection::create_projection(srs));
+    return *projections.emplace_back(reprojection_t::create_projection(srs));
 }
diff --git a/src/reprojection.hpp b/src/reprojection.hpp
index e1de8c90f..8893eef8a 100644
--- a/src/reprojection.hpp
+++ b/src/reprojection.hpp
@@ -28,18 +28,18 @@
  * the coordinates into Spherical Mercator coordinates used in common web
  * tiles.
  */
-class reprojection
+class reprojection_t
 {
 public:
-    reprojection() = default;
+    reprojection_t() = default;
 
-    reprojection(reprojection const &) = delete;
-    reprojection &operator=(reprojection const &) = delete;
+    reprojection_t(reprojection_t const &) = delete;
+    reprojection_t &operator=(reprojection_t const &) = delete;
 
-    reprojection(reprojection &&) = delete;
-    reprojection &operator=(reprojection &&) = delete;
+    reprojection_t(reprojection_t &&) = delete;
+    reprojection_t &operator=(reprojection_t &&) = delete;
 
-    virtual ~reprojection() = default;
+    virtual ~reprojection_t() = default;
 
     /**
      * Reproject from the source projection lat/lon (EPSG:4326)
@@ -65,10 +65,10 @@ class reprojection
      * The target projection (used in the PostGIS tables).
      * Controlled by the -l/-m/-E options.
      */
-    static std::shared_ptr<reprojection> create_projection(int srs);
+    static std::shared_ptr<reprojection_t> create_projection(int srs);
 
 private:
-    static std::shared_ptr<reprojection> make_generic_projection(int srs);
+    static std::shared_ptr<reprojection_t> make_generic_projection(int srs);
 };
 
 std::string get_proj_version();
@@ -77,6 +77,6 @@ std::string get_proj_version();
  * Get projection object for given srs. Objects are only created once and
  * then cached.
  */
-reprojection const &get_projection(int srs);
+reprojection_t const &get_projection(int srs);
 
 #endif // OSM2PGSQL_REPROJECTION_HPP
diff --git a/tests/common-options.hpp b/tests/common-options.hpp
index 58adb8ea2..4eefe4800 100644
--- a/tests/common-options.hpp
+++ b/tests/common-options.hpp
@@ -28,7 +28,7 @@ class opt_t
         m_opt.num_procs = 1;
         m_opt.cache = 2;
         m_opt.append = false;
-        m_opt.projection = reprojection::create_projection(PROJ_SPHERE_MERC);
+        m_opt.projection = reprojection_t::create_projection(PROJ_SPHERE_MERC);
         m_opt.middle_dbschema = "public";
         m_opt.output_dbschema = "public";
     }
@@ -79,7 +79,7 @@ class opt_t
 
     opt_t &srs(int srs)
     {
-        m_opt.projection = reprojection::create_projection(srs);
+        m_opt.projection = reprojection_t::create_projection(srs);
         return *this;
     }
 
diff --git a/tests/test-expire-from-geometry.cpp b/tests/test-expire-from-geometry.cpp
index 90623ae68..db260f7ff 100644
--- a/tests/test-expire-from-geometry.cpp
+++ b/tests/test-expire-from-geometry.cpp
@@ -20,8 +20,8 @@
 
 namespace {
 
-std::shared_ptr<reprojection> defproj{
-    reprojection::create_projection(PROJ_SPHERE_MERC)};
+std::shared_ptr<reprojection_t> defproj{
+    reprojection_t::create_projection(PROJ_SPHERE_MERC)};
 
 // We are using zoom level 12 here, because at that level a tile is about
 // 10,000 units wide/high which gives us easy numbers to work with.
diff --git a/tests/test-expire-tiles.cpp b/tests/test-expire-tiles.cpp
index 72717ec87..1460d84b3 100644
--- a/tests/test-expire-tiles.cpp
+++ b/tests/test-expire-tiles.cpp
@@ -19,8 +19,8 @@
 
 namespace {
 
-std::shared_ptr<reprojection> defproj{
-    reprojection::create_projection(PROJ_SPHERE_MERC)};
+std::shared_ptr<reprojection_t> defproj{
+    reprojection_t::create_projection(PROJ_SPHERE_MERC)};
 
 std::set<tile_t> generate_random(uint32_t zoom, size_t count)
 {
diff --git a/tests/test-geom-transform.cpp b/tests/test-geom-transform.cpp
index 10a7ed775..60ac0eb3a 100644
--- a/tests/test-geom-transform.cpp
+++ b/tests/test-geom-transform.cpp
@@ -43,7 +43,7 @@ double const Y09 = 100191.66201561989; // lat 0.9
 TEST_CASE("Transform geom::null_t", "[NoDB]")
 {
     auto const &reprojection =
-        reprojection::create_projection(PROJ_SPHERE_MERC);
+        reprojection_t::create_projection(PROJ_SPHERE_MERC);
 
     geom::geometry_t const geom{};
     auto const result = geom::transform(geom, *reprojection);
@@ -54,7 +54,7 @@ TEST_CASE("Transform geom::null_t", "[NoDB]")
 TEST_CASE("Transform geom::point_t", "[NoDB]")
 {
     auto const &reprojection =
-        reprojection::create_projection(PROJ_SPHERE_MERC);
+        reprojection_t::create_projection(PROJ_SPHERE_MERC);
 
     geom::geometry_t const geom{geom::point_t{5.5, 4.4}};
     auto const result = geom::transform(geom, *reprojection);
@@ -68,7 +68,7 @@ TEST_CASE("Transform geom::point_t", "[NoDB]")
 TEST_CASE("Transform geom::linestring_t", "[NoDB]")
 {
     auto const &reprojection =
-        reprojection::create_projection(PROJ_SPHERE_MERC);
+        reprojection_t::create_projection(PROJ_SPHERE_MERC);
 
     geom::geometry_t const geom{geom::linestring_t{{5.5, 4.4}, {3.3, 2.2}}};
     auto const result = geom::transform(geom, *reprojection);
@@ -83,7 +83,7 @@ TEST_CASE("Transform geom::linestring_t", "[NoDB]")
 TEST_CASE("Transform geom::polygon_t", "[NoDB]")
 {
     auto const &reprojection =
-        reprojection::create_projection(PROJ_SPHERE_MERC);
+        reprojection_t::create_projection(PROJ_SPHERE_MERC);
 
     geom::geometry_t geom{
         geom::polygon_t{geom::ring_t{{0, 0}, {0, 1}, {1, 1}, {1, 0}, {0, 0}}}};
@@ -117,7 +117,7 @@ TEST_CASE("Transform geom::polygon_t", "[NoDB]")
 TEST_CASE("Transform geom::multipoint_t", "[NoDB]")
 {
     auto const &reprojection =
-        reprojection::create_projection(PROJ_SPHERE_MERC);
+        reprojection_t::create_projection(PROJ_SPHERE_MERC);
 
     geom::geometry_t geom{geom::multipoint_t{}};
     auto &mp = geom.get<geom::multipoint_t>();
@@ -137,7 +137,7 @@ TEST_CASE("Transform geom::multipoint_t", "[NoDB]")
 TEST_CASE("Transform geom::multilinestring_t", "[NoDB]")
 {
     auto const &reprojection =
-        reprojection::create_projection(PROJ_SPHERE_MERC);
+        reprojection_t::create_projection(PROJ_SPHERE_MERC);
 
     geom::geometry_t geom{geom::multilinestring_t{}};
     auto &ml = geom.get<geom::multilinestring_t>();
@@ -163,7 +163,7 @@ TEST_CASE("Transform geom::multilinestring_t", "[NoDB]")
 TEST_CASE("Transform geom::multipolygon_t", "[NoDB]")
 {
     auto const &reprojection =
-        reprojection::create_projection(PROJ_SPHERE_MERC);
+        reprojection_t::create_projection(PROJ_SPHERE_MERC);
 
     geom::geometry_t geom{geom::multipolygon_t{}};
     auto &mp = geom.get<geom::multipolygon_t>();
@@ -199,7 +199,7 @@ TEST_CASE("Transform geom::multipolygon_t", "[NoDB]")
 TEST_CASE("Transform geom::collection_t", "[NoDB]")
 {
     auto const &reprojection =
-        reprojection::create_projection(PROJ_SPHERE_MERC);
+        reprojection_t::create_projection(PROJ_SPHERE_MERC);
 
     geom::geometry_t geom{geom::collection_t{}};
     auto &c = geom.get<geom::collection_t>();
diff --git a/tests/test-reprojection.cpp b/tests/test-reprojection.cpp
index 0818d477c..f3778bd68 100644
--- a/tests/test-reprojection.cpp
+++ b/tests/test-reprojection.cpp
@@ -17,7 +17,7 @@ TEST_CASE("projection 4326", "[NoDB]")
     osmium::Location const loc{10.0, 53.0};
     int const srs = PROJ_LATLONG;
 
-    auto const reprojection = reprojection::create_projection(srs);
+    auto const reprojection = reprojection_t::create_projection(srs);
     REQUIRE(reprojection->target_srs() == srs);
     REQUIRE(reprojection->target_latlon());
 
@@ -35,7 +35,7 @@ TEST_CASE("projection 3857", "[NoDB]")
     osmium::Location const loc{10.0, 53.0};
     int const srs = PROJ_SPHERE_MERC;
 
-    auto const reprojection = reprojection::create_projection(srs);
+    auto const reprojection = reprojection_t::create_projection(srs);
     REQUIRE(reprojection->target_srs() == srs);
     REQUIRE_FALSE(reprojection->target_latlon());
 
@@ -54,7 +54,7 @@ TEST_CASE("projection 3857 bounds", "[NoDB]")
     osmium::Location const loc2{-180.0, -85.0511288};
     osmium::Location const loc3{180.0, 85.0511288};
     int const srs = PROJ_SPHERE_MERC;
-    auto const reprojection = reprojection::create_projection(srs);
+    auto const reprojection = reprojection_t::create_projection(srs);
 
     {
         auto const c = reprojection->reproject(geom::point_t{loc1});
@@ -91,7 +91,7 @@ TEST_CASE("projection 5651", "[NoDB]")
     osmium::Location const loc{10.0, 53.0};
     int const srs = 5651; // ETRS89 / UTM zone 31N (N-zE)
 
-    auto const reprojection = reprojection::create_projection(srs);
+    auto const reprojection = reprojection_t::create_projection(srs);
     REQUIRE(reprojection->target_srs() == srs);
     REQUIRE_FALSE(reprojection->target_latlon());
 

From 745381ce301296f4024f001a0024d6f62aff6cc2 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 21 Aug 2025 16:58:55 +0200
Subject: [PATCH 367/430] Add _t suffix to class expire_tiles

---
 src/expire-tiles.cpp                | 62 ++++++++++++++--------------
 src/expire-tiles.hpp                | 13 +++---
 src/flex-table-column.cpp           |  2 +-
 src/flex-table-column.hpp           |  2 +-
 src/flex-write.cpp                  |  2 +-
 src/flex-write.hpp                  |  4 +-
 src/output-flex.hpp                 |  2 +-
 src/output-pgsql.hpp                |  2 +-
 tests/test-expire-from-geometry.cpp | 28 ++++++-------
 tests/test-expire-tiles.cpp         | 64 ++++++++++++++---------------
 10 files changed, 91 insertions(+), 90 deletions(-)

diff --git a/src/expire-tiles.cpp b/src/expire-tiles.cpp
index ceb978119..d9578cd89 100644
--- a/src/expire-tiles.cpp
+++ b/src/expire-tiles.cpp
@@ -26,13 +26,13 @@
 #include "tile.hpp"
 #include "wkb.hpp"
 
-expire_tiles::expire_tiles(uint32_t max_zoom,
-                           std::shared_ptr<reprojection_t> projection)
+expire_tiles_t::expire_tiles_t(uint32_t max_zoom,
+                               std::shared_ptr<reprojection_t> projection)
 : m_projection(std::move(projection)), m_maxzoom(max_zoom),
   m_map_width(static_cast<int>(1U << m_maxzoom))
 {}
 
-void expire_tiles::expire_tile(uint32_t x, uint32_t y)
+void expire_tiles_t::expire_tile(uint32_t x, uint32_t y)
 {
     // Only try to insert to tile into the set if the last inserted tile
     // is different from this tile.
@@ -43,7 +43,7 @@ void expire_tiles::expire_tile(uint32_t x, uint32_t y)
     }
 }
 
-uint32_t expire_tiles::normalise_tile_x_coord(int x) const
+uint32_t expire_tiles_t::normalise_tile_x_coord(int x) const
 {
     x %= m_map_width;
     if (x < 0) {
@@ -52,7 +52,7 @@ uint32_t expire_tiles::normalise_tile_x_coord(int x) const
     return static_cast<uint32_t>(x);
 }
 
-geom::point_t expire_tiles::coords_to_tile(geom::point_t const &point)
+geom::point_t expire_tiles_t::coords_to_tile(geom::point_t const &point)
 {
     auto const c = m_projection->target_to_tile(point);
 
@@ -60,29 +60,29 @@ geom::point_t expire_tiles::coords_to_tile(geom::point_t const &point)
             m_map_width * (0.5 - c.y() / tile_t::EARTH_CIRCUMFERENCE)};
 }
 
-void expire_tiles::from_point_list(geom::point_list_t const &list,
-                                   expire_config_t const &expire_config)
+void expire_tiles_t::from_point_list(geom::point_list_t const &list,
+                                     expire_config_t const &expire_config)
 {
     for_each_segment(list, [&](geom::point_t const &a, geom::point_t const &b) {
         from_line_segment(a, b, expire_config);
     });
 }
 
-void expire_tiles::from_geometry(geom::point_t const &geom,
-                                 expire_config_t const &expire_config)
+void expire_tiles_t::from_geometry(geom::point_t const &geom,
+                                   expire_config_t const &expire_config)
 {
     geom::box_t const box = geom::envelope(geom);
     from_bbox(box, expire_config);
 }
 
-void expire_tiles::from_geometry(geom::linestring_t const &geom,
-                                 expire_config_t const &expire_config)
+void expire_tiles_t::from_geometry(geom::linestring_t const &geom,
+                                   expire_config_t const &expire_config)
 {
     from_point_list(geom, expire_config);
 }
 
-void expire_tiles::from_polygon_boundary(geom::polygon_t const &geom,
-                                         expire_config_t const &expire_config)
+void expire_tiles_t::from_polygon_boundary(geom::polygon_t const &geom,
+                                           expire_config_t const &expire_config)
 {
     from_point_list(geom.outer(), expire_config);
     for (auto const &inner : geom.inners()) {
@@ -90,8 +90,8 @@ void expire_tiles::from_polygon_boundary(geom::polygon_t const &geom,
     }
 }
 
-void expire_tiles::from_geometry(geom::polygon_t const &geom,
-                                 expire_config_t const &expire_config)
+void expire_tiles_t::from_geometry(geom::polygon_t const &geom,
+                                   expire_config_t const &expire_config)
 {
     if (expire_config.mode == expire_mode::boundary_only) {
         from_polygon_boundary(geom, expire_config);
@@ -105,16 +105,16 @@ void expire_tiles::from_geometry(geom::polygon_t const &geom,
     }
 }
 
-void expire_tiles::from_polygon_boundary(geom::multipolygon_t const &geom,
-                                         expire_config_t const &expire_config)
+void expire_tiles_t::from_polygon_boundary(geom::multipolygon_t const &geom,
+                                           expire_config_t const &expire_config)
 {
     for (auto const &sgeom : geom) {
         from_polygon_boundary(sgeom, expire_config);
     }
 }
 
-void expire_tiles::from_geometry(geom::multipolygon_t const &geom,
-                                 expire_config_t const &expire_config)
+void expire_tiles_t::from_geometry(geom::multipolygon_t const &geom,
+                                   expire_config_t const &expire_config)
 {
     if (expire_config.mode == expire_mode::boundary_only) {
         from_polygon_boundary(geom, expire_config);
@@ -130,14 +130,14 @@ void expire_tiles::from_geometry(geom::multipolygon_t const &geom,
 
 // False positive: Apparently clang-tidy can not see through the visit()
 // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-void expire_tiles::from_geometry(geom::geometry_t const &geom,
-                                 expire_config_t const &expire_config)
+void expire_tiles_t::from_geometry(geom::geometry_t const &geom,
+                                   expire_config_t const &expire_config)
 {
     geom.visit([&](auto const &g) { from_geometry(g, expire_config); });
 }
 
-void expire_tiles::from_geometry_if_3857(geom::geometry_t const &geom,
-                                         expire_config_t const &expire_config)
+void expire_tiles_t::from_geometry_if_3857(geom::geometry_t const &geom,
+                                           expire_config_t const &expire_config)
 {
     if (geom.srid() == PROJ_SPHERE_MERC) {
         from_geometry(geom, expire_config);
@@ -147,9 +147,9 @@ void expire_tiles::from_geometry_if_3857(geom::geometry_t const &geom,
 /*
  * Expire tiles that a line crosses
  */
-void expire_tiles::from_line_segment(geom::point_t const &a,
-                                     geom::point_t const &b,
-                                     expire_config_t const &expire_config)
+void expire_tiles_t::from_line_segment(geom::point_t const &a,
+                                       geom::point_t const &b,
+                                       expire_config_t const &expire_config)
 {
     auto tilec_a = coords_to_tile(a);
     auto tilec_b = coords_to_tile(b);
@@ -207,8 +207,8 @@ void expire_tiles::from_line_segment(geom::point_t const &a,
 /*
  * Expire tiles within a bounding box
  */
-int expire_tiles::from_bbox(geom::box_t const &box,
-                            expire_config_t const &expire_config)
+int expire_tiles_t::from_bbox(geom::box_t const &box,
+                              expire_config_t const &expire_config)
 {
     if (!enabled()) {
         return 0;
@@ -257,7 +257,7 @@ int expire_tiles::from_bbox(geom::box_t const &box,
     return 0;
 }
 
-quadkey_list_t expire_tiles::get_tiles()
+quadkey_list_t expire_tiles_t::get_tiles()
 {
     quadkey_list_t tiles;
     tiles.reserve(m_dirty_tiles.size());
@@ -267,7 +267,7 @@ quadkey_list_t expire_tiles::get_tiles()
     return tiles;
 }
 
-void expire_tiles::merge_and_destroy(expire_tiles *other)
+void expire_tiles_t::merge_and_destroy(expire_tiles_t *other)
 {
     if (m_map_width != other->m_map_width) {
         throw fmt_error("Unable to merge tile expiry sets when "
@@ -285,7 +285,7 @@ void expire_tiles::merge_and_destroy(expire_tiles *other)
     }
 }
 
-int expire_from_result(expire_tiles *expire, pg_result_t const &result,
+int expire_from_result(expire_tiles_t *expire, pg_result_t const &result,
                        expire_config_t const &expire_config)
 {
     auto const num_tuples = result.num_tuples();
diff --git a/src/expire-tiles.hpp b/src/expire-tiles.hpp
index 2e4af5e29..ef5bf4c78 100644
--- a/src/expire-tiles.hpp
+++ b/src/expire-tiles.hpp
@@ -27,10 +27,11 @@
 
 class reprojection_t;
 
-class expire_tiles
+class expire_tiles_t
 {
 public:
-    expire_tiles(uint32_t max_zoom, std::shared_ptr<reprojection_t> projection);
+    expire_tiles_t(uint32_t max_zoom,
+                   std::shared_ptr<reprojection_t> projection);
 
     bool empty() const noexcept { return m_dirty_tiles.empty(); }
 
@@ -76,7 +77,7 @@ class expire_tiles
     int from_bbox(geom::box_t const &box, expire_config_t const &expire_config);
 
     /**
-     * Get tiles as a vector of quadkeys and remove them from the expire_tiles
+     * Get tiles as a vector of quadkeys and remove them from the expire_tiles_t
      * object.
      */
     quadkey_list_t get_tiles();
@@ -85,7 +86,7 @@ class expire_tiles
      * Merge the list of expired tiles in the other object into this
      * object, destroying the list in the other object.
      */
-    void merge_and_destroy(expire_tiles *other);
+    void merge_and_destroy(expire_tiles_t *other);
 
 private:
     /**
@@ -120,7 +121,7 @@ class expire_tiles
     uint32_t m_maxzoom;
     int m_map_width;
 
-}; // class expire_tiles
+}; // class expire_tiles_t
 
 /**
  * Expire tiles based on an osm id.
@@ -132,7 +133,7 @@ class expire_tiles
  * \param expire_config Configuration for expiry.
  * \return The number of tuples in the result or -1 if expire is disabled.
  */
-int expire_from_result(expire_tiles *expire, pg_result_t const &result,
+int expire_from_result(expire_tiles_t *expire, pg_result_t const &result,
                        expire_config_t const &expire_config);
 
 #endif // OSM2PGSQL_EXPIRE_TILES_HPP
diff --git a/src/flex-table-column.cpp b/src/flex-table-column.cpp
index 9fea319bc..353d55e0a 100644
--- a/src/flex-table-column.cpp
+++ b/src/flex-table-column.cpp
@@ -203,7 +203,7 @@ void flex_table_column_t::add_expire(expire_config_t const &config)
 }
 
 void flex_table_column_t::do_expire(geom::geometry_t const &geom,
-                                    std::vector<expire_tiles> *expire) const
+                                    std::vector<expire_tiles_t> *expire) const
 {
     assert(expire);
     for (auto const &expire_config : m_expires) {
diff --git a/src/flex-table-column.hpp b/src/flex-table-column.hpp
index d19edef5b..38f0d43d3 100644
--- a/src/flex-table-column.hpp
+++ b/src/flex-table-column.hpp
@@ -132,7 +132,7 @@ class flex_table_column_t
     }
 
     void do_expire(geom::geometry_t const &geom,
-                   std::vector<expire_tiles> *expire) const;
+                   std::vector<expire_tiles_t> *expire) const;
 
 private:
     std::vector<expire_config_t> m_expires;
diff --git a/src/flex-write.cpp b/src/flex-write.cpp
index 7fcf46510..62eab0b81 100644
--- a/src/flex-write.cpp
+++ b/src/flex-write.cpp
@@ -258,7 +258,7 @@ bool is_compatible(geom::geometry_t const &geom,
 void flex_write_column(lua_State *lua_state,
                        db_copy_mgr_t<db_deleter_by_type_and_id_t> *copy_mgr,
                        flex_table_column_t const &column,
-                       std::vector<expire_tiles> *expire)
+                       std::vector<expire_tiles_t> *expire)
 {
     lua_getfield(lua_state, -1, column.name().c_str());
     int const ltype = lua_type(lua_state, -1);
diff --git a/src/flex-write.hpp b/src/flex-write.hpp
index e726310fa..dccf9f3f7 100644
--- a/src/flex-write.hpp
+++ b/src/flex-write.hpp
@@ -18,7 +18,7 @@
 #include <string>
 #include <vector>
 
-class expire_tiles;
+class expire_tiles_t;
 
 class not_null_exception : public std::runtime_error
 {
@@ -37,6 +37,6 @@ class not_null_exception : public std::runtime_error
 void flex_write_column(lua_State *lua_state,
                        db_copy_mgr_t<db_deleter_by_type_and_id_t> *copy_mgr,
                        flex_table_column_t const &column,
-                       std::vector<expire_tiles> *expire);
+                       std::vector<expire_tiles_t> *expire);
 
 #endif // OSM2PGSQL_FLEX_WRITE_HPP
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index 5af451c3a..235b579e6 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -291,7 +291,7 @@ class output_flex_t : public output_t
     // accessed while protected using the lua_mutex.
     std::shared_ptr<lua_State> m_lua_state;
 
-    std::vector<expire_tiles> m_expire_tiles;
+    std::vector<expire_tiles_t> m_expire_tiles;
 
     way_cache_t m_way_cache;
     relation_cache_t m_relation_cache;
diff --git a/src/output-pgsql.hpp b/src/output-pgsql.hpp
index 23d333d1e..f35aac778 100644
--- a/src/output-pgsql.hpp
+++ b/src/output-pgsql.hpp
@@ -108,7 +108,7 @@ class output_pgsql_t : public output_t
 
     std::shared_ptr<reprojection_t> m_proj;
     expire_config_t m_expire_config;
-    expire_tiles m_expire;
+    expire_tiles_t m_expire;
 
     osmium::memory::Buffer m_buffer;
     osmium::memory::Buffer m_rels_buffer;
diff --git a/tests/test-expire-from-geometry.cpp b/tests/test-expire-from-geometry.cpp
index db260f7ff..abe4a2ca3 100644
--- a/tests/test-expire-from-geometry.cpp
+++ b/tests/test-expire-from-geometry.cpp
@@ -32,7 +32,7 @@ constexpr uint32_t ZOOM = 12;
 TEST_CASE("expire null geometry does nothing", "[NoDB]")
 {
     expire_config_t const expire_config;
-    expire_tiles et{ZOOM, defproj};
+    expire_tiles_t et{ZOOM, defproj};
 
     SECTION("geom")
     {
@@ -53,7 +53,7 @@ TEST_CASE("expire null geometry does nothing", "[NoDB]")
 TEST_CASE("expire point at tile boundary", "[NoDB]")
 {
     expire_config_t const expire_config;
-    expire_tiles et{ZOOM, defproj};
+    expire_tiles_t et{ZOOM, defproj};
 
     geom::point_t const pt{0.0, 0.0};
 
@@ -83,7 +83,7 @@ TEST_CASE("expire point at tile boundary", "[NoDB]")
 TEST_CASE("expire point away from tile boundary", "[NoDB]")
 {
     expire_config_t const expire_config;
-    expire_tiles et{ZOOM, defproj};
+    expire_tiles_t et{ZOOM, defproj};
 
     geom::point_t const pt{5000.0, 5000.0};
 
@@ -110,7 +110,7 @@ TEST_CASE("expire point away from tile boundary", "[NoDB]")
 TEST_CASE("expire linestring away from tile boundary", "[NoDB]")
 {
     expire_config_t const expire_config;
-    expire_tiles et{ZOOM, defproj};
+    expire_tiles_t et{ZOOM, defproj};
 
     SECTION("line")
     {
@@ -141,7 +141,7 @@ TEST_CASE("expire linestring away from tile boundary", "[NoDB]")
 TEST_CASE("expire linestring crossing tile boundary", "[NoDB]")
 {
     expire_config_t const expire_config;
-    expire_tiles et{ZOOM, defproj};
+    expire_tiles_t et{ZOOM, defproj};
 
     SECTION("line")
     {
@@ -173,7 +173,7 @@ TEST_CASE("expire linestring crossing tile boundary", "[NoDB]")
 TEST_CASE("expire small polygon", "[NoDB]")
 {
     expire_config_t const expire_config;
-    expire_tiles et{ZOOM, defproj};
+    expire_tiles_t et{ZOOM, defproj};
 
     SECTION("polygon")
     {
@@ -218,7 +218,7 @@ TEST_CASE("expire large polygon as bbox", "[NoDB]")
     expire_config_t expire_config;
     expire_config.mode = expire_mode::hybrid;
     expire_config.full_area_limit = 40000;
-    expire_tiles et{ZOOM, defproj};
+    expire_tiles_t et{ZOOM, defproj};
 
     SECTION("polygon")
     {
@@ -273,7 +273,7 @@ TEST_CASE("expire large polygon as boundary", "[NoDB]")
     expire_config_t expire_config;
     expire_config.mode = expire_mode::hybrid;
     expire_config.full_area_limit = 10000;
-    expire_tiles et{ZOOM, defproj};
+    expire_tiles_t et{ZOOM, defproj};
 
     SECTION("polygon")
     {
@@ -335,7 +335,7 @@ TEST_CASE("expire large polygon as boundary", "[NoDB]")
 TEST_CASE("expire multipoint geometry", "[NoDB]")
 {
     expire_config_t const expire_config;
-    expire_tiles et{ZOOM, defproj};
+    expire_tiles_t et{ZOOM, defproj};
 
     geom::point_t const p1{0.0, 0.0};
     geom::point_t const p2{15000.0, 15000.0};
@@ -379,7 +379,7 @@ TEST_CASE("expire multipoint geometry", "[NoDB]")
 TEST_CASE("expire multilinestring geometry", "[NoDB]")
 {
     expire_config_t const expire_config;
-    expire_tiles et{ZOOM, defproj};
+    expire_tiles_t et{ZOOM, defproj};
 
     geom::linestring_t l1{{2000.0, 2000.0}, {3000.0, 3000.0}};
     geom::linestring_t l2{{15000.0, 15000.0}, {25000.0, 15000.0}};
@@ -407,7 +407,7 @@ TEST_CASE("expire multipolygon geometry", "[NoDB]")
     expire_config_t expire_config;
     expire_config.mode = expire_mode::hybrid;
     expire_config.full_area_limit = 10000;
-    expire_tiles et{ZOOM, defproj};
+    expire_tiles_t et{ZOOM, defproj};
 
     geom::polygon_t p1{{{2000.0, 2000.0},
                         {2000.0, 3000.0},
@@ -460,7 +460,7 @@ TEST_CASE("expire multipolygon geometry", "[NoDB]")
 TEST_CASE("expire geometry collection", "[NoDB]")
 {
     expire_config_t const expire_config;
-    expire_tiles et{ZOOM, defproj};
+    expire_tiles_t et{ZOOM, defproj};
 
     geom::collection_t collection;
     collection.add_geometry(geom::geometry_t{geom::point_t{0.0, 0.0}});
@@ -483,7 +483,7 @@ TEST_CASE("expire geometry collection", "[NoDB]")
 TEST_CASE("expire works if in 3857", "[NoDB]")
 {
     expire_config_t const expire_config;
-    expire_tiles et{ZOOM, defproj};
+    expire_tiles_t et{ZOOM, defproj};
 
     geom::geometry_t geom{geom::point_t{0.0, 0.0}};
     geom.set_srid(PROJ_SPHERE_MERC);
@@ -496,7 +496,7 @@ TEST_CASE("expire works if in 3857", "[NoDB]")
 TEST_CASE("expire doesn't do anything if not in 3857", "[NoDB]")
 {
     expire_config_t const expire_config;
-    expire_tiles et{ZOOM, defproj};
+    expire_tiles_t et{ZOOM, defproj};
 
     geom::geometry_t geom{geom::point_t{0.0, 0.0}};
     geom.set_srid(1234);
diff --git a/tests/test-expire-tiles.cpp b/tests/test-expire-tiles.cpp
index 1460d84b3..844bc49eb 100644
--- a/tests/test-expire-tiles.cpp
+++ b/tests/test-expire-tiles.cpp
@@ -41,7 +41,7 @@ std::set<tile_t> generate_random(uint32_t zoom, size_t count)
     return set;
 }
 
-void expire_centroids(expire_tiles *et, std::set<tile_t> const &tiles)
+void expire_centroids(expire_tiles_t *et, std::set<tile_t> const &tiles)
 {
     for (auto const &t : tiles) {
         auto const p = t.center();
@@ -56,7 +56,7 @@ void check_quadkey(quadkey_t quadkey_expected, tile_t const &tile) noexcept
     CHECK(t == tile);
 }
 
-std::vector<tile_t> get_tiles_ordered(expire_tiles *et, uint32_t minzoom,
+std::vector<tile_t> get_tiles_ordered(expire_tiles_t *et, uint32_t minzoom,
                                       uint32_t maxzoom)
 {
     std::vector<tile_t> tiles;
@@ -67,7 +67,7 @@ std::vector<tile_t> get_tiles_ordered(expire_tiles *et, uint32_t minzoom,
     return tiles;
 }
 
-std::set<tile_t> get_tiles_unordered(expire_tiles *et, uint32_t zoom)
+std::set<tile_t> get_tiles_unordered(expire_tiles_t *et, uint32_t zoom)
 {
     std::set<tile_t> tiles;
 
@@ -91,7 +91,7 @@ TEST_CASE("simple expire z1", "[NoDB]")
 {
     uint32_t const minzoom = 1;
     uint32_t const maxzoom = 1;
-    expire_tiles et{minzoom, defproj};
+    expire_tiles_t et{minzoom, defproj};
 
     // as big a bbox as possible at the origin to dirty all four
     // quadrants of the world.
@@ -111,7 +111,7 @@ TEST_CASE("simple expire z3", "[NoDB]")
 {
     uint32_t const minzoom = 3;
     uint32_t const maxzoom = 3;
-    expire_tiles et{minzoom, defproj};
+    expire_tiles_t et{minzoom, defproj};
 
     // as big a bbox as possible at the origin to dirty all four
     // quadrants of the world.
@@ -131,7 +131,7 @@ TEST_CASE("simple expire z18", "[NoDB]")
 {
     uint32_t const minzoom = 18;
     uint32_t const maxzoom = 18;
-    expire_tiles et{minzoom, defproj};
+    expire_tiles_t et{minzoom, defproj};
 
     // dirty a smaller bbox this time, as at z18 the scale is
     // pretty small.
@@ -151,7 +151,7 @@ TEST_CASE("simple expire z10 bounds 0, 0", "[NoDB]")
 {
     uint32_t const minzoom = 10;
     uint32_t const maxzoom = 10;
-    expire_tiles et{minzoom, defproj};
+    expire_tiles_t et{minzoom, defproj};
 
     et.from_geometry(geom::point_t{-20037508.34, 20037508.34},
                      expire_config_t{});
@@ -167,7 +167,7 @@ TEST_CASE("simple expire z10 bounds 0, 1023", "[NoDB]")
 {
     uint32_t const minzoom = 10;
     uint32_t const maxzoom = 10;
-    expire_tiles et{minzoom, defproj};
+    expire_tiles_t et{minzoom, defproj};
 
     et.from_geometry(geom::point_t{-20037508.34, -20037508.34},
                      expire_config_t{});
@@ -183,7 +183,7 @@ TEST_CASE("simple expire z10 bounds 1023, 0", "[NoDB]")
 {
     uint32_t const minzoom = 10;
     uint32_t const maxzoom = 10;
-    expire_tiles et{minzoom, defproj};
+    expire_tiles_t et{minzoom, defproj};
 
     et.from_geometry(geom::point_t{20037508.34, 20037508.34},
                      expire_config_t{});
@@ -199,7 +199,7 @@ TEST_CASE("simple expire z10 bounds 1023, 1023", "[NoDB]")
 {
     uint32_t const minzoom = 10;
     uint32_t const maxzoom = 10;
-    expire_tiles et{minzoom, defproj};
+    expire_tiles_t et{minzoom, defproj};
 
     et.from_geometry(geom::point_t{20037508.34, -20037508.34},
                      expire_config_t{});
@@ -214,7 +214,7 @@ TEST_CASE("simple expire z10 bounds 1023, 1023", "[NoDB]")
 TEST_CASE("expire a simple line", "[NoDB]")
 {
     uint32_t const zoom = 18;
-    expire_tiles et{zoom, defproj};
+    expire_tiles_t et{zoom, defproj};
 
     et.from_geometry(
         geom::linestring_t{{1398725.0, 7493354.0}, {1399030.0, 7493354.0}},
@@ -232,7 +232,7 @@ TEST_CASE("expire a simple line", "[NoDB]")
 TEST_CASE("expire a line near the tile border", "[NoDB]")
 {
     uint32_t const zoom = 18;
-    expire_tiles et{zoom, defproj};
+    expire_tiles_t et{zoom, defproj};
 
     et.from_geometry(
         geom::linestring_t{{1398945.0, 7493267.0}, {1398960.0, 7493282.0}},
@@ -251,7 +251,7 @@ TEST_CASE("expire a line near the tile border", "[NoDB]")
 TEST_CASE("expire a u-shaped linestring", "[NoDB]")
 {
     uint32_t const zoom = 18;
-    expire_tiles et{zoom, defproj};
+    expire_tiles_t et{zoom, defproj};
 
     et.from_geometry(geom::linestring_t{{1398586.0, 7493485.0},
                                         {1398575.0, 7493347.0},
@@ -273,7 +273,7 @@ TEST_CASE("expire a u-shaped linestring", "[NoDB]")
 TEST_CASE("expire longer horizontal line", "[NoDB]")
 {
     uint32_t const zoom = 18;
-    expire_tiles et{zoom, defproj};
+    expire_tiles_t et{zoom, defproj};
 
     et.from_geometry(
         geom::linestring_t{{1397815.0, 7493800.0}, {1399316.0, 7493780.0}},
@@ -290,7 +290,7 @@ TEST_CASE("expire longer horizontal line", "[NoDB]")
 TEST_CASE("expire longer diagonal line", "[NoDB]")
 {
     uint32_t const zoom = 18;
-    expire_tiles et{zoom, defproj};
+    expire_tiles_t et{zoom, defproj};
 
     et.from_geometry(
         geom::linestring_t{{1398427.0, 7494118.0}, {1398869.0, 7493189.0}},
@@ -322,7 +322,7 @@ TEST_CASE("simple expire z17 and z18", "[NoDB]")
 {
     uint32_t const minzoom = 17;
     uint32_t const maxzoom = 18;
-    expire_tiles et{maxzoom, defproj};
+    expire_tiles_t et{maxzoom, defproj};
 
     // dirty a smaller bbox this time, as at z18 the scale is
     // pretty small.
@@ -350,7 +350,7 @@ TEST_CASE("simple expire z17 and z18 in one superior tile", "[NoDB]")
 {
     uint32_t const minzoom = 17;
     uint32_t const maxzoom = 18;
-    expire_tiles et{maxzoom, defproj};
+    expire_tiles_t et{maxzoom, defproj};
 
     et.from_bbox({-163, 140, -140, 164}, expire_config_t{});
     auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
@@ -372,7 +372,7 @@ TEST_CASE("expire centroids", "[NoDB]")
     uint32_t const zoom = 18;
 
     for (int i = 0; i < 100; ++i) {
-        expire_tiles et{zoom, defproj};
+        expire_tiles_t et{zoom, defproj};
 
         auto check_set = generate_random(zoom, 100);
         expire_centroids(&et, check_set);
@@ -383,7 +383,7 @@ TEST_CASE("expire centroids", "[NoDB]")
 }
 
 /**
- * After expiring a random set of tiles in one expire_tiles object
+ * After expiring a random set of tiles in one expire_tiles_t object
  * and a different set in another, when they are merged together they are the
  * same as if the union of the sets of tiles had been expired.
  */
@@ -392,9 +392,9 @@ TEST_CASE("merge expire sets", "[NoDB]")
     uint32_t const zoom = 18;
 
     for (int i = 0; i < 100; ++i) {
-        expire_tiles et{zoom, defproj};
-        expire_tiles et1{zoom, defproj};
-        expire_tiles et2{zoom, defproj};
+        expire_tiles_t et{zoom, defproj};
+        expire_tiles_t et1{zoom, defproj};
+        expire_tiles_t et2{zoom, defproj};
 
         auto check_set1 = generate_random(zoom, 100);
         expire_centroids(&et1, check_set1);
@@ -423,9 +423,9 @@ TEST_CASE("merge identical expire sets", "[NoDB]")
     uint32_t const zoom = 18;
 
     for (int i = 0; i < 100; ++i) {
-        expire_tiles et{zoom, defproj};
-        expire_tiles et1{zoom, defproj};
-        expire_tiles et2{zoom, defproj};
+        expire_tiles_t et{zoom, defproj};
+        expire_tiles_t et1{zoom, defproj};
+        expire_tiles_t et2{zoom, defproj};
 
         auto const check_set = generate_random(zoom, 100);
         expire_centroids(&et1, check_set);
@@ -448,9 +448,9 @@ TEST_CASE("merge overlapping expire sets", "[NoDB]")
     uint32_t const zoom = 18;
 
     for (int i = 0; i < 100; ++i) {
-        expire_tiles et{zoom, defproj};
-        expire_tiles et1{zoom, defproj};
-        expire_tiles et2{zoom, defproj};
+        expire_tiles_t et{zoom, defproj};
+        expire_tiles_t et1{zoom, defproj};
+        expire_tiles_t et2{zoom, defproj};
 
         auto check_set1 = generate_random(zoom, 100);
         expire_centroids(&et1, check_set1);
@@ -482,10 +482,10 @@ TEST_CASE("merge with complete flag", "[NoDB]")
 {
     uint32_t const zoom = 18;
 
-    expire_tiles et{zoom, defproj};
-    expire_tiles et0{zoom, defproj};
-    expire_tiles et1{zoom, defproj};
-    expire_tiles et2{zoom, defproj};
+    expire_tiles_t et{zoom, defproj};
+    expire_tiles_t et0{zoom, defproj};
+    expire_tiles_t et1{zoom, defproj};
+    expire_tiles_t et2{zoom, defproj};
 
     // et1&2 are two halves of et0's box
     et0.from_bbox({-10000, -10000, 10000, 10000}, expire_config_t{});

From 7f56678e84afaaca886f2a64f78b09e4f8db2a32 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 22 Aug 2025 09:42:09 +0200
Subject: [PATCH 368/430] Add _t suffix to class not_null_exception

---
 src/flex-write.cpp  | 2 +-
 src/flex-write.hpp  | 6 +++---
 src/output-flex.cpp | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/flex-write.cpp b/src/flex-write.cpp
index 62eab0b81..562d325eb 100644
--- a/src/flex-write.cpp
+++ b/src/flex-write.cpp
@@ -39,7 +39,7 @@ void write_null(db_copy_mgr_t<db_deleter_by_type_and_id_t> *copy_mgr,
                 flex_table_column_t const &column)
 {
     if (column.not_null()) {
-        throw not_null_exception{
+        throw not_null_exception_t{
             fmt::format("Can not add NULL to column '{}' declared NOT NULL.",
                         column.name()),
             &column};
diff --git a/src/flex-write.hpp b/src/flex-write.hpp
index dccf9f3f7..8c23d8b5e 100644
--- a/src/flex-write.hpp
+++ b/src/flex-write.hpp
@@ -20,10 +20,10 @@
 
 class expire_tiles_t;
 
-class not_null_exception : public std::runtime_error
+class not_null_exception_t : public std::runtime_error
 {
 public:
-    not_null_exception(std::string const &message,
+    not_null_exception_t(std::string const &message,
                        flex_table_column_t const *column)
     : std::runtime_error(message), m_column(column)
     {}
@@ -32,7 +32,7 @@ class not_null_exception : public std::runtime_error
 
 private:
     flex_table_column_t const *m_column;
-}; // class not_null_exception
+}; // class not_null_exception_t
 
 void flex_write_column(lua_State *lua_state,
                        db_copy_mgr_t<db_deleter_by_type_and_id_t> *copy_mgr,
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 13ab98d1a..4da3b59f6 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -778,7 +778,7 @@ int output_flex_t::table_insert()
             }
         }
         table_connection.increment_insert_counter();
-    } catch (not_null_exception const &e) {
+    } catch (not_null_exception_t const &e) {
         copy_mgr->rollback_line();
         lua_pushboolean(lua_state(), false);
         lua_pushliteral(lua_state(), "null value in not null column.");

From dfa0df3d364a4416f039f80402c9bccd64e59e13 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 22 Aug 2025 10:01:48 +0200
Subject: [PATCH 369/430] Add _t suffix to class node_persistent_cache

---
 src/middle-pgsql.cpp            |  4 ++--
 src/middle-pgsql.hpp            |  8 ++++----
 src/middle-ram.cpp              |  2 +-
 src/middle-ram.hpp              |  4 ++--
 src/node-persistent-cache.cpp   | 11 ++++++-----
 src/node-persistent-cache.hpp   | 19 ++++++++++---------
 tests/test-persistent-cache.cpp | 14 +++++++-------
 7 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index b1cbbb0b5..d03f9325c 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -987,7 +987,7 @@ void middle_pgsql_t::after_relations()
 middle_query_pgsql_t::middle_query_pgsql_t(
     connection_params_t const &connection_params,
     std::shared_ptr<node_locations_t> cache,
-    std::shared_ptr<node_persistent_cache> persistent_cache,
+    std::shared_ptr<node_persistent_cache_t> persistent_cache,
     middle_pgsql_options const &options)
 : m_db_connection(connection_params, "middle.query"), m_cache(std::move(cache)),
   m_persistent_cache(std::move(persistent_cache)), m_store_options(options)
@@ -1249,7 +1249,7 @@ middle_pgsql_t::middle_pgsql_t(std::shared_ptr<thread_pool_t> thread_pool,
         m_store_options.untagged_nodes = true;
     } else {
         m_store_options.use_flat_node_file = true;
-        m_persistent_cache = std::make_shared<node_persistent_cache>(
+        m_persistent_cache = std::make_shared<node_persistent_cache_t>(
             options->flat_node_file, !options->append, options->droptemp);
     }
 
diff --git a/src/middle-pgsql.hpp b/src/middle-pgsql.hpp
index 2ef73c887..5e6dd0afb 100644
--- a/src/middle-pgsql.hpp
+++ b/src/middle-pgsql.hpp
@@ -30,7 +30,7 @@
 #include "pgsql.hpp"
 
 class node_locations_t;
-class node_persistent_cache;
+class node_persistent_cache_t;
 
 struct middle_pgsql_options
 {
@@ -53,7 +53,7 @@ class middle_query_pgsql_t : public middle_query_t
     middle_query_pgsql_t(
         connection_params_t const &connection_params,
         std::shared_ptr<node_locations_t> cache,
-        std::shared_ptr<node_persistent_cache> persistent_cache,
+        std::shared_ptr<node_persistent_cache_t> persistent_cache,
         middle_pgsql_options const &options);
 
     osmium::Location get_node_location(osmid_t id) const override;
@@ -81,7 +81,7 @@ class middle_query_pgsql_t : public middle_query_t
 
     pg_conn_t m_db_connection;
     std::shared_ptr<node_locations_t> m_cache;
-    std::shared_ptr<node_persistent_cache> m_persistent_cache;
+    std::shared_ptr<node_persistent_cache_t> m_persistent_cache;
 
     middle_pgsql_options m_store_options;
 };
@@ -185,7 +185,7 @@ struct middle_pgsql_t : public middle_t
     options_t const *m_options;
 
     std::shared_ptr<node_locations_t> m_cache;
-    std::shared_ptr<node_persistent_cache> m_persistent_cache;
+    std::shared_ptr<node_persistent_cache_t> m_persistent_cache;
 
     pg_conn_t m_db_connection;
 
diff --git a/src/middle-ram.cpp b/src/middle-ram.cpp
index 54c87bc23..de1af0107 100644
--- a/src/middle-ram.cpp
+++ b/src/middle-ram.cpp
@@ -79,7 +79,7 @@ middle_ram_t::middle_ram_t(std::shared_ptr<thread_pool_t> thread_pool,
     }
 
     if (!options->flat_node_file.empty()) {
-        m_persistent_cache = std::make_shared<node_persistent_cache>(
+        m_persistent_cache = std::make_shared<node_persistent_cache_t>(
             options->flat_node_file, !options->append, options->droptemp);
     }
 }
diff --git a/src/middle-ram.hpp b/src/middle-ram.hpp
index 488eb60e5..e7355f836 100644
--- a/src/middle-ram.hpp
+++ b/src/middle-ram.hpp
@@ -25,7 +25,7 @@
 #include <string>
 #include <utility>
 
-class node_persistent_cache;
+class node_persistent_cache_t;
 class thread_pool_t;
 
 /**
@@ -130,7 +130,7 @@ class middle_ram_t : public middle_t, public middle_query_t
     middle_ram_options m_store_options;
 
     /// File cache
-    std::shared_ptr<node_persistent_cache> m_persistent_cache;
+    std::shared_ptr<node_persistent_cache_t> m_persistent_cache;
 
 }; // class middle_ram_t
 
diff --git a/src/node-persistent-cache.cpp b/src/node-persistent-cache.cpp
index 5b918b54e..9b1b3a824 100644
--- a/src/node-persistent-cache.cpp
+++ b/src/node-persistent-cache.cpp
@@ -17,19 +17,20 @@
 #include <system_error>
 #include <utility>
 
-void node_persistent_cache::set(osmid_t id, osmium::Location location)
+void node_persistent_cache_t::set(osmid_t id, osmium::Location location)
 {
     m_index->set(static_cast<osmium::unsigned_object_id_type>(id), location);
 }
 
-osmium::Location node_persistent_cache::get(osmid_t id) const noexcept
+osmium::Location node_persistent_cache_t::get(osmid_t id) const noexcept
 {
     return m_index->get_noexcept(
         static_cast<osmium::unsigned_object_id_type>(id));
 }
 
-node_persistent_cache::node_persistent_cache(std::string file_name,
-                                             bool create_file, bool remove_file)
+node_persistent_cache_t::node_persistent_cache_t(std::string file_name,
+                                                 bool create_file,
+                                                 bool remove_file)
 : m_file_name(std::move(file_name)), m_remove_file(remove_file)
 {
     assert(!m_file_name.empty());
@@ -65,7 +66,7 @@ node_persistent_cache::node_persistent_cache(std::string file_name,
     }
 }
 
-node_persistent_cache::~node_persistent_cache() noexcept
+node_persistent_cache_t::~node_persistent_cache_t() noexcept
 {
     m_index.reset();
     if (m_fd >= 0) {
diff --git a/src/node-persistent-cache.hpp b/src/node-persistent-cache.hpp
index 936771723..4ebe25ebf 100644
--- a/src/node-persistent-cache.hpp
+++ b/src/node-persistent-cache.hpp
@@ -18,18 +18,19 @@
 
 #include "osmtypes.hpp"
 
-class node_persistent_cache
+class node_persistent_cache_t
 {
 public:
-    node_persistent_cache(std::string file_name, bool create_file,
-                          bool remove_file);
-    ~node_persistent_cache() noexcept;
+    node_persistent_cache_t(std::string file_name, bool create_file,
+                            bool remove_file);
+    ~node_persistent_cache_t() noexcept;
 
-    node_persistent_cache(node_persistent_cache const &) = delete;
-    node_persistent_cache &operator=(node_persistent_cache const &) = delete;
+    node_persistent_cache_t(node_persistent_cache_t const &) = delete;
+    node_persistent_cache_t &
+    operator=(node_persistent_cache_t const &) = delete;
 
-    node_persistent_cache(node_persistent_cache &&) = delete;
-    node_persistent_cache &operator=(node_persistent_cache &&) = delete;
+    node_persistent_cache_t(node_persistent_cache_t &&) = delete;
+    node_persistent_cache_t &operator=(node_persistent_cache_t &&) = delete;
 
     void set(osmid_t id, osmium::Location location);
     osmium::Location get(osmid_t id) const noexcept;
@@ -49,6 +50,6 @@ class node_persistent_cache
     int m_fd = -1;
     std::unique_ptr<index_t> m_index;
     bool m_remove_file;
-};
+}; // class node_persistent_cache_t
 
 #endif // OSM2PGSQL_NODE_PERSISTENT_CACHE_HPP
diff --git a/tests/test-persistent-cache.cpp b/tests/test-persistent-cache.cpp
index 4cdccdd9d..a250511fc 100644
--- a/tests/test-persistent-cache.cpp
+++ b/tests/test-persistent-cache.cpp
@@ -15,20 +15,20 @@
 
 namespace {
 
-void write_and_read_location(node_persistent_cache *cache, osmid_t id, double x,
-                             double y)
+void write_and_read_location(node_persistent_cache_t *cache, osmid_t id,
+                             double x, double y)
 {
     cache->set(id, osmium::Location{x, y});
     REQUIRE(osmium::Location(x, y) == cache->get(id));
 }
 
-void read_location(node_persistent_cache const &cache, osmid_t id, double x,
+void read_location(node_persistent_cache_t const &cache, osmid_t id, double x,
                    double y)
 {
     REQUIRE(osmium::Location(x, y) == cache.get(id));
 }
 
-void delete_location(node_persistent_cache *cache, osmid_t id)
+void delete_location(node_persistent_cache_t *cache, osmid_t id)
 {
     cache->set(id, osmium::Location{});
     REQUIRE(osmium::Location{} == cache->get(id));
@@ -43,7 +43,7 @@ TEST_CASE("Persistent cache", "[NoDB]")
 
     // create a new cache
     {
-        node_persistent_cache cache{flat_node_file, true, false};
+        node_persistent_cache_t cache{flat_node_file, true, false};
 
         // write in order
         write_and_read_location(&cache, 10, 10.01, -45.3);
@@ -66,7 +66,7 @@ TEST_CASE("Persistent cache", "[NoDB]")
 
     // reopen the cache
     {
-        node_persistent_cache cache{flat_node_file, false, false};
+        node_persistent_cache_t cache{flat_node_file, false, false};
 
         // read all previously written locations
         read_location(cache, 10, 10.01, -45.3);
@@ -115,5 +115,5 @@ TEST_CASE("Opening non-existent persistent cache should fail in append mode",
         "test_middle_flat.nonexistent.flat.nodes.bin";
     testing::cleanup::file_t const flatnode_cleaner{flat_node_file};
 
-    REQUIRE_THROWS(node_persistent_cache(flat_node_file, false, false));
+    REQUIRE_THROWS(node_persistent_cache_t(flat_node_file, false, false));
 }

From c953857c4b79b1cf9e65c2adb294622d9d500546 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 22 Aug 2025 10:04:29 +0200
Subject: [PATCH 370/430] Add _t suffix to class table_desc

---
 src/middle-pgsql.cpp | 14 +++++++-------
 src/middle-pgsql.hpp |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index d03f9325c..0a7204b55 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -73,8 +73,8 @@ void load_id_list(pg_conn_t const &db_connection, std::string const &table,
 
 } // anonymous namespace
 
-middle_pgsql_t::table_desc::table_desc(options_t const &options,
-                                       std::string_view name)
+middle_pgsql_t::table_desc_t::table_desc_t(options_t const &options,
+                                           std::string_view name)
 : m_copy_target(std::make_shared<db_target_descr_t>(
       options.middle_dbschema, fmt::format("{}_{}", options.prefix, name),
       "id"))
@@ -99,7 +99,7 @@ void middle_query_pgsql_t::prepare(std::string const &stmt,
     m_db_connection.prepare(stmt, fmt::runtime(sql_cmd));
 }
 
-void middle_pgsql_t::table_desc::drop_table(
+void middle_pgsql_t::table_desc_t::drop_table(
     pg_conn_t const &db_connection) const
 {
     util::timer_t timer;
@@ -110,7 +110,7 @@ void middle_pgsql_t::table_desc::drop_table(
              util::human_readable_duration(timer.stop()));
 }
 
-void middle_pgsql_t::table_desc::init_max_id(pg_conn_t const &db_connection)
+void middle_pgsql_t::table_desc_t::init_max_id(pg_conn_t const &db_connection)
 {
     auto const qual_name = qualified_name(schema(), name());
     auto const res = db_connection.exec("SELECT max(id) FROM {}", qual_name);
@@ -1257,9 +1257,9 @@ middle_pgsql_t::middle_pgsql_t(std::shared_ptr<thread_pool_t> thread_pool,
 
     init_params(&m_params, *options);
 
-    m_tables.nodes() = table_desc{*options, "nodes"};
-    m_tables.ways() = table_desc{*options, "ways"};
-    m_tables.relations() = table_desc{*options, "rels"};
+    m_tables.nodes() = table_desc_t{*options, "nodes"};
+    m_tables.ways() = table_desc_t{*options, "ways"};
+    m_tables.relations() = table_desc_t{*options, "rels"};
 }
 
 void middle_pgsql_t::set_requirements(
diff --git a/src/middle-pgsql.hpp b/src/middle-pgsql.hpp
index 5e6dd0afb..b8ff8e863 100644
--- a/src/middle-pgsql.hpp
+++ b/src/middle-pgsql.hpp
@@ -110,11 +110,11 @@ struct middle_pgsql_t : public middle_t
     void get_way_parents(idlist_t const &changed_ways,
                          idlist_t *parent_relations) const override;
 
-    class table_desc
+    class table_desc_t
     {
     public:
-        table_desc() = default;
-        table_desc(options_t const &options, std::string_view name);
+        table_desc_t() = default;
+        table_desc_t(options_t const &options, std::string_view name);
 
         std::string const &schema() const noexcept
         {
@@ -180,7 +180,7 @@ struct middle_pgsql_t : public middle_t
     void build_relation_member_indexes();
 
     std::map<osmium::user_id_type, std::string> m_users;
-    osmium::nwr_array<table_desc> m_tables;
+    osmium::nwr_array<table_desc_t> m_tables;
 
     options_t const *m_options;
 

From 945a800964743135625c3d9ca81cbfc20d1318b9 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 22 Aug 2025 11:02:02 +0200
Subject: [PATCH 371/430] Add _t suffix to lua_wrapper_base class

---
 src/flex-lua-expire-output.hpp | 4 ++--
 src/flex-lua-locator.hpp       | 4 ++--
 src/flex-lua-table.hpp         | 4 ++--
 src/flex-lua-wrapper.hpp       | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/flex-lua-expire-output.hpp b/src/flex-lua-expire-output.hpp
index dcdc4be4a..1294d4096 100644
--- a/src/flex-lua-expire-output.hpp
+++ b/src/flex-lua-expire-output.hpp
@@ -25,14 +25,14 @@ int setup_flex_expire_output(lua_State *lua_state,
                              std::string const &default_schema,
                              std::vector<expire_output_t> *expire_outputs);
 
-class lua_wrapper_expire_output : public lua_wrapper_base<expire_output_t>
+class lua_wrapper_expire_output : public lua_wrapper_base_t<expire_output_t>
 {
 public:
     static void init(lua_State *lua_state);
 
     lua_wrapper_expire_output(lua_State *lua_state,
                               expire_output_t *expire_output)
-    : lua_wrapper_base(lua_state, expire_output)
+    : lua_wrapper_base_t(lua_state, expire_output)
     {
     }
 
diff --git a/src/flex-lua-locator.hpp b/src/flex-lua-locator.hpp
index 186256780..0af2b0a5c 100644
--- a/src/flex-lua-locator.hpp
+++ b/src/flex-lua-locator.hpp
@@ -27,14 +27,14 @@ static char const *const OSM2PGSQL_LOCATOR_CLASS = "osm2pgsql.Locator";
 
 int setup_flex_locator(lua_State *lua_state, std::vector<locator_t> *locators);
 
-class lua_wrapper_locator : public lua_wrapper_base<locator_t>
+class lua_wrapper_locator : public lua_wrapper_base_t<locator_t>
 {
 public:
     static void init(lua_State *lua_state,
                      connection_params_t const &connection_params);
 
     lua_wrapper_locator(lua_State *lua_state, locator_t *locator)
-    : lua_wrapper_base(lua_state, locator)
+    : lua_wrapper_base_t(lua_state, locator)
     {
     }
 
diff --git a/src/flex-lua-table.hpp b/src/flex-lua-table.hpp
index 9bda81830..a02a399a6 100644
--- a/src/flex-lua-table.hpp
+++ b/src/flex-lua-table.hpp
@@ -26,13 +26,13 @@ int setup_flex_table(lua_State *lua_state, std::vector<flex_table_t> *tables,
                      std::string const &default_schema, bool updatable,
                      bool append_mode);
 
-class lua_wrapper_table : public lua_wrapper_base<flex_table_t>
+class lua_wrapper_table : public lua_wrapper_base_t<flex_table_t>
 {
 public:
     static void init(lua_State *lua_state);
 
     lua_wrapper_table(lua_State *lua_state, flex_table_t *table)
-    : lua_wrapper_base(lua_state, table)
+    : lua_wrapper_base_t(lua_state, table)
     {
     }
 
diff --git a/src/flex-lua-wrapper.hpp b/src/flex-lua-wrapper.hpp
index 0b63fd704..ded9c5601 100644
--- a/src/flex-lua-wrapper.hpp
+++ b/src/flex-lua-wrapper.hpp
@@ -39,10 +39,10 @@ struct lua_State;
  * Helper class for wrapping C++ classes in Lua "classes".
  */
 template <typename WRAPPED>
-class lua_wrapper_base
+class lua_wrapper_base_t
 {
 public:
-    lua_wrapper_base(lua_State *lua_state, WRAPPED *wrapped)
+    lua_wrapper_base_t(lua_State *lua_state, WRAPPED *wrapped)
     : m_lua_state(lua_state), m_self(wrapped)
     {
         assert(lua_state);
@@ -59,6 +59,6 @@ class lua_wrapper_base
     lua_State *m_lua_state;
     WRAPPED *m_self;
 
-}; // class lua_wrapper_base;
+}; // class lua_wrapper_base_t
 
 #endif // OSM2PGSQL_FLEX_LUA_WRAPPER_HPP

From 0168cab2e5334f9c576ad58884798696a6d6fe84 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 22 Aug 2025 09:35:09 +0200
Subject: [PATCH 372/430] A grab-bag of fixes for clang-tidy issues in test
 headers

---
 tests/common-cleanup.hpp |  9 ++++++---
 tests/common-options.hpp |  2 ++
 tests/common-pg.hpp      | 37 ++++++++++++++++++++-----------------
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/tests/common-cleanup.hpp b/tests/common-cleanup.hpp
index 46a1dbe5d..2fc870714 100644
--- a/tests/common-cleanup.hpp
+++ b/tests/common-cleanup.hpp
@@ -26,9 +26,8 @@ namespace testing::cleanup {
 class file_t
 {
 public:
-    explicit file_t(std::string const &filename,
-                    bool remove_on_construct = true)
-    : m_filename(filename)
+    explicit file_t(std::string filename, bool remove_on_construct = true)
+    : m_filename(std::move(filename))
     {
         if (remove_on_construct) {
             delete_file(false);
@@ -38,6 +37,10 @@ class file_t
     ~file_t() noexcept { delete_file(true); }
 
 private:
+    // This function is run from a destructor so must be noexcept. If an
+    // exception does occur the program is terminated and we are fine with
+    // that, it is test code after all.
+    // NOLINTNEXTLINE(bugprone-exception-escape)
     void delete_file(bool warn) const noexcept
     {
         if (m_filename.empty()) {
diff --git a/tests/common-options.hpp b/tests/common-options.hpp
index 58adb8ea2..bbd45c66b 100644
--- a/tests/common-options.hpp
+++ b/tests/common-options.hpp
@@ -33,6 +33,8 @@ class opt_t
         m_opt.output_dbschema = "public";
     }
 
+    // Implicit conversion is intended here for ease of use in lots of tests.
+    // NOLINTNEXTLINE(google-explicit-constructor,hicpp-explicit-conversions)
     operator options_t() const { return m_opt; }
 
     opt_t &slim()
diff --git a/tests/common-pg.hpp b/tests/common-pg.hpp
index d48628499..5189494e8 100644
--- a/tests/common-pg.hpp
+++ b/tests/common-pg.hpp
@@ -122,7 +122,7 @@ class tempdb_t
                        "Test database cannot be created: {}\n"
                        "Did you mean to run 'pg_virtualenv ctest'?\n",
                        e.what());
-            std::exit(1);
+            std::exit(1); // NOLINT(concurrency-mt-unsafe)
         }
     }
 
@@ -134,22 +134,25 @@ class tempdb_t
 
     ~tempdb_t() noexcept
     {
-        if (!m_db_name.empty()) {
-            // Disable removal of the test database by setting the environment
-            // variable OSM2PGSQL_KEEP_TEST_DB to anything. This can be useful
-            // when debugging tests.
-            char const *const keep_db = std::getenv("OSM2PGSQL_KEEP_TEST_DB");
-            if (keep_db != nullptr) {
-                return;
-            }
-            try {
-                connection_params_t connection_params;
-                connection_params.set("dbname", "postgres");
-                conn_t const conn{connection_params};
-                conn.exec(R"(DROP DATABASE IF EXISTS "{}")", m_db_name);
-            } catch (...) {
-                fprintf(stderr, "DROP DATABASE failed. Ignored.\n");
-            }
+        if (m_db_name.empty()) {
+            return;
+        }
+
+        // Disable removal of the test database by setting the environment
+        // variable OSM2PGSQL_KEEP_TEST_DB to anything. This can be useful
+        // when debugging tests.
+        // NOLINTNEXTLINE(concurrency-mt-unsafe)
+        char const *const keep_db = std::getenv("OSM2PGSQL_KEEP_TEST_DB");
+        if (keep_db != nullptr) {
+            return;
+        }
+        try {
+            connection_params_t connection_params;
+            connection_params.set("dbname", "postgres");
+            conn_t const conn{connection_params};
+            conn.exec(R"(DROP DATABASE IF EXISTS "{}")", m_db_name);
+        } catch (...) {
+            fmt::print(stderr, "DROP DATABASE failed. Ignored.\n");
         }
     }
 

From 010c71705fe0d89c0dad0eba26cfe24ada205481 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 22 Aug 2025 11:23:13 +0200
Subject: [PATCH 373/430] Add _t suffix to all lua_wrapper_* classes

---
 src/flex-lua-expire-output.cpp | 14 +++++++-------
 src/flex-lua-expire-output.hpp |  8 ++++----
 src/flex-lua-locator.cpp       | 18 +++++++++---------
 src/flex-lua-locator.hpp       |  6 +++---
 src/flex-lua-table.cpp         | 12 ++++++------
 src/flex-lua-table.hpp         |  6 +++---
 src/flex-lua-wrapper.hpp       |  2 +-
 src/output-flex.cpp            |  6 +++---
 8 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/flex-lua-expire-output.cpp b/src/flex-lua-expire-output.cpp
index 49d8d876c..00195f1e2 100644
--- a/src/flex-lua-expire-output.cpp
+++ b/src/flex-lua-expire-output.cpp
@@ -97,7 +97,7 @@ int setup_flex_expire_output(lua_State *lua_state,
 /**
  * Define the osm2pgsql.ExpireOutput class/metatable.
  */
-void lua_wrapper_expire_output::init(lua_State *lua_state)
+void lua_wrapper_expire_output_t::init(lua_State *lua_state)
 {
     luaX_set_up_metatable(
         lua_state, "ExpireOutput", OSM2PGSQL_EXPIRE_OUTPUT_CLASS,
@@ -109,7 +109,7 @@ void lua_wrapper_expire_output::init(lua_State *lua_state)
          {"table", lua_trampoline_expire_output_table}});
 }
 
-int lua_wrapper_expire_output::tostring() const
+int lua_wrapper_expire_output_t::tostring() const
 {
     std::string const str =
         fmt::format("osm2pgsql.ExpireOutput[minzoom={},maxzoom={},filename={},"
@@ -121,31 +121,31 @@ int lua_wrapper_expire_output::tostring() const
     return 1;
 }
 
-int lua_wrapper_expire_output::filename() const noexcept
+int lua_wrapper_expire_output_t::filename() const noexcept
 {
     luaX_pushstring(lua_state(), self().filename());
     return 1;
 }
 
-int lua_wrapper_expire_output::maxzoom() const noexcept
+int lua_wrapper_expire_output_t::maxzoom() const noexcept
 {
     lua_pushinteger(lua_state(), self().maxzoom());
     return 1;
 }
 
-int lua_wrapper_expire_output::minzoom() const noexcept
+int lua_wrapper_expire_output_t::minzoom() const noexcept
 {
     lua_pushinteger(lua_state(), self().minzoom());
     return 1;
 }
 
-int lua_wrapper_expire_output::schema() const noexcept
+int lua_wrapper_expire_output_t::schema() const noexcept
 {
     luaX_pushstring(lua_state(), self().schema());
     return 1;
 }
 
-int lua_wrapper_expire_output::table() const noexcept
+int lua_wrapper_expire_output_t::table() const noexcept
 {
     luaX_pushstring(lua_state(), self().table());
     return 1;
diff --git a/src/flex-lua-expire-output.hpp b/src/flex-lua-expire-output.hpp
index 1294d4096..9c37f0450 100644
--- a/src/flex-lua-expire-output.hpp
+++ b/src/flex-lua-expire-output.hpp
@@ -25,13 +25,13 @@ int setup_flex_expire_output(lua_State *lua_state,
                              std::string const &default_schema,
                              std::vector<expire_output_t> *expire_outputs);
 
-class lua_wrapper_expire_output : public lua_wrapper_base_t<expire_output_t>
+class lua_wrapper_expire_output_t : public lua_wrapper_base_t<expire_output_t>
 {
 public:
     static void init(lua_State *lua_state);
 
-    lua_wrapper_expire_output(lua_State *lua_state,
-                              expire_output_t *expire_output)
+    lua_wrapper_expire_output_t(lua_State *lua_state,
+                                expire_output_t *expire_output)
     : lua_wrapper_base_t(lua_state, expire_output)
     {
     }
@@ -43,6 +43,6 @@ class lua_wrapper_expire_output : public lua_wrapper_base_t<expire_output_t>
     int schema() const noexcept;
     int table() const noexcept;
 
-}; // class lua_wrapper_expire_output
+}; // class lua_wrapper_expire_output_t
 
 #endif // OSM2PGSQL_FLEX_LUA_EXPIRE_OUTPUT_HPP
diff --git a/src/flex-lua-locator.cpp b/src/flex-lua-locator.cpp
index 150457661..8cac5e1ad 100644
--- a/src/flex-lua-locator.cpp
+++ b/src/flex-lua-locator.cpp
@@ -45,7 +45,7 @@ TRAMPOLINE_WRAPPED_OBJECT(locator, first_intersecting)
 
 } // anonymous namespace
 
-connection_params_t lua_wrapper_locator::s_connection_params;
+connection_params_t lua_wrapper_locator_t::s_connection_params;
 
 int setup_flex_locator(lua_State *lua_state, std::vector<locator_t> *locators)
 {
@@ -65,8 +65,8 @@ int setup_flex_locator(lua_State *lua_state, std::vector<locator_t> *locators)
     return 1;
 }
 
-void lua_wrapper_locator::init(lua_State *lua_state,
-                               connection_params_t const &connection_params)
+void lua_wrapper_locator_t::init(lua_State *lua_state,
+                                 connection_params_t const &connection_params)
 {
     s_connection_params = connection_params;
 
@@ -80,7 +80,7 @@ void lua_wrapper_locator::init(lua_State *lua_state,
          {"first_intersecting", lua_trampoline_locator_first_intersecting}});
 }
 
-int lua_wrapper_locator::tostring() const
+int lua_wrapper_locator_t::tostring() const
 {
     std::string const str{fmt::format("osm2pgsql.Locator[name={},size={}]",
                                       self().name(), self().size())};
@@ -88,13 +88,13 @@ int lua_wrapper_locator::tostring() const
     return 1;
 }
 
-int lua_wrapper_locator::name() const noexcept
+int lua_wrapper_locator_t::name() const noexcept
 {
     luaX_pushstring(lua_state(), self().name());
     return 1;
 }
 
-int lua_wrapper_locator::add_bbox()
+int lua_wrapper_locator_t::add_bbox()
 {
     if (lua_gettop(lua_state()) < 5) {
         throw fmt_error("Need locator, name and 4 coordinates as arguments");
@@ -111,7 +111,7 @@ int lua_wrapper_locator::add_bbox()
     return 0;
 }
 
-int lua_wrapper_locator::add_from_db()
+int lua_wrapper_locator_t::add_from_db()
 {
     if (lua_gettop(lua_state()) < 1) {
         throw fmt_error("Need locator and SQL query arguments");
@@ -125,7 +125,7 @@ int lua_wrapper_locator::add_from_db()
     return 0;
 }
 
-int lua_wrapper_locator::all_intersecting()
+int lua_wrapper_locator_t::all_intersecting()
 {
     if (lua_gettop(lua_state()) < 1) {
         throw fmt_error("Need locator and geometry arguments");
@@ -149,7 +149,7 @@ int lua_wrapper_locator::all_intersecting()
     return 1;
 }
 
-int lua_wrapper_locator::first_intersecting()
+int lua_wrapper_locator_t::first_intersecting()
 {
     if (lua_gettop(lua_state()) < 1) {
         throw fmt_error("Need locator and geometry arguments");
diff --git a/src/flex-lua-locator.hpp b/src/flex-lua-locator.hpp
index 0af2b0a5c..6df0a4ad5 100644
--- a/src/flex-lua-locator.hpp
+++ b/src/flex-lua-locator.hpp
@@ -27,13 +27,13 @@ static char const *const OSM2PGSQL_LOCATOR_CLASS = "osm2pgsql.Locator";
 
 int setup_flex_locator(lua_State *lua_state, std::vector<locator_t> *locators);
 
-class lua_wrapper_locator : public lua_wrapper_base_t<locator_t>
+class lua_wrapper_locator_t : public lua_wrapper_base_t<locator_t>
 {
 public:
     static void init(lua_State *lua_state,
                      connection_params_t const &connection_params);
 
-    lua_wrapper_locator(lua_State *lua_state, locator_t *locator)
+    lua_wrapper_locator_t(lua_State *lua_state, locator_t *locator)
     : lua_wrapper_base_t(lua_state, locator)
     {
     }
@@ -48,6 +48,6 @@ class lua_wrapper_locator : public lua_wrapper_base_t<locator_t>
 private:
     static connection_params_t s_connection_params;
 
-}; // class lua_wrapper_locator
+}; // class lua_wrapper_locator_t
 
 #endif // OSM2PGSQL_FLEX_LUA_LOCATOR_HPP
diff --git a/src/flex-lua-table.cpp b/src/flex-lua-table.cpp
index 72978ecc5..ccf7cf1b4 100644
--- a/src/flex-lua-table.cpp
+++ b/src/flex-lua-table.cpp
@@ -454,7 +454,7 @@ int setup_flex_table(lua_State *lua_state, std::vector<flex_table_t> *tables,
 /**
  * Define the osm2pgsql.Table class/metatable.
  */
-void lua_wrapper_table::init(lua_State *lua_state)
+void lua_wrapper_table_t::init(lua_State *lua_state)
 {
     luaX_set_up_metatable(lua_state, "Table", OSM2PGSQL_TABLE_CLASS,
                           {{"__tostring", lua_trampoline_table_tostring},
@@ -465,7 +465,7 @@ void lua_wrapper_table::init(lua_State *lua_state)
                            {"columns", lua_trampoline_table_columns}});
 }
 
-int lua_wrapper_table::tostring() const
+int lua_wrapper_table_t::tostring() const
 {
     std::string const str{fmt::format("osm2pgsql.Table[{}]", self().name())};
     luaX_pushstring(lua_state(), str);
@@ -473,13 +473,13 @@ int lua_wrapper_table::tostring() const
     return 1;
 }
 
-int lua_wrapper_table::cluster() const noexcept
+int lua_wrapper_table_t::cluster() const noexcept
 {
     lua_pushboolean(lua_state(), self().cluster_by_geom());
     return 1;
 }
 
-int lua_wrapper_table::columns() const
+int lua_wrapper_table_t::columns() const
 {
     lua_createtable(lua_state(), (int)self().num_columns(), 0);
 
@@ -502,13 +502,13 @@ int lua_wrapper_table::columns() const
     return 1;
 }
 
-int lua_wrapper_table::name() const noexcept
+int lua_wrapper_table_t::name() const noexcept
 {
     luaX_pushstring(lua_state(), self().name());
     return 1;
 }
 
-int lua_wrapper_table::schema() const noexcept
+int lua_wrapper_table_t::schema() const noexcept
 {
     luaX_pushstring(lua_state(), self().schema());
     return 1;
diff --git a/src/flex-lua-table.hpp b/src/flex-lua-table.hpp
index a02a399a6..326633318 100644
--- a/src/flex-lua-table.hpp
+++ b/src/flex-lua-table.hpp
@@ -26,12 +26,12 @@ int setup_flex_table(lua_State *lua_state, std::vector<flex_table_t> *tables,
                      std::string const &default_schema, bool updatable,
                      bool append_mode);
 
-class lua_wrapper_table : public lua_wrapper_base_t<flex_table_t>
+class lua_wrapper_table_t : public lua_wrapper_base_t<flex_table_t>
 {
 public:
     static void init(lua_State *lua_state);
 
-    lua_wrapper_table(lua_State *lua_state, flex_table_t *table)
+    lua_wrapper_table_t(lua_State *lua_state, flex_table_t *table)
     : lua_wrapper_base_t(lua_state, table)
     {
     }
@@ -42,6 +42,6 @@ class lua_wrapper_table : public lua_wrapper_base_t<flex_table_t>
     int name() const noexcept;
     int schema() const noexcept;
 
-}; // class lua_wrapper_table
+}; // class lua_wrapper_table_t
 
 #endif // OSM2PGSQL_FLEX_LUA_TABLE_HPP
diff --git a/src/flex-lua-wrapper.hpp b/src/flex-lua-wrapper.hpp
index ded9c5601..92c529484 100644
--- a/src/flex-lua-wrapper.hpp
+++ b/src/flex-lua-wrapper.hpp
@@ -23,7 +23,7 @@
             auto *flex =                                                       \
                 static_cast<output_flex_t *>(luaX_get_context(lua_state));     \
             auto &obj = flex->get_##obj_name##_from_param();                   \
-            return lua_wrapper_##obj_name{lua_state, &obj}.func_name();        \
+            return lua_wrapper_##obj_name##_t{lua_state, &obj}.func_name();    \
         } catch (std::exception const &e) {                                    \
             return luaL_error(lua_state, "Error in '" #func_name "': %s\n",    \
                               e.what());                                       \
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index f29ff5f15..46b70f13f 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -1306,9 +1306,9 @@ void output_flex_t::init_lua(std::string const &filename,
     luaX_add_table_func(lua_state(), "define_expire_output",
                         lua_trampoline_app_define_expire_output);
 
-    lua_wrapper_expire_output::init(lua_state());
-    lua_wrapper_locator::init(lua_state(), get_options()->connection_params);
-    lua_wrapper_table::init(lua_state());
+    lua_wrapper_expire_output_t::init(lua_state());
+    lua_wrapper_locator_t::init(lua_state(), get_options()->connection_params);
+    lua_wrapper_table_t::init(lua_state());
 
     // Clean up stack
     lua_settop(lua_state(), 0);

From bb6579037835cdac12c53f5d88006a3eb0e62f3f Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 22 Aug 2025 16:00:16 +0200
Subject: [PATCH 374/430] Delete copy/move constructor/assignment operator for
 file_t

They would break the cleanup function of the class destructor.
---
 tests/common-cleanup.hpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/common-cleanup.hpp b/tests/common-cleanup.hpp
index 2fc870714..a480113d5 100644
--- a/tests/common-cleanup.hpp
+++ b/tests/common-cleanup.hpp
@@ -34,6 +34,12 @@ class file_t
         }
     }
 
+    file_t(file_t const &) = delete;
+    file_t &operator=(file_t const &) = delete;
+
+    file_t(file_t &&) = delete;
+    file_t &operator=(file_t const &&) = delete;
+
     ~file_t() noexcept { delete_file(true); }
 
 private:

From ca536909f8873040c916fefd332ad81ef9f7374c Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 22 Aug 2025 17:34:58 +0200
Subject: [PATCH 375/430] Disable another clang-tidy warning

---
 tests/common-pg.hpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/common-pg.hpp b/tests/common-pg.hpp
index 5189494e8..48a352483 100644
--- a/tests/common-pg.hpp
+++ b/tests/common-pg.hpp
@@ -132,6 +132,9 @@ class tempdb_t
     tempdb_t(tempdb_t &&) = delete;
     tempdb_t &operator=(tempdb_t const &&) = delete;
 
+    // We want to terminate the program if there is an exception thrown inside
+    // the destructor.
+    // NOLINTNEXTLINE(bugprone-exception-escape)
     ~tempdb_t() noexcept
     {
         if (m_db_name.empty()) {

From 3bc0f6794eb0a9c260fd366e5fd4936933fdbd7b Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 22 Aug 2025 09:14:58 +0200
Subject: [PATCH 376/430] Also check headers in tests directory in clang-tidy

---
 .clang-tidy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.clang-tidy b/.clang-tidy
index b4e660b85..31c6fedeb 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -88,7 +88,7 @@ Checks: '*,-abseil-*,-altera-*,-android-cloexec-*,-boost-use-ranges,-bugprone-ch
 #    Readability is a matter of opinion here
 #
 #WarningsAsErrors: '*'
-HeaderFilterRegex: '\/src\/'
+HeaderFilterRegex: '\/(src|tests)\/'
 CheckOptions:
     - key: cppcoreguidelines-special-member-functions.AllowSoleDefaultDtor
       value: true

From 069724f10332c4b7eba38a428946c360c0daf229 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 22 Aug 2025 09:15:21 +0200
Subject: [PATCH 377/430] Explicitly tell clang-tidy where the config file is

For some reason clang-tidy will behave differently when run from
different current directories if the config file is not set explicitly.
It is supposed to find the source files to check in the
compile_commands.json file and find the config from there, but
apparently that is not the whole truth!?
---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a5fbadd5..b4039bcf8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -286,6 +286,7 @@ if (CLANG_TIDY)
 
     add_custom_target(clang-tidy
         ${CLANG_TIDY}
+        --config-file ${CMAKE_SOURCE_DIR}/.clang-tidy
         -p ${CMAKE_BINARY_DIR}
         ${CT_CHECK_FILES}
     )

From b57dd1f60bdf2d4201c3cfb3cc33fa122cc61a1d Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 22 Aug 2025 20:41:54 +0200
Subject: [PATCH 378/430] Enable various naming checks in clang-tidy

---
 .clang-tidy | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/.clang-tidy b/.clang-tidy
index 31c6fedeb..12cb5d635 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -106,4 +106,26 @@ CheckOptions:
       value: true
     - key: bugprone-empty-catch.IgnoreCatchWithKeywords
       value: "@todo;@fixme;exception ignored on purpose"
+    - key: readability-identifier-naming.ClassCase
+      value: lower_case
+    - key: readability-identifier-naming.ClassSuffix
+      value: _t
+    - key: readability-identifier-naming.PrivateMemberPrefix
+      value: m_
+    - key: readability-identifier-naming.StructCase
+      value: lower_case
+    - key: readability-identifier-naming.EnumCase
+      value: lower_case
+    - key: readability-identifier-naming.FunctionCase
+      value: lower_case
+    - key: readability-identifier-naming.FunctionIgnoredRegexp
+      value: luaX.*
+    - key: readability-identifier-naming.VariableCase
+      value: lower_case
+    - key: readability-identifier-naming.ConstexprVariableCase
+      value: UPPER_CASE
+    - key: readability-identifier-naming.GlobalConstantCase
+      value: UPPER_CASE
+    - key: readability-identifier-naming.NamespaceCase
+      value: lower_case
 ...

From 947296abd773337a5425a117e54b26be8513b03e Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 19 Aug 2025 16:24:27 +0200
Subject: [PATCH 379/430] Add osm2pgsql-expire command

New osm2pgsql-expire command that helps with debugging/visualizing
expire tiles issues.

The command can be used for two things:

1. To check what tiles some OSM data is in: If an OSM file is specified
   osm2pgsql-expire will calculate the tiles covering the objects in that file.
   Note that the file must not be a change file but a regular OSM data file!
   Output is, by default, a tile file, but GeoJSON is also possible.
2. Visualize tile list: If a tile file (presumably generated by osm2pgsql)
   is specified, a GeoJSON file is generated showing all mentioned tiles. In
   this mode all command line options are ignored.
---
 CMakeLists.txt              |   3 +
 man/CMakeLists.txt          |   8 +
 man/osm2pgsql-expire.1      |  80 +++++++
 man/osm2pgsql-expire.md     |  74 ++++++
 src/command-line-app.cpp    |  64 +++---
 src/command-line-app.hpp    |   6 +-
 src/command-line-parser.cpp |   3 +
 src/expire-output.cpp       |   2 +-
 src/gen/osm2pgsql-gen.cpp   |   2 +
 src/osm2pgsql-expire.cpp    | 439 ++++++++++++++++++++++++++++++++++++
 src/tile.cpp                |  37 +++
 src/tile.hpp                |   8 +
 tests/test-tile.cpp         |  17 ++
 13 files changed, 708 insertions(+), 35 deletions(-)
 create mode 100644 man/osm2pgsql-expire.1
 create mode 100644 man/osm2pgsql-expire.md
 create mode 100644 src/osm2pgsql-expire.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4039bcf8..2d5aaecec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -271,6 +271,9 @@ else()
     target_link_libraries(osm2pgsql-gen osm2pgsql_lib ${LIBS} ${POTRACE_LIBRARY} ${OpenCV_LIBS})
 endif()
 
+add_executable(osm2pgsql-expire src/osm2pgsql-expire.cpp)
+target_link_libraries(osm2pgsql-expire osm2pgsql_lib ${LIBS})
+
 #############################################################
 # Optional "clang-tidy" target
 #############################################################
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
index 94171469d..8f2356e49 100644
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -26,6 +26,14 @@ if(PANDOC)
 
     list(APPEND MANPAGE_TARGETS osm2pgsql.1)
 
+    add_custom_command(OUTPUT osm2pgsql-expire.1
+        COMMAND ${PANDOC} ${PANDOC_MAN_OPTIONS} -o osm2pgsql-expire.1
+            ${CMAKE_CURRENT_SOURCE_DIR}/osm2pgsql-expire.md
+        DEPENDS osm2pgsql-expire.md manpage.template
+        COMMENT "Building manpage osm2pgsql-expire.1"
+        VERBATIM)
+    list(APPEND MANPAGE_TARGETS osm2pgsql-expire.1)
+
     if(BUILD_GEN)
         add_custom_command(OUTPUT osm2pgsql-gen.1
             COMMAND ${PANDOC} ${PANDOC_MAN_OPTIONS} -o osm2pgsql-gen.1
diff --git a/man/osm2pgsql-expire.1 b/man/osm2pgsql-expire.1
new file mode 100644
index 000000000..1dead2206
--- /dev/null
+++ b/man/osm2pgsql-expire.1
@@ -0,0 +1,80 @@
+.TH "OSM2PGSQL" "1" "2.1.1" "" ""
+.SH NAME
+.PP
+osm2pgsql-expire - Visualize expire output
+.SH SYNOPSIS
+.PP
+\f[B]osm2pgsql-expire\f[R] [\f[I]OPTIONS\f[R]] \f[I]OSM-FILE\f[R] (1)
+\f[B]osm2pgsql-expire\f[R] \f[I]TILES-FILE\f[R] (2)
+.SH DESCRIPTION
+.PP
+\f[B]This command is currently experimental.\f[R]
+.PP
+The expire command can be used for two things:
+.IP "1." 3
+\f[B]To check what tiles some OSM data is in.\f[R] If an
+\f[I]OSM-FILE\f[R] is specified osm2pgsql-expire will calculate the
+tiles covering the objects in that file.
+Note that the file must not be a change file but a regular OSM data
+file!
+Output is, by default, a tile file, but GeoJSON is also possible.
+.IP "2." 3
+\f[B]Visualize tile list.\f[R] If a \f[I]TILE-FILE\f[R] (presumably
+generated by osm2pgsql) is specified, a GeoJSON file is generated
+showing all mentioned tiles.
+In this mode all command line options are ignored.
+.PP
+Read the \f[I]Expire\f[R] chapter of the osm2pgsql manual
+(https://osm2pgsql.org/doc/manual.html#expire) for details on how to
+interpret the \f[V]-m, \[rs]--mode\f[R] and
+\f[V]\[rs]--full-area-limit\f[R] options.
+.SH OPTIONS
+.PP
+This program follows the usual GNU command line syntax, with long
+options starting with two dashes (\f[V]--\f[R]).
+Mandatory arguments to long options are mandatory for short options too.
+.SH MAIN OPTIONS
+.TP
+-b, --buffer=VALUE
+Set buffer size around geometry relative to tile size.
+Example: Set to 0.1 for a buffer that\[cq]s 10% of the tile size.
+.TP
+-f, --format=FORMAT
+Output format.
+Options are `tiles' (default) or `geojson'.
+The GeoJSON output uses the Web Mercator projection (EPSG:3857) which is
+supported by many programs although, strictly speaking, it is not
+allowed by the GeoJSON spec.
+.TP
+--full-area-limit=VALUE
+Set full area limit.
+.TP
+-m, --mode=MODE
+Set expire mode.
+One of \f[V]boundary_only\f[R], \f[V]full_area\f[R] (default), and
+\f[V]hybrid\f[R].
+.TP
+-z, --zoom=ZOOM
+Zoom level on which to calculate tiles.
+.SH HELP/VERSION OPTIONS
+.TP
+-h, --help
+Print help.
+.TP
+-V, --version
+Print osm2pgsql version.
+.SH LOGGING OPTIONS
+.TP
+--log-level=LEVEL
+Set log level (`debug', `info' (default), `warn', or `error').
+.SH SEE ALSO
+.IP \[bu] 2
+osm2pgsql website (https://osm2pgsql.org)
+.IP \[bu] 2
+osm2pgsql manual (https://osm2pgsql.org/doc/manual.html)
+.IP \[bu] 2
+\f[B]osm2pgsql\f[R](1)
+.IP \[bu] 2
+\f[B]postgres\f[R](1)
+.IP \[bu] 2
+\f[B]osmcoastline\f[R](1)
diff --git a/man/osm2pgsql-expire.md b/man/osm2pgsql-expire.md
new file mode 100644
index 000000000..3024b81b0
--- /dev/null
+++ b/man/osm2pgsql-expire.md
@@ -0,0 +1,74 @@
+# NAME
+
+osm2pgsql-expire - Visualize expire output
+
+# SYNOPSIS
+
+**osm2pgsql-expire** \[*OPTIONS*\] *OSM-FILE* (1)
+**osm2pgsql-expire** *TILES-FILE* (2)
+
+# DESCRIPTION
+
+**This command is currently experimental.**
+
+The expire command can be used for two things:
+
+1. **To check what tiles some OSM data is in.** If an *OSM-FILE* is specified
+   osm2pgsql-expire will calculate the tiles covering the objects in that file.
+   Note that the file must not be a change file but a regular OSM data file!
+   Output is, by default, a tile file, but GeoJSON is also possible.
+2. **Visualize tile list.** If a *TILE-FILE* (presumably generated by osm2pgsql)
+   is specified, a GeoJSON file is generated showing all mentioned tiles. In
+   this mode all command line options are ignored.
+
+Read the *Expire* chapter of the osm2pgsql manual
+(https://osm2pgsql.org/doc/manual.html#expire) for details on how to
+interpret the `-m, \--mode` and `\--full-area-limit` options.
+
+# OPTIONS
+
+This program follows the usual GNU command line syntax, with long options
+starting with two dashes (`--`). Mandatory arguments to long options are
+mandatory for short options too.
+
+# MAIN OPTIONS
+
+-b, \--buffer=VALUE
+: Set buffer size around geometry relative to tile size. Example: Set to 0.1
+  for a buffer that's 10% of the tile size.
+
+-f, \--format=FORMAT
+: Output format. Options are 'tiles' (default) or 'geojson'. The GeoJSON output
+  uses the Web Mercator projection (EPSG:3857) which is supported by many
+  programs although, strictly speaking, it is not allowed by the GeoJSON spec.
+
+\--full-area-limit=VALUE
+: Set full area limit.
+
+-m, \--mode=MODE
+: Set expire mode. One of  `boundary_only`, `full_area` (default), and `hybrid`.
+
+-z, \--zoom=ZOOM
+: Zoom level on which to calculate tiles.
+
+# HELP/VERSION OPTIONS
+
+-h, \--help
+:   Print help.
+
+-V, \--version
+:   Print osm2pgsql version.
+
+# LOGGING OPTIONS
+
+\--log-level=LEVEL
+:   Set log level ('debug', 'info' (default), 'warn', or 'error').
+
+# SEE ALSO
+
+* [osm2pgsql website](https://osm2pgsql.org)
+* [osm2pgsql manual](https://osm2pgsql.org/doc/manual.html)
+* **osm2pgsql**(1)
+* **postgres**(1)
+* **osmcoastline**(1)
+
diff --git a/src/command-line-app.cpp b/src/command-line-app.cpp
index 03e319ab0..b07a607fe 100644
--- a/src/command-line-app.cpp
+++ b/src/command-line-app.cpp
@@ -21,9 +21,6 @@ command_line_app_t::command_line_app_t(std::string app_description)
 
     add_flag("-h,--help", "Print this help message and exit.");
     add_flag("-V,--version", "Show version and exit.");
-
-    init_database_options();
-    init_logging_options();
 }
 
 bool command_line_app_t::want_help() const { return count("--help"); }
@@ -75,7 +72,7 @@ void command_line_app_t::init_database_options()
         ->group("Database options");
 }
 
-void command_line_app_t::init_logging_options()
+void command_line_app_t::init_logging_options(bool with_progress, bool with_sql)
 {
     static std::map<std::string, log_level> const log_levels_map{
         {"debug", log_level::debug},
@@ -97,31 +94,36 @@ void command_line_app_t::init_logging_options()
         ->option_text("LEVEL")
         ->group("Logging options");
 
-    add_option_function<std::string>(
-        "--log-progress",
-        [&](std::string const &arg) {
-            if (arg == "true") {
-                get_logger().enable_progress();
-            } else if (arg == "false") {
-                get_logger().disable_progress();
-            } else if (arg == "auto") {
-                get_logger().auto_progress();
-            } else {
-                throw fmt_error("Unknown value for --log-progress option: {}",
-                                arg);
-            }
-        })
-        ->description(
-            "Log progress to console ('true', 'false', 'auto' (default)).")
-        ->option_text("PROGRESS")
-        ->group("Logging options");
-
-    add_flag_function("--log-sql", [](int64_t) { get_logger().enable_sql(); })
-        ->description("Enable logging of SQL commands for debugging.")
-        ->group("Logging options");
-
-    add_flag_function("--log-sql-data",
-                      [](int64_t) { get_logger().enable_sql_data(); })
-        ->description("Enable logging of all data added to the database.")
-        ->group("Logging options");
+    if (with_progress) {
+        add_option_function<std::string>(
+            "--log-progress",
+            [&](std::string const &arg) {
+                if (arg == "true") {
+                    get_logger().enable_progress();
+                } else if (arg == "false") {
+                    get_logger().disable_progress();
+                } else if (arg == "auto") {
+                    get_logger().auto_progress();
+                } else {
+                    throw fmt_error(
+                        "Unknown value for --log-progress option: {}", arg);
+                }
+            })
+            ->description(
+                "Log progress to console ('true', 'false', 'auto' (default)).")
+            ->option_text("PROGRESS")
+            ->group("Logging options");
+    }
+
+    if (with_sql) {
+        add_flag_function("--log-sql",
+                          [](int64_t) { get_logger().enable_sql(); })
+            ->description("Enable logging of SQL commands for debugging.")
+            ->group("Logging options");
+
+        add_flag_function("--log-sql-data",
+                          [](int64_t) { get_logger().enable_sql_data(); })
+            ->description("Enable logging of all data added to the database.")
+            ->group("Logging options");
+    }
 }
diff --git a/src/command-line-app.hpp b/src/command-line-app.hpp
index 55080473d..89ae7005b 100644
--- a/src/command-line-app.hpp
+++ b/src/command-line-app.hpp
@@ -31,12 +31,12 @@ class command_line_app_t : public CLI::App
         return m_connection_params;
     }
 
+    void init_database_options();
+    void init_logging_options(bool with_progress, bool with_sql);
+
 private:
     connection_params_t m_connection_params;
 
-    void init_database_options();
-    void init_logging_options();
-
 }; // class App
 
 #endif // OSM2PGSQL_COMMAND_LINE_APP_HPP
diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index ca7200d38..d757b7462 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -265,6 +265,9 @@ options_t parse_command_line(int argc, char *argv[])
 
     command_line_app_t app{"osm2pgsql -- Import OpenStreetMap data into a "
                            "PostgreSQL/PostGIS database\n"};
+    app.init_database_options();
+    app.init_logging_options(true, true);
+
     app.get_formatter()->column_width(38);
 
     app.add_option("OSMFILE", options.input_files)
diff --git a/src/expire-output.cpp b/src/expire-output.cpp
index 2d203e9b9..bd2f822d4 100644
--- a/src/expire-output.cpp
+++ b/src/expire-output.cpp
@@ -45,7 +45,7 @@ std::size_t expire_output_t::output_tiles_to_file(
 
     auto const count = for_each_tile(
         tiles_at_maxzoom, m_minzoom, m_maxzoom, [&](tile_t const &tile) {
-            fmt::print(outfile, "{}/{}/{}\n", tile.zoom(), tile.x(), tile.y());
+            fmt::print(outfile, "{}\n", tile.to_zxy());
         });
 
     (void)std::fclose(outfile);
diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index e5fb2541b..b0704cf42 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -646,6 +646,8 @@ int main(int argc, char *argv[])
 
         command_line_app_t app{
             "osm2pgsql-gen -- Generalize OpenStreetMap data\n"};
+        app.init_database_options();
+        app.init_logging_options(true, true);
 
         // ------------------------------------------------------------------
         // Main options
diff --git a/src/osm2pgsql-expire.cpp b/src/osm2pgsql-expire.cpp
new file mode 100644
index 000000000..d9616f869
--- /dev/null
+++ b/src/osm2pgsql-expire.cpp
@@ -0,0 +1,439 @@
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+#include "command-line-app.hpp"
+#include "expire-config.hpp"
+#include "expire-output.hpp"
+#include "expire-tiles.hpp"
+#include "format.hpp"
+#include "geom-from-osm.hpp"
+#include "geom-functions.hpp"
+#include "geom.hpp"
+#include "input.hpp"
+#include "logging.hpp"
+#include "middle-ram.hpp"
+#include "middle.hpp"
+#include "osmdata.hpp"
+#include "output.hpp"
+#include "reprojection.hpp"
+#include "tile.hpp"
+#include "version.hpp"
+
+#include <nlohmann/json.hpp>
+
+#include <cassert>
+#include <exception>
+#include <iostream>
+
+namespace {
+
+struct config_t
+{
+    expire_config_t expire_config;
+    std::string input_file;
+    std::string mode{"full_area"};
+    std::string format{"tiles"};
+    std::shared_ptr<reprojection_t> projection;
+    command_t command = command_t::process;
+    uint32_t zoom = 0;
+};
+
+class output_expire_t : public output_t
+{
+public:
+    output_expire_t(std::shared_ptr<middle_query_t> const &mid,
+                    std::shared_ptr<thread_pool_t> thread_pool,
+                    options_t const &options, config_t const &cfg);
+
+    output_expire_t(output_expire_t const &) = default;
+    output_expire_t &operator=(output_expire_t const &) = default;
+
+    output_expire_t(output_expire_t &&) = default;
+    output_expire_t &operator=(output_expire_t &&) = default;
+
+    ~output_expire_t() override;
+
+    std::shared_ptr<output_t>
+    clone(std::shared_ptr<middle_query_t> const &mid,
+          std::shared_ptr<db_copy_thread_t> const &copy_thread) const override;
+
+    void start() override {}
+    void stop() override {}
+    void sync() override {}
+    void wait() override {}
+
+    void pending_way(osmid_t /*id*/) override {}
+    void pending_relation(osmid_t /*id*/) override {}
+
+    void node_add(osmium::Node const &node) override;
+    void way_add(osmium::Way *way) override;
+    void relation_add(osmium::Relation const &rel) override;
+
+    void node_modify(osmium::Node const & /*node*/) override {}
+    void way_modify(osmium::Way * /*way*/) override {}
+    void relation_modify(osmium::Relation const & /*rel*/) override {}
+
+    void node_delete(osmium::Node const & /*node*/) override {}
+    void way_delete(osmium::Way * /*way*/) override {}
+    void relation_delete(osmium::Relation const & /*rel*/) override {}
+
+    void merge_expire_trees(output_t * /*other*/) override {}
+
+    void print(std::string const &format);
+
+private:
+    config_t m_config;
+    expire_tiles_t m_expire_tiles;
+    expire_output_t m_expire_output;
+}; // class output_expire_t
+
+std::shared_ptr<output_t> output_expire_t::clone(
+    std::shared_ptr<middle_query_t> const & /*mid*/,
+    std::shared_ptr<db_copy_thread_t> const & /*copy_thread*/) const
+{
+    return std::make_shared<output_expire_t>(*this);
+}
+
+output_expire_t::output_expire_t(std::shared_ptr<middle_query_t> const &mid,
+                                 std::shared_ptr<thread_pool_t> thread_pool,
+                                 options_t const &options, config_t const &cfg)
+: output_t(mid, std::move(thread_pool), options), m_config(cfg),
+  m_expire_tiles(cfg.zoom, cfg.projection)
+{
+}
+
+output_expire_t::~output_expire_t() = default;
+
+void output_expire_t::node_add(osmium::Node const &node)
+{
+    if (node.tags().empty()) {
+        return;
+    }
+
+    auto const geom_merc =
+        geom::transform(geom::create_point(node), *m_config.projection);
+
+    m_expire_tiles.from_geometry(geom_merc, m_config.expire_config);
+}
+
+void output_expire_t::way_add(osmium::Way *way)
+{
+    if (way->tags().empty()) {
+        return;
+    }
+
+    auto const counts = middle().nodes_get_list(&way->nodes());
+    if (counts != way->nodes().size()) {
+        log_error("Missing nodes in way {}.", way->id());
+    }
+
+    osmium::memory::Buffer buffer{1024, osmium::memory::Buffer::auto_grow::yes};
+
+    geom::geometry_t geom;
+
+    if (way->is_closed()) {
+        log_debug("Creating polygon from closed way {}...", way->id());
+        geom::create_polygon(&geom, *way, &buffer);
+    }
+
+    if (geom.is_null()) {
+        log_debug("Creating linestring from way {}...", way->id());
+        geom::create_linestring(&geom, *way);
+    }
+
+    if (geom.is_null()) {
+        log_warn("Creating geometry from way {} failed.", way->id());
+        return;
+    }
+
+    auto const geom_merc = geom::transform(geom, *m_config.projection);
+
+    m_expire_tiles.from_geometry(geom_merc, m_config.expire_config);
+}
+
+void output_expire_t::relation_add(osmium::Relation const &relation)
+{
+    if (relation.tags().empty()) {
+        return;
+    }
+
+    osmium::memory::Buffer buffer{1024, osmium::memory::Buffer::auto_grow::yes};
+
+    auto const num_members = middle().rel_members_get(
+        relation, &buffer,
+        osmium::osm_entity_bits::node | osmium::osm_entity_bits::way);
+
+    if (num_members == 0) {
+        log_warn("No node/way members found for relation {}.", relation.id());
+        return;
+    }
+
+    for (auto &node : buffer.select<osmium::Node>()) {
+        if (!node.location().valid()) {
+            node.set_location(middle().get_node_location(node.id()));
+        }
+    }
+
+    for (auto &way : buffer.select<osmium::Way>()) {
+        middle().nodes_get_list(&way.nodes());
+    }
+
+    std::string const type = relation.tags()["type"];
+
+    osmium::memory::Buffer tmp_buffer{1024,
+                                      osmium::memory::Buffer::auto_grow::yes};
+    geom::geometry_t geom;
+    if (type == "multipolygon") {
+        log_debug("Creating multipolygon from relation {}...", relation.id());
+        geom::create_multipolygon(&geom, relation, buffer, &tmp_buffer);
+    } else if (type == "route" || type == "multilinestring") {
+        log_debug("Creating multilinestring from relation {}...",
+                  relation.id());
+        geom::create_multilinestring(&geom, buffer, false);
+    } else {
+        log_debug("Creating geometry collection from relation {}.",
+                  relation.id());
+        geom::create_collection(&geom, buffer);
+    }
+
+    if (geom.is_null()) {
+        log_warn("Creating geometry from relation {} failed.", relation.id());
+        return;
+    }
+
+    auto const geom_merc = geom::transform(geom, *m_config.projection);
+
+    m_expire_tiles.from_geometry(geom_merc, m_config.expire_config);
+}
+
+std::string tile_to_json(tile_t const &tile)
+{
+    auto const box = tile.box(0);
+
+    nlohmann::json const feature_json = {{"type", "Feature"},
+                                         {"geometry",
+                                          {{"type", "Polygon"},
+                                           {"coordinates",
+                                            {{{box.min_x(), box.min_y()},
+                                              {box.min_x(), box.max_y()},
+                                              {box.max_x(), box.max_y()},
+                                              {box.max_x(), box.min_y()},
+                                              {box.min_x(), box.min_y()}}}}}},
+                                         {"properties",
+                                          {{"z", tile.zoom()},
+                                           {"x", tile.x()},
+                                           {"y", tile.y()},
+                                           {"label", tile.to_zxy()}}}};
+
+    return feature_json.dump();
+}
+
+std::string geojson_start()
+{
+    // The GeoJSON Specification (RFC 7946) only allows lon/lat coordinates,
+    // but other CRSes are widely supported though this syntax from an earlier
+    // draft of the GeoJSON spec.
+    nlohmann::json const type_json = {
+        {"type", "name"},
+        {"properties", {{"name", "urn:ogc:def:crs:EPSG::3857"}}}};
+
+    return fmt::format("{}{}{}\n", R"({"type": "FeatureCollection", "crs":)",
+                       type_json.dump(), R"(, "features": [)");
+}
+
+std::string geojson_end() { return "]}\n"; }
+
+void print_tiles(std::vector<tile_t> const &tiles)
+{
+    fmt::print("{}\n", geojson_start());
+    bool first = true;
+    for (auto const &tile : tiles) {
+        fmt::print("{}{}\n", (first ? "" : ","), tile_to_json(tile));
+        first = false;
+    }
+    fmt::print("{}", geojson_end());
+}
+
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+config_t parse_command_line(int argc, char *argv[])
+{
+    config_t cfg;
+
+    command_line_app_t app{"osm2pgsql-expire -- Visualize expire output\n"};
+    app.init_logging_options(false, false);
+
+    app.get_formatter()->column_width(38);
+
+    app.add_option("OSMFILE", cfg.input_file)
+        ->description("Input file")
+        ->type_name("FILE");
+
+    app.add_option("-b,--buffer", cfg.expire_config.buffer)
+        ->description("Set buffer size around geometry relative to tile size")
+        ->type_name("VALUE");
+
+    app.add_option("-f,--format", cfg.format)
+        ->description("Output format ('tiles', 'geojson')")
+        ->type_name("FORMAT");
+
+    app.add_option("--full-area-limit", cfg.expire_config.full_area_limit)
+        ->description("Set full area limit")
+        ->type_name("VALUE");
+
+    app.add_option("-m,--mode", cfg.mode)
+        ->description(
+            "Set expire mode ('boundary_only', 'full_area', 'hybrid')")
+        ->type_name("MODE");
+
+    app.add_option("-z,--zoom", cfg.zoom)
+        ->description("Set zoom level")
+        ->type_name("ZOOM");
+
+    try {
+        app.parse(argc, argv);
+    } catch (...) {
+        log_info("osm2pgsql-expire version {}", get_osm2pgsql_version());
+        throw;
+    }
+
+    if (app.want_help()) {
+        std::cout << app.help();
+        cfg.command = command_t::help;
+        return cfg;
+    }
+
+    if (app.want_version()) {
+        cfg.command = command_t::version;
+        return cfg;
+    }
+
+    if (cfg.format != "tiles" && cfg.format != "geojson") {
+        throw std::runtime_error{
+            "Value for --format must be 'tiles' or 'geojson'."};
+    }
+
+    if (cfg.mode == "boundary_only") {
+        cfg.expire_config.mode = expire_mode::boundary_only;
+    } else if (cfg.mode == "full_area") {
+        cfg.expire_config.mode = expire_mode::full_area;
+    } else if (cfg.mode == "hybrid") {
+        cfg.expire_config.mode = expire_mode::hybrid;
+    } else {
+        throw std::runtime_error{"Value for --mode must be 'boundary_only', "
+                                 "'full_area', or 'hybrid'."};
+    }
+
+    return cfg;
+}
+
+void output_expire_t::print(std::string const &format)
+{
+    auto const tiles = m_expire_tiles.get_tiles();
+    if (format == "tiles") {
+        for (auto const &qk : tiles) {
+            auto const tile = tile_t::from_quadkey(qk, m_config.zoom);
+            fmt::print(stdout, "{}\n", tile.to_zxy());
+        }
+        return;
+    }
+
+    assert(format == "geojson");
+
+    fmt::print("{}\n", geojson_start());
+    bool first = true;
+    for (auto const &qk : tiles) {
+        fmt::print("{}{}\n", (first ? "" : ","),
+                   tile_to_json(tile_t::from_quadkey(qk, m_config.zoom)));
+        first = false;
+    }
+    fmt::print("{}", geojson_end());
+}
+
+} // anonymous namespace
+
+// NOLINTNEXTLINE(bugprone-exception-escape)
+int main(int argc, char *argv[])
+{
+    try {
+        auto cfg = parse_command_line(argc, argv);
+
+        cfg.projection = reprojection_t::create_projection(PROJ_SPHERE_MERC);
+
+        if (cfg.command == command_t::help) {
+            // Already handled inside parse_command_line()
+            return 0;
+        }
+
+        if (cfg.command == command_t::version) {
+            print_version("osm2pgsql-expire");
+            return 0;
+        }
+
+        log_info("osm2pgsql-expire version {}", get_osm2pgsql_version());
+        log_warn("This is an EXPERIMENTAL extension to osm2pgsql.");
+
+        double const distance = tile_t::EARTH_CIRCUMFERENCE /
+                                static_cast<double>(1UL << cfg.zoom) *
+                                cfg.expire_config.buffer;
+
+        log_info("Settings:");
+        log_info("  input_file={}", cfg.input_file);
+        log_info("  buffer={}", cfg.expire_config.buffer);
+        log_info("    distance={:.2f} web mercator units", distance);
+        log_info("  full_area_limit={}", cfg.expire_config.full_area_limit);
+        log_info("  mode={}", cfg.mode);
+        log_info("  zoom={}", cfg.zoom);
+
+        auto const input = osmium::split_string(cfg.input_file, '.');
+        if (input.empty()) {
+            throw std::runtime_error{"Missing input file"};
+        }
+
+        auto const &suffix = input.back();
+        if (suffix == "osm" || suffix == "pbf" || suffix == "opl") {
+            // input is an OSM file
+            auto thread_pool = std::make_shared<thread_pool_t>(1U);
+            log_debug("Started pool with {} threads.",
+                      thread_pool->num_threads());
+
+            options_t options;
+            options.projection = cfg.projection;
+            auto middle = create_middle(thread_pool, options);
+            middle->start();
+
+            auto output = std::make_shared<output_expire_t>(
+                middle->get_query_instance(), thread_pool, options, cfg);
+
+            osmdata_t osmdata{middle, output, options};
+
+            std::vector<osmium::io::File> files;
+            files.emplace_back(cfg.input_file);
+            process_files(files, &osmdata, false, false);
+
+            output->print(cfg.format);
+        } else {
+            // input is a tiles file
+            std::ifstream file{cfg.input_file};
+            std::string str;
+            std::vector<tile_t> tiles;
+            while (std::getline(file, str)) {
+                tiles.push_back(tile_t::from_zxy(str));
+            }
+            print_tiles(tiles);
+        }
+    } catch (std::exception const &e) {
+        log_error("{}", e.what());
+        return 1;
+    } catch (...) {
+        log_error("Unknown exception.");
+        return 1;
+    }
+
+    return 0;
+}
diff --git a/src/tile.cpp b/src/tile.cpp
index 76ece1952..a527ee735 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -9,6 +9,17 @@
 
 #include "tile.hpp"
 
+#include "format.hpp"
+
+#include <osmium/util/string.hpp>
+
+#include <cstdlib>
+
+std::string tile_t::to_zxy() const
+{
+    return fmt::format("{}/{}/{}", zoom(), x(), y());
+}
+
 geom::point_t tile_t::to_tile_coords(geom::point_t p,
                                      unsigned int pixel_extent) const noexcept
 {
@@ -55,6 +66,19 @@ uint32_t deinterleave_lowuint32(uint64_t word) noexcept
     return static_cast<uint32_t>(word);
 }
 
+uint32_t parse_num_with_max(std::string const &str, uint32_t max)
+{
+    std::size_t pos = 0;
+    auto const value = std::stoul(str, &pos);
+    if (pos != str.size()) {
+        throw std::invalid_argument{"extra characters"};
+    }
+    if (value >= max) {
+        throw std::invalid_argument{"value to large"};
+    }
+    return static_cast<uint32_t>(value);
+}
+
 } // anonymous namespace
 
 quadkey_t tile_t::quadkey() const noexcept
@@ -68,3 +92,16 @@ tile_t tile_t::from_quadkey(quadkey_t quadkey, uint32_t zoom) noexcept
     return {zoom, deinterleave_lowuint32(quadkey.value()),
             deinterleave_lowuint32(quadkey.value() >> 1U)};
 }
+
+tile_t tile_t::from_zxy(std::string const &zxy)
+{
+    auto const p = osmium::split_string(zxy, '/');
+    if (p.size() != 3) {
+        throw fmt_error("Invalid tile '{}'.", zxy);
+    }
+
+    auto const zoom = parse_num_with_max(p[0], MAX_ZOOM);
+    uint32_t const max = 1UL << zoom;
+
+    return {zoom, parse_num_with_max(p[1], max), parse_num_with_max(p[2], max)};
+}
diff --git a/src/tile.hpp b/src/tile.hpp
index 08e6fdf69..3c52e4cf3 100644
--- a/src/tile.hpp
+++ b/src/tile.hpp
@@ -208,6 +208,9 @@ class tile_t
     geom::point_t to_world_coords(geom::point_t p,
                                   unsigned int pixel_extent) const noexcept;
 
+    /// Convert to string in format "ZOOM/X/Y".
+    std::string to_zxy() const;
+
     /// The center of this tile in web mercator (EPSG:3857) units.
     geom::point_t center() const noexcept;
 
@@ -256,6 +259,11 @@ class tile_t
      */
     static tile_t from_quadkey(quadkey_t quadkey, uint32_t zoom) noexcept;
 
+    /**
+     * Construct tile from string in format "ZOOM/X/Y"
+     */
+    static tile_t from_zxy(std::string const &zxy);
+
 private:
     static constexpr uint32_t INVALID_ZOOM =
         std::numeric_limits<uint32_t>::max();
diff --git a/tests/test-tile.cpp b/tests/test-tile.cpp
index e75d29e37..f5d6489ff 100644
--- a/tests/test-tile.cpp
+++ b/tests/test-tile.cpp
@@ -30,14 +30,17 @@ TEST_CASE("tile access and comparison", "[NoDB]")
     REQUIRE(a.zoom() == 3);
     REQUIRE(a.x() == 2);
     REQUIRE(a.y() == 1);
+    REQUIRE(a.to_zxy() == "3/2/1");
 
     REQUIRE(b.zoom() == 3);
     REQUIRE(b.x() == 2);
     REQUIRE(b.y() == 1);
+    REQUIRE(b.to_zxy() == "3/2/1");
 
     REQUIRE(c.zoom() == 3);
     REQUIRE(c.x() == 1);
     REQUIRE(c.y() == 2);
+    REQUIRE(c.to_zxy() == "3/1/2");
 
     REQUIRE(a == b);
     REQUIRE_FALSE(a != b);
@@ -51,6 +54,20 @@ TEST_CASE("tile access and comparison", "[NoDB]")
     REQUIRE(c < a);
 }
 
+TEST_CASE("tile_t from zxy string", "[NoDB]")
+{
+    REQUIRE(tile_t::from_zxy("0/0/0") == tile_t(0, 0, 0));
+    REQUIRE(tile_t::from_zxy("2/3/3") == tile_t(2, 3, 3));
+    REQUIRE(tile_t::from_zxy("31/3/27") == tile_t(31, 3, 27));
+
+    REQUIRE_THROWS(tile_t::from_zxy(""));
+    REQUIRE_THROWS(tile_t::from_zxy("a/c/c"));
+    REQUIRE_THROWS(tile_t::from_zxy("1a/0/0"));
+    REQUIRE_THROWS(tile_t::from_zxy("32/0/0"));
+    REQUIRE_THROWS(tile_t::from_zxy("2/4/0"));
+    REQUIRE_THROWS(tile_t::from_zxy("2/0/4"));
+}
+
 TEST_CASE("tile_t coordinates zoom=0", "[NoDB]")
 {
     tile_t const tile{0, 0, 0};

From a2ddd01bd075ba6d75b33972f66fae8238ec151f Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 16 Sep 2025 12:11:39 +0200
Subject: [PATCH 380/430] allow BDD tests involving multigeometries

---
 tests/bdd/flex/geometry-collection.feature    | 14 +--
 tests/bdd/flex/geometry-linestring.feature    |  6 +-
 .../bdd/flex/geometry-multilinestring.feature | 16 ++--
 tests/bdd/flex/geometry-multipoint.feature    | 10 +-
 tests/bdd/steps/steps_db.py                   | 93 ++++++++++++++++---
 5 files changed, 102 insertions(+), 37 deletions(-)

diff --git a/tests/bdd/flex/geometry-collection.feature b/tests/bdd/flex/geometry-collection.feature
index fbadebe1d..ff3704365 100644
--- a/tests/bdd/flex/geometry-collection.feature
+++ b/tests/bdd/flex/geometry-collection.feature
@@ -45,11 +45,11 @@ Feature: Create geometry collections from relations
             | 33     | node   | ST_GeometryCollection | 1                      | ST_Point                               |
 
         And table osm2pgsql_test_collection contains exactly
-            | osm_id | ST_AsText(ST_GeometryN(geom, 1)) | ST_AsText(ST_GeometryN(geom, 2)) |
-            | 30     | 10, 11, 12, 13, 10               | NULL                             |
-            | 31     | 10, 11, 12, 13, 10               | 14, 15, 16                       |
-            | 32     | 17                               | 14, 15, 16                       |
-            | 33     | 17                               | NULL                             |
+            | osm_id | ST_AsText(geom)                    |
+            | 30     | { 10, 11, 12, 13, 10 }             |
+            | 31     | { 10, 11, 12, 13, 10; 14, 15, 16 } |
+            | 32     | { 17; 14, 15, 16 }                 |
+            | 33     | { 17 }                             |
 
         Examples:
             | param  |
@@ -105,6 +105,6 @@ Feature: Create geometry collections from relations
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_collection contains exactly
-            | osm_id | name  | ST_NumGeometries(geom) | ST_AsText(ST_GeometryN(geom, 1)) | ST_AsText(ST_GeometryN(geom, 2)) |
-            | 30     | three | 2                      | 10, 11, 12, 13, 10               | 10, 11, 13                       |
+            | osm_id | name  | ST_AsText(geom)                    |
+            | 30     | three | { 10, 11, 12, 13, 10; 10, 11, 13 } |
 
diff --git a/tests/bdd/flex/geometry-linestring.feature b/tests/bdd/flex/geometry-linestring.feature
index ec3526c68..af4039f88 100644
--- a/tests/bdd/flex/geometry-linestring.feature
+++ b/tests/bdd/flex/geometry-linestring.feature
@@ -32,9 +32,9 @@ Feature: Creating linestring features from way
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_lines contains exactly
-            | way_id | ST_AsText(sgeom) | ST_AsText(ST_GeometryN(mgeom, 1)) | ST_AsText(ST_GeometryN(xgeom, 1)) |
-            | 20     | 1, 2, 3          | 1, 2, 3                           | 1, 2, 3                           |
-            | 21     | 4, 5             | 4, 5                              | 4, 5                              |
+            | way_id | ST_AsText(sgeom) | ST_AsText(mgeom) | ST_AsText(xgeom) |
+            | 20     | 1, 2, 3          | [ 1, 2, 3 ]      | [ 1, 2, 3 ]      |
+            | 21     | 4, 5             | [ 4, 5 ]         | [ 4, 5 ]         |
 
     Scenario:
         Given the grid
diff --git a/tests/bdd/flex/geometry-multilinestring.feature b/tests/bdd/flex/geometry-multilinestring.feature
index be8fd8b2b..6b06aa8d0 100644
--- a/tests/bdd/flex/geometry-multilinestring.feature
+++ b/tests/bdd/flex/geometry-multilinestring.feature
@@ -41,11 +41,11 @@ Feature: Creating (multi)linestring features from way and relations
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_lines contains exactly
-            | osm_type | osm_id | ST_GeometryType(geom) | ST_AsText(ST_GeometryN(geom, 1)) | ST_AsText(ST_GeometryN(geom, 2)) |
-            | W        | 20     | ST_LineString         | 1, 2, 3                          | NULL                             |
-            | W        | 21     | ST_LineString         | 4, 5, 6                          | NULL                             |
-            | R        | 30     | ST_LineString         | 1, 2, 3                          | NULL                             |
-            | R        | 31     | ST_MultiLineString    | 1, 2, 3                          | 4, 5, 6                          |
+            | osm_type | osm_id | ST_AsText(geom)      |
+            | W        | 20     | 1, 2, 3              |
+            | W        | 21     | 4, 5, 6              |
+            | R        | 30     | 1, 2, 3              |
+            | R        | 31     | [ 1, 2, 3; 4, 5, 6 ] |
 
     Scenario:
         Given the grid
@@ -77,7 +77,7 @@ Feature: Creating (multi)linestring features from way and relations
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_roads contains exactly
-            | relation_id | ST_GeometryType(geom) | ST_GeometryType(merged) | ST_AsText(ST_GeometryN(merged, 1)) | ST_AsText(ST_GeometryN(merged, 2)) |
-            | 30          | ST_MultiLineString    | ST_MultiLineString      | 1, 2, 3                            | NULL                               |
-            | 31          | ST_MultiLineString    | ST_MultiLineString      | 1, 2                               | 3, 4                               |
+            | relation_id | ST_GeometryType(geom) |  ST_AsText(merged) |
+            | 30          | ST_MultiLineString    |  [ 1, 2, 3 ]       |
+            | 31          | ST_MultiLineString    |  [ 1, 2; 3, 4 ]    |
 
diff --git a/tests/bdd/flex/geometry-multipoint.feature b/tests/bdd/flex/geometry-multipoint.feature
index 650128c31..3e98852c0 100644
--- a/tests/bdd/flex/geometry-multipoint.feature
+++ b/tests/bdd/flex/geometry-multipoint.feature
@@ -43,9 +43,9 @@ Feature: Creating (multi)point features from nodes and relations
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_points contains exactly
-            | osm_type | osm_id | ST_GeometryType(geom) | ST_NumGeometries(geom) | ST_AsText(ST_GeometryN(geom, 1)) | ST_AsText(ST_GeometryN(geom, 2)) |
-            | N        | 1      | ST_Point              | 1                      | 1                                | NULL                             |
-            | N        | 5      | ST_Point              | 1                      | 5                                | NULL                             |
-            | R        | 30     | ST_Point              | 1                      | 1                                | NULL                             |
-            | R        | 31     | ST_MultiPoint         | 2                      | 5                                | 1                                |
+            | osm_type | osm_id | ST_AsText(geom) |
+            | N        | 1      | 1               |
+            | N        | 5      | 5               |
+            | R        | 30     | 1               |
+            | R        | 31     | [ 5; 1 ]        |
 
diff --git a/tests/bdd/steps/steps_db.py b/tests/bdd/steps/steps_db.py
index 5d7a99523..26159c2be 100644
--- a/tests/bdd/steps/steps_db.py
+++ b/tests/bdd/steps/steps_db.py
@@ -178,15 +178,43 @@ def __init__(self, value, props, factory):
         self.factory = factory
 
     def set_coordinates(self, value):
-        m = re.fullmatch(r'(POINT|LINESTRING|POLYGON)\((.*)\)', value)
+        if value.startswith('GEOMETRYCOLLECTION('):
+            geoms = []
+            remain = value[19:-1]
+            while remain:
+                _, value, remain = self._parse_simple_wkt(remain)
+                remain = remain[1:] # delete comma
+                geoms.append(value)
+            self.geom_type = 'GEOMETRYCOLLECTION'
+            self.value = geoms
+        else:
+            self.geom_type, self.value, remain = self._parse_simple_wkt(value)
+            if remain:
+                raise RuntimeError('trailing content for geometry: ' + value)
+
+    def _parse_simple_wkt(self, value):
+        m = re.fullmatch(r'(MULTI)?(POINT|LINESTRING|POLYGON)\(([^A-Z]*)\)(.*)', value)
         if not m:
             raise RuntimeError(f'Unparsable WKT: {value}')
-        if m[1] == 'POINT':
-            self.value = self._parse_wkt_coord(m[2])
-        elif m[1] == 'LINESTRING':
-            self.value = self._parse_wkt_line(m[2])
-        elif m[1] == 'POLYGON':
-            self.value = [self._parse_wkt_line(ln) for ln in m[2][1:-1].split('),(')]
+        geom_type = (m[1] or '') + m[2]
+        if m[1] == 'MULTI':
+            splitup = m[3][1:-1].split('),(')
+            if m[2] == 'POINT':
+                value = [self._parse_wkt_coord(c) for c in splitup]
+            elif m[2] == 'LINESTRING':
+                value = [self._parse_wkt_line(c) for c in splitup]
+            elif m[2] == 'POLYGON':
+                value = [[self._parse_wkt_line(ln) for ln in poly[1:-1].split('),(')]
+                         for poly in splitup]
+        else:
+            if m[2] == 'POINT':
+                value = self._parse_wkt_coord(m[3])
+            elif m[2] == 'LINESTRING':
+                value = self._parse_wkt_line(m[3])
+            elif m[2] == 'POLYGON':
+                value = [self._parse_wkt_line(ln) for ln in m[3][1:-1].split('),(')]
+
+        return geom_type, value, m[4]
 
     def _parse_wkt_coord(self, coord):
         return tuple(DBValueFloat(float(f.strip()), self.precision) for f in coord.split())
@@ -195,14 +223,51 @@ def _parse_wkt_line(self, coords):
         return [self._parse_wkt_coord(pt) for pt in coords.split(',')]
 
     def __eq__(self, other):
-        if other.find(',') < 0:
-            geom = self._parse_input_coord(other)
-        elif other.find('(') < 0:
-            geom = self._parse_input_line(other)
+        if other.startswith('[') and other.endswith(']'):
+            gtype = 'MULTI'
+            toparse = other[1:-1].split(';')
+        elif other.startswith('{') and other.endswith('}'):
+            gtype = 'GEOMETRYCOLLECTION'
+            toparse = other[1:-1].split(';')
         else:
-            geom = [self._parse_input_line(ln) for ln in other.strip()[1:-1].split('),(')]
-
-        return self.value == geom
+            gtype = None
+            toparse = [other]
+
+        geoms = []
+        for sub in toparse:
+            sub = sub.strip()
+            if sub.find(',') < 0:
+                geoms.append(self._parse_input_coord(sub))
+                if gtype is None:
+                    gtype = 'POINT'
+                elif gtype.startswith('MULTI'):
+                    if gtype == 'MULTI':
+                        gtype = 'MULTIPOINT'
+                    elif gtype != 'MULTIPOINT':
+                        raise RuntimeError('MULTI* geometry with different geometry types is not supported.')
+            elif sub.find('(') < 0:
+                geoms.append(self._parse_input_line(sub))
+                if gtype is None:
+                    gtype = 'LINESTRING'
+                elif gtype.startswith('MULTI'):
+                    if gtype == 'MULTI':
+                        gtype = 'MULTILINESTRING'
+                    elif gtype != 'MULTILINESTRING':
+                        raise RuntimeError('MULTI* geometry with different geometry types is not supported.')
+            else:
+                geoms.append([self._parse_input_line(ln) for ln in sub.strip()[1:-1].split('),(')])
+                if gtype is None:
+                    gtype = 'POLYGON'
+                elif gtype.startswith('MULTI'):
+                    if gtype == 'MULTI':
+                        gtype = 'MULTIPOLYGON'
+                    elif gtype != 'MULTIPOLYGON':
+                        raise RuntimeError('MULTI* geometry with different geometry types is not supported.')
+
+        if not gtype.startswith('MULTI') and gtype != 'GEOMETRYCOLLECTION':
+            geoms = geoms[0]
+
+        return gtype == self.geom_type and self.value == geoms
 
     def _parse_input_coord(self, other):
         coords = other.split(' ')

From b152dc82149cfa7505a5c5adb757d90dc072863e Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 16 Sep 2025 13:56:29 +0200
Subject: [PATCH 381/430] use PBF for testing

Geofabrik doesn't see to have osm.bz2 files anymore.
---
 .github/workflows/ci.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 459e474bc..763aa0bd3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -384,7 +384,7 @@ jobs:
     runs-on: windows-2025
 
     env:
-      OSMURL: https://download.geofabrik.de/europe/monaco-latest.osm.bz2
+      OSMURL: https://download.geofabrik.de/europe/monaco-latest.osm.pbf
 
     steps:
       - uses: actions/checkout@v4
@@ -398,8 +398,9 @@ jobs:
           & $env:PGBIN\psql -d osm -c "CREATE EXTENSION hstore; CREATE EXTENSION postgis;"
         shell: pwsh
       - name: Get test data
-        run: (new-object net.webclient).DownloadFile($env:OSMURL, "testfile.osm.bz2")
+        run: Invoke-WebRequest -Uri $env:OSMURL -OutFile "testfile.osm.pbf"
+        shell: pwsh
       - name: Execute osm2pgsql
-        run: ./osm2pgsql-bin/osm2pgsql --slim -d osm testfile.osm.bz2
+        run: ./osm2pgsql-bin/osm2pgsql --slim -d osm testfile.osm.pbf
         shell: bash
 

From 72c2a61785fbaa9cbffa8f8cace7f7e9682be1ae Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 15 Sep 2025 15:01:27 +0200
Subject: [PATCH 382/430] recommend psycopg version 3 for BDD tests

---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a169f050f..9f1e51e01 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -137,10 +137,10 @@ database created by `pg_virtualenv`.
 
 Tests in the `tests/bdd` directory use [behave](https://github.com/behave/behave),
 a Python implementation of a behaviour-driven test framework. To run the
-BDD tests you need to have behave and psycopg2 installed. On Ubuntu run:
+BDD tests you need to have behave and psycopg installed. On Ubuntu run:
 
 ```sh
-sudo apt-get install python3-psycopg2 python3-behave
+sudo apt-get install python3-psycopg python3-behave
 ```
 
 There are ctest directives to run the tests. If you want to run the tests

From 4f8e195b5fcb241bd1acd861c2126576ec0dc4a1 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 15 Sep 2025 12:15:05 +0200
Subject: [PATCH 383/430] add example for delete callback

---
 flex-config/track-changes.lua | 80 +++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 flex-config/track-changes.lua

diff --git a/flex-config/track-changes.lua b/flex-config/track-changes.lua
new file mode 100644
index 000000000..cf9e3a094
--- /dev/null
+++ b/flex-config/track-changes.lua
@@ -0,0 +1,80 @@
+-- This config example file is released into the Public Domain.
+
+-- This config shows how to track in a table which OSM object have been
+-- added, changed and deleted.
+
+-- The main table logging the changes.
+local change_table = osm2pgsql.define_table{
+    name = 'change_log',
+    -- Disable automatic ID tracking by osm2pgsql. No rows should ever
+    -- be deleted. osm2pgsql will issue a warning about this. It can
+    -- be safely ignored.
+    ids = nil,
+    columns = {
+        { column = 'osm_type', type = 'text' },
+        { column = 'osm_id', type = 'bigint' },
+        { column = 'version', type = 'int' },
+        -- This column describes the kind of change:
+        -- 'A' for added/newly created,
+        -- 'M' for modified,
+        -- 'D' for deleted
+        { column = 'action', type = 'text' },
+        { column = 'date', sql_type = 'timestamp' }
+    },
+    indexes = {
+        { column = { 'osm_type', 'osm_id' }, method = 'btree' }
+    }
+}
+
+-- We only want to catch changes coming from the OSM file input.
+-- This flag marks when file reading is done and dependent objects are
+-- being processed.
+local file_reading_in_progress = true
+
+local function format_date(ts)
+    return os.date('!%Y-%m-%dT%H:%M:%SZ', ts)
+end
+
+local function add_object_change(object)
+    -- In this example only changes while updating the database are recorded.
+    -- This happens in 'append' mode.
+    if osm2pgsql.mode == 'append' and file_reading_in_progress then
+        change_table:insert{
+            osm_type = object.type,
+            osm_id = object.id,
+            version = object.version,
+            action = (object.version == 1) and 'A' or 'M',
+            date = format_date(object.timestamp)
+        }
+    end
+end
+
+osm2pgsql.process_node = add_object_change
+osm2pgsql.process_way = add_object_change
+osm2pgsql.process_relation = add_object_change
+
+osm2pgsql.process_untagged_node = add_object_change
+osm2pgsql.process_untagged_way = add_object_change
+osm2pgsql.process_untagged_relation = add_object_change
+
+
+local function add_deleted_object(object)
+    change_table:insert{
+        osm_type = object.type,
+        osm_id = object.id,
+        version = object.version,
+        action = 'D',
+        date = format_date(object.timestamp)
+    }
+end
+
+osm2pgsql.process_deleted_node = add_deleted_object
+osm2pgsql.process_deleted_way = add_deleted_object
+osm2pgsql.process_deleted_relation = add_deleted_object
+
+function osm2pgsql.after_relations()
+  -- This callback is called after the last relation has been read from
+  -- the input file. As objects are guaranteed to come in order
+  -- node/way/relation, file reading is done at that point.
+  file_reading_in_progress = false
+end

From d87843d38e50700beb6b0c27145bd231726da01a Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 15 Sep 2025 12:18:53 +0200
Subject: [PATCH 384/430] add exceptions for more callbacks to luacheck

---
 .luacheckrc | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/.luacheckrc b/.luacheckrc
index 515ded21b..80507e2a6 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -29,12 +29,30 @@ stds.osm2pgsql = {
                 process_untagged_relation = {
                     read_only = false
                 },
+                process_deleted_node = {
+                    read_only = false
+                },
+                process_deleted_way = {
+                    read_only = false
+                },
+                process_deleted_relation = {
+                    read_only = false
+                },
                 select_relation_members = {
                     read_only = false
                 },
                 process_gen = {
                     read_only = false
                 },
+                after_nodes = {
+                    read_only = false
+                },
+                after_ways = {
+                    read_only = false
+                },
+                after_relations = {
+                    read_only = false
+                },
             },
             other_fields = true,
         }

From 3250ac363c0a5a14fc116d60d7219a1fe37ad2b4 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 17 Sep 2025 16:36:08 +0200
Subject: [PATCH 385/430] prepare release 2.2.0

---
 CMakeLists.txt              |   2 +-
 man/osm2pgsql-expire.1      |  52 ++++----
 man/osm2pgsql-gen.1         |  78 ++++++------
 man/osm2pgsql-replication.1 | 247 +++++++++++++-----------------------
 man/osm2pgsql.1             | 211 +++++++++++++++---------------
 5 files changed, 262 insertions(+), 328 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d5aaecec..22d37fb5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 cmake_minimum_required(VERSION 3.10.0)
 
-project(osm2pgsql VERSION 2.1.1 LANGUAGES CXX C)
+project(osm2pgsql VERSION 2.2.0 LANGUAGES CXX C)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
diff --git a/man/osm2pgsql-expire.1 b/man/osm2pgsql-expire.1
index 1dead2206..c6dbd023c 100644
--- a/man/osm2pgsql-expire.1
+++ b/man/osm2pgsql-expire.1
@@ -1,77 +1,79 @@
-.TH "OSM2PGSQL" "1" "2.1.1" "" ""
+.TH "OSM2PGSQL" "1" "2.2.0" "" ""
 .SH NAME
-.PP
-osm2pgsql-expire - Visualize expire output
+osm2pgsql\-expire \- Visualize expire output
 .SH SYNOPSIS
-.PP
-\f[B]osm2pgsql-expire\f[R] [\f[I]OPTIONS\f[R]] \f[I]OSM-FILE\f[R] (1)
-\f[B]osm2pgsql-expire\f[R] \f[I]TILES-FILE\f[R] (2)
+\f[B]osm2pgsql\-expire\f[R] [\f[I]OPTIONS\f[R]] \f[I]OSM\-FILE\f[R] (1)
+\f[B]osm2pgsql\-expire\f[R] \f[I]TILES\-FILE\f[R] (2)
 .SH DESCRIPTION
-.PP
 \f[B]This command is currently experimental.\f[R]
 .PP
 The expire command can be used for two things:
 .IP "1." 3
 \f[B]To check what tiles some OSM data is in.\f[R] If an
-\f[I]OSM-FILE\f[R] is specified osm2pgsql-expire will calculate the
+\f[I]OSM\-FILE\f[R] is specified osm2pgsql\-expire will calculate the
 tiles covering the objects in that file.
 Note that the file must not be a change file but a regular OSM data
 file!
 Output is, by default, a tile file, but GeoJSON is also possible.
 .IP "2." 3
-\f[B]Visualize tile list.\f[R] If a \f[I]TILE-FILE\f[R] (presumably
+\f[B]Visualize tile list.\f[R] If a \f[I]TILE\-FILE\f[R] (presumably
 generated by osm2pgsql) is specified, a GeoJSON file is generated
 showing all mentioned tiles.
 In this mode all command line options are ignored.
 .PP
 Read the \f[I]Expire\f[R] chapter of the osm2pgsql manual
 (https://osm2pgsql.org/doc/manual.html#expire) for details on how to
-interpret the \f[V]-m, \[rs]--mode\f[R] and
-\f[V]\[rs]--full-area-limit\f[R] options.
+interpret the \f[CR]\-m, \[rs]\-\-mode\f[R] and
+\f[CR]\[rs]\-\-full\-area\-limit\f[R] options.
 .SH OPTIONS
-.PP
 This program follows the usual GNU command line syntax, with long
-options starting with two dashes (\f[V]--\f[R]).
+options starting with two dashes (\f[CR]\-\-\f[R]).
 Mandatory arguments to long options are mandatory for short options too.
 .SH MAIN OPTIONS
 .TP
--b, --buffer=VALUE
+\-b, \-\-buffer=VALUE
 Set buffer size around geometry relative to tile size.
 Example: Set to 0.1 for a buffer that\[cq]s 10% of the tile size.
 .TP
--f, --format=FORMAT
+\-f, \-\-format=FORMAT
 Output format.
 Options are `tiles' (default) or `geojson'.
 The GeoJSON output uses the Web Mercator projection (EPSG:3857) which is
 supported by many programs although, strictly speaking, it is not
 allowed by the GeoJSON spec.
 .TP
---full-area-limit=VALUE
+\-\-full\-area\-limit=VALUE
 Set full area limit.
 .TP
--m, --mode=MODE
+\-m, \-\-mode=MODE
 Set expire mode.
-One of \f[V]boundary_only\f[R], \f[V]full_area\f[R] (default), and
-\f[V]hybrid\f[R].
+One of \f[CR]boundary_only\f[R], \f[CR]full_area\f[R] (default), and
+\f[CR]hybrid\f[R].
 .TP
--z, --zoom=ZOOM
+\-z, \-\-zoom=ZOOM
 Zoom level on which to calculate tiles.
 .SH HELP/VERSION OPTIONS
 .TP
--h, --help
+\-h, \-\-help
 Print help.
 .TP
--V, --version
+\-V, \-\-version
 Print osm2pgsql version.
 .SH LOGGING OPTIONS
 .TP
---log-level=LEVEL
+\-\-log\-level=LEVEL
 Set log level (`debug', `info' (default), `warn', or `error').
 .SH SEE ALSO
 .IP \[bu] 2
-osm2pgsql website (https://osm2pgsql.org)
+\c
+.UR https://osm2pgsql.org
+osm2pgsql website
+.UE \c
 .IP \[bu] 2
-osm2pgsql manual (https://osm2pgsql.org/doc/manual.html)
+\c
+.UR https://osm2pgsql.org/doc/manual.html
+osm2pgsql manual
+.UE \c
 .IP \[bu] 2
 \f[B]osm2pgsql\f[R](1)
 .IP \[bu] 2
diff --git a/man/osm2pgsql-gen.1 b/man/osm2pgsql-gen.1
index e5d2cfbd0..878e1fd69 100644
--- a/man/osm2pgsql-gen.1
+++ b/man/osm2pgsql-gen.1
@@ -1,15 +1,12 @@
-.TH "OSM2PGSQL" "1" "2.1.1" "" ""
+.TH "OSM2PGSQL" "1" "2.2.0" "" ""
 .SH NAME
-.PP
-osm2pgsql-gen - Generalize OpenStreetMap data - EXPERIMENTAL!
+osm2pgsql\-gen \- Generalize OpenStreetMap data \- EXPERIMENTAL!
 .SH SYNOPSIS
-.PP
-\f[B]osm2pgsql-gen\f[R] [\f[I]OPTIONS\f[R]]\&...
+\f[B]osm2pgsql\-gen\f[R] [\f[I]OPTIONS\f[R]]\&...
 .SH DESCRIPTION
-.PP
 THIS PROGRAM IS EXPERIMENTAL AND MIGHT CHANGE WITHOUT NOTICE!
 .PP
-\f[B]osm2pgsql-gen\f[R] reads data imported by \f[B]osm2pgsql\f[R] from
+\f[B]osm2pgsql\-gen\f[R] reads data imported by \f[B]osm2pgsql\f[R] from
 the database, performs various generalization steps specified by a Lua
 config file and writes the data back to the database.
 It is used in conjunction with and after \f[B]osm2pgsql\f[R] and reads
@@ -17,83 +14,90 @@ the same config file.
 .PP
 This man page can only cover some of the basics and describe the command
 line options.
-See the Generalization chapter in the osm2pgsql
-Manual (https://osm2pgsql.org/doc/manual.html#generalization) for more
-information.
+See the \c
+.UR https://osm2pgsql.org/doc/manual.html#generalization
+Generalization chapter in the osm2pgsql Manual
+.UE \c
+\ for more information.
 .SH OPTIONS
-.PP
 This program follows the usual GNU command line syntax, with long
-options starting with two dashes (\f[V]--\f[R]).
+options starting with two dashes (\f[CR]\-\-\f[R]).
 Mandatory arguments to long options are mandatory for short options too.
 .SH MAIN OPTIONS
 .TP
--a, --append
+\-a, \-\-append
 Run in append mode.
 The default is to run in create mode.
 .TP
--S, --style=FILE
+\-S, \-\-style=FILE
 The Lua config file.
 Same as for \f[B]osm2pgsql\f[R].
 Usually not required because it is read from the
-\f[V]osm2pgsql_properties\f[R] table.
+\f[CR]osm2pgsql_properties\f[R] table.
 .TP
--j, -jobs=NUM
+\-j, \-jobs=NUM
 Specifies the number of parallel threads used for certain operations.
 Setting this to the number of available CPU cores is a reasonable
 starting point.
 Minimum value and default is 1, maximum value is 256.
 .SH HELP/VERSION OPTIONS
 .TP
--h, --help
+\-h, \-\-help
 Print help.
 .TP
--V, --version
+\-V, \-\-version
 Print osm2pgsql version.
 .SH LOGGING OPTIONS
 .TP
---log-level=LEVEL
+\-\-log\-level=LEVEL
 Set log level (`debug', `info' (default), `warn', or `error').
 .TP
---log-sql
+\-\-log\-sql
 Enable logging of SQL commands for debugging.
 .SH DATABASE OPTIONS
 .TP
--d, --database=NAME
+\-d, \-\-database=NAME
 The name of the PostgreSQL database to connect to.
-If this parameter contains an \f[V]=\f[R] sign or starts with a valid
-URI prefix (\f[V]postgresql://\f[R] or \f[V]postgres://\f[R]), it is
+If this parameter contains an \f[CR]=\f[R] sign or starts with a valid
+URI prefix (\f[CR]postgresql://\f[R] or \f[CR]postgres://\f[R]), it is
 treated as a conninfo string.
 See the PostgreSQL manual for details.
 .TP
--U, --username=NAME
+\-U, \-\-username=NAME
 Postgresql user name.
 .TP
--W, --password
+\-W, \-\-password
 Force password prompt.
 .TP
--H, --host=HOSTNAME
+\-H, \-\-host=HOSTNAME
 Database server hostname or unix domain socket location.
 .TP
--P, --port=PORT
+\-P, \-\-port=PORT
 Database server port.
 .TP
---schema=SCHEMA
-Default for various schema settings throughout osm2pgsql-gen (default:
-\f[V]public\f[R]).
+\-\-schema=SCHEMA
+Default for various schema settings throughout osm2pgsql\-gen (default:
+\f[CR]public\f[R]).
 The schema must exist in the database and be writable by the database
 user.
-It must be the same as used with \f[V]osm2pgsql\f[R].
+It must be the same as used with \f[CR]osm2pgsql\f[R].
 .TP
---middle-schema=SCHEMA
-Database schema where the \f[V]osm2pgsql_properties\f[R] table is to be
+\-\-middle\-schema=SCHEMA
+Database schema where the \f[CR]osm2pgsql_properties\f[R] table is to be
 found.
-Default set with \f[V]--schema\f[R].
-Set to the same value as on the \f[V]osm2pgsql\f[R] command line.
+Default set with \f[CR]\-\-schema\f[R].
+Set to the same value as on the \f[CR]osm2pgsql\f[R] command line.
 .SH SEE ALSO
 .IP \[bu] 2
-osm2pgsql website (https://osm2pgsql.org)
+\c
+.UR https://osm2pgsql.org
+osm2pgsql website
+.UE \c
 .IP \[bu] 2
-osm2pgsql manual (https://osm2pgsql.org/doc/manual.html)
+\c
+.UR https://osm2pgsql.org/doc/manual.html
+osm2pgsql manual
+.UE \c
 .IP \[bu] 2
 \f[B]postgres\f[R](1)
 .IP \[bu] 2
diff --git a/man/osm2pgsql-replication.1 b/man/osm2pgsql-replication.1
index 19aeb9192..00c5d8873 100644
--- a/man/osm2pgsql-replication.1
+++ b/man/osm2pgsql-replication.1
@@ -1,112 +1,72 @@
-.TH "OSM2PGSQL-REPLICATION" "1" "2.1.1" "" ""
+.TH "OSM2PGSQL-REPLICATION" "1" "2.2.0" "" ""
 .SH NAME
-osm2pgsql-replication \- osm2pgsql database updater
+osm2pgsql\-replication \- osm2pgsql database updater
 .SH SYNOPSIS
-.B osm2pgsql-replication
+.B osm2pgsql\-replication
 [-h] {init,update,status} ...
 .SH DESCRIPTION
-Update an osm2pgsql database with changes from a OSM replication server.
-.br
+Update an osm2pgsql database with changes from an OSM replication server.
 
-.br
 This tool initialises the updating process by looking at the import file
-.br
 or the newest object in the database. The state is then saved in a table
-.br
 in the database. Subsequent runs download newly available data and apply
-.br
 it to the database.
-.br
 
-.br
 See the help of the \(cqinit\(cq and \(cqupdate\(cq command for more information on
-.br
-how to use osm2pgsql\-replication.
-.SH OPTIONS
+how to use osm2pgsql-replication.
 
-
-.SS
-\fBSub-commands\fR
+.SH
+AVAILABLE COMMANDS
 .TP
-\fBosm2pgsql-replication\fR \fI\,init\/\fR
-    Initialise the replication process.
+\fBosm2pgsql\-replication\fR \fI\,init\/\fR
+Initialise the replication process.
 .TP
-\fBosm2pgsql-replication\fR \fI\,update\/\fR
-    Download newly available data and apply it to the database.
+\fBosm2pgsql\-replication\fR \fI\,update\/\fR
+Download newly available data and apply it to the database.
 .TP
-\fBosm2pgsql-replication\fR \fI\,status\/\fR
-    Print information about the current replication status, optionally as JSON.
-.SH OPTIONS 'osm2pgsql-replication init'
-usage: osm2pgsql-replication init [-h] [-q] [-v] [-d DB] [-U NAME] [-H HOST]
-                                  [-P PORT] [-p PREFIX]
-                                  [--middle-schema SCHEMA] [--schema SCHEMA]
-                                  [--osm-file FILE | --server URL]
-                                  [--start-at TIME]
+\fBosm2pgsql\-replication\fR \fI\,status\/\fR
+Print information about the current replication status, optionally as JSON.
+
+.SH COMMAND \fI\,'osm2pgsql\-replication init'\/\fR
+usage: osm2pgsql\-replication init [\-h] [\-q] [\-v] [\-d DB] [\-U NAME] [\-H HOST]
+                                  [\-P PORT] [\-p PREFIX]
+                                  [\-\-middle\-schema SCHEMA] [\-\-schema SCHEMA]
+                                  [\-\-osm\-file FILE | \-\-server URL]
+                                  [\-\-start\-at TIME]
 
 Initialise the replication process.
-.br
 
-.br
 This function sets the replication service to use and determines from
-.br
 which date to apply updates. You must call this function at least once
-.br
 to set up the replication process. It can safely be called again later
-.br
 to change the replication servers or to roll back the update process and
-.br
 reapply updates.
-.br
 
-.br
 There are different methods available for initialisation. When no
-.br
 additional parameters are given, the data is initialised from the data
-.br
 in the database. If the data was imported from a file with replication
-.br
 information and the properties table is available (for osm2pgsql >= 1.9)
-.br
 then the replication from the file is used. Otherwise the minutely
-.br
 update service from openstreetmap.org is used as the default replication
-.br
 service. The start date is either taken from the database timestamp
-.br
 (for osm2pgsql >= 1.9) or determined from the newest way in the database
-.br
 by querying the OSM API about its creation date.
-.br
 
-.br
 The replication service can be changed with the \(cq\-\-server\(cq parameter.
-.br
 To use a different start date, add \(cq\-\-start\-at\(cq with an absolute
-.br
 ISO timestamp (e.g. 2007\-08\-20T12:21:53Z). When the program determines the
-.br
 start date from the database timestamp or way creation date, then it
-.br
 subtracts another 3 hours by default to ensure that all new changes are
-.br
 available. To change this rollback period, use \(cq\-\-start\-at\(cq with the
-.br
 number of minutes to rollback. This rollback mode can also be used to
-.br
 force initialisation to use the database date and ignore the date
-.br
 from the replication information in the file.
-.br
 
-.br
 The initialisation process can also use replication information from
-.br
 an OSM file directly and ignore all other date information.
-.br
 Use the command \(cqosm2pgsql-replication \-\-osm\-file <filename>\(cq for this.
 
-
-
+.SH DEFAULT ARGUMENTS \fI\,'osm2pgsql\-replication init'\/\fR
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
 Print only error messages
@@ -115,101 +75,88 @@ Print only error messages
 \fB\-v\fR, \fB\-\-verbose\fR
 Increase verboseness of output
 
+.SH DATABASE ARGUMENTS \fI\,'osm2pgsql\-replication init'\/\fR
+The following arguments can be used to set the connection parameters to the
+osm2pgsql database. You may also use libpq environment variables to set
+connection parameters, see https://www.postgresql.org/docs/current/libpq\-envars.html.
+If your database connection requires a password, use a pgpass file,
+see https://www.postgresql.org/docs/current/libpq\-pgpass.html.
+
 .TP
-\fB\-d\fR DB, \fB\-\-database\fR DB
+\fB\-d\fR \fI\,DB\/\fR, \fB\-\-database\fR \fI\,DB\/\fR
 Name of PostgreSQL database to connect to or conninfo string
 
 .TP
-\fB\-U\fR NAME, \fB\-\-username\fR NAME
+\fB\-U\fR \fI\,NAME\/\fR, \fB\-\-username\fR \fI\,NAME\/\fR, \fB\-\-user\fR \fI\,NAME\/\fR
 PostgreSQL user name
 
 .TP
-\fB\-H\fR HOST, \fB\-\-host\fR HOST
+\fB\-H\fR \fI\,HOST\/\fR, \fB\-\-host\fR \fI\,HOST\/\fR
 Database server host name or socket location
 
 .TP
-\fB\-P\fR PORT, \fB\-\-port\fR PORT
+\fB\-P\fR \fI\,PORT\/\fR, \fB\-\-port\fR \fI\,PORT\/\fR
 Database server port
 
 .TP
-\fB\-p\fR PREFIX, \fB\-\-prefix\fR PREFIX
+\fB\-p\fR \fI\,PREFIX\/\fR, \fB\-\-prefix\fR \fI\,PREFIX\/\fR
 Prefix for table names (default 'planet_osm')
 
 .TP
-\fB\-\-middle\-schema\fR SCHEMA
+\fB\-\-middle\-schema\fR \fI\,SCHEMA\/\fR
 Name of the schema to store the table for the replication state in
 
 .TP
-\fB\-\-schema\fR SCHEMA
+\fB\-\-schema\fR \fI\,SCHEMA\/\fR
 Name of the schema for the database
 
+.SH REPLICATION SOURCE ARGUMENTS \fI\,'osm2pgsql\-replication init'\/\fR
 .TP
-\fB\-\-osm\-file\fR FILE
+\fB\-\-osm\-file\fR \fI\,FILE\/\fR
 Get replication information from the given file.
 
 .TP
-\fB\-\-server\fR URL
+\fB\-\-server\fR \fI\,URL\/\fR
 Use replication server at the given URL
 
 .TP
-\fB\-\-start\-at\fR TIME
+\fB\-\-start\-at\fR \fI\,TIME\/\fR
 Time when to start replication. When an absolute timestamp (in ISO format) is given, it will be used. If a number is given, then replication starts the number of minutes before the known date of the database.
 
-.SH OPTIONS 'osm2pgsql-replication update'
-usage: osm2pgsql-replication update update [options] [-- param [param ...]]
+.SH COMMAND \fI\,'osm2pgsql\-replication update'\/\fR
+usage: osm2pgsql\-replication update update [options] [\-\- param [param ...]]
 
 Download newly available data and apply it to the database.
-.br
 
-.br
 The data is downloaded in chunks of \(cq\-\-max\-diff\-size\(cq MB. Each chunk is
-.br
 saved in a temporary file and imported with osm2pgsql from there. The
-.br
 temporary file is normally deleted afterwards unless you state an explicit
-.br
 location with \(cq\-\-diff\-file\(cq. Once the database is up to date with the
-.br
 replication source, the update process exits with 0.
-.br
 
-.br
 Any additional arguments to osm2pgsql need to be given after \(cq\-\-\(cq. Database
-.br
 and the prefix parameter are handed through to osm2pgsql. They do not need
-.br
 to be repeated. \(cq\-\-append\(cq and \(cq\-\-slim\(cq will always be added as well.
-.br
 
-.br
 Use the \(cq\-\-post\-processing\(cq parameter to execute a script after osm2pgsql has
-.br
 run successfully. If the updates consists of multiple runs because the
-.br
 maximum size of downloaded data was reached, then the script is executed
-.br
 each time that osm2pgsql has run. When the post\-processing fails, then
-.br
 the entire update run is considered a failure and the replication information
-.br
 is not updated. That means that when 'update' is run the next time it will
-.br
 recommence with downloading the diffs again and reapplying them to the
-.br
 database. This is usually safe. The script receives two parameters:
-.br
 the sequence ID and timestamp of the last successful run. The timestamp
-.br
 may be missing in the rare case that the replication service stops responding
-.br
 after the updates have been downloaded.
 
 .TP
 \fBparam\fR
 Extra parameters to hand in to osm2pgsql.
 
+.SH OPTIONS \fI\,'osm2pgsql\-replication update'\/\fR
 .TP
-\fB\-\-diff\-file\fR FILE
+\fB\-\-diff\-file\fR \fI\,FILE\/\fR
 File to save changes before they are applied to osm2pgsql.
 
 .TP
@@ -225,9 +172,10 @@ Path to osm2pgsql command
 Run updates only once, even when more data is available.
 
 .TP
-\fB\-\-post\-processing\fR SCRIPT
+\fB\-\-post\-processing\fR \fI\,SCRIPT\/\fR
 Post\-processing script to run after each execution of osm2pgsql.
 
+.SH DEFAULT ARGUMENTS \fI\,'osm2pgsql\-replication update'\/\fR
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
 Print only error messages
@@ -236,122 +184,92 @@ Print only error messages
 \fB\-v\fR, \fB\-\-verbose\fR
 Increase verboseness of output
 
+.SH DATABASE ARGUMENTS \fI\,'osm2pgsql\-replication update'\/\fR
+The following arguments can be used to set the connection parameters to the
+osm2pgsql database. You may also use libpq environment variables to set
+connection parameters, see https://www.postgresql.org/docs/current/libpq\-envars.html.
+If your database connection requires a password, use a pgpass file,
+see https://www.postgresql.org/docs/current/libpq\-pgpass.html.
+
 .TP
-\fB\-d\fR DB, \fB\-\-database\fR DB
+\fB\-d\fR \fI\,DB\/\fR, \fB\-\-database\fR \fI\,DB\/\fR
 Name of PostgreSQL database to connect to or conninfo string
 
 .TP
-\fB\-U\fR NAME, \fB\-\-username\fR NAME
+\fB\-U\fR \fI\,NAME\/\fR, \fB\-\-username\fR \fI\,NAME\/\fR, \fB\-\-user\fR \fI\,NAME\/\fR
 PostgreSQL user name
 
 .TP
-\fB\-H\fR HOST, \fB\-\-host\fR HOST
+\fB\-H\fR \fI\,HOST\/\fR, \fB\-\-host\fR \fI\,HOST\/\fR
 Database server host name or socket location
 
 .TP
-\fB\-P\fR PORT, \fB\-\-port\fR PORT
+\fB\-P\fR \fI\,PORT\/\fR, \fB\-\-port\fR \fI\,PORT\/\fR
 Database server port
 
 .TP
-\fB\-p\fR PREFIX, \fB\-\-prefix\fR PREFIX
+\fB\-p\fR \fI\,PREFIX\/\fR, \fB\-\-prefix\fR \fI\,PREFIX\/\fR
 Prefix for table names (default 'planet_osm')
 
 .TP
-\fB\-\-middle\-schema\fR SCHEMA
+\fB\-\-middle\-schema\fR \fI\,SCHEMA\/\fR
 Name of the schema to store the table for the replication state in
 
 .TP
-\fB\-\-schema\fR SCHEMA
+\fB\-\-schema\fR \fI\,SCHEMA\/\fR
 Name of the schema for the database
 
-
-.SH OPTIONS 'osm2pgsql-replication status'
-usage: osm2pgsql-replication status [-h] [-q] [-v] [-d DB] [-U NAME] [-H HOST]
-                                    [-P PORT] [-p PREFIX]
-                                    [--middle-schema SCHEMA] [--schema SCHEMA]
-                                    [--json]
+.SH COMMAND \fI\,'osm2pgsql\-replication status'\/\fR
+usage: osm2pgsql\-replication status [\-h] [\-q] [\-v] [\-d DB] [\-U NAME] [\-H HOST]
+                                    [\-P PORT] [\-p PREFIX]
+                                    [\-\-middle\-schema SCHEMA] [\-\-schema SCHEMA]
+                                    [\-\-json]
 
 Print information about the current replication status, optionally as JSON.
-.br
 
-.br
 Sample output:
-.br
 
-.br
     2021\-08\-17 15:20:28 [INFO]: Using replication service 'https://planet.openstreetmap.org/replication/minute', which is at sequence 4675115 ( 2021\-08\-17T13:19:43Z )
-.br
     2021\-08\-17 15:20:28 [INFO]: Replication server's most recent data is <1 minute old
-.br
     2021\-08\-17 15:20:28 [INFO]: Local database is 8288 sequences behind the server, i.e. 5 day(s) 20 hour(s) 58 minute(s)
-.br
     2021\-08\-17 15:20:28 [INFO]: Local database's most recent data is 5 day(s) 20 hour(s) 59 minute(s) old
-.br
 
-.br
 
-.br
 With the \(cq\-\-json\(cq option, the status is printed as a json object.
-.br
 
-.br
     {
-.br
       "server": {
-.br
         "base_url": "https://planet.openstreetmap.org/replication/minute",
-.br
         "sequence": 4675116,
-.br
         "timestamp": "2021\-08\-17T13:20:43Z",
-.br
         "age_sec": 27
-.br
       },
-.br
       "local": {
-.br
         "sequence": 4666827,
-.br
         "timestamp": "2021\-08\-11T16:21:09Z",
-.br
         "age_sec": 507601
-.br
       },
-.br
       "status": 0
-.br
     }
-.br
 
-.br
 
-.br
 \(cqstatus\(cq is 0 if there were no problems getting the status. 1 & 2 for
-.br
-improperly set up replication. 3 for network issues. If status ≠ 0, then
-.br
-the \(cqerror\(cq key is an error message (as string). \(cqstatus\(cq is used as the
-.br
-exit code.
-.br
-
-.br
-\(cqserver\(cq is the replication server's current status. \(cqsequence\(cq is it's
-.br
+improperly set up replication. 3 for network issues. If status is greater 0,
+then the \(cqerror\(cq key is an error message (as string). \(cqstatus\(cq is used as
+the exit code.
+
+\(cqserver\(cq is the replication server's current status. \(cqsequence\(cq is its
 sequence number, \(cqtimestamp\(cq the time of that, and 'age_sec' the age of the
-.br
 data in seconds.
-.br
 
-.br
 \(cqlocal\(cq is the status of your server.
 
-
+.SH OPTIONS \fI\,'osm2pgsql\-replication status'\/\fR
 .TP
 \fB\-\-json\fR
 Output status as json.
 
+.SH DEFAULT ARGUMENTS \fI\,'osm2pgsql\-replication status'\/\fR
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
 Print only error messages
@@ -360,36 +278,41 @@ Print only error messages
 \fB\-v\fR, \fB\-\-verbose\fR
 Increase verboseness of output
 
+.SH DATABASE ARGUMENTS \fI\,'osm2pgsql\-replication status'\/\fR
+The following arguments can be used to set the connection parameters to the
+osm2pgsql database. You may also use libpq environment variables to set
+connection parameters, see https://www.postgresql.org/docs/current/libpq\-envars.html.
+If your database connection requires a password, use a pgpass file,
+see https://www.postgresql.org/docs/current/libpq\-pgpass.html.
+
 .TP
-\fB\-d\fR DB, \fB\-\-database\fR DB
+\fB\-d\fR \fI\,DB\/\fR, \fB\-\-database\fR \fI\,DB\/\fR
 Name of PostgreSQL database to connect to or conninfo string
 
 .TP
-\fB\-U\fR NAME, \fB\-\-username\fR NAME
+\fB\-U\fR \fI\,NAME\/\fR, \fB\-\-username\fR \fI\,NAME\/\fR, \fB\-\-user\fR \fI\,NAME\/\fR
 PostgreSQL user name
 
 .TP
-\fB\-H\fR HOST, \fB\-\-host\fR HOST
+\fB\-H\fR \fI\,HOST\/\fR, \fB\-\-host\fR \fI\,HOST\/\fR
 Database server host name or socket location
 
 .TP
-\fB\-P\fR PORT, \fB\-\-port\fR PORT
+\fB\-P\fR \fI\,PORT\/\fR, \fB\-\-port\fR \fI\,PORT\/\fR
 Database server port
 
 .TP
-\fB\-p\fR PREFIX, \fB\-\-prefix\fR PREFIX
+\fB\-p\fR \fI\,PREFIX\/\fR, \fB\-\-prefix\fR \fI\,PREFIX\/\fR
 Prefix for table names (default 'planet_osm')
 
 .TP
-\fB\-\-middle\-schema\fR SCHEMA
+\fB\-\-middle\-schema\fR \fI\,SCHEMA\/\fR
 Name of the schema to store the table for the replication state in
 
 .TP
-\fB\-\-schema\fR SCHEMA
+\fB\-\-schema\fR \fI\,SCHEMA\/\fR
 Name of the schema for the database
-
 .SH SEE ALSO
 * osm2pgsql website (https://osm2pgsql.org)
-.br
 * osm2pgsql manual (https://osm2pgsql.org/doc/manual.html)
 
diff --git a/man/osm2pgsql.1 b/man/osm2pgsql.1
index e4864b0dc..de2211e10 100644
--- a/man/osm2pgsql.1
+++ b/man/osm2pgsql.1
@@ -1,24 +1,21 @@
-.TH "OSM2PGSQL" "1" "2.1.1" "" ""
+.TH "OSM2PGSQL" "1" "2.2.0" "" ""
 .SH NAME
-.PP
-osm2pgsql - OpenStreetMap data to PostgreSQL converter
+osm2pgsql \- OpenStreetMap data to PostgreSQL converter
 .SH SYNOPSIS
-.PP
-\f[B]osm2pgsql\f[R] [\f[I]OPTIONS\f[R]] OSM-FILE\&...
+\f[B]osm2pgsql\f[R] [\f[I]OPTIONS\f[R]] OSM\-FILE\&...
 .SH DESCRIPTION
-.PP
 \f[B]osm2pgsql\f[R] imports OpenStreetMap data into a PostgreSQL/PostGIS
 database.
 It is an essential part of many rendering toolchains, the Nominatim
 geocoder and other applications processing OSM data.
 .PP
 \f[B]osm2pgsql\f[R] can run in either \[lq]create\[rq] mode (the
-default) or in \[lq]append\[rq] mode (option \f[B]-a, --append\f[R]).
+default) or in \[lq]append\[rq] mode (option \f[B]\-a, \-\-append\f[R]).
 .PP
 In \[lq]create\[rq] mode osm2pgsql will create the database tables
 required by the configuration and import the OSM file(s) specified on
 the command line into those tables.
-Note that you also have to use the \f[B]-s, --slim\f[R] option if you
+Note that you also have to use the \f[B]\-s, \-\-slim\f[R] option if you
 want your database to be updatable.
 .PP
 In \[lq]append\[rq] mode osm2pgsql will update the database tables with
@@ -26,108 +23,110 @@ the data from OSM change files specified on the command line.
 .PP
 This man page can only cover some of the basics and describe the command
 line options.
-See the Osm2pgsql Manual (https://osm2pgsql.org/doc/manual.html) for
-more information.
+See the \c
+.UR https://osm2pgsql.org/doc/manual.html
+Osm2pgsql Manual
+.UE \c
+\ for more information.
 .SH OPTIONS
-.PP
 This program follows the usual GNU command line syntax, with long
-options starting with two dashes (\f[V]--\f[R]).
+options starting with two dashes (\f[CR]\-\-\f[R]).
 Mandatory arguments to long options are mandatory for short options too.
 .SH MAIN OPTIONS
 .TP
--a, --append
+\-a, \-\-append
 Run in append mode.
 Adds the OSM change file into the database without removing existing
 data.
 .TP
--c, --create
+\-c, \-\-create
 Run in create mode.
-This is the default if \f[B]-a, --append\f[R] is not specified.
+This is the default if \f[B]\-a, \-\-append\f[R] is not specified.
 Removes existing data from the database tables!
 .SH HELP/VERSION OPTIONS
 .TP
--h, --help
+\-h, \-\-help
 Print help.
 .TP
--V, --version
+\-V, \-\-version
 Print osm2pgsql version.
 .SH LOGGING OPTIONS
 .TP
---log-level=LEVEL
+\-\-log\-level=LEVEL
 Set log level (`debug', `info' (default), `warn', or `error').
 .TP
---log-progress=VALUE
-Enable (\f[V]true\f[R]) or disable (\f[V]false\f[R]) progress logging.
-Setting this to \f[V]auto\f[R] will enable progress logging on the
+\-\-log\-progress=VALUE
+Enable (\f[CR]true\f[R]) or disable (\f[CR]false\f[R]) progress logging.
+Setting this to \f[CR]auto\f[R] will enable progress logging on the
 console and disable it if the output is redirected to a file.
 Default: true.
 .TP
---log-sql
+\-\-log\-sql
 Enable logging of SQL commands for debugging.
 .TP
---log-sql-data
+\-\-log\-sql\-data
 Enable logging of all data added to the database.
 This will write out a huge amount of data!
 For debugging.
 .TP
--v, --verbose
-Same as \f[V]--log-level=debug\f[R].
+\-v, \-\-verbose
+Same as \f[CR]\-\-log\-level=debug\f[R].
 .SH DATABASE OPTIONS
 .TP
--d, --database=NAME
+\-d, \-\-database=NAME
 The name of the PostgreSQL database to connect to.
-If this parameter contains an \f[V]=\f[R] sign or starts with a valid
-URI prefix (\f[V]postgresql://\f[R] or \f[V]postgres://\f[R]), it is
+If this parameter contains an \f[CR]=\f[R] sign or starts with a valid
+URI prefix (\f[CR]postgresql://\f[R] or \f[CR]postgres://\f[R]), it is
 treated as a conninfo string.
 See the PostgreSQL manual for details.
 .TP
--U, --username=NAME
+\-U, \-\-username=NAME, \-\-user=NAME
 Postgresql user name.
 .TP
--W, --password
+\-W, \-\-password
 Force password prompt.
 .TP
--H, --host=HOSTNAME
+\-H, \-\-host=HOSTNAME
 Database server hostname or unix domain socket location.
 .TP
--P, --port=PORT
+\-P, \-\-port=PORT
 Database server port.
 .TP
---schema=SCHEMA
+\-\-schema=SCHEMA
 Default for various schema settings throughout osm2pgsql (default:
-\f[V]public\f[R]).
+\f[CR]public\f[R]).
 The schema must exist in the database and be writable by the database
 user.
 .SH INPUT OPTIONS
 .TP
--r, --input-reader=FORMAT
+\-r, \-\-input\-reader=FORMAT
 Select format of the input file.
 Available choices are \f[B]auto\f[R] (default) for autodetecting the
 format, \f[B]xml\f[R] for OSM XML format files, \f[B]o5m\f[R] for o5m
 formatted files and \f[B]pbf\f[R] for OSM PBF binary format.
 .TP
--b, --bbox=MINLON,MINLAT,MAXLON,MAXLAT
+\-b, \-\-bbox=MINLON,MINLAT,MAXLON,MAXLAT
 Apply a bounding box filter on the imported data.
-Example: \f[B]--bbox\f[R] \f[B]-0.5,51.25,0.5,51.75\f[R]
+Example: \f[B]\-\-bbox\f[R] \f[B]\-0.5,51.25,0.5,51.75\f[R]
 .SH MIDDLE OPTIONS
 .TP
--i, --tablespace-index=TABLESPC
-Store all indexes in the PostgreSQL tablespace \f[V]TABLESPC\f[R].
+\-i, \-\-tablespace\-index=TABLESPC
+Store all indexes in the PostgreSQL tablespace \f[CR]TABLESPC\f[R].
 This option also affects the tables created by the pgsql output.
 This option is deprecated.
-Use the --tablespace-slim-index and/or --tablespace-main-index options
-instead.
+Use the \-\-tablespace\-slim\-index and/or \-\-tablespace\-main\-index
+options instead.
 .TP
---tablespace-slim-data=TABLESPC
+\-\-tablespace\-slim\-data=TABLESPC
 Store the slim mode tables in the given tablespace.
 .TP
---tablespace-slim-index=TABLESPC
+\-\-tablespace\-slim\-index=TABLESPC
 Store the indexes of the slim mode tables in the given tablespace.
 .TP
--p, --prefix=PREFIX
-Prefix for table names (default: \f[V]planet_osm\f[R]).
+\-p, \-\-prefix=PREFIX
+Prefix for table names (default: \f[CR]planet_osm\f[R]).
 .TP
--s, --slim
+\-s, \-\-slim
 Store temporary data in the database.
 Without this mode, all temporary data is stored in RAM and if you do not
 have enough the import will not work successfully.
@@ -136,7 +135,7 @@ with limited RAM, although if you do not have enough RAM to cache at
 least all of the nodes, the time to import the data will likely be
 greatly increased.
 .TP
---drop
+\-\-drop
 Drop the slim mode tables from the database and the flat node file once
 the import is complete.
 This can greatly reduce the size of the database, as the slim mode
@@ -150,56 +149,56 @@ nearly halve import time.
 Slim mode tables however have to be persistent if you want to be able to
 update your database, as these tables are needed for diff processing.
 .TP
--C, --cache=NUM
+\-C, \-\-cache=NUM
 Only for slim mode: Use up to \f[B]NUM\f[R] MB of RAM for caching nodes.
 Giving osm2pgsql sufficient cache to store all imported nodes typically
 greatly increases the speed of the import.
-Each cached node requires 8 bytes of cache, plus about 10% - 30%
+Each cached node requires 8 bytes of cache, plus about 10% \- 30%
 overhead.
 As a rule of thumb, give a bit more than the size of the import file in
 PBF format.
 If the RAM is not big enough, use about 75% of memory.
 Make sure to leave enough RAM for PostgreSQL.
-It needs at least the amount of \f[V]shared_buffers\f[R] given in its
+It needs at least the amount of \f[CR]shared_buffers\f[R] given in its
 configuration.
 Defaults to 800.
 .TP
--x, --extra-attributes
+\-x, \-\-extra\-attributes
 Include attributes of each object in the middle tables and make them
 available to the outputs.
 Attributes are: user name, user id, changeset id, timestamp and version.
 .TP
--F, --flat-nodes=FILENAME
+\-F, \-\-flat\-nodes=FILENAME
 Use a file on disk to store node locations instead of storing them in
-memory (in non-slim mode) or in the database (in slim mode).
+memory (in non\-slim mode) or in the database (in slim mode).
 This is much more efficient than storing the data in the database.
 Storing the node information for the full planet requires more than
 500GB in PostgreSQL, the same data is stored in \[lq]only\[rq] 90GB
-using the flat-nodes mode.
+using the flat\-nodes mode.
 This can also increase the speed of applying diff files.
-This option activates the flat-nodes mode and specifies the location of
+This option activates the flat\-nodes mode and specifies the location of
 the database file.
 It is a single large file.
 This mode is only recommended for full planet imports as it doesn\[cq]t
 work well with small imports.
 The default is disabled.
-The file will stay on disk after import, use --drop to remove it (but
+The file will stay on disk after import, use \-\-drop to remove it (but
 you can\[cq]t do updates then).
 .TP
---middle-schema=SCHEMA
+\-\-middle\-schema=SCHEMA
 Use PostgreSQL schema SCHEMA for all tables, indexes, and functions in
 the middle.
 The schema must exist in the database and be writable by the database
 user.
-By default the schema set with \f[V]--schema\f[R] is used, or
-\f[V]public\f[R] if that is not set.
+By default the schema set with \f[CR]\-\-schema\f[R] is used, or
+\f[CR]public\f[R] if that is not set.
 .TP
---middle-with-nodes
+\-\-middle\-with\-nodes
 When a flat nodes file is used, nodes are not stored in the database.
 Use this option to force storing nodes with tags in the database, too.
 .SH OUTPUT OPTIONS
 .TP
--O, --output=OUTPUT
+\-O, \-\-output=OUTPUT
 Specifies the output to use.
 Currently osm2pgsql supports \f[B]pgsql\f[R], \f[B]flex\f[R], and
 \f[B]null\f[R].
@@ -208,117 +207,123 @@ compatibility.
 New setups should use the \f[B]flex\f[R] output which allows for a much
 more flexible configuration.
 The \f[B]null\f[R] output does not write anything and is only useful for
-testing or with \f[B]--slim\f[R] for creating slim tables.
+testing or with \f[B]\-\-slim\f[R] for creating slim tables.
 .TP
--S, --style=FILE
+\-S, \-\-style=FILE
 The style file.
 This specifies how the data is imported into the database, its format
 depends on the output.
 (For the \f[B]pgsql\f[R] output, the default is
-\f[V]/usr/share/osm2pgsql/default.style\f[R], for other outputs there is
-no default.)
+\f[CR]/usr/share/osm2pgsql/default.style\f[R], for other outputs there
+is no default.)
 .SH PGSQL OUTPUT OPTIONS
 .TP
---tablespace-main-data=TABLESPC
-Store the data tables in the PostgreSQL tablespace \f[V]TABLESPC\f[R].
+\-\-tablespace\-main\-data=TABLESPC
+Store the data tables in the PostgreSQL tablespace \f[CR]TABLESPC\f[R].
 .TP
---tablespace-main-index=TABLESPC
-Store the indexes in the PostgreSQL tablespace \f[V]TABLESPC\f[R].
+\-\-tablespace\-main\-index=TABLESPC
+Store the indexes in the PostgreSQL tablespace \f[CR]TABLESPC\f[R].
 .TP
---latlong
+\-\-latlong
 Store coordinates in degrees of latitude & longitude.
 .TP
--m, --merc
+\-m, \-\-merc
 Store coordinates in Spherical Mercator (Web Mercator, EPSG:3857) (the
 default).
 .TP
--E, --proj=SRID
+\-E, \-\-proj=SRID
 Use projection EPSG:SRID.
 .TP
--p, --prefix=PREFIX
-Prefix for table names (default: \f[V]planet_osm\f[R]).
+\-p, \-\-prefix=PREFIX
+Prefix for table names (default: \f[CR]planet_osm\f[R]).
 This option affects the middle as well as the pgsql output table names.
 .TP
---tag-transform-script=SCRIPT
+\-\-tag\-transform\-script=SCRIPT
 Specify a Lua script to handle tag filtering and normalisation.
 The script contains callback functions for nodes, ways and relations,
 which each take a set of tags and returns a transformed, filtered set of
 tags which are then written to the database.
 .TP
--x, --extra-attributes
+\-x, \-\-extra\-attributes
 Include attributes (user name, user id, changeset id, timestamp and
 version).
 This also requires additional entries in your style file.
 .TP
--k, --hstore
+\-k, \-\-hstore
 Add tags without column to an additional hstore (key/value) column in
 the database tables.
 .TP
--j, --hstore-all
+\-j, \-\-hstore\-all
 Add all tags to an additional hstore (key/value) column in the database
 tables.
 .TP
--z, --hstore-column=PREFIX
-Add an additional hstore (key/value) column named \f[V]PREFIX\f[R]
-containing all tags that have a key starting with \f[V]PREFIX\f[R], eg
-\f[V]\[rs]--hstore-column \[dq]name:\[dq]\f[R] will produce an extra
-hstore column that contains all \f[V]name:xx\f[R] tags.
+\-z, \-\-hstore\-column=PREFIX
+Add an additional hstore (key/value) column named \f[CR]PREFIX\f[R]
+containing all tags that have a key starting with \f[CR]PREFIX\f[R], eg
+\f[CR]\[rs]\-\-hstore\-column \[dq]name:\[dq]\f[R] will produce an extra
+hstore column that contains all \f[CR]name:xx\f[R] tags.
 .TP
---hstore-match-only
-Only keep objects that have a value in at least one of the non-hstore
+\-\-hstore\-match\-only
+Only keep objects that have a value in at least one of the non\-hstore
 columns.
 .TP
---hstore-add-index
+\-\-hstore\-add\-index
 Create indexes for all hstore columns after import.
 .TP
--G, --multi-geometry
-Normally osm2pgsql splits multi-part geometries into separate database
+\-G, \-\-multi\-geometry
+Normally osm2pgsql splits multi\-part geometries into separate database
 rows per part.
 A single OSM object can therefore use several rows in the output tables.
-With this option, osm2pgsql instead generates multi-geometry features in
-the PostgreSQL tables.
+With this option, osm2pgsql instead generates multi\-geometry features
+in the PostgreSQL tables.
 .TP
--K, --keep-coastlines
+\-K, \-\-keep\-coastlines
 Keep coastline data rather than filtering it out.
-By default objects tagged \f[V]natural=coastline\f[R] will be discarded
+By default objects tagged \f[CR]natural=coastline\f[R] will be discarded
 based on the assumption that Shapefiles generated by OSMCoastline
 (https://osmdata.openstreetmap.de/) will be used for the coastline data.
 .TP
---reproject-area
+\-\-reproject\-area
 Compute area column using spherical mercator coordinates even if a
 different projection is used for the geometries.
 .TP
---output-pgsql-schema=SCHEMA
+\-\-output\-pgsql\-schema=SCHEMA
 Use PostgreSQL schema SCHEMA for all tables, indexes, and functions in
 the pgsql output.
 The schema must exist in the database and be writable by the database
 user.
-By default the schema set with \f[V]--schema\f[R] is used, or
-\f[V]public\f[R] if that is not set.
+By default the schema set with \f[CR]\-\-schema\f[R] is used, or
+\f[CR]public\f[R] if that is not set.
 .SH EXPIRE OPTIONS
 .TP
--e, --expire-tiles=[MIN_ZOOM-]MAX-ZOOM
+\-e, \-\-expire\-tiles=[MIN_ZOOM\-]MAX\-ZOOM
 Create a tile expiry list.
 .TP
--o, --expire-output=FILENAME
+\-o, \-\-expire\-output=FILENAME
 Output file name for expired tiles list.
 .TP
---expire-bbox-size=SIZE
+\-\-expire\-bbox\-size=SIZE
 Max size for a polygon to expire the whole polygon, not just the
 boundary.
 .SH ADVANCED OPTIONS
 .TP
--I, --disable-parallel-indexing
+\-I, \-\-disable\-parallel\-indexing
 Disable parallel clustering and index building on all tables, build one
 index after the other.
 .TP
---number-processes=THREADS
+\-\-number\-processes=THREADS
 Specifies the number of parallel threads used for certain operations.
 .SH SEE ALSO
 .IP \[bu] 2
-osm2pgsql website (https://osm2pgsql.org)
+\c
+.UR https://osm2pgsql.org
+osm2pgsql website
+.UE \c
 .IP \[bu] 2
-osm2pgsql manual (https://osm2pgsql.org/doc/manual.html)
+\c
+.UR https://osm2pgsql.org/doc/manual.html
+osm2pgsql manual
+.UE \c
 .IP \[bu] 2
 \f[B]postgres\f[R](1)
 .IP \[bu] 2

From 65dee52179b918a83248aa88549c762cd299a12c Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 22 Sep 2025 09:58:19 +0200
Subject: [PATCH 386/430] install osm2pgsql-expire

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22d37fb5b..968fc797c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -330,6 +330,7 @@ include(GNUInstallDirs)
 
 if (ENABLE_INSTALL)
     install(TARGETS osm2pgsql DESTINATION bin)
+    install(TARGETS osm2pgsql-expire DESTINATION bin)
     install(FILES default.style empty.style DESTINATION share/osm2pgsql)
     install(PROGRAMS scripts/osm2pgsql-replication DESTINATION bin)
     if (BUILD_GEN)

From c98b02af0401b27c1ef762e872c4427d1d3bee49 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 24 Oct 2025 11:45:21 +0200
Subject: [PATCH 387/430] Implement expire of points in its own code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead of generating a bounding box and using the general bbox expire
code.

This takes the expire buffer into account, so neighboring tiles are
expired if the point is near the tile boundary.

Other than before tiles affected wrap around at the 180° line.
---
 src/expire-tiles.cpp        | 18 ++++++++++++++++--
 tests/test-expire-tiles.cpp |  6 ++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/expire-tiles.cpp b/src/expire-tiles.cpp
index d9578cd89..8ad2e6c63 100644
--- a/src/expire-tiles.cpp
+++ b/src/expire-tiles.cpp
@@ -71,8 +71,22 @@ void expire_tiles_t::from_point_list(geom::point_list_t const &list,
 void expire_tiles_t::from_geometry(geom::point_t const &geom,
                                    expire_config_t const &expire_config)
 {
-    geom::box_t const box = geom::envelope(geom);
-    from_bbox(box, expire_config);
+    auto const tilec = coords_to_tile(geom);
+
+    auto const ymin =
+        std::max(0U, static_cast<uint32_t>(tilec.y() - expire_config.buffer));
+
+    auto const ymax =
+        std::min(m_map_width - 1U,
+                 static_cast<uint32_t>(tilec.y() + expire_config.buffer));
+
+    for (int x = static_cast<int>(tilec.x() - expire_config.buffer);
+         x <= static_cast<int>(tilec.x() + expire_config.buffer); ++x) {
+        uint32_t const norm_x = normalise_tile_x_coord(x);
+        for (uint32_t y = ymin; y <= ymax; ++y) {
+            expire_tile(norm_x, y);
+        }
+    }
 }
 
 void expire_tiles_t::from_geometry(geom::linestring_t const &geom,
diff --git a/tests/test-expire-tiles.cpp b/tests/test-expire-tiles.cpp
index 844bc49eb..b8409202d 100644
--- a/tests/test-expire-tiles.cpp
+++ b/tests/test-expire-tiles.cpp
@@ -189,9 +189,10 @@ TEST_CASE("simple expire z10 bounds 1023, 0", "[NoDB]")
                      expire_config_t{});
 
     auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
-    CHECK(tiles.size() == 1);
+    CHECK(tiles.size() == 2);
 
     auto itr = tiles.cbegin();
+    CHECK(*(itr++) == tile_t(10, 0, 0));
     CHECK(*(itr++) == tile_t(10, 1023, 0));
 }
 
@@ -205,9 +206,10 @@ TEST_CASE("simple expire z10 bounds 1023, 1023", "[NoDB]")
                      expire_config_t{});
 
     auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
-    CHECK(tiles.size() == 1);
+    CHECK(tiles.size() == 2);
 
     auto itr = tiles.cbegin();
+    CHECK(*(itr++) == tile_t(10, 0, 1023));
     CHECK(*(itr++) == tile_t(10, 1023, 1023));
 }
 

From be86625d9194d76da1ee400872f79275522d71c3 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 24 Oct 2025 16:44:11 +0200
Subject: [PATCH 388/430] Fix: Always disable expiry if maxzoom==0

maxzoom==0 is the default setting and it is documented to means that
there is no expire. That's what the enabled() function checks.

But disabling this in from_bbox() only disabled the expire for that
case, not for linestrings. Better to do this check in the function
that's called from outside the expire code:  from_geometry().

We also need to fix some tests that were using maxzoom==0 by changing
their setting to use maxzoom==1.
---
 src/expire-tiles.cpp          | 8 ++++----
 tests/bdd/flex/expire.feature | 8 ++++----
 tests/data/test_expire.lua    | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/expire-tiles.cpp b/src/expire-tiles.cpp
index 8ad2e6c63..b348cbeb8 100644
--- a/src/expire-tiles.cpp
+++ b/src/expire-tiles.cpp
@@ -147,6 +147,10 @@ void expire_tiles_t::from_geometry(geom::multipolygon_t const &geom,
 void expire_tiles_t::from_geometry(geom::geometry_t const &geom,
                                    expire_config_t const &expire_config)
 {
+    if (!enabled()) {
+        return;
+    }
+
     geom.visit([&](auto const &g) { from_geometry(g, expire_config); });
 }
 
@@ -224,10 +228,6 @@ void expire_tiles_t::from_line_segment(geom::point_t const &a,
 int expire_tiles_t::from_bbox(geom::box_t const &box,
                               expire_config_t const &expire_config)
 {
-    if (!enabled()) {
-        return 0;
-    }
-
     double const width = box.width();
     double const height = box.height();
     if (width > tile_t::HALF_EARTH_CIRCUMFERENCE + 1) {
diff --git a/tests/bdd/flex/expire.feature b/tests/bdd/flex/expire.feature
index 2230cf7a4..40c6f6f15 100644
--- a/tests/bdd/flex/expire.feature
+++ b/tests/bdd/flex/expire.feature
@@ -1,4 +1,4 @@
-Feature: Changes on way with expire on zoom 0
+Feature: Changes on way with expire on zoom 1
 
     Background:
         Given the style file 'test_expire.lua'
@@ -71,7 +71,7 @@ Feature: Changes on way with expire on zoom 0
             | 11     |
         Then table osm2pgsql_test_expire contains exactly
             | zoom | x | y |
-            | 0    | 0 | 0 |
+            | 1    | 1 | 0 |
 
 
     Scenario: change in t1
@@ -88,7 +88,7 @@ Feature: Changes on way with expire on zoom 0
             | way_id |
         Then table osm2pgsql_test_expire contains exactly
             | zoom | x | y |
-            | 0    | 0 | 0 |
+            | 1    | 1 | 0 |
 
 
     Scenario: remove from t1
@@ -105,4 +105,4 @@ Feature: Changes on way with expire on zoom 0
             | way_id |
         Then table osm2pgsql_test_expire contains exactly
             | zoom | x | y |
-            | 0    | 0 | 0 |
+            | 1    | 1 | 0 |
diff --git a/tests/data/test_expire.lua b/tests/data/test_expire.lua
index bd949e743..04b2fe234 100644
--- a/tests/data/test_expire.lua
+++ b/tests/data/test_expire.lua
@@ -1,7 +1,7 @@
 
--- No maxzoom sets it to 0
 local eo = osm2pgsql.define_expire_output({
     table = 'osm2pgsql_test_expire',
+    maxzoom = 1,
 })
 
 local the_table = osm2pgsql.define_way_table('osm2pgsql_test_t1', {

From 3984965378b8eb7eff5c3483f5dc4a71080967ed Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 27 Oct 2025 15:05:38 +0100
Subject: [PATCH 389/430] osm2pgsql-expire: Expire type=boundary relations as
 multipolygons

You can always use --mode=boundary_only to switch back to boundary only
interepretation.

So type=boundary is now treated exactly like type=multipolygon.

Also adds more information to man page.
---
 man/osm2pgsql-expire.1   | 75 ++++++++++++++++++++++++++--------------
 man/osm2pgsql-expire.md  | 22 +++++++++++-
 src/osm2pgsql-expire.cpp |  2 +-
 3 files changed, 71 insertions(+), 28 deletions(-)

diff --git a/man/osm2pgsql-expire.1 b/man/osm2pgsql-expire.1
index c6dbd023c..5425c3fa2 100644
--- a/man/osm2pgsql-expire.1
+++ b/man/osm2pgsql-expire.1
@@ -1,79 +1,102 @@
 .TH "OSM2PGSQL" "1" "2.2.0" "" ""
 .SH NAME
-osm2pgsql\-expire \- Visualize expire output
+.PP
+osm2pgsql-expire - Visualize expire output
 .SH SYNOPSIS
-\f[B]osm2pgsql\-expire\f[R] [\f[I]OPTIONS\f[R]] \f[I]OSM\-FILE\f[R] (1)
-\f[B]osm2pgsql\-expire\f[R] \f[I]TILES\-FILE\f[R] (2)
+.PP
+\f[B]osm2pgsql-expire\f[R] [\f[I]OPTIONS\f[R]] \f[I]OSM-FILE\f[R] (1)
+\f[B]osm2pgsql-expire\f[R] \f[I]TILES-FILE\f[R] (2)
 .SH DESCRIPTION
+.PP
 \f[B]This command is currently experimental.\f[R]
 .PP
 The expire command can be used for two things:
 .IP "1." 3
 \f[B]To check what tiles some OSM data is in.\f[R] If an
-\f[I]OSM\-FILE\f[R] is specified osm2pgsql\-expire will calculate the
+\f[I]OSM-FILE\f[R] is specified osm2pgsql-expire will calculate the
 tiles covering the objects in that file.
 Note that the file must not be a change file but a regular OSM data
 file!
 Output is, by default, a tile file, but GeoJSON is also possible.
+Covering tiles are only calculated for tagged objects.
 .IP "2." 3
-\f[B]Visualize tile list.\f[R] If a \f[I]TILE\-FILE\f[R] (presumably
+\f[B]Visualize tile list.\f[R] If a \f[I]TILE-FILE\f[R] (presumably
 generated by osm2pgsql) is specified, a GeoJSON file is generated
 showing all mentioned tiles.
 In this mode all command line options are ignored.
 .PP
 Read the \f[I]Expire\f[R] chapter of the osm2pgsql manual
 (https://osm2pgsql.org/doc/manual.html#expire) for details on how to
-interpret the \f[CR]\-m, \[rs]\-\-mode\f[R] and
-\f[CR]\[rs]\-\-full\-area\-limit\f[R] options.
+interpret the \f[V]-m, \[rs]--mode\f[R] and
+\f[V]\[rs]--full-area-limit\f[R] options.
+.SH GEOMETRY GENERATION
+.PP
+To calculate the tiles covering the specified OSM data in mode (1), a
+geometry has to be generated first for each object.
+This works as follow:
+.IP \[bu] 2
+For nodes a point geometry will be generated.
+.IP \[bu] 2
+For closed ways a polygon geometry will be generated, for non-closed
+ways a linestring geometry.
+If a generated polygon is not valid, the program will fall back to a
+linestring.
+If neither a valid polygon nor a valid linestring can be generated the
+object is ignored.
+.IP \[bu] 2
+For relations a geometry is generated based on the \f[V]type\f[R] tag.
+For types \f[V]multipolygon\f[R] and \f[V]boundary\f[R], a multipolygon
+geometry is created, for types \f[V]route\f[R] and
+\f[V]multilinestring\f[R] a multilinestring geometry is created, for all
+other types a geometry collection is created.
+.PP
+Note that for (multi)polygons it depends on the command line options
+--mode and --full-area-limit whether the tiles calculation is based on
+the area or the boundary of the (multi)polygons.
 .SH OPTIONS
+.PP
 This program follows the usual GNU command line syntax, with long
-options starting with two dashes (\f[CR]\-\-\f[R]).
+options starting with two dashes (\f[V]--\f[R]).
 Mandatory arguments to long options are mandatory for short options too.
 .SH MAIN OPTIONS
 .TP
-\-b, \-\-buffer=VALUE
+-b, --buffer=VALUE
 Set buffer size around geometry relative to tile size.
 Example: Set to 0.1 for a buffer that\[cq]s 10% of the tile size.
 .TP
-\-f, \-\-format=FORMAT
+-f, --format=FORMAT
 Output format.
 Options are `tiles' (default) or `geojson'.
 The GeoJSON output uses the Web Mercator projection (EPSG:3857) which is
 supported by many programs although, strictly speaking, it is not
 allowed by the GeoJSON spec.
 .TP
-\-\-full\-area\-limit=VALUE
+--full-area-limit=VALUE
 Set full area limit.
 .TP
-\-m, \-\-mode=MODE
+-m, --mode=MODE
 Set expire mode.
-One of \f[CR]boundary_only\f[R], \f[CR]full_area\f[R] (default), and
-\f[CR]hybrid\f[R].
+One of \f[V]boundary_only\f[R], \f[V]full_area\f[R] (default), and
+\f[V]hybrid\f[R].
 .TP
-\-z, \-\-zoom=ZOOM
+-z, --zoom=ZOOM
 Zoom level on which to calculate tiles.
 .SH HELP/VERSION OPTIONS
 .TP
-\-h, \-\-help
+-h, --help
 Print help.
 .TP
-\-V, \-\-version
+-V, --version
 Print osm2pgsql version.
 .SH LOGGING OPTIONS
 .TP
-\-\-log\-level=LEVEL
+--log-level=LEVEL
 Set log level (`debug', `info' (default), `warn', or `error').
 .SH SEE ALSO
 .IP \[bu] 2
-\c
-.UR https://osm2pgsql.org
-osm2pgsql website
-.UE \c
+osm2pgsql website (https://osm2pgsql.org)
 .IP \[bu] 2
-\c
-.UR https://osm2pgsql.org/doc/manual.html
-osm2pgsql manual
-.UE \c
+osm2pgsql manual (https://osm2pgsql.org/doc/manual.html)
 .IP \[bu] 2
 \f[B]osm2pgsql\f[R](1)
 .IP \[bu] 2
diff --git a/man/osm2pgsql-expire.md b/man/osm2pgsql-expire.md
index 3024b81b0..9c031ee5b 100644
--- a/man/osm2pgsql-expire.md
+++ b/man/osm2pgsql-expire.md
@@ -16,7 +16,8 @@ The expire command can be used for two things:
 1. **To check what tiles some OSM data is in.** If an *OSM-FILE* is specified
    osm2pgsql-expire will calculate the tiles covering the objects in that file.
    Note that the file must not be a change file but a regular OSM data file!
-   Output is, by default, a tile file, but GeoJSON is also possible.
+   Output is, by default, a tile file, but GeoJSON is also possible. Covering
+   tiles are only calculated for tagged objects.
 2. **Visualize tile list.** If a *TILE-FILE* (presumably generated by osm2pgsql)
    is specified, a GeoJSON file is generated showing all mentioned tiles. In
    this mode all command line options are ignored.
@@ -25,6 +26,25 @@ Read the *Expire* chapter of the osm2pgsql manual
 (https://osm2pgsql.org/doc/manual.html#expire) for details on how to
 interpret the `-m, \--mode` and `\--full-area-limit` options.
 
+# GEOMETRY GENERATION
+
+To calculate the tiles covering the specified OSM data in mode (1), a geometry
+has to be generated first for each object. This works as follow:
+
+* For nodes a point geometry will be generated.
+* For closed ways a polygon geometry will be generated, for non-closed ways
+  a linestring geometry. If a generated polygon is not valid, the program
+  will fall back to a linestring. If neither a valid polygon nor a valid
+  linestring can be generated the object is ignored.
+* For relations a geometry is generated based on the `type` tag. For types
+  `multipolygon` and `boundary`, a multipolygon geometry is created, for types
+  `route` and `multilinestring` a multilinestring geometry is created, for
+  all other types a geometry collection is created.
+
+Note that for (multi)polygons it depends on the command line options \--mode
+and \--full-area-limit whether the tiles calculation is based on the area or
+the boundary of the (multi)polygons.
+
 # OPTIONS
 
 This program follows the usual GNU command line syntax, with long options
diff --git a/src/osm2pgsql-expire.cpp b/src/osm2pgsql-expire.cpp
index d9616f869..fff07589b 100644
--- a/src/osm2pgsql-expire.cpp
+++ b/src/osm2pgsql-expire.cpp
@@ -189,7 +189,7 @@ void output_expire_t::relation_add(osmium::Relation const &relation)
     osmium::memory::Buffer tmp_buffer{1024,
                                       osmium::memory::Buffer::auto_grow::yes};
     geom::geometry_t geom;
-    if (type == "multipolygon") {
+    if (type == "multipolygon" || type == "boundary") {
         log_debug("Creating multipolygon from relation {}...", relation.id());
         geom::create_multipolygon(&geom, relation, buffer, &tmp_buffer);
     } else if (type == "route" || type == "multilinestring") {

From 47938815da5ae734d113d7fb62af64fbb85bfd80 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 30 Oct 2025 14:28:05 +0100
Subject: [PATCH 390/430] Flex: Allow creating point geometry from way

This allows the as_point() function to be called for ways. The function
has a single (optional) parameter specifying which member node to create
the point from. The index parameter is 1-based as usual in Lua. Negative
indexes count from the back,

:as_point(), :as_point(nil), :as_point(1) will return the first node,
:as_point(2) the second node and so on. :as_point(-1) will return the
last node.

If the index is 0 or out of range a null geometry will be returned. If
the parameter is not a number an error will be generated.
---
 src/geom-from-osm.cpp                 | 13 +++-
 src/geom-from-osm.hpp                 |  9 +++
 src/output-flex.cpp                   | 41 +++++++++++-
 tests/bdd/flex/geometry-point.feature | 95 +++++++++++++++++++++++++++
 tests/test-geom-linestrings.cpp       | 44 +++++++++++++
 tests/test-geom-points.cpp            | 14 ++++
 6 files changed, 210 insertions(+), 6 deletions(-)
 create mode 100644 tests/bdd/flex/geometry-point.feature

diff --git a/src/geom-from-osm.cpp b/src/geom-from-osm.cpp
index c1f0f10d8..e7002d29a 100644
--- a/src/geom-from-osm.cpp
+++ b/src/geom-from-osm.cpp
@@ -19,11 +19,18 @@
 
 namespace geom {
 
+void create_point(geometry_t *geom, osmium::Location const &location)
+{
+    if (location.valid()) {
+        auto &point = geom->set<point_t>();
+        point.set_x(location.lon());
+        point.set_y(location.lat());
+    }
+}
+
 void create_point(geometry_t *geom, osmium::Node const &node)
 {
-    auto &point = geom->set<point_t>();
-    point.set_x(node.location().lon());
-    point.set_y(node.location().lat());
+    create_point(geom, node.location());
 }
 
 geometry_t create_point(osmium::Node const &node)
diff --git a/src/geom-from-osm.hpp b/src/geom-from-osm.hpp
index 4db2c8654..0d295cebf 100644
--- a/src/geom-from-osm.hpp
+++ b/src/geom-from-osm.hpp
@@ -27,6 +27,15 @@
 
 namespace geom {
 
+/**
+ * Create a point geometry from a location. If the location is not valid,
+ * the output will not be changed.
+ *
+ * \param geom Pointer to an existing geometry which will be used as output.
+ * \param location The input location.
+ */
+void create_point(geometry_t *geom, osmium::Location const &location);
+
 /**
  * Create a point geometry from a node.
  *
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 5c27e901d..3b554e25e 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -454,11 +454,46 @@ int output_flex_t::app_get_bbox()
 
 int output_flex_t::app_as_point()
 {
-    check_context_and_state("as_point", "node",
-                            m_calling_context != calling_context::process_node);
+    check_for_object(lua_state(), "as_point");
+
+    if (m_calling_context == calling_context::process_node) {
+        if (lua_gettop(lua_state()) > 1) {
+            throw fmt_error("No parameter(s) needed for as_point().");
+        }
+        auto *geom = create_lua_geometry_object(lua_state());
+        geom::create_point(geom, *m_context_node);
+        return 1;
+    }
+
+    if (m_calling_context != calling_context::process_way) {
+        throw fmt_error(
+            "The function as_point() can only be called (directly "
+            "or indirectly) from the process_[untagged]_node/way() functions.");
+    }
+
+    if (lua_gettop(lua_state()) > 2) {
+        throw fmt_error("Too many arguments for function as_point()");
+    }
+
+    m_way_cache.add_nodes(middle());
+    auto const &nodes = m_way_cache.get().nodes();
+
+    int64_t n = 1; // get first node by default
+    if (lua_gettop(lua_state()) > 1) {
+        if (lua_type(lua_state(), 2) != LUA_TNUMBER) {
+            throw std::runtime_error{
+                "Argument #1 to 'as_point()' must be an integer."};
+        }
+        n = lua_tointeger(lua_state(), 2);
+        if (n < 0) { // negative index values count from the back
+            n += static_cast<int64_t>(nodes.size()) + 1;
+        }
+    }
 
     auto *geom = create_lua_geometry_object(lua_state());
-    geom::create_point(geom, *m_context_node);
+    if (n > 0 && static_cast<std::size_t>(n) <= nodes.size()) {
+        geom::create_point(geom, nodes[n - 1].location());
+    } // fall through returning null geometry if 0 or too large or small
 
     return 1;
 }
diff --git a/tests/bdd/flex/geometry-point.feature b/tests/bdd/flex/geometry-point.feature
new file mode 100644
index 000000000..493c246b6
--- /dev/null
+++ b/tests/bdd/flex/geometry-point.feature
@@ -0,0 +1,95 @@
+Feature: Creating point features from way
+
+    Scenario:
+        Given the grid
+            | 1 | 2 |   |
+            | 4 |   | 3 |
+            |   | 5 |   |
+        And the OSM data
+            """
+            w20 Thighway=motorway Nn1,n2,n3
+            w21 Thighway=motorway Nn4,n5
+            """
+        And the lua style
+            """
+            local points = osm2pgsql.define_way_table('osm2pgsql_test_points', {
+                { column = 'n', type = 'int' },
+                { column = 'geom', type = 'point', projection = 4326, not_null = false },
+            })
+
+            function osm2pgsql.process_way(object)
+                if object.tags.highway == 'motorway' then
+                    points:insert({ n = nil, geom = object:as_point() })
+                    points:insert({ n =   0, geom = object:as_point(0) })
+                    points:insert({ n =   1, geom = object:as_point(1) })
+                    points:insert({ n =   2, geom = object:as_point(2) })
+                    points:insert({ n =   3, geom = object:as_point(3) })
+                    points:insert({ n =   4, geom = object:as_point(4) })
+                    points:insert({ n =  -1, geom = object:as_point(-1) })
+                    points:insert({ n =  -2, geom = object:as_point(-2) })
+                    points:insert({ n =  -3, geom = object:as_point(-3) })
+                end
+            end
+            """
+        When running osm2pgsql flex
+
+        Then table osm2pgsql_test_points contains exactly
+            | way_id | n    | ST_AsText(geom) |
+            | 20     | NULL | 1               |
+            | 20     | 0    | NULL            |
+            | 20     | 1    | 1               |
+            | 20     | 2    | 2               |
+            | 20     | 3    | 3               |
+            | 20     | 4    | NULL            |
+            | 20     | -1   | 3               |
+            | 20     | -2   | 2               |
+            | 20     | -3   | 1               |
+            | 21     | NULL | 4               |
+            | 21     | 0    | NULL            |
+            | 21     | 1    | 4               |
+            | 21     | 2    | 5               |
+            | 21     | 3    | NULL            |
+            | 21     | 4    | NULL            |
+            | 21     | -1   | 5               |
+            | 21     | -2   | 4               |
+            | 21     | -3   | NULL            |
+
+    Scenario:
+        Given the grid
+            | 1 | 2 |
+        And the OSM data
+            """
+            w20 Thighway=motorway Nn1,n2
+            """
+        And the lua style
+            """
+            function osm2pgsql.process_way(object)
+                local geom = object:as_point('foo')
+            end
+            """
+        Then running osm2pgsql flex fails
+
+        And the error output contains
+            """
+            Argument #1 to 'as_point()' must be an integer.
+            """
+
+    Scenario:
+        Given the grid
+            | 1 | 2 |
+        And the OSM data
+            """
+            w20 Thighway=motorway Nn1,n2
+            """
+        And the lua style
+            """
+            function osm2pgsql.process_way(object)
+                local geom = object:as_point(1, 'foo')
+            end
+            """
+        Then running osm2pgsql flex fails
+
+        And the error output contains
+            """
+            Too many arguments for function as_point()
+            """
diff --git a/tests/test-geom-linestrings.cpp b/tests/test-geom-linestrings.cpp
index 33420de6f..b50de68ef 100644
--- a/tests/test-geom-linestrings.cpp
+++ b/tests/test-geom-linestrings.cpp
@@ -115,6 +115,50 @@ TEST_CASE("create_linestring from invalid OSM data", "[NoDB]")
     REQUIRE(geom.is_null());
 }
 
+TEST_CASE("create_point from OSM way data", "[NoDB]")
+{
+    test_buffer_t buffer;
+    buffer.add_way("w20 Nn1x1y1,n2x2y2");
+
+    auto const &nodes = buffer.buffer().get<osmium::Way>(0).nodes();
+    geom::geometry_t geom;
+    geom::create_point(&geom, nodes[0].location());
+
+    REQUIRE(geom.is_point());
+    REQUIRE(geometry_type(geom) == "POINT");
+    REQUIRE(dimension(geom) == 0);
+    REQUIRE(num_geometries(geom) == 1);
+    REQUIRE(geom.get<geom::point_t>() == geom::point_t{1, 1});
+}
+
+TEST_CASE("create_point from OSM data without locations", "[NoDB]")
+{
+    test_buffer_t buffer;
+    buffer.add_way("w20 Nn1,n2");
+
+    auto const &nodes = buffer.buffer().get<osmium::Way>(0).nodes();
+    geom::geometry_t geom;
+    geom::create_point(&geom, nodes[0].location());
+
+    REQUIRE(geom.is_null());
+}
+
+TEST_CASE("create_point from way with single node", "[NoDB]")
+{
+    test_buffer_t buffer;
+    buffer.add_way("w20 Nn1x1y1");
+
+    auto const &nodes = buffer.buffer().get<osmium::Way>(0).nodes();
+    geom::geometry_t geom;
+    geom::create_point(&geom, nodes[0].location());
+
+    REQUIRE(geom.is_point());
+    REQUIRE(geometry_type(geom) == "POINT");
+    REQUIRE(dimension(geom) == 0);
+    REQUIRE(num_geometries(geom) == 1);
+    REQUIRE(geom.get<geom::point_t>() == geom::point_t{1, 1});
+}
+
 TEST_CASE("geom::segmentize w/o split", "[NoDB]")
 {
     geom::linestring_t const expected{{0, 0}, {1, 2}, {2, 2}};
diff --git a/tests/test-geom-points.cpp b/tests/test-geom-points.cpp
index 13b07e8d4..94e5e0418 100644
--- a/tests/test-geom-points.cpp
+++ b/tests/test-geom-points.cpp
@@ -42,6 +42,20 @@ TEST_CASE("geom::point_t from location", "[NoDB]")
     REQUIRE(p == geom::point_t{3.141, 2.718});
 }
 
+TEST_CASE("geom::point_t from location with create_point", "[NoDB]")
+{
+    osmium::Location const location{1.1, 2.2};
+
+    geom::geometry_t geom;
+    geom::create_point(&geom, location);
+    REQUIRE(geom.is_point());
+
+    auto const &p = geom.get<geom::point_t>();
+    REQUIRE(p.x() == Approx(1.1));
+    REQUIRE(p.y() == Approx(2.2));
+    REQUIRE(p == geom::point_t{1.1, 2.2});
+}
+
 TEST_CASE("create_point from OSM data", "[NoDB]")
 {
     test_buffer_t buffer;

From 35ef2de952c4bb41fcec2919465ea46a4c9a6008 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 6 Nov 2025 16:53:52 +0100
Subject: [PATCH 391/430] bdd: change handling of untagged nodes

Nodes defined in the grid are now added to the import data only
when the grid is defined, not when the final OPL is generated.
This avoids untagged nodes being added again when running updates.
---
 tests/bdd/flex/expire.feature           |  5 -----
 tests/bdd/flex/locator.feature          |  3 +--
 tests/bdd/flex/node-add.feature         | 18 +++++----------
 tests/bdd/flex/relation-changes.feature | 27 ++++++++--------------
 tests/bdd/flex/way-add.feature          | 18 +++++----------
 tests/bdd/flex/way-change.feature       | 15 +++++--------
 tests/bdd/flex/way-del.feature          | 24 +++++++-------------
 tests/bdd/flex/way-relation-add.feature | 30 +++++++++----------------
 tests/bdd/flex/way-relation-del.feature | 15 +++++--------
 tests/bdd/steps/geometry_factory.py     | 30 +++++++++----------------
 tests/bdd/steps/steps_execute.py        |  2 --
 tests/bdd/steps/steps_osm_data.py       | 26 ++++++++++++---------
 12 files changed, 76 insertions(+), 137 deletions(-)

diff --git a/tests/bdd/flex/expire.feature b/tests/bdd/flex/expire.feature
index 2230cf7a4..623cdd794 100644
--- a/tests/bdd/flex/expire.feature
+++ b/tests/bdd/flex/expire.feature
@@ -26,7 +26,6 @@ Feature: Changes on way with expire on zoom 0
             """
             w10 v1 dV Ta=b Nn10,n11
             """
-        And an empty grid
 
         When running osm2pgsql flex with parameters
             | --slim | -a |
@@ -43,7 +42,6 @@ Feature: Changes on way with expire on zoom 0
             """
             n1 v2 dV x1 y2
             """
-        And an empty grid
 
         When running osm2pgsql flex with parameters
             | --slim | -a |
@@ -60,7 +58,6 @@ Feature: Changes on way with expire on zoom 0
             """
             w10 v1 dV Tt1=yes Nn10,n11
             """
-        And an empty grid
 
         When running osm2pgsql flex with parameters
             | --slim | -a |
@@ -79,7 +76,6 @@ Feature: Changes on way with expire on zoom 0
             """
             w11 v2 dV Ta=b Nn10,n11
             """
-        And an empty grid
 
         When running osm2pgsql flex with parameters
             | --slim | -a |
@@ -96,7 +92,6 @@ Feature: Changes on way with expire on zoom 0
             """
             w11 v2 dD
             """
-        And an empty grid
 
         When running osm2pgsql flex with parameters
             | --slim | -a |
diff --git a/tests/bdd/flex/locator.feature b/tests/bdd/flex/locator.feature
index 7a97b6b8f..1e1bf9aec 100644
--- a/tests/bdd/flex/locator.feature
+++ b/tests/bdd/flex/locator.feature
@@ -199,8 +199,7 @@ Feature: Locators
             | way_id | region | ST_AsText(geom)         |
             | 20     | P1     | (10 0,20 10,10 10,10 0) |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             n10 v1 dV Tamenity=post_box x15.0 y8.0
             n11 v1 dV Tamenity=post_box x15.0 y2.0
diff --git a/tests/bdd/flex/node-add.feature b/tests/bdd/flex/node-add.feature
index 178ba81b1..f5790dc3c 100644
--- a/tests/bdd/flex/node-add.feature
+++ b/tests/bdd/flex/node-add.feature
@@ -27,8 +27,7 @@ Feature: Adding nodes to a flex database
 
 
     Scenario: node is not relevant
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             n10 v1 dV Tt=ag x0 y0
             r30 v2 dV Tt=ag Mn10@,n11@,n12@mark,n13@,n14@mark
@@ -49,8 +48,7 @@ Feature: Adding nodes to a flex database
 
 
     Scenario: add to t1
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             n10 v1 dV Tt1=yes x0 y0
             r30 v2 dV Tt=ag Mn10@,n11@,n12@mark,n13@,n14@mark
@@ -72,8 +70,7 @@ Feature: Adding nodes to a flex database
 
 
     Scenario: add to t2
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             n10 v1 dV Tt2=yes x0 y0
             r30 v2 dV Tt=ag Mn10@mark,n11@,n12@mark,n13@,n14@mark
@@ -95,8 +92,7 @@ Feature: Adding nodes to a flex database
 
 
     Scenario: add to t1 and t2
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             n10 v1 dV Tt1=yes,t2=yes x0 y0
             r30 v2 dV Tt=ag Mn10@mark,n11@,n12@mark,n13@,n14@mark
@@ -119,8 +115,7 @@ Feature: Adding nodes to a flex database
 
 
     Scenario: add to tboth (only stage1)
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             n10 v1 dV Ttboth=yes x0 y0
             r30 v2 dV Tt=ag Mn10@,n11@,n12@mark,n13@,n14@mark
@@ -142,8 +137,7 @@ Feature: Adding nodes to a flex database
 
 
     Scenario: add to tboth (stage1 and stage2)
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             n10 v1 dV Ttboth=yes x0 y0
             r30 v2 dV Tt=ag Mn10@mark,n11@,n12@mark,n13@,n14@mark
diff --git a/tests/bdd/flex/relation-changes.feature b/tests/bdd/flex/relation-changes.feature
index a05c469e7..4f16d6c65 100644
--- a/tests/bdd/flex/relation-changes.feature
+++ b/tests/bdd/flex/relation-changes.feature
@@ -32,8 +32,7 @@ Feature: Handling changes to relations
             | --slim |
         Then table osm2pgsql_test_relations has 0 rows
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             r30 v2 dV Ttype=multipolygon Mw20@,w21@
             """
@@ -56,8 +55,7 @@ Feature: Handling changes to relations
             | --slim |
         Then table osm2pgsql_test_relations has 0 rows
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             w21 v2 dV Nn12,n13,n10
             """
@@ -79,8 +77,7 @@ Feature: Handling changes to relations
             | --slim |
         Then table osm2pgsql_test_relations has 0 rows
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             n12 v2 dV x10.1 y10.1
             """
@@ -103,8 +100,7 @@ Feature: Handling changes to relations
             | --slim |
         Then table osm2pgsql_test_relations has 0 rows
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             r30 v2 dV Ttype=multipolygon Mw20@,w21@
             """
@@ -127,8 +123,7 @@ Feature: Handling changes to relations
             | --slim |
         Then table osm2pgsql_test_relations has 1 row
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             r30 v2 dV Mw20@,w21@
             """
@@ -151,8 +146,7 @@ Feature: Handling changes to relations
             | --slim |
         Then table osm2pgsql_test_relations has 1 row
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             w21 v2 dV <new nodelist>
             """
@@ -180,8 +174,7 @@ Feature: Handling changes to relations
             | --slim |
         Then table osm2pgsql_test_relations has 1 row
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             n12 v2 dV <new coordinates>
             """
@@ -209,8 +202,7 @@ Feature: Handling changes to relations
             | --slim |
         Then table osm2pgsql_test_relations has 1 row
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             r30 v2 dV Ttype=multipolygon <new memberlist>
             """
@@ -240,8 +232,7 @@ Feature: Handling changes to relations
             | area_id | tags->'natural' | tags->'landuse' |
             | -30     | wood            | NULL            |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             r30 v2 dV Ttype=multipolygon,landuse=forest Mw20@,w21@
             """
diff --git a/tests/bdd/flex/way-add.feature b/tests/bdd/flex/way-add.feature
index bad8041ef..4b7ca86a1 100644
--- a/tests/bdd/flex/way-add.feature
+++ b/tests/bdd/flex/way-add.feature
@@ -31,8 +31,7 @@ Feature: Adding ways to a flex database
 
 
     Scenario: way is not relevant
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             w10 v1 dV Tt=ag Nn10,n11
             r30 v2 dV Tt=ag Mw10@,w11@,w12@mark,w13@,w14@mark
@@ -53,8 +52,7 @@ Feature: Adding ways to a flex database
 
 
     Scenario: add to t1
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             w10 v1 dV Tt1=yes Nn10,n11
             r30 v2 dV Tt=ag Mw10@,w11@,w12@mark,w13@,w14@mark
@@ -76,8 +74,7 @@ Feature: Adding ways to a flex database
 
 
     Scenario: add to t2
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             w10 v1 dV Tt2=yes Nn10,n11
             r30 v2 dV Tt=ag Mw10@mark,w11@,w12@mark,w13@,w14@mark
@@ -99,8 +96,7 @@ Feature: Adding ways to a flex database
 
 
     Scenario: add to t1 and t2
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             w10 v1 dV Tt1=yes,t2=yes Nn10,n11
             r30 v2 dV Tt=ag Mw10@mark,w11@,w12@mark,w13@,w14@mark
@@ -123,8 +119,7 @@ Feature: Adding ways to a flex database
 
 
     Scenario: add to tboth (only stage1)
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             w10 v1 dV Ttboth=yes Nn10,n11
             r30 v2 dV Tt=ag Mw10@,w11@,w12@mark,w13@,w14@mark
@@ -146,8 +141,7 @@ Feature: Adding ways to a flex database
 
 
     Scenario: add to tboth (stage1 and stage2)
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             w10 v1 dV Ttboth=yes Nn10,n11
             r30 v2 dV Tt=ag Mw10@mark,w11@,w12@mark,w13@,w14@mark
diff --git a/tests/bdd/flex/way-change.feature b/tests/bdd/flex/way-change.feature
index 941c8d319..4346fec50 100644
--- a/tests/bdd/flex/way-change.feature
+++ b/tests/bdd/flex/way-change.feature
@@ -31,8 +31,7 @@ Feature: Changing ways in a flex database
             | 13     |
             | 14     |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             <input>
             """
@@ -84,8 +83,7 @@ Feature: Changing ways in a flex database
             | 13     |
             | 14     |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             <input>
             """
@@ -138,8 +136,7 @@ Feature: Changing ways in a flex database
             | 13     |
             | 14     |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             <input>
             """
@@ -196,8 +193,7 @@ Feature: Changing ways in a flex database
             | 13     | NULL    |
             | 14     | {30}    |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             <input>
             """
@@ -243,8 +239,7 @@ Feature: Changing ways in a flex database
             | 13     | NULL    |
             | 14     | {30}    |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             w10 v2 dV Tt1=yes,t2=yes,tboth=yes Nn10,n11
             """
diff --git a/tests/bdd/flex/way-del.feature b/tests/bdd/flex/way-del.feature
index 0e650e885..bc0d25d17 100644
--- a/tests/bdd/flex/way-del.feature
+++ b/tests/bdd/flex/way-del.feature
@@ -31,8 +31,7 @@ Feature: Deleting ways in a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             w10 v2 dD
             """
@@ -74,8 +73,7 @@ Feature: Deleting ways in a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             w10 v2 dD
             """
@@ -117,8 +115,7 @@ Feature: Deleting ways in a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             w10 v2 dD
             """
@@ -159,8 +156,7 @@ Feature: Deleting ways in a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             w10 v2 dD
             """
@@ -202,8 +198,7 @@ Feature: Deleting ways in a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             w10 v2 dD
             """
@@ -245,8 +240,7 @@ Feature: Deleting ways in a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             w10 v2 dD
             """
@@ -289,8 +283,7 @@ Feature: Deleting ways in a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             w10 v2 dD
             """
@@ -332,8 +325,7 @@ Feature: Deleting ways in a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             w10 v2 dD
             """
diff --git a/tests/bdd/flex/way-relation-add.feature b/tests/bdd/flex/way-relation-add.feature
index 984f7862b..3ec232b37 100644
--- a/tests/bdd/flex/way-relation-add.feature
+++ b/tests/bdd/flex/way-relation-add.feature
@@ -34,8 +34,7 @@ Feature: Adding relations to a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             r32 v2 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@,w15@
             """
@@ -86,8 +85,7 @@ Feature: Adding relations to a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             r32 v2 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@,w15@
             """
@@ -133,8 +131,7 @@ Feature: Adding relations to a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             r32 v2 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@,w15@
             """
@@ -180,8 +177,7 @@ Feature: Adding relations to a 2-stage flex database
             | 13     | NULL    |
             | 14     | {30}    |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             r32 v2 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@,w15@
             """
@@ -231,8 +227,7 @@ Feature: Adding relations to a 2-stage flex database
             | 13     | NULL    |
             | 14     | {30}    |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             r32 v2 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@,w15@
             """
@@ -277,8 +272,7 @@ Feature: Adding relations to a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             r32 v2 dV Tt=ag Mw10@,w11@,w12@,w13@,w14@,w15@
             """
@@ -328,8 +322,7 @@ Feature: Adding relations to a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             r32 v2 dV Tt=ag Mw10@mark,w11@,w12@,w13@,w14@,w15@
             """
@@ -375,8 +368,7 @@ Feature: Adding relations to a 2-stage flex database
             | 13     |
             | 14     |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             r32 v2 dV Tt=ag Mw10@,w11@,w12@,w13@,w14@,w15@
             """
@@ -422,8 +414,7 @@ Feature: Adding relations to a 2-stage flex database
             | 13     | NULL    |
             | 14     | {30}    |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             r32 v2 dV Tt=ag Mw10@,w11@,w12@,w13@,w14@,w15@
             """
@@ -468,8 +459,7 @@ Feature: Adding relations to a 2-stage flex database
             | 13     | NULL    |
             | 14     | {30}    |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             r32 v2 dV Tt=ag Mw10@,w11@,w12@,w13@,w14@,w15@
             """
diff --git a/tests/bdd/flex/way-relation-del.feature b/tests/bdd/flex/way-relation-del.feature
index 1efc34ef0..eb15b807d 100644
--- a/tests/bdd/flex/way-relation-del.feature
+++ b/tests/bdd/flex/way-relation-del.feature
@@ -33,8 +33,7 @@ Feature: Deleting relations in a stage-2 flex database
             | 13     |
             | 14     |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             r32 v2 dD
             """
@@ -78,8 +77,7 @@ Feature: Deleting relations in a stage-2 flex database
             | 13     |
             | 14     |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             r32 v2 dD
             """
@@ -125,8 +123,7 @@ Feature: Deleting relations in a stage-2 flex database
             | 13     |
             | 14     |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             <input>
             """
@@ -176,8 +173,7 @@ Feature: Deleting relations in a stage-2 flex database
             | 13     |
             | 14     |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             <input>
             """
@@ -228,8 +224,7 @@ Feature: Deleting relations in a stage-2 flex database
             | 13     |
             | 14     |
 
-        Given an empty grid
-        And the OSM data
+        Given the OSM data
             """
             <input>
             """
diff --git a/tests/bdd/steps/geometry_factory.py b/tests/bdd/steps/geometry_factory.py
index 41e3f18ee..b56361da6 100644
--- a/tests/bdd/steps/geometry_factory.py
+++ b/tests/bdd/steps/geometry_factory.py
@@ -64,10 +64,6 @@ def mk_wkt_points(self, geom):
         return ','.join([self.mk_wkt_point(x) for x in geom.split(',')])
 
 
-    def remove_grid(self):
-        self.grid = {}
-
-
     def set_grid(self, lines, grid_step, origin_x, origin_y):
         """ Replace the grid with one from the given lines.
         """
@@ -92,23 +88,17 @@ def grid_node(self, nodeid):
         """
         return self.grid.get(nodeid)
 
+    def as_opl_lines(self):
+        return [f"n{nid} x{c[0]:.{self.grid_precision}f} y{c[1]:.{self.grid_precision}f}"
+                for nid, c in self.grid.items()]
 
-    def complete_node_list(self, nodes):
-        todos = set(self.grid.keys())
-
-        for i in range(len(nodes)):
-            line = nodes[i]
-            nid = int(line[1:].split(' ')[0])
-
-            if ' x' not in line:
-                assert ' y' not in line
+    def complete_opl(self, opl):
+        if opl[0] != 'n' or ' x' in opl:
+            return opl
 
-                coords = self.grid_node(nid)
-                assert coords is not None, f"Coordinates missing for node {nid}"
-                nodes[i] = f"{line} x{coords[0]:.{self.grid_precision}f} y{coords[1]:.{self.grid_precision}f}"
+        nid = int(opl.split(' ', 1)[0][1:])
 
-            todos.discard(nid)
+        coords = self.grid_node(nid)
+        assert coords is not None, f"Coordinates missing for node {nid}"
 
-        for nid in todos:
-            coords = self.grid_node(nid)
-            nodes.append(f"n{nid} x{coords[0]:.{self.grid_precision}f} y{coords[1]:.{self.grid_precision}f}")
+        return f"{opl} x{coords[0]:.{self.grid_precision}f} y{coords[1]:.{self.grid_precision}f}"
diff --git a/tests/bdd/steps/steps_execute.py b/tests/bdd/steps/steps_execute.py
index b2d4bd6d6..d8dea1a82 100644
--- a/tests/bdd/steps/steps_execute.py
+++ b/tests/bdd/steps/steps_execute.py
@@ -21,8 +21,6 @@ def get_import_file(context):
     if context.import_file is not None:
         return str(context.import_file), None
 
-    context.geometry_factory.complete_node_list(context.import_data['n'])
-
     # sort by OSM id
     for obj in context.import_data.values():
         obj.sort(key=lambda l: int(l.split(' ')[0][1:]))
diff --git a/tests/bdd/steps/steps_osm_data.py b/tests/bdd/steps/steps_osm_data.py
index 37f44cf69..9dc27e771 100644
--- a/tests/bdd/steps/steps_osm_data.py
+++ b/tests/bdd/steps/steps_osm_data.py
@@ -8,6 +8,20 @@
 Steps for creating the OSM import file.
 """
 
+def add_opl_lines(context, lines):
+    for line in lines:
+        if (oplobj := line.strip()):
+            assert oplobj[0] in ('n', 'w', 'r')
+            oplobj = context.geometry_factory.complete_opl(oplobj)
+            data = context.import_data[oplobj[0]]
+            objid = oplobj.split(' ', 1)[0] + ' '
+            for i, existing in enumerate(data):
+                if existing.startswith(objid):
+                    data[i] = oplobj
+                    break
+            else:
+                data.append(oplobj)
+
 
 @given("the input file '(?P<osm_file>.+)'")
 def osm_set_import_file(context, osm_file):
@@ -16,11 +30,6 @@ def osm_set_import_file(context, osm_file):
     context.import_file = context.test_data_dir / osm_file
 
 
-@given("an empty grid")
-def osm_define_node_grid(context):
-    context.geometry_factory.remove_grid()
-
-
 @given("the (?P<step>[0-9.]+ )?grid(?: with origin (?P<origin_x>[0-9.-]+) (?P<origin_y>[0-9.-]+))?")
 def osm_define_node_grid(context, step, origin_x, origin_y):
     step = float(step.strip()) if step else 0.1
@@ -32,6 +41,7 @@ def osm_define_node_grid(context, step, origin_x, origin_y):
 
     context.geometry_factory.set_grid([context.table.headings] + [list(h) for h in context.table],
                                       step, x, y)
+    add_opl_lines(context, context.geometry_factory.as_opl_lines())
 
 
 @given("the (?P<formatted>python-formatted )?OSM data")
@@ -41,8 +51,4 @@ def osm_define_data(context, formatted):
     if formatted:
         data = eval('f"""' + data + '"""')
 
-    for line in data.split('\n'):
-        line = line.strip()
-        if line:
-            assert line[0] in ('n', 'w', 'r')
-            context.import_data[line[0]].append(line)
+    add_opl_lines(context, data.split('\n'))

From 64b4fc37a7cf2c7209fa0239a675676133480912 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 7 Nov 2025 14:12:32 +0100
Subject: [PATCH 392/430] bdd: replace sum step with tale check with aggregate

---
 tests/bdd/regression/import.feature | 89 ++++++++++++++++-------------
 tests/bdd/steps/steps_db.py         | 17 ------
 2 files changed, 48 insertions(+), 58 deletions(-)

diff --git a/tests/bdd/regression/import.feature b/tests/bdd/regression/import.feature
index eb98fafc0..c848dc1f4 100644
--- a/tests/bdd/regression/import.feature
+++ b/tests/bdd/regression/import.feature
@@ -7,14 +7,15 @@ Feature: Imports of the test database
         When running osm2pgsql pgsql
 
         Then table planet_osm_point has 1342 rows
-        And table planet_osm_line has 3231 rows
-        And table planet_osm_roads has 375 rows
-        And table planet_osm_polygon has 4130 rows
-
-        Then the sum of 'cast(ST_Area(way) as numeric)' in table planet_osm_polygon is 1247245186
-        And the sum of 'cast(way_area as numeric)' in table planet_osm_polygon is 1247245413
-        And the sum of 'ST_Length(way)' in table planet_osm_line is 4211350
-        And the sum of 'ST_Length(way)' in table planet_osm_roads is 2032023
+        And table planet_osm_polygon contains
+            | count(*) | round(sum(ST_Area(way))) | round(sum(way_area)) |
+            | 4130     | 1247245186               | 1247245413           |
+        And table planet_osm_line contains
+            | count(*) | round(sum(ST_Length(way))) |
+            | 3231     | 4211350                    |
+        And table planet_osm_roads contains
+            | count(*) | round(sum(ST_Length(way))) |
+            | 375      | 2032023                    |
 
         And there are no tables planet_osm_nodes, planet_osm_ways, planet_osm_rels
 
@@ -37,14 +38,15 @@ Feature: Imports of the test database
             | <drop> |
 
         Then table planet_osm_point has 1342 rows
-        And table planet_osm_line has 3231 rows
-        And table planet_osm_roads has 375 rows
-        And table planet_osm_polygon has 4130 rows
-
-        Then the sum of 'cast(ST_Area(way) as numeric)' in table planet_osm_polygon is 1247245186
-        And the sum of 'cast(way_area as numeric)' in table planet_osm_polygon is 1247245413
-        And the sum of 'ST_Length(way)' in table planet_osm_line is 4211350
-        And the sum of 'ST_Length(way)' in table planet_osm_roads is 2032023
+        And table planet_osm_polygon contains
+            | count(*) | round(sum(ST_Area(way))) | round(sum(way_area)) |
+            | 4130     | 1247245186               | 1247245413           |
+        And table planet_osm_line contains
+            | count(*) | round(sum(ST_Length(way))) |
+            | 3231     | 4211350                    |
+        And table planet_osm_roads contains
+            | count(*) | round(sum(ST_Length(way))) |
+            | 375      | 2032023                    |
 
         And there are <have table> planet_osm_nodes, planet_osm_ways, planet_osm_rels
 
@@ -61,14 +63,15 @@ Feature: Imports of the test database
             | <slim> |
 
         Then table planet_osm_point has 1342 rows
-        And table planet_osm_line has 3231 rows
-        And table planet_osm_roads has 375 rows
-        And table planet_osm_polygon has 4136 rows
-
-        Then the sum of 'cast(ST_Area(way) as numeric)' in table planet_osm_polygon is 1272140688
-        And the sum of 'cast(way_area as numeric)' in table planet_osm_polygon is 1272140891
-        And the sum of 'ST_Length(way)' in table planet_osm_line is 4211350
-        And the sum of 'ST_Length(way)' in table planet_osm_roads is 2032023
+        And table planet_osm_polygon contains
+            | count(*) | round(sum(ST_Area(way))) | round(sum(way_area)) |
+            | 4136     | 1272140688               | 1272140891           |
+        And table planet_osm_line contains
+            | count(*) | round(sum(ST_Length(way))) |
+            | 3231     | 4211350                    |
+        And table planet_osm_roads contains
+            | count(*) | round(sum(ST_Length(way))) |
+            | 375      | 2032023                    |
 
         And there are <have table> planet_osm_nodes, planet_osm_ways, planet_osm_rels
 
@@ -102,15 +105,18 @@ Feature: Imports of the test database
         When running osm2pgsql pgsql with parameters
             | --slim   | -j |
 
-        Then table planet_osm_point has 1360 rows
-        And table planet_osm_line has 3254 rows
-        And table planet_osm_roads has 375 rows
-        And table planet_osm_polygon has 4131 rows
-
-        Then the sum of 'array_length(akeys(tags),1)' in table planet_osm_point is 4228
-        And the sum of 'array_length(akeys(tags),1)' in table planet_osm_roads is 2317
-        And the sum of 'array_length(akeys(tags),1)' in table planet_osm_line is 10387
-        And the sum of 'array_length(akeys(tags),1)' in table planet_osm_polygon is 9538
+        Then table planet_osm_point contains
+            | count(*) | sum(array_length(akeys(tags), 1)) |
+            | 1360     | 4228                              |
+        Then table planet_osm_line contains
+            | count(*) | sum(array_length(akeys(tags), 1)) |
+            | 3254     | 10387                             |
+        Then table planet_osm_roads contains
+            | count(*) | sum(array_length(akeys(tags), 1)) |
+            | 375      | 2317                              |
+        Then table planet_osm_polygon contains
+            | count(*) | sum(array_length(akeys(tags), 1)) |
+            | 4131     | 9538                              |
 
 
     Scenario Outline: Import slim with various tweaks
@@ -121,14 +127,15 @@ Feature: Imports of the test database
             | <param3> |
 
         Then table planet_osm_point has 1342 rows
-        And table planet_osm_line has 3231 rows
-        And table planet_osm_roads has 375 rows
-        And table planet_osm_polygon has 4130 rows
-
-        Then the sum of 'cast(ST_Area(way) as numeric)' in table planet_osm_polygon is 1247245186
-        And the sum of 'cast(way_area as numeric)' in table planet_osm_polygon is 1247245413
-        And the sum of 'ST_Length(way)' in table planet_osm_line is 4211350
-        And the sum of 'ST_Length(way)' in table planet_osm_roads is 2032023
+        And table planet_osm_polygon contains
+            | count(*) | round(sum(ST_Area(way))) | round(sum(way_area)) |
+            | 4130     | 1247245186               | 1247245413           |
+        And table planet_osm_line contains
+            | count(*) | round(sum(ST_Length(way))) |
+            | 3231     | 4211350                    |
+        And table planet_osm_roads contains
+            | count(*) | round(sum(ST_Length(way))) |
+            | 375      | 2032023                    |
 
         And there are tables planet_osm_nodes, planet_osm_ways, planet_osm_rels
 
diff --git a/tests/bdd/steps/steps_db.py b/tests/bdd/steps/steps_db.py
index 26159c2be..c2ba93298 100644
--- a/tests/bdd/steps/steps_db.py
+++ b/tests/bdd/steps/steps_db.py
@@ -44,23 +44,6 @@ def db_table_row_count(context, table, row_num, has_where):
            f"Table {table}: expected {row_num} rows, got {actual}"
 
 
-@then(r"the sum of '(?P<formula>.+)' in table (?P<table>.+) is (?P<result>\d+)(?P<has_where> with condition)?")
-def db_table_sum_up(context, table, formula, result, has_where):
-    assert table_exists(context.db, table)
-
-    query = sql.SQL("SELECT round(sum({})) FROM {}")\
-               .format(sql.SQL(formula), sql.Identifier(*table.split('.', 2)))
-
-    if has_where:
-        query = sql.SQL("{} WHERE {}").format(query, sql.SQL(context.text))
-
-
-    actual = scalar(context.db, query)
-
-    assert actual == int(result),\
-           f"Table {table}: expected sum {result}, got {actual}"
-
-
 @then("there (?:is|are) (?P<exists>no )?tables? (?P<tables>.+)")
 def db_table_existance(context, exists, tables):
     for table in tables.split(','):

From 391b2f5d05eed7de4bef5576a885da5d20438686 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 9 Nov 2025 13:08:13 +0100
Subject: [PATCH 393/430] add joto as maintainer

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8d0e74fc8..c1c7dd84a 100644
--- a/README.md
+++ b/README.md
@@ -223,8 +223,9 @@ GNU General Public License for more details.
 
 ## Maintainers
 
-The current maintainers of osm2pgsql are [Sarah Hoffmann](https://github.com/lonvia/)
-and [Paul Norman](https://github.com/pnorman/).
+The current maintainers of osm2pgsql are [Sarah Hoffmann](https://github.com/lonvia/),
+[Paul Norman](https://github.com/pnorman/) and
+[Jochen Topf](https://github.com/joto).
 
 ## Contributing
 

From 2aa48c777c08ecc2a5871df45a7efda2cbd957ac Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 28 Nov 2025 17:24:36 +0100
Subject: [PATCH 394/430] BDD: drop "row with condition" in favour of "doesn't
 contain"

---
 tests/bdd/flex/lua-index-definitions.feature  | 55 +++++++++----------
 tests/bdd/flex/way-change.feature             | 46 +++++++---------
 .../regression/forward_dependencies.feature   | 25 ++++-----
 tests/bdd/regression/import.feature           | 41 ++++----------
 tests/bdd/regression/multipolygon.feature     | 31 +++++------
 tests/bdd/steps/steps_db.py                   | 24 ++++++--
 6 files changed, 104 insertions(+), 118 deletions(-)

diff --git a/tests/bdd/flex/lua-index-definitions.feature b/tests/bdd/flex/lua-index-definitions.feature
index da77db887..eeb92202a 100644
--- a/tests/bdd/flex/lua-index-definitions.feature
+++ b/tests/bdd/flex/lua-index-definitions.feature
@@ -473,9 +473,10 @@ Feature: Index definitions in Lua file
             })
             """
         When running osm2pgsql flex
-        Then SELECT schemaname, tablename FROM pg_catalog.pg_indexes WHERE tablename = 'mytable' AND indexdef LIKE '%USING btree (name)%' AND indexdef LIKE '%WHERE (name = lower(name))%'
-            | schemaname | tablename |
-            | public     | mytable   |
+        Then table pg_catalog.pg_indexes contains
+            | schemaname | tablename | indexdef@fullmatch |
+            | public     | mytable   | .*USING btree \(name\).*WHERE \(name = lower\(name\)\).* |
+
 
     Scenario: Don't create id index if the configuration doesn't mention it
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
@@ -492,10 +493,9 @@ Feature: Index definitions in Lua file
             })
             """
         When running osm2pgsql flex
-        Then table pg_catalog.pg_indexes has 0 rows with condition
-            """
-            schemaname = 'public' AND tablename = 'mytable' AND indexname LIKE '%node_id%'
-            """
+        Then table pg_catalog.pg_indexes doesn't contain
+            | schemaname | tablename | indexname@fullmatch |
+            | public     | mytable   | .*node_id.*         |
 
     Scenario: Don't create id index if the configuration doesn't says so
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
@@ -512,10 +512,9 @@ Feature: Index definitions in Lua file
             })
             """
         When running osm2pgsql flex
-        Then table pg_catalog.pg_indexes has 0 rows with condition
-            """
-            schemaname = 'public' AND tablename = 'mytable' AND indexname LIKE '%node_id%'
-            """
+        Then table pg_catalog.pg_indexes doesn't contain
+            | schemaname | tablename | indexname@fullmatch |
+            | public     | mytable   | .*node_id.*         |
 
     Scenario: Always create id index if the configuration says so
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
@@ -532,10 +531,9 @@ Feature: Index definitions in Lua file
             })
             """
         When running osm2pgsql flex
-        Then table pg_catalog.pg_indexes has 1 rows with condition
-            """
-            schemaname = 'public' AND tablename = 'mytable' AND indexname LIKE '%node_id%'
-            """
+        Then table pg_catalog.pg_indexes contains
+            | schemaname | tablename | indexname@fullmatch |
+            | public     | mytable   | .*node_id.*         |
 
     Scenario: Create a unique id index when requested
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
@@ -553,13 +551,12 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then table foo has 1562 rows
-        And SELECT indexdef FROM pg_indexes WHERE tablename = 'foo'
-            | indexdef@fullmatch |
-            | CREATE UNIQUE INDEX .* USING .*\(node_id\) |
-        And table pg_catalog.pg_index has 0 rows with condition
-            """
-            indrelid = 'foo'::regclass and indisprimary
-            """
+        Then table pg_catalog.pg_indexes contains
+            | tablename | indexdef@fullmatch |
+            | foo       | CREATE UNIQUE INDEX .* USING .*\(node_id\) |
+        And SELECT count(*) FROM pg_catalog.pg_index WHERE indrelid = 'foo'::regclass and indisprimary
+            | count |
+            | 0     |
 
     Scenario: Create a primary key id index when requested
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
@@ -577,11 +574,9 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then table foo has 1562 rows
-        And SELECT indexdef FROM pg_indexes WHERE tablename = 'foo'
-            | indexdef@fullmatch |
-            | CREATE UNIQUE INDEX .* USING .*\(node_id\) |
-        And table pg_catalog.pg_index has 1 row with condition
-            """
-            indrelid = 'foo'::regclass and indisprimary
-            """
-
+        Then table pg_catalog.pg_indexes contains
+            | tablename | indexdef@fullmatch |
+            | foo       | CREATE UNIQUE INDEX .* USING .*\(node_id\) |
+        And SELECT count(*) FROM pg_catalog.pg_index WHERE indrelid = 'foo'::regclass and indisprimary
+            | count |
+            | 1     |
diff --git a/tests/bdd/flex/way-change.feature b/tests/bdd/flex/way-change.feature
index 4346fec50..28c73d448 100644
--- a/tests/bdd/flex/way-change.feature
+++ b/tests/bdd/flex/way-change.feature
@@ -40,10 +40,9 @@ Feature: Changing ways in a flex database
         Then table osm2pgsql_test_t1 contains
             | way_id |
             | 11     |
-        And table osm2pgsql_test_t1 has <num_w10> rows with condition
-            """
-            way_id = 10
-            """
+        And table osm2pgsql_test_t1 <exist_w10>
+            | way_id |
+            | 10     |
         Then table osm2pgsql_test_t2 contains exactly
             | way_id |
             | 10     |
@@ -54,9 +53,9 @@ Feature: Changing ways in a flex database
             | 14     |
 
         Examples:
-            | input                             | num_w10 |
-            | w10 v2 dV Tt2=yes Nn10,n11        | 0       |
-            | w10 v2 dV Tt1=yes,t2=yes Nn10,n11 | 1       |
+            | input                             | exist_w10       |
+            | w10 v2 dV Tt2=yes Nn10,n11        | doesn't contain |
+            | w10 v2 dV Tt1=yes,t2=yes Nn10,n11 | contains        |
 
 
     Scenario Outline: change way from t2
@@ -96,19 +95,18 @@ Feature: Changing ways in a flex database
         Then table osm2pgsql_test_t2 contains
             | way_id |
             | 12     |
-        And table osm2pgsql_test_t2 has <num_w10> rows with condition
-            """
-            way_id = 10
-            """
+        And table osm2pgsql_test_t2 <exist_w10>
+            | way_id |
+            | 10     |
         Then table osm2pgsql_test_tboth contains exactly
             | way_id |
             | 13     |
             | 14     |
 
         Examples:
-            | input                             | num_w10 |
-            | w10 v2 dV Tt1=yes Nn10,n11        | 0       |
-            | w10 v2 dV Tt1=yes,t2=yes Nn10,n11 | 1       |
+            | input                             | exist_w10       |
+            | w10 v2 dV Tt1=yes Nn10,n11        | doesn't contain |
+            | w10 v2 dV Tt1=yes,t2=yes Nn10,n11 | contains        |
 
 
     Scenario Outline: change way from t1 and t2
@@ -145,26 +143,24 @@ Feature: Changing ways in a flex database
         Then table osm2pgsql_test_t1 contains
             | way_id |
             | 11     |
-        And table osm2pgsql_test_t1 has <num_t1> rows with condition
-            """
-            way_id = 10
-            """
+        And table osm2pgsql_test_t1 <exist_t1>
+            | way_id |
+            | 10     |
         Then table osm2pgsql_test_t2 contains
             | way_id |
             | 12     |
-        And table osm2pgsql_test_t2 has <num_t2> rows with condition
-            """
-            way_id = 10
-            """
+        And table osm2pgsql_test_t2 <exist_t2>
+            | way_id |
+            | 10     |
         Then table osm2pgsql_test_tboth contains exactly
             | way_id |
             | 13     |
             | 14     |
 
         Examples:
-            | input                      | num_t1 | num_t2 |
-            | w10 v2 dV Tt1=yes Nn10,n11 | 1      | 0      |
-            | w10 v2 dV Tt2=yes Nn10,n11 | 0      | 1      |
+            | input                      | exist_t1        | exist_t2 |
+            | w10 v2 dV Tt1=yes Nn10,n11 | contains        | doesn't contain |
+            | w10 v2 dV Tt2=yes Nn10,n11 | doesn't contain | contains        |
 
 
     Scenario Outline: change valid geom to invalid geom
diff --git a/tests/bdd/regression/forward_dependencies.feature b/tests/bdd/regression/forward_dependencies.feature
index 8b48bbee2..cf96032e7 100644
--- a/tests/bdd/regression/forward_dependencies.feature
+++ b/tests/bdd/regression/forward_dependencies.feature
@@ -29,16 +29,15 @@ Feature: Test forward propagation of changes
         When running osm2pgsql pgsql with parameters
             | --slim | -a | --latlong |
 
-        Then table planet_osm_point has 1 row
-        Then table planet_osm_line has 1 row
-        Then table planet_osm_line has 0 rows with condition
-            """
-            abs(ST_X(ST_StartPoint(way)) - 3.0) < 0.0001
-            """
-        Then table planet_osm_line has 1 row with condition
-            """
-            abs(ST_X(ST_StartPoint(way)) - 3.1) < 0.0001
-            """
-        Then table planet_osm_roads has 1 row
-        Then table planet_osm_polygon has 1 row
-
+        Then table planet_osm_point contains exactly
+            | osm_id |
+            | 12     |
+        Then table planet_osm_line contains exactly
+            | osm_id | round(ST_X(ST_StartPoint(way))::numeric, 1) |
+            | 21     | 3.1                                         |
+        Then table planet_osm_roads contains exactly
+            | osm_id |
+            | 21     |
+        Then table planet_osm_polygon contains exactly
+            | osm_id |
+            | 20     |
diff --git a/tests/bdd/regression/import.feature b/tests/bdd/regression/import.feature
index c848dc1f4..4cd4760d6 100644
--- a/tests/bdd/regression/import.feature
+++ b/tests/bdd/regression/import.feature
@@ -162,32 +162,15 @@ Feature: Imports of the test database
             | -j |
             | -x |
 
-        Then table planet_osm_point has 1360 rows with condition
-            """
-            tags ? 'osm_user' AND
-            tags ? 'osm_version' AND
-            tags ? 'osm_uid' AND
-            tags ? 'osm_changeset'
-            """
-        And table planet_osm_line has 3254 rows with condition
-            """
-            tags ? 'osm_user' AND
-            tags ? 'osm_version' AND
-            tags ? 'osm_uid' AND
-            tags ? 'osm_changeset'
-            """
-        And table planet_osm_roads has 375 rows with condition
-            """
-            tags ? 'osm_user' AND
-            tags ? 'osm_version' AND
-            tags ? 'osm_uid' AND
-            tags ? 'osm_changeset'
-            """
-        And table planet_osm_polygon has 4131 rows with condition
-            """
-            tags ? 'osm_user' AND
-            tags ? 'osm_version' AND
-            tags ? 'osm_uid' AND
-            tags ? 'osm_changeset'
-            """
-
+        Then table planet_osm_point contains
+            | count(*) | every(tags ?& ARRAY['osm_user', 'osm_version', 'osm_uid', 'osm_changeset']) |
+            | 1360     | True |
+        Then table planet_osm_line contains
+            | count(*) | every(tags ?& ARRAY['osm_user', 'osm_version', 'osm_uid', 'osm_changeset']) |
+            | 3254     | True |
+        Then table planet_osm_roads contains
+            | count(*) | every(tags ?& ARRAY['osm_user', 'osm_version', 'osm_uid', 'osm_changeset']) |
+            | 375      | True |
+        Then table planet_osm_polygon contains
+            | count(*) | every(tags ?& ARRAY['osm_user', 'osm_version', 'osm_uid', 'osm_changeset']) |
+            | 4131     | True |
diff --git a/tests/bdd/regression/multipolygon.feature b/tests/bdd/regression/multipolygon.feature
index 1e3701219..ce4b48ef5 100644
--- a/tests/bdd/regression/multipolygon.feature
+++ b/tests/bdd/regression/multipolygon.feature
@@ -54,15 +54,14 @@ Feature: Import and update of multipolygon areas
             | 138    | 1     |
             | 140    | 1     |
 
-        Then table planet_osm_polygon has 0 rows with condition
-            """
-            osm_id IN (109, 104)
-            """
+        Then table planet_osm_polygon doesn't contain
+            | osm_id |
+            | 109    |
+            | 104    |
 
-        Then table planet_osm_polygon has 0 rows with condition
-            """
-            osm_id = -33 and "natural" = 'water'
-            """
+        Then table planet_osm_polygon doesn't contain
+            | osm_id | "natural" |
+            | -33    | water     |
 
         Then SELECT osm_id, CASE WHEN '<param1>' = '-G' THEN min(ST_NumGeometries(way)) ELSE count(*) END FROM planet_osm_polygon GROUP BY osm_id
            | osm_id | count |
@@ -118,15 +117,15 @@ Feature: Import and update of multipolygon areas
             | 138    | 1     |
             | 140    | 1     |
 
-        Then table planet_osm_polygon has 0 rows with condition
-            """
-            osm_id IN (-25, 109, 104)
-            """
+        Then table planet_osm_polygon doesn't contain
+            | osm_id |
+            | -25    |
+            | 109    |
+            | 104    |
 
-        Then table planet_osm_polygon has 0 rows with condition
-            """
-            osm_id = -33 and "natural" = 'water'
-            """
+        Then table planet_osm_polygon doesn't contain
+            | osm_id | "natural" |
+            | -33    | water     |
 
         Examples:
             | param1 | lua         |
diff --git a/tests/bdd/steps/steps_db.py b/tests/bdd/steps/steps_db.py
index c2ba93298..f83d085af 100644
--- a/tests/bdd/steps/steps_db.py
+++ b/tests/bdd/steps/steps_db.py
@@ -29,15 +29,12 @@ def delete_table(context, table):
         cur.execute("DROP TABLE " + table)
 
 
-@then(r"table (?P<table>.+) has (?P<row_num>\d+) rows?(?P<has_where> with condition)?")
-def db_table_row_count(context, table, row_num, has_where):
+@then(r"table (?P<table>.+) has (?P<row_num>\d+) rows?")
+def db_table_row_count(context, table, row_num):
     assert table_exists(context.db, table)
 
     query = sql.SQL("SELECT count(*) FROM {}").format(sql.Identifier(*table.split('.', 2)))
 
-    if has_where:
-        query = sql.SQL("{} WHERE {}").format(query, sql.SQL(context.text))
-
     actual = scalar(context.db, query)
 
     assert actual == int(row_num),\
@@ -78,6 +75,23 @@ def db_check_table_content(context, table, exact):
     assert not exact or not actuals,\
            f"Unexpected lines in row:\n{actuals}"
 
+
+@then("table (?P<table>.+) doesn't contain")
+def db_check_table_absence(context, table):
+    assert table_exists(context.db, table)
+
+    rows = sql.SQL(', '.join(h.rsplit('@')[0] for h in context.table.headings))
+
+    with context.db.cursor() as cur:
+        cur.execute(sql.SQL("SELECT {} FROM {}")
+                       .format(rows, sql.Identifier(*table.split('.', 2))))
+
+        actuals = list(DBRow(r, context.table.headings, context.geometry_factory) for r in cur)
+
+    for row in context.table.rows:
+        assert not row in actuals, f"Row unexpectedly found: {row}. Full content:\n{actuals}"
+
+
 @then("(?P<query>SELECT .*)")
 def db_check_sql_statement(context, query):
     with context.db.cursor() as cur:

From 3913c6d6753ea5fd1c4fcc18602ddeffcd44555c Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 29 Nov 2025 11:14:42 +0100
Subject: [PATCH 395/430] bdd: use a SQL statement template for index checks

Also introduces substring matching.
---
 tests/bdd/environment.py                     |   1 +
 tests/bdd/flex/lua-index-definitions.feature | 121 ++++++++++---------
 tests/bdd/steps/steps_db.py                  |  35 +++++-
 3 files changed, 92 insertions(+), 65 deletions(-)

diff --git a/tests/bdd/environment.py b/tests/bdd/environment.py
index 350b5e1b6..16919ec85 100644
--- a/tests/bdd/environment.py
+++ b/tests/bdd/environment.py
@@ -122,6 +122,7 @@ def before_scenario(context, scenario):
     context.geometry_factory = GeometryFactory()
     context.osm2pgsql_replication.ReplicationServer = ReplicationServerMock()
     context.urlrequest_responses = {}
+    context.sql_statements = {}
 
     def _mock_urlopen(request):
         if not request.full_url in context.urlrequest_responses:
diff --git a/tests/bdd/flex/lua-index-definitions.feature b/tests/bdd/flex/lua-index-definitions.feature
index eeb92202a..051253fa5 100644
--- a/tests/bdd/flex/lua-index-definitions.feature
+++ b/tests/bdd/flex/lua-index-definitions.feature
@@ -1,5 +1,16 @@
 Feature: Index definitions in Lua file
 
+    Background:
+        Given the SQL statement mytable_indexes
+            """
+            SELECT indexdef, indisprimary as is_primary
+            FROM pg_catalog.pg_index, pg_catalog.pg_indexes
+            WHERE schemaname = 'public'
+                  AND tablename = 'mytable'
+                  AND indrelid = tablename::regclass
+                  AND indexrelid = indexname::regclass
+            """
+
     Scenario: Indexes field in table definition must be an array
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
         And the lua style
@@ -36,9 +47,9 @@ Feature: Index definitions in Lua file
             })
             """
         When running osm2pgsql flex
-        Then SELECT schemaname, tablename FROM pg_catalog.pg_indexes WHERE tablename = 'mytable' AND indexdef LIKE '%USING gist (geom)%'
-            | schemaname | tablename |
-            | public     | mytable   |
+        Then statement mytable_indexes returns
+            | indexdef@substr |
+            | USING gist (geom) |
 
     Scenario: Empty indexes field in table definition gets you no index
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
@@ -56,8 +67,8 @@ Feature: Index definitions in Lua file
             })
             """
         When running osm2pgsql flex
-        Then SELECT schemaname, tablename FROM pg_catalog.pg_indexes WHERE tablename = 'mytable'
-            | schemaname | tablename |
+        Then statement mytable_indexes returns exactly
+            | indexdef |
 
     Scenario: Explicitly setting an index column works
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
@@ -77,9 +88,9 @@ Feature: Index definitions in Lua file
             })
             """
         When running osm2pgsql flex
-        Then SELECT schemaname, tablename FROM pg_catalog.pg_indexes WHERE tablename = 'mytable' AND indexdef LIKE '%USING btree (name)%'
-            | schemaname | tablename |
-            | public     | mytable   |
+        Then statement mytable_indexes returns
+            | indexdef@substr |
+            | USING btree (name) |
 
     Scenario: Explicitly setting multiple indexes
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
@@ -101,15 +112,11 @@ Feature: Index definitions in Lua file
             })
             """
         When running osm2pgsql flex
-        Then SELECT schemaname, tablename FROM pg_catalog.pg_indexes WHERE tablename = 'mytable' AND indexdef LIKE '%USING btree (name)%'
-            | schemaname | tablename |
-            | public     | mytable   |
-        And SELECT schemaname, tablename FROM pg_catalog.pg_indexes WHERE tablename = 'mytable' AND indexdef LIKE '%USING gist (geom)%'
-            | schemaname | tablename |
-            | public     | mytable   |
-        And SELECT schemaname, tablename FROM pg_catalog.pg_indexes WHERE tablename = 'mytable' AND indexdef LIKE '%USING btree (name, tags)%'
-            | schemaname | tablename |
-            | public     | mytable   |
+        Then statement mytable_indexes returns exactly
+            | indexdef@substr |
+            | USING btree (name) |
+            | USING gist (geom) |
+            | USING btree (name, tags) |
 
     Scenario: Method can not be missing
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
@@ -244,9 +251,9 @@ Feature: Index definitions in Lua file
             })
             """
         When running osm2pgsql flex
-        Then SELECT schemaname, tablename FROM pg_catalog.pg_indexes WHERE tablename = 'mytable' AND indexdef LIKE '%USING btree (lower(name))%'
-            | schemaname | tablename |
-            | public     | mytable   |
+        Then statement mytable_indexes returns
+            | indexdef@substr |
+            | USING btree (lower(name)) |
 
     @needs-pg-index-includes
     Scenario: Include field must be a string or array
@@ -315,9 +322,9 @@ Feature: Index definitions in Lua file
             })
             """
         When running osm2pgsql flex
-        Then SELECT schemaname, tablename FROM pg_catalog.pg_indexes WHERE tablename = 'mytable' AND indexdef LIKE '%USING btree (name)%' AND indexdef LIKE '%INCLUDE (tags)%'
-            | schemaname | tablename |
-            | public     | mytable   |
+        Then statement mytable_indexes returns
+            | indexdef@substr |
+            | USING btree (name) INCLUDE (tags) |
 
     @needs-pg-index-includes
     Scenario: Include field works with array
@@ -338,9 +345,9 @@ Feature: Index definitions in Lua file
             })
             """
         When running osm2pgsql flex
-        Then SELECT schemaname, tablename FROM pg_catalog.pg_indexes WHERE tablename = 'mytable' AND indexdef LIKE '%USING btree (name)%' AND indexdef LIKE '%INCLUDE (tags)%'
-            | schemaname | tablename |
-            | public     | mytable   |
+        Then statement mytable_indexes returns
+            | indexdef@substr |
+            | USING btree (name) INCLUDE (tags) |
 
     Scenario: Tablespace needs a string
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
@@ -383,9 +390,9 @@ Feature: Index definitions in Lua file
             })
             """
         When running osm2pgsql flex
-        Then SELECT schemaname, tablename FROM pg_catalog.pg_indexes WHERE tablename = 'mytable' AND indexdef LIKE '%USING btree (name)%'
-            | schemaname | tablename |
-            | public     | mytable   |
+        Then statement mytable_indexes returns
+            | indexdef@substr |
+            | USING btree (name) |
 
     Scenario: Unique needs a boolean
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
@@ -428,9 +435,9 @@ Feature: Index definitions in Lua file
             })
             """
         When running osm2pgsql flex
-        Then SELECT schemaname, tablename FROM pg_catalog.pg_indexes WHERE tablename = 'mytable' AND indexdef LIKE '%USING btree (name)%' AND indexdef LIKE '%UNIQUE%'
-            | schemaname | tablename |
-            | public     | mytable   |
+        Then statement mytable_indexes returns
+            | indexdef@fullmatch |
+            | .*UNIQUE.*USING btree \(name\).* |
 
     Scenario: Where condition needs a string
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
@@ -473,9 +480,9 @@ Feature: Index definitions in Lua file
             })
             """
         When running osm2pgsql flex
-        Then table pg_catalog.pg_indexes contains
-            | schemaname | tablename | indexdef@fullmatch |
-            | public     | mytable   | .*USING btree \(name\).*WHERE \(name = lower\(name\)\).* |
+        Then statement mytable_indexes returns
+            | indexdef@substr |
+            | USING btree (name) WHERE (name = lower(name)) |
 
 
     Scenario: Don't create id index if the configuration doesn't mention it
@@ -493,9 +500,9 @@ Feature: Index definitions in Lua file
             })
             """
         When running osm2pgsql flex
-        Then table pg_catalog.pg_indexes doesn't contain
-            | schemaname | tablename | indexname@fullmatch |
-            | public     | mytable   | .*node_id.*         |
+        Then statement mytable_indexes returns exactly
+            | indexdef@substr  |
+            | USING gist (geom) |
 
     Scenario: Don't create id index if the configuration doesn't says so
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
@@ -512,9 +519,9 @@ Feature: Index definitions in Lua file
             })
             """
         When running osm2pgsql flex
-        Then table pg_catalog.pg_indexes doesn't contain
-            | schemaname | tablename | indexname@fullmatch |
-            | public     | mytable   | .*node_id.*         |
+        Then statement mytable_indexes returns exactly
+            | indexdef@substr  |
+            | USING gist (geom) |
 
     Scenario: Always create id index if the configuration says so
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
@@ -531,16 +538,16 @@ Feature: Index definitions in Lua file
             })
             """
         When running osm2pgsql flex
-        Then table pg_catalog.pg_indexes contains
-            | schemaname | tablename | indexname@fullmatch |
-            | public     | mytable   | .*node_id.*         |
+        Then statement mytable_indexes returns
+            | indexdef@substr      |
+            | USING btree (node_id) |
 
     Scenario: Create a unique id index when requested
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
         And the lua style
             """
             local t = osm2pgsql.define_table({
-                name = 'foo',
+                name = 'mytable',
                 ids = { type = 'node', id_column = 'node_id', create_index = 'unique' },
                 columns = {}
             })
@@ -550,20 +557,17 @@ Feature: Index definitions in Lua file
             end
             """
         When running osm2pgsql flex
-        Then table foo has 1562 rows
-        Then table pg_catalog.pg_indexes contains
-            | tablename | indexdef@fullmatch |
-            | foo       | CREATE UNIQUE INDEX .* USING .*\(node_id\) |
-        And SELECT count(*) FROM pg_catalog.pg_index WHERE indrelid = 'foo'::regclass and indisprimary
-            | count |
-            | 0     |
+        Then table mytable has 1562 rows
+        Then statement mytable_indexes returns
+            | indexdef@fullmatch                           | is_primary |
+            | CREATE UNIQUE INDEX .* USING .*\(node_id\).* | False      |
 
     Scenario: Create a primary key id index when requested
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
         And the lua style
             """
             local t = osm2pgsql.define_table({
-                name = 'foo',
+                name = 'mytable',
                 ids = { type = 'node', id_column = 'node_id', create_index = 'primary_key' },
                 columns = {}
             })
@@ -573,10 +577,7 @@ Feature: Index definitions in Lua file
             end
             """
         When running osm2pgsql flex
-        Then table foo has 1562 rows
-        Then table pg_catalog.pg_indexes contains
-            | tablename | indexdef@fullmatch |
-            | foo       | CREATE UNIQUE INDEX .* USING .*\(node_id\) |
-        And SELECT count(*) FROM pg_catalog.pg_index WHERE indrelid = 'foo'::regclass and indisprimary
-            | count |
-            | 1     |
+        Then table mytable has 1562 rows
+        Then statement mytable_indexes returns
+            | indexdef@fullmatch                         | is_primary |
+            | CREATE UNIQUE INDEX .* USING .*\(node_id\) | True       |
diff --git a/tests/bdd/steps/steps_db.py b/tests/bdd/steps/steps_db.py
index f83d085af..c91d1e059 100644
--- a/tests/bdd/steps/steps_db.py
+++ b/tests/bdd/steps/steps_db.py
@@ -92,19 +92,30 @@ def db_check_table_absence(context, table):
         assert not row in actuals, f"Row unexpectedly found: {row}. Full content:\n{actuals}"
 
 
-@then("(?P<query>SELECT .*)")
-def db_check_sql_statement(context, query):
+@given("the SQL statement (?P<sql>.+)")
+def db_define_sql_statement(context, sql):
+    context.sql_statements[sql] = context.text
+
+@then("statement (?P<stmt>.+) returns(?P<exact> exactly)?")
+def db_check_sql_statement(context, stmt, exact):
     with context.db.cursor() as cur:
-        cur.execute(query)
+        assert stmt in context.sql_statements
+        cur.execute(context.sql_statements[stmt])
 
         actuals = list(DBRow(r, context.table.headings, context.geometry_factory) for r in cur)
 
     linenr = 1
     for row in context.table.rows:
-        assert any(r == row for r in actuals),\
-               f"{linenr}. entry not found in table. Full content:\n{actuals}"
+        try:
+            actuals.remove(row)
+        except ValueError:
+            assert False,\
+                   f"{linenr}. entry not found in result. Full response:\n{actuals}"
         linenr += 1
 
+    assert not exact or not actuals,\
+           f"Unexpected lines in result:\n{actuals}"
+
 
 ### Helper functions and classes
 
@@ -152,6 +163,8 @@ def __init__(self, row, headings, factory):
                 self.data.append(DBValueGeometry(value, props, factory))
             elif props == 'fullmatch':
                 self.data.append(DBValueRegex(value))
+            elif props == 'substr':
+                self.data.append(DBValueSubString(value))
             else:
                 self.data.append(str(value))
 
@@ -310,3 +323,15 @@ def __eq__(self, other):
 
     def __repr__(self):
         return repr(self.value)
+
+
+class DBValueSubString:
+
+    def __init__(self, value):
+        self.value = str(value)
+
+    def __eq__(self, other):
+        return str(other) in self.value
+
+    def __repr__(self):
+        return repr(self.value)

From 7d69ce84c75e39aa6bf26adfd45adf1d1c2807db Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 29 Nov 2025 11:16:10 +0100
Subject: [PATCH 396/430] bdd: remove needs include index check

Postgrsql versions without the feature are no longer supported.
---
 tests/bdd/environment.py                     | 7 -------
 tests/bdd/flex/lua-index-definitions.feature | 4 ----
 2 files changed, 11 deletions(-)

diff --git a/tests/bdd/environment.py b/tests/bdd/environment.py
index 16919ec85..16afeeae4 100644
--- a/tests/bdd/environment.py
+++ b/tests/bdd/environment.py
@@ -154,10 +154,3 @@ def test_db(context, **kwargs):
 def working_directory(context, **kwargs):
     with tempfile.TemporaryDirectory() as tmpdir:
         yield Path(tmpdir)
-
-
-def before_tag(context, tag):
-    if tag == 'needs-pg-index-includes':
-        if context.config.userdata['PG_VERSION'] < 110000:
-            context.scenario.skip("No index includes in PostgreSQL < 11")
-
diff --git a/tests/bdd/flex/lua-index-definitions.feature b/tests/bdd/flex/lua-index-definitions.feature
index 051253fa5..1400a7809 100644
--- a/tests/bdd/flex/lua-index-definitions.feature
+++ b/tests/bdd/flex/lua-index-definitions.feature
@@ -255,7 +255,6 @@ Feature: Index definitions in Lua file
             | indexdef@substr |
             | USING btree (lower(name)) |
 
-    @needs-pg-index-includes
     Scenario: Include field must be a string or array
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
         And the lua style
@@ -279,7 +278,6 @@ Feature: Index definitions in Lua file
             The 'include' field in an index definition must contain a string or an array.
             """
 
-    @needs-pg-index-includes
     Scenario: Include field must contain a valid column
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
         And the lua style
@@ -303,7 +301,6 @@ Feature: Index definitions in Lua file
             Unknown column 'foo' in table 'mytable'.
             """
 
-    @needs-pg-index-includes
     Scenario: Include field works with string
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
         And the lua style
@@ -326,7 +323,6 @@ Feature: Index definitions in Lua file
             | indexdef@substr |
             | USING btree (name) INCLUDE (tags) |
 
-    @needs-pg-index-includes
     Scenario: Include field works with array
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
         And the lua style

From 69739e8dccce612ce0b9a8834aa839ed78ab130e Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 29 Nov 2025 11:52:05 +0100
Subject: [PATCH 397/430] bdd: replace remaining SELECT steps with SQL
 templates

---
 tests/bdd/flex/delete-callbacks.feature   | 34 ++++++++++++++---------
 tests/bdd/regression/multipolygon.feature | 28 +++++++++++++++----
 tests/bdd/steps/steps_db.py               |  7 +++--
 3 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/tests/bdd/flex/delete-callbacks.feature b/tests/bdd/flex/delete-callbacks.feature
index 2d2a3ec02..773c521db 100644
--- a/tests/bdd/flex/delete-callbacks.feature
+++ b/tests/bdd/flex/delete-callbacks.feature
@@ -27,21 +27,29 @@ Feature: Test for delete callbacks
 
         Given the input file '008-ch.osc.gz'
 
+        Given the SQL statement grouped_counts
+            """
+            SELECT osm_type,
+                   count(*),
+                   sum(extra) AS sum_extra,
+                   sum(osm_id) AS sum_osm_id
+            FROM change
+            GROUP BY osm_type
+            """
+
     Scenario: Delete callbacks are called
         When running osm2pgsql flex with parameters
             | --slim | -a |
-
-        Then SELECT osm_type, count(*), sum(extra) FROM change GROUP BY osm_type
-            | osm_type | count | sum |
-            | N        | 16773 | 16779 |
-            | W        | 4     | 9 |
-            | R        | 1     | 3 |
+        Then statement grouped_counts returns exactly
+            | osm_type | count | sum_extra |
+            | N        | 16773 | 16779     |
+            | W        | 4     | 9         |
+            | R        | 1     | 3         |
 
         When running osm2pgsql flex with parameters
             | --slim | -a |
-
-        Then SELECT osm_type, count(*), sum(osm_id) FROM change GROUP BY osm_type
-            | osm_type | count | sum |
+        Then statement grouped_counts returns exactly
+            | osm_type | count | sum_osm_id |
             | N        | 16773 | 37856781001834 |
             | W        | 4     | 350933407 |
             | R        | 1     | 2871571 |
@@ -72,8 +80,8 @@ Feature: Test for delete callbacks
             """
         When running osm2pgsql flex with parameters
             | --slim | -a |
-        Then SELECT osm_type, count(*), sum(extra) FROM change GROUP BY osm_type
-            | osm_type | count | sum |
+        Then statement grouped_counts returns exactly
+            | osm_type | count | sum_extra |
             | N        | 16773 | 16773 |
             | W        | 4     | 4 |
             | R        | 1     | 1 |
@@ -105,8 +113,8 @@ Feature: Test for delete callbacks
             """
         When running osm2pgsql flex with parameters
             | --slim | -a |
-        Then SELECT osm_type, count(*), sum(extra) FROM change GROUP BY osm_type
-            | osm_type | count | sum |
+        Then statement grouped_counts returns exactly
+            | osm_type | count | sum_extra |
             | N        | 16773 | 16773|
             | W        | 4     | 4|
             | R        | 1     | 1|
diff --git a/tests/bdd/regression/multipolygon.feature b/tests/bdd/regression/multipolygon.feature
index ce4b48ef5..4f5d7af91 100644
--- a/tests/bdd/regression/multipolygon.feature
+++ b/tests/bdd/regression/multipolygon.feature
@@ -3,6 +3,16 @@ Feature: Import and update of multipolygon areas
     Background:
         Given the input file 'test_multipolygon.osm'
 
+        Given the SQL statement grouped_polygons
+            """
+            SELECT osm_id,
+                   count(*) AS count,
+                   round(sum(ST_Area(way))) AS area,
+                   round(sum(way_area::numeric)) AS way_area
+            FROM planet_osm_polygon
+            GROUP BY osm_id
+            """
+
     Scenario Outline: Import and update slim
         Given <lua> lua tagtransform
         When running osm2pgsql pgsql with parameters
@@ -35,7 +45,7 @@ Feature: Import and update of multipolygon areas
             | osm_id | landuse     | name       | ST_NumInteriorRing(way) |
             | -3     | residential | Name_rel11 | 2                       |
 
-        Then SELECT osm_id, round(sum(ST_Area(way))), round(sum(way_area::numeric)) FROM planet_osm_polygon GROUP BY osm_id
+        Then statement grouped_polygons returns
             | osm_id | area  | way_area |
             | -13    | 17581 | 17581    |
             | -7     | 16169 | 16169    |
@@ -43,7 +53,7 @@ Feature: Import and update of multipolygon areas
             | -39    | 10377 | 10378    |
             | -40    | 12397 | 12397    |
 
-        Then SELECT osm_id, count(*) FROM planet_osm_polygon GROUP BY osm_id
+        Then statement grouped_polygons returns
             | osm_id | count |
             | -25    | 1     |
             | 113    | 1     |
@@ -63,7 +73,15 @@ Feature: Import and update of multipolygon areas
             | osm_id | "natural" |
             | -33    | water     |
 
-        Then SELECT osm_id, CASE WHEN '<param1>' = '-G' THEN min(ST_NumGeometries(way)) ELSE count(*) END FROM planet_osm_polygon GROUP BY osm_id
+        Given the SQL statement geometries_polygon
+            """
+            SELECT osm_id,
+                   CASE WHEN '<param1>' = '-G' THEN min(ST_NumGeometries(way))
+                   ELSE count(*) END AS count
+            FROM planet_osm_polygon
+            GROUP BY osm_id
+            """
+        Then statement geometries_polygon returns
            | osm_id | count |
            | -13    | 2     |
            | -7     | 2     |
@@ -99,7 +117,7 @@ Feature: Import and update of multipolygon areas
             | osm_id | landuse     | name       | ST_NumInteriorRing(way) |
             | -3     | residential | Name_rel11 | 2                       |
 
-        Then SELECT osm_id, round(sum(ST_Area(way))), round(sum(way_area::numeric)) FROM planet_osm_polygon GROUP BY osm_id
+        Then statement grouped_polygons returns
             | osm_id | area  | way_area |
             | -13    | 17581 | 17581    |
             | -7     | 16169 | 16169    |
@@ -107,7 +125,7 @@ Feature: Import and update of multipolygon areas
             | -39    | 10377 | 10378    |
             | -40    | 12397 | 12397    |
 
-        Then SELECT osm_id, count(*) FROM planet_osm_polygon GROUP BY osm_id
+        Then statement grouped_polygons returns
             | osm_id | count |
             | 113    | 1     |
             | 118    | 1     |
diff --git a/tests/bdd/steps/steps_db.py b/tests/bdd/steps/steps_db.py
index c91d1e059..681b0635d 100644
--- a/tests/bdd/steps/steps_db.py
+++ b/tests/bdd/steps/steps_db.py
@@ -98,9 +98,12 @@ def db_define_sql_statement(context, sql):
 
 @then("statement (?P<stmt>.+) returns(?P<exact> exactly)?")
 def db_check_sql_statement(context, stmt, exact):
+    assert stmt in context.sql_statements
+    rows = sql.SQL(', '.join(h.rsplit('@')[0] for h in context.table.headings))
+
     with context.db.cursor() as cur:
-        assert stmt in context.sql_statements
-        cur.execute(context.sql_statements[stmt])
+        cur.execute(sql.SQL("SELECT {} FROM ({}) _sql_statement")
+                       .format(rows, sql.SQL(context.sql_statements[stmt])))
 
         actuals = list(DBRow(r, context.table.headings, context.geometry_factory) for r in cur)
 

From b2765aca4a272b2fd015f299c0557c22b86d2555 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 3 Nov 2025 09:31:11 +0100
Subject: [PATCH 398/430] introduce osm2pgsql-test-style for BDD testing

---
 scripts/osm2pgsql-test-style                  | 835 ++++++++++++++++++
 tests/bdd/command-line/invalid.feature        |   6 +-
 tests/bdd/command-line/replication.feature    |  26 +-
 .../command-line/replication_legacy.feature   |  17 +-
 tests/bdd/flex/area.feature                   |   6 +-
 tests/bdd/flex/bbox.feature                   |  18 +-
 tests/bdd/flex/delete-callbacks.feature       |   6 +-
 tests/bdd/flex/empty-insert.feature           |   4 +-
 tests/bdd/flex/geometry-collection.feature    |   4 +-
 tests/bdd/flex/geometry-function-area.feature |   6 +-
 tests/bdd/flex/geometry-iteration.feature     |  16 +-
 tests/bdd/flex/geometry-linestring.feature    |   9 +-
 .../bdd/flex/geometry-multilinestring.feature |   8 +-
 tests/bdd/flex/geometry-multipoint.feature    |  10 +-
 tests/bdd/flex/geometry-null.feature          |  18 +-
 tests/bdd/flex/geometry-point.feature         |  44 +-
 tests/bdd/flex/geometry-processing.feature    |  22 +-
 tests/bdd/flex/invalid-geometries.feature     |  10 +-
 tests/bdd/flex/invalid-lua.feature            |   3 +-
 tests/bdd/flex/line-splitting.feature         |   8 +-
 tests/bdd/flex/locator.feature                |  36 +-
 .../lua-expire-output-definitions.feature     |  27 +-
 tests/bdd/flex/lua-expire.feature             |  18 +-
 tests/bdd/flex/lua-index-definitions.feature  |  61 +-
 tests/bdd/flex/lua-table-definitions.feature  |  21 +-
 tests/bdd/flex/multigeom.feature              |   2 +-
 tests/bdd/flex/relation-changes.feature       |   2 +-
 tests/bdd/flex/way-change.feature             |   2 +-
 tests/bdd/regression/import.feature           |  55 +-
 tests/bdd/regression/input.feature            |   2 +-
 tests/bdd/regression/multipolygon.feature     | 266 ++++--
 tests/bdd/regression/properties.feature       |  14 +-
 tests/bdd/regression/update.feature           |   4 +-
 33 files changed, 1314 insertions(+), 272 deletions(-)
 create mode 100755 scripts/osm2pgsql-test-style

diff --git a/scripts/osm2pgsql-test-style b/scripts/osm2pgsql-test-style
new file mode 100755
index 000000000..0cdb8bdd9
--- /dev/null
+++ b/scripts/osm2pgsql-test-style
@@ -0,0 +1,835 @@
+#!/usr/bin/env python3
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# This file is part of osm2pgsql (https://osm2pgsql.org/).
+#
+# Copyright (C) 2025 by the osm2pgsql developer community.
+# For a full list of authors see the git log.
+"""
+Test runner for BDD-style integration tests.
+
+See osm2pgsql manual for more information on osm2pgsql style testing.
+"""
+import logging
+import sys
+import tempfile
+import math
+import re
+import contextlib
+import json
+import datetime as dt
+from decimal import Decimal
+from subprocess import Popen, PIPE
+from argparse import ArgumentParser, RawDescriptionHelpFormatter
+from pathlib import Path
+import importlib.util
+import io
+from importlib.machinery import SourceFileLoader
+
+from behave import given, when, then, use_step_matcher, use_fixture, fixture
+from behave.runner import ModelRunner, Context
+from behave.formatter.base import StreamOpener
+from behave.formatter.pretty import PrettyFormatter
+from behave import runner_util
+from behave.configuration import Configuration
+
+LOG = logging.getLogger()
+
+import psycopg
+from psycopg import sql
+
+use_step_matcher('re')
+
+OBJECT_ORDER = {'n': 1, 'w': 2, 'r': 3}
+
+def opl_sort(line):
+    oid = line.split(' ', 1)[0]
+    return OBJECT_ORDER[oid[0]], int(oid[1:])
+
+#################### Replication mock ##############################
+
+class ReplicationServerMock:
+
+    def __init__(self, base_url, state_infos):
+        self.expected_base_url = base_url
+        self.state_infos = state_infos
+
+    def __call__(self, base_url):
+        assert base_url == self.expected_base_url,\
+               f"Wrong replication service called. Expected '{self.expected_base_url}', got '{base_url}'"
+        return self
+
+    def get_state_info(self, seq=None, retries=2):
+        assert self.state_infos, 'Replication mock not properly set up'
+        if seq is None:
+            return self.state_infos[-1]
+
+        for info in self.state_infos:
+            if info.sequence == seq:
+                return info
+
+        return None
+
+    def timestamp_to_sequence(self, timestamp, balanced_search=False):
+        assert self.state_infos, 'Replication mock not properly set up'
+
+        if timestamp < self.state_infos[0].timestamp:
+            return self.state_infos[0].sequence
+
+        prev = self.state_infos[0]
+        for info in self.state_infos:
+            if timestamp >= prev.timestamp and timestamp < info.timestamp:
+                return prev.sequence
+            prev = info
+
+        return prev.sequence
+
+    def apply_diffs(self, handler, start_id, max_size=1024, idx="", simplify=True):
+        if start_id > self.state_infos[-1].sequence:
+            return None
+
+        numdiffs = int((max_size + 1023)/1024)
+        return min(self.state_infos[-1].sequence, start_id + numdiffs - 1)
+
+
+# Replication module is optional
+_repfl_spec = importlib.util.spec_from_loader(
+    'osm2pgsql_replication',
+    SourceFileLoader('osm2pgsql_replication',
+                     str(Path(__file__, '..', 'osm2pgsql-replication').resolve())))
+
+if _repfl_spec:
+    osm2pgsql_replication = importlib.util.module_from_spec(_repfl_spec)
+    _repfl_spec.loader.exec_module(osm2pgsql_replication)
+
+    from osmium.replication.server import OsmosisState
+else:
+    osm2pgsql_replication = None
+
+#################### hooks #########################################
+
+def hook_before_all(context):
+    context.config.setup_logging(logging.INFO)
+
+    # Feature check: table spaces
+    if context.user_args.test_tablespace == 'auto':
+        with context.connect_db('postgres') as conn:
+            with conn.cursor() as cur:
+                cur.execute("""SELECT spcname FROM pg_tablespace
+                                WHERE spcname = 'tablespacetest'""")
+                context.user_args.test_tablespace = cur.rowcount > 0
+        LOG.info('Check if tablespaces are available: %s',
+                 'yes' if context.user_args.test_tablespace else 'no')
+    else:
+        context.user_args.test_tablespace = context.user_args.test_tablespace == 'yes'
+
+    # Test that osm2pgsql works.
+    proc = Popen([context.user_args.osm2pgsql_binary, '--version'],
+                 stdout=PIPE, stderr=PIPE)
+    _, serr = proc.communicate()
+    osm2pgsql_version = serr.decode('utf-8')
+    if proc.returncode != 0:
+        LOG.critical("Could not run osm2pgsql. Error:\n%s", serr)
+        LOG.critical("osm2pgsql binary used: %s", context.user_args.osm2pgsql_binary)
+        raise RuntimeError('Error running osm2pgsql')
+
+        LOG.info('Check if proj is available: %s',
+                 'yes' if context.user_args.test_proj else 'no')
+
+    # Feature check: proj
+    if context.user_args.test_proj == 'auto':
+        context.user_args.test_proj = 'Proj [disabled]' not in osm2pgsql_version
+    else:
+        context.user_args.test_proj = context.user_args.test_proj == 'yes'
+
+    use_fixture(template_test_db, context)
+
+
+
+def hook_before_scenario(context, scenario):
+    if 'config.have_proj' in scenario.tags and not context.user_args.test_proj:
+        scenario.skip("Generic proj library not configured.")
+
+    context.db = use_fixture(test_db, context)
+    context.import_file = None
+    context.import_data = None
+    context.osm2pgsql_params = {'-d': context.user_args.test_db}
+    context.osm2pgsql_returncode = None
+    context.workdir = use_fixture(working_directory, context)
+    context.nodes = NodeStore()
+    context.sql_statements = {}
+    context.urlrequest_responses = {}
+    osm2pgsql_replication.ReplicationServer = None
+
+    def _mock_urlopen(request):
+        if not request.full_url in context.urlrequest_responses:
+            raise urllib.error.URLError('Unknown URL')
+
+        return contextlib.closing(io.BytesIO(context.urlrequest_responses[request.full_url].encode('utf-8')))
+
+    osm2pgsql_replication.urlrequest.urlopen = _mock_urlopen
+
+
+
+#################### fixtures ######################################
+
+@fixture
+def template_test_db(context, **kwargs):
+    context.drop_db(context.user_args.template_test_db, recreate_template='default')
+
+    with context.connect_db(context.user_args.template_test_db) as conn:
+        conn.execute('CREATE EXTENSION postgis')
+        conn.execute('CREATE EXTENSION hstore')
+
+    yield context.user_args.template_test_db
+
+    context.drop_db(context.user_args.template_test_db)
+
+
+@fixture
+def test_db(context, **kwargs):
+    context.drop_db(recreate_template=context.user_args.template_test_db)
+
+    with context.connect_db() as conn:
+        yield conn
+
+    if not context.user_args.keep_test_db:
+        context.drop_db()
+
+
+@fixture
+def working_directory(context, **kwargs):
+    with tempfile.TemporaryDirectory() as tmpdir:
+        yield Path(tmpdir)
+
+################### Node location creation #########################
+
+class NodeStore:
+    grid = {}
+
+    def set_grid(self, lines, grid_step, origin_x, origin_y):
+        self.grid = {}
+        origin_y -= grid_step * (len(lines) - 1)
+
+        ndigits = 1
+        step = grid_step
+        while step < 0:
+            ndigits += 1
+            step /= 10
+
+        for y, line in enumerate(lines):
+            for x, pt in enumerate(line):
+                if pt.isdigit():
+                    self.grid[int(pt)] = (round(origin_x + x * grid_step, ndigits),
+                                          round(origin_y + y * grid_step, ndigits))
+
+    def get_as_opl(self):
+        return [f"n{i} x{x} y{y}" for i, (x, y) in self.grid.items()]
+
+    def add_coordinates(self, lines):
+        for line in lines:
+            if line.startswith('n') and ' x' not in line:
+                nid = int(line.split(' ', 1)[0][1:])
+                assert nid in self.grid, \
+                    f"OPL error. Node {nid} has no coordinates and is not in grid."
+                x, y = self.grid[nid]
+                yield f"{line} x{x} y{y}"
+            else:
+                yield line
+
+    def parse_point(self, pt):
+        pt = pt.strip()
+        if ' ' in pt:
+            return list(map(float, pt.split(' ', 1)))
+        return self.grid[int(pt)]
+
+
+################### ResultComparison ###############################
+
+class ResultCompare:
+
+    def __init__(self, heading, nodes):
+        self.nodes = nodes
+        if '!' in heading:
+            self.name, self.fmt = heading.rsplit('!', 1)
+            if self.fmt.startswith(':'):
+                self.compare = self._intcompare_fmt
+            elif self.fmt.startswith('~'):
+                if self.fmt.endswith('%'):
+                    rel_tol = float(self.fmt[1:-1]) / 100
+                    self.compare = lambda exp, val: math.isclose(float(exp), val, rel_tol=rel_tol)
+                else:
+                    abs_tol = float(self.fmt[1:])
+                    self.compare = lambda exp, val: math.isclose(float(exp), val, abs_tol=abs_tol)
+            else:
+                self.compare = getattr(self, f"_compare_{self.fmt}", None)
+            assert self.compare is not None, f"Unknown formatter {self.fmt}"
+        else:
+            self.name = heading
+            self.fmt = None
+            self.compare = lambda exp, val: str(val) == exp
+
+    def as_select(self):
+        if self.fmt == 'geo':
+            return f"ST_AsText({self.name})"
+
+        return self.name
+
+    def equals(self, expected, value):
+        if expected == 'NULL':
+            return value is None
+
+        return self.compare(expected, value)
+
+    def _intcompare_fmt(self, expected, value):
+        return expected == f"{{{self.fmt}}}".format(value)
+
+    def _compare_i(self, expected, value):
+        return expected.lower() == str(value).lower()
+
+    def _compare_re(self, expected, value):
+        return re.fullmatch(expected, str(value)) is not None
+
+    def _compare_substr(self, expected, value):
+        return expected in str(value)
+
+    def _compare_json(self, expected, value):
+        return json.loads(expected) == value
+
+    def _compare_geo(self, expected, value):
+        m = re.fullmatch(r'([A-Z]+)\((.*)\)', value)
+
+        return self._eq_geom(expected, m[1], m[2]) if m else False
+
+    def _eq_geom(self, bdd_geom, pg_type, pg_coords):
+        # MULTI* geometries
+        if bdd_geom.startswith('[') and bdd_geom.endswith(']'):
+            bdd_parts = bdd_geom[1:-1].split(';')
+            pg_parts = pg_coords[1:-1].split('),(')
+            return pg_type.startswith('MULTI') \
+                    and len(bdd_parts) == len(pg_parts) \
+                    and all(self._eq_geom(b.strip(), pg_type[5:], g.strip())
+                            for b, g in zip(bdd_parts, pg_parts))
+
+        # GEOMETRYCOLLECTIONS
+        if bdd_geom.startswith('{') and bdd_geom.endswith('}'):
+            bdd_parts = bdd_geom[1:-1].split(';')
+            pg_parts = list(map(lambda s: re.fullmatch(r'([A-Z]+)\(([^A-Z]*)\)', s),
+                                re.findall('[A-Z]+[^A-Z]+[^,A-Z]', pg_coords)))
+            return pg_type.startswith('GEOMETRYCOLLECTION')\
+                    and len(bdd_parts) == len(pg_parts)\
+                    and all(g is not None and self._eq_geom(b.strip(), g[1], g[2])
+                            for b, g in zip(bdd_parts, pg_parts))
+
+        # POINT
+        if ',' not in bdd_geom:
+            return pg_type == 'POINT' and self._eq_point(bdd_geom, pg_coords)
+
+        # LINESTRING
+        if '(' not in bdd_geom:
+            return pg_type == 'LINESTRING' \
+                    and all(self._eq_point(b, p) for b, p
+                            in zip((g.strip() for g in bdd_geom.split(',')),
+                                   (g.strip() for g in pg_coords.split(','))))
+
+        # POLYGON
+        if pg_type != 'POLYGON':
+            return False
+        # Polygon comparison is tricky because the polygons don't necessarily
+        # end at the same point or have the same winding order.
+        # Brute force all possible variants of the expected polygon
+        bdd_parts = re.findall(r'\([^)]+\)', bdd_geom)
+        pg_parts = [g.strip() for g in pg_coords[1:-1].split('),(')]
+        return len(bdd_parts) == len(pg_parts) \
+                and all(self._eq_ring(*parts) for parts in zip(bdd_parts, pg_parts))
+
+    def _eq_point(self, bdd_pt, pg_pt):
+        exp_geom = self.nodes.parse_point(bdd_pt)
+        pg_geom = list(map(float, pg_pt.split(' ')))
+        return len(exp_geom) == len(pg_geom) \
+                and all(math.isclose(e, p, rel_tol=0.000001) for e, p in zip(exp_geom, pg_geom))
+
+    def _eq_ring(self, bdd_ring, pg_ring):
+        bdd_pts = [g.strip() for g in bdd_ring[1:-1].split(',')]
+        pg_pts = [g.strip() for g in pg_ring.split(',')]
+        if bdd_pts[0] != bdd_pts[-1]:
+            raise RuntimeError(f"Invalid polygon {bdd_geom}. "
+                                "First and last point need to be the same")
+        if len(bdd_pts) != len(pg_pts):
+            return False
+
+        for line in (bdd_pts[:-1], bdd_pts[-1:0:-1]):
+            for i in range(len(line)):
+                if all(self._eq_point(p1, p2) for p1, p2 in
+                       zip(line[i:] + line[:i], pg_pts)):
+                    return True
+
+        return False
+
+################### Steps: Database setup ##########################
+
+@given("the database schema (?P<schema>.+)")
+def create_db_schema(context, schema):
+    with context.db.cursor() as cur:
+        cur.execute("CREATE SCHEMA " + schema)
+
+
+@when("deleting table (?P<table>.+)")
+def delete_table(context, table):
+    with context.db.cursor() as cur:
+        cur.execute("DROP TABLE " + table)
+
+
+################### Steps: OSM data ################################
+
+@given("the input file '(?P<osm_file>.+)'")
+def osm_set_import_file(context, osm_file):
+    assert context.import_data is None, \
+        "Import file cannot be used together with inline data."
+    pfile = Path(osm_file)
+    if pfile.is_absolute():
+        context.import_file = pfile
+    else:
+        basedir = context.user_args.test_data_dir or Path(context.feature.filename).parent
+        context.import_file = (basedir / osm_file).resolve()
+
+
+@given("the OSM data")
+def osm_define_data(context):
+    assert context.import_file is None, \
+        "Inline data cannot be used together with an import file."
+    if context.text.strip():
+        context.append_osm_data(context.nodes.add_coordinates(context.text.split('\n')))
+    else:
+        context.append_osm_data([])
+
+
+@given("the OSM data format string")
+def osm_define_data(context):
+    assert context.import_file is None, \
+        "Inline data cannot be used together with an import file."
+    data = eval('f"""' + context.text + '"""')
+
+    context.append_osm_data(context.nodes.add_coordinates(data.split('\n')))
+
+
+@given("the (?P<step>[0-9.]+ )?grid(?: with origin (?P<origin_x>[0-9.-]+) (?P<origin_y>[0-9.-]+))?")
+def osm_define_node_grid(context, step, origin_x, origin_y):
+    step = float(step.strip()) if step else 0.1
+    x = float(origin_x) if origin_x else 20.0
+    y = float(origin_y) if origin_y else 20.0
+
+    assert x > -180.0 and x < 180.0
+    assert y > -90.0 and y < 90.0
+
+    context.nodes.set_grid([context.table.headings] + [list(h) for h in context.table], step, x, y)
+    context.append_osm_data(context.nodes.get_as_opl())
+
+################### Steps: Style file ##############################
+
+@given("the style file '(?P<style>.+)'")
+def setup_style_file(context, style):
+    sfile = Path(style)
+
+    if sfile.is_absolute():
+        assert sfile.is_file()
+    elif context.user_args.style_data_dir is not None \
+        and (context.user_args.style_data_dir / sfile).is_file():
+            sfile = context.user_args.style_data_dir / sfile
+    elif context.user_args.test_data_dir is not None \
+        and (context.user_args.test_data_dir / sfile).is_file():
+            sfile = context.user_args.test_data_dir / sfile
+    else:
+        sfile = Path(context.feature.filename).parent / sfile
+        assert sfile.is_file()
+    context.osm2pgsql_params['-S'] = str(sfile.resolve())
+
+
+@given("the lua style")
+def setup_style_inline(context):
+    outfile = context.workdir / 'inline_style.lua'
+    outfile.write_text(context.text)
+
+    context.osm2pgsql_params['-S'] = str(outfile)
+
+
+################### Steps: Running osm2pgsql #######################
+
+@when(r"running osm2pgsql(?P<output> \w+)?(?: with parameters)?")
+def execute_osm2pgsql(context, output):
+    assert output in (' flex', ' pgsql', ' null', None)
+
+    if output is not None:
+        context.osm2pgsql_params['-O'] = output.strip()
+    if output == ' pgsql' and '-S' not in context.osm2pgsql_params:
+        context.osm2pgsql_params['-S'] = '{STYLE_DATA_DIR}/default.style'
+
+    cmdline = [context.user_args.osm2pgsql_binary]
+
+    test_dir = (context.user_args.test_data_dir or Path('.')).resolve()
+    style_dir = (context.user_args.style_data_dir or Path('.')).resolve()
+    def _template(param):
+        return param.replace('{TEST_DATA_DIR}', str(test_dir))\
+                    .replace('{STYLE_DATA_DIR}', str(style_dir))\
+                    .replace('{TEST_DB}', context.user_args.test_db)
+
+    if context.table:
+        assert not any('<' in h for h in context.table.headings), \
+            "Substition in the first line of a table are not supported."
+        cmdline.extend(_template(h) for h in context.table.headings if h)
+        for row in context.table:
+            cmdline.extend(_template(c) for c in row if c)
+
+    for k, v in context.osm2pgsql_params.items():
+        if k not in cmdline:
+            cmdline.extend((k, _template(v)))
+
+    if not context.user_args.test_tablespace\
+        and any(p.startswith('--tablespace') for p in cmdline):
+        context.scenario.skip('tablespace tablespacetest not available')
+        return
+
+    if context.import_data is not None:
+        data_stdin = '\n'.join(sorted(context.import_data.values(), key=opl_sort)).encode('utf-8')
+        context.import_data = None
+        cmdline.extend(('-r', 'opl', '-'))
+    else:
+        assert context.import_file is not None, "No input data given."
+        cmdline.append(str(context.import_file))
+        context.import_file = None
+        data_stdin = None
+
+    env = {}
+
+    proc = Popen(cmdline, cwd=str(context.workdir),
+                 stdin=PIPE, stdout=PIPE, stderr=PIPE, env=env)
+
+    outdata = proc.communicate(input=data_stdin)
+    context.osm2pgsql_cmdline = ' '.join(cmdline)
+    context.osm2pgsql_outdata = [d.decode('utf-8').replace('\\n', '\n') for d in outdata]
+    context.osm2pgsql_returncode = proc.returncode
+    context.osm2pgsql_params = {'-d': context.user_args.test_db}
+
+@then("execution is successful")
+def osm2pgsql_check_success(context):
+    assert context.osm2pgsql_returncode == 0, \
+        f"osm2pgsql failed with error code {context.osm2pgsql_returncode}.\n"\
+        f"Command line: {context.osm2pgsql_cmdline}\n"\
+        f"Output:\n{context.osm2pgsql_outdata[0]}\n{context.osm2pgsql_outdata[1]}\n"
+
+@then(r"execution fails(?: with return code (?P<expected>\d+))?")
+def osm2pgsql_check_failure(context, expected):
+    retcode = context.osm2pgsql_returncode
+    assert retcode != 0, "osm2pgsql unexpectedly succeeded"
+
+    if expected:
+        assert retcode == int(expected), \
+            f"osm2pgsql failed with return code {retcode} instead of {expected}\n"\
+            f"Output:\n{context.osm2pgsql_outdata[0]}\n{context.osm2pgsql_outdata[1]}\n"
+
+@then(r"the (?P<kind>\w+) output contains")
+def check_program_output(context, kind):
+    if kind == 'error':
+        s = context.osm2pgsql_outdata[1]
+    elif kind == 'standard':
+        s = context.osm2pgsql_outdata[0]
+    else:
+        assert not "Expect one of error, standard"
+
+    for line in context.text.split('\n'):
+        line = line.strip()
+        assert line in s,\
+               f"Output '{line}' not found in {kind} output:\n{s}\n"
+
+################### Steps: Running Replication #####################
+
+@given("the replication service at (?P<base_url>.*)")
+def setup_replication_mock(context, base_url):
+    if osm2pgsql_replication is None:
+        context.scenario.skip("Replication binary not available. Skip.")
+        return
+
+    if context.table:
+        state_infos = \
+            [OsmosisState(int(row[0]),
+             dt.datetime.strptime(row[1], '%Y-%m-%dT%H:%M:%SZ').replace(tzinfo=dt.timezone.utc))
+             for row in context.table]
+    else:
+        state_infos = []
+    osm2pgsql_replication.ReplicationServer = ReplicationServerMock(base_url, state_infos)
+
+
+@given("the URL (?P<base_url>.*) returns")
+def mock_url_response(context, base_url):
+    context.urlrequest_responses[base_url] = context.text
+
+
+@when("running osm2pgsql-replication")
+def execute_osm2pgsql_replication(context):
+    assert osm2pgsql_replication is not None
+    assert osm2pgsql_replication.ReplicationServer is not None
+
+    cmdline = []
+
+    test_dir = (context.user_args.test_data_dir or Path('.')).resolve()
+    style_dir = (context.user_args.style_data_dir or Path('.')).resolve()
+    def _template(param):
+        return param.replace('{TEST_DATA_DIR}', str(test_dir))\
+                    .replace('{STYLE_DATA_DIR}', str(style_dir))\
+                    .replace('{TEST_DB}', context.user_args.test_db)
+
+    if context.table:
+        assert not any('<' in h for h in context.table.headings), \
+            "Substition in the first line of a table are not supported."
+        cmdline.extend(_template(h) for h in context.table.headings if h)
+        for row in context.table:
+            cmdline.extend(_template(c) for c in row if c)
+
+    if '-d' not in cmdline and '--database' not in cmdline:
+        cmdline.extend(('-d', context.user_args.test_db))
+
+    if cmdline[0] == 'update':
+        cmdline.extend(('--osm2pgsql-cmd', context.user_args.osm2pgsql_binary))
+
+        if '--' not in cmdline:
+            cmdline.extend(('--', '-S', str(style_dir / 'default.style')))
+
+    serr = io.StringIO()
+    log_handler = logging.StreamHandler(serr)
+    osm2pgsql_replication.LOG.addHandler(log_handler)
+    with contextlib.redirect_stdout(io.StringIO()) as sout:
+        context.osm2pgsql_returncode = osm2pgsql_replication.main(cmdline)
+    osm2pgsql_replication.LOG.removeHandler(log_handler)
+    context.osm2pgsql_outdata = [sout.getvalue(), serr.getvalue()]
+
+
+################### Steps: Inspect database ########################
+
+@given("the SQL statement (?P<sql>.+)")
+def db_define_sql_statement(context, sql):
+    context.sql_statements[sql] = context.text
+
+
+@then("there are (?P<exists>no )?tables (?P<tables>.+)")
+def db_table_existance(context, exists, tables):
+    for table in tables.split(','):
+        table = table.strip()
+        if exists == 'no ':
+            assert not context.table_exists(table), f"Table '{table}' unexpectedly found"
+        else:
+            assert context.table_exists(table), f"Table '{table}' not found"
+
+
+@then("table (?P<table>.+) contains(?P<exact> exactly)?")
+def db_check_table_content(context, table, exact):
+    context.execute_steps("Then execution is successful")
+    assert context.table_exists(table), f"Table {table} not found in database."
+    context.check_select(sql.Identifier(*table.split('.', 1)), exact is not None)
+
+
+@then("table (?P<table>.+) doesn't contain")
+def db_check_table_content_negative(context, table):
+    context.execute_steps("Then execution is successful")
+    assert context.table_exists(table), f"Table {table} not found in database."
+    context.check_select_not_contained(sql.Identifier(*table.split('.', 1)))
+
+
+@then(r"table (?P<table>.+) has (?P<row_num>\d+) rows?")
+def db_table_row_count(context, table, row_num):
+    context.execute_steps("Then execution is successful")
+    assert context.table_exists(table), f"Table {table} not found in database."
+
+    query = sql.SQL("SELECT count(*) FROM {}").format(sql.Identifier(*table.split('.', 2)))
+    for res in context.db.execute(query):
+        assert res[0] == int(row_num),\
+           f"Table {table}: expected {row_num} rows, got {res[0]}"
+
+
+@then("statement (?P<stmt>.+) returns(?P<exact> exactly)?")
+def db_check_table_content(context, stmt, exact):
+    context.execute_steps("Then execution is successful")
+    assert stmt in context.sql_statements
+    context.check_select(sql.SQL(f"({context.sql_statements[stmt]}) _statement_sql"),
+                         exact is not None)
+
+################### Context ########################################
+
+class Osm2pgsqlContext(Context):
+
+    def __init__(self, runner, args):
+        super().__init__(runner)
+        self.user_args = args
+
+    def connect_db(self, name=None):
+        dbname = name or self.user_args.test_db
+        return psycopg.connect(dbname=dbname, autocommit=True)
+
+    def drop_db(self, name=None, recreate_template=None):
+        db = sql.Identifier(name or self.user_args.test_db)
+        with self.connect_db('postgres') as conn:
+            conn.execute(sql.SQL('DROP DATABASE IF EXISTS {}').format(db))
+            if recreate_template == 'default':
+                conn.execute(sql.SQL('CREATE DATABASE {}').format(db))
+            elif recreate_template:
+                conn.execute(sql.SQL('CREATE DATABASE {} WITH TEMPLATE {}')
+                                .format(db, sql.Identifier(recreate_template)))
+
+    def append_osm_data(self, lines, include_untagged=None):
+        if self.import_data is None:
+            self.import_data = {}
+        for line in lines:
+            if (l := line.strip()):
+                self.import_data[l.split(' ', 1)[0]] = l
+
+    def table_exists(self, table):
+        sql_params = table.split('.', 1) if '.' in table else ('public', table)
+        sql = 'SELECT count(*) FROM {} WHERE schemaname = %s AND tablename = %s'
+
+        for look_in in ('pg_tables', 'pg_views'):
+            for res in self.db.execute(sql.format('pg_tables'), sql_params):
+                if res[0] == 1:
+                    return True
+        return False
+
+    def check_select(self, from_clause, exact):
+        rows = [ResultCompare(h, self.nodes) for h in self.table.headings]
+        lines = set(range(0, len(self.table.rows)))
+
+        query = sql.SQL('SELECT {} FROM {}').format(
+                sql.SQL(', '.join(f"({r.as_select()}) as c{i}" for i, r in enumerate(rows))),
+                from_clause)
+
+        table_content = ''
+        unexpected_rows = []
+        for row in self.db.execute(query):
+            table_content += f"\n{row}"
+            for i in lines:
+                for attr, expected, value in zip(rows, self.table[i], row):
+                    if not attr.equals(expected, value):
+                        break
+                else:
+                    lines.remove(i)
+                    break
+            else:
+                if exact:
+                    unexpected_rows.append(str(row))
+
+        assert not lines, \
+               "Rows not found:\n" \
+               + '\n'.join(str(self.table[i]) for i in lines) \
+               + "\nTable content:\n" \
+               + table_content
+
+        assert not unexpected_rows, \
+            "Unexpected rows found:\n" + '\n'.join(unexpected_rows)\
+               + "\nTable content:\n" \
+               + table_content
+
+    def check_select_not_contained(self, from_clause):
+        rows = [ResultCompare(h, self.nodes) for h in self.table.headings]
+        lines = set(range(0, len(self.table.rows)))
+
+        query = sql.SQL('SELECT {} FROM {}').format(
+                sql.SQL(', '.join(f"({r.as_select()}) as c{i}" for i, r in enumerate(rows))),
+                from_clause)
+
+        table_content = ''
+        matching_rows = []
+        for row in self.db.execute(query):
+            table_content += f"\n{row}"
+            for i in lines:
+                for attr, expected, value in zip(rows, self.table[i], row):
+                    if not attr.equals(expected, value):
+                        break
+                else:
+                    matching_rows.append(str(row))
+                    break
+
+        assert not matching_rows, \
+            "Matching rows found:\n" + '\n'.join(matching_rows)\
+               + "\nFull table content:\n" \
+               + table_content
+
+
+#################### runner and main ###############################
+
+class Osm2pgsqlRunner(ModelRunner):
+
+    def __init__(self, config, args):
+        super().__init__(config)
+        self.feature_locations = runner_util.collect_feature_locations(args.features)
+        self.hooks = {
+          'before_all' : hook_before_all,
+          'before_scenario': hook_before_scenario
+        }
+        self.context = Osm2pgsqlContext(self, args)
+
+    def run(self):
+        features = runner_util.parse_features(self.feature_locations)
+        self.features.extend(features)
+
+        stream_opener = StreamOpener(stream=sys.stdout)
+        self.formatters = [PrettyFormatter(stream_opener, self.config)]
+        return self.run_model()
+
+
+def get_parser():
+    parser = ArgumentParser(description=__doc__,
+                            prog='osm2pgsql-test-style',
+                            formatter_class=RawDescriptionHelpFormatter)
+    parser.add_argument('features', nargs='+',
+                        help='Feature files or paths')
+    parser.add_argument('--osm2pgsql-binary',
+                        help='osm2pgsql binary to use for testing (default: osm2pgsql)')
+    parser.add_argument('--test-data-dir', type=Path,
+                        help='(optional) directory to search for test data')
+    parser.add_argument('--style-data-dir', type=Path,
+                        help='(optional) directory to search for style files')
+    parser.add_argument('--test-db', default='osm2pgsql-test',
+                        help='Name of database to use for testing (default: osm2pgsql-test)')
+    parser.add_argument('--template-test-db', default='osm2pgsql-test-template',
+                        help='Name of database to use for creating the template db '
+                             '(default: osm2pgsql-test-template)')
+    parser.add_argument('--keep-test-db', action='store_true',
+                        help='Keep the test database around after tests are done')
+    parser.add_argument('--test-tablespace', default='auto', choices=['yes', 'no', 'auto'],
+                        help='Include tests requiring a tablespace')
+    parser.add_argument('--test-proj', default='auto', choices=['yes', 'no', 'auto'],
+                        help='Include tests requiring the proj library')
+
+    return parser
+
+def main(prog_args=None):
+    parser = get_parser()
+    try:
+        args = parser.parse_args(args=prog_args)
+    except SystemExit:
+        return 1
+
+    if args.osm2pgsql_binary is None:
+        args.osm2pgsql_binary = 'osm2pgsql'
+    else:
+        args.osm2pgsql_binary = str(Path(args.osm2pgsql_binary).resolve())
+
+    config = Configuration(command_args=[])
+    config.show_skipped = False
+    runner = Osm2pgsqlRunner(config, args)
+
+    failed = runner.run()
+
+    if runner.undefined_steps:
+        LOG.error('Error in feature definition. The following steps are unknown:\n - '
+                  + '\n - '.join(f"{s.keyword} {s.name}" for s in runner.undefined_steps))
+
+    return int(failed)
+
+if __name__ == '__main__':
+    retcode = main()
+    try:
+        pass
+    except Exception as ex:
+        LOG.fatal("Exception during execution: %s", ex)
+        retcode = 3
+
+    sys.exit(retcode)
diff --git a/tests/bdd/command-line/invalid.feature b/tests/bdd/command-line/invalid.feature
index edcce7376..54e9393dd 100644
--- a/tests/bdd/command-line/invalid.feature
+++ b/tests/bdd/command-line/invalid.feature
@@ -7,16 +7,18 @@ Feature: Errors for invalid command line parameter combinations
             """
 
     Scenario: create and append cannot be used together
-        Then running osm2pgsql pgsql with parameters fails
+        When running osm2pgsql pgsql with parameters
             | -c | -a |
+        Then execution fails
         And the error output contains
             """
             --append and --create options can not be used at the same time
             """
 
     Scenario: append can only be used with slim mode
-        Then running osm2pgsql pgsql with parameters fails
+        When running osm2pgsql pgsql with parameters
             | -a |
+        Then execution fails
         And the error output contains
             """
             --append can only be used with slim mode
diff --git a/tests/bdd/command-line/replication.feature b/tests/bdd/command-line/replication.feature
index 7329bee41..8567b1e0c 100644
--- a/tests/bdd/command-line/replication.feature
+++ b/tests/bdd/command-line/replication.feature
@@ -44,11 +44,13 @@ Feature: Tests for the osm2pgsql-replication script with property table
             """
             n34 Tamenity=restaurant x77 y45.3
             """
+        And the replication service at http://example.com/europe/liechtenstein-updates
         When running osm2pgsql pgsql with parameters
             | --slim |
 
-        Then running osm2pgsql-replication fails with returncode 1
+        When running osm2pgsql-replication
             | init |
+        Then execution fails with return code 1
         And the error output contains
             """
             Cannot get timestamp from database.
@@ -56,10 +58,12 @@ Feature: Tests for the osm2pgsql-replication script with property table
 
     Scenario: Replication cannot initialised on non-updatable database
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the replication service at http://example.com/europe/liechtenstein-updates
         When running osm2pgsql pgsql
 
-        Then running osm2pgsql-replication fails with returncode 1
+        When running osm2pgsql-replication
             | init |
+        Then execution fails with return code 1
         And the error output contains
             """
             Database needs to be imported in --slim mode.
@@ -130,8 +134,9 @@ Feature: Tests for the osm2pgsql-replication script with property table
         When running osm2pgsql pgsql with parameters
             | --slim |
 
-        Then running osm2pgsql-replication fails with returncode 1
+        When running osm2pgsql-replication
             | init | --middle-schema=foobar |
+        Then execution fails with return code 1
         And the error output contains
             """
             Database needs to be imported in --slim mode.
@@ -275,8 +280,9 @@ Feature: Tests for the osm2pgsql-replication script with property table
         When running osm2pgsql pgsql with parameters
             | --slim |
 
-        Then running osm2pgsql-replication fails with returncode 1
+        When running osm2pgsql-replication
             | update |
+        Then execution fails with return code 1
         And the error output contains
             """
             Updates not set up correctly.
@@ -354,8 +360,9 @@ Feature: Tests for the osm2pgsql-replication script with property table
         When running osm2pgsql pgsql with parameters
             | --slim |
 
-        Then running osm2pgsql-replication fails with returncode 2
+        When running osm2pgsql-replication
             | status | --json |
+        Then execution fails with return code 2
         And the standard output contains
             """
             "status": 2
@@ -374,7 +381,8 @@ Feature: Tests for the osm2pgsql-replication script with property table
 
         And running osm2pgsql-replication
             | status | --json |
-        Then the standard output contains
+        Then execution is successful
+        And the standard output contains
             """
             "status": 0
             "server": {"base_url": "http://example.com/europe/liechtenstein-updates", "sequence": 10000001, "timestamp": "2013-10-01T01:00:00Z"
@@ -391,8 +399,9 @@ Feature: Tests for the osm2pgsql-replication script with property table
         When running osm2pgsql pgsql with parameters
             | --slim |
 
-        Then running osm2pgsql-replication fails with returncode 1
+        When running osm2pgsql-replication
             | init | --server | http://example.com/europe/liechtenstein-updates |
+        Then execution fails with return code 1
         And the error output contains
             """
             The replication service does not have diff files for the requested date.
@@ -408,8 +417,9 @@ Feature: Tests for the osm2pgsql-replication script with property table
         When running osm2pgsql pgsql with parameters
             | --slim |
 
-        Then running osm2pgsql-replication fails with returncode 1
+        When running osm2pgsql-replication
             | init |
+        Then execution fails with return code 1
         And the error output contains
             """
             Cannot load state information for 9999999 from replication service http://example.com/europe/liechtenstein-updates.
diff --git a/tests/bdd/command-line/replication_legacy.feature b/tests/bdd/command-line/replication_legacy.feature
index de7db6248..e89932b5a 100644
--- a/tests/bdd/command-line/replication_legacy.feature
+++ b/tests/bdd/command-line/replication_legacy.feature
@@ -30,8 +30,9 @@ Feature: Tests for the osm2pgsql-replication script without property table
             | --slim |
         And deleting table osm2pgsql_properties
 
-        Then running osm2pgsql-replication fails with returncode 1
+        When running osm2pgsql-replication
             | init | --osm-file={TEST_DATA_DIR}/008-ch.osc.gz |
+        Then execution fails with return code 1
         And the error output contains
             """
             has no usable replication headers
@@ -66,10 +67,11 @@ Feature: Tests for the osm2pgsql-replication script without property table
 
         And deleting table foobar.osm2pgsql_properties
 
-        Then running osm2pgsql-replication fails with returncode 1
+        When running osm2pgsql-replication
             | init |
             | --osm-file={TEST_DATA_DIR}/liechtenstein-2013-08-03.osm.pbf |
-         And the error output contains
+        Then execution fails with return code 1
+        And the error output contains
             """
             Database needs to be imported in --slim mode.
             """
@@ -141,8 +143,9 @@ Feature: Tests for the osm2pgsql-replication script without property table
         When running osm2pgsql pgsql with parameters
             | --slim |
 
-        Then running osm2pgsql-replication fails with returncode 1
+        When running osm2pgsql-replication
             | update |
+        Then execution fails with return code 1
         And the error output contains
             """
             Updates not set up correctly.
@@ -215,8 +218,9 @@ Feature: Tests for the osm2pgsql-replication script without property table
             | --slim |
         And deleting table osm2pgsql_properties
 
-        Then running osm2pgsql-replication fails with returncode 1
+        When running osm2pgsql-replication
             | status | --json |
+        Then execution fails with return code 1
         And the standard output contains
             """
             "status": 1
@@ -238,7 +242,8 @@ Feature: Tests for the osm2pgsql-replication script without property table
 
         And running osm2pgsql-replication
             | status | --json |
-        Then the standard output contains
+        Then execution is successful
+        And the standard output contains
             """
             "status": 0
             "server": {"base_url": "https://planet.openstreetmap.org/replication/minute", "sequence": 347, "timestamp": "2020-10-24T03:00:00Z"
diff --git a/tests/bdd/flex/area.feature b/tests/bdd/flex/area.feature
index bc6d7a5ba..fb38dffe4 100644
--- a/tests/bdd/flex/area.feature
+++ b/tests/bdd/flex/area.feature
@@ -46,9 +46,9 @@ Feature: Tests for area column type
             """
         When running osm2pgsql flex
         Then table osm2pgsql_test_polygon contains
-            | name  | ST_Area(geom)  | area         | ST_Area(ST_Transform(geom, 4326)) |
-            | poly  | <st_area poly> | <area poly>  | 0.01 |
-            | multi | <st_area multi>| <area multi> | 0.08 |
+            | name  | ST_Area(geom)!~1%  | area!~1%     | ST_Area(ST_Transform(geom, 4326))!~0.01% |
+            | poly  | <st_area poly>     | <area poly>  | 0.01 |
+            | multi | <st_area multi>    | <area multi> | 0.08 |
 
         Examples:
             | geom proj | area proj | st_area poly | area poly    | st_area multi | area multi    |
diff --git a/tests/bdd/flex/bbox.feature b/tests/bdd/flex/bbox.feature
index 6daadbd9e..e777b1843 100644
--- a/tests/bdd/flex/bbox.feature
+++ b/tests/bdd/flex/bbox.feature
@@ -29,8 +29,8 @@ Feature: Test get_bbox() function
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_points contains exactly
-            | node_id | min_x | max_x | min_y | max_y | ST_AsText(geom) |
-            | 10      | 20.0  | 20.0  | 10.1  | 10.1  | <geometry>      |
+            | node_id | min_x | max_x | min_y | max_y | geom!geo   |
+            | 10      | 20.0  | 20.0  | 10.1  | 10.1  | <geometry> |
 
         Examples:
             | projection | geometry            |
@@ -39,8 +39,8 @@ Feature: Test get_bbox() function
 
     Scenario Outline: for ways
         Given the 0.1 grid with origin 20.0 10.1
-            | 10 | 11 |
             |    | 12 |
+            | 10 | 11 |
         And the OSM data
             """
             w20 v1 dV Thighway=primary Nn10,n11,n12
@@ -69,8 +69,8 @@ Feature: Test get_bbox() function
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_highways contains exactly
-            | way_id | min_x | max_x | min_y | max_y | ST_AsText(geom) |
-            | 20     | 20.0  | 20.1  | 10.0  | 10.1  | <geometry>      |
+            | way_id | min_x | max_x | min_y | max_y | geom!geo   |
+            | 20     | 20.0  | 20.1  | 10.0  | 10.1  | <geometry> |
 
         Examples:
             | projection | geometry                                                    |
@@ -79,8 +79,8 @@ Feature: Test get_bbox() function
 
     Scenario Outline: for relations with way members only
         Given the 0.1 grid with origin 20.0 10.1
-            | 10 | 11 |
             |    | 12 |
+            | 10 | 11 |
         And the OSM data
             """
             w20 v1 dV Nn10,n11
@@ -115,9 +115,9 @@ Feature: Test get_bbox() function
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_routes contains exactly
-            | relation_id | min_x | max_x | min_y | max_y | ST_AsText(geom) |
-            | 30          | 20.0  | 20.1  | 10.1  | 10.1  | <geom30>        |
-            | 31          | 20.0  | 20.1  | 10.0  | 10.1  | <geom31>        |
+            | relation_id | min_x | max_x | min_y | max_y | geom!geo |
+            | 30          | 20.0  | 20.1  | 10.1  | 10.1  | <geom30> |
+            | 31          | 20.0  | 20.1  | 10.0  | 10.1  | <geom31> |
 
         Examples:
             | projection | geom30                                  | geom31                                                      |
diff --git a/tests/bdd/flex/delete-callbacks.feature b/tests/bdd/flex/delete-callbacks.feature
index 773c521db..8bf9b8f89 100644
--- a/tests/bdd/flex/delete-callbacks.feature
+++ b/tests/bdd/flex/delete-callbacks.feature
@@ -25,8 +25,6 @@ Feature: Test for delete callbacks
         Then table change contains exactly
             | osm_type | osm_id |
 
-        Given the input file '008-ch.osc.gz'
-
         Given the SQL statement grouped_counts
             """
             SELECT osm_type,
@@ -38,6 +36,7 @@ Feature: Test for delete callbacks
             """
 
     Scenario: Delete callbacks are called
+        Given the input file '008-ch.osc.gz'
         When running osm2pgsql flex with parameters
             | --slim | -a |
         Then statement grouped_counts returns exactly
@@ -46,6 +45,7 @@ Feature: Test for delete callbacks
             | W        | 4     | 9         |
             | R        | 1     | 3         |
 
+        Given the input file '008-ch.osc.gz'
         When running osm2pgsql flex with parameters
             | --slim | -a |
         Then statement grouped_counts returns exactly
@@ -78,6 +78,7 @@ Feature: Test for delete callbacks
 
 
             """
+        Given the input file '008-ch.osc.gz'
         When running osm2pgsql flex with parameters
             | --slim | -a |
         Then statement grouped_counts returns exactly
@@ -111,6 +112,7 @@ Feature: Test for delete callbacks
 
 
             """
+        Given the input file '008-ch.osc.gz'
         When running osm2pgsql flex with parameters
             | --slim | -a |
         Then statement grouped_counts returns exactly
diff --git a/tests/bdd/flex/empty-insert.feature b/tests/bdd/flex/empty-insert.feature
index 7e032c5b4..7209e4c68 100644
--- a/tests/bdd/flex/empty-insert.feature
+++ b/tests/bdd/flex/empty-insert.feature
@@ -20,8 +20,8 @@ Feature: Tests that empty insert command does something
             end
             """
 
-        Then running osm2pgsql flex fails
-
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Need two parameters
diff --git a/tests/bdd/flex/geometry-collection.feature b/tests/bdd/flex/geometry-collection.feature
index ff3704365..8a5b71d10 100644
--- a/tests/bdd/flex/geometry-collection.feature
+++ b/tests/bdd/flex/geometry-collection.feature
@@ -45,7 +45,7 @@ Feature: Create geometry collections from relations
             | 33     | node   | ST_GeometryCollection | 1                      | ST_Point                               |
 
         And table osm2pgsql_test_collection contains exactly
-            | osm_id | ST_AsText(geom)                    |
+            | osm_id | geom!geo                           |
             | 30     | { 10, 11, 12, 13, 10 }             |
             | 31     | { 10, 11, 12, 13, 10; 14, 15, 16 } |
             | 32     | { 17; 14, 15, 16 }                 |
@@ -105,6 +105,6 @@ Feature: Create geometry collections from relations
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_collection contains exactly
-            | osm_id | name  | ST_AsText(geom)                    |
+            | osm_id | name  | geom!geo                           |
             | 30     | three | { 10, 11, 12, 13, 10; 10, 11, 13 } |
 
diff --git a/tests/bdd/flex/geometry-function-area.feature b/tests/bdd/flex/geometry-function-area.feature
index ba8f5a040..40efc7da0 100644
--- a/tests/bdd/flex/geometry-function-area.feature
+++ b/tests/bdd/flex/geometry-function-area.feature
@@ -45,9 +45,9 @@ Feature: Tests for area() function
             """
         When running osm2pgsql flex
         Then table osm2pgsql_test_polygon contains
-            | name  | ST_Area(geom)  | area         | ST_Area(ST_Transform(geom, 4326)) |
-            | poly  | <st_area poly> | <area poly>  | 0.01 |
-            | multi | <st_area multi>| <area multi> | 0.08 |
+            | name  | ST_Area(geom)!~1%  | area!~1%     | ST_Area(ST_Transform(geom, 4326))!~1% |
+            | poly  | <st_area poly>     | <area poly>  | 0.01 |
+            | multi | <st_area multi>    | <area multi> | 0.08 |
 
         Examples:
             | geom proj | area proj | st_area poly | area poly    | st_area multi | area multi    |
diff --git a/tests/bdd/flex/geometry-iteration.feature b/tests/bdd/flex/geometry-iteration.feature
index 8ff2fc46f..ebe5abdb6 100644
--- a/tests/bdd/flex/geometry-iteration.feature
+++ b/tests/bdd/flex/geometry-iteration.feature
@@ -44,13 +44,13 @@ Feature: Tests for iterating over a (multi)geometry
             """
         When running osm2pgsql flex
         Then table osm2pgsql_test_routes contains exactly
-            | relation_id | ST_AsText(geom) | num_all | num_one |
-            | 30          | 1, 2, 3         | 2       | 1       |
-            | 30          | 4, 5, 6         | 2       | 1       |
-            | 31          | 1, 2, 3         | 1       | 1       |
+            | relation_id | geom!geo | num_all | num_one |
+            | 30          | 1, 2, 3  | 2       | 1       |
+            | 30          | 4, 5, 6  | 2       | 1       |
+            | 31          | 1, 2, 3  | 1       | 1       |
         And table osm2pgsql_test_firsts contains exactly
-            | relation_id | ST_AsText(geom) |
-            | 30          | 1, 2, 3         |
-            | 31          | 1, 2, 3         |
-            | 33          | NULL            |
+            | relation_id | geom!geo |
+            | 30          | 1, 2, 3  |
+            | 31          | 1, 2, 3  |
+            | 33          | NULL     |
 
diff --git a/tests/bdd/flex/geometry-linestring.feature b/tests/bdd/flex/geometry-linestring.feature
index af4039f88..6bd2f0d5e 100644
--- a/tests/bdd/flex/geometry-linestring.feature
+++ b/tests/bdd/flex/geometry-linestring.feature
@@ -32,9 +32,9 @@ Feature: Creating linestring features from way
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_lines contains exactly
-            | way_id | ST_AsText(sgeom) | ST_AsText(mgeom) | ST_AsText(xgeom) |
-            | 20     | 1, 2, 3          | [ 1, 2, 3 ]      | [ 1, 2, 3 ]      |
-            | 21     | 4, 5             | [ 4, 5 ]         | [ 4, 5 ]         |
+            | way_id | sgeom!geo | mgeom!geo   | xgeom!geo   |
+            | 20     | 1, 2, 3   | [ 1, 2, 3 ] | [ 1, 2, 3 ] |
+            | 21     | 4, 5      | [ 4, 5 ]    | [ 4, 5 ]    |
 
     Scenario:
         Given the grid
@@ -58,7 +58,8 @@ Feature: Creating linestring features from way
             end
 
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
 
         And the error output contains
             """
diff --git a/tests/bdd/flex/geometry-multilinestring.feature b/tests/bdd/flex/geometry-multilinestring.feature
index 6b06aa8d0..f0daa7e8b 100644
--- a/tests/bdd/flex/geometry-multilinestring.feature
+++ b/tests/bdd/flex/geometry-multilinestring.feature
@@ -41,7 +41,7 @@ Feature: Creating (multi)linestring features from way and relations
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_lines contains exactly
-            | osm_type | osm_id | ST_AsText(geom)      |
+            | osm_type | osm_id | geom!geo             |
             | W        | 20     | 1, 2, 3              |
             | W        | 21     | 4, 5, 6              |
             | R        | 30     | 1, 2, 3              |
@@ -77,7 +77,7 @@ Feature: Creating (multi)linestring features from way and relations
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_roads contains exactly
-            | relation_id | ST_GeometryType(geom) |  ST_AsText(merged) |
-            | 30          | ST_MultiLineString    |  [ 1, 2, 3 ]       |
-            | 31          | ST_MultiLineString    |  [ 1, 2; 3, 4 ]    |
+            | relation_id | ST_GeometryType(geom) |  merged!geo     |
+            | 30          | ST_MultiLineString    |  [ 1, 2, 3 ]    |
+            | 31          | ST_MultiLineString    |  [ 1, 2; 3, 4 ] |
 
diff --git a/tests/bdd/flex/geometry-multipoint.feature b/tests/bdd/flex/geometry-multipoint.feature
index 3e98852c0..f6eb11c1e 100644
--- a/tests/bdd/flex/geometry-multipoint.feature
+++ b/tests/bdd/flex/geometry-multipoint.feature
@@ -43,9 +43,9 @@ Feature: Creating (multi)point features from nodes and relations
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_points contains exactly
-            | osm_type | osm_id | ST_AsText(geom) |
-            | N        | 1      | 1               |
-            | N        | 5      | 5               |
-            | R        | 30     | 1               |
-            | R        | 31     | [ 5; 1 ]        |
+            | osm_type | osm_id | geom!geo |
+            | N        | 1      | 1        |
+            | N        | 5      | 5        |
+            | R        | 30     | 1        |
+            | R        | 31     | [ 5; 1 ] |
 
diff --git a/tests/bdd/flex/geometry-null.feature b/tests/bdd/flex/geometry-null.feature
index cd338864b..27ad74f2d 100644
--- a/tests/bdd/flex/geometry-null.feature
+++ b/tests/bdd/flex/geometry-null.feature
@@ -75,15 +75,15 @@ Feature: Null geometry handling
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_null contains exactly
-            | osm_type | osm_id | ST_AsText(geom) | num |
-            | N        | 12     | 3.4 5.6         | 1   |
-            | W        | 20     | 10, 11          | 1   |
-            | W        | 21     | NULL            | 0   |
-            | W        | 22     | NULL            | 0   |
-            | W        | 23     | NULL            | 0   |
+            | osm_type | osm_id | geom!geo | num |
+            | N        | 12     | 3.4 5.6  | 1   |
+            | W        | 20     | 10, 11   | 1   |
+            | W        | 21     | NULL     | 0   |
+            | W        | 22     | NULL     | 0   |
+            | W        | 23     | NULL     | 0   |
 
         And table osm2pgsql_test_not_null contains exactly
-            | osm_type | osm_id | ST_AsText(geom) | num |
-            | N        | 12     | 3.4 5.6         | 1   |
-            | W        | 20     | 10, 11          | 1   |
+            | osm_type | osm_id | geom!geo | num |
+            | N        | 12     | 3.4 5.6  | 1   |
+            | W        | 20     | 10, 11   | 1   |
 
diff --git a/tests/bdd/flex/geometry-point.feature b/tests/bdd/flex/geometry-point.feature
index 493c246b6..cdd75b323 100644
--- a/tests/bdd/flex/geometry-point.feature
+++ b/tests/bdd/flex/geometry-point.feature
@@ -34,25 +34,25 @@ Feature: Creating point features from way
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_points contains exactly
-            | way_id | n    | ST_AsText(geom) |
-            | 20     | NULL | 1               |
-            | 20     | 0    | NULL            |
-            | 20     | 1    | 1               |
-            | 20     | 2    | 2               |
-            | 20     | 3    | 3               |
-            | 20     | 4    | NULL            |
-            | 20     | -1   | 3               |
-            | 20     | -2   | 2               |
-            | 20     | -3   | 1               |
-            | 21     | NULL | 4               |
-            | 21     | 0    | NULL            |
-            | 21     | 1    | 4               |
-            | 21     | 2    | 5               |
-            | 21     | 3    | NULL            |
-            | 21     | 4    | NULL            |
-            | 21     | -1   | 5               |
-            | 21     | -2   | 4               |
-            | 21     | -3   | NULL            |
+            | way_id | n    | geom!geo |
+            | 20     | NULL | 1        |
+            | 20     | 0    | NULL     |
+            | 20     | 1    | 1        |
+            | 20     | 2    | 2        |
+            | 20     | 3    | 3        |
+            | 20     | 4    | NULL     |
+            | 20     | -1   | 3        |
+            | 20     | -2   | 2        |
+            | 20     | -3   | 1        |
+            | 21     | NULL | 4        |
+            | 21     | 0    | NULL     |
+            | 21     | 1    | 4        |
+            | 21     | 2    | 5        |
+            | 21     | 3    | NULL     |
+            | 21     | 4    | NULL     |
+            | 21     | -1   | 5        |
+            | 21     | -2   | 4        |
+            | 21     | -3   | NULL     |
 
     Scenario:
         Given the grid
@@ -67,7 +67,8 @@ Feature: Creating point features from way
                 local geom = object:as_point('foo')
             end
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
 
         And the error output contains
             """
@@ -87,7 +88,8 @@ Feature: Creating point features from way
                 local geom = object:as_point(1, 'foo')
             end
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
 
         And the error output contains
             """
diff --git a/tests/bdd/flex/geometry-processing.feature b/tests/bdd/flex/geometry-processing.feature
index 4d01fd20d..8dcb3f0b8 100644
--- a/tests/bdd/flex/geometry-processing.feature
+++ b/tests/bdd/flex/geometry-processing.feature
@@ -26,15 +26,15 @@ Feature: Tests for Lua geometry processing functions
             """
         When running osm2pgsql flex
         Then table osm2pgsql_test_points contains
-            | node_id | name  | ST_AsText(geom4326) | geom3857 = geomauto |
-            | 1       | point | 1.1 1.2             | True                |
+            | node_id | name  | geom4326!geo | geom3857 = geomauto |
+            | 1       | point | 1.1 1.2      | True                |
 
     Scenario:
         Given the 0.1 grid with origin 9.0 50.3
-            |    |    |  7 |    |    |  8 |
-            |    |    |    | 11 | 12 |    |
-            |  3 |  4 |    |  9 | 10 |    |
             |  1 |  2 |  5 |    |    |  6 |
+            |  3 |  4 |    |  9 | 10 |    |
+            |    |    |    | 11 | 12 |    |
+            |    |    |  7 |    |    |  8 |
         And the OSM data
             """
             w1 Tnatural=water,name=poly Nn1,n2,n4,n3,n1
@@ -94,12 +94,12 @@ Feature: Tests for Lua geometry processing functions
             """
         When running osm2pgsql flex
         Then table osm2pgsql_test_ways contains
-            | way_id | name  | ST_AsText(geom) | ST_AsText(geomsimple) |
-            | 1      | poly  | 1, 2, 4, 3, 1   | 1, 4, 1               |
+            | way_id | name  | geom!geo      | geomsimple!geo |
+            | 1      | poly  | 1, 2, 4, 3, 1 | 1, 4, 1               |
         And table osm2pgsql_test_polygons contains
-            | area_id | name  | ST_AsText(geom)                    | ST_AsText(center) | type    |
-            | 1       | poly  | (1, 2, 4, 3, 1)                    | 9.05 50.05        | POLYGON |
-            | -1      | multi | (5, 6, 8, 7, 5),(9, 11, 12, 10, 9) | NULL              | POLYGON |
+            | area_id | name  | geom!geo                           | center!geo | type    |
+            | 1       | poly  | (1, 2, 4, 3, 1)                    | 9.05 50.05 | POLYGON |
+            | -1      | multi | (5, 6, 8, 7, 5),(9, 11, 12, 10, 9) | NULL       | POLYGON |
 
     Scenario:
         Given the grid
@@ -131,7 +131,7 @@ Feature: Tests for Lua geometry processing functions
             """
         When running osm2pgsql flex
         Then table osm2pgsql_test_roads contains
-            | way_id | n | ST_AsText(geom)      |
+            | way_id | n | geom!geo             |
             | 1      | 1 | 1, 2                 |
             | 1      | 2 | 2, 3                 |
             | 1      | 3 | 3, 20.2 19.9         |
diff --git a/tests/bdd/flex/invalid-geometries.feature b/tests/bdd/flex/invalid-geometries.feature
index c9c47421d..fd5f56144 100644
--- a/tests/bdd/flex/invalid-geometries.feature
+++ b/tests/bdd/flex/invalid-geometries.feature
@@ -50,8 +50,8 @@ Feature: Test handling of invalid geometries
 
     Scenario: Invalid way geometry should be ignored
         Given the grid with origin 10.0 10.0
-            | 10 | 11 |
             |    | 12 |
+            | 10 | 11 |
         And the OSM data
             """
             n14 v1 dV x10.0 y10.0
@@ -66,9 +66,9 @@ Feature: Test handling of invalid geometries
 
         Then table osm2pgsql_test_polygon has 0 rows
         Then table osm2pgsql_test_line contains exactly
-            | osm_id | ST_AsText(geom) |
-            | 20     | 10, 12          |
-            | 21     | 10, 12          |
+            | osm_id | geom!geo |
+            | 20     | 10, 12   |
+            | 21     | 10, 12   |
 
 
     Scenario: Invalid area geometry from way should be ignored
@@ -86,7 +86,7 @@ Feature: Test handling of invalid geometries
 
         Then table osm2pgsql_test_line has 0 rows
         Then table osm2pgsql_test_polygon contains exactly
-            | osm_id | ST_AsText(geom)  |
+            | osm_id | geom!geo         |
             | 20     | (10, 12, 11, 10) |
             | 21     | (10, 12, 11, 10) |
 
diff --git a/tests/bdd/flex/invalid-lua.feature b/tests/bdd/flex/invalid-lua.feature
index 36309b172..55589fc3d 100644
--- a/tests/bdd/flex/invalid-lua.feature
+++ b/tests/bdd/flex/invalid-lua.feature
@@ -9,4 +9,5 @@ Feature: Tests for basic Lua functions
             """
             this-is-not-valid-lua
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
diff --git a/tests/bdd/flex/line-splitting.feature b/tests/bdd/flex/line-splitting.feature
index 48fdfdcae..a73db7bb0 100644
--- a/tests/bdd/flex/line-splitting.feature
+++ b/tests/bdd/flex/line-splitting.feature
@@ -40,12 +40,12 @@ Feature: Test splitting of lines
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_line contains exactly
-            | way_id | ST_Length(geom) | ST_AsText(geom) |
-            | 20     | 1.0             | 10, 11          |
-            | 21     | 2.5             | 10, 12          |
+            | way_id | ST_Length(geom) | geom!geo |
+            | 20     | 1.0             | 10, 11   |
+            | 21     | 2.5             | 10, 12   |
 
         And table osm2pgsql_test_split contains exactly
-            | way_id | ST_Length(geom) | ST_AsText(geom)      |
+            | way_id | ST_Length(geom) | geom!geo             |
             | 20     | 1.0             | 10, 11               |
             | 21     | 1.0             | 20.0 20.0, 21.0 20.0 |
             | 21     | 1.0             | 21.0 20.0, 22.0 20.0 |
diff --git a/tests/bdd/flex/locator.feature b/tests/bdd/flex/locator.feature
index 1e1bf9aec..cadaaa2ef 100644
--- a/tests/bdd/flex/locator.feature
+++ b/tests/bdd/flex/locator.feature
@@ -9,7 +9,8 @@ Feature: Locators
             local regions = osm2pgsql.define_locator()
             print(regions:name())
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Argument #1 to 'define_locator' must be a Lua table.
@@ -54,7 +55,8 @@ Feature: Locators
             local regions = osm2pgsql.define_locator({ name = 'test' })
             print(regions.name())
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Argument #1 has to be of type osm2pgsql.Locator.
@@ -74,7 +76,8 @@ Feature: Locators
                 local r = regions:first_intersecting()
             end
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Error in 'first_intersecting': Need locator and geometry arguments
@@ -94,7 +97,8 @@ Feature: Locators
                 local r = regions:all_intersecting()
             end
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Error in 'all_intersecting': Need locator and geometry arguments
@@ -131,9 +135,9 @@ Feature: Locators
             """
         When running osm2pgsql flex
         Then table osm2pgsql_test_points contains exactly
-            | node_id | region | ST_AsText(geom) |
-            | 10      | B1     | 0.5 0.5         |
-            | 12      | B2     | 1.5 1.5         |
+            | node_id | region | geom!geo |
+            | 10      | B1     | 0.5 0.5  |
+            | 12      | B2     | 1.5 1.5  |
 
     Scenario: Define and use a locator with all_intersecting
         Given the OSM data
@@ -167,15 +171,15 @@ Feature: Locators
             """
         When running osm2pgsql flex
         Then table osm2pgsql_test_points contains exactly
-            | node_id | num_regions | ST_AsText(geom) |
-            | 10      | 1           | 0.5 0.5         |
-            | 12      | 1           | 1.5 1.5         |
-            | 13      | 2           | 1 1             |
+            | node_id | num_regions | geom!geo |
+            | 10      | 1           | 0.5 0.5  |
+            | 12      | 1           | 1.5 1.5  |
+            | 13      | 2           | 1 1      |
 
     Scenario: Define and use a locator with polygon from db
         Given the 10.0 grid with origin 10.0 10.0
-            | 10 | 11 |
             | 12 |    |
+            | 10 | 11 |
         And the OSM data
             """
             w20 v1 dV Tsome=boundary Nn10,n11,n12,n10
@@ -196,7 +200,7 @@ Feature: Locators
             """
         When running osm2pgsql flex
         Then table osm2pgsql_test_regions contains exactly
-            | way_id | region | ST_AsText(geom)         |
+            | way_id | region | geom!geo                |
             | 20     | P1     | (10 0,20 10,10 10,10 0) |
 
         Given the OSM data
@@ -227,8 +231,8 @@ Feature: Locators
             """
         When running osm2pgsql flex
         Then table osm2pgsql_test_points contains exactly
-            | node_id | region | ST_AsText(geom) |
-            | 10      | P1     | 15 8            |
+            | node_id | region | geom!geo |
+            | 10      | P1     | 15 8     |
 
     Scenario: Define and use a locator with relation from db
         Given the 10.0 grid with origin 10.0 10.0
@@ -254,7 +258,7 @@ Feature: Locators
             """
         When running osm2pgsql flex
         Then table osm2pgsql_test_regions contains exactly
-            | way_id | region | ST_AsText(geom)               |
+            | way_id | region | geom!geo                      |
             | 29     | P1     | (10 0,20 0,20 10,10 10, 10 0) |
 
         Given the 10.0 grid with origin 10.0 10.0
diff --git a/tests/bdd/flex/lua-expire-output-definitions.feature b/tests/bdd/flex/lua-expire-output-definitions.feature
index bb1c74c6b..500328c72 100644
--- a/tests/bdd/flex/lua-expire-output-definitions.feature
+++ b/tests/bdd/flex/lua-expire-output-definitions.feature
@@ -6,7 +6,8 @@ Feature: Expire output definitions in Lua file
             """
             osm2pgsql.define_expire_output()
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Argument #1 to 'define_expire_output' must be a Lua table.
@@ -20,7 +21,8 @@ Feature: Expire output definitions in Lua file
                 filename = false
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             The expire output field must contain a 'filename' string field (or nil for default: '').
@@ -35,7 +37,8 @@ Feature: Expire output definitions in Lua file
                 schema = false
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             The expire output field must contain a 'schema' string field (or nil for default: 'public').
@@ -49,7 +52,8 @@ Feature: Expire output definitions in Lua file
                 table = false
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             The expire output field must contain a 'table' string field (or nil for default: '').
@@ -64,7 +68,8 @@ Feature: Expire output definitions in Lua file
                 filename = 'somewhere'
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             The 'maxzoom' field in a expire output must contain an integer.
@@ -80,7 +85,8 @@ Feature: Expire output definitions in Lua file
                 filename = 'somewhere'
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             The 'minzoom' field in a expire output must contain an integer.
@@ -95,7 +101,8 @@ Feature: Expire output definitions in Lua file
                 filename = 'somewhere'
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             The 'maxzoom' field in a expire output must be between 1 and 20.
@@ -111,7 +118,8 @@ Feature: Expire output definitions in Lua file
                 filename = 'somewhere'
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             The 'minzoom' field in a expire output must be between 1 and 'maxzoom'.
@@ -127,7 +135,8 @@ Feature: Expire output definitions in Lua file
                 filename = 'somewhere'
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             The 'minzoom' field in a expire output must be between 1 and 'maxzoom'.
diff --git a/tests/bdd/flex/lua-expire.feature b/tests/bdd/flex/lua-expire.feature
index d24fc0bfd..fbff960ba 100644
--- a/tests/bdd/flex/lua-expire.feature
+++ b/tests/bdd/flex/lua-expire.feature
@@ -12,7 +12,8 @@ Feature: Expire configuration in Lua file
                 { column = 'some', expire = {{ output = eo }} }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Expire only allowed for geometry columns in Web Mercator projection.
@@ -33,7 +34,8 @@ Feature: Expire configuration in Lua file
                   expire = {{ output = eo }} }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Expire only allowed for geometry columns in Web Mercator projection.
@@ -51,7 +53,8 @@ Feature: Expire configuration in Lua file
                 { column = 'some', type = 'geometry', expire = {{ output = 'abc' }} }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Expire output must be of type ExpireOutput.
@@ -115,7 +118,8 @@ Feature: Expire configuration in Lua file
                 }}
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Optional expire field 'buffer' must contain a number.
@@ -139,7 +143,8 @@ Feature: Expire configuration in Lua file
                 t:insert({ some = object:as_point() })
             end
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Unknown expire mode 'foo'.
@@ -161,7 +166,8 @@ Feature: Expire configuration in Lua file
                 }}
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Optional expire field 'full_area_limit' must contain a number.
diff --git a/tests/bdd/flex/lua-index-definitions.feature b/tests/bdd/flex/lua-index-definitions.feature
index 1400a7809..de97fcbb7 100644
--- a/tests/bdd/flex/lua-index-definitions.feature
+++ b/tests/bdd/flex/lua-index-definitions.feature
@@ -26,7 +26,8 @@ Feature: Index definitions in Lua file
                 indexes = true
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             The 'indexes' field in definition of table 'mytable' is not an array.
@@ -48,7 +49,7 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then statement mytable_indexes returns
-            | indexdef@substr |
+            | indexdef!substr |
             | USING gist (geom) |
 
     Scenario: Empty indexes field in table definition gets you no index
@@ -89,7 +90,7 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then statement mytable_indexes returns
-            | indexdef@substr |
+            | indexdef!substr |
             | USING btree (name) |
 
     Scenario: Explicitly setting multiple indexes
@@ -113,7 +114,7 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then statement mytable_indexes returns exactly
-            | indexdef@substr |
+            | indexdef!substr |
             | USING btree (name) |
             | USING gist (geom) |
             | USING btree (name, tags) |
@@ -135,7 +136,8 @@ Feature: Index definitions in Lua file
                 }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Index definition must contain a 'method' string field.
@@ -158,7 +160,8 @@ Feature: Index definitions in Lua file
                 }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Unknown index method 'ERROR'.
@@ -181,7 +184,8 @@ Feature: Index definitions in Lua file
                 }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             You must set either the 'column' or the 'expression' field in index definition.
@@ -204,7 +208,8 @@ Feature: Index definitions in Lua file
                 }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Unknown column 'foo' in table 'mytable'.
@@ -227,7 +232,8 @@ Feature: Index definitions in Lua file
                 }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             You must set either the 'column' or the 'expression' field in index definition.
@@ -252,7 +258,7 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then statement mytable_indexes returns
-            | indexdef@substr |
+            | indexdef!substr |
             | USING btree (lower(name)) |
 
     Scenario: Include field must be a string or array
@@ -272,7 +278,8 @@ Feature: Index definitions in Lua file
                 }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             The 'include' field in an index definition must contain a string or an array.
@@ -295,7 +302,8 @@ Feature: Index definitions in Lua file
                 }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Unknown column 'foo' in table 'mytable'.
@@ -320,7 +328,7 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then statement mytable_indexes returns
-            | indexdef@substr |
+            | indexdef!substr |
             | USING btree (name) INCLUDE (tags) |
 
     Scenario: Include field works with array
@@ -342,7 +350,7 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then statement mytable_indexes returns
-            | indexdef@substr |
+            | indexdef!substr |
             | USING btree (name) INCLUDE (tags) |
 
     Scenario: Tablespace needs a string
@@ -362,7 +370,8 @@ Feature: Index definitions in Lua file
                 }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Index definition field must contain a 'tablespace' string field (or nil for default: '').
@@ -387,7 +396,7 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then statement mytable_indexes returns
-            | indexdef@substr |
+            | indexdef!substr |
             | USING btree (name) |
 
     Scenario: Unique needs a boolean
@@ -407,7 +416,8 @@ Feature: Index definitions in Lua file
                 }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Index definition field 'unique' must be a boolean field.
@@ -432,7 +442,7 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then statement mytable_indexes returns
-            | indexdef@fullmatch |
+            | indexdef!re |
             | .*UNIQUE.*USING btree \(name\).* |
 
     Scenario: Where condition needs a string
@@ -452,7 +462,8 @@ Feature: Index definitions in Lua file
                 }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Index definition field must contain a 'where' string field (or nil for default: '').
@@ -477,7 +488,7 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then statement mytable_indexes returns
-            | indexdef@substr |
+            | indexdef!substr |
             | USING btree (name) WHERE (name = lower(name)) |
 
 
@@ -497,7 +508,7 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then statement mytable_indexes returns exactly
-            | indexdef@substr  |
+            | indexdef!substr |
             | USING gist (geom) |
 
     Scenario: Don't create id index if the configuration doesn't says so
@@ -516,7 +527,7 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then statement mytable_indexes returns exactly
-            | indexdef@substr  |
+            | indexdef!substr |
             | USING gist (geom) |
 
     Scenario: Always create id index if the configuration says so
@@ -535,7 +546,7 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then statement mytable_indexes returns
-            | indexdef@substr      |
+            | indexdef!substr |
             | USING btree (node_id) |
 
     Scenario: Create a unique id index when requested
@@ -555,7 +566,7 @@ Feature: Index definitions in Lua file
         When running osm2pgsql flex
         Then table mytable has 1562 rows
         Then statement mytable_indexes returns
-            | indexdef@fullmatch                           | is_primary |
+            | indexdef!re                                  | is_primary |
             | CREATE UNIQUE INDEX .* USING .*\(node_id\).* | False      |
 
     Scenario: Create a primary key id index when requested
@@ -575,5 +586,5 @@ Feature: Index definitions in Lua file
         When running osm2pgsql flex
         Then table mytable has 1562 rows
         Then statement mytable_indexes returns
-            | indexdef@fullmatch                         | is_primary |
+            | indexdef!re                                | is_primary |
             | CREATE UNIQUE INDEX .* USING .*\(node_id\) | True       |
diff --git a/tests/bdd/flex/lua-table-definitions.feature b/tests/bdd/flex/lua-table-definitions.feature
index a061b1b28..070a8257e 100644
--- a/tests/bdd/flex/lua-table-definitions.feature
+++ b/tests/bdd/flex/lua-table-definitions.feature
@@ -6,7 +6,8 @@ Feature: Table definitions in Lua file
             """
             local t = osm2pgsql.define_table()
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Argument #1 to 'define_table' must be a table.
@@ -18,7 +19,8 @@ Feature: Table definitions in Lua file
             """
             local t = osm2pgsql.define_table({})
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             The table must contain a 'name' string field.
@@ -32,7 +34,8 @@ Feature: Table definitions in Lua file
                 name = false
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             The table must contain a 'name' string field.
@@ -46,7 +49,8 @@ Feature: Table definitions in Lua file
                 name = 'foo'
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             No 'columns' field (or not an array) in table 'foo'.
@@ -61,7 +65,8 @@ Feature: Table definitions in Lua file
                 columns = 123
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             No 'columns' field (or not an array) in table 'foo'.
@@ -76,7 +81,8 @@ Feature: Table definitions in Lua file
                 columns = {}
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             No columns defined for table 'foo'.
@@ -110,7 +116,8 @@ Feature: Table definitions in Lua file
                 { column = 'baz' }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Table with name 'foo' already exists.
diff --git a/tests/bdd/flex/multigeom.feature b/tests/bdd/flex/multigeom.feature
index c5083729d..4858fcdd7 100644
--- a/tests/bdd/flex/multigeom.feature
+++ b/tests/bdd/flex/multigeom.feature
@@ -79,7 +79,7 @@ Feature: Handling of multiple geometries
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_polygon contains exactly
-            | osm_id | ST_GeometryType(geom) | ST_AsText(geom)      |
+            | osm_id | ST_GeometryType(geom) | geom!geo             |
             | 20     | ST_Polygon            | (10, 11, 12, 13, 10) |
             | -30    | ST_Polygon            | (10, 11, 12, 13, 10) |
             | -31    | ST_Polygon            | (10, 11, 12, 13, 10) |
diff --git a/tests/bdd/flex/relation-changes.feature b/tests/bdd/flex/relation-changes.feature
index 4f16d6c65..51a10c199 100644
--- a/tests/bdd/flex/relation-changes.feature
+++ b/tests/bdd/flex/relation-changes.feature
@@ -162,8 +162,8 @@ Feature: Handling changes to relations
 
     Scenario Outline: Changing nodes in a valid relation
         Given the 0.1 grid with origin 10.0 10.0
-            | 10 | 11 |
             |    | 12 |
+            | 10 | 11 |
         And the OSM data
             """
             w20 v1 dV Nn10,n11,n12
diff --git a/tests/bdd/flex/way-change.feature b/tests/bdd/flex/way-change.feature
index 28c73d448..514cc055d 100644
--- a/tests/bdd/flex/way-change.feature
+++ b/tests/bdd/flex/way-change.feature
@@ -4,8 +4,8 @@ Feature: Changing ways in a flex database
         Given the style file 'test_output_flex_way.lua'
 
         Given the 0.1 grid with origin 10.0 10.1
-            | 11 | 13 | 15 | 17 | 19 |
             | 10 | 12 | 14 | 16 | 18 |
+            | 11 | 13 | 15 | 17 | 19 |
 
     Scenario Outline:
         Given the OSM data
diff --git a/tests/bdd/regression/import.feature b/tests/bdd/regression/import.feature
index 4cd4760d6..b94a016be 100644
--- a/tests/bdd/regression/import.feature
+++ b/tests/bdd/regression/import.feature
@@ -8,14 +8,14 @@ Feature: Imports of the test database
 
         Then table planet_osm_point has 1342 rows
         And table planet_osm_polygon contains
-            | count(*) | round(sum(ST_Area(way))) | round(sum(way_area)) |
-            | 4130     | 1247245186               | 1247245413           |
+            | count(*) | sum(ST_Area(way))::int | sum(way_area)::int |
+            | 4130     | 1247245186             | 1247243136         |
         And table planet_osm_line contains
-            | count(*) | round(sum(ST_Length(way))) |
-            | 3231     | 4211350                    |
+            | count(*) | sum(ST_Length(way))::int |
+            | 3231     | 4211350                  |
         And table planet_osm_roads contains
-            | count(*) | round(sum(ST_Length(way))) |
-            | 375      | 2032023                    |
+            | count(*) | sum(ST_Length(way))::int |
+            | 375      | 2032023                  |
 
         And there are no tables planet_osm_nodes, planet_osm_ways, planet_osm_rels
 
@@ -39,14 +39,14 @@ Feature: Imports of the test database
 
         Then table planet_osm_point has 1342 rows
         And table planet_osm_polygon contains
-            | count(*) | round(sum(ST_Area(way))) | round(sum(way_area)) |
-            | 4130     | 1247245186               | 1247245413           |
+            | count(*) | sum(ST_Area(way))::int | sum(way_area)::int |
+            | 4130     | 1247245186             | 1247243136         |
         And table planet_osm_line contains
-            | count(*) | round(sum(ST_Length(way))) |
-            | 3231     | 4211350                    |
+            | count(*) | sum(ST_Length(way))::int |
+            | 3231     | 4211350                  |
         And table planet_osm_roads contains
-            | count(*) | round(sum(ST_Length(way))) |
-            | 375      | 2032023                    |
+            | count(*) | sum(ST_Length(way))::int |
+            | 375      | 2032023                  |
 
         And there are <have table> planet_osm_nodes, planet_osm_ways, planet_osm_rels
 
@@ -57,21 +57,22 @@ Feature: Imports of the test database
 
 
     Scenario Outline: Import with Lua tagtransform
-        Given the default lua tagtransform
         When running osm2pgsql pgsql
-            | --create |
-            | <slim> |
+            | --create                   |
+            | <slim>                     |
+            | --tag-transform-script     |
+            | {STYLE_DATA_DIR}/style.lua |
 
         Then table planet_osm_point has 1342 rows
         And table planet_osm_polygon contains
-            | count(*) | round(sum(ST_Area(way))) | round(sum(way_area)) |
-            | 4136     | 1272140688               | 1272140891           |
+            | count(*) | sum(ST_Area(way))::int | sum(way_area)::int |
+            | 4136     | 1272140688             | 1272138496         |
         And table planet_osm_line contains
-            | count(*) | round(sum(ST_Length(way))) |
-            | 3231     | 4211350                    |
+            | count(*) | sum(ST_Length(way))::int |
+            | 3231     | 4211350                  |
         And table planet_osm_roads contains
-            | count(*) | round(sum(ST_Length(way))) |
-            | 375      | 2032023                    |
+            | count(*) | sum(ST_Length(way))::int |
+            | 375      | 2032023                  |
 
         And there are <have table> planet_osm_nodes, planet_osm_ways, planet_osm_rels
 
@@ -128,14 +129,14 @@ Feature: Imports of the test database
 
         Then table planet_osm_point has 1342 rows
         And table planet_osm_polygon contains
-            | count(*) | round(sum(ST_Area(way))) | round(sum(way_area)) |
-            | 4130     | 1247245186               | 1247245413           |
+            | count(*) | sum(ST_Area(way))::int | sum(way_area)::int |
+            | 4130     | 1247245186             | 1247243136         |
         And table planet_osm_line contains
-            | count(*) | round(sum(ST_Length(way))) |
-            | 3231     | 4211350                    |
+            | count(*) | sum(ST_Length(way))::int |
+            | 3231     | 4211350                  |
         And table planet_osm_roads contains
-            | count(*) | round(sum(ST_Length(way))) |
-            | 375      | 2032023                    |
+            | count(*) | sum(ST_Length(way))::int |
+            | 375      | 2032023                  |
 
         And there are tables planet_osm_nodes, planet_osm_ways, planet_osm_rels
 
diff --git a/tests/bdd/regression/input.feature b/tests/bdd/regression/input.feature
index 2071c2fa9..f247488b4 100644
--- a/tests/bdd/regression/input.feature
+++ b/tests/bdd/regression/input.feature
@@ -1,7 +1,7 @@
 Feature: Tests for bad input data
 
     Scenario: Overly large relations are ignored
-        Given the python-formatted OSM data
+        Given the OSM data format string
             """
             n1 x45 y34
             r1 Ttype=multipolygon M{','.join('n' + str(i) + '@' for i in range(33000))}
diff --git a/tests/bdd/regression/multipolygon.feature b/tests/bdd/regression/multipolygon.feature
index 4f5d7af91..21983c8e9 100644
--- a/tests/bdd/regression/multipolygon.feature
+++ b/tests/bdd/regression/multipolygon.feature
@@ -7,14 +7,13 @@ Feature: Import and update of multipolygon areas
             """
             SELECT osm_id,
                    count(*) AS count,
-                   round(sum(ST_Area(way))) AS area,
-                   round(sum(way_area::numeric)) AS way_area
+                   sum(ST_Area(way))::int AS area,
+                   sum(way_area)::int AS way_area
             FROM planet_osm_polygon
             GROUP BY osm_id
             """
 
     Scenario Outline: Import and update slim
-        Given <lua> lua tagtransform
         When running osm2pgsql pgsql with parameters
             | --slim   |
             | <param1> |
@@ -22,24 +21,24 @@ Feature: Import and update of multipolygon areas
         Then there are tables planet_osm_nodes
 
         Then table planet_osm_polygon contains
-            | osm_id | landuse     | name      | round(ST_Area(way)) |
-            | -1     | residential | Name_rel  | 12895               |
-            | 4      | farmland    | Name_way3 | 3144                |
-            | -8     | residential | Name_rel2 | 12894               |
-            | 5      | farmland    | Name_way4 | 3144                |
-            | -14    | residential | Name_way5 | 12894               |
-            | -11    | residential | Name_rel6 | 11529               |
-            | -3     | residential | Name_rel11| 9286                |
-            | 83     | farmland    | NULL      | 24859               |
+            | osm_id | landuse     | name      | ST_Area(way)::int |
+            | -1     | residential | Name_rel  | 12895             |
+            | 4      | farmland    | Name_way3 | 3144              |
+            | -8     | residential | Name_rel2 | 12894             |
+            | 5      | farmland    | Name_way4 | 3144              |
+            | -14    | residential | Name_way5 | 12894             |
+            | -11    | residential | Name_rel6 | 11529             |
+            | -3     | residential | Name_rel11| 9286              |
+            | 83     | farmland    | NULL      | 24859             |
 
         Then table planet_osm_polygon contains
-            | osm_id | "natural" | round(ST_Area(way)) |
-            | -24    | water     | 18501               |
-            | 102    | water     | 12994               |
+            | osm_id | "natural" | ST_Area(way)::int |
+            | -24    | water     | 18501             |
+            | 102    | water     | 12994             |
 
         Then table planet_osm_line contains
-            | osm_id | highway     | name      | round(ST_Length(way)) |
-            | 6      | residential | Name_way6 | 228                   |
+            | osm_id | highway     | name      | ST_Length(way)::int |
+            | 6      | residential | Name_way6 | 228                 |
 
         Then table planet_osm_polygon contains
             | osm_id | landuse     | name       | ST_NumInteriorRing(way) |
@@ -94,24 +93,24 @@ Feature: Import and update of multipolygon areas
             | <param1> |
 
         Then table planet_osm_polygon contains
-            | osm_id | landuse     | name      | round(ST_Area(way)) |
-            | -1     | residential | Name_rel  | 13949               |
-            | 4      | farmland    | Name_way3 | 3144                |
-            | -8     | residential | Name_rel2 | 12894               |
-            | 5      | farmland    | Name_way4 | 3144                |
-            | -14    | residential | Name_way5 | 12894               |
-            | -11    | residential | Name_rel6 | 11529               |
-            | -3     | residential | Name_rel11| 9286                |
-            | 83     | farmland    | NULL      | 24859               |
+            | osm_id | landuse     | name      | ST_Area(way)::int |
+            | -1     | residential | Name_rel  | 13949             |
+            | 4      | farmland    | Name_way3 | 3144              |
+            | -8     | residential | Name_rel2 | 12894             |
+            | 5      | farmland    | Name_way4 | 3144              |
+            | -14    | residential | Name_way5 | 12894             |
+            | -11    | residential | Name_rel6 | 11529             |
+            | -3     | residential | Name_rel11| 9286              |
+            | 83     | farmland    | NULL      | 24859             |
 
         Then table planet_osm_polygon contains
-            | osm_id | "natural" | round(ST_Area(way)) |
-            | -24    | water     | 18501               |
-            | 102    | water     | 12994               |
+            | osm_id | "natural" | ST_Area(way)::int |
+            | -24    | water     | 18501             |
+            | 102    | water     | 12994             |
 
         Then table planet_osm_line contains
-            | osm_id | highway     | name      | round(ST_Length(way)) |
-            | 6      | residential | Name_way6 | 228                   |
+            | osm_id | highway     | name      | ST_Length(way)::int |
+            | 6      | residential | Name_way6 | 228                 |
 
         Then table planet_osm_polygon contains
             | osm_id | landuse     | name       | ST_NumInteriorRing(way) |
@@ -146,12 +145,151 @@ Feature: Import and update of multipolygon areas
             | -33    | water     |
 
         Examples:
-            | param1 | lua         |
-            |        | no          |
-            | -G     | no          |
-            | -k     | no          |
-            |        | the default |
-            | -k     | the default |
+            | param1 |
+            |        |
+            | -G     |
+            | -k     |
+
+
+    Scenario Outline: Import and update slim
+        When running osm2pgsql pgsql with parameters
+            | --slim                     |
+            | <param1>                   |
+            | --tag-transform-script     |
+            | {STYLE_DATA_DIR}/style.lua |
+
+        Then there are tables planet_osm_nodes
+
+        Then table planet_osm_polygon contains
+            | osm_id | landuse     | name      | ST_Area(way)::int |
+            | -1     | residential | Name_rel  | 12895             |
+            | 4      | farmland    | Name_way3 | 3144              |
+            | -8     | residential | Name_rel2 | 12894             |
+            | 5      | farmland    | Name_way4 | 3144              |
+            | -14    | residential | Name_way5 | 12894             |
+            | -11    | residential | Name_rel6 | 11529             |
+            | -3     | residential | Name_rel11| 9286              |
+            | 83     | farmland    | NULL      | 24859             |
+
+        Then table planet_osm_polygon contains
+            | osm_id | "natural" | ST_Area(way)::int |
+            | -24    | water     | 18501             |
+            | 102    | water     | 12994             |
+
+        Then table planet_osm_line contains
+            | osm_id | highway     | name      | ST_Length(way)::int |
+            | 6      | residential | Name_way6 | 228                 |
+
+        Then table planet_osm_polygon contains
+            | osm_id | landuse     | name       | ST_NumInteriorRing(way) |
+            | -3     | residential | Name_rel11 | 2                       |
+
+        Then statement grouped_polygons returns
+            | osm_id | area  | way_area |
+            | -13    | 17581 | 17581    |
+            | -7     | 16169 | 16169    |
+            | -29    | 68494 | 68494    |
+            | -39    | 10377 | 10378    |
+            | -40    | 12397 | 12397    |
+
+        Then statement grouped_polygons returns
+            | osm_id | count |
+            | -25    | 1     |
+            | 113    | 1     |
+            | 118    | 1     |
+            | 114    | 1     |
+            | 107    | 1     |
+            | 102    | 1     |
+            | 138    | 1     |
+            | 140    | 1     |
+
+        Then table planet_osm_polygon doesn't contain
+            | osm_id |
+            | 109    |
+            | 104    |
+
+        Then table planet_osm_polygon doesn't contain
+            | osm_id | "natural" |
+            | -33    | water     |
+
+        Given the SQL statement geometries_polygon
+            """
+            SELECT osm_id,
+                   CASE WHEN '<param1>' = '-G' THEN min(ST_NumGeometries(way))
+                   ELSE count(*) END AS count
+            FROM planet_osm_polygon
+            GROUP BY osm_id
+            """
+        Then statement geometries_polygon returns
+           | osm_id | count |
+           | -13    | 2     |
+           | -7     | 2     |
+
+
+        Given the input file 'test_multipolygon_diff.osc'
+        When running osm2pgsql pgsql with parameters
+            | --slim                     |
+            | -a                         |
+            | <param1>                   |
+            | --tag-transform-script     |
+            | {STYLE_DATA_DIR}/style.lua |
+
+        Then table planet_osm_polygon contains
+            | osm_id | landuse     | name      | ST_Area(way)::int |
+            | -1     | residential | Name_rel  | 13949             |
+            | 4      | farmland    | Name_way3 | 3144              |
+            | -8     | residential | Name_rel2 | 12894             |
+            | 5      | farmland    | Name_way4 | 3144              |
+            | -14    | residential | Name_way5 | 12894             |
+            | -11    | residential | Name_rel6 | 11529             |
+            | -3     | residential | Name_rel11| 9286              |
+            | 83     | farmland    | NULL      | 24859             |
+
+        Then table planet_osm_polygon contains
+            | osm_id | "natural" | ST_Area(way)::int |
+            | -24    | water     | 18501             |
+            | 102    | water     | 12994             |
+
+        Then table planet_osm_line contains
+            | osm_id | highway     | name      | ST_Length(way)::int |
+            | 6      | residential | Name_way6 | 228                 |
+
+        Then table planet_osm_polygon contains
+            | osm_id | landuse     | name       | ST_NumInteriorRing(way) |
+            | -3     | residential | Name_rel11 | 2                       |
+
+        Then statement grouped_polygons returns
+            | osm_id | area  | way_area |
+            | -13    | 17581 | 17581    |
+            | -7     | 16169 | 16169    |
+            | -29    | 29155 | 29155    |
+            | -39    | 10377 | 10378    |
+            | -40    | 12397 | 12397    |
+
+        Then statement grouped_polygons returns
+            | osm_id | count |
+            | 113    | 1     |
+            | 118    | 1     |
+            | 114    | 1     |
+            | 107    | 1     |
+            | 102    | 1     |
+            | 138    | 1     |
+            | 140    | 1     |
+
+        Then table planet_osm_polygon doesn't contain
+            | osm_id |
+            | -25    |
+            | 109    |
+            | 104    |
+
+        Then table planet_osm_polygon doesn't contain
+            | osm_id | "natural" |
+            | -33    | water     |
+
+        Examples:
+            | param1 |
+            |        |
+            | -k     |
 
 
      Scenario: Import with flat-node option
@@ -159,15 +297,15 @@ Feature: Import and update of multipolygon areas
             | -F | flat.store | --drop |
 
         Then table planet_osm_polygon contains
-            | osm_id | landuse     | name      | round(ST_Area(way)) |
-            | -1     | residential | Name_rel  | 12895               |
-            | 4      | farmland    | Name_way3 | 3144                |
-            | -8     | residential | Name_rel2 | 12894               |
-            | 5      | farmland    | Name_way4 | 3144                |
-            | -14    | residential | Name_way5 | 12894               |
-            | -11    | residential | Name_rel6 | 11529               |
-            | -3     | residential | Name_rel11| 9286                |
-            | 83     | farmland    | NULL      | 24859               |
+            | osm_id | landuse     | name      | ST_Area(way)::int |
+            | -1     | residential | Name_rel  | 12895             |
+            | 4      | farmland    | Name_way3 | 3144              |
+            | -8     | residential | Name_rel2 | 12894             |
+            | 5      | farmland    | Name_way4 | 3144              |
+            | -14    | residential | Name_way5 | 12894             |
+            | -11    | residential | Name_rel6 | 11529             |
+            | -3     | residential | Name_rel11| 9286              |
+            | 83     | farmland    | NULL      | 24859             |
 
 
      Scenario: Import and update with flat-node option
@@ -175,15 +313,15 @@ Feature: Import and update of multipolygon areas
             | --slim | -F | flat.store |
 
         Then table planet_osm_polygon contains
-            | osm_id | landuse     | name      | round(ST_Area(way)) |
-            | -1     | residential | Name_rel  | 12895               |
-            | 4      | farmland    | Name_way3 | 3144                |
-            | -8     | residential | Name_rel2 | 12894               |
-            | 5      | farmland    | Name_way4 | 3144                |
-            | -14    | residential | Name_way5 | 12894               |
-            | -11    | residential | Name_rel6 | 11529               |
-            | -3     | residential | Name_rel11| 9286                |
-            | 83     | farmland    | NULL      | 24859               |
+            | osm_id | landuse     | name      | ST_Area(way)::int |
+            | -1     | residential | Name_rel  | 12895             |
+            | 4      | farmland    | Name_way3 | 3144              |
+            | -8     | residential | Name_rel2 | 12894             |
+            | 5      | farmland    | Name_way4 | 3144              |
+            | -14    | residential | Name_way5 | 12894             |
+            | -11    | residential | Name_rel6 | 11529             |
+            | -3     | residential | Name_rel11| 9286              |
+            | 83     | farmland    | NULL      | 24859             |
 
 
         Given the input file 'test_multipolygon_diff.osc'
@@ -191,13 +329,13 @@ Feature: Import and update of multipolygon areas
             | --slim | -a | -F | flat.store |
 
         Then table planet_osm_polygon contains
-            | osm_id | landuse     | name      | round(ST_Area(way)) |
-            | -1     | residential | Name_rel  | 13949               |
-            | 4      | farmland    | Name_way3 | 3144                |
-            | -8     | residential | Name_rel2 | 12894               |
-            | 5      | farmland    | Name_way4 | 3144                |
-            | -14    | residential | Name_way5 | 12894               |
-            | -11    | residential | Name_rel6 | 11529               |
-            | -3     | residential | Name_rel11| 9286                |
-            | 83     | farmland    | NULL      | 24859               |
+            | osm_id | landuse     | name      | ST_Area(way)::int |
+            | -1     | residential | Name_rel  | 13949             |
+            | 4      | farmland    | Name_way3 | 3144              |
+            | -8     | residential | Name_rel2 | 12894             |
+            | 5      | farmland    | Name_way4 | 3144              |
+            | -14    | residential | Name_way5 | 12894             |
+            | -11    | residential | Name_rel6 | 11529             |
+            | -3     | residential | Name_rel11| 9286              |
+            | 83     | farmland    | NULL      | 24859             |
 
diff --git a/tests/bdd/regression/properties.feature b/tests/bdd/regression/properties.feature
index e22e299d4..6cd822846 100644
--- a/tests/bdd/regression/properties.feature
+++ b/tests/bdd/regression/properties.feature
@@ -7,12 +7,14 @@ Feature: Updates to the test database with properties check
         When running osm2pgsql pgsql with parameters
             | -c             |
             | <param_create> |
+        Then execution is successful
 
         Given the input file '000466354.osc.gz'
-        Then running osm2pgsql pgsql with parameters fails
+        When running osm2pgsql pgsql with parameters
             | -a             |
             | --slim         |
             | <param_append> |
+        Then execution fails
         And the error output contains
             """
             <message>
@@ -30,11 +32,13 @@ Feature: Updates to the test database with properties check
         When running osm2pgsql null with parameters
             | -c     |
             | --slim |
+        Then execution is successful
 
         Given the input file '000466354.osc.gz'
-        When running osm2pgsql nooutput with parameters
+        When running osm2pgsql with parameters
             | -a     |
             | --slim |
+        Then execution is successful
         Then the error output contains
             """
             Using output 'null' (same as on import).
@@ -71,10 +75,11 @@ Feature: Updates to the test database with properties check
             | --flat-nodes=x |
 
         Given the input file '000466354.osc.gz'
-        Then running osm2pgsql pgsql with parameters fails
+        When running osm2pgsql pgsql with parameters
             | -a             |
             | --slim         |
             | --flat-nodes=y |
+        Then execution fails
         And the error output contains
             """
             Unable to open flatnode file
@@ -86,9 +91,10 @@ Feature: Updates to the test database with properties check
             | --slim |
 
         Given the input file '000466354.osc.gz'
-        Then running osm2pgsql null with parameters fails
+        When running osm2pgsql null with parameters
             | -a     |
             | --slim |
+        Then execution fails
         And the error output contains
             """
             Different output specified on command line
diff --git a/tests/bdd/regression/update.feature b/tests/bdd/regression/update.feature
index 57a9c5d39..ce1abaf18 100644
--- a/tests/bdd/regression/update.feature
+++ b/tests/bdd/regression/update.feature
@@ -69,9 +69,11 @@ Feature: Updates to the test database
 
 
     Scenario: Simple updates with lua tagtransform
-        Given the default lua tagtransform
         When running osm2pgsql pgsql with parameters
             | --slim   |
+            | --tag-transform-script     |
+            | {STYLE_DATA_DIR}/style.lua |
+
 
         Given the input file '000466354.osc.gz'
         When running osm2pgsql pgsql with parameters

From 195529a29f02d48b1bdd8ee7623a6020a1fe8ce9 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 1 Dec 2025 08:47:43 +0100
Subject: [PATCH 399/430] add parameters for lua and themepark path

---
 scripts/osm2pgsql-test-style | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scripts/osm2pgsql-test-style b/scripts/osm2pgsql-test-style
index 0cdb8bdd9..d0bfbc18e 100755
--- a/scripts/osm2pgsql-test-style
+++ b/scripts/osm2pgsql-test-style
@@ -501,6 +501,10 @@ def execute_osm2pgsql(context, output):
         data_stdin = None
 
     env = {}
+    if context.user_args.lua_path:
+        env['LUA_PATH'] = context.user_args.lua_path
+    if context.user_args.themepark_path:
+        env['THEMEPARK_PATH'] = context.user_args.themepark_path
 
     proc = Popen(cmdline, cwd=str(context.workdir),
                  stdin=PIPE, stdout=PIPE, stderr=PIPE, env=env)
@@ -786,6 +790,10 @@ def get_parser():
                         help='(optional) directory to search for test data')
     parser.add_argument('--style-data-dir', type=Path,
                         help='(optional) directory to search for style files')
+    parser.add_argument('--lua-path',
+                        help='Additional paths to take into account for finding lua modules')
+    parser.add_argument('--themepark-path',
+                        help='Additional paths to take into account for finding themepark themes')
     parser.add_argument('--test-db', default='osm2pgsql-test',
                         help='Name of database to use for testing (default: osm2pgsql-test)')
     parser.add_argument('--template-test-db', default='osm2pgsql-test-template',

From 6d7d1e8d863a51c8f81e7239c33075ed503cae44 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 1 Dec 2025 09:08:00 +0100
Subject: [PATCH 400/430] change BDD run script to new style tester

---
 CMakeLists.txt         |  4 ----
 tests/CMakeLists.txt   |  5 +++--
 tests/run-bdd-tests.in |  3 +++
 tests/run-behave.in    | 10 ----------
 4 files changed, 6 insertions(+), 16 deletions(-)
 create mode 100755 tests/run-bdd-tests.in
 delete mode 100755 tests/run-behave.in

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 968fc797c..566d8b79b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -308,10 +308,6 @@ if (BUILD_TESTS)
         set(TESTING_TIMEOUT 1200)
     endif()
     add_subdirectory(tests)
-    configure_file(
-        ${PROJECT_SOURCE_DIR}/tests/run-behave.in
-        ${PROJECT_BINARY_DIR}/run-behave
-    )
 else()
     message(STATUS "Tests disabled. Set BUILD_TESTS=ON to enable tests.")
 endif()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 14f312cd2..8558da81f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -118,14 +118,15 @@ if (NOT WIN32)
     set_tests_properties(FixtureTablespaceCleanup PROPERTIES FIXTURES_CLEANUP Tablespace)
 endif()
 
+configure_file(run-bdd-tests.in ${PROJECT_BINARY_DIR}/run-bdd-tests)
 
 find_program(BEHAVE_BIN NAMES behave)
 
 if (BEHAVE_BIN)
     foreach(BDD_TEST IN ITEMS command-line flex regression)
         add_test(NAME bdd-${BDD_TEST}
-                 COMMAND behave -DBINARY=$<TARGET_FILE:osm2pgsql> ${BDD_TEST}
-                 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bdd)
+                 COMMAND ./run-bdd-tests ${CMAKE_CURRENT_SOURCE_DIR}/bdd/${BDD_TEST}
+                 WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
         message(STATUS "Added test: bdd-${BDD_TEST}")
     endforeach(BDD_TEST)
 
diff --git a/tests/run-bdd-tests.in b/tests/run-bdd-tests.in
new file mode 100755
index 000000000..cd9709b51
--- /dev/null
+++ b/tests/run-bdd-tests.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+@PROJECT_SOURCE_DIR@/scripts/osm2pgsql-test-style --style-data-dir @PROJECT_SOURCE_DIR@ --test-data-dir @CMAKE_CURRENT_SOURCE_DIR@/data/ --osm2pgsql-binary @PROJECT_BINARY_DIR@/osm2pgsql "$@"
diff --git a/tests/run-behave.in b/tests/run-behave.in
deleted file mode 100755
index c82be884c..000000000
--- a/tests/run-behave.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "-p" ]; then
-    pgv=pg_virtualenv
-    shift
-fi
-
-cd @PROJECT_SOURCE_DIR@/tests/bdd
-exec $pgv behave -DBINARY=@PROJECT_BINARY_DIR@/osm2pgsql "$@"
-

From 88e263ebf3d1249f65a4feaf48747a5eedac1d4f Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 1 Dec 2025 09:34:47 +0100
Subject: [PATCH 401/430] allow selected PG* env variables so that
 pg_virtualenv works

---
 scripts/osm2pgsql-test-style | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/osm2pgsql-test-style b/scripts/osm2pgsql-test-style
index d0bfbc18e..d54f515f5 100755
--- a/scripts/osm2pgsql-test-style
+++ b/scripts/osm2pgsql-test-style
@@ -16,6 +16,7 @@ import sys
 import tempfile
 import math
 import re
+import os
 import contextlib
 import json
 import datetime as dt
@@ -505,6 +506,9 @@ def execute_osm2pgsql(context, output):
         env['LUA_PATH'] = context.user_args.lua_path
     if context.user_args.themepark_path:
         env['THEMEPARK_PATH'] = context.user_args.themepark_path
+    for k in ['PGPORT', 'PGPASSWORD', 'PGUSER', 'PGHOST']:
+        if k in os.environ:
+            env[k] = os.environ[k]
 
     proc = Popen(cmdline, cwd=str(context.workdir),
                  stdin=PIPE, stdout=PIPE, stderr=PIPE, env=env)

From 9a00f332088145f0af115a2d5507239dad9f1b0b Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 1 Dec 2025 09:37:19 +0100
Subject: [PATCH 402/430] remove old behave harness

---
 tests/bdd/.behaverc                        |   3 -
 tests/bdd/environment.py                   | 156 ----------
 tests/bdd/steps/geometry_factory.py        | 104 -------
 tests/bdd/steps/replication_server_mock.py |  53 ----
 tests/bdd/steps/steps_db.py                | 340 ---------------------
 tests/bdd/steps/steps_execute.py           | 212 -------------
 tests/bdd/steps/steps_osm_data.py          |  54 ----
 7 files changed, 922 deletions(-)
 delete mode 100644 tests/bdd/.behaverc
 delete mode 100644 tests/bdd/environment.py
 delete mode 100644 tests/bdd/steps/geometry_factory.py
 delete mode 100644 tests/bdd/steps/replication_server_mock.py
 delete mode 100644 tests/bdd/steps/steps_db.py
 delete mode 100644 tests/bdd/steps/steps_execute.py
 delete mode 100644 tests/bdd/steps/steps_osm_data.py

diff --git a/tests/bdd/.behaverc b/tests/bdd/.behaverc
deleted file mode 100644
index 1b426ec94..000000000
--- a/tests/bdd/.behaverc
+++ /dev/null
@@ -1,3 +0,0 @@
-[behave]
-show_skipped=False
-default_tags=~@Fail
diff --git a/tests/bdd/environment.py b/tests/bdd/environment.py
deleted file mode 100644
index 16afeeae4..000000000
--- a/tests/bdd/environment.py
+++ /dev/null
@@ -1,156 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
-# This file is part of osm2pgsql (https://osm2pgsql.org/).
-#
-# Copyright (C) 2006-2025 by the osm2pgsql developer community.
-# For a full list of authors see the git log.
-from contextlib import closing
-from pathlib import Path
-import subprocess
-import tempfile
-import importlib.util
-import io
-from importlib.machinery import SourceFileLoader
-
-from behave import *
-try:
-    import psycopg2 as psycopg
-    from psycopg2 import sql
-except ImportError:
-    import psycopg
-    from psycopg import sql
-
-
-from steps.geometry_factory import GeometryFactory
-from steps.replication_server_mock import ReplicationServerMock
-
-TEST_BASE_DIR = (Path(__file__) / '..' / '..').resolve()
-
-# The following parameters can be changed on the command line using
-# the -D parameter. Example:
-#
-#    behave -DBINARY=/tmp/my-builddir/osm2pgsql -DKEEP_TEST_DB
-USER_CONFIG = {
-    'BINARY': (TEST_BASE_DIR / '..' / 'build' / 'osm2pgsql').resolve(),
-    'REPLICATION_SCRIPT': (TEST_BASE_DIR / '..' / 'scripts' / 'osm2pgsql-replication').resolve(),
-    'TEST_DATA_DIR': TEST_BASE_DIR / 'data',
-    'SRC_DIR': (TEST_BASE_DIR / '..').resolve(),
-    'KEEP_TEST_DB': False,
-    'TEST_DB': 'osm2pgsql-test',
-    'HAVE_TABLESPACE': True,
-    'HAVE_PROJ': True
-}
-
-use_step_matcher('re')
-
-def _connect_db(context, dbname):
-    """ Connect to the given database and return the connection
-        object as a context manager that automatically closes.
-        Note that the connection does not commit automatically.
-    """
-    if psycopg.__version__.startswith('2'):
-        conn = psycopg.connect(dbname=dbname)
-        conn.autocommit = True
-        return closing(conn)
-
-    return psycopg.connect(dbname=dbname, autocommit=True)
-
-
-def _drop_db(context, dbname, recreate_immediately=False):
-    """ Drop the database with the given name if it exists.
-    """
-    with _connect_db(context, 'postgres') as conn:
-        with conn.cursor() as cur:
-            db = sql.Identifier(dbname)
-            cur.execute(sql.SQL('DROP DATABASE IF EXISTS {}').format(db))
-            if recreate_immediately:
-                cur.execute(sql.SQL('CREATE DATABASE {}').format(db))
-
-
-def before_all(context):
-    # logging setup
-    context.config.setup_logging()
-    # set up -D options
-    for k,v in USER_CONFIG.items():
-        context.config.userdata.setdefault(k, v)
-
-    if context.config.userdata['HAVE_TABLESPACE']:
-        with _connect_db(context, 'postgres') as conn:
-            with conn.cursor() as cur:
-                cur.execute("""SELECT spcname FROM pg_tablespace
-                               WHERE spcname = 'tablespacetest'""")
-                context.config.userdata['HAVE_TABLESPACE'] = cur.rowcount > 0
-                cur.execute("""SELECT setting FROM pg_settings
-                               WHERE name = 'server_version_num'""")
-                context.config.userdata['PG_VERSION'] = int(cur.fetchone()[0])
-
-    # Get the osm2pgsql configuration
-    proc = subprocess.Popen([str(context.config.userdata['BINARY']), '--version'],
-                            stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    _, serr = proc.communicate()
-    ver_info = serr.decode('utf-8')
-    if proc.returncode != 0:
-        raise RuntimeError('Cannot run osm2pgsql')
-
-    if context.config.userdata['HAVE_PROJ']:
-        context.config.userdata['HAVE_PROJ'] = 'Proj [disabled]' not in ver_info
-
-    context.test_data_dir = Path(context.config.userdata['TEST_DATA_DIR']).resolve()
-    context.default_data_dir = Path(context.config.userdata['SRC_DIR']).resolve()
-
-    # Set up replication script.
-    replicationfile = str(Path(context.config.userdata['REPLICATION_SCRIPT']).resolve())
-    spec = importlib.util.spec_from_loader('osm2pgsql_replication',
-                                           SourceFileLoader('osm2pgsql_replication',
-                                                            replicationfile))
-    assert spec, f"File not found: {replicationfile}"
-    context.osm2pgsql_replication = importlib.util.module_from_spec(spec)
-    spec.loader.exec_module(context.osm2pgsql_replication)
-
-
-def before_scenario(context, scenario):
-    """ Set up a fresh, empty test database.
-    """
-    if 'config.have_proj' in scenario.tags and not context.config.userdata['HAVE_PROJ']:
-        scenario.skip("Generic proj library not configured.")
-
-    context.db = use_fixture(test_db, context)
-    context.import_file = None
-    context.import_data = {'n': [], 'w': [], 'r': []}
-    context.osm2pgsql_params = []
-    context.workdir = use_fixture(working_directory, context)
-    context.geometry_factory = GeometryFactory()
-    context.osm2pgsql_replication.ReplicationServer = ReplicationServerMock()
-    context.urlrequest_responses = {}
-    context.sql_statements = {}
-
-    def _mock_urlopen(request):
-        if not request.full_url in context.urlrequest_responses:
-            raise urllib.error.URLError('Unknown URL')
-
-        return closing(io.BytesIO(context.urlrequest_responses[request.full_url].encode('utf-8')))
-
-    context.osm2pgsql_replication.urlrequest.urlopen = _mock_urlopen
-
-
-@fixture
-def test_db(context, **kwargs):
-    dbname = context.config.userdata['TEST_DB']
-    _drop_db(context, dbname, recreate_immediately=True)
-
-    with _connect_db(context, dbname) as conn:
-
-        with conn.cursor() as cur:
-            cur.execute('CREATE EXTENSION postgis')
-            cur.execute('CREATE EXTENSION hstore')
-
-        yield conn
-
-    if not context.config.userdata['KEEP_TEST_DB']:
-        _drop_db(context, dbname)
-
-
-@fixture
-def working_directory(context, **kwargs):
-    with tempfile.TemporaryDirectory() as tmpdir:
-        yield Path(tmpdir)
diff --git a/tests/bdd/steps/geometry_factory.py b/tests/bdd/steps/geometry_factory.py
deleted file mode 100644
index b56361da6..000000000
--- a/tests/bdd/steps/geometry_factory.py
+++ /dev/null
@@ -1,104 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
-# This file is part of osm2pgsql (https://osm2pgsql.org/).
-#
-# Copyright (C) 2006-2025 by the osm2pgsql developer community.
-# For a full list of authors see the git log.
-
-class GeometryFactory:
-    """ Provides functions to create geometries from data grids.
-    """
-
-    def __init__(self):
-        self.grid = {}
-
-
-    def parse_geometry(self, geom, scene):
-        """ Create a WKT SQL term for the given geometry.
-            The function understands the following formats:
-
-              <P>
-                 Point geometry
-              <P>,...,<P>
-                 Line geometry
-              (<P>,...,<P>)
-                 Polygon geometry
-
-           <P> may either be a coordinate of the form '<x> <y>' or a single
-           number. In the latter case it must refer to a point in
-           a previously defined grid.
-        """
-        if geom.find(',') < 0:
-            out = "POINT({})".format(self.mk_wkt_point(geom))
-        elif geom.find('(') < 0:
-            out = "LINESTRING({})".format(self.mk_wkt_points(geom))
-        else:
-            out = "POLYGON(({}))".format(self.mk_wkt_points(geom.strip('() ')))
-
-        return f"'SRID=4326;{out}'::geometry"
-
-
-    def mk_wkt_point(self, point):
-        """ Parse a point description.
-            The point may either consist of 'x y' cooordinates or a number
-            that refers to a grid setup.
-        """
-        geom = point.strip()
-        if geom.find(' ') >= 0:
-            return geom
-
-        try:
-            pt = self.grid_node(int(geom))
-        except ValueError:
-            assert False, "Scenario error: Point '{}' is not a number".format(geom)
-
-        assert pt is not None, "Scenario error: Point '{}' not found in grid".format(geom)
-        return "{} {}".format(*pt)
-
-
-    def mk_wkt_points(self, geom):
-        """ Parse a list of points.
-            The list must be a comma-separated list of points. Points
-            in coordinate and grid format may be mixed.
-        """
-        return ','.join([self.mk_wkt_point(x) for x in geom.split(',')])
-
-
-    def set_grid(self, lines, grid_step, origin_x, origin_y):
-        """ Replace the grid with one from the given lines.
-        """
-        self.grid = {}
-        y = origin_y
-        for line in lines:
-            x = origin_x
-            for pt_id in line:
-                if pt_id.isdigit():
-                    self.grid[int(pt_id)] = (x, y)
-                x += grid_step
-            y -= grid_step
-
-        self.grid_precision = 1
-        while grid_step < 0:
-            self.grid_precision += 1
-            grid_step /= 10
-
-
-    def grid_node(self, nodeid):
-        """ Get the coordinates for the given grid node.
-        """
-        return self.grid.get(nodeid)
-
-    def as_opl_lines(self):
-        return [f"n{nid} x{c[0]:.{self.grid_precision}f} y{c[1]:.{self.grid_precision}f}"
-                for nid, c in self.grid.items()]
-
-    def complete_opl(self, opl):
-        if opl[0] != 'n' or ' x' in opl:
-            return opl
-
-        nid = int(opl.split(' ', 1)[0][1:])
-
-        coords = self.grid_node(nid)
-        assert coords is not None, f"Coordinates missing for node {nid}"
-
-        return f"{opl} x{coords[0]:.{self.grid_precision}f} y{coords[1]:.{self.grid_precision}f}"
diff --git a/tests/bdd/steps/replication_server_mock.py b/tests/bdd/steps/replication_server_mock.py
deleted file mode 100644
index cf6387066..000000000
--- a/tests/bdd/steps/replication_server_mock.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
-# This file is part of osm2pgsql (https://osm2pgsql.org/).
-#
-# Copyright (C) 2006-2025 by the osm2pgsql developer community.
-# For a full list of authors see the git log.
-
-
-class ReplicationServerMock:
-
-    def __init__(self):
-        self.expected_base_url = None
-        self.state_infos = []
-
-
-    def __call__(self, base_url):
-        assert self.expected_base_url is not None and base_url == self.expected_base_url,\
-               f"Wrong replication service called. Expected '{self.expected_base_url}', got '{base_url}'"
-        return self
-
-
-    def get_state_info(self, seq=None, retries=2):
-        assert self.state_infos, 'Replication mock not properly set up'
-        if seq is None:
-            return self.state_infos[-1]
-
-        for info in self.state_infos:
-            if info.sequence == seq:
-                return info
-
-        return None
-
-    def timestamp_to_sequence(self, timestamp, balanced_search=False):
-        assert self.state_infos, 'Replication mock not properly set up'
-
-        if timestamp < self.state_infos[0].timestamp:
-            return self.state_infos[0].sequence
-
-        prev = self.state_infos[0]
-        for info in self.state_infos:
-            if timestamp >= prev.timestamp and timestamp < info.timestamp:
-                return prev.sequence
-            prev = info
-
-        return prev.sequence
-
-    def apply_diffs(self, handler, start_id, max_size=1024, idx="", simplify=True):
-        if start_id > self.state_infos[-1].sequence:
-            return None
-
-        numdiffs = int((max_size + 1023)/1024)
-        return min(self.state_infos[-1].sequence, start_id + numdiffs - 1)
-
diff --git a/tests/bdd/steps/steps_db.py b/tests/bdd/steps/steps_db.py
deleted file mode 100644
index 681b0635d..000000000
--- a/tests/bdd/steps/steps_db.py
+++ /dev/null
@@ -1,340 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
-# This file is part of osm2pgsql (https://osm2pgsql.org/).
-#
-# Copyright (C) 2006-2025 by the osm2pgsql developer community.
-# For a full list of authors see the git log.
-"""
-Steps that query the database.
-"""
-import math
-import re
-from typing import Iterable
-
-try:
-    from psycopg2 import sql
-except ImportError:
-    from psycopg import sql
-
-
-@given("the database schema (?P<schema>.+)")
-def create_db_schema(context, schema):
-    with context.db.cursor() as cur:
-        cur.execute("CREATE SCHEMA " + schema)
-
-
-@when("deleting table (?P<table>.+)")
-def delete_table(context, table):
-    with context.db.cursor() as cur:
-        cur.execute("DROP TABLE " + table)
-
-
-@then(r"table (?P<table>.+) has (?P<row_num>\d+) rows?")
-def db_table_row_count(context, table, row_num):
-    assert table_exists(context.db, table)
-
-    query = sql.SQL("SELECT count(*) FROM {}").format(sql.Identifier(*table.split('.', 2)))
-
-    actual = scalar(context.db, query)
-
-    assert actual == int(row_num),\
-           f"Table {table}: expected {row_num} rows, got {actual}"
-
-
-@then("there (?:is|are) (?P<exists>no )?tables? (?P<tables>.+)")
-def db_table_existance(context, exists, tables):
-    for table in tables.split(','):
-        table = table.strip()
-        if exists == 'no ':
-            assert not table_exists(context.db, table), f"Table '{table}' unexpectedly found"
-        else:
-            assert table_exists(context.db, table), f"Table '{table}' not found"
-
-
-@then("table (?P<table>.+) contains(?P<exact> exactly)?")
-def db_check_table_content(context, table, exact):
-    assert table_exists(context.db, table)
-
-    rows = sql.SQL(', '.join(h.rsplit('@')[0] for h in context.table.headings))
-
-    with context.db.cursor() as cur:
-        cur.execute(sql.SQL("SELECT {} FROM {}")
-                       .format(rows, sql.Identifier(*table.split('.', 2))))
-
-        actuals = list(DBRow(r, context.table.headings, context.geometry_factory) for r in cur)
-
-    linenr = 1
-    for row in context.table.rows:
-        try:
-            actuals.remove(row)
-        except ValueError:
-            assert False,\
-                   f"{linenr}. entry not found in table. Full content:\n{actuals}"
-        linenr += 1
-
-    assert not exact or not actuals,\
-           f"Unexpected lines in row:\n{actuals}"
-
-
-@then("table (?P<table>.+) doesn't contain")
-def db_check_table_absence(context, table):
-    assert table_exists(context.db, table)
-
-    rows = sql.SQL(', '.join(h.rsplit('@')[0] for h in context.table.headings))
-
-    with context.db.cursor() as cur:
-        cur.execute(sql.SQL("SELECT {} FROM {}")
-                       .format(rows, sql.Identifier(*table.split('.', 2))))
-
-        actuals = list(DBRow(r, context.table.headings, context.geometry_factory) for r in cur)
-
-    for row in context.table.rows:
-        assert not row in actuals, f"Row unexpectedly found: {row}. Full content:\n{actuals}"
-
-
-@given("the SQL statement (?P<sql>.+)")
-def db_define_sql_statement(context, sql):
-    context.sql_statements[sql] = context.text
-
-@then("statement (?P<stmt>.+) returns(?P<exact> exactly)?")
-def db_check_sql_statement(context, stmt, exact):
-    assert stmt in context.sql_statements
-    rows = sql.SQL(', '.join(h.rsplit('@')[0] for h in context.table.headings))
-
-    with context.db.cursor() as cur:
-        cur.execute(sql.SQL("SELECT {} FROM ({}) _sql_statement")
-                       .format(rows, sql.SQL(context.sql_statements[stmt])))
-
-        actuals = list(DBRow(r, context.table.headings, context.geometry_factory) for r in cur)
-
-    linenr = 1
-    for row in context.table.rows:
-        try:
-            actuals.remove(row)
-        except ValueError:
-            assert False,\
-                   f"{linenr}. entry not found in result. Full response:\n{actuals}"
-        linenr += 1
-
-    assert not exact or not actuals,\
-           f"Unexpected lines in result:\n{actuals}"
-
-
-### Helper functions and classes
-
-def scalar(conn, sql, args=None):
-    with conn.cursor() as cur:
-        cur.execute(sql, args)
-
-        assert cur.rowcount == 1
-        return cur.fetchone()[0]
-
-def table_exists(conn, table):
-    if '.' in table:
-        schema, tablename = table.split('.', 2)
-    else:
-        schema = 'public'
-        tablename = table
-
-    num = scalar(conn, """SELECT count(*) FROM pg_tables
-                          WHERE tablename = %s AND schemaname = %s""",
-                (tablename, schema))
-    if num == 1:
-        return True
-
-    num = scalar(conn, """SELECT count(*) FROM pg_views
-                          WHERE viewname = %s AND schemaname = %s""",
-                (tablename, schema))
-    return num == 1
-
-
-class DBRow:
-
-    def __init__(self, row, headings, factory):
-        self.data = []
-        for value, head in zip(row, headings):
-            if '@' in head:
-                _, props = head.rsplit('@', 2)
-            else:
-                props = None
-
-            if isinstance(value, float):
-                self.data.append(DBValueFloat(value, props))
-            elif value is None:
-                self.data.append(None)
-            elif head.lower().startswith('st_astext('):
-                self.data.append(DBValueGeometry(value, props, factory))
-            elif props == 'fullmatch':
-                self.data.append(DBValueRegex(value))
-            elif props == 'substr':
-                self.data.append(DBValueSubString(value))
-            else:
-                self.data.append(str(value))
-
-    def __eq__(self, other):
-        if not isinstance(other, Iterable):
-            return False
-
-        return all((a is None) if b == 'NULL' else (a == b)
-                   for a, b in zip(self.data, other))
-
-    def __repr__(self):
-        return '\n[' + ', '.join(str(s) for s in self.data) + ']'
-
-
-class DBValueGeometry:
-
-    def __init__(self, value, props, factory):
-        self.precision = float(props) if props else 0.0001
-        self.orig_value = value
-        self.set_coordinates(value)
-        self.factory = factory
-
-    def set_coordinates(self, value):
-        if value.startswith('GEOMETRYCOLLECTION('):
-            geoms = []
-            remain = value[19:-1]
-            while remain:
-                _, value, remain = self._parse_simple_wkt(remain)
-                remain = remain[1:] # delete comma
-                geoms.append(value)
-            self.geom_type = 'GEOMETRYCOLLECTION'
-            self.value = geoms
-        else:
-            self.geom_type, self.value, remain = self._parse_simple_wkt(value)
-            if remain:
-                raise RuntimeError('trailing content for geometry: ' + value)
-
-    def _parse_simple_wkt(self, value):
-        m = re.fullmatch(r'(MULTI)?(POINT|LINESTRING|POLYGON)\(([^A-Z]*)\)(.*)', value)
-        if not m:
-            raise RuntimeError(f'Unparsable WKT: {value}')
-        geom_type = (m[1] or '') + m[2]
-        if m[1] == 'MULTI':
-            splitup = m[3][1:-1].split('),(')
-            if m[2] == 'POINT':
-                value = [self._parse_wkt_coord(c) for c in splitup]
-            elif m[2] == 'LINESTRING':
-                value = [self._parse_wkt_line(c) for c in splitup]
-            elif m[2] == 'POLYGON':
-                value = [[self._parse_wkt_line(ln) for ln in poly[1:-1].split('),(')]
-                         for poly in splitup]
-        else:
-            if m[2] == 'POINT':
-                value = self._parse_wkt_coord(m[3])
-            elif m[2] == 'LINESTRING':
-                value = self._parse_wkt_line(m[3])
-            elif m[2] == 'POLYGON':
-                value = [self._parse_wkt_line(ln) for ln in m[3][1:-1].split('),(')]
-
-        return geom_type, value, m[4]
-
-    def _parse_wkt_coord(self, coord):
-        return tuple(DBValueFloat(float(f.strip()), self.precision) for f in coord.split())
-
-    def _parse_wkt_line(self, coords):
-        return [self._parse_wkt_coord(pt) for pt in coords.split(',')]
-
-    def __eq__(self, other):
-        if other.startswith('[') and other.endswith(']'):
-            gtype = 'MULTI'
-            toparse = other[1:-1].split(';')
-        elif other.startswith('{') and other.endswith('}'):
-            gtype = 'GEOMETRYCOLLECTION'
-            toparse = other[1:-1].split(';')
-        else:
-            gtype = None
-            toparse = [other]
-
-        geoms = []
-        for sub in toparse:
-            sub = sub.strip()
-            if sub.find(',') < 0:
-                geoms.append(self._parse_input_coord(sub))
-                if gtype is None:
-                    gtype = 'POINT'
-                elif gtype.startswith('MULTI'):
-                    if gtype == 'MULTI':
-                        gtype = 'MULTIPOINT'
-                    elif gtype != 'MULTIPOINT':
-                        raise RuntimeError('MULTI* geometry with different geometry types is not supported.')
-            elif sub.find('(') < 0:
-                geoms.append(self._parse_input_line(sub))
-                if gtype is None:
-                    gtype = 'LINESTRING'
-                elif gtype.startswith('MULTI'):
-                    if gtype == 'MULTI':
-                        gtype = 'MULTILINESTRING'
-                    elif gtype != 'MULTILINESTRING':
-                        raise RuntimeError('MULTI* geometry with different geometry types is not supported.')
-            else:
-                geoms.append([self._parse_input_line(ln) for ln in sub.strip()[1:-1].split('),(')])
-                if gtype is None:
-                    gtype = 'POLYGON'
-                elif gtype.startswith('MULTI'):
-                    if gtype == 'MULTI':
-                        gtype = 'MULTIPOLYGON'
-                    elif gtype != 'MULTIPOLYGON':
-                        raise RuntimeError('MULTI* geometry with different geometry types is not supported.')
-
-        if not gtype.startswith('MULTI') and gtype != 'GEOMETRYCOLLECTION':
-            geoms = geoms[0]
-
-        return gtype == self.geom_type and self.value == geoms
-
-    def _parse_input_coord(self, other):
-        coords = other.split(' ')
-        if len(coords) == 1:
-            return self.factory.grid_node(int(coords[0]))
-        if len(coords) == 2:
-            return tuple(float(c.strip()) for c in coords)
-
-        raise RuntimeError(f'Bad coordinate: {other}')
-
-    def _parse_input_line(self, other):
-        return [self._parse_input_coord(pt.strip()) for pt in other.split(',')]
-
-    def __repr__(self):
-        return self.orig_value
-
-
-class DBValueFloat:
-
-    def __init__(self, value, props):
-        self.precision = float(props) if props else 0.0001
-        self.value = value
-
-    def __eq__(self, other):
-        try:
-            fother = float(other)
-        except:
-            return False
-
-        return math.isclose(self.value, fother, rel_tol=self.precision)
-
-    def __repr__(self):
-        return repr(self.value)
-
-
-class DBValueRegex:
-
-    def __init__(self, value):
-        self.value = str(value)
-
-    def __eq__(self, other):
-        return re.fullmatch(str(other), self.value) is not None
-
-    def __repr__(self):
-        return repr(self.value)
-
-
-class DBValueSubString:
-
-    def __init__(self, value):
-        self.value = str(value)
-
-    def __eq__(self, other):
-        return str(other) in self.value
-
-    def __repr__(self):
-        return repr(self.value)
diff --git a/tests/bdd/steps/steps_execute.py b/tests/bdd/steps/steps_execute.py
deleted file mode 100644
index d8dea1a82..000000000
--- a/tests/bdd/steps/steps_execute.py
+++ /dev/null
@@ -1,212 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
-# This file is part of osm2pgsql (https://osm2pgsql.org/).
-#
-# Copyright (C) 2006-2025 by the osm2pgsql developer community.
-# For a full list of authors see the git log.
-"""
-Steps for executing osm2pgsql.
-"""
-from io import StringIO
-from pathlib import Path
-import sys
-import subprocess
-import contextlib
-import logging
-import datetime as dt
-
-from osmium.replication.server import OsmosisState
-
-def get_import_file(context):
-    if context.import_file is not None:
-        return str(context.import_file), None
-
-    # sort by OSM id
-    for obj in context.import_data.values():
-        obj.sort(key=lambda l: int(l.split(' ')[0][1:]))
-
-    fd = StringIO()
-    for typ in ('n', 'w', 'r'):
-        for line in context.import_data[typ]:
-            fd.write(line)
-            fd.write('\n')
-        context.import_data[typ].clear()
-
-    return '-', fd.getvalue()
-
-
-def run_osm2pgsql(context, output):
-    assert output in ('flex', 'pgsql', 'null', 'nooutput')
-
-    cmdline = [str(Path(context.config.userdata['BINARY']).resolve())]
-
-    if output != 'nooutput':
-        cmdline.extend(('-O', output))
-
-    cmdline.extend(context.osm2pgsql_params)
-
-    # convert table items to CLI arguments and inject constants to placeholders
-    if context.table:
-        cmdline.extend(f.format(**context.config.userdata) for f in context.table.headings if f)
-        for row in context.table:
-            cmdline.extend(f.format(**context.config.userdata) for f in row if f)
-
-    if '-d' not in cmdline and '--database' not in cmdline:
-        cmdline.extend(('-d', context.config.userdata['TEST_DB']))
-
-    if 'tablespacetest' in cmdline and not context.config.userdata['HAVE_TABLESPACE']:
-       context.scenario.skip('tablespace tablespacetest not available')
-       return
-
-    if output == 'pgsql':
-        if '-S' not in cmdline:
-            cmdline.extend(('-S', str(context.default_data_dir / 'default.style')))
-
-    data_file, data_stdin = get_import_file(context)
-
-    if data_stdin is not None:
-        data_stdin = data_stdin.encode('utf-8')
-        cmdline.extend(('-r', 'opl'))
-
-    cmdline.append(data_file)
-
-    proc = subprocess.Popen(cmdline, cwd=str(context.workdir),
-                            stdin=subprocess.PIPE,
-                            stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-
-    outdata = proc.communicate(input=data_stdin)
-
-    context.osm2pgsql_outdata = [d.decode('utf-8').replace('\\n', '\n') for d in outdata]
-
-    return proc.returncode
-
-
-def run_osm2pgsql_replication(context):
-    cmdline = []
-    # convert table items to CLI arguments and inject constants to placeholders
-    if context.table:
-        cmdline.extend(f.format(**context.config.userdata) for f in context.table.headings if f)
-        for row in context.table:
-            cmdline.extend(f.format(**context.config.userdata) for f in row if f)
-
-    if '-d' not in cmdline and '--database' not in cmdline:
-        cmdline.extend(('-d', context.config.userdata['TEST_DB']))
-
-    if cmdline[0] == 'update':
-        cmdline.extend(('--osm2pgsql-cmd',
-                        str(Path(context.config.userdata['BINARY']).resolve())))
-
-        if '--' not in cmdline:
-            cmdline.extend(('--', '-S', str(context.default_data_dir / 'default.style')))
-
-
-    serr = StringIO()
-    log_handler = logging.StreamHandler(serr)
-    context.osm2pgsql_replication.LOG.addHandler(log_handler)
-    with contextlib.redirect_stdout(StringIO()) as sout:
-        retval = context.osm2pgsql_replication.main(cmdline)
-    context.osm2pgsql_replication.LOG.removeHandler(log_handler)
-
-    context.osm2pgsql_outdata = [sout.getvalue(), serr.getvalue()]
-    print(context.osm2pgsql_outdata)
-
-    return retval
-
-
-@given("no lua tagtransform")
-def do_not_setup_tagtransform(context):
-    pass
-
-@given("the default lua tagtransform")
-def setup_lua_tagtransform(context):
-    context.osm2pgsql_params.extend(('--tag-transform-script',
-                                    str(context.default_data_dir / 'style.lua')))
-
-@given("the lua style")
-def setup_inline_lua_style(context):
-    outfile = context.workdir / 'inline_style.lua'
-    outfile.write_text(context.text)
-    if '-S' in context.osm2pgsql_params:
-        context.osm2pgsql_params[context.osm2pgsql_params.index('-S') + 1] = str(outfile)
-    else:
-        context.osm2pgsql_params.extend(('-S', str(outfile)))
-
-@given("the style file '(?P<style>.+)'")
-def setup_style_file(context, style):
-    if '-S' in context.osm2pgsql_params:
-        context.osm2pgsql_params[context.osm2pgsql_params.index('-S') + 1] = str(context.test_data_dir / style)
-    else:
-        context.osm2pgsql_params.extend(('-S', str(context.test_data_dir / style)))
-
-
-@when(r"running osm2pgsql (?P<output>\w+)(?: with parameters)?")
-def execute_osm2pgsql_successfully(context, output):
-    returncode = run_osm2pgsql(context, output)
-
-    if context.scenario.status == "skipped":
-        return
-
-    assert returncode == 0,\
-           f"osm2pgsql failed with error code {returncode}.\n"\
-           f"Output:\n{context.osm2pgsql_outdata[0]}\n{context.osm2pgsql_outdata[1]}\n"
-
-
-@then(r"running osm2pgsql (?P<output>\w+)(?: with parameters)? fails")
-def execute_osm2pgsql_with_failure(context, output):
-    returncode = run_osm2pgsql(context, output)
-
-    if context.scenario.status == "skipped":
-        return
-
-    assert returncode != 0, "osm2pgsql unexpectedly succeeded"
-
-
-@when("running osm2pgsql-replication")
-def execute_osm2pgsql_replication_successfully(context):
-    returncode = run_osm2pgsql_replication(context)
-
-    assert returncode == 0,\
-           f"osm2pgsql-replication failed with error code {returncode}.\n"\
-           f"Output:\n{context.osm2pgsql_outdata[0]}\n{context.osm2pgsql_outdata[1]}\n"
-
-
-@then(r"running osm2pgsql-replication fails(?: with returncode (?P<expected>\d+))?")
-def execute_osm2pgsql_replication_successfully(context, expected):
-    returncode = run_osm2pgsql_replication(context)
-
-    assert returncode != 0, "osm2pgsql-replication unexpectedly succeeded"
-    if expected:
-        assert returncode == int(expected), \
-               f"osm2pgsql-replication failed with returncode {returncode} instead of {expected}."\
-               f"Output:\n{context.osm2pgsql_outdata[0]}\n{context.osm2pgsql_outdata[1]}\n"
-
-
-@then(r"the (?P<kind>\w+) output contains")
-def check_program_output(context, kind):
-    if kind == 'error':
-        s = context.osm2pgsql_outdata[1]
-    elif kind == 'standard':
-        s = context.osm2pgsql_outdata[0]
-    else:
-        assert not "Expect one of error, standard"
-
-    for line in context.text.split('\n'):
-        line = line.strip()
-        if line:
-            assert line in s,\
-                   f"Output '{line}' not found in {kind} output:\n{s}\n"
-
-
-@given("the replication service at (?P<base_url>.*)")
-def setup_replication_mock(context, base_url):
-    context.osm2pgsql_replication.ReplicationServer.expected_base_url = base_url
-    if context.table:
-        context.osm2pgsql_replication.ReplicationServer.state_infos =\
-          [OsmosisState(int(row[0]),
-                        dt.datetime.strptime(row[1], '%Y-%m-%dT%H:%M:%SZ').replace(tzinfo=dt.timezone.utc))
-           for row in context.table]
-
-
-@given("the URL (?P<base_url>.*) returns")
-def mock_url_response(context, base_url):
-    context.urlrequest_responses[base_url] = context.text
diff --git a/tests/bdd/steps/steps_osm_data.py b/tests/bdd/steps/steps_osm_data.py
deleted file mode 100644
index 9dc27e771..000000000
--- a/tests/bdd/steps/steps_osm_data.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
-# This file is part of osm2pgsql (https://osm2pgsql.org/).
-#
-# Copyright (C) 2006-2025 by the osm2pgsql developer community.
-# For a full list of authors see the git log.
-"""
-Steps for creating the OSM import file.
-"""
-
-def add_opl_lines(context, lines):
-    for line in lines:
-        if (oplobj := line.strip()):
-            assert oplobj[0] in ('n', 'w', 'r')
-            oplobj = context.geometry_factory.complete_opl(oplobj)
-            data = context.import_data[oplobj[0]]
-            objid = oplobj.split(' ', 1)[0] + ' '
-            for i, existing in enumerate(data):
-                if existing.startswith(objid):
-                    data[i] = oplobj
-                    break
-            else:
-                data.append(oplobj)
-
-
-@given("the input file '(?P<osm_file>.+)'")
-def osm_set_import_file(context, osm_file):
-    """ Use an OSM file from the test directory for the import.
-    """
-    context.import_file = context.test_data_dir / osm_file
-
-
-@given("the (?P<step>[0-9.]+ )?grid(?: with origin (?P<origin_x>[0-9.-]+) (?P<origin_y>[0-9.-]+))?")
-def osm_define_node_grid(context, step, origin_x, origin_y):
-    step = float(step.strip()) if step else 0.1
-    x = float(origin_x) if origin_x else 20.0
-    y = float(origin_y) if origin_y else 20.0
-
-    assert x >= -180.0 and x <= 180.0
-    assert y >= -90.0 and y <= 90.0
-
-    context.geometry_factory.set_grid([context.table.headings] + [list(h) for h in context.table],
-                                      step, x, y)
-    add_opl_lines(context, context.geometry_factory.as_opl_lines())
-
-
-@given("the (?P<formatted>python-formatted )?OSM data")
-def osm_define_data(context, formatted):
-    context.import_file = None
-    data = context.text
-    if formatted:
-        data = eval('f"""' + data + '"""')
-
-    add_opl_lines(context, data.split('\n'))

From c342e13a396d04f352cdbc43bc9245e3edc5bdca Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 1 Dec 2025 10:32:26 +0100
Subject: [PATCH 403/430] avoid run-test-bdd script in ctest

Windows can't handle the paths properly.
---
 .github/actions/win-install/action.yml | 4 ++--
 scripts/osm2pgsql-test-style           | 4 ++--
 tests/CMakeLists.txt                   | 4 ++--
 tests/run-bdd-tests.in                 | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/actions/win-install/action.yml b/.github/actions/win-install/action.yml
index a31825a95..e00163d91 100644
--- a/.github/actions/win-install/action.yml
+++ b/.github/actions/win-install/action.yml
@@ -16,6 +16,6 @@ runs:
           proj[core]:x64-windows \
           zlib:x64-windows
       shell: bash
-    - name: Install psycopg2 and behave
-      run: python -m pip install psycopg2 behave osmium
+    - name: Install psycopg and behave
+      run: python -m pip install psycopg behave osmium
       shell: bash
diff --git a/scripts/osm2pgsql-test-style b/scripts/osm2pgsql-test-style
index d54f515f5..f14e00eba 100755
--- a/scripts/osm2pgsql-test-style
+++ b/scripts/osm2pgsql-test-style
@@ -135,8 +135,8 @@ def hook_before_all(context):
         LOG.critical("osm2pgsql binary used: %s", context.user_args.osm2pgsql_binary)
         raise RuntimeError('Error running osm2pgsql')
 
-        LOG.info('Check if proj is available: %s',
-                 'yes' if context.user_args.test_proj else 'no')
+    LOG.info('Check if proj is available: %s',
+             'yes' if context.user_args.test_proj else 'no')
 
     # Feature check: proj
     if context.user_args.test_proj == 'auto':
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8558da81f..93f022e7a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -125,8 +125,8 @@ find_program(BEHAVE_BIN NAMES behave)
 if (BEHAVE_BIN)
     foreach(BDD_TEST IN ITEMS command-line flex regression)
         add_test(NAME bdd-${BDD_TEST}
-                 COMMAND ./run-bdd-tests ${CMAKE_CURRENT_SOURCE_DIR}/bdd/${BDD_TEST}
-                 WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
+                 COMMAND python3 scripts/osm2pgsql-test-style --style-data-dir ${PROJECT_SOURCE_DIR} --test-data-dir ${CMAKE_CURRENT_SOURCE_DIR}/data/ --osm2pgsql-binary $<TARGET_FILE:osm2pgsql> ${CMAKE_CURRENT_SOURCE_DIR}/bdd/${BDD_TEST}
+                 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
         message(STATUS "Added test: bdd-${BDD_TEST}")
     endforeach(BDD_TEST)
 
diff --git a/tests/run-bdd-tests.in b/tests/run-bdd-tests.in
index cd9709b51..a4f1c97ee 100755
--- a/tests/run-bdd-tests.in
+++ b/tests/run-bdd-tests.in
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-@PROJECT_SOURCE_DIR@/scripts/osm2pgsql-test-style --style-data-dir @PROJECT_SOURCE_DIR@ --test-data-dir @CMAKE_CURRENT_SOURCE_DIR@/data/ --osm2pgsql-binary @PROJECT_BINARY_DIR@/osm2pgsql "$@"
+python3 @PROJECT_SOURCE_DIR@/scripts/osm2pgsql-test-style --style-data-dir @PROJECT_SOURCE_DIR@ --test-data-dir @CMAKE_CURRENT_SOURCE_DIR@/data/ --osm2pgsql-binary @PROJECT_BINARY_DIR@/osm2pgsql "$@"

From cc98e6aab66015d0eeb6f819462bab553eaa4ebe Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 2 Dec 2025 18:29:38 +0100
Subject: [PATCH 404/430] forward environment variables to osm2pgsql in test

Windows needs external setup to function properly.
---
 scripts/osm2pgsql-test-style | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/scripts/osm2pgsql-test-style b/scripts/osm2pgsql-test-style
index f14e00eba..3dea64198 100755
--- a/scripts/osm2pgsql-test-style
+++ b/scripts/osm2pgsql-test-style
@@ -501,17 +501,8 @@ def execute_osm2pgsql(context, output):
         context.import_file = None
         data_stdin = None
 
-    env = {}
-    if context.user_args.lua_path:
-        env['LUA_PATH'] = context.user_args.lua_path
-    if context.user_args.themepark_path:
-        env['THEMEPARK_PATH'] = context.user_args.themepark_path
-    for k in ['PGPORT', 'PGPASSWORD', 'PGUSER', 'PGHOST']:
-        if k in os.environ:
-            env[k] = os.environ[k]
-
     proc = Popen(cmdline, cwd=str(context.workdir),
-                 stdin=PIPE, stdout=PIPE, stderr=PIPE, env=env)
+                 stdin=PIPE, stdout=PIPE, stderr=PIPE)
 
     outdata = proc.communicate(input=data_stdin)
     context.osm2pgsql_cmdline = ' '.join(cmdline)
@@ -794,10 +785,6 @@ def get_parser():
                         help='(optional) directory to search for test data')
     parser.add_argument('--style-data-dir', type=Path,
                         help='(optional) directory to search for style files')
-    parser.add_argument('--lua-path',
-                        help='Additional paths to take into account for finding lua modules')
-    parser.add_argument('--themepark-path',
-                        help='Additional paths to take into account for finding themepark themes')
     parser.add_argument('--test-db', default='osm2pgsql-test',
                         help='Name of database to use for testing (default: osm2pgsql-test)')
     parser.add_argument('--template-test-db', default='osm2pgsql-test-template',

From b545d3c814d5621e2c9a0f622e6fd43442576400 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 3 Dec 2025 13:22:35 +0100
Subject: [PATCH 405/430] adapt contributing documentation for new runner

---
 CONTRIBUTING.md | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9f1e51e01..f830a4ceb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -143,48 +143,48 @@ BDD tests you need to have behave and psycopg installed. On Ubuntu run:
 sudo apt-get install python3-psycopg python3-behave
 ```
 
+The BDD tests are run through the osm2pgsql-test-style tester. See the
+[section on testing](https://osm2pgsql.org/doc/manual.html#style-testing)
+in the manual for details.
+
 There are ctest directives to run the tests. If you want to run the tests
 manually, for example to run single tests during development, you can
-switch to the bdd test directory and run behave directly from there:
+use the `run-bdd-tests` script in the build directory. It is a thin
+wrapper around osm2pgsql-test-style which properly sets up the paths
+for the osm2pgsql binary and test data paths:
 
 ```sh
-cd osm2pgsql/tests/bdd
-behave -DBINARY=<your build directory>/osm2pgsql
+cd build
+./run-bdd-tests ../tests/bdd/regression/
 ```
 
-Per default, behave assumes that the build directory is under `osm2pgsql/build`.
-If your setup works like that, you can leave out the `-D` parameter.
-
-To make this a bit easier a shell script `run-behave` is provided in your
-build directory which sets those correct paths and calls `behave`. If run
-with `-p` as first option it will wrap the call to `behave` in a call to
-`pg_virtualenv` for your convenience. All other command line parameters of
-`run-behave` will be passed through to behave.
-
 To run a single test, simply add the name of the test file, followed by a
 column and the line number of the test:
 
 ```sh
-behave flex/area.feature:71
+./run-bdd-tests ../tests/bdd/flex/area.feature:71
 ```
 
-If you need to inspect the database that a test produces, you can add
-`-DKEEP_TEST_DB` and behave won't remove the database after the test is
-finished. This makes of course only sense, when running a single test.
+You can pass any additional parameters to the script that osm2pgsql-test-style
+would take. If you need to inspect the database that a test produces, you add
+`--keep-test-db` and behave won't remove the database after the test is
+finished. This makes only sense, when running a single test.
 When running under pg_virtualenv, don't forget to keep the virtual environment
 as well. You can use the handy `-s` switch:
 
 ```sh
-pg_virtualenv -s behave -DKEEP_TEST_DB flex/area.feature:71
+pg_virtualenv -s ./run-bdd-tests ../tests/bdd/flex/area.feature:71
 ```
 
 It drops you into a shell when the behave test fails, where you can use
 psql to look at the database. Or start a shell in the virtual environment
 with `pg_virtualenv bash` and run behave from there.
 
-The BDDs automatically detect if osm2pgsql was compiled with Lua and
+The BDDs automatically detect if osm2pgsql was compiled with
 proj support and skip tests accordingly. They also check for the test
-tablespace `tablespacetest` for tests that need tablespaces.
+tablespace `tablespacetest` for tests that need tablespaces. To force
+running the proj and tablespace tests use `--test-proj yes` and
+`--test-tablespace yes` respectively.
 
 BDD tests hide print statements by default. For development purposes they
 can be shown by adding these lines to `tests/bdd/.behaverc`:

From 65da6819135ab88b2ccf84901e2e283d124120f1 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 3 Dec 2025 13:54:47 +0100
Subject: [PATCH 406/430] add test for style test matcher

---
 tests/bdd/command-line/test_style.feature | 68 +++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 tests/bdd/command-line/test_style.feature

diff --git a/tests/bdd/command-line/test_style.feature b/tests/bdd/command-line/test_style.feature
new file mode 100644
index 000000000..315bf0c18
--- /dev/null
+++ b/tests/bdd/command-line/test_style.feature
@@ -0,0 +1,68 @@
+Feature: Writing tests for lua styles
+    This feature exercises the different steps and matcher
+    of the osm2pgsql-test-style script.
+
+    Background:
+        Given the OSM data
+            """
+            n10 Tname=Afeat,access=yes x1 y4
+            n11 Tname=B-feat-Ö,access=no x34.5 y-1.5
+            """
+        And the style file 'flex-config/generic.lua'
+        When running osm2pgsql flex
+
+    Scenario: Fields can be matched case-insensitive
+        Then table points contains
+            | node_id | tags->'name'!i |
+            | 10      | AFEAT          |
+            | 11      | b-feat-ö       |
+        And table points doesn't contain
+            | node_id | tags->'name' |
+            | 10      | AFEAT        |
+
+
+    Scenario: Fields can be match with a regular expression
+        Then table points contains
+            | node_id | tags!re |
+            | 10      | .*access.*   |
+            | 11      | .*-[a-z]+-.* |
+
+
+    Scenario: Fields can be matched as a substring
+        Then table points contains
+            | node_id | tags->'name'!substr |
+            | 10      | feat                |
+            | 11      | feat                |
+        And table points doesn't contain
+            | node_id | tags->'name' |
+            | 10      | ?            |
+
+
+    Scenario: Fields can be matched as a json expression
+        Then table points contains
+            | node_id | tags!json |
+            | 10      | {"name": "Afeat", "access": "yes"} |
+        Then table points contains
+            | node_id | tags!json |
+            | 10      | {"access": "yes", "name": "Afeat"} |
+
+
+    Scenario: Floating fields can be matched with different precision
+        Then table points contains
+            | node_id | ST_X(geom)!~0.5 |
+            | 11      | 3840522.0 |
+        Then table points doesn't contain
+            | node_id | ST_X(geom)!~0.1 |
+            | 11      | 3840522.0 |
+        Then table points contains
+            | node_id | ST_X(geom)!~1% |
+            | 11      | 3840000.0 |
+        Then table points doesn't contain
+            | node_id | ST_X(geom)!~0.01% |
+            | 11      | 3840000.0 |
+
+
+    Scenario: Fields can be formatted arbitrarily for comparison
+        Then table points contains
+            | node_id!:03d | ST_X(geom)!:.1f |
+            | 010          | 111319.5             |

From 273ce3b3a0cdc0d2fbfdc213fa50cde5dfc32bcf Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 6 Jan 2026 10:12:08 +0100
Subject: [PATCH 407/430] Fix: Handle case where raster-union gen is used
 without group-by

Fixes #2443
---
 src/gen/gen-tile-raster.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/gen/gen-tile-raster.cpp b/src/gen/gen-tile-raster.cpp
index b22e929e5..6a5def857 100644
--- a/src/gen/gen-tile-raster.cpp
+++ b/src/gen/gen-tile-raster.cpp
@@ -237,8 +237,13 @@ void gen_tile_raster_union_t::process(tile_t const &tile)
         timer(m_timer_write).start();
         for (auto const &geom : geometries) {
             auto const wkb = geom_to_ewkb(geom);
-            connection().exec_prepared("insert_geoms", binary_param_t{wkb},
-                                       tile.x(), tile.y(), param);
+            if (with_group_by()) {
+                connection().exec_prepared("insert_geoms", binary_param_t{wkb},
+                                           tile.x(), tile.y(), param);
+            } else {
+                connection().exec_prepared("insert_geoms", binary_param_t{wkb},
+                                           tile.x(), tile.y());
+            }
         }
         timer(m_timer_write).stop();
         log_gen("Inserted {} generalized polygons", geometries.size());

From 388a451c9893b4f8d110568a8e35709a4adccf6e Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 29 Jan 2026 15:01:22 +0100
Subject: [PATCH 408/430] Update included libosmium to version 2.23.0

---
 contrib/libosmium/README.contrib              |   2 +-
 .../include/osmium/area/assembler.hpp         |   2 +-
 .../include/osmium/area/assembler_config.hpp  |   2 +-
 .../include/osmium/area/assembler_legacy.hpp  |   4 +-
 .../osmium/area/detail/basic_assembler.hpp    |  12 +-
 .../area/detail/basic_assembler_with_tags.hpp |   2 +-
 .../osmium/area/detail/node_ref_segment.hpp   |   2 +-
 .../include/osmium/area/detail/proto_ring.hpp |   4 +-
 .../osmium/area/detail/segment_list.hpp       |   2 +-
 .../include/osmium/area/detail/vector.hpp     |   2 +-
 .../include/osmium/area/geom_assembler.hpp    |   2 +-
 .../osmium/area/multipolygon_collector.hpp    |   2 +-
 .../osmium/area/multipolygon_manager.hpp      |   2 +-
 .../area/multipolygon_manager_legacy.hpp      |   2 +-
 .../include/osmium/area/problem_reporter.hpp  |   2 +-
 .../area/problem_reporter_exception.hpp       |   2 +-
 .../osmium/area/problem_reporter_ogr.hpp      |   2 +-
 .../osmium/area/problem_reporter_stream.hpp   |   2 +-
 .../libosmium/include/osmium/area/stats.hpp   |   2 +-
 .../libosmium/include/osmium/builder/attr.hpp |   2 +-
 .../include/osmium/builder/builder.hpp        |   2 +-
 .../osmium/builder/osm_object_builder.hpp     |  59 ++--
 .../libosmium/include/osmium/diff_handler.hpp |   2 +-
 .../include/osmium/diff_iterator.hpp          |   2 +-
 .../libosmium/include/osmium/diff_visitor.hpp |   2 +-
 .../include/osmium/dynamic_handler.hpp        |   2 +-
 .../osmium/experimental/flex_reader.hpp       |   2 +-
 contrib/libosmium/include/osmium/fwd.hpp      |   2 +-
 .../include/osmium/geom/coordinates.hpp       |   2 +-
 .../libosmium/include/osmium/geom/factory.hpp |   2 +-
 .../libosmium/include/osmium/geom/geojson.hpp |   2 +-
 .../libosmium/include/osmium/geom/geos.hpp    |   2 +-
 .../include/osmium/geom/haversine.hpp         |   2 +-
 .../osmium/geom/mercator_projection.hpp       |   2 +-
 contrib/libosmium/include/osmium/geom/ogr.hpp |   2 +-
 .../include/osmium/geom/rapid_geojson.hpp     |   2 +-
 .../include/osmium/geom/relations.hpp         |   2 +-
 .../libosmium/include/osmium/geom/tile.hpp    |   2 +-
 .../libosmium/include/osmium/geom/util.hpp    |   2 +-
 contrib/libosmium/include/osmium/geom/wkb.hpp |   2 +-
 contrib/libosmium/include/osmium/geom/wkt.hpp |   2 +-
 contrib/libosmium/include/osmium/handler.hpp  |   2 +-
 .../include/osmium/handler/chain.hpp          |   2 +-
 .../include/osmium/handler/check_order.hpp    |   2 +-
 .../include/osmium/handler/disk_store.hpp     |   2 +-
 .../libosmium/include/osmium/handler/dump.hpp |   2 +-
 .../handler/node_locations_for_ways.hpp       |   2 +-
 .../osmium/handler/object_relations.hpp       |   2 +-
 .../index/detail/create_map_with_fd.hpp       |   2 +-
 .../osmium/index/detail/mmap_vector_anon.hpp  |   2 +-
 .../osmium/index/detail/mmap_vector_base.hpp  |   2 +-
 .../osmium/index/detail/mmap_vector_file.hpp  |   2 +-
 .../include/osmium/index/detail/tmpfile.hpp   |   2 +-
 .../osmium/index/detail/vector_map.hpp        |   2 +-
 .../osmium/index/detail/vector_multimap.hpp   |   2 +-
 .../libosmium/include/osmium/index/id_set.hpp |   2 +-
 .../libosmium/include/osmium/index/index.hpp  |   2 +-
 .../libosmium/include/osmium/index/map.hpp    |   2 +-
 .../include/osmium/index/map/all.hpp          |   2 +-
 .../osmium/index/map/dense_file_array.hpp     |   2 +-
 .../osmium/index/map/dense_mem_array.hpp      |   2 +-
 .../osmium/index/map/dense_mmap_array.hpp     |   2 +-
 .../include/osmium/index/map/dummy.hpp        |   2 +-
 .../include/osmium/index/map/flex_mem.hpp     |   2 +-
 .../osmium/index/map/sparse_file_array.hpp    |   2 +-
 .../osmium/index/map/sparse_mem_array.hpp     |   2 +-
 .../osmium/index/map/sparse_mem_map.hpp       |   2 +-
 .../osmium/index/map/sparse_mmap_array.hpp    |   2 +-
 .../include/osmium/index/multimap.hpp         |   2 +-
 .../include/osmium/index/multimap/all.hpp     |   2 +-
 .../include/osmium/index/multimap/hybrid.hpp  |   2 +-
 .../index/multimap/sparse_file_array.hpp      |   2 +-
 .../index/multimap/sparse_mem_array.hpp       |   2 +-
 .../index/multimap/sparse_mem_multimap.hpp    |   2 +-
 .../index/multimap/sparse_mmap_array.hpp      |   2 +-
 .../osmium/index/node_locations_map.hpp       |   2 +-
 .../include/osmium/index/nwr_array.hpp        |   2 +-
 .../include/osmium/index/relations_map.hpp    |   2 +-
 .../include/osmium/io/any_compression.hpp     |   2 +-
 .../libosmium/include/osmium/io/any_input.hpp |   2 +-
 .../include/osmium/io/any_output.hpp          |   2 +-
 .../include/osmium/io/bzip2_compression.hpp   |  20 +-
 .../include/osmium/io/compression.hpp         |   6 +-
 .../include/osmium/io/debug_output.hpp        |   2 +-
 .../osmium/io/detail/debug_output_format.hpp  |  16 +-
 .../osmium/io/detail/ids_output_format.hpp    |   2 +-
 .../include/osmium/io/detail/input_format.hpp |   2 +-
 .../include/osmium/io/detail/lz4.hpp          |   2 +-
 .../osmium/io/detail/o5m_input_format.hpp     |   2 +-
 .../osmium/io/detail/opl_input_format.hpp     |   2 +-
 .../osmium/io/detail/opl_output_format.hpp    |   2 +-
 .../osmium/io/detail/opl_parser_functions.hpp |   2 +-
 .../osmium/io/detail/output_format.hpp        |   2 +-
 .../include/osmium/io/detail/pbf.hpp          |   2 +-
 .../include/osmium/io/detail/pbf_decoder.hpp  | 271 +++++++++++++-----
 .../osmium/io/detail/pbf_input_format.hpp     |  11 +-
 .../osmium/io/detail/pbf_output_format.hpp    |   2 +-
 .../osmium/io/detail/protobuf_tags.hpp        |   2 +-
 .../include/osmium/io/detail/queue_util.hpp   |   2 +-
 .../include/osmium/io/detail/read_thread.hpp  |   2 +-
 .../include/osmium/io/detail/read_write.hpp   |   5 +-
 .../include/osmium/io/detail/string_table.hpp |   2 +-
 .../include/osmium/io/detail/string_util.hpp  |   2 +-
 .../include/osmium/io/detail/write_thread.hpp |   2 +-
 .../osmium/io/detail/xml_input_format.hpp     |   2 +-
 .../osmium/io/detail/xml_output_format.hpp    |   2 +-
 .../include/osmium/io/detail/zlib.hpp         |   2 +-
 contrib/libosmium/include/osmium/io/error.hpp |   2 +-
 contrib/libosmium/include/osmium/io/file.hpp  |   2 +-
 .../include/osmium/io/file_compression.hpp    |   2 +-
 .../include/osmium/io/file_format.hpp         |   2 +-
 .../include/osmium/io/gzip_compression.hpp    |   2 +-
 .../libosmium/include/osmium/io/header.hpp    |   2 +-
 .../include/osmium/io/ids_output.hpp          |   2 +-
 .../include/osmium/io/input_iterator.hpp      |   2 +-
 .../libosmium/include/osmium/io/o5m_input.hpp |   2 +-
 .../libosmium/include/osmium/io/opl_input.hpp |   2 +-
 .../include/osmium/io/opl_output.hpp          |   2 +-
 .../include/osmium/io/output_iterator.hpp     |   2 +-
 .../libosmium/include/osmium/io/overwrite.hpp |   2 +-
 contrib/libosmium/include/osmium/io/pbf.hpp   |   2 +-
 .../libosmium/include/osmium/io/pbf_input.hpp |   2 +-
 .../include/osmium/io/pbf_output.hpp          |   2 +-
 .../libosmium/include/osmium/io/reader.hpp    |   2 +-
 .../include/osmium/io/reader_iterator.hpp     |   2 +-
 .../osmium/io/reader_with_progress_bar.hpp    |   2 +-
 .../libosmium/include/osmium/io/writer.hpp    |   2 +-
 .../include/osmium/io/writer_options.hpp      |   2 +-
 .../libosmium/include/osmium/io/xml_input.hpp |   2 +-
 .../include/osmium/io/xml_output.hpp          |   2 +-
 .../include/osmium/memory/buffer.hpp          |   6 +-
 .../include/osmium/memory/callback_buffer.hpp |   2 +-
 .../include/osmium/memory/collection.hpp      |   3 +-
 .../libosmium/include/osmium/memory/item.hpp  |   2 +-
 .../include/osmium/memory/item_iterator.hpp   |   2 +-
 .../osmium/object_pointer_collection.hpp      |   2 +-
 contrib/libosmium/include/osmium/opl.hpp      |   2 +-
 contrib/libosmium/include/osmium/osm.hpp      |   2 +-
 contrib/libosmium/include/osmium/osm/area.hpp |   2 +-
 contrib/libosmium/include/osmium/osm/box.hpp  |   2 +-
 .../include/osmium/osm/changeset.hpp          |   2 +-
 contrib/libosmium/include/osmium/osm/crc.hpp  |   2 +-
 .../libosmium/include/osmium/osm/crc_zlib.hpp |   2 +-
 .../include/osmium/osm/diff_object.hpp        |   2 +-
 .../libosmium/include/osmium/osm/entity.hpp   |   2 +-
 .../include/osmium/osm/entity_bits.hpp        |   6 +-
 .../include/osmium/osm/item_type.hpp          |   2 +-
 .../libosmium/include/osmium/osm/location.hpp | 157 ++++++++--
 .../include/osmium/osm/metadata_options.hpp   |   6 +-
 contrib/libosmium/include/osmium/osm/node.hpp |   2 +-
 .../libosmium/include/osmium/osm/node_ref.hpp |   2 +-
 .../include/osmium/osm/node_ref_list.hpp      |   2 +-
 .../libosmium/include/osmium/osm/object.hpp   |   2 +-
 .../include/osmium/osm/object_comparisons.hpp |   2 +-
 .../libosmium/include/osmium/osm/relation.hpp |   2 +-
 .../libosmium/include/osmium/osm/segment.hpp  |   2 +-
 contrib/libosmium/include/osmium/osm/tag.hpp  |   2 +-
 .../include/osmium/osm/timestamp.hpp          |   2 +-
 .../libosmium/include/osmium/osm/types.hpp    |   2 +-
 .../include/osmium/osm/types_from_string.hpp  |   2 +-
 .../include/osmium/osm/undirected_segment.hpp |   2 +-
 contrib/libosmium/include/osmium/osm/way.hpp  |   2 +-
 .../include/osmium/relations/collector.hpp    |   2 +-
 .../osmium/relations/detail/member_meta.hpp   |   2 +-
 .../osmium/relations/detail/relation_meta.hpp |   2 +-
 .../include/osmium/relations/manager_util.hpp |   2 +-
 .../osmium/relations/members_database.hpp     |   2 +-
 .../osmium/relations/relations_database.hpp   |   2 +-
 .../osmium/relations/relations_manager.hpp    |   2 +-
 .../include/osmium/storage/item_stash.hpp     |   2 +-
 .../libosmium/include/osmium/tags/filter.hpp  |   2 +-
 .../libosmium/include/osmium/tags/matcher.hpp |   2 +-
 .../libosmium/include/osmium/tags/taglist.hpp |   2 +-
 .../include/osmium/tags/tags_filter.hpp       |  45 ++-
 .../osmium/thread/function_wrapper.hpp        |   2 +-
 .../libosmium/include/osmium/thread/pool.hpp  |   2 +-
 .../libosmium/include/osmium/thread/queue.hpp |   2 +-
 .../libosmium/include/osmium/thread/util.hpp  |   2 +-
 .../include/osmium/util/compatibility.hpp     |   2 +-
 .../libosmium/include/osmium/util/config.hpp  |   2 +-
 .../libosmium/include/osmium/util/delta.hpp   |   2 +-
 .../libosmium/include/osmium/util/double.hpp  |   2 +-
 .../libosmium/include/osmium/util/endian.hpp  |   2 +-
 .../libosmium/include/osmium/util/file.hpp    |   2 +-
 .../include/osmium/util/iterator.hpp          |   2 +-
 .../libosmium/include/osmium/util/memory.hpp  |   2 +-
 .../include/osmium/util/memory_mapping.hpp    |   2 +-
 .../libosmium/include/osmium/util/minmax.hpp  |   2 +-
 .../libosmium/include/osmium/util/misc.hpp    |   2 +-
 .../libosmium/include/osmium/util/options.hpp |   2 +-
 .../include/osmium/util/progress_bar.hpp      |   2 +-
 .../libosmium/include/osmium/util/string.hpp  |   2 +-
 .../include/osmium/util/string_matcher.hpp    |   2 +-
 .../libosmium/include/osmium/util/timer.hpp   |   2 +-
 .../include/osmium/util/verbose_output.hpp    |   2 +-
 contrib/libosmium/include/osmium/version.hpp  |   6 +-
 contrib/libosmium/include/osmium/visitor.hpp  |   2 +-
 197 files changed, 677 insertions(+), 320 deletions(-)

diff --git a/contrib/libosmium/README.contrib b/contrib/libosmium/README.contrib
index 955da97f3..7026807c1 100644
--- a/contrib/libosmium/README.contrib
+++ b/contrib/libosmium/README.contrib
@@ -1,2 +1,2 @@
 Source: https://github.com/osmcode/libosmium
-Revision: v2.22.0
+Revision: v2.23.0
diff --git a/contrib/libosmium/include/osmium/area/assembler.hpp b/contrib/libosmium/include/osmium/area/assembler.hpp
index 3116f47b0..0ecd13612 100644
--- a/contrib/libosmium/include/osmium/area/assembler.hpp
+++ b/contrib/libosmium/include/osmium/area/assembler.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/area/assembler_config.hpp b/contrib/libosmium/include/osmium/area/assembler_config.hpp
index e81afcfa3..ff5156c9b 100644
--- a/contrib/libosmium/include/osmium/area/assembler_config.hpp
+++ b/contrib/libosmium/include/osmium/area/assembler_config.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/area/assembler_legacy.hpp b/contrib/libosmium/include/osmium/area/assembler_legacy.hpp
index f30ab329d..537087565 100644
--- a/contrib/libosmium/include/osmium/area/assembler_legacy.hpp
+++ b/contrib/libosmium/include/osmium/area/assembler_legacy.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -72,7 +72,7 @@ namespace osmium {
          */
         class AssemblerLegacy : public detail::BasicAssemblerWithTags {
 
-            void add_common_tags(osmium::builder::TagListBuilder& tl_builder, std::set<const osmium::Way*>& ways) const {
+            void add_common_tags(osmium::builder::TagListBuilder& tl_builder, const std::set<const osmium::Way*>& ways) const {
                 std::map<std::string, std::size_t> counter;
                 for (const osmium::Way* way : ways) {
                     for (const auto& tag : way->tags()) {
diff --git a/contrib/libosmium/include/osmium/area/detail/basic_assembler.hpp b/contrib/libosmium/include/osmium/area/detail/basic_assembler.hpp
index 5a378d076..fa2152a2e 100644
--- a/contrib/libosmium/include/osmium/area/detail/basic_assembler.hpp
+++ b/contrib/libosmium/include/osmium/area/detail/basic_assembler.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -290,7 +290,7 @@ namespace osmium {
                     }
                 }
 
-                ProtoRing* find_enclosing_ring(NodeRefSegment* segment) {
+                ProtoRing* find_enclosing_ring(NodeRefSegment const* segment) {
                     if (debug()) {
                         std::cerr << "    Looking for ring enclosing " << *segment << "\n";
                     }
@@ -553,7 +553,7 @@ namespace osmium {
                         return;
                     }
 
-                    std::stable_sort(rings.begin(), rings.end(), [](ProtoRing* a, ProtoRing* b) {
+                    std::stable_sort(rings.begin(), rings.end(), [](ProtoRing const* a, ProtoRing const* b) {
                         return a->min_segment() < b->min_segment();
                     });
 
@@ -824,7 +824,7 @@ namespace osmium {
                     });
 
                     find_inner_outer_complex();
-                    ProtoRing* outer_ring = find_enclosing_ring(ring_min->ring().min_segment());
+                    const ProtoRing* outer_ring = find_enclosing_ring(ring_min->ring().min_segment());
                     const bool ring_min_is_outer = !outer_ring;
                     if (debug()) {
                         std::cerr << "  Open ring is " << (ring_min_is_outer ? "outer" : "inner") << " ring\n";
@@ -858,7 +858,7 @@ namespace osmium {
                         if (!open_ring_its.empty()) {
                             ++m_stats.open_rings;
                             if (m_config.problem_reporter) {
-                                for (auto& it : open_ring_its) {
+                                for (const auto& it : open_ring_its) {
                                     m_config.problem_reporter->report_ring_not_closed(it->get_node_ref_start(), nullptr);
                                     m_config.problem_reporter->report_ring_not_closed(it->get_node_ref_stop(), nullptr);
                                 }
@@ -912,7 +912,7 @@ namespace osmium {
                                                                       [this, &location](const slocation& lhs, const slocation& rhs) {
                                                                           return lhs.location(m_segment_list, location) < rhs.location(m_segment_list, location);
                                                                       }));
-                        for (auto& loc : locs) {
+                        for (const auto& loc : locs) {
                             if (!m_segment_list[loc.item].is_done()) {
                                 count_remaining -= add_new_ring_complex(loc);
                                 if (count_remaining == 0) {
diff --git a/contrib/libosmium/include/osmium/area/detail/basic_assembler_with_tags.hpp b/contrib/libosmium/include/osmium/area/detail/basic_assembler_with_tags.hpp
index 9e4a4072e..8c5b56f43 100644
--- a/contrib/libosmium/include/osmium/area/detail/basic_assembler_with_tags.hpp
+++ b/contrib/libosmium/include/osmium/area/detail/basic_assembler_with_tags.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/area/detail/node_ref_segment.hpp b/contrib/libosmium/include/osmium/area/detail/node_ref_segment.hpp
index 5ecaf02a4..41f35b4fe 100644
--- a/contrib/libosmium/include/osmium/area/detail/node_ref_segment.hpp
+++ b/contrib/libosmium/include/osmium/area/detail/node_ref_segment.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/area/detail/proto_ring.hpp b/contrib/libosmium/include/osmium/area/detail/proto_ring.hpp
index ec62dca59..fb8316f9b 100644
--- a/contrib/libosmium/include/osmium/area/detail/proto_ring.hpp
+++ b/contrib/libosmium/include/osmium/area/detail/proto_ring.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -195,7 +195,7 @@ namespace osmium {
                     }
                 }
 
-                void join_forward(ProtoRing& other) {
+                void join_forward(const ProtoRing& other) {
                     m_segments.reserve(m_segments.size() + other.m_segments.size());
                     for (NodeRefSegment* segment : other.m_segments) {
                         add_segment_back(segment);
diff --git a/contrib/libosmium/include/osmium/area/detail/segment_list.hpp b/contrib/libosmium/include/osmium/area/detail/segment_list.hpp
index ed07fe198..4be4cb1e1 100644
--- a/contrib/libosmium/include/osmium/area/detail/segment_list.hpp
+++ b/contrib/libosmium/include/osmium/area/detail/segment_list.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/area/detail/vector.hpp b/contrib/libosmium/include/osmium/area/detail/vector.hpp
index 3c1ba31b0..ac5474602 100644
--- a/contrib/libosmium/include/osmium/area/detail/vector.hpp
+++ b/contrib/libosmium/include/osmium/area/detail/vector.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/area/geom_assembler.hpp b/contrib/libosmium/include/osmium/area/geom_assembler.hpp
index 8ce75a7a6..558eb9767 100644
--- a/contrib/libosmium/include/osmium/area/geom_assembler.hpp
+++ b/contrib/libosmium/include/osmium/area/geom_assembler.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/area/multipolygon_collector.hpp b/contrib/libosmium/include/osmium/area/multipolygon_collector.hpp
index c983ae18a..c3054c625 100644
--- a/contrib/libosmium/include/osmium/area/multipolygon_collector.hpp
+++ b/contrib/libosmium/include/osmium/area/multipolygon_collector.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/area/multipolygon_manager.hpp b/contrib/libosmium/include/osmium/area/multipolygon_manager.hpp
index 26b4c06ec..f9b221e3b 100644
--- a/contrib/libosmium/include/osmium/area/multipolygon_manager.hpp
+++ b/contrib/libosmium/include/osmium/area/multipolygon_manager.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/area/multipolygon_manager_legacy.hpp b/contrib/libosmium/include/osmium/area/multipolygon_manager_legacy.hpp
index adf9eda0c..9077805ab 100644
--- a/contrib/libosmium/include/osmium/area/multipolygon_manager_legacy.hpp
+++ b/contrib/libosmium/include/osmium/area/multipolygon_manager_legacy.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/area/problem_reporter.hpp b/contrib/libosmium/include/osmium/area/problem_reporter.hpp
index 95e4e8206..2748f9690 100644
--- a/contrib/libosmium/include/osmium/area/problem_reporter.hpp
+++ b/contrib/libosmium/include/osmium/area/problem_reporter.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/area/problem_reporter_exception.hpp b/contrib/libosmium/include/osmium/area/problem_reporter_exception.hpp
index 216b4b0c4..f9b8699df 100644
--- a/contrib/libosmium/include/osmium/area/problem_reporter_exception.hpp
+++ b/contrib/libosmium/include/osmium/area/problem_reporter_exception.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/area/problem_reporter_ogr.hpp b/contrib/libosmium/include/osmium/area/problem_reporter_ogr.hpp
index a99e2f1f3..b887e5b16 100644
--- a/contrib/libosmium/include/osmium/area/problem_reporter_ogr.hpp
+++ b/contrib/libosmium/include/osmium/area/problem_reporter_ogr.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/area/problem_reporter_stream.hpp b/contrib/libosmium/include/osmium/area/problem_reporter_stream.hpp
index d2307a6a3..dd491f958 100644
--- a/contrib/libosmium/include/osmium/area/problem_reporter_stream.hpp
+++ b/contrib/libosmium/include/osmium/area/problem_reporter_stream.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/area/stats.hpp b/contrib/libosmium/include/osmium/area/stats.hpp
index 2699d7445..4434f48d8 100644
--- a/contrib/libosmium/include/osmium/area/stats.hpp
+++ b/contrib/libosmium/include/osmium/area/stats.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/builder/attr.hpp b/contrib/libosmium/include/osmium/builder/attr.hpp
index fdc54bb34..8e99c7f20 100644
--- a/contrib/libosmium/include/osmium/builder/attr.hpp
+++ b/contrib/libosmium/include/osmium/builder/attr.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/builder/builder.hpp b/contrib/libosmium/include/osmium/builder/builder.hpp
index 2206bcd50..57ead29cb 100644
--- a/contrib/libosmium/include/osmium/builder/builder.hpp
+++ b/contrib/libosmium/include/osmium/builder/builder.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/builder/osm_object_builder.hpp b/contrib/libosmium/include/osmium/builder/osm_object_builder.hpp
index 7e49535d9..aa5b04315 100644
--- a/contrib/libosmium/include/osmium/builder/osm_object_builder.hpp
+++ b/contrib/libosmium/include/osmium/builder/osm_object_builder.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -324,7 +324,7 @@ namespace osmium {
 
         class ChangesetDiscussionBuilder : public Builder {
 
-            osmium::ChangesetComment* m_comment = nullptr;
+            std::size_t m_comment_offset = std::numeric_limits<std::size_t>::max();
 
             void add_user(osmium::ChangesetComment& comment, const char* user, const std::size_t length) {
                 if (length > osmium::max_osm_string_length) {
@@ -343,6 +343,19 @@ namespace osmium {
                 add_padding(true);
             }
 
+            bool has_open_comment() const noexcept {
+                return m_comment_offset != std::numeric_limits<std::size_t>::max();
+            }
+
+            // Get current comment pointer (recalculated each time to handle buffer reallocation)
+            osmium::ChangesetComment* get_comment_ptr() {
+                if (has_open_comment()) {
+                    return &buffer().get<osmium::ChangesetComment>(
+                        buffer().committed() + m_comment_offset);
+                }
+                return nullptr;
+            }
+
         public:
 
             explicit ChangesetDiscussionBuilder(osmium::memory::Buffer& buffer, Builder* parent = nullptr) :
@@ -362,32 +375,46 @@ namespace osmium {
             ChangesetDiscussionBuilder& operator=(ChangesetDiscussionBuilder&&) = delete;
 
             ~ChangesetDiscussionBuilder() {
-                assert(!m_comment && "You have to always call both add_comment() and then add_comment_text() in that order for each comment!");
+                assert(!has_open_comment() && "You have to always call both add_comment() and then add_comment_text() in that order for each comment!");
                 add_padding();
             }
 
             void add_comment(osmium::Timestamp date, osmium::user_id_type uid, const char* user) {
-                assert(!m_comment && "You have to always call both add_comment() and then add_comment_text() in that order for each comment!");
-                m_comment = reserve_space_for<osmium::ChangesetComment>();
-                new (m_comment) osmium::ChangesetComment{date, uid};
+                assert(!has_open_comment() && "You have to always call both add_comment() and then add_comment_text() in that order for each comment!");
+
+                // Store offset instead of pointer to handle buffer reallocation
+                m_comment_offset = buffer().written() - buffer().committed();
+
+                auto* comment = reserve_space_for<osmium::ChangesetComment>();
+                new (comment) osmium::ChangesetComment{date, uid};
                 add_size(sizeof(ChangesetComment));
-                add_user(*m_comment, user, std::strlen(user));
+
+                add_user(*comment, user, std::strlen(user));
             }
 
             void add_comment_text(const char* text) {
-                assert(m_comment && "You have to always call both add_comment() and then add_comment_text() in that order for each comment!");
-                osmium::ChangesetComment& comment = *m_comment;
-                m_comment = nullptr;
-                add_text(comment, text, std::strlen(text));
+                assert(has_open_comment() && "You have to always call both add_comment() and then add_comment_text() in that order for each comment!");
+
+                // Get fresh pointer each time to handle buffer reallocation
+                auto* comment = get_comment_ptr();
+
+                // Invalidate offset to ensure right adding order
+                m_comment_offset = std::numeric_limits<std::size_t>::max();
+
+                add_text(*comment, text, std::strlen(text));
             }
 
             void add_comment_text(const std::string& text) {
-                assert(m_comment && "You have to always call both add_comment() and then add_comment_text() in that order for each comment!");
-                osmium::ChangesetComment& comment = *m_comment;
-                m_comment = nullptr;
-                add_text(comment, text.c_str(), text.size());
-            }
+                assert(has_open_comment() && "You have to always call both add_comment() and then add_comment_text() in that order for each comment!");
 
+                // Get fresh pointer each time to handle buffer reallocation
+                auto* comment = get_comment_ptr();
+
+                // Invalidate offset to ensure right adding order
+                m_comment_offset = std::numeric_limits<std::size_t>::max();
+
+                add_text(*comment, text.c_str(), text.size());
+            }
         }; // class ChangesetDiscussionBuilder
 
 #define OSMIUM_FORWARD(setter) \
diff --git a/contrib/libosmium/include/osmium/diff_handler.hpp b/contrib/libosmium/include/osmium/diff_handler.hpp
index 935d6a1a1..2bf4435e4 100644
--- a/contrib/libosmium/include/osmium/diff_handler.hpp
+++ b/contrib/libosmium/include/osmium/diff_handler.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/diff_iterator.hpp b/contrib/libosmium/include/osmium/diff_iterator.hpp
index c6c725168..577b3e333 100644
--- a/contrib/libosmium/include/osmium/diff_iterator.hpp
+++ b/contrib/libosmium/include/osmium/diff_iterator.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/diff_visitor.hpp b/contrib/libosmium/include/osmium/diff_visitor.hpp
index 32f0ff328..4a3ec8171 100644
--- a/contrib/libosmium/include/osmium/diff_visitor.hpp
+++ b/contrib/libosmium/include/osmium/diff_visitor.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/dynamic_handler.hpp b/contrib/libosmium/include/osmium/dynamic_handler.hpp
index 3917309dd..a730f2f6c 100644
--- a/contrib/libosmium/include/osmium/dynamic_handler.hpp
+++ b/contrib/libosmium/include/osmium/dynamic_handler.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/experimental/flex_reader.hpp b/contrib/libosmium/include/osmium/experimental/flex_reader.hpp
index ad4525f1f..92d830ff1 100644
--- a/contrib/libosmium/include/osmium/experimental/flex_reader.hpp
+++ b/contrib/libosmium/include/osmium/experimental/flex_reader.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/fwd.hpp b/contrib/libosmium/include/osmium/fwd.hpp
index b80c5d742..608f83b51 100644
--- a/contrib/libosmium/include/osmium/fwd.hpp
+++ b/contrib/libosmium/include/osmium/fwd.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/geom/coordinates.hpp b/contrib/libosmium/include/osmium/geom/coordinates.hpp
index c734d0dd7..72d3a20ff 100644
--- a/contrib/libosmium/include/osmium/geom/coordinates.hpp
+++ b/contrib/libosmium/include/osmium/geom/coordinates.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/geom/factory.hpp b/contrib/libosmium/include/osmium/geom/factory.hpp
index 148a3e2e3..0b2438a81 100644
--- a/contrib/libosmium/include/osmium/geom/factory.hpp
+++ b/contrib/libosmium/include/osmium/geom/factory.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/geom/geojson.hpp b/contrib/libosmium/include/osmium/geom/geojson.hpp
index 41650501b..9ad997370 100644
--- a/contrib/libosmium/include/osmium/geom/geojson.hpp
+++ b/contrib/libosmium/include/osmium/geom/geojson.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/geom/geos.hpp b/contrib/libosmium/include/osmium/geom/geos.hpp
index d859e6be3..87afe8bf3 100644
--- a/contrib/libosmium/include/osmium/geom/geos.hpp
+++ b/contrib/libosmium/include/osmium/geom/geos.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/geom/haversine.hpp b/contrib/libosmium/include/osmium/geom/haversine.hpp
index a57170f82..f1bc7a6be 100644
--- a/contrib/libosmium/include/osmium/geom/haversine.hpp
+++ b/contrib/libosmium/include/osmium/geom/haversine.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/geom/mercator_projection.hpp b/contrib/libosmium/include/osmium/geom/mercator_projection.hpp
index 514152e1c..572d080cf 100644
--- a/contrib/libosmium/include/osmium/geom/mercator_projection.hpp
+++ b/contrib/libosmium/include/osmium/geom/mercator_projection.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/geom/ogr.hpp b/contrib/libosmium/include/osmium/geom/ogr.hpp
index 603a104cf..f26c01c96 100644
--- a/contrib/libosmium/include/osmium/geom/ogr.hpp
+++ b/contrib/libosmium/include/osmium/geom/ogr.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/geom/rapid_geojson.hpp b/contrib/libosmium/include/osmium/geom/rapid_geojson.hpp
index 5e415f5b4..f93b9996c 100644
--- a/contrib/libosmium/include/osmium/geom/rapid_geojson.hpp
+++ b/contrib/libosmium/include/osmium/geom/rapid_geojson.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/geom/relations.hpp b/contrib/libosmium/include/osmium/geom/relations.hpp
index 4a33574ce..d1beb721c 100644
--- a/contrib/libosmium/include/osmium/geom/relations.hpp
+++ b/contrib/libosmium/include/osmium/geom/relations.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/geom/tile.hpp b/contrib/libosmium/include/osmium/geom/tile.hpp
index 242fd5c27..3dde94ef1 100644
--- a/contrib/libosmium/include/osmium/geom/tile.hpp
+++ b/contrib/libosmium/include/osmium/geom/tile.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/geom/util.hpp b/contrib/libosmium/include/osmium/geom/util.hpp
index 2341b38d7..4b69da939 100644
--- a/contrib/libosmium/include/osmium/geom/util.hpp
+++ b/contrib/libosmium/include/osmium/geom/util.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/geom/wkb.hpp b/contrib/libosmium/include/osmium/geom/wkb.hpp
index 30f0b5428..9f7a5973d 100644
--- a/contrib/libosmium/include/osmium/geom/wkb.hpp
+++ b/contrib/libosmium/include/osmium/geom/wkb.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/geom/wkt.hpp b/contrib/libosmium/include/osmium/geom/wkt.hpp
index 5be2507cc..a5ff4fabe 100644
--- a/contrib/libosmium/include/osmium/geom/wkt.hpp
+++ b/contrib/libosmium/include/osmium/geom/wkt.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/handler.hpp b/contrib/libosmium/include/osmium/handler.hpp
index cd510c30a..cb3d495d9 100644
--- a/contrib/libosmium/include/osmium/handler.hpp
+++ b/contrib/libosmium/include/osmium/handler.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/handler/chain.hpp b/contrib/libosmium/include/osmium/handler/chain.hpp
index 869076809..d05df2556 100644
--- a/contrib/libosmium/include/osmium/handler/chain.hpp
+++ b/contrib/libosmium/include/osmium/handler/chain.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/handler/check_order.hpp b/contrib/libosmium/include/osmium/handler/check_order.hpp
index 643034226..c05652d6a 100644
--- a/contrib/libosmium/include/osmium/handler/check_order.hpp
+++ b/contrib/libosmium/include/osmium/handler/check_order.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/handler/disk_store.hpp b/contrib/libosmium/include/osmium/handler/disk_store.hpp
index 2d5ec190e..165f09283 100644
--- a/contrib/libosmium/include/osmium/handler/disk_store.hpp
+++ b/contrib/libosmium/include/osmium/handler/disk_store.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/handler/dump.hpp b/contrib/libosmium/include/osmium/handler/dump.hpp
index c08d79752..a15fb52d4 100644
--- a/contrib/libosmium/include/osmium/handler/dump.hpp
+++ b/contrib/libosmium/include/osmium/handler/dump.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/handler/node_locations_for_ways.hpp b/contrib/libosmium/include/osmium/handler/node_locations_for_ways.hpp
index 05b36e814..720d1ae81 100644
--- a/contrib/libosmium/include/osmium/handler/node_locations_for_ways.hpp
+++ b/contrib/libosmium/include/osmium/handler/node_locations_for_ways.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/handler/object_relations.hpp b/contrib/libosmium/include/osmium/handler/object_relations.hpp
index 0dee79edf..d9c318a80 100644
--- a/contrib/libosmium/include/osmium/handler/object_relations.hpp
+++ b/contrib/libosmium/include/osmium/handler/object_relations.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/detail/create_map_with_fd.hpp b/contrib/libosmium/include/osmium/index/detail/create_map_with_fd.hpp
index 8870f09b2..876fa1f49 100644
--- a/contrib/libosmium/include/osmium/index/detail/create_map_with_fd.hpp
+++ b/contrib/libosmium/include/osmium/index/detail/create_map_with_fd.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/detail/mmap_vector_anon.hpp b/contrib/libosmium/include/osmium/index/detail/mmap_vector_anon.hpp
index 1b36522c7..4bcf86ef0 100644
--- a/contrib/libosmium/include/osmium/index/detail/mmap_vector_anon.hpp
+++ b/contrib/libosmium/include/osmium/index/detail/mmap_vector_anon.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/detail/mmap_vector_base.hpp b/contrib/libosmium/include/osmium/index/detail/mmap_vector_base.hpp
index a81cde7fb..9e7ba10f7 100644
--- a/contrib/libosmium/include/osmium/index/detail/mmap_vector_base.hpp
+++ b/contrib/libosmium/include/osmium/index/detail/mmap_vector_base.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/detail/mmap_vector_file.hpp b/contrib/libosmium/include/osmium/index/detail/mmap_vector_file.hpp
index f7e18e59c..30aa28707 100644
--- a/contrib/libosmium/include/osmium/index/detail/mmap_vector_file.hpp
+++ b/contrib/libosmium/include/osmium/index/detail/mmap_vector_file.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/detail/tmpfile.hpp b/contrib/libosmium/include/osmium/index/detail/tmpfile.hpp
index 88db24d7d..dc0205f98 100644
--- a/contrib/libosmium/include/osmium/index/detail/tmpfile.hpp
+++ b/contrib/libosmium/include/osmium/index/detail/tmpfile.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/detail/vector_map.hpp b/contrib/libosmium/include/osmium/index/detail/vector_map.hpp
index 550694b98..db4fb999a 100644
--- a/contrib/libosmium/include/osmium/index/detail/vector_map.hpp
+++ b/contrib/libosmium/include/osmium/index/detail/vector_map.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/detail/vector_multimap.hpp b/contrib/libosmium/include/osmium/index/detail/vector_multimap.hpp
index a1a5a7320..adbd19882 100644
--- a/contrib/libosmium/include/osmium/index/detail/vector_multimap.hpp
+++ b/contrib/libosmium/include/osmium/index/detail/vector_multimap.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/id_set.hpp b/contrib/libosmium/include/osmium/index/id_set.hpp
index c5732ea3a..07946662d 100644
--- a/contrib/libosmium/include/osmium/index/id_set.hpp
+++ b/contrib/libosmium/include/osmium/index/id_set.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/index.hpp b/contrib/libosmium/include/osmium/index/index.hpp
index 9ebb4cce6..8da068e11 100644
--- a/contrib/libosmium/include/osmium/index/index.hpp
+++ b/contrib/libosmium/include/osmium/index/index.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/map.hpp b/contrib/libosmium/include/osmium/index/map.hpp
index ff2a54d56..ea26c99cb 100644
--- a/contrib/libosmium/include/osmium/index/map.hpp
+++ b/contrib/libosmium/include/osmium/index/map.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/map/all.hpp b/contrib/libosmium/include/osmium/index/map/all.hpp
index 9f001c30c..28e497d43 100644
--- a/contrib/libosmium/include/osmium/index/map/all.hpp
+++ b/contrib/libosmium/include/osmium/index/map/all.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/map/dense_file_array.hpp b/contrib/libosmium/include/osmium/index/map/dense_file_array.hpp
index 674464589..8de47e7f0 100644
--- a/contrib/libosmium/include/osmium/index/map/dense_file_array.hpp
+++ b/contrib/libosmium/include/osmium/index/map/dense_file_array.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/map/dense_mem_array.hpp b/contrib/libosmium/include/osmium/index/map/dense_mem_array.hpp
index 0a90488a3..ea1999e5a 100644
--- a/contrib/libosmium/include/osmium/index/map/dense_mem_array.hpp
+++ b/contrib/libosmium/include/osmium/index/map/dense_mem_array.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/map/dense_mmap_array.hpp b/contrib/libosmium/include/osmium/index/map/dense_mmap_array.hpp
index 0ee920491..2660c8d46 100644
--- a/contrib/libosmium/include/osmium/index/map/dense_mmap_array.hpp
+++ b/contrib/libosmium/include/osmium/index/map/dense_mmap_array.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/map/dummy.hpp b/contrib/libosmium/include/osmium/index/map/dummy.hpp
index e29322371..b6ebbfbcb 100644
--- a/contrib/libosmium/include/osmium/index/map/dummy.hpp
+++ b/contrib/libosmium/include/osmium/index/map/dummy.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/map/flex_mem.hpp b/contrib/libosmium/include/osmium/index/map/flex_mem.hpp
index b282217b2..770be661c 100644
--- a/contrib/libosmium/include/osmium/index/map/flex_mem.hpp
+++ b/contrib/libosmium/include/osmium/index/map/flex_mem.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/map/sparse_file_array.hpp b/contrib/libosmium/include/osmium/index/map/sparse_file_array.hpp
index 8832682f1..41ac38fd4 100644
--- a/contrib/libosmium/include/osmium/index/map/sparse_file_array.hpp
+++ b/contrib/libosmium/include/osmium/index/map/sparse_file_array.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/map/sparse_mem_array.hpp b/contrib/libosmium/include/osmium/index/map/sparse_mem_array.hpp
index ce0ef9cb7..39bdd34f1 100644
--- a/contrib/libosmium/include/osmium/index/map/sparse_mem_array.hpp
+++ b/contrib/libosmium/include/osmium/index/map/sparse_mem_array.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/map/sparse_mem_map.hpp b/contrib/libosmium/include/osmium/index/map/sparse_mem_map.hpp
index b7b798abb..c03cc6935 100644
--- a/contrib/libosmium/include/osmium/index/map/sparse_mem_map.hpp
+++ b/contrib/libosmium/include/osmium/index/map/sparse_mem_map.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/map/sparse_mmap_array.hpp b/contrib/libosmium/include/osmium/index/map/sparse_mmap_array.hpp
index b616f1921..202ffbba4 100644
--- a/contrib/libosmium/include/osmium/index/map/sparse_mmap_array.hpp
+++ b/contrib/libosmium/include/osmium/index/map/sparse_mmap_array.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/multimap.hpp b/contrib/libosmium/include/osmium/index/multimap.hpp
index 6c72fdcc5..a70d4631c 100644
--- a/contrib/libosmium/include/osmium/index/multimap.hpp
+++ b/contrib/libosmium/include/osmium/index/multimap.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/multimap/all.hpp b/contrib/libosmium/include/osmium/index/multimap/all.hpp
index 439762a74..de7359bc8 100644
--- a/contrib/libosmium/include/osmium/index/multimap/all.hpp
+++ b/contrib/libosmium/include/osmium/index/multimap/all.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/multimap/hybrid.hpp b/contrib/libosmium/include/osmium/index/multimap/hybrid.hpp
index 45e38d954..9311f0c0e 100644
--- a/contrib/libosmium/include/osmium/index/multimap/hybrid.hpp
+++ b/contrib/libosmium/include/osmium/index/multimap/hybrid.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/multimap/sparse_file_array.hpp b/contrib/libosmium/include/osmium/index/multimap/sparse_file_array.hpp
index 38cf5e4cb..ad2268f63 100644
--- a/contrib/libosmium/include/osmium/index/multimap/sparse_file_array.hpp
+++ b/contrib/libosmium/include/osmium/index/multimap/sparse_file_array.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/multimap/sparse_mem_array.hpp b/contrib/libosmium/include/osmium/index/multimap/sparse_mem_array.hpp
index c9a24eb79..34030b3ed 100644
--- a/contrib/libosmium/include/osmium/index/multimap/sparse_mem_array.hpp
+++ b/contrib/libosmium/include/osmium/index/multimap/sparse_mem_array.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/multimap/sparse_mem_multimap.hpp b/contrib/libosmium/include/osmium/index/multimap/sparse_mem_multimap.hpp
index 5899d647a..92c1b1dc8 100644
--- a/contrib/libosmium/include/osmium/index/multimap/sparse_mem_multimap.hpp
+++ b/contrib/libosmium/include/osmium/index/multimap/sparse_mem_multimap.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/multimap/sparse_mmap_array.hpp b/contrib/libosmium/include/osmium/index/multimap/sparse_mmap_array.hpp
index 7d82c3eac..b599a3c57 100644
--- a/contrib/libosmium/include/osmium/index/multimap/sparse_mmap_array.hpp
+++ b/contrib/libosmium/include/osmium/index/multimap/sparse_mmap_array.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/node_locations_map.hpp b/contrib/libosmium/include/osmium/index/node_locations_map.hpp
index 3a1035c49..8c80169be 100644
--- a/contrib/libosmium/include/osmium/index/node_locations_map.hpp
+++ b/contrib/libosmium/include/osmium/index/node_locations_map.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/nwr_array.hpp b/contrib/libosmium/include/osmium/index/nwr_array.hpp
index 001851a11..dc469d55c 100644
--- a/contrib/libosmium/include/osmium/index/nwr_array.hpp
+++ b/contrib/libosmium/include/osmium/index/nwr_array.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/index/relations_map.hpp b/contrib/libosmium/include/osmium/index/relations_map.hpp
index 57a214968..0f993bc5a 100644
--- a/contrib/libosmium/include/osmium/index/relations_map.hpp
+++ b/contrib/libosmium/include/osmium/index/relations_map.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/any_compression.hpp b/contrib/libosmium/include/osmium/io/any_compression.hpp
index ebdb0f87c..e02eee771 100644
--- a/contrib/libosmium/include/osmium/io/any_compression.hpp
+++ b/contrib/libosmium/include/osmium/io/any_compression.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/any_input.hpp b/contrib/libosmium/include/osmium/io/any_input.hpp
index bb625ed8c..3a8f0522e 100644
--- a/contrib/libosmium/include/osmium/io/any_input.hpp
+++ b/contrib/libosmium/include/osmium/io/any_input.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/any_output.hpp b/contrib/libosmium/include/osmium/io/any_output.hpp
index a78fff652..509dd947e 100644
--- a/contrib/libosmium/include/osmium/io/any_output.hpp
+++ b/contrib/libosmium/include/osmium/io/any_output.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/bzip2_compression.hpp b/contrib/libosmium/include/osmium/io/bzip2_compression.hpp
index 99c50cc2a..e1f9e3235 100644
--- a/contrib/libosmium/include/osmium/io/bzip2_compression.hpp
+++ b/contrib/libosmium/include/osmium/io/bzip2_compression.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -109,6 +109,9 @@ namespace osmium {
                 file_wrapper() noexcept = default;
 
                 file_wrapper(const int fd, const char* mode) {
+                    if (fd < 0) {
+                        throw std::system_error{errno, std::system_category(), "file descriptor must be >= 0"};
+                    }
 #ifdef _MSC_VER
                     osmium::detail::disable_invalid_parameter_handler diph;
 #endif
@@ -152,7 +155,7 @@ namespace osmium {
 
                         // Do not close stdout
                         if (fileno(wrapped_file) == 1) {
-                            return;
+                            return; // NOLINT(clang-analyzer-unix.Stream)
                         }
 
                         if (fclose(wrapped_file) != 0) {
@@ -313,7 +316,18 @@ namespace osmium {
                                     throw bzip2_error{"bzip2 error: read open failed", bzerror};
                                 }
                             } else {
-                                m_stream_end = true;
+                                // Close current stream and try to open a new one for multi-stream files
+                                ::BZ2_bzReadClose(&bzerror, m_bzfile);
+                                if (bzerror != BZ_OK) {
+                                    throw bzip2_error{"bzip2 error: read close failed", bzerror};
+                                }
+                                // Try to open a new stream - there might be more bzip2 streams concatenated
+                                m_bzfile = ::BZ2_bzReadOpen(&bzerror, m_file.file(), 0, 0, nullptr, 0);
+                                if (!m_bzfile || bzerror != BZ_OK) {
+                                    // If we can't open a new stream, we've truly reached the end
+                                    m_stream_end = true;
+                                    m_bzfile = nullptr;
+                                }
                             }
                         } else {
                             m_stream_end = true;
diff --git a/contrib/libosmium/include/osmium/io/compression.hpp b/contrib/libosmium/include/osmium/io/compression.hpp
index f21905d34..a49f5157d 100644
--- a/contrib/libosmium/include/osmium/io/compression.hpp
+++ b/contrib/libosmium/include/osmium/io/compression.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -207,6 +207,10 @@ namespace osmium {
                 return m_callbacks.insert(cc).second;
             }
 
+            void clear_register() {
+                m_callbacks.clear();
+            }
+
             template <typename... TArgs>
             std::unique_ptr<osmium::io::Compressor> create_compressor(const osmium::io::file_compression compression, TArgs&&... args) const {
                 const auto callbacks = find_callbacks(compression);
diff --git a/contrib/libosmium/include/osmium/io/debug_output.hpp b/contrib/libosmium/include/osmium/io/debug_output.hpp
index 87bf29d32..e1999014f 100644
--- a/contrib/libosmium/include/osmium/io/debug_output.hpp
+++ b/contrib/libosmium/include/osmium/io/debug_output.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/debug_output_format.hpp b/contrib/libosmium/include/osmium/io/detail/debug_output_format.hpp
index 9767690e9..4fe3c1cd7 100644
--- a/contrib/libosmium/include/osmium/io/detail/debug_output_format.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/debug_output_format.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -106,6 +106,14 @@ namespace osmium {
 
             }; // struct debug_output_options
 
+            // Space needed for printing numbers from 0 to num - 1
+            inline int print_width(std::size_t num) noexcept {
+                if (num <= 10) {
+                    return 1;
+                }
+                return static_cast<int>(std::log10(num - 1)) + 1;
+            }
+
             /**
              * Writes out one buffer with OSM data in Debug format.
              */
@@ -392,7 +400,7 @@ namespace osmium {
                         *m_out += " (open)\n";
                     }
 
-                    const int width = static_cast<int>(std::log10(way.nodes().size())) + 1;
+                    const int width = print_width(way.nodes().size());
                     int n = 0;
                     for (const auto& node_ref : way.nodes()) {
                         write_diff();
@@ -427,7 +435,7 @@ namespace osmium {
                     output_int(relation.members().size());
                     *m_out += '\n';
 
-                    const int width = static_cast<int>(std::log10(relation.members().size())) + 1;
+                    const int width = print_width(relation.members().size());
                     int n = 0;
                     for (const auto& member : relation.members()) {
                         write_diff();
@@ -485,7 +493,7 @@ namespace osmium {
                         output_int(changeset.num_comments());
                         *m_out += '\n';
 
-                        const int width = static_cast<int>(std::log10(changeset.num_comments())) + 1;
+                        const int width = print_width(changeset.num_comments());
                         int n = 0;
                         for (const auto& comment : changeset.discussion()) {
                             write_counter(width, n++);
diff --git a/contrib/libosmium/include/osmium/io/detail/ids_output_format.hpp b/contrib/libosmium/include/osmium/io/detail/ids_output_format.hpp
index 87448280b..6249705a4 100644
--- a/contrib/libosmium/include/osmium/io/detail/ids_output_format.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/ids_output_format.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/input_format.hpp b/contrib/libosmium/include/osmium/io/detail/input_format.hpp
index f16a1b77e..403afb53f 100644
--- a/contrib/libosmium/include/osmium/io/detail/input_format.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/input_format.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/lz4.hpp b/contrib/libosmium/include/osmium/io/detail/lz4.hpp
index 601ffc5af..c8061fdb6 100644
--- a/contrib/libosmium/include/osmium/io/detail/lz4.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/lz4.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/o5m_input_format.hpp b/contrib/libosmium/include/osmium/io/detail/o5m_input_format.hpp
index 2f6995186..f76a367b1 100644
--- a/contrib/libosmium/include/osmium/io/detail/o5m_input_format.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/o5m_input_format.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/opl_input_format.hpp b/contrib/libosmium/include/osmium/io/detail/opl_input_format.hpp
index 568110af2..63a5b4d1c 100644
--- a/contrib/libosmium/include/osmium/io/detail/opl_input_format.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/opl_input_format.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/opl_output_format.hpp b/contrib/libosmium/include/osmium/io/detail/opl_output_format.hpp
index ab5a847b1..9c1723641 100644
--- a/contrib/libosmium/include/osmium/io/detail/opl_output_format.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/opl_output_format.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/opl_parser_functions.hpp b/contrib/libosmium/include/osmium/io/detail/opl_parser_functions.hpp
index 8fb5c3966..3fa5ed430 100644
--- a/contrib/libosmium/include/osmium/io/detail/opl_parser_functions.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/opl_parser_functions.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/output_format.hpp b/contrib/libosmium/include/osmium/io/detail/output_format.hpp
index 3a86d497c..7f648cfcf 100644
--- a/contrib/libosmium/include/osmium/io/detail/output_format.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/output_format.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/pbf.hpp b/contrib/libosmium/include/osmium/io/detail/pbf.hpp
index 0dd5e7550..c6fbcdcc5 100644
--- a/contrib/libosmium/include/osmium/io/detail/pbf.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/pbf.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/pbf_decoder.hpp b/contrib/libosmium/include/osmium/io/detail/pbf_decoder.hpp
index 6f77dda6b..b03cfb2f3 100644
--- a/contrib/libosmium/include/osmium/io/detail/pbf_decoder.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/pbf_decoder.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -81,31 +81,50 @@ namespace osmium {
 
             using protozero::data_view;
 
-            class varint_range {
+            template <typename T>
+            class values_access {
 
                 const char* m_data = nullptr;
                 const char* m_end = nullptr;
+                T m_value = 0;
+                int m_num_values = 0;
+
+            protected:
 
                 std::uint64_t next() {
                     return protozero::decode_varint(&m_data, m_end);
                 }
 
+                bool has_single_value() const noexcept {
+                    return m_num_values > 0;
+                }
+
+                T get_and_clear_value() noexcept {
+                    m_num_values = 0;
+                    return m_value;
+                }
+
             public:
 
-                varint_range() = default;
+                values_access() = default;
 
-                explicit varint_range(const data_view& data) :
+                explicit values_access(const data_view& data) :
                     m_data(data.data()),
                     m_end(data.data() + data.size()) {
                 }
 
+                explicit values_access(T value) :
+                    m_value(value),
+                    m_num_values(1) {
+                }
+
                 bool empty() const noexcept {
-                    return m_data == m_end;
+                    return m_data == m_end && m_num_values == 0;
                 }
 
                 std::size_t size() const noexcept {
                     if (!m_data) {
-                        return 0;
+                        return m_num_values;
                     }
 
                     // We know that each varint contains exactly one byte with the most
@@ -116,23 +135,67 @@ namespace osmium {
                     });
                 }
 
-                std::int32_t next_int32() {
+            }; // class values_access
+
+            class values_access_int32 : public values_access<std::int32_t> {
+
+            public:
+
+                using values_access::values_access;
+
+                int32_t next_int32() {
+                    if (has_single_value()) {
+                        return get_and_clear_value();
+                    }
                     return static_cast<int32_t>(next());
                 }
 
-                std::uint32_t next_uint32() {
+            }; // class values_access_int32
+
+            class values_access_uint32 : public values_access<std::uint32_t> {
+
+            public:
+
+                using values_access::values_access;
+
+                uint32_t next_uint32() {
+                    if (has_single_value()) {
+                        return get_and_clear_value();
+                    }
                     return static_cast<uint32_t>(next());
                 }
 
-                std::int32_t next_sint32() {
+            }; // class values_access_uint32
+
+            class values_access_sint32 : public values_access<std::int32_t> {
+
+            public:
+
+                using values_access::values_access;
+
+                int32_t next_sint32() {
+                    if (has_single_value()) {
+                        return get_and_clear_value();
+                    }
                     return protozero::decode_zigzag32(static_cast<uint32_t>(next()));
                 }
 
-                std::int64_t next_sint64() {
+            }; // class values_access_sint32
+
+            class values_access_sint64 : public values_access<std::int64_t> {
+
+            public:
+
+                using values_access::values_access;
+
+                int64_t next_sint64() {
+                    if (has_single_value()) {
+                        return get_and_clear_value();
+                    }
                     return protozero::decode_zigzag64(next());
                 }
 
-            }; // class varint_range
+            }; // class values_access_sint64
 
             using osm_string_len_type = std::pair<const char*, osmium::string_size_type>;
 
@@ -300,7 +363,7 @@ namespace osmium {
                     return user;
                 }
 
-                void build_tag_list(osmium::builder::Builder& parent, varint_range& keys, varint_range& vals) {
+                void build_tag_list(osmium::builder::Builder& parent, values_access_uint32& keys, values_access_uint32& vals) {
                     if (keys.empty() || vals.empty()) {
                         return;
                     }
@@ -325,8 +388,8 @@ namespace osmium {
                     osmium::builder::NodeBuilder builder{m_buffer};
                     osmium::Node& node = builder.object();
 
-                    varint_range keys;
-                    varint_range vals;
+                    values_access_uint32 keys;
+                    values_access_uint32 vals;
                     int64_t lon = std::numeric_limits<int64_t>::max();
                     int64_t lat = std::numeric_limits<int64_t>::max();
 
@@ -339,10 +402,16 @@ namespace osmium {
                                 node.set_id(pbf_node.get_sint64());
                                 break;
                             case protozero::tag_and_type(OSMFormat::Node::packed_uint32_keys, protozero::pbf_wire_type::length_delimited):
-                                keys = varint_range{pbf_node.get_view()};
+                                keys = values_access_uint32{pbf_node.get_view()};
+                                break;
+                            case protozero::tag_and_type(OSMFormat::Node::packed_uint32_keys, protozero::pbf_wire_type::varint):
+                                keys = values_access_uint32{pbf_node.get_uint32()};
                                 break;
                             case protozero::tag_and_type(OSMFormat::Node::packed_uint32_vals, protozero::pbf_wire_type::length_delimited):
-                                vals = varint_range{pbf_node.get_view()};
+                                vals = values_access_uint32{pbf_node.get_view()};
+                                break;
+                            case protozero::tag_and_type(OSMFormat::Node::packed_uint32_vals, protozero::pbf_wire_type::varint):
+                                vals = values_access_uint32{pbf_node.get_uint32()};
                                 break;
                             case protozero::tag_and_type(OSMFormat::Node::optional_Info_info, protozero::pbf_wire_type::length_delimited):
                                 if (m_read_metadata == osmium::io::read_meta::yes) {
@@ -381,11 +450,11 @@ namespace osmium {
                 void decode_way(const data_view& data) {
                     osmium::builder::WayBuilder builder{m_buffer};
 
-                    varint_range keys;
-                    varint_range vals;
-                    varint_range refs;
-                    varint_range lats;
-                    varint_range lons;
+                    values_access_uint32 keys;
+                    values_access_uint32 vals;
+                    values_access_sint64 refs;
+                    values_access_sint64 lats;
+                    values_access_sint64 lons;
 
                     osm_string_len_type user{"", 0};
 
@@ -396,10 +465,16 @@ namespace osmium {
                                 builder.object().set_id(pbf_way.get_int64());
                                 break;
                             case protozero::tag_and_type(OSMFormat::Way::packed_uint32_keys, protozero::pbf_wire_type::length_delimited):
-                                keys = varint_range{pbf_way.get_view()};
+                                keys = values_access_uint32{pbf_way.get_view()};
+                                break;
+                            case protozero::tag_and_type(OSMFormat::Way::packed_uint32_keys, protozero::pbf_wire_type::varint):
+                                keys = values_access_uint32{pbf_way.get_uint32()};
                                 break;
                             case protozero::tag_and_type(OSMFormat::Way::packed_uint32_vals, protozero::pbf_wire_type::length_delimited):
-                                vals = varint_range{pbf_way.get_view()};
+                                vals = values_access_uint32{pbf_way.get_view()};
+                                break;
+                            case protozero::tag_and_type(OSMFormat::Way::packed_uint32_vals, protozero::pbf_wire_type::varint):
+                                vals = values_access_uint32{pbf_way.get_uint32()};
                                 break;
                             case protozero::tag_and_type(OSMFormat::Way::optional_Info_info, protozero::pbf_wire_type::length_delimited):
                                 if (m_read_metadata == osmium::io::read_meta::yes) {
@@ -409,13 +484,22 @@ namespace osmium {
                                 }
                                 break;
                             case protozero::tag_and_type(OSMFormat::Way::packed_sint64_refs, protozero::pbf_wire_type::length_delimited):
-                                refs = varint_range{pbf_way.get_view()};
+                                refs = values_access_sint64{pbf_way.get_view()};
+                                break;
+                            case protozero::tag_and_type(OSMFormat::Way::packed_sint64_refs, protozero::pbf_wire_type::varint):
+                                refs = values_access_sint64{pbf_way.get_sint64()};
                                 break;
                             case protozero::tag_and_type(OSMFormat::Way::packed_sint64_lat, protozero::pbf_wire_type::length_delimited):
-                                lats = varint_range{pbf_way.get_view()};
+                                lats = values_access_sint64{pbf_way.get_view()};
+                                break;
+                            case protozero::tag_and_type(OSMFormat::Way::packed_sint64_lat, protozero::pbf_wire_type::varint):
+                                lats = values_access_sint64{pbf_way.get_sint64()};
                                 break;
                             case protozero::tag_and_type(OSMFormat::Way::packed_sint64_lon, protozero::pbf_wire_type::length_delimited):
-                                lons = varint_range{pbf_way.get_view()};
+                                lons = values_access_sint64{pbf_way.get_view()};
+                                break;
+                            case protozero::tag_and_type(OSMFormat::Way::packed_sint64_lon, protozero::pbf_wire_type::varint):
+                                lons = values_access_sint64{pbf_way.get_sint64()};
                                 break;
                             default:
                                 pbf_way.skip();
@@ -450,11 +534,11 @@ namespace osmium {
                 void decode_relation(const data_view& data) {
                     osmium::builder::RelationBuilder builder{m_buffer};
 
-                    varint_range keys;
-                    varint_range vals;
-                    varint_range roles;
-                    varint_range refs;
-                    varint_range types;
+                    values_access_uint32 keys;
+                    values_access_uint32 vals;
+                    values_access_int32 roles;
+                    values_access_sint64 refs;
+                    values_access_int32 types;
 
                     osm_string_len_type user{"", 0};
 
@@ -465,10 +549,16 @@ namespace osmium {
                                 builder.object().set_id(pbf_relation.get_int64());
                                 break;
                             case protozero::tag_and_type(OSMFormat::Relation::packed_uint32_keys, protozero::pbf_wire_type::length_delimited):
-                                keys = varint_range{pbf_relation.get_view()};
+                                keys = values_access_uint32{pbf_relation.get_view()};
+                                break;
+                            case protozero::tag_and_type(OSMFormat::Relation::packed_uint32_keys, protozero::pbf_wire_type::varint):
+                                keys = values_access_uint32{pbf_relation.get_uint32()};
                                 break;
                             case protozero::tag_and_type(OSMFormat::Relation::packed_uint32_vals, protozero::pbf_wire_type::length_delimited):
-                                vals = varint_range{pbf_relation.get_view()};
+                                vals = values_access_uint32{pbf_relation.get_view()};
+                                break;
+                            case protozero::tag_and_type(OSMFormat::Relation::packed_uint32_vals, protozero::pbf_wire_type::varint):
+                                vals = values_access_uint32{pbf_relation.get_uint32()};
                                 break;
                             case protozero::tag_and_type(OSMFormat::Relation::optional_Info_info, protozero::pbf_wire_type::length_delimited):
                                 if (m_read_metadata == osmium::io::read_meta::yes) {
@@ -478,13 +568,22 @@ namespace osmium {
                                 }
                                 break;
                             case protozero::tag_and_type(OSMFormat::Relation::packed_int32_roles_sid, protozero::pbf_wire_type::length_delimited):
-                                roles = varint_range{pbf_relation.get_view()};
+                                roles = values_access_int32{pbf_relation.get_view()};
+                                break;
+                            case protozero::tag_and_type(OSMFormat::Relation::packed_int32_roles_sid, protozero::pbf_wire_type::varint):
+                                roles = values_access_int32{pbf_relation.get_int32()};
                                 break;
                             case protozero::tag_and_type(OSMFormat::Relation::packed_sint64_memids, protozero::pbf_wire_type::length_delimited):
-                                refs = varint_range{pbf_relation.get_view()};
+                                refs = values_access_sint64{pbf_relation.get_view()};
+                                break;
+                            case protozero::tag_and_type(OSMFormat::Relation::packed_sint64_memids, protozero::pbf_wire_type::varint):
+                                refs = values_access_sint64{pbf_relation.get_sint64()};
                                 break;
                             case protozero::tag_and_type(OSMFormat::Relation::packed_MemberType_types, protozero::pbf_wire_type::length_delimited):
-                                types = varint_range{pbf_relation.get_view()};
+                                types = values_access_int32{pbf_relation.get_view()};
+                                break;
+                            case protozero::tag_and_type(OSMFormat::Relation::packed_MemberType_types, protozero::pbf_wire_type::varint):
+                                types = values_access_int32{pbf_relation.get_int32()};
                                 break;
                             default:
                                 pbf_relation.skip();
@@ -514,7 +613,7 @@ namespace osmium {
                     build_tag_list(builder, keys, vals);
                 }
 
-                void build_tag_list_from_dense_nodes(osmium::builder::NodeBuilder& builder, varint_range& tags) {
+                void build_tag_list_from_dense_nodes(osmium::builder::NodeBuilder& builder, values_access_int32& tags) {
                     osmium::builder::TagListBuilder tl_builder{builder};
                     while (!tags.empty()) {
                         const auto idx = tags.next_int32();
@@ -531,25 +630,37 @@ namespace osmium {
                 }
 
                 void decode_dense_nodes_without_metadata(const data_view& data) {
-                    varint_range ids;
-                    varint_range lats;
-                    varint_range lons;
-                    varint_range tags;
+                    values_access_sint64 ids;
+                    values_access_sint64 lats;
+                    values_access_sint64 lons;
+                    values_access_int32 tags;
 
                     protozero::pbf_message<OSMFormat::DenseNodes> pbf_dense_nodes{data};
                     while (pbf_dense_nodes.next()) {
                         switch (pbf_dense_nodes.tag_and_type()) {
                             case protozero::tag_and_type(OSMFormat::DenseNodes::packed_sint64_id, protozero::pbf_wire_type::length_delimited):
-                                ids = varint_range{pbf_dense_nodes.get_view()};
+                                ids = values_access_sint64{pbf_dense_nodes.get_view()};
+                                break;
+                            case protozero::tag_and_type(OSMFormat::DenseNodes::packed_sint64_id, protozero::pbf_wire_type::varint):
+                                ids = values_access_sint64{pbf_dense_nodes.get_sint64()};
                                 break;
                             case protozero::tag_and_type(OSMFormat::DenseNodes::packed_sint64_lat, protozero::pbf_wire_type::length_delimited):
-                                lats = varint_range{pbf_dense_nodes.get_view()};
+                                lats = values_access_sint64{pbf_dense_nodes.get_view()};
+                                break;
+                            case protozero::tag_and_type(OSMFormat::DenseNodes::packed_sint64_lat, protozero::pbf_wire_type::varint):
+                                lats = values_access_sint64{pbf_dense_nodes.get_sint64()};
                                 break;
                             case protozero::tag_and_type(OSMFormat::DenseNodes::packed_sint64_lon, protozero::pbf_wire_type::length_delimited):
-                                lons = varint_range{pbf_dense_nodes.get_view()};
+                                lons = values_access_sint64{pbf_dense_nodes.get_view()};
+                                break;
+                            case protozero::tag_and_type(OSMFormat::DenseNodes::packed_sint64_lon, protozero::pbf_wire_type::varint):
+                                lons = values_access_sint64{pbf_dense_nodes.get_sint64()};
                                 break;
                             case protozero::tag_and_type(OSMFormat::DenseNodes::packed_int32_keys_vals, protozero::pbf_wire_type::length_delimited):
-                                tags = varint_range{pbf_dense_nodes.get_view()};
+                                tags = values_access_int32{pbf_dense_nodes.get_view()};
+                                break;
+                            case protozero::tag_and_type(OSMFormat::DenseNodes::packed_int32_keys_vals, protozero::pbf_wire_type::varint):
+                                tags = values_access_int32{pbf_dense_nodes.get_int32()};
                                 break;
                             default:
                                 pbf_dense_nodes.skip();
@@ -592,22 +703,25 @@ namespace osmium {
                 void decode_dense_nodes(const data_view& data) {
                     bool has_info = false;
 
-                    varint_range ids;
-                    varint_range lats;
-                    varint_range lons;
-                    varint_range tags;
-                    varint_range versions;
-                    varint_range timestamps;
-                    varint_range changesets;
-                    varint_range uids;
-                    varint_range user_sids;
-                    varint_range visibles;
+                    values_access_sint64 ids;
+                    values_access_sint64 lats;
+                    values_access_sint64 lons;
+                    values_access_int32 tags;
+                    values_access_int32 versions;
+                    values_access_sint64 timestamps;
+                    values_access_sint64 changesets;
+                    values_access_sint32 uids;
+                    values_access_sint32 user_sids;
+                    values_access_int32 visibles;
 
                     protozero::pbf_message<OSMFormat::DenseNodes> pbf_dense_nodes{data};
                     while (pbf_dense_nodes.next()) {
                         switch (pbf_dense_nodes.tag_and_type()) {
                             case protozero::tag_and_type(OSMFormat::DenseNodes::packed_sint64_id, protozero::pbf_wire_type::length_delimited):
-                                ids = varint_range{pbf_dense_nodes.get_view()};
+                                ids = values_access_sint64{pbf_dense_nodes.get_view()};
+                                break;
+                            case protozero::tag_and_type(OSMFormat::DenseNodes::packed_sint64_id, protozero::pbf_wire_type::varint):
+                                ids = values_access_sint64{pbf_dense_nodes.get_sint64()};
                                 break;
                             case protozero::tag_and_type(OSMFormat::DenseNodes::optional_DenseInfo_denseinfo, protozero::pbf_wire_type::length_delimited):
                                 {
@@ -616,22 +730,40 @@ namespace osmium {
                                     while (pbf_dense_info.next()) {
                                         switch (pbf_dense_info.tag_and_type()) {
                                             case protozero::tag_and_type(OSMFormat::DenseInfo::packed_int32_version, protozero::pbf_wire_type::length_delimited):
-                                                versions = varint_range{pbf_dense_info.get_view()};
+                                                versions = values_access_int32{pbf_dense_info.get_view()};
+                                                break;
+                                            case protozero::tag_and_type(OSMFormat::DenseInfo::packed_int32_version, protozero::pbf_wire_type::varint):
+                                                versions = values_access_int32{pbf_dense_info.get_int32()};
                                                 break;
                                             case protozero::tag_and_type(OSMFormat::DenseInfo::packed_sint64_timestamp, protozero::pbf_wire_type::length_delimited):
-                                                timestamps = varint_range{pbf_dense_info.get_view()};
+                                                timestamps = values_access_sint64{pbf_dense_info.get_view()};
+                                                break;
+                                            case protozero::tag_and_type(OSMFormat::DenseInfo::packed_sint64_timestamp, protozero::pbf_wire_type::varint):
+                                                timestamps = values_access_sint64{pbf_dense_info.get_sint64()};
                                                 break;
                                             case protozero::tag_and_type(OSMFormat::DenseInfo::packed_sint64_changeset, protozero::pbf_wire_type::length_delimited):
-                                                changesets = varint_range{pbf_dense_info.get_view()};
+                                                changesets = values_access_sint64{pbf_dense_info.get_view()};
+                                                break;
+                                            case protozero::tag_and_type(OSMFormat::DenseInfo::packed_sint64_changeset, protozero::pbf_wire_type::varint):
+                                                changesets = values_access_sint64{pbf_dense_info.get_sint64()};
                                                 break;
                                             case protozero::tag_and_type(OSMFormat::DenseInfo::packed_sint32_uid, protozero::pbf_wire_type::length_delimited):
-                                                uids = varint_range{pbf_dense_info.get_view()};
+                                                uids = values_access_sint32{pbf_dense_info.get_view()};
+                                                break;
+                                            case protozero::tag_and_type(OSMFormat::DenseInfo::packed_sint32_uid, protozero::pbf_wire_type::varint):
+                                                uids = values_access_sint32{pbf_dense_info.get_sint32()};
                                                 break;
                                             case protozero::tag_and_type(OSMFormat::DenseInfo::packed_sint32_user_sid, protozero::pbf_wire_type::length_delimited):
-                                                user_sids = varint_range{pbf_dense_info.get_view()};
+                                                user_sids = values_access_sint32{pbf_dense_info.get_view()};
+                                                break;
+                                            case protozero::tag_and_type(OSMFormat::DenseInfo::packed_sint32_user_sid, protozero::pbf_wire_type::varint):
+                                                user_sids = values_access_sint32{pbf_dense_info.get_sint32()};
                                                 break;
                                             case protozero::tag_and_type(OSMFormat::DenseInfo::packed_bool_visible, protozero::pbf_wire_type::length_delimited):
-                                                visibles = varint_range{pbf_dense_info.get_view()};
+                                                visibles = values_access_int32{pbf_dense_info.get_view()};
+                                                break;
+                                            case protozero::tag_and_type(OSMFormat::DenseInfo::packed_bool_visible, protozero::pbf_wire_type::varint):
+                                                visibles = values_access_int32{pbf_dense_info.get_int32()};
                                                 break;
                                             default:
                                                 pbf_dense_info.skip();
@@ -640,13 +772,22 @@ namespace osmium {
                                 }
                                 break;
                             case protozero::tag_and_type(OSMFormat::DenseNodes::packed_sint64_lat, protozero::pbf_wire_type::length_delimited):
-                                lats = varint_range{pbf_dense_nodes.get_view()};
+                                lats = values_access_sint64{pbf_dense_nodes.get_view()};
+                                break;
+                            case protozero::tag_and_type(OSMFormat::DenseNodes::packed_sint64_lat, protozero::pbf_wire_type::varint):
+                                lats = values_access_sint64{pbf_dense_nodes.get_sint64()};
                                 break;
                             case protozero::tag_and_type(OSMFormat::DenseNodes::packed_sint64_lon, protozero::pbf_wire_type::length_delimited):
-                                lons = varint_range{pbf_dense_nodes.get_view()};
+                                lons = values_access_sint64{pbf_dense_nodes.get_view()};
+                                break;
+                            case protozero::tag_and_type(OSMFormat::DenseNodes::packed_sint64_lon, protozero::pbf_wire_type::varint):
+                                lons = values_access_sint64{pbf_dense_nodes.get_sint64()};
                                 break;
                             case protozero::tag_and_type(OSMFormat::DenseNodes::packed_int32_keys_vals, protozero::pbf_wire_type::length_delimited):
-                                tags = varint_range{pbf_dense_nodes.get_view()};
+                                tags = values_access_int32{pbf_dense_nodes.get_view()};
+                                break;
+                            case protozero::tag_and_type(OSMFormat::DenseNodes::packed_int32_keys_vals, protozero::pbf_wire_type::varint):
+                                tags = values_access_int32{pbf_dense_nodes.get_int32()};
                                 break;
                             default:
                                 pbf_dense_nodes.skip();
diff --git a/contrib/libosmium/include/osmium/io/detail/pbf_input_format.hpp b/contrib/libosmium/include/osmium/io/detail/pbf_input_format.hpp
index fc4b70d18..abac957c7 100644
--- a/contrib/libosmium/include/osmium/io/detail/pbf_input_format.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/pbf_input_format.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -124,6 +124,11 @@ namespace osmium {
                         if (!osmium::io::detail::read_exactly(m_fd, buffer.data(), static_cast<unsigned int>(buffer.size()))) {
                             return 0; // EOF
                         }
+
+                        if (m_offset_ptr) {
+                            *m_offset_ptr += buffer.size();
+                        }
+
                         return check_size(get_size_in_network_byte_order(buffer.data()));
                     }
 
@@ -210,6 +215,10 @@ namespace osmium {
                         if (!osmium::io::detail::read_exactly(m_fd, &*buffer.begin(), static_cast<unsigned int>(size))) {
                             throw osmium::pbf_error{"unexpected EOF"};
                         }
+
+                        if (m_offset_ptr) {
+                            *m_offset_ptr += buffer.size();
+                        }
                     } else {
                         ensure_available_in_input_queue(size);
                         buffer.append(m_input_buffer, 0, size);
diff --git a/contrib/libosmium/include/osmium/io/detail/pbf_output_format.hpp b/contrib/libosmium/include/osmium/io/detail/pbf_output_format.hpp
index 4834475c0..05f11c3fc 100644
--- a/contrib/libosmium/include/osmium/io/detail/pbf_output_format.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/pbf_output_format.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/protobuf_tags.hpp b/contrib/libosmium/include/osmium/io/detail/protobuf_tags.hpp
index 50e09fc18..f337aefb3 100644
--- a/contrib/libosmium/include/osmium/io/detail/protobuf_tags.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/protobuf_tags.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/queue_util.hpp b/contrib/libosmium/include/osmium/io/detail/queue_util.hpp
index 5bffb1e00..fc4870661 100644
--- a/contrib/libosmium/include/osmium/io/detail/queue_util.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/queue_util.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/read_thread.hpp b/contrib/libosmium/include/osmium/io/detail/read_thread.hpp
index cf92440df..66e24e4e1 100644
--- a/contrib/libosmium/include/osmium/io/detail/read_thread.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/read_thread.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/read_write.hpp b/contrib/libosmium/include/osmium/io/detail/read_write.hpp
index dffc6e7ec..f4b1913c5 100644
--- a/contrib/libosmium/include/osmium/io/detail/read_write.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/read_write.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -104,6 +104,9 @@ namespace osmium {
 #endif
 
                 if (filename.empty() || filename == "-") {
+#ifdef _WIN32
+                    _setmode(0, _O_BINARY);
+#endif
                     return 0; // stdin
                 }
 
diff --git a/contrib/libosmium/include/osmium/io/detail/string_table.hpp b/contrib/libosmium/include/osmium/io/detail/string_table.hpp
index 5045c8d6c..5854e17ed 100644
--- a/contrib/libosmium/include/osmium/io/detail/string_table.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/string_table.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/string_util.hpp b/contrib/libosmium/include/osmium/io/detail/string_util.hpp
index 381e84aed..038a5194f 100644
--- a/contrib/libosmium/include/osmium/io/detail/string_util.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/string_util.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/write_thread.hpp b/contrib/libosmium/include/osmium/io/detail/write_thread.hpp
index 8f00896d8..166e8cb2d 100644
--- a/contrib/libosmium/include/osmium/io/detail/write_thread.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/write_thread.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/xml_input_format.hpp b/contrib/libosmium/include/osmium/io/detail/xml_input_format.hpp
index bf5e8c61f..fc966a7a8 100644
--- a/contrib/libosmium/include/osmium/io/detail/xml_input_format.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/xml_input_format.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/xml_output_format.hpp b/contrib/libosmium/include/osmium/io/detail/xml_output_format.hpp
index 88a4a0b29..1ba57f2fe 100644
--- a/contrib/libosmium/include/osmium/io/detail/xml_output_format.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/xml_output_format.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/detail/zlib.hpp b/contrib/libosmium/include/osmium/io/detail/zlib.hpp
index 502fe9d35..c0329b597 100644
--- a/contrib/libosmium/include/osmium/io/detail/zlib.hpp
+++ b/contrib/libosmium/include/osmium/io/detail/zlib.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/error.hpp b/contrib/libosmium/include/osmium/io/error.hpp
index eabdcde39..97b94573e 100644
--- a/contrib/libosmium/include/osmium/io/error.hpp
+++ b/contrib/libosmium/include/osmium/io/error.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/file.hpp b/contrib/libosmium/include/osmium/io/file.hpp
index 7c8e6345a..678038015 100644
--- a/contrib/libosmium/include/osmium/io/file.hpp
+++ b/contrib/libosmium/include/osmium/io/file.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/file_compression.hpp b/contrib/libosmium/include/osmium/io/file_compression.hpp
index 79f20e34d..6c6010a0d 100644
--- a/contrib/libosmium/include/osmium/io/file_compression.hpp
+++ b/contrib/libosmium/include/osmium/io/file_compression.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/file_format.hpp b/contrib/libosmium/include/osmium/io/file_format.hpp
index 35fbb46a9..a981866f8 100644
--- a/contrib/libosmium/include/osmium/io/file_format.hpp
+++ b/contrib/libosmium/include/osmium/io/file_format.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/gzip_compression.hpp b/contrib/libosmium/include/osmium/io/gzip_compression.hpp
index ed7fa2b6e..1060bcbbe 100644
--- a/contrib/libosmium/include/osmium/io/gzip_compression.hpp
+++ b/contrib/libosmium/include/osmium/io/gzip_compression.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/header.hpp b/contrib/libosmium/include/osmium/io/header.hpp
index 9c2903111..4e495c45d 100644
--- a/contrib/libosmium/include/osmium/io/header.hpp
+++ b/contrib/libosmium/include/osmium/io/header.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/ids_output.hpp b/contrib/libosmium/include/osmium/io/ids_output.hpp
index fe09c5f59..8caf5b1b0 100644
--- a/contrib/libosmium/include/osmium/io/ids_output.hpp
+++ b/contrib/libosmium/include/osmium/io/ids_output.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/input_iterator.hpp b/contrib/libosmium/include/osmium/io/input_iterator.hpp
index e8196268e..2bd40b6e0 100644
--- a/contrib/libosmium/include/osmium/io/input_iterator.hpp
+++ b/contrib/libosmium/include/osmium/io/input_iterator.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/o5m_input.hpp b/contrib/libosmium/include/osmium/io/o5m_input.hpp
index e2df6fcd0..5d70c77ff 100644
--- a/contrib/libosmium/include/osmium/io/o5m_input.hpp
+++ b/contrib/libosmium/include/osmium/io/o5m_input.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/opl_input.hpp b/contrib/libosmium/include/osmium/io/opl_input.hpp
index bde901863..8641ffd46 100644
--- a/contrib/libosmium/include/osmium/io/opl_input.hpp
+++ b/contrib/libosmium/include/osmium/io/opl_input.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/opl_output.hpp b/contrib/libosmium/include/osmium/io/opl_output.hpp
index 521dac34a..445bf5f19 100644
--- a/contrib/libosmium/include/osmium/io/opl_output.hpp
+++ b/contrib/libosmium/include/osmium/io/opl_output.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/output_iterator.hpp b/contrib/libosmium/include/osmium/io/output_iterator.hpp
index 7aeb75089..84a3ff085 100644
--- a/contrib/libosmium/include/osmium/io/output_iterator.hpp
+++ b/contrib/libosmium/include/osmium/io/output_iterator.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/overwrite.hpp b/contrib/libosmium/include/osmium/io/overwrite.hpp
index 37c011d3e..87132a9ca 100644
--- a/contrib/libosmium/include/osmium/io/overwrite.hpp
+++ b/contrib/libosmium/include/osmium/io/overwrite.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/pbf.hpp b/contrib/libosmium/include/osmium/io/pbf.hpp
index 2205b9de9..96b0c3045 100644
--- a/contrib/libosmium/include/osmium/io/pbf.hpp
+++ b/contrib/libosmium/include/osmium/io/pbf.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/pbf_input.hpp b/contrib/libosmium/include/osmium/io/pbf_input.hpp
index e2a1f2b80..cd5472d18 100644
--- a/contrib/libosmium/include/osmium/io/pbf_input.hpp
+++ b/contrib/libosmium/include/osmium/io/pbf_input.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/pbf_output.hpp b/contrib/libosmium/include/osmium/io/pbf_output.hpp
index 83f1048b0..34ab804d7 100644
--- a/contrib/libosmium/include/osmium/io/pbf_output.hpp
+++ b/contrib/libosmium/include/osmium/io/pbf_output.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/reader.hpp b/contrib/libosmium/include/osmium/io/reader.hpp
index 2e63bc6b1..835279760 100644
--- a/contrib/libosmium/include/osmium/io/reader.hpp
+++ b/contrib/libosmium/include/osmium/io/reader.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/reader_iterator.hpp b/contrib/libosmium/include/osmium/io/reader_iterator.hpp
index 632cbbbe7..c989f3ca3 100644
--- a/contrib/libosmium/include/osmium/io/reader_iterator.hpp
+++ b/contrib/libosmium/include/osmium/io/reader_iterator.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/reader_with_progress_bar.hpp b/contrib/libosmium/include/osmium/io/reader_with_progress_bar.hpp
index 88323488a..d332b667f 100644
--- a/contrib/libosmium/include/osmium/io/reader_with_progress_bar.hpp
+++ b/contrib/libosmium/include/osmium/io/reader_with_progress_bar.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/writer.hpp b/contrib/libosmium/include/osmium/io/writer.hpp
index 52346a379..3a2731923 100644
--- a/contrib/libosmium/include/osmium/io/writer.hpp
+++ b/contrib/libosmium/include/osmium/io/writer.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/writer_options.hpp b/contrib/libosmium/include/osmium/io/writer_options.hpp
index dddb2918e..8e90a3073 100644
--- a/contrib/libosmium/include/osmium/io/writer_options.hpp
+++ b/contrib/libosmium/include/osmium/io/writer_options.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/xml_input.hpp b/contrib/libosmium/include/osmium/io/xml_input.hpp
index 8681a4736..3a90cf528 100644
--- a/contrib/libosmium/include/osmium/io/xml_input.hpp
+++ b/contrib/libosmium/include/osmium/io/xml_input.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/io/xml_output.hpp b/contrib/libosmium/include/osmium/io/xml_output.hpp
index 3110c4317..4b69d9ac1 100644
--- a/contrib/libosmium/include/osmium/io/xml_output.hpp
+++ b/contrib/libosmium/include/osmium/io/xml_output.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/memory/buffer.hpp b/contrib/libosmium/include/osmium/memory/buffer.hpp
index a1fe3c168..6645d555a 100644
--- a/contrib/libosmium/include/osmium/memory/buffer.hpp
+++ b/contrib/libosmium/include/osmium/memory/buffer.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -343,8 +343,8 @@ namespace osmium {
             }
 
             /**
-             * Returns the number of bytes currently filled in this buffer that
-             * are not yet committed.
+             * Returns the number of bytes currently filled in this buffer.
+             * This includes committed and not yet committed bytes.
              * Always returns 0 on invalid buffers.
              */
             std::size_t written() const noexcept {
diff --git a/contrib/libosmium/include/osmium/memory/callback_buffer.hpp b/contrib/libosmium/include/osmium/memory/callback_buffer.hpp
index 4c55b8146..102f43eeb 100644
--- a/contrib/libosmium/include/osmium/memory/callback_buffer.hpp
+++ b/contrib/libosmium/include/osmium/memory/callback_buffer.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/memory/collection.hpp b/contrib/libosmium/include/osmium/memory/collection.hpp
index 01b127dc3..5dab5aaf7 100644
--- a/contrib/libosmium/include/osmium/memory/collection.hpp
+++ b/contrib/libosmium/include/osmium/memory/collection.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -35,6 +35,7 @@ DEALINGS IN THE SOFTWARE.
 
 #include <osmium/memory/item.hpp>
 
+#include <cassert>
 #include <iosfwd>
 #include <iterator>
 #include <type_traits>
diff --git a/contrib/libosmium/include/osmium/memory/item.hpp b/contrib/libosmium/include/osmium/memory/item.hpp
index 19e9e5bcb..fbf1f8a84 100644
--- a/contrib/libosmium/include/osmium/memory/item.hpp
+++ b/contrib/libosmium/include/osmium/memory/item.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/memory/item_iterator.hpp b/contrib/libosmium/include/osmium/memory/item_iterator.hpp
index 132bb8ea2..14de17b44 100644
--- a/contrib/libosmium/include/osmium/memory/item_iterator.hpp
+++ b/contrib/libosmium/include/osmium/memory/item_iterator.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/object_pointer_collection.hpp b/contrib/libosmium/include/osmium/object_pointer_collection.hpp
index 4a03f5a42..50f634a43 100644
--- a/contrib/libosmium/include/osmium/object_pointer_collection.hpp
+++ b/contrib/libosmium/include/osmium/object_pointer_collection.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/opl.hpp b/contrib/libosmium/include/osmium/opl.hpp
index d4d280241..86025b348 100644
--- a/contrib/libosmium/include/osmium/opl.hpp
+++ b/contrib/libosmium/include/osmium/opl.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm.hpp b/contrib/libosmium/include/osmium/osm.hpp
index 23e2b7537..3bded0674 100644
--- a/contrib/libosmium/include/osmium/osm.hpp
+++ b/contrib/libosmium/include/osmium/osm.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/area.hpp b/contrib/libosmium/include/osmium/osm/area.hpp
index 1d3fa603a..5aa4f5f42 100644
--- a/contrib/libosmium/include/osmium/osm/area.hpp
+++ b/contrib/libosmium/include/osmium/osm/area.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/box.hpp b/contrib/libosmium/include/osmium/osm/box.hpp
index 5ad763932..3de1db5dc 100644
--- a/contrib/libosmium/include/osmium/osm/box.hpp
+++ b/contrib/libosmium/include/osmium/osm/box.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/changeset.hpp b/contrib/libosmium/include/osmium/osm/changeset.hpp
index bf9030d96..4a1d8598f 100644
--- a/contrib/libosmium/include/osmium/osm/changeset.hpp
+++ b/contrib/libosmium/include/osmium/osm/changeset.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/crc.hpp b/contrib/libosmium/include/osmium/osm/crc.hpp
index 508e361f6..55f909723 100644
--- a/contrib/libosmium/include/osmium/osm/crc.hpp
+++ b/contrib/libosmium/include/osmium/osm/crc.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/crc_zlib.hpp b/contrib/libosmium/include/osmium/osm/crc_zlib.hpp
index 3b300463a..8297ba00f 100644
--- a/contrib/libosmium/include/osmium/osm/crc_zlib.hpp
+++ b/contrib/libosmium/include/osmium/osm/crc_zlib.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/diff_object.hpp b/contrib/libosmium/include/osmium/osm/diff_object.hpp
index 393234250..5e9f5654e 100644
--- a/contrib/libosmium/include/osmium/osm/diff_object.hpp
+++ b/contrib/libosmium/include/osmium/osm/diff_object.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/entity.hpp b/contrib/libosmium/include/osmium/osm/entity.hpp
index 16534c78b..8515513b8 100644
--- a/contrib/libosmium/include/osmium/osm/entity.hpp
+++ b/contrib/libosmium/include/osmium/osm/entity.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/entity_bits.hpp b/contrib/libosmium/include/osmium/osm/entity_bits.hpp
index f082cd9f9..f1b0d5503 100644
--- a/contrib/libosmium/include/osmium/osm/entity_bits.hpp
+++ b/contrib/libosmium/include/osmium/osm/entity_bits.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -45,6 +45,8 @@ namespace osmium {
      */
     namespace osm_entity_bits {
 
+        // NOLINTBEGIN(clang-analyzer-optin.core.EnumCastOutOfRange)
+
         /**
          * Describes zero or more OSM entities.
          *
@@ -123,6 +125,8 @@ namespace osmium {
             return static_cast<osmium::osm_entity_bits::type>(1U << (ut - 1U));
         }
 
+        // NOLINTEND(clang-analyzer-optin.core.EnumCastOutOfRange)
+
     } // namespace osm_entity_bits
 
 } // namespace osmium
diff --git a/contrib/libosmium/include/osmium/osm/item_type.hpp b/contrib/libosmium/include/osmium/osm/item_type.hpp
index 3556bb4f0..0d462254a 100644
--- a/contrib/libosmium/include/osmium/osm/item_type.hpp
+++ b/contrib/libosmium/include/osmium/osm/item_type.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/location.hpp b/contrib/libosmium/include/osmium/osm/location.hpp
index 2fcf75f30..36072d184 100644
--- a/contrib/libosmium/include/osmium/osm/location.hpp
+++ b/contrib/libosmium/include/osmium/osm/location.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -34,6 +34,7 @@ DEALINGS IN THE SOFTWARE.
 */
 
 #include <algorithm>
+#include <cassert>
 #include <cmath>
 #include <cstdint>
 #include <cstring>
@@ -267,6 +268,13 @@ namespace osmium {
      *
      * Coordinates are never checked on whether they are inside bounds.
      * Call valid() to check this.
+     *
+     * If the macro OSMIUM_LOCATION_WITH_EXTRA_BIT is defined, Location values
+     * can store one extra bit of information, because one bit is not needed
+     * for the y coordinate. Use the functions set/clear/toggle/get_extra_bit()
+     * to access it. The extra bit will always be cleared for new locations or
+     * by setting the y coordinate of a location. You can not store an extra
+     * bit on an invalid location.
      */
     class Location {
 
@@ -277,6 +285,31 @@ namespace osmium {
             return static_cast<double>(detail::coordinate_precision);
         }
 
+#ifdef OSMIUM_LOCATION_WITH_EXTRA_BIT
+
+        /**
+         * For normal y coordinates, bit 30 is always equal to bit 31. So
+         * we can use that to store one extra piece of information.
+         */
+        enum {
+            mask_b30 = 1UL << 30UL
+        };
+
+        static constexpr int32_t remove_extra_bit(int32_t v) noexcept {
+            if (v == undefined_coordinate) {
+                return v;
+            }
+            auto const value = static_cast<uint32_t>(v);
+            auto const n30 = value & ~mask_b30;
+            auto const b30 = (value >> 1UL) & mask_b30;
+            return static_cast<int32_t>(n30 | b30);
+        }
+#else
+        static constexpr int32_t remove_extra_bit(int32_t v) noexcept {
+            return v;
+        }
+#endif
+
     public:
 
         // this value is used for a coordinate to mark it as undefined
@@ -310,7 +343,7 @@ namespace osmium {
          */
         constexpr Location(const int32_t x, const int32_t y) noexcept :
             m_x(x),
-            m_y(y) {
+            m_y(remove_extra_bit(y)) {
         }
 
         /**
@@ -320,7 +353,7 @@ namespace osmium {
          */
         constexpr Location(const int64_t x, const int64_t y) noexcept :
             m_x(static_cast<int32_t>(x)),
-            m_y(static_cast<int32_t>(y)) {
+            m_y(remove_extra_bit(static_cast<int32_t>(y))) {
         }
 
         /**
@@ -329,14 +362,14 @@ namespace osmium {
          */
         Location(const double lon, const double lat) :
             m_x(double_to_fix(lon)),
-            m_y(double_to_fix(lat)) {
+            m_y(remove_extra_bit(double_to_fix(lat))) {
         }
 
         /**
          * Check whether the coordinates of this location
          * are defined.
          *
-         * @deprecated Use is_defined() or is_undefined() or is_valid() which
+         * @deprecated Use is_defined() or is_undefined() or valid() which
          *             have all slightly different meanings.
          */
         explicit constexpr operator bool() const noexcept {
@@ -350,16 +383,16 @@ namespace osmium {
          * See also is_defined() and is_undefined().
          */
         constexpr bool valid() const noexcept {
-            return m_x >= -180 * precision()
-                && m_x <=  180 * precision()
-                && m_y >=  -90 * precision()
-                && m_y <=   90 * precision();
+            return x() >= -180 * precision()
+                && x() <=  180 * precision()
+                && y() >=  -90 * precision()
+                && y() <=   90 * precision();
         }
 
         /**
          * Returns true if at least one of the coordinates is defined.
          *
-         * See also is_undefined() and is_valid().
+         * See also is_undefined() and valid().
          */
         constexpr bool is_defined() const noexcept {
             return m_x != undefined_coordinate || m_y != undefined_coordinate;
@@ -368,7 +401,7 @@ namespace osmium {
         /**
          * Returns true if both coordinates are undefined.
          *
-         * See also is_defined() and is_valid().
+         * See also is_defined() and valid().
          */
         constexpr bool is_undefined() const noexcept {
             return m_x == undefined_coordinate && m_y == undefined_coordinate;
@@ -379,7 +412,7 @@ namespace osmium {
         }
 
         constexpr int32_t y() const noexcept {
-            return m_y;
+            return remove_extra_bit(m_y);
         }
 
         Location& set_x(const int32_t x) noexcept {
@@ -387,8 +420,13 @@ namespace osmium {
             return *this;
         }
 
+        /**
+         * Set the y coordinate of the location.
+         *
+         * This will always clear the extra bit.
+         */
         Location& set_y(const int32_t y) noexcept {
-            m_y = y;
+            m_y = remove_extra_bit(y);
             return *this;
         }
 
@@ -401,14 +439,14 @@ namespace osmium {
             if (!valid()) {
                 throw osmium::invalid_location{"invalid location"};
             }
-            return fix_to_double(m_x);
+            return fix_to_double(x());
         }
 
         /**
          * Get longitude without checking the validity.
          */
         double lon_without_check() const noexcept {
-            return fix_to_double(m_x);
+            return fix_to_double(x());
         }
 
         /**
@@ -420,24 +458,22 @@ namespace osmium {
             if (!valid()) {
                 throw osmium::invalid_location{"invalid location"};
             }
-            return fix_to_double(m_y);
+            return fix_to_double(y());
         }
 
         /**
          * Get latitude without checking the validity.
          */
         double lat_without_check() const noexcept {
-            return fix_to_double(m_y);
+            return fix_to_double(y());
         }
 
         Location& set_lon(double lon) noexcept {
-            m_x = double_to_fix(lon);
-            return *this;
+            return set_x(double_to_fix(lon));
         }
 
         Location& set_lat(double lat) noexcept {
-            m_y = double_to_fix(lat);
-            return *this;
+            return set_y(double_to_fix(lat));
         }
 
         Location& set_lon(const char* str) {
@@ -446,8 +482,7 @@ namespace osmium {
             if (**data != '\0') {
                 throw invalid_location{std::string{"characters after coordinate: '"} + *data + "'"};
             }
-            m_x = value;
-            return *this;
+            return set_x(value);
         }
 
         Location& set_lat(const char* str) {
@@ -456,18 +491,15 @@ namespace osmium {
             if (**data != '\0') {
                 throw invalid_location{std::string{"characters after coordinate: '"} + *data + "'"};
             }
-            m_y = value;
-            return *this;
+            return set_y(value);
         }
 
         Location& set_lon_partial(const char** str) {
-            m_x = detail::string_to_location_coordinate(str);
-            return *this;
+            return set_x(detail::string_to_location_coordinate(str));
         }
 
         Location& set_lat_partial(const char** str) {
-            m_y = detail::string_to_location_coordinate(str);
-            return *this;
+            return set_y(detail::string_to_location_coordinate(str));
         }
 
         template <typename T>
@@ -485,6 +517,73 @@ namespace osmium {
             return as_string_without_check(iterator, separator);
         }
 
+#ifdef OSMIUM_LOCATION_WITH_EXTRA_BIT
+        /**
+         * Get extra bit from location.
+         */
+        constexpr bool get_extra_bit() const noexcept {
+            assert(m_y != undefined_coordinate);
+
+            auto const b = static_cast<uint32_t>(m_y);
+            auto const b31 = b >> 31UL;
+            auto const b30 = (b >> 30UL) & 1UL;
+            return b30 ^ b31;
+        }
+
+        /**
+         * Set extra bit on location.
+         *
+         * @pre valid()
+         */
+        constexpr void set_extra_bit() noexcept {
+            assert(m_y != undefined_coordinate);
+
+            auto const b = static_cast<uint32_t>(m_y);
+            auto const n30 = b & ~mask_b30;
+            auto const b30 = (~b >> 1UL) & mask_b30;
+            m_y = static_cast<int32_t>(n30 | b30);
+        }
+
+        /**
+         * Set or clear extra bit on location.
+         *
+         * @pre valid()
+         */
+        constexpr void set_extra_bit(bool value) noexcept {
+            assert(m_y != undefined_coordinate);
+
+            auto const b = static_cast<uint32_t>(m_y);
+            auto const n30 = b & ~mask_b30;
+            auto const b30 = ((b >> 31UL) ^ value) << 30UL;
+            m_y = static_cast<int32_t>(n30 | b30);
+        }
+
+        /**
+         * Clear extra bit on location.
+         *
+         * @pre valid()
+         */
+        constexpr void clear_extra_bit() noexcept {
+            assert(m_y != undefined_coordinate);
+
+            m_y = y();
+        }
+
+        /**
+         * Toggle extra bit on location.
+         *
+         * @pre valid()
+         */
+        constexpr void toggle_extra_bit() noexcept {
+            assert(m_y != undefined_coordinate);
+
+            auto const b = static_cast<uint32_t>(m_y);
+            auto const n30 = b & ~mask_b30;
+            auto const b30 = ~b & mask_b30;
+            m_y = static_cast<int32_t>(n30 | b30);
+        }
+#endif
+
     }; // class Location
 
     /**
diff --git a/contrib/libosmium/include/osmium/osm/metadata_options.hpp b/contrib/libosmium/include/osmium/osm/metadata_options.hpp
index 85d05fea3..1552886f0 100644
--- a/contrib/libosmium/include/osmium/osm/metadata_options.hpp
+++ b/contrib/libosmium/include/osmium/osm/metadata_options.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -42,6 +42,8 @@ DEALINGS IN THE SOFTWARE.
 
 namespace osmium {
 
+    // NOLINTBEGIN(clang-analyzer-optin.core.EnumCastOutOfRange)
+
     /**
      * Describes which metadata fields are available in an OSMObject. This is
      * most often used to describe which metadata fields are available in the
@@ -219,6 +221,8 @@ namespace osmium {
 
     }; // class metadata_options
 
+    // NOLINTEND(clang-analyzer-optin.core.EnumCastOutOfRange)
+
     template <typename TChar, typename TTraits>
     inline std::basic_ostream<TChar, TTraits>& operator<<(std::basic_ostream<TChar, TTraits>& out, const metadata_options& options) {
         return out << options.to_string();
diff --git a/contrib/libosmium/include/osmium/osm/node.hpp b/contrib/libosmium/include/osmium/osm/node.hpp
index fa3544f66..773a43d18 100644
--- a/contrib/libosmium/include/osmium/osm/node.hpp
+++ b/contrib/libosmium/include/osmium/osm/node.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/node_ref.hpp b/contrib/libosmium/include/osmium/osm/node_ref.hpp
index bb8138f0c..0b33c3ab1 100644
--- a/contrib/libosmium/include/osmium/osm/node_ref.hpp
+++ b/contrib/libosmium/include/osmium/osm/node_ref.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/node_ref_list.hpp b/contrib/libosmium/include/osmium/osm/node_ref_list.hpp
index ba8bbe3e0..a7e495f7d 100644
--- a/contrib/libosmium/include/osmium/osm/node_ref_list.hpp
+++ b/contrib/libosmium/include/osmium/osm/node_ref_list.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/object.hpp b/contrib/libosmium/include/osmium/osm/object.hpp
index 38c17f244..80d93740e 100644
--- a/contrib/libosmium/include/osmium/osm/object.hpp
+++ b/contrib/libosmium/include/osmium/osm/object.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/object_comparisons.hpp b/contrib/libosmium/include/osmium/osm/object_comparisons.hpp
index eff811fd0..96a5ca7ef 100644
--- a/contrib/libosmium/include/osmium/osm/object_comparisons.hpp
+++ b/contrib/libosmium/include/osmium/osm/object_comparisons.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/relation.hpp b/contrib/libosmium/include/osmium/osm/relation.hpp
index c457b5fae..f0eb060c5 100644
--- a/contrib/libosmium/include/osmium/osm/relation.hpp
+++ b/contrib/libosmium/include/osmium/osm/relation.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/segment.hpp b/contrib/libosmium/include/osmium/osm/segment.hpp
index 04598d180..c037c1aaf 100644
--- a/contrib/libosmium/include/osmium/osm/segment.hpp
+++ b/contrib/libosmium/include/osmium/osm/segment.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/tag.hpp b/contrib/libosmium/include/osmium/osm/tag.hpp
index e1538a9ae..40c00dbce 100644
--- a/contrib/libosmium/include/osmium/osm/tag.hpp
+++ b/contrib/libosmium/include/osmium/osm/tag.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/timestamp.hpp b/contrib/libosmium/include/osmium/osm/timestamp.hpp
index f91747448..38a908ff5 100644
--- a/contrib/libosmium/include/osmium/osm/timestamp.hpp
+++ b/contrib/libosmium/include/osmium/osm/timestamp.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/types.hpp b/contrib/libosmium/include/osmium/osm/types.hpp
index 154329d7a..3403f5c61 100644
--- a/contrib/libosmium/include/osmium/osm/types.hpp
+++ b/contrib/libosmium/include/osmium/osm/types.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/types_from_string.hpp b/contrib/libosmium/include/osmium/osm/types_from_string.hpp
index 8471a7f16..b2ee7b84d 100644
--- a/contrib/libosmium/include/osmium/osm/types_from_string.hpp
+++ b/contrib/libosmium/include/osmium/osm/types_from_string.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/undirected_segment.hpp b/contrib/libosmium/include/osmium/osm/undirected_segment.hpp
index ad68e2f0b..2123b3d90 100644
--- a/contrib/libosmium/include/osmium/osm/undirected_segment.hpp
+++ b/contrib/libosmium/include/osmium/osm/undirected_segment.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/osm/way.hpp b/contrib/libosmium/include/osmium/osm/way.hpp
index 71f535910..3fdfcf06f 100644
--- a/contrib/libosmium/include/osmium/osm/way.hpp
+++ b/contrib/libosmium/include/osmium/osm/way.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/relations/collector.hpp b/contrib/libosmium/include/osmium/relations/collector.hpp
index e61574936..4648a92f7 100644
--- a/contrib/libosmium/include/osmium/relations/collector.hpp
+++ b/contrib/libosmium/include/osmium/relations/collector.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/relations/detail/member_meta.hpp b/contrib/libosmium/include/osmium/relations/detail/member_meta.hpp
index 3df887b66..6b467b8de 100644
--- a/contrib/libosmium/include/osmium/relations/detail/member_meta.hpp
+++ b/contrib/libosmium/include/osmium/relations/detail/member_meta.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/relations/detail/relation_meta.hpp b/contrib/libosmium/include/osmium/relations/detail/relation_meta.hpp
index 87678a70f..6bc6fc277 100644
--- a/contrib/libosmium/include/osmium/relations/detail/relation_meta.hpp
+++ b/contrib/libosmium/include/osmium/relations/detail/relation_meta.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/relations/manager_util.hpp b/contrib/libosmium/include/osmium/relations/manager_util.hpp
index 929c97dd5..94bd45b9a 100644
--- a/contrib/libosmium/include/osmium/relations/manager_util.hpp
+++ b/contrib/libosmium/include/osmium/relations/manager_util.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/relations/members_database.hpp b/contrib/libosmium/include/osmium/relations/members_database.hpp
index 1702658de..b743edffa 100644
--- a/contrib/libosmium/include/osmium/relations/members_database.hpp
+++ b/contrib/libosmium/include/osmium/relations/members_database.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/relations/relations_database.hpp b/contrib/libosmium/include/osmium/relations/relations_database.hpp
index e31d237e0..2fd01b27d 100644
--- a/contrib/libosmium/include/osmium/relations/relations_database.hpp
+++ b/contrib/libosmium/include/osmium/relations/relations_database.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/relations/relations_manager.hpp b/contrib/libosmium/include/osmium/relations/relations_manager.hpp
index 1bee78cce..d62933ccd 100644
--- a/contrib/libosmium/include/osmium/relations/relations_manager.hpp
+++ b/contrib/libosmium/include/osmium/relations/relations_manager.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/storage/item_stash.hpp b/contrib/libosmium/include/osmium/storage/item_stash.hpp
index e42836df9..a9a0142fb 100644
--- a/contrib/libosmium/include/osmium/storage/item_stash.hpp
+++ b/contrib/libosmium/include/osmium/storage/item_stash.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/tags/filter.hpp b/contrib/libosmium/include/osmium/tags/filter.hpp
index 45c5e6d6b..d061c0716 100644
--- a/contrib/libosmium/include/osmium/tags/filter.hpp
+++ b/contrib/libosmium/include/osmium/tags/filter.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/tags/matcher.hpp b/contrib/libosmium/include/osmium/tags/matcher.hpp
index 50eb110c8..0746a5468 100644
--- a/contrib/libosmium/include/osmium/tags/matcher.hpp
+++ b/contrib/libosmium/include/osmium/tags/matcher.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/tags/taglist.hpp b/contrib/libosmium/include/osmium/tags/taglist.hpp
index d5ec309a3..b61afa040 100644
--- a/contrib/libosmium/include/osmium/tags/taglist.hpp
+++ b/contrib/libosmium/include/osmium/tags/taglist.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/tags/tags_filter.hpp b/contrib/libosmium/include/osmium/tags/tags_filter.hpp
index 61d20e20c..608c1e878 100644
--- a/contrib/libosmium/include/osmium/tags/tags_filter.hpp
+++ b/contrib/libosmium/include/osmium/tags/tags_filter.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -154,6 +154,49 @@ namespace osmium {
 
     using TagsFilter = TagsFilterBase<bool>;
 
+    /**
+     * Compare two lists of tags ignoring tags matching the filter.
+     * Tag lists must be ordered in a consistent way.
+     * The filter must return "false" for all tags that should be ignored.
+     */
+    inline bool compare_tags(osmium::TagList const &tags1,
+                             osmium::TagList const &tags2,
+                             TagsFilter const &filter)
+    {
+        auto const end1 = tags1.cend();
+        auto const end2 = tags2.cend();
+
+        auto it1 = tags1.cbegin();
+        auto it2 = tags2.cbegin();
+
+        while (it1 != end1 && it2 != end2) {
+            if (!filter(*it1)) {
+                ++it1;
+                continue;
+            }
+            if (!filter(*it2)) {
+                ++it2;
+                continue;
+            }
+            if (*it1 == *it2) {
+                ++it1;
+                ++it2;
+                continue;
+            }
+            return false;
+        }
+
+        while (it1 != end1 && !filter(*it1)) {
+            ++it1;
+        }
+
+        while (it2 != end2 && !filter(*it2)) {
+            ++it2;
+        }
+
+        return it1 == end1 && it2 == end2;
+    }
+
 } // namespace osmium
 
 
diff --git a/contrib/libosmium/include/osmium/thread/function_wrapper.hpp b/contrib/libosmium/include/osmium/thread/function_wrapper.hpp
index d0ec3509d..0c1110155 100644
--- a/contrib/libosmium/include/osmium/thread/function_wrapper.hpp
+++ b/contrib/libosmium/include/osmium/thread/function_wrapper.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/thread/pool.hpp b/contrib/libosmium/include/osmium/thread/pool.hpp
index 059f761d3..de5f2716a 100644
--- a/contrib/libosmium/include/osmium/thread/pool.hpp
+++ b/contrib/libosmium/include/osmium/thread/pool.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/thread/queue.hpp b/contrib/libosmium/include/osmium/thread/queue.hpp
index 950b60227..574bef0b9 100644
--- a/contrib/libosmium/include/osmium/thread/queue.hpp
+++ b/contrib/libosmium/include/osmium/thread/queue.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/thread/util.hpp b/contrib/libosmium/include/osmium/thread/util.hpp
index 0817d93e1..9244f1e2c 100644
--- a/contrib/libosmium/include/osmium/thread/util.hpp
+++ b/contrib/libosmium/include/osmium/thread/util.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/compatibility.hpp b/contrib/libosmium/include/osmium/util/compatibility.hpp
index 1b6ac56d1..be7ac6399 100644
--- a/contrib/libosmium/include/osmium/util/compatibility.hpp
+++ b/contrib/libosmium/include/osmium/util/compatibility.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/config.hpp b/contrib/libosmium/include/osmium/util/config.hpp
index eaa887848..6ac37bee8 100644
--- a/contrib/libosmium/include/osmium/util/config.hpp
+++ b/contrib/libosmium/include/osmium/util/config.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/delta.hpp b/contrib/libosmium/include/osmium/util/delta.hpp
index 6033e6474..8a2eb672c 100644
--- a/contrib/libosmium/include/osmium/util/delta.hpp
+++ b/contrib/libosmium/include/osmium/util/delta.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/double.hpp b/contrib/libosmium/include/osmium/util/double.hpp
index 4e8dfb90b..01746dd44 100644
--- a/contrib/libosmium/include/osmium/util/double.hpp
+++ b/contrib/libosmium/include/osmium/util/double.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/endian.hpp b/contrib/libosmium/include/osmium/util/endian.hpp
index 17be6a2ff..e48e9aa51 100644
--- a/contrib/libosmium/include/osmium/util/endian.hpp
+++ b/contrib/libosmium/include/osmium/util/endian.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/file.hpp b/contrib/libosmium/include/osmium/util/file.hpp
index 1d7737e0c..20bfd1dfd 100644
--- a/contrib/libosmium/include/osmium/util/file.hpp
+++ b/contrib/libosmium/include/osmium/util/file.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/iterator.hpp b/contrib/libosmium/include/osmium/util/iterator.hpp
index 8fcb497e3..5236e8963 100644
--- a/contrib/libosmium/include/osmium/util/iterator.hpp
+++ b/contrib/libosmium/include/osmium/util/iterator.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/memory.hpp b/contrib/libosmium/include/osmium/util/memory.hpp
index 7ccb388c5..72cd4cc0f 100644
--- a/contrib/libosmium/include/osmium/util/memory.hpp
+++ b/contrib/libosmium/include/osmium/util/memory.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/memory_mapping.hpp b/contrib/libosmium/include/osmium/util/memory_mapping.hpp
index 38ca38ed7..7a73137e9 100644
--- a/contrib/libosmium/include/osmium/util/memory_mapping.hpp
+++ b/contrib/libosmium/include/osmium/util/memory_mapping.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/minmax.hpp b/contrib/libosmium/include/osmium/util/minmax.hpp
index 1f0931d4d..552ecd250 100644
--- a/contrib/libosmium/include/osmium/util/minmax.hpp
+++ b/contrib/libosmium/include/osmium/util/minmax.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/misc.hpp b/contrib/libosmium/include/osmium/util/misc.hpp
index 824e57131..4cdef5e87 100644
--- a/contrib/libosmium/include/osmium/util/misc.hpp
+++ b/contrib/libosmium/include/osmium/util/misc.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/options.hpp b/contrib/libosmium/include/osmium/util/options.hpp
index a31d9084a..5ff71506b 100644
--- a/contrib/libosmium/include/osmium/util/options.hpp
+++ b/contrib/libosmium/include/osmium/util/options.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/progress_bar.hpp b/contrib/libosmium/include/osmium/util/progress_bar.hpp
index 2329bdaa8..394ee8d8d 100644
--- a/contrib/libosmium/include/osmium/util/progress_bar.hpp
+++ b/contrib/libosmium/include/osmium/util/progress_bar.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/string.hpp b/contrib/libosmium/include/osmium/util/string.hpp
index 2a1557e83..c2474d345 100644
--- a/contrib/libosmium/include/osmium/util/string.hpp
+++ b/contrib/libosmium/include/osmium/util/string.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/string_matcher.hpp b/contrib/libosmium/include/osmium/util/string_matcher.hpp
index 1d11e1926..0f2fb8def 100644
--- a/contrib/libosmium/include/osmium/util/string_matcher.hpp
+++ b/contrib/libosmium/include/osmium/util/string_matcher.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/timer.hpp b/contrib/libosmium/include/osmium/util/timer.hpp
index 312c34536..0db68e9ea 100644
--- a/contrib/libosmium/include/osmium/util/timer.hpp
+++ b/contrib/libosmium/include/osmium/util/timer.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/util/verbose_output.hpp b/contrib/libosmium/include/osmium/util/verbose_output.hpp
index cfc774307..246033f72 100644
--- a/contrib/libosmium/include/osmium/util/verbose_output.hpp
+++ b/contrib/libosmium/include/osmium/util/verbose_output.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/contrib/libosmium/include/osmium/version.hpp b/contrib/libosmium/include/osmium/version.hpp
index 585f999e2..549cca1b0 100644
--- a/contrib/libosmium/include/osmium/version.hpp
+++ b/contrib/libosmium/include/osmium/version.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -37,11 +37,11 @@ DEALINGS IN THE SOFTWARE.
 #define LIBOSMIUM_VERSION_MAJOR 2
 
 // NOLINTNEXTLINE(modernize-macro-to-enum)
-#define LIBOSMIUM_VERSION_MINOR 22
+#define LIBOSMIUM_VERSION_MINOR 23
 
 // NOLINTNEXTLINE(modernize-macro-to-enum)
 #define LIBOSMIUM_VERSION_PATCH 0
 
-#define LIBOSMIUM_VERSION_STRING "2.22.0"
+#define LIBOSMIUM_VERSION_STRING "2.23.0"
 
 #endif // OSMIUM_VERSION_HPP
diff --git a/contrib/libosmium/include/osmium/visitor.hpp b/contrib/libosmium/include/osmium/visitor.hpp
index fdd5ce1c7..174a940bd 100644
--- a/contrib/libosmium/include/osmium/visitor.hpp
+++ b/contrib/libosmium/include/osmium/visitor.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2026 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 

From cd506fa20da2abeacd9f1d588025bedd415cb7f4 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 29 Jan 2026 16:31:21 +0100
Subject: [PATCH 409/430] Update copyright year

---
 man/manpage_from_python.py                       | 2 +-
 scripts/osm2pgsql-replication                    | 2 +-
 scripts/osm2pgsql-test-style                     | 2 +-
 src/command-line-app.cpp                         | 2 +-
 src/command-line-app.hpp                         | 2 +-
 src/command-line-parser.cpp                      | 2 +-
 src/command-line-parser.hpp                      | 2 +-
 src/db-copy-mgr.hpp                              | 2 +-
 src/db-copy.cpp                                  | 2 +-
 src/db-copy.hpp                                  | 2 +-
 src/debug-output.cpp                             | 2 +-
 src/debug-output.hpp                             | 2 +-
 src/expire-config.hpp                            | 2 +-
 src/expire-output.cpp                            | 2 +-
 src/expire-output.hpp                            | 2 +-
 src/expire-tiles.cpp                             | 2 +-
 src/expire-tiles.hpp                             | 2 +-
 src/flex-index.cpp                               | 2 +-
 src/flex-index.hpp                               | 2 +-
 src/flex-lua-expire-output.cpp                   | 2 +-
 src/flex-lua-expire-output.hpp                   | 2 +-
 src/flex-lua-geom.cpp                            | 2 +-
 src/flex-lua-geom.hpp                            | 2 +-
 src/flex-lua-index.cpp                           | 2 +-
 src/flex-lua-index.hpp                           | 2 +-
 src/flex-lua-locator.cpp                         | 2 +-
 src/flex-lua-locator.hpp                         | 2 +-
 src/flex-lua-table.cpp                           | 2 +-
 src/flex-lua-table.hpp                           | 2 +-
 src/flex-lua-wrapper.hpp                         | 2 +-
 src/flex-table-column.cpp                        | 2 +-
 src/flex-table-column.hpp                        | 2 +-
 src/flex-table.cpp                               | 2 +-
 src/flex-table.hpp                               | 2 +-
 src/flex-write.cpp                               | 2 +-
 src/flex-write.hpp                               | 2 +-
 src/format.hpp                                   | 2 +-
 src/gen/canvas.cpp                               | 2 +-
 src/gen/canvas.hpp                               | 2 +-
 src/gen/gen-base.cpp                             | 2 +-
 src/gen/gen-base.hpp                             | 2 +-
 src/gen/gen-create.cpp                           | 2 +-
 src/gen/gen-create.hpp                           | 2 +-
 src/gen/gen-discrete-isolation.cpp               | 2 +-
 src/gen/gen-discrete-isolation.hpp               | 2 +-
 src/gen/gen-rivers.cpp                           | 2 +-
 src/gen/gen-rivers.hpp                           | 2 +-
 src/gen/gen-tile-builtup.cpp                     | 2 +-
 src/gen/gen-tile-builtup.hpp                     | 2 +-
 src/gen/gen-tile-raster.cpp                      | 2 +-
 src/gen/gen-tile-raster.hpp                      | 2 +-
 src/gen/gen-tile-sql.cpp                         | 2 +-
 src/gen/gen-tile-sql.hpp                         | 2 +-
 src/gen/gen-tile-vector.cpp                      | 2 +-
 src/gen/gen-tile-vector.hpp                      | 2 +-
 src/gen/gen-tile.cpp                             | 2 +-
 src/gen/gen-tile.hpp                             | 2 +-
 src/gen/osm2pgsql-gen.cpp                        | 2 +-
 src/gen/raster.cpp                               | 2 +-
 src/gen/raster.hpp                               | 2 +-
 src/gen/tracer.cpp                               | 2 +-
 src/gen/tracer.hpp                               | 2 +-
 src/geom-area-assembler.cpp                      | 2 +-
 src/geom-area-assembler.hpp                      | 2 +-
 src/geom-boost-adaptor.hpp                       | 2 +-
 src/geom-box.cpp                                 | 2 +-
 src/geom-box.hpp                                 | 2 +-
 src/geom-from-osm.cpp                            | 2 +-
 src/geom-from-osm.hpp                            | 2 +-
 src/geom-functions.cpp                           | 2 +-
 src/geom-functions.hpp                           | 2 +-
 src/geom-output.hpp                              | 2 +-
 src/geom-pole-of-inaccessibility.cpp             | 2 +-
 src/geom-pole-of-inaccessibility.hpp             | 2 +-
 src/geom.cpp                                     | 2 +-
 src/geom.hpp                                     | 2 +-
 src/hex.cpp                                      | 2 +-
 src/hex.hpp                                      | 2 +-
 src/idlist.cpp                                   | 2 +-
 src/idlist.hpp                                   | 2 +-
 src/input.cpp                                    | 2 +-
 src/input.hpp                                    | 2 +-
 src/json-writer.hpp                              | 2 +-
 src/locator.cpp                                  | 2 +-
 src/locator.hpp                                  | 2 +-
 src/logging.cpp                                  | 2 +-
 src/logging.hpp                                  | 2 +-
 src/lua-init.hpp                                 | 2 +-
 src/lua-setup.cpp                                | 2 +-
 src/lua-setup.hpp                                | 2 +-
 src/lua-utils.cpp                                | 2 +-
 src/lua-utils.hpp                                | 2 +-
 src/middle-pgsql.cpp                             | 2 +-
 src/middle-pgsql.hpp                             | 2 +-
 src/middle-ram.cpp                               | 2 +-
 src/middle-ram.hpp                               | 2 +-
 src/middle.cpp                                   | 2 +-
 src/middle.hpp                                   | 2 +-
 src/node-locations.cpp                           | 2 +-
 src/node-locations.hpp                           | 2 +-
 src/node-persistent-cache.cpp                    | 2 +-
 src/node-persistent-cache.hpp                    | 2 +-
 src/options.hpp                                  | 2 +-
 src/ordered-index.cpp                            | 2 +-
 src/ordered-index.hpp                            | 2 +-
 src/osm2pgsql-expire.cpp                         | 2 +-
 src/osm2pgsql.cpp                                | 2 +-
 src/osmdata.cpp                                  | 2 +-
 src/osmdata.hpp                                  | 2 +-
 src/osmtypes.hpp                                 | 2 +-
 src/output-flex.cpp                              | 2 +-
 src/output-flex.hpp                              | 2 +-
 src/output-null.cpp                              | 2 +-
 src/output-null.hpp                              | 2 +-
 src/output-pgsql.cpp                             | 2 +-
 src/output-pgsql.hpp                             | 2 +-
 src/output-requirements.hpp                      | 2 +-
 src/output.cpp                                   | 2 +-
 src/output.hpp                                   | 2 +-
 src/overloaded.hpp                               | 2 +-
 src/params.cpp                                   | 2 +-
 src/params.hpp                                   | 2 +-
 src/pgsql-capabilities-int.hpp                   | 2 +-
 src/pgsql-capabilities.cpp                       | 2 +-
 src/pgsql-capabilities.hpp                       | 2 +-
 src/pgsql-helper.cpp                             | 2 +-
 src/pgsql-helper.hpp                             | 2 +-
 src/pgsql-params.hpp                             | 2 +-
 src/pgsql.cpp                                    | 2 +-
 src/pgsql.hpp                                    | 2 +-
 src/progress-display.cpp                         | 2 +-
 src/progress-display.hpp                         | 2 +-
 src/projection.hpp                               | 2 +-
 src/properties.cpp                               | 2 +-
 src/properties.hpp                               | 2 +-
 src/reprojection-generic-none.cpp                | 2 +-
 src/reprojection.cpp                             | 2 +-
 src/reprojection.hpp                             | 2 +-
 src/table.cpp                                    | 2 +-
 src/table.hpp                                    | 2 +-
 src/taginfo-impl.hpp                             | 2 +-
 src/taginfo.cpp                                  | 2 +-
 src/taginfo.hpp                                  | 2 +-
 src/tagtransform-c.cpp                           | 2 +-
 src/tagtransform-c.hpp                           | 2 +-
 src/tagtransform-lua.cpp                         | 2 +-
 src/tagtransform-lua.hpp                         | 2 +-
 src/tagtransform.cpp                             | 2 +-
 src/tagtransform.hpp                             | 2 +-
 src/template.cpp                                 | 2 +-
 src/template.hpp                                 | 2 +-
 src/thread-pool.cpp                              | 2 +-
 src/thread-pool.hpp                              | 2 +-
 src/tile-output.hpp                              | 2 +-
 src/tile.cpp                                     | 2 +-
 src/tile.hpp                                     | 2 +-
 src/util.cpp                                     | 2 +-
 src/util.hpp                                     | 2 +-
 src/version.cpp.in                               | 2 +-
 src/version.hpp                                  | 2 +-
 src/wildcmp.cpp                                  | 2 +-
 src/wildcmp.hpp                                  | 2 +-
 src/wkb.cpp                                      | 2 +-
 src/wkb.hpp                                      | 2 +-
 tests/catch-main.cpp                             | 2 +-
 tests/common-buffer.hpp                          | 2 +-
 tests/common-cleanup.hpp                         | 2 +-
 tests/common-import.hpp                          | 2 +-
 tests/common-options.hpp                         | 2 +-
 tests/common-pg.hpp                              | 2 +-
 tests/test-check-input.cpp                       | 2 +-
 tests/test-db-copy-mgr.cpp                       | 2 +-
 tests/test-db-copy-thread.cpp                    | 2 +-
 tests/test-expire-from-geometry.cpp              | 2 +-
 tests/test-expire-tiles.cpp                      | 2 +-
 tests/test-flex-indexes.cpp                      | 2 +-
 tests/test-geom-box.cpp                          | 2 +-
 tests/test-geom-collections.cpp                  | 2 +-
 tests/test-geom-linestrings.cpp                  | 2 +-
 tests/test-geom-multilinestrings.cpp             | 2 +-
 tests/test-geom-multipoints.cpp                  | 2 +-
 tests/test-geom-multipolygons.cpp                | 2 +-
 tests/test-geom-null.cpp                         | 2 +-
 tests/test-geom-output.cpp                       | 2 +-
 tests/test-geom-points.cpp                       | 2 +-
 tests/test-geom-pole-of-inaccessibility.cpp      | 2 +-
 tests/test-geom-polygons.cpp                     | 2 +-
 tests/test-geom-transform.cpp                    | 2 +-
 tests/test-hex.cpp                               | 2 +-
 tests/test-json-writer.cpp                       | 2 +-
 tests/test-locator.cpp                           | 2 +-
 tests/test-lua-utils.cpp                         | 2 +-
 tests/test-middle.cpp                            | 2 +-
 tests/test-node-locations.cpp                    | 2 +-
 tests/test-options-parse.cpp                     | 2 +-
 tests/test-options-projection.cpp                | 2 +-
 tests/test-ordered-index.cpp                     | 2 +-
 tests/test-osm-file-parsing.cpp                  | 2 +-
 tests/test-output-flex-example-configs.cpp       | 2 +-
 tests/test-output-flex-multi-input.cpp           | 2 +-
 tests/test-output-flex-nodes.cpp                 | 2 +-
 tests/test-output-flex-relation-combinations.cpp | 2 +-
 tests/test-output-flex-relations.cpp             | 2 +-
 tests/test-output-flex-schema.cpp                | 2 +-
 tests/test-output-flex-stage2.cpp                | 2 +-
 tests/test-output-flex-tablespace.cpp            | 2 +-
 tests/test-output-flex-types.cpp                 | 2 +-
 tests/test-output-flex-uni.cpp                   | 2 +-
 tests/test-output-flex-update.cpp                | 2 +-
 tests/test-output-flex-validgeom.cpp             | 2 +-
 tests/test-output-flex.cpp                       | 2 +-
 tests/test-output-pgsql-area.cpp                 | 2 +-
 tests/test-output-pgsql-hstore-match-only.cpp    | 2 +-
 tests/test-output-pgsql-int4.cpp                 | 2 +-
 tests/test-output-pgsql-schema.cpp               | 2 +-
 tests/test-output-pgsql-style-file.cpp           | 2 +-
 tests/test-output-pgsql-tablespace.cpp           | 2 +-
 tests/test-output-pgsql-validgeom.cpp            | 2 +-
 tests/test-output-pgsql-z_order.cpp              | 2 +-
 tests/test-output-pgsql.cpp                      | 2 +-
 tests/test-params.cpp                            | 2 +-
 tests/test-persistent-cache.cpp                  | 2 +-
 tests/test-pgsql-capabilities.cpp                | 2 +-
 tests/test-pgsql.cpp                             | 2 +-
 tests/test-properties.cpp                        | 2 +-
 tests/test-reprojection.cpp                      | 2 +-
 tests/test-taginfo.cpp                           | 2 +-
 tests/test-tile.cpp                              | 2 +-
 tests/test-util.cpp                              | 2 +-
 tests/test-wildcard-match.cpp                    | 2 +-
 tests/test-wkb.cpp                               | 2 +-
 231 files changed, 231 insertions(+), 231 deletions(-)

diff --git a/man/manpage_from_python.py b/man/manpage_from_python.py
index b41b4c2a7..182932713 100644
--- a/man/manpage_from_python.py
+++ b/man/manpage_from_python.py
@@ -2,7 +2,7 @@
 #
 # This file is part of osm2pgsql (https://osm2pgsql.org/).
 #
-# Copyright (C) 2006-2025 by the osm2pgsql developer community.
+# Copyright (C) 2006-2026 by the osm2pgsql developer community.
 # For a full list of authors see the git log.
 """ Create a man page for osm2pgsql helper scripts in python.
 """
diff --git a/scripts/osm2pgsql-replication b/scripts/osm2pgsql-replication
index 5f9120c20..2b68efb90 100755
--- a/scripts/osm2pgsql-replication
+++ b/scripts/osm2pgsql-replication
@@ -4,7 +4,7 @@
 #
 # This file is part of osm2pgsql (https://osm2pgsql.org/).
 #
-# Copyright (C) 2006-2025 by the osm2pgsql developer community.
+# Copyright (C) 2006-2026 by the osm2pgsql developer community.
 # For a full list of authors see the git log.
 
 """
diff --git a/scripts/osm2pgsql-test-style b/scripts/osm2pgsql-test-style
index 3dea64198..b173e2d0c 100755
--- a/scripts/osm2pgsql-test-style
+++ b/scripts/osm2pgsql-test-style
@@ -4,7 +4,7 @@
 #
 # This file is part of osm2pgsql (https://osm2pgsql.org/).
 #
-# Copyright (C) 2025 by the osm2pgsql developer community.
+# Copyright (C) 2025-2026 by the osm2pgsql developer community.
 # For a full list of authors see the git log.
 """
 Test runner for BDD-style integration tests.
diff --git a/src/command-line-app.cpp b/src/command-line-app.cpp
index b07a607fe..f038f1ff1 100644
--- a/src/command-line-app.cpp
+++ b/src/command-line-app.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/command-line-app.hpp b/src/command-line-app.hpp
index 89ae7005b..c43a23f90 100644
--- a/src/command-line-app.hpp
+++ b/src/command-line-app.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index d757b7462..a89370d73 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/command-line-parser.hpp b/src/command-line-parser.hpp
index 0f481d5b2..2932d60dc 100644
--- a/src/command-line-parser.hpp
+++ b/src/command-line-parser.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/db-copy-mgr.hpp b/src/db-copy-mgr.hpp
index 5e7fdd69f..a92af7388 100644
--- a/src/db-copy-mgr.hpp
+++ b/src/db-copy-mgr.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/db-copy.cpp b/src/db-copy.cpp
index 300be9bd2..1a7dedec5 100644
--- a/src/db-copy.cpp
+++ b/src/db-copy.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/db-copy.hpp b/src/db-copy.hpp
index 6cda44368..3a9d3f05e 100644
--- a/src/db-copy.hpp
+++ b/src/db-copy.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/debug-output.cpp b/src/debug-output.cpp
index 17218ddf4..6e90fdf0e 100644
--- a/src/debug-output.cpp
+++ b/src/debug-output.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/debug-output.hpp b/src/debug-output.hpp
index 204d71c9f..7b4662767 100644
--- a/src/debug-output.hpp
+++ b/src/debug-output.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/expire-config.hpp b/src/expire-config.hpp
index 2ce64fd57..c4ae83b49 100644
--- a/src/expire-config.hpp
+++ b/src/expire-config.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/expire-output.cpp b/src/expire-output.cpp
index bd2f822d4..737e059f3 100644
--- a/src/expire-output.cpp
+++ b/src/expire-output.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/expire-output.hpp b/src/expire-output.hpp
index c25033d96..59de5f3fb 100644
--- a/src/expire-output.hpp
+++ b/src/expire-output.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/expire-tiles.cpp b/src/expire-tiles.cpp
index b348cbeb8..0686804ea 100644
--- a/src/expire-tiles.cpp
+++ b/src/expire-tiles.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/expire-tiles.hpp b/src/expire-tiles.hpp
index ef5bf4c78..a372d3759 100644
--- a/src/expire-tiles.hpp
+++ b/src/expire-tiles.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-index.cpp b/src/flex-index.cpp
index c5bc5d857..3ad220510 100644
--- a/src/flex-index.cpp
+++ b/src/flex-index.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-index.hpp b/src/flex-index.hpp
index 8432a5dc7..a09f00e83 100644
--- a/src/flex-index.hpp
+++ b/src/flex-index.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-expire-output.cpp b/src/flex-lua-expire-output.cpp
index 00195f1e2..8248d30d6 100644
--- a/src/flex-lua-expire-output.cpp
+++ b/src/flex-lua-expire-output.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-expire-output.hpp b/src/flex-lua-expire-output.hpp
index 9c37f0450..9e71d6471 100644
--- a/src/flex-lua-expire-output.hpp
+++ b/src/flex-lua-expire-output.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-geom.cpp b/src/flex-lua-geom.cpp
index 3aa0788da..8592a60c2 100644
--- a/src/flex-lua-geom.cpp
+++ b/src/flex-lua-geom.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-geom.hpp b/src/flex-lua-geom.hpp
index 2f1dc01e4..33242a0e2 100644
--- a/src/flex-lua-geom.hpp
+++ b/src/flex-lua-geom.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-index.cpp b/src/flex-lua-index.cpp
index 31085e236..a9e28db53 100644
--- a/src/flex-lua-index.cpp
+++ b/src/flex-lua-index.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-index.hpp b/src/flex-lua-index.hpp
index bba9ed5ad..e05cded05 100644
--- a/src/flex-lua-index.hpp
+++ b/src/flex-lua-index.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-locator.cpp b/src/flex-lua-locator.cpp
index 8cac5e1ad..8eb730e38 100644
--- a/src/flex-lua-locator.cpp
+++ b/src/flex-lua-locator.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-locator.hpp b/src/flex-lua-locator.hpp
index 6df0a4ad5..9574ad46e 100644
--- a/src/flex-lua-locator.hpp
+++ b/src/flex-lua-locator.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-table.cpp b/src/flex-lua-table.cpp
index ccf7cf1b4..f50fef6ab 100644
--- a/src/flex-lua-table.cpp
+++ b/src/flex-lua-table.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-table.hpp b/src/flex-lua-table.hpp
index 326633318..d09a995e2 100644
--- a/src/flex-lua-table.hpp
+++ b/src/flex-lua-table.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-lua-wrapper.hpp b/src/flex-lua-wrapper.hpp
index 92c529484..d2c963a95 100644
--- a/src/flex-lua-wrapper.hpp
+++ b/src/flex-lua-wrapper.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-table-column.cpp b/src/flex-table-column.cpp
index 353d55e0a..121fd485e 100644
--- a/src/flex-table-column.cpp
+++ b/src/flex-table-column.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-table-column.hpp b/src/flex-table-column.hpp
index 38f0d43d3..213bd9726 100644
--- a/src/flex-table-column.hpp
+++ b/src/flex-table-column.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-table.cpp b/src/flex-table.cpp
index 7d40bb59d..0204b766d 100644
--- a/src/flex-table.cpp
+++ b/src/flex-table.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-table.hpp b/src/flex-table.hpp
index 06fe48804..d917ddacb 100644
--- a/src/flex-table.hpp
+++ b/src/flex-table.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-write.cpp b/src/flex-write.cpp
index 562d325eb..688b66b76 100644
--- a/src/flex-write.cpp
+++ b/src/flex-write.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/flex-write.hpp b/src/flex-write.hpp
index 8c23d8b5e..6150aace8 100644
--- a/src/flex-write.hpp
+++ b/src/flex-write.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/format.hpp b/src/format.hpp
index 02eb99c4a..e5eabe589 100644
--- a/src/format.hpp
+++ b/src/format.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/canvas.cpp b/src/gen/canvas.cpp
index e0dd41a64..3f30e7530 100644
--- a/src/gen/canvas.cpp
+++ b/src/gen/canvas.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/canvas.hpp b/src/gen/canvas.hpp
index 65bc0b913..5d653b3e4 100644
--- a/src/gen/canvas.hpp
+++ b/src/gen/canvas.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-base.cpp b/src/gen/gen-base.cpp
index 7a7123bb6..56fb7809a 100644
--- a/src/gen/gen-base.cpp
+++ b/src/gen/gen-base.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-base.hpp b/src/gen/gen-base.hpp
index 26588ba97..097c2843b 100644
--- a/src/gen/gen-base.hpp
+++ b/src/gen/gen-base.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-create.cpp b/src/gen/gen-create.cpp
index 49d2fb4a0..55200b593 100644
--- a/src/gen/gen-create.cpp
+++ b/src/gen/gen-create.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-create.hpp b/src/gen/gen-create.hpp
index b1e3432f3..928923213 100644
--- a/src/gen/gen-create.hpp
+++ b/src/gen/gen-create.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-discrete-isolation.cpp b/src/gen/gen-discrete-isolation.cpp
index 2ee6d2cf9..eed211e5c 100644
--- a/src/gen/gen-discrete-isolation.cpp
+++ b/src/gen/gen-discrete-isolation.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-discrete-isolation.hpp b/src/gen/gen-discrete-isolation.hpp
index aa15d4bf7..c9fc6cff7 100644
--- a/src/gen/gen-discrete-isolation.hpp
+++ b/src/gen/gen-discrete-isolation.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-rivers.cpp b/src/gen/gen-rivers.cpp
index 54314ad5b..a893d7537 100644
--- a/src/gen/gen-rivers.cpp
+++ b/src/gen/gen-rivers.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-rivers.hpp b/src/gen/gen-rivers.hpp
index 71c269f15..34f2b9ed8 100644
--- a/src/gen/gen-rivers.hpp
+++ b/src/gen/gen-rivers.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile-builtup.cpp b/src/gen/gen-tile-builtup.cpp
index 4be8fe1ac..18f2d54b6 100644
--- a/src/gen/gen-tile-builtup.cpp
+++ b/src/gen/gen-tile-builtup.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile-builtup.hpp b/src/gen/gen-tile-builtup.hpp
index 24d97ef54..f5d940930 100644
--- a/src/gen/gen-tile-builtup.hpp
+++ b/src/gen/gen-tile-builtup.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile-raster.cpp b/src/gen/gen-tile-raster.cpp
index 6a5def857..f19d7b5ae 100644
--- a/src/gen/gen-tile-raster.cpp
+++ b/src/gen/gen-tile-raster.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile-raster.hpp b/src/gen/gen-tile-raster.hpp
index a8e94839b..3321081b1 100644
--- a/src/gen/gen-tile-raster.hpp
+++ b/src/gen/gen-tile-raster.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile-sql.cpp b/src/gen/gen-tile-sql.cpp
index 144892fcc..65f450059 100644
--- a/src/gen/gen-tile-sql.cpp
+++ b/src/gen/gen-tile-sql.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile-sql.hpp b/src/gen/gen-tile-sql.hpp
index 81d593e2a..8ccf6e3d1 100644
--- a/src/gen/gen-tile-sql.hpp
+++ b/src/gen/gen-tile-sql.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile-vector.cpp b/src/gen/gen-tile-vector.cpp
index 0d3b6ba62..a9aba3d02 100644
--- a/src/gen/gen-tile-vector.cpp
+++ b/src/gen/gen-tile-vector.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile-vector.hpp b/src/gen/gen-tile-vector.hpp
index 100bff45c..691d4489e 100644
--- a/src/gen/gen-tile-vector.hpp
+++ b/src/gen/gen-tile-vector.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile.cpp b/src/gen/gen-tile.cpp
index e2dd2585f..e325891fe 100644
--- a/src/gen/gen-tile.cpp
+++ b/src/gen/gen-tile.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/gen-tile.hpp b/src/gen/gen-tile.hpp
index 1d96dbc38..9591cb8ba 100644
--- a/src/gen/gen-tile.hpp
+++ b/src/gen/gen-tile.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index b0704cf42..eba14215f 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/raster.cpp b/src/gen/raster.cpp
index 26eddf5ff..2e22ef978 100644
--- a/src/gen/raster.cpp
+++ b/src/gen/raster.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/raster.hpp b/src/gen/raster.hpp
index c1cf895bc..46666632f 100644
--- a/src/gen/raster.hpp
+++ b/src/gen/raster.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/tracer.cpp b/src/gen/tracer.cpp
index b8e54826e..5674a199a 100644
--- a/src/gen/tracer.cpp
+++ b/src/gen/tracer.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/gen/tracer.hpp b/src/gen/tracer.hpp
index 1171f1d5a..0188c0a04 100644
--- a/src/gen/tracer.hpp
+++ b/src/gen/tracer.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-area-assembler.cpp b/src/geom-area-assembler.cpp
index c2163b841..3af9b4235 100644
--- a/src/geom-area-assembler.cpp
+++ b/src/geom-area-assembler.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-area-assembler.hpp b/src/geom-area-assembler.hpp
index c7efab075..eb55c2a2b 100644
--- a/src/geom-area-assembler.hpp
+++ b/src/geom-area-assembler.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-boost-adaptor.hpp b/src/geom-boost-adaptor.hpp
index 2ae4104c1..3446c2c4c 100644
--- a/src/geom-boost-adaptor.hpp
+++ b/src/geom-boost-adaptor.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-box.cpp b/src/geom-box.cpp
index 09812380d..0b49cfb82 100644
--- a/src/geom-box.cpp
+++ b/src/geom-box.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-box.hpp b/src/geom-box.hpp
index e2f241da2..7bb5f9c76 100644
--- a/src/geom-box.hpp
+++ b/src/geom-box.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-from-osm.cpp b/src/geom-from-osm.cpp
index e7002d29a..017a9e1f4 100644
--- a/src/geom-from-osm.cpp
+++ b/src/geom-from-osm.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-from-osm.hpp b/src/geom-from-osm.hpp
index 0d295cebf..a1068e87d 100644
--- a/src/geom-from-osm.hpp
+++ b/src/geom-from-osm.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-functions.cpp b/src/geom-functions.cpp
index 3ea2e64c2..34e5d3fd3 100644
--- a/src/geom-functions.cpp
+++ b/src/geom-functions.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-functions.hpp b/src/geom-functions.hpp
index 08e26b348..6bcae6918 100644
--- a/src/geom-functions.hpp
+++ b/src/geom-functions.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-output.hpp b/src/geom-output.hpp
index 21d94f741..0de8c92ff 100644
--- a/src/geom-output.hpp
+++ b/src/geom-output.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-pole-of-inaccessibility.cpp b/src/geom-pole-of-inaccessibility.cpp
index dfb5274e7..0b3a9657f 100644
--- a/src/geom-pole-of-inaccessibility.cpp
+++ b/src/geom-pole-of-inaccessibility.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom-pole-of-inaccessibility.hpp b/src/geom-pole-of-inaccessibility.hpp
index 6b9c46b2f..086163b8e 100644
--- a/src/geom-pole-of-inaccessibility.hpp
+++ b/src/geom-pole-of-inaccessibility.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom.cpp b/src/geom.cpp
index cc6394f5a..120f56ced 100644
--- a/src/geom.cpp
+++ b/src/geom.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/geom.hpp b/src/geom.hpp
index 24915524d..0adb54d36 100644
--- a/src/geom.hpp
+++ b/src/geom.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/hex.cpp b/src/hex.cpp
index 40e8f3945..df6a43d6e 100644
--- a/src/hex.cpp
+++ b/src/hex.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/hex.hpp b/src/hex.hpp
index a085e32fe..8ca0f33e9 100644
--- a/src/hex.hpp
+++ b/src/hex.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/idlist.cpp b/src/idlist.cpp
index 3a2581ae5..6877959d1 100644
--- a/src/idlist.cpp
+++ b/src/idlist.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/idlist.hpp b/src/idlist.hpp
index 9657cbfb5..5ae6a1b60 100644
--- a/src/idlist.hpp
+++ b/src/idlist.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/input.cpp b/src/input.cpp
index 9ffbe108b..7d12dd6f5 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/input.hpp b/src/input.hpp
index 8a10ae35b..c9553908f 100644
--- a/src/input.hpp
+++ b/src/input.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/json-writer.hpp b/src/json-writer.hpp
index 9ea391702..1b0e222df 100644
--- a/src/json-writer.hpp
+++ b/src/json-writer.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/locator.cpp b/src/locator.cpp
index 35fcbd584..4cdf9baaf 100644
--- a/src/locator.cpp
+++ b/src/locator.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/locator.hpp b/src/locator.hpp
index 5fdc17b35..ae64e0c6e 100644
--- a/src/locator.hpp
+++ b/src/locator.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/logging.cpp b/src/logging.cpp
index 9d58b5035..95ed5f8f3 100644
--- a/src/logging.cpp
+++ b/src/logging.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/logging.hpp b/src/logging.hpp
index 9b116685e..a8b95ad1c 100644
--- a/src/logging.hpp
+++ b/src/logging.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/lua-init.hpp b/src/lua-init.hpp
index d91e173fa..3e4309d35 100644
--- a/src/lua-init.hpp
+++ b/src/lua-init.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/lua-setup.cpp b/src/lua-setup.cpp
index 25b0266ff..43da73e7b 100644
--- a/src/lua-setup.cpp
+++ b/src/lua-setup.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/lua-setup.hpp b/src/lua-setup.hpp
index 95dbff626..60510757c 100644
--- a/src/lua-setup.hpp
+++ b/src/lua-setup.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/lua-utils.cpp b/src/lua-utils.cpp
index 6b5b0ff6f..4734dd4a7 100644
--- a/src/lua-utils.cpp
+++ b/src/lua-utils.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/lua-utils.hpp b/src/lua-utils.hpp
index d595b4eed..8030935b5 100644
--- a/src/lua-utils.hpp
+++ b/src/lua-utils.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index 0a7204b55..c31348395 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/middle-pgsql.hpp b/src/middle-pgsql.hpp
index b8ff8e863..5cf73ec8e 100644
--- a/src/middle-pgsql.hpp
+++ b/src/middle-pgsql.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/middle-ram.cpp b/src/middle-ram.cpp
index de1af0107..8fe2eff8b 100644
--- a/src/middle-ram.cpp
+++ b/src/middle-ram.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/middle-ram.hpp b/src/middle-ram.hpp
index e7355f836..699f2c890 100644
--- a/src/middle-ram.hpp
+++ b/src/middle-ram.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/middle.cpp b/src/middle.cpp
index 27733006b..4734e6f87 100644
--- a/src/middle.cpp
+++ b/src/middle.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/middle.hpp b/src/middle.hpp
index 73aae0f84..a2e74e08e 100644
--- a/src/middle.hpp
+++ b/src/middle.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/node-locations.cpp b/src/node-locations.cpp
index 1ce3787b2..ab87adf33 100644
--- a/src/node-locations.cpp
+++ b/src/node-locations.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/node-locations.hpp b/src/node-locations.hpp
index 83befe2c6..d6fbed0be 100644
--- a/src/node-locations.hpp
+++ b/src/node-locations.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/node-persistent-cache.cpp b/src/node-persistent-cache.cpp
index 9b1b3a824..9e89963e1 100644
--- a/src/node-persistent-cache.cpp
+++ b/src/node-persistent-cache.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/node-persistent-cache.hpp b/src/node-persistent-cache.hpp
index 4ebe25ebf..42d7b22ae 100644
--- a/src/node-persistent-cache.hpp
+++ b/src/node-persistent-cache.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/options.hpp b/src/options.hpp
index f15139be4..4f56bfb88 100644
--- a/src/options.hpp
+++ b/src/options.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/ordered-index.cpp b/src/ordered-index.cpp
index a6901f97b..7925aa504 100644
--- a/src/ordered-index.cpp
+++ b/src/ordered-index.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/ordered-index.hpp b/src/ordered-index.hpp
index f8792b975..53d16198a 100644
--- a/src/ordered-index.hpp
+++ b/src/ordered-index.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/osm2pgsql-expire.cpp b/src/osm2pgsql-expire.cpp
index fff07589b..36f9a4163 100644
--- a/src/osm2pgsql-expire.cpp
+++ b/src/osm2pgsql-expire.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
index 3fc355dca..96d803817 100644
--- a/src/osm2pgsql.cpp
+++ b/src/osm2pgsql.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/osmdata.cpp b/src/osmdata.cpp
index b081da167..3d87dd175 100644
--- a/src/osmdata.cpp
+++ b/src/osmdata.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/osmdata.hpp b/src/osmdata.hpp
index 4054222b0..fa7e1f129 100644
--- a/src/osmdata.hpp
+++ b/src/osmdata.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/osmtypes.hpp b/src/osmtypes.hpp
index 1ac127506..90d2772ec 100644
--- a/src/osmtypes.hpp
+++ b/src/osmtypes.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 3b554e25e..c3d78f9e6 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index 235b579e6..446273a13 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output-null.cpp b/src/output-null.cpp
index 63286205a..a16077193 100644
--- a/src/output-null.cpp
+++ b/src/output-null.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output-null.hpp b/src/output-null.hpp
index a7ad82b50..b4de6b970 100644
--- a/src/output-null.hpp
+++ b/src/output-null.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output-pgsql.cpp b/src/output-pgsql.cpp
index 874d5f30b..97316b1b0 100644
--- a/src/output-pgsql.cpp
+++ b/src/output-pgsql.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output-pgsql.hpp b/src/output-pgsql.hpp
index f35aac778..dd2679b66 100644
--- a/src/output-pgsql.hpp
+++ b/src/output-pgsql.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output-requirements.hpp b/src/output-requirements.hpp
index 5ffd0d1b1..69e3f072a 100644
--- a/src/output-requirements.hpp
+++ b/src/output-requirements.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output.cpp b/src/output.cpp
index 24f6b078d..c02b9179c 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/output.hpp b/src/output.hpp
index 3993a7585..f7d3b85bd 100644
--- a/src/output.hpp
+++ b/src/output.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/overloaded.hpp b/src/overloaded.hpp
index cef3ab445..718f161d6 100644
--- a/src/overloaded.hpp
+++ b/src/overloaded.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/params.cpp b/src/params.cpp
index 89b0abe44..4986c36df 100644
--- a/src/params.cpp
+++ b/src/params.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/params.hpp b/src/params.hpp
index a5935393e..766925dc2 100644
--- a/src/params.hpp
+++ b/src/params.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/pgsql-capabilities-int.hpp b/src/pgsql-capabilities-int.hpp
index 993f7dbc6..cbac16206 100644
--- a/src/pgsql-capabilities-int.hpp
+++ b/src/pgsql-capabilities-int.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/pgsql-capabilities.cpp b/src/pgsql-capabilities.cpp
index 18c94fc75..cc876ff55 100644
--- a/src/pgsql-capabilities.cpp
+++ b/src/pgsql-capabilities.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/pgsql-capabilities.hpp b/src/pgsql-capabilities.hpp
index 4eb766e69..2330d0f59 100644
--- a/src/pgsql-capabilities.hpp
+++ b/src/pgsql-capabilities.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/pgsql-helper.cpp b/src/pgsql-helper.cpp
index cb72891bc..d859b13a3 100644
--- a/src/pgsql-helper.cpp
+++ b/src/pgsql-helper.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/pgsql-helper.hpp b/src/pgsql-helper.hpp
index d499f89b3..4ab4abd51 100644
--- a/src/pgsql-helper.hpp
+++ b/src/pgsql-helper.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/pgsql-params.hpp b/src/pgsql-params.hpp
index 742a5b656..cf672115b 100644
--- a/src/pgsql-params.hpp
+++ b/src/pgsql-params.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/pgsql.cpp b/src/pgsql.cpp
index e3c8dc06e..e34491ff4 100644
--- a/src/pgsql.cpp
+++ b/src/pgsql.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/pgsql.hpp b/src/pgsql.hpp
index 5a8e8c677..febe6e59a 100644
--- a/src/pgsql.hpp
+++ b/src/pgsql.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/progress-display.cpp b/src/progress-display.cpp
index 7f57b2359..6a69eddee 100644
--- a/src/progress-display.cpp
+++ b/src/progress-display.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/progress-display.hpp b/src/progress-display.hpp
index 0efbbe5f0..e9cbbd90b 100644
--- a/src/progress-display.hpp
+++ b/src/progress-display.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/projection.hpp b/src/projection.hpp
index b3230039a..eadd832e1 100644
--- a/src/projection.hpp
+++ b/src/projection.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/properties.cpp b/src/properties.cpp
index b7872cc8c..5d6be8bca 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/properties.hpp b/src/properties.hpp
index 40a787104..ceae04b00 100644
--- a/src/properties.hpp
+++ b/src/properties.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/reprojection-generic-none.cpp b/src/reprojection-generic-none.cpp
index 803e8c9de..1be5769f7 100644
--- a/src/reprojection-generic-none.cpp
+++ b/src/reprojection-generic-none.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/reprojection.cpp b/src/reprojection.cpp
index d2b512f64..fe1ba9ca3 100644
--- a/src/reprojection.cpp
+++ b/src/reprojection.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/reprojection.hpp b/src/reprojection.hpp
index 8893eef8a..d561e7217 100644
--- a/src/reprojection.hpp
+++ b/src/reprojection.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/table.cpp b/src/table.cpp
index 06a3bb676..6b65eb9d5 100644
--- a/src/table.cpp
+++ b/src/table.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/table.hpp b/src/table.hpp
index fbc06290b..db0f73f61 100644
--- a/src/table.hpp
+++ b/src/table.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/taginfo-impl.hpp b/src/taginfo-impl.hpp
index a6fdea2fb..d26acec16 100644
--- a/src/taginfo-impl.hpp
+++ b/src/taginfo-impl.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/taginfo.cpp b/src/taginfo.cpp
index 6b98323a9..dc9e4bb0e 100644
--- a/src/taginfo.cpp
+++ b/src/taginfo.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/taginfo.hpp b/src/taginfo.hpp
index 69d080a6c..a1c5ce628 100644
--- a/src/taginfo.hpp
+++ b/src/taginfo.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tagtransform-c.cpp b/src/tagtransform-c.cpp
index 7adb5564a..ca2cfad84 100644
--- a/src/tagtransform-c.cpp
+++ b/src/tagtransform-c.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tagtransform-c.hpp b/src/tagtransform-c.hpp
index 235ff4902..7aec83ffb 100644
--- a/src/tagtransform-c.hpp
+++ b/src/tagtransform-c.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tagtransform-lua.cpp b/src/tagtransform-lua.cpp
index 678bdd2f0..c0fa11b05 100644
--- a/src/tagtransform-lua.cpp
+++ b/src/tagtransform-lua.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tagtransform-lua.hpp b/src/tagtransform-lua.hpp
index 861417384..73e25609a 100644
--- a/src/tagtransform-lua.hpp
+++ b/src/tagtransform-lua.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tagtransform.cpp b/src/tagtransform.cpp
index d5cd1adbc..6a2c9b807 100644
--- a/src/tagtransform.cpp
+++ b/src/tagtransform.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tagtransform.hpp b/src/tagtransform.hpp
index e74c9e5d7..1188e99e1 100644
--- a/src/tagtransform.hpp
+++ b/src/tagtransform.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/template.cpp b/src/template.cpp
index 29d17661d..22b21c753 100644
--- a/src/template.cpp
+++ b/src/template.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/template.hpp b/src/template.hpp
index 7ef4fb1ea..31dbc4135 100644
--- a/src/template.hpp
+++ b/src/template.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/thread-pool.cpp b/src/thread-pool.cpp
index d4bd67750..dbe846443 100644
--- a/src/thread-pool.cpp
+++ b/src/thread-pool.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/thread-pool.hpp b/src/thread-pool.hpp
index 212d33b68..a53dede11 100644
--- a/src/thread-pool.hpp
+++ b/src/thread-pool.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tile-output.hpp b/src/tile-output.hpp
index c6cf3962c..e7f461a06 100644
--- a/src/tile-output.hpp
+++ b/src/tile-output.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tile.cpp b/src/tile.cpp
index a527ee735..87d45f66b 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/tile.hpp b/src/tile.hpp
index 3c52e4cf3..3eea2a7f8 100644
--- a/src/tile.hpp
+++ b/src/tile.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/util.cpp b/src/util.cpp
index 7ec65aea2..a9193454a 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/util.hpp b/src/util.hpp
index 67df33019..5cfa40683 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/version.cpp.in b/src/version.cpp.in
index a02c364f6..8613bb78e 100644
--- a/src/version.cpp.in
+++ b/src/version.cpp.in
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/version.hpp b/src/version.hpp
index c4eeec53c..8251ccc5a 100644
--- a/src/version.hpp
+++ b/src/version.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/wildcmp.cpp b/src/wildcmp.cpp
index 219fb03a9..e95236000 100644
--- a/src/wildcmp.cpp
+++ b/src/wildcmp.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/wildcmp.hpp b/src/wildcmp.hpp
index b471fa5aa..49fbb7bb1 100644
--- a/src/wildcmp.hpp
+++ b/src/wildcmp.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/wkb.cpp b/src/wkb.cpp
index 4e290df8b..629bb4d59 100644
--- a/src/wkb.cpp
+++ b/src/wkb.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/src/wkb.hpp b/src/wkb.hpp
index b43d4ed63..abd86102c 100644
--- a/src/wkb.hpp
+++ b/src/wkb.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/catch-main.cpp b/tests/catch-main.cpp
index 8cad8f4a5..60273a5d4 100644
--- a/tests/catch-main.cpp
+++ b/tests/catch-main.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/common-buffer.hpp b/tests/common-buffer.hpp
index 556affcf0..9764a9d86 100644
--- a/tests/common-buffer.hpp
+++ b/tests/common-buffer.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/common-cleanup.hpp b/tests/common-cleanup.hpp
index a480113d5..0f46eeea8 100644
--- a/tests/common-cleanup.hpp
+++ b/tests/common-cleanup.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/common-import.hpp b/tests/common-import.hpp
index 901df7e9c..b48a310e8 100644
--- a/tests/common-import.hpp
+++ b/tests/common-import.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/common-options.hpp b/tests/common-options.hpp
index 52c7999b4..f2904ba5a 100644
--- a/tests/common-options.hpp
+++ b/tests/common-options.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/common-pg.hpp b/tests/common-pg.hpp
index 48a352483..cf21863cc 100644
--- a/tests/common-pg.hpp
+++ b/tests/common-pg.hpp
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-check-input.cpp b/tests/test-check-input.cpp
index edfee76e4..c08d250a2 100644
--- a/tests/test-check-input.cpp
+++ b/tests/test-check-input.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-db-copy-mgr.cpp b/tests/test-db-copy-mgr.cpp
index 691b5cd78..00ec098b5 100644
--- a/tests/test-db-copy-mgr.cpp
+++ b/tests/test-db-copy-mgr.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-db-copy-thread.cpp b/tests/test-db-copy-thread.cpp
index b55dd8f36..fee3b40b6 100644
--- a/tests/test-db-copy-thread.cpp
+++ b/tests/test-db-copy-thread.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-expire-from-geometry.cpp b/tests/test-expire-from-geometry.cpp
index abe4a2ca3..1cdb4206a 100644
--- a/tests/test-expire-from-geometry.cpp
+++ b/tests/test-expire-from-geometry.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-expire-tiles.cpp b/tests/test-expire-tiles.cpp
index b8409202d..c5153b403 100644
--- a/tests/test-expire-tiles.cpp
+++ b/tests/test-expire-tiles.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-flex-indexes.cpp b/tests/test-flex-indexes.cpp
index 916ba5fe1..7d99c7b48 100644
--- a/tests/test-flex-indexes.cpp
+++ b/tests/test-flex-indexes.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-box.cpp b/tests/test-geom-box.cpp
index 134697de7..dec7a96fe 100644
--- a/tests/test-geom-box.cpp
+++ b/tests/test-geom-box.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-collections.cpp b/tests/test-geom-collections.cpp
index 85d05805e..d7b14bf3a 100644
--- a/tests/test-geom-collections.cpp
+++ b/tests/test-geom-collections.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-linestrings.cpp b/tests/test-geom-linestrings.cpp
index b50de68ef..a72101165 100644
--- a/tests/test-geom-linestrings.cpp
+++ b/tests/test-geom-linestrings.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-multilinestrings.cpp b/tests/test-geom-multilinestrings.cpp
index 0eee538db..7e81ad95f 100644
--- a/tests/test-geom-multilinestrings.cpp
+++ b/tests/test-geom-multilinestrings.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-multipoints.cpp b/tests/test-geom-multipoints.cpp
index b0b52d04c..575aa6786 100644
--- a/tests/test-geom-multipoints.cpp
+++ b/tests/test-geom-multipoints.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-multipolygons.cpp b/tests/test-geom-multipolygons.cpp
index 6ba866a73..8bcc90417 100644
--- a/tests/test-geom-multipolygons.cpp
+++ b/tests/test-geom-multipolygons.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-null.cpp b/tests/test-geom-null.cpp
index eca420b03..709a251ae 100644
--- a/tests/test-geom-null.cpp
+++ b/tests/test-geom-null.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-output.cpp b/tests/test-geom-output.cpp
index 52bd32c74..40b56ca4d 100644
--- a/tests/test-geom-output.cpp
+++ b/tests/test-geom-output.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-points.cpp b/tests/test-geom-points.cpp
index 94e5e0418..913afd69d 100644
--- a/tests/test-geom-points.cpp
+++ b/tests/test-geom-points.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-pole-of-inaccessibility.cpp b/tests/test-geom-pole-of-inaccessibility.cpp
index fdbfe9f3f..c05017a2e 100644
--- a/tests/test-geom-pole-of-inaccessibility.cpp
+++ b/tests/test-geom-pole-of-inaccessibility.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-polygons.cpp b/tests/test-geom-polygons.cpp
index caee81586..246ac4690 100644
--- a/tests/test-geom-polygons.cpp
+++ b/tests/test-geom-polygons.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-geom-transform.cpp b/tests/test-geom-transform.cpp
index 60ac0eb3a..ffa0eb1a2 100644
--- a/tests/test-geom-transform.cpp
+++ b/tests/test-geom-transform.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-hex.cpp b/tests/test-hex.cpp
index 4b6df6a2a..27bafbd65 100644
--- a/tests/test-hex.cpp
+++ b/tests/test-hex.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-json-writer.cpp b/tests/test-json-writer.cpp
index 734cc8bf5..cb862ff74 100644
--- a/tests/test-json-writer.cpp
+++ b/tests/test-json-writer.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-locator.cpp b/tests/test-locator.cpp
index 2b0cb2db9..92c83d95e 100644
--- a/tests/test-locator.cpp
+++ b/tests/test-locator.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-lua-utils.cpp b/tests/test-lua-utils.cpp
index 49af80dcc..98f9106f6 100644
--- a/tests/test-lua-utils.cpp
+++ b/tests/test-lua-utils.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-middle.cpp b/tests/test-middle.cpp
index 5c52a4e84..36a88b776 100644
--- a/tests/test-middle.cpp
+++ b/tests/test-middle.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-node-locations.cpp b/tests/test-node-locations.cpp
index 76d0b6cac..50d69961e 100644
--- a/tests/test-node-locations.cpp
+++ b/tests/test-node-locations.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-options-parse.cpp b/tests/test-options-parse.cpp
index b2ca41f41..71d4e7f8f 100644
--- a/tests/test-options-parse.cpp
+++ b/tests/test-options-parse.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-options-projection.cpp b/tests/test-options-projection.cpp
index 204ec5ff1..5f6a3b86d 100644
--- a/tests/test-options-projection.cpp
+++ b/tests/test-options-projection.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-ordered-index.cpp b/tests/test-ordered-index.cpp
index e75b4a346..63c9b7bc0 100644
--- a/tests/test-ordered-index.cpp
+++ b/tests/test-ordered-index.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-osm-file-parsing.cpp b/tests/test-osm-file-parsing.cpp
index 712e95986..1b62ad1ba 100644
--- a/tests/test-osm-file-parsing.cpp
+++ b/tests/test-osm-file-parsing.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-example-configs.cpp b/tests/test-output-flex-example-configs.cpp
index b745efaee..7775a5c27 100644
--- a/tests/test-output-flex-example-configs.cpp
+++ b/tests/test-output-flex-example-configs.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-multi-input.cpp b/tests/test-output-flex-multi-input.cpp
index 63b8a08e3..ab9f8a47c 100644
--- a/tests/test-output-flex-multi-input.cpp
+++ b/tests/test-output-flex-multi-input.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-nodes.cpp b/tests/test-output-flex-nodes.cpp
index 9f999eda3..18f580803 100644
--- a/tests/test-output-flex-nodes.cpp
+++ b/tests/test-output-flex-nodes.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-relation-combinations.cpp b/tests/test-output-flex-relation-combinations.cpp
index c05ce9414..a273dd622 100644
--- a/tests/test-output-flex-relation-combinations.cpp
+++ b/tests/test-output-flex-relation-combinations.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-relations.cpp b/tests/test-output-flex-relations.cpp
index 0a57b6b2a..812425694 100644
--- a/tests/test-output-flex-relations.cpp
+++ b/tests/test-output-flex-relations.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-schema.cpp b/tests/test-output-flex-schema.cpp
index 7ae5b5604..7dd6a8587 100644
--- a/tests/test-output-flex-schema.cpp
+++ b/tests/test-output-flex-schema.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-stage2.cpp b/tests/test-output-flex-stage2.cpp
index d53853dba..c73b09029 100644
--- a/tests/test-output-flex-stage2.cpp
+++ b/tests/test-output-flex-stage2.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-tablespace.cpp b/tests/test-output-flex-tablespace.cpp
index 527784855..31677f258 100644
--- a/tests/test-output-flex-tablespace.cpp
+++ b/tests/test-output-flex-tablespace.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-types.cpp b/tests/test-output-flex-types.cpp
index f28e514ca..d3e351611 100644
--- a/tests/test-output-flex-types.cpp
+++ b/tests/test-output-flex-types.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-uni.cpp b/tests/test-output-flex-uni.cpp
index 17604b304..98b7ce412 100644
--- a/tests/test-output-flex-uni.cpp
+++ b/tests/test-output-flex-uni.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-update.cpp b/tests/test-output-flex-update.cpp
index 879ce2ae1..8e58c63d1 100644
--- a/tests/test-output-flex-update.cpp
+++ b/tests/test-output-flex-update.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex-validgeom.cpp b/tests/test-output-flex-validgeom.cpp
index 73eec6665..3e79047e9 100644
--- a/tests/test-output-flex-validgeom.cpp
+++ b/tests/test-output-flex-validgeom.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-flex.cpp b/tests/test-output-flex.cpp
index ec6dcaf24..e17d00052 100644
--- a/tests/test-output-flex.cpp
+++ b/tests/test-output-flex.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql-area.cpp b/tests/test-output-pgsql-area.cpp
index 4b72002b1..2082e2588 100644
--- a/tests/test-output-pgsql-area.cpp
+++ b/tests/test-output-pgsql-area.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql-hstore-match-only.cpp b/tests/test-output-pgsql-hstore-match-only.cpp
index bb432ab5c..9addc2c17 100644
--- a/tests/test-output-pgsql-hstore-match-only.cpp
+++ b/tests/test-output-pgsql-hstore-match-only.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql-int4.cpp b/tests/test-output-pgsql-int4.cpp
index 604cb589f..1d75e6871 100644
--- a/tests/test-output-pgsql-int4.cpp
+++ b/tests/test-output-pgsql-int4.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql-schema.cpp b/tests/test-output-pgsql-schema.cpp
index 189f34c70..493d644af 100644
--- a/tests/test-output-pgsql-schema.cpp
+++ b/tests/test-output-pgsql-schema.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql-style-file.cpp b/tests/test-output-pgsql-style-file.cpp
index 6586aaa81..e0d06d17f 100644
--- a/tests/test-output-pgsql-style-file.cpp
+++ b/tests/test-output-pgsql-style-file.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql-tablespace.cpp b/tests/test-output-pgsql-tablespace.cpp
index 8d9f1171d..821e8289f 100644
--- a/tests/test-output-pgsql-tablespace.cpp
+++ b/tests/test-output-pgsql-tablespace.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql-validgeom.cpp b/tests/test-output-pgsql-validgeom.cpp
index 1adcdc489..5202c3960 100644
--- a/tests/test-output-pgsql-validgeom.cpp
+++ b/tests/test-output-pgsql-validgeom.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql-z_order.cpp b/tests/test-output-pgsql-z_order.cpp
index 1fa88f921..91ab5cda3 100644
--- a/tests/test-output-pgsql-z_order.cpp
+++ b/tests/test-output-pgsql-z_order.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-output-pgsql.cpp b/tests/test-output-pgsql.cpp
index 91ce54916..fdf06991f 100644
--- a/tests/test-output-pgsql.cpp
+++ b/tests/test-output-pgsql.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-params.cpp b/tests/test-params.cpp
index 31b81f5cd..7ab11d370 100644
--- a/tests/test-params.cpp
+++ b/tests/test-params.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-persistent-cache.cpp b/tests/test-persistent-cache.cpp
index a250511fc..0c996469a 100644
--- a/tests/test-persistent-cache.cpp
+++ b/tests/test-persistent-cache.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-pgsql-capabilities.cpp b/tests/test-pgsql-capabilities.cpp
index 190b93334..2ecd6bd0c 100644
--- a/tests/test-pgsql-capabilities.cpp
+++ b/tests/test-pgsql-capabilities.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-pgsql.cpp b/tests/test-pgsql.cpp
index d00b5d42a..09e0e0147 100644
--- a/tests/test-pgsql.cpp
+++ b/tests/test-pgsql.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-properties.cpp b/tests/test-properties.cpp
index 8b1e2563d..a3bbb65d1 100644
--- a/tests/test-properties.cpp
+++ b/tests/test-properties.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-reprojection.cpp b/tests/test-reprojection.cpp
index f3778bd68..8e87cb6e5 100644
--- a/tests/test-reprojection.cpp
+++ b/tests/test-reprojection.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-taginfo.cpp b/tests/test-taginfo.cpp
index 5765dab45..f639a5fbc 100644
--- a/tests/test-taginfo.cpp
+++ b/tests/test-taginfo.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-tile.cpp b/tests/test-tile.cpp
index f5d6489ff..c53d6e064 100644
--- a/tests/test-tile.cpp
+++ b/tests/test-tile.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-util.cpp b/tests/test-util.cpp
index b9a143c89..e64ce5aff 100644
--- a/tests/test-util.cpp
+++ b/tests/test-util.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-wildcard-match.cpp b/tests/test-wildcard-match.cpp
index b7d82cef1..d1520ff40 100644
--- a/tests/test-wildcard-match.cpp
+++ b/tests/test-wildcard-match.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff --git a/tests/test-wkb.cpp b/tests/test-wkb.cpp
index 6ce11f474..ef5ea667e 100644
--- a/tests/test-wkb.cpp
+++ b/tests/test-wkb.cpp
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2025 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2026 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 

From f4b957d97e7844a0eb1054ab6d25fdb370fb3a0b Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 18 Dec 2025 10:11:03 +0100
Subject: [PATCH 410/430] Use single zoom variable in test instead of minzoom
 and maxzoom

...when they are the same.
---
 tests/test-expire-tiles.cpp | 49 ++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/tests/test-expire-tiles.cpp b/tests/test-expire-tiles.cpp
index b8409202d..0863fd4b7 100644
--- a/tests/test-expire-tiles.cpp
+++ b/tests/test-expire-tiles.cpp
@@ -89,15 +89,14 @@ TEST_CASE("tile to quadkey", "[NoDB]")
 
 TEST_CASE("simple expire z1", "[NoDB]")
 {
-    uint32_t const minzoom = 1;
-    uint32_t const maxzoom = 1;
-    expire_tiles_t et{minzoom, defproj};
+    uint32_t const zoom = 1;
+    expire_tiles_t et{zoom, defproj};
 
     // as big a bbox as possible at the origin to dirty all four
     // quadrants of the world.
     et.from_bbox({-10000, -10000, 10000, 10000}, expire_config_t{});
 
-    auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
+    auto const tiles = get_tiles_ordered(&et, zoom, zoom);
     CHECK(tiles.size() == 4);
 
     auto itr = tiles.cbegin();
@@ -109,15 +108,14 @@ TEST_CASE("simple expire z1", "[NoDB]")
 
 TEST_CASE("simple expire z3", "[NoDB]")
 {
-    uint32_t const minzoom = 3;
-    uint32_t const maxzoom = 3;
-    expire_tiles_t et{minzoom, defproj};
+    uint32_t const zoom = 3;
+    expire_tiles_t et{zoom, defproj};
 
     // as big a bbox as possible at the origin to dirty all four
     // quadrants of the world.
     et.from_bbox({-10000, -10000, 10000, 10000}, expire_config_t{});
 
-    auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
+    auto const tiles = get_tiles_ordered(&et, zoom, zoom);
     CHECK(tiles.size() == 4);
 
     auto itr = tiles.cbegin();
@@ -129,15 +127,14 @@ TEST_CASE("simple expire z3", "[NoDB]")
 
 TEST_CASE("simple expire z18", "[NoDB]")
 {
-    uint32_t const minzoom = 18;
-    uint32_t const maxzoom = 18;
-    expire_tiles_t et{minzoom, defproj};
+    uint32_t const zoom = 18;
+    expire_tiles_t et{zoom, defproj};
 
     // dirty a smaller bbox this time, as at z18 the scale is
     // pretty small.
     et.from_bbox({-1, -1, 1, 1}, expire_config_t{});
 
-    auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
+    auto const tiles = get_tiles_ordered(&et, zoom, zoom);
     CHECK(tiles.size() == 4);
 
     auto itr = tiles.cbegin();
@@ -149,14 +146,13 @@ TEST_CASE("simple expire z18", "[NoDB]")
 
 TEST_CASE("simple expire z10 bounds 0, 0", "[NoDB]")
 {
-    uint32_t const minzoom = 10;
-    uint32_t const maxzoom = 10;
-    expire_tiles_t et{minzoom, defproj};
+    uint32_t const zoom = 10;
+    expire_tiles_t et{zoom, defproj};
 
     et.from_geometry(geom::point_t{-20037508.34, 20037508.34},
                      expire_config_t{});
 
-    auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
+    auto const tiles = get_tiles_ordered(&et, zoom, zoom);
     CHECK(tiles.size() == 1);
 
     auto itr = tiles.cbegin();
@@ -165,14 +161,13 @@ TEST_CASE("simple expire z10 bounds 0, 0", "[NoDB]")
 
 TEST_CASE("simple expire z10 bounds 0, 1023", "[NoDB]")
 {
-    uint32_t const minzoom = 10;
-    uint32_t const maxzoom = 10;
-    expire_tiles_t et{minzoom, defproj};
+    uint32_t const zoom = 10;
+    expire_tiles_t et{zoom, defproj};
 
     et.from_geometry(geom::point_t{-20037508.34, -20037508.34},
                      expire_config_t{});
 
-    auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
+    auto const tiles = get_tiles_ordered(&et, zoom, zoom);
     CHECK(tiles.size() == 1);
 
     auto itr = tiles.cbegin();
@@ -181,14 +176,13 @@ TEST_CASE("simple expire z10 bounds 0, 1023", "[NoDB]")
 
 TEST_CASE("simple expire z10 bounds 1023, 0", "[NoDB]")
 {
-    uint32_t const minzoom = 10;
-    uint32_t const maxzoom = 10;
-    expire_tiles_t et{minzoom, defproj};
+    uint32_t const zoom = 10;
+    expire_tiles_t et{zoom, defproj};
 
     et.from_geometry(geom::point_t{20037508.34, 20037508.34},
                      expire_config_t{});
 
-    auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
+    auto const tiles = get_tiles_ordered(&et, zoom, zoom);
     CHECK(tiles.size() == 2);
 
     auto itr = tiles.cbegin();
@@ -198,14 +192,13 @@ TEST_CASE("simple expire z10 bounds 1023, 0", "[NoDB]")
 
 TEST_CASE("simple expire z10 bounds 1023, 1023", "[NoDB]")
 {
-    uint32_t const minzoom = 10;
-    uint32_t const maxzoom = 10;
-    expire_tiles_t et{minzoom, defproj};
+    uint32_t const zoom = 10;
+    expire_tiles_t et{zoom, defproj};
 
     et.from_geometry(geom::point_t{20037508.34, -20037508.34},
                      expire_config_t{});
 
-    auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
+    auto const tiles = get_tiles_ordered(&et, zoom, zoom);
     CHECK(tiles.size() == 2);
 
     auto itr = tiles.cbegin();

From 269116e87ed95f861fe642fc4be15832f627ed5e Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 29 Jan 2026 21:21:26 +0100
Subject: [PATCH 411/430] Update FindOsmium.cmake from upstream

---
 cmake/FindOsmium.cmake | 53 ------------------------------------------
 1 file changed, 53 deletions(-)

diff --git a/cmake/FindOsmium.cmake b/cmake/FindOsmium.cmake
index 651c09a72..17be19666 100644
--- a/cmake/FindOsmium.cmake
+++ b/cmake/FindOsmium.cmake
@@ -32,8 +32,6 @@
 #      io         - include libraries needed for any type of input/output
 #      geos       - include if you want to use any of the GEOS functions
 #      gdal       - include if you want to use any of the OGR functions
-#      proj       - include if you want to use any of the Proj.4 functions
-#      sparsehash - include if you use the sparsehash index (deprecated!)
 #      lz4        - include support for LZ4 compression of PBF files
 #
 #    You can check for success with something like this:
@@ -205,57 +203,6 @@ if(Osmium_USE_GDAL)
     endif()
 endif()
 
-#----------------------------------------------------------------------
-# Component 'proj'
-if(Osmium_USE_PROJ)
-    find_path(PROJ_INCLUDE_DIR proj_api.h)
-    find_library(PROJ_LIBRARY NAMES proj)
-
-    list(APPEND OSMIUM_EXTRA_FIND_VARS PROJ_INCLUDE_DIR PROJ_LIBRARY)
-    if(PROJ_INCLUDE_DIR AND PROJ_LIBRARY)
-        set(PROJ_FOUND 1)
-        list(APPEND OSMIUM_LIBRARIES ${PROJ_LIBRARY})
-        list(APPEND OSMIUM_INCLUDE_DIRS ${PROJ_INCLUDE_DIR})
-    else()
-        message(WARNING "Osmium: PROJ.4 library is required but not found, please install it or configure the paths.")
-    endif()
-endif()
-
-#----------------------------------------------------------------------
-# Component 'sparsehash'
-if(Osmium_USE_SPARSEHASH)
-    message(WARNING "Osmium: Use of Google SparseHash is deprecated. Please switch to a different index type.")
-    find_path(SPARSEHASH_INCLUDE_DIR google/sparsetable)
-
-    list(APPEND OSMIUM_EXTRA_FIND_VARS SPARSEHASH_INCLUDE_DIR)
-    if(SPARSEHASH_INCLUDE_DIR)
-        # Find size of sparsetable::size_type. This does not work on older
-        # CMake versions because they can do this check only in C, not in C++.
-        if(NOT CMAKE_VERSION VERSION_LESS 3.0)
-           include(CheckTypeSize)
-           set(CMAKE_REQUIRED_INCLUDES ${SPARSEHASH_INCLUDE_DIR})
-           set(CMAKE_EXTRA_INCLUDE_FILES "google/sparsetable")
-           check_type_size("google::sparsetable<int>::size_type" SPARSETABLE_SIZE_TYPE LANGUAGE CXX)
-           set(CMAKE_EXTRA_INCLUDE_FILES)
-           set(CMAKE_REQUIRED_INCLUDES)
-        else()
-           set(SPARSETABLE_SIZE_TYPE ${CMAKE_SIZEOF_VOID_P})
-        endif()
-
-        # Sparsetable::size_type must be at least 8 bytes (64bit), otherwise
-        # OSM object IDs will not fit.
-        if(SPARSETABLE_SIZE_TYPE GREATER 7)
-            set(SPARSEHASH_FOUND 1)
-            add_definitions(-DOSMIUM_WITH_SPARSEHASH=${SPARSEHASH_FOUND})
-            list(APPEND OSMIUM_INCLUDE_DIRS ${SPARSEHASH_INCLUDE_DIR})
-        else()
-            message(WARNING "Osmium: Disabled Google SparseHash library on 32bit system (size_type=${SPARSETABLE_SIZE_TYPE}).")
-        endif()
-    else()
-        message(WARNING "Osmium: Google SparseHash library is required but not found, please install it or configure the paths.")
-    endif()
-endif()
-
 #----------------------------------------------------------------------
 
 list(REMOVE_DUPLICATES OSMIUM_INCLUDE_DIRS)

From 45e330c6d811f8368d25eface80bf5fa3217d114 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 29 Nov 2025 12:05:57 +0100
Subject: [PATCH 412/430] Introduce per geometry and overall limits on number
 of expire tiles

The number of tiles to be expired can be quite large if the input
geometries are large or if there are many geometries. Numbers of tiles in
the billions can crash osm2pgsql because it runs out of memory. Such
large numbers can also overwhelm any kind of re-rendering mechanism run
after osm2pgsql to bring tiles up to date. In day-to-day processing this
should not happen, but it can happen due to vandalism or misconfiguration.

To protect against this problem, this change introduces limits on the
number of tiles that can be affected by a single geometry and the
overall number of tiles that an expire output will generate for each run
of osm2pgsql.

* If a single geometry would result in the expire of more than
  `max_tiles_geometry` this geometry will be ignored for the purposes of
  expiry. Note that the geometry will still be written to the database,
  but no tiles will be added to the expire output.
* If the number of tiles generated during a single run of osm2pgsql for an
  expire output grows beyond `max_tiles_overall`, no further tiles will be
  written to this output.

Limits are per expire output of which you can have several. The limits
can be set in the flex expire output configuration but sensible defaults
are provided. For the (legacy) expire output configured on the command
line with the `-e` and `-o` options, the settings can not be changed,
you will always get the default values.

To choose the default values for these settings I looked at real-world
values as follows:

* Russia has one of the largest boundaries in the planet. Expiry
  (boundary only) on zoom level 14 affects 94144 tiles, on z15 190168
  tiles, on z16 383465 tiles. For typical raster tiles using 8x8 meta
  tiles expiry on z16 is equivalent to showing z19 tiles. So 500,000 tiles
  seems to be a useful limit for `max_tiles_geometry`.
* For expiring the area I looked at the Greenland icesheet, which needs
  more than 8 million tiles on z14. At least for vector tiles this is
  good enough, for raster tiles we might need more though.
* For `max_tiles_overall`: Paul Norman analyzed the number of tiles
  expired by typical minutely updates in
  https://www.openstreetmap.org/user/pnorman/diary/403266. For zoom level
  14 the most he got was 119801 tiles. The same analysis also shows that
  for longer time frames (checked were 2 minutes and 5 minutes, but the
  same should be true for larger intervals) the number of tiles doesn't go
  up because these huge numbers only happen very rarely.

Rounding these numbers and adding a safety factor, values of 10,000,000
and 50,000,000 seem reasonable for the single geometry and the overall
number of tiles per run. Memory use in osm2pgsql is about 32 bytes per
tile, so this will need 1.6 GB max which should be no problem at all.

The numbers are chosen so they will practically never be triggered so
that users upgrading from existing versions of osm2pgsql will not be
suddenly affected. It is recommended that users tune their settings
according to their own needs. Once we have some more operational
experience with this, we can adjust the defaults.

I considered using different default max values for different zoom
levels, but this will make configuration more complicated.

Change file processing in osm2pgsql runs in parallel threads. The old
code stored the to-be-expired tiles in one list per thread and merged
them later. This has two problems:

a) because the lists might contain some of the same tiles, all lists
   together can use a much larger amount than a single list would take
b) we can not easily check the number of tiles in those lists against
   the configured maximum.

So this commit changes the way the list is kept: We only keep a single
list in the expire_output_t and use a mutex to control access to this
list. (There might still be overlapping lists if you have more than
one expire output, but that's by design.)

Objects of expire_tiles_t class now only keep a temporary list for
each geometry added. Once all tiles affected by a single geometry are
identified, this list is added to the overall list in expire_output_t
and the temporary list is cleared.

Fixes #2190
---
 src/expire-output.cpp                         |  59 ++++++++-
 src/expire-output.hpp                         |  73 ++++++++++-
 src/expire-tiles.cpp                          |  46 +++----
 src/expire-tiles.hpp                          |  19 +--
 src/flex-lua-expire-output.cpp                |  42 +++++-
 src/flex-lua-expire-output.hpp                |   2 +
 src/flex-table-column.cpp                     |  13 +-
 src/flex-table-column.hpp                     |   3 +-
 src/flex-write.cpp                            |   7 +-
 src/flex-write.hpp                            |   3 +-
 src/lua-utils.cpp                             |  24 ++++
 src/lua-utils.hpp                             |   5 +
 src/osm2pgsql-expire.cpp                      |  41 ++++--
 src/osmdata.cpp                               |  12 --
 src/output-flex.cpp                           |  27 ++--
 src/output-flex.hpp                           |   2 -
 src/output-pgsql.cpp                          |  25 ++--
 src/output-pgsql.hpp                          |   3 +-
 src/output.hpp                                |   2 -
 tests/bdd/flex/expire-limit.feature           |  98 ++++++++++++++
 .../lua-expire-output-definitions.feature     |  34 +++++
 tests/data/test_expire_limit.lua              |  20 +++
 tests/test-expire-tiles.cpp                   | 121 +-----------------
 23 files changed, 443 insertions(+), 238 deletions(-)
 create mode 100644 tests/bdd/flex/expire-limit.feature
 create mode 100644 tests/data/test_expire_limit.lua

diff --git a/src/expire-output.cpp b/src/expire-output.cpp
index 737e059f3..7babda0e1 100644
--- a/src/expire-output.cpp
+++ b/src/expire-output.cpp
@@ -17,16 +17,67 @@
 #include <cerrno>
 #include <system_error>
 
+void expire_output_t::add_tiles(
+    std::unordered_set<quadkey_t> const &dirty_tiles)
+{
+    std::lock_guard<std::mutex> const guard{*m_tiles_mutex};
+
+    if (m_overall_tile_limit_reached) {
+        return;
+    }
+
+    if (dirty_tiles.size() > m_max_tiles_geometry) {
+        log_warn("Tile limit {} reached for single geometry!",
+                 m_max_tiles_geometry);
+        return;
+    }
+
+    /**
+     * This check is not quite correct, because some tiles could be in both,
+     * the dirty_list and in m_tiles, which means we might not reach
+     * m_max_tiles_overall if we join those in. But this check is much
+     * easier and cheaper than trying to add all the tiles into the dirty_list,
+     * checking each time whether we reached the limit. And with the number
+     * of tiles involved in doesn't matter that much anyway.
+     */
+    if (dirty_tiles.size() + m_tiles.size() > m_max_tiles_overall) {
+        m_overall_tile_limit_reached = true;
+        log_warn("Overall tile limit {} reached for this run!",
+                 m_max_tiles_overall);
+        return;
+    }
+
+    m_tiles.insert(dirty_tiles.cbegin(), dirty_tiles.cend());
+}
+
+bool expire_output_t::empty() noexcept
+{
+    std::lock_guard<std::mutex> const guard{*m_tiles_mutex};
+    return m_tiles.empty();
+}
+
+quadkey_list_t expire_output_t::get_tiles()
+{
+    std::lock_guard<std::mutex> const guard{*m_tiles_mutex};
+    quadkey_list_t tile_list;
+
+    tile_list.reserve(m_tiles.size());
+    tile_list.assign(m_tiles.cbegin(), m_tiles.cend());
+    std::sort(tile_list.begin(), tile_list.end());
+    m_tiles.clear();
+
+    return tile_list;
+}
+
 std::size_t
-expire_output_t::output(quadkey_list_t const &tile_list,
-                        connection_params_t const &connection_params) const
+expire_output_t::output(connection_params_t const &connection_params)
 {
     std::size_t num = 0;
     if (!m_filename.empty()) {
-        num = output_tiles_to_file(tile_list);
+        num = output_tiles_to_file(get_tiles());
     }
     if (!m_table.empty()) {
-        num = output_tiles_to_table(tile_list, connection_params);
+        num = output_tiles_to_table(get_tiles(), connection_params);
     }
     return num;
 }
diff --git a/src/expire-output.hpp b/src/expire-output.hpp
index 59de5f3fb..312ed7de4 100644
--- a/src/expire-output.hpp
+++ b/src/expire-output.hpp
@@ -15,9 +15,15 @@
 #include <cassert>
 #include <cstddef>
 #include <cstdint>
+#include <memory>
+#include <mutex>
 #include <string>
+#include <unordered_set>
 #include <utility>
 
+constexpr std::size_t DEFAULT_MAX_TILES_GEOMETRY = 10'000'000;
+constexpr std::size_t DEFAULT_MAX_TILES_OVERALL = 50'000'000;
+
 class pg_conn_t;
 class connection_params_t;
 
@@ -53,9 +59,45 @@ class expire_output_t
     uint32_t maxzoom() const noexcept { return m_maxzoom; }
     void set_maxzoom(uint32_t maxzoom) noexcept { m_maxzoom = maxzoom; }
 
-    std::size_t output(quadkey_list_t const &tile_list,
-                       connection_params_t const &connection_params) const;
+    std::size_t max_tiles_geometry() const noexcept
+    {
+        return m_max_tiles_geometry;
+    }
+
+    void set_max_tiles_geometry(std::size_t max_tiles_geometry) noexcept
+    {
+        m_max_tiles_geometry = max_tiles_geometry;
+    }
+
+    std::size_t max_tiles_overall() const noexcept
+    {
+        return m_max_tiles_overall;
+    }
+
+    void set_max_tiles_overall(std::size_t max_tiles_overall) noexcept
+    {
+        m_max_tiles_overall = max_tiles_overall;
+    }
+
+    bool empty() noexcept;
+
+    void add_tiles(std::unordered_set<quadkey_t> const &dirty_tiles);
+
+    quadkey_list_t get_tiles();
+
+    /**
+     * Write the list of tiles to a database table or file.
+     *
+     * \param connection_params Database connection parameters
+     */
+    std::size_t output(connection_params_t const &connection_params);
+
+    /**
+     * Create table for tiles.
+     */
+    void create_output_table(pg_conn_t const &db_connection) const;
 
+private:
     /**
      * Write the list of tiles to a file.
      *
@@ -75,11 +117,16 @@ class expire_output_t
                           connection_params_t const &connection_params) const;
 
     /**
-     * Create table for tiles.
+     * Access to the m_tiles collection of expired tiles must go through
+     * this mutex, because it can happend from several threads at the same
+     * time. Mutex is wrapped in a shared_ptr to make this class movable so
+     * we can store instances in std::vector.
      */
-    void create_output_table(pg_conn_t const &db_connection) const;
+    std::shared_ptr<std::mutex> m_tiles_mutex = std::make_shared<std::mutex>();
+
+    /// This is where we collect all the expired tiles.
+    std::unordered_set<quadkey_t> m_tiles;
 
-private:
     /// The filename (if any) for output
     std::string m_filename;
 
@@ -95,6 +142,22 @@ class expire_output_t
     /// Zoom level we capture tiles on
     uint32_t m_maxzoom = 0;
 
+    /**
+     * The following two settings are for protecting osm2pgsql from overload as
+     * well as downstream tile expiry mechanisms in case of large changes to
+     * OSM data (possibly from vandalism). They should be large enough to not
+     * trigger in normal use.
+     */
+
+    /// Maximum number of tiles that can be affected by a single geometry.
+    std::size_t m_max_tiles_geometry = DEFAULT_MAX_TILES_GEOMETRY;
+
+    /// Maximum number of tiles that can be affected per run.
+    std::size_t m_max_tiles_overall = DEFAULT_MAX_TILES_OVERALL;
+
+    /// Has the overall tile limit been reached already.
+    bool m_overall_tile_limit_reached = false;
+
 }; // class expire_output_t
 
 #endif // OSM2PGSQL_EXPIRE_OUTPUT_HPP
diff --git a/src/expire-tiles.cpp b/src/expire-tiles.cpp
index 0686804ea..076148571 100644
--- a/src/expire-tiles.cpp
+++ b/src/expire-tiles.cpp
@@ -27,20 +27,30 @@
 #include "wkb.hpp"
 
 expire_tiles_t::expire_tiles_t(uint32_t max_zoom,
-                               std::shared_ptr<reprojection_t> projection)
-: m_projection(std::move(projection)), m_maxzoom(max_zoom),
-  m_map_width(static_cast<int>(1U << m_maxzoom))
-{}
+                               std::shared_ptr<reprojection_t> projection,
+                               std::size_t max_tiles_geometry)
+: m_projection(std::move(projection)), m_max_tiles_geometry(max_tiles_geometry),
+  m_maxzoom(max_zoom), m_map_width(static_cast<int>(1U << m_maxzoom))
+{
+}
 
 void expire_tiles_t::expire_tile(uint32_t x, uint32_t y)
 {
-    // Only try to insert to tile into the set if the last inserted tile
-    // is different from this tile.
+    if (m_dirty_tiles.size() > m_max_tiles_geometry) {
+        return;
+    }
+
     tile_t const new_tile{m_maxzoom, x, y};
-    if (!m_prev_tile.valid() || m_prev_tile != new_tile) {
-        m_dirty_tiles.insert(new_tile.quadkey());
-        m_prev_tile = new_tile;
+    m_dirty_tiles.insert(new_tile.quadkey());
+}
+
+void expire_tiles_t::commit_tiles(expire_output_t *expire_output)
+{
+    if (!expire_output || m_dirty_tiles.empty()) {
+        return;
     }
+    expire_output->add_tiles(m_dirty_tiles);
+    m_dirty_tiles.clear();
 }
 
 uint32_t expire_tiles_t::normalise_tile_x_coord(int x) const
@@ -281,24 +291,6 @@ quadkey_list_t expire_tiles_t::get_tiles()
     return tiles;
 }
 
-void expire_tiles_t::merge_and_destroy(expire_tiles_t *other)
-{
-    if (m_map_width != other->m_map_width) {
-        throw fmt_error("Unable to merge tile expiry sets when "
-                        "map_width does not match: {} != {}.",
-                        m_map_width, other->m_map_width);
-    }
-
-    if (m_dirty_tiles.empty()) {
-        using std::swap;
-        swap(m_dirty_tiles, other->m_dirty_tiles);
-    } else {
-        m_dirty_tiles.insert(other->m_dirty_tiles.cbegin(),
-                             other->m_dirty_tiles.cend());
-        other->m_dirty_tiles.clear();
-    }
-}
-
 int expire_from_result(expire_tiles_t *expire, pg_result_t const &result,
                        expire_config_t const &expire_config)
 {
diff --git a/src/expire-tiles.hpp b/src/expire-tiles.hpp
index a372d3759..73ee1add8 100644
--- a/src/expire-tiles.hpp
+++ b/src/expire-tiles.hpp
@@ -18,6 +18,7 @@
 #include <vector>
 
 #include "expire-config.hpp"
+#include "expire-output.hpp"
 #include "geom.hpp"
 #include "geom-box.hpp"
 #include "logging.hpp"
@@ -31,9 +32,8 @@ class expire_tiles_t
 {
 public:
     expire_tiles_t(uint32_t max_zoom,
-                   std::shared_ptr<reprojection_t> projection);
-
-    bool empty() const noexcept { return m_dirty_tiles.empty(); }
+                   std::shared_ptr<reprojection_t> projection,
+                   std::size_t max_tiles_geometry = DEFAULT_MAX_TILES_GEOMETRY);
 
     bool enabled() const noexcept { return m_maxzoom != 0; }
 
@@ -83,10 +83,13 @@ class expire_tiles_t
     quadkey_list_t get_tiles();
 
     /**
-     * Merge the list of expired tiles in the other object into this
-     * object, destroying the list in the other object.
+     * Must be called after calling expire_tile() one or more times for a
+     * single geometry to "commit" all tiles to be expired for that geometry.
+     *
+     * \param expire_output The expire output to write tiles to. If this is
+     *                      the nullptr, nothing is done.
      */
-    void merge_and_destroy(expire_tiles_t *other);
+    void commit_tiles(expire_output_t* expire_output);
 
 private:
     /**
@@ -113,11 +116,9 @@ class expire_tiles_t
     /// This is where we collect all the expired tiles.
     std::unordered_set<quadkey_t> m_dirty_tiles;
 
-    /// The tile which has been added last to the unordered set.
-    tile_t m_prev_tile;
-
     std::shared_ptr<reprojection_t> m_projection;
 
+    std::size_t m_max_tiles_geometry;
     uint32_t m_maxzoom;
     int m_map_width;
 
diff --git a/src/flex-lua-expire-output.cpp b/src/flex-lua-expire-output.cpp
index 8248d30d6..172f29e8b 100644
--- a/src/flex-lua-expire-output.cpp
+++ b/src/flex-lua-expire-output.cpp
@@ -62,6 +62,26 @@ create_expire_output(lua_State *lua_state, std::string const &default_schema,
     }
     lua_pop(lua_state, 1); // "minzoom"
 
+    // optional "max_tiles_geometry" field
+    auto const max_tiles_geometry = luaX_get_table_optional_uint64(
+        lua_state, "max_tiles_geometry", -1,
+        "The 'max_tiles_geometry' field in a expire output", 1, (4ULL << 20ULL),
+        "1 and 4 << 20");
+    if (max_tiles_geometry > 0) {
+        new_expire_output.set_max_tiles_geometry(max_tiles_geometry);
+    }
+    lua_pop(lua_state, 1); // "max_tiles_geometry"
+
+    // optional "max_tiles_overall" field
+    auto const max_tiles_overall = luaX_get_table_optional_uint64(
+        lua_state, "max_tiles_overall", -1,
+        "The 'max_tiles_overall' field in a expire output", 1, (4ULL << 20ULL),
+        "1 and 4 << 20");
+    if (max_tiles_overall > 0) {
+        new_expire_output.set_max_tiles_overall(max_tiles_overall);
+    }
+    lua_pop(lua_state, 1); // "max_tiles_overall"
+
     return new_expire_output;
 }
 
@@ -71,6 +91,8 @@ TRAMPOLINE_WRAPPED_OBJECT(expire_output, maxzoom)
 TRAMPOLINE_WRAPPED_OBJECT(expire_output, minzoom)
 TRAMPOLINE_WRAPPED_OBJECT(expire_output, schema)
 TRAMPOLINE_WRAPPED_OBJECT(expire_output, table)
+TRAMPOLINE_WRAPPED_OBJECT(expire_output, max_tiles_geometry)
+TRAMPOLINE_WRAPPED_OBJECT(expire_output, max_tiles_overall)
 
 } // anonymous namespace
 
@@ -106,7 +128,11 @@ void lua_wrapper_expire_output_t::init(lua_State *lua_state)
          {"maxzoom", lua_trampoline_expire_output_maxzoom},
          {"minzoom", lua_trampoline_expire_output_minzoom},
          {"schema", lua_trampoline_expire_output_schema},
-         {"table", lua_trampoline_expire_output_table}});
+         {"table", lua_trampoline_expire_output_table},
+         {"max_tiles_geometry",
+          lua_trampoline_expire_output_max_tiles_geometry},
+         {"max_tiles_overall",
+          lua_trampoline_expire_output_max_tiles_overall}});
 }
 
 int lua_wrapper_expire_output_t::tostring() const
@@ -150,3 +176,17 @@ int lua_wrapper_expire_output_t::table() const noexcept
     luaX_pushstring(lua_state(), self().table());
     return 1;
 }
+
+int lua_wrapper_expire_output_t::max_tiles_geometry() const noexcept
+{
+    lua_pushinteger(lua_state(),
+                    static_cast<lua_Integer>(self().max_tiles_geometry()));
+    return 1;
+}
+
+int lua_wrapper_expire_output_t::max_tiles_overall() const noexcept
+{
+    lua_pushinteger(lua_state(),
+                    static_cast<lua_Integer>(self().max_tiles_overall()));
+    return 1;
+}
diff --git a/src/flex-lua-expire-output.hpp b/src/flex-lua-expire-output.hpp
index 9e71d6471..437023ea8 100644
--- a/src/flex-lua-expire-output.hpp
+++ b/src/flex-lua-expire-output.hpp
@@ -42,6 +42,8 @@ class lua_wrapper_expire_output_t : public lua_wrapper_base_t<expire_output_t>
     int minzoom() const noexcept;
     int schema() const noexcept;
     int table() const noexcept;
+    int max_tiles_geometry() const noexcept;
+    int max_tiles_overall() const noexcept;
 
 }; // class lua_wrapper_expire_output_t
 
diff --git a/src/flex-table-column.cpp b/src/flex-table-column.cpp
index 121fd485e..4ba1ac273 100644
--- a/src/flex-table-column.cpp
+++ b/src/flex-table-column.cpp
@@ -202,13 +202,18 @@ void flex_table_column_t::add_expire(expire_config_t const &config)
     m_expires.push_back(config);
 }
 
-void flex_table_column_t::do_expire(geom::geometry_t const &geom,
-                                    std::vector<expire_tiles_t> *expire) const
+void flex_table_column_t::do_expire(
+    geom::geometry_t const &geom, std::vector<expire_tiles_t> *expire,
+    std::vector<expire_output_t> *expire_outputs) const
 {
     assert(expire);
+    assert(expire_outputs);
+
     for (auto const &expire_config : m_expires) {
         assert(expire_config.expire_output < expire->size());
-        (*expire)[expire_config.expire_output].from_geometry(geom,
-                                                             expire_config);
+        auto &expire_tiles = expire->at(expire_config.expire_output);
+        expire_tiles.from_geometry(geom, expire_config);
+        expire_tiles.commit_tiles(
+            &expire_outputs->at(expire_config.expire_output));
     }
 }
diff --git a/src/flex-table-column.hpp b/src/flex-table-column.hpp
index 213bd9726..966e73d2e 100644
--- a/src/flex-table-column.hpp
+++ b/src/flex-table-column.hpp
@@ -132,7 +132,8 @@ class flex_table_column_t
     }
 
     void do_expire(geom::geometry_t const &geom,
-                   std::vector<expire_tiles_t> *expire) const;
+                   std::vector<expire_tiles_t> *expire,
+                   std::vector<expire_output_t> *expire_outputs) const;
 
 private:
     std::vector<expire_config_t> m_expires;
diff --git a/src/flex-write.cpp b/src/flex-write.cpp
index 688b66b76..b023cb5fd 100644
--- a/src/flex-write.cpp
+++ b/src/flex-write.cpp
@@ -258,7 +258,8 @@ bool is_compatible(geom::geometry_t const &geom,
 void flex_write_column(lua_State *lua_state,
                        db_copy_mgr_t<db_deleter_by_type_and_id_t> *copy_mgr,
                        flex_table_column_t const &column,
-                       std::vector<expire_tiles_t> *expire)
+                       std::vector<expire_tiles_t> *expire,
+                       std::vector<expire_output_t> *expire_outputs)
 {
     lua_getfield(lua_state, -1, column.name().c_str());
     int const ltype = lua_type(lua_state, -1);
@@ -423,12 +424,12 @@ void flex_write_column(lua_State *lua_state,
                      type == table_column_type::multilinestring ||
                      type == table_column_type::multipolygon);
                 if (geom->srid() == column.srid()) {
-                    column.do_expire(*geom, expire);
+                    column.do_expire(*geom, expire, expire_outputs);
                     copy_mgr->add_hex_geom(geom_to_ewkb(*geom, wrap_multi));
                 } else {
                     auto const &proj = get_projection(column.srid());
                     auto const tgeom = geom::transform(*geom, proj);
-                    column.do_expire(tgeom, expire);
+                    column.do_expire(tgeom, expire, expire_outputs);
                     copy_mgr->add_hex_geom(geom_to_ewkb(tgeom, wrap_multi));
                 }
             } else {
diff --git a/src/flex-write.hpp b/src/flex-write.hpp
index 6150aace8..bef1b45c0 100644
--- a/src/flex-write.hpp
+++ b/src/flex-write.hpp
@@ -37,6 +37,7 @@ class not_null_exception_t : public std::runtime_error
 void flex_write_column(lua_State *lua_state,
                        db_copy_mgr_t<db_deleter_by_type_and_id_t> *copy_mgr,
                        flex_table_column_t const &column,
-                       std::vector<expire_tiles_t> *expire);
+                       std::vector<expire_tiles_t> *expire,
+                       std::vector<expire_output_t> *expire_outputs);
 
 #endif // OSM2PGSQL_FLEX_WRITE_HPP
diff --git a/src/lua-utils.cpp b/src/lua-utils.cpp
index 4734dd4a7..a50ea9f8d 100644
--- a/src/lua-utils.cpp
+++ b/src/lua-utils.cpp
@@ -217,6 +217,30 @@ uint32_t luaX_get_table_optional_uint32(lua_State *lua_state, char const *key,
     return static_cast<uint32_t>(num);
 }
 
+uint64_t luaX_get_table_optional_uint64(lua_State *lua_state, char const *key,
+                                        int table_index, char const *error_msg,
+                                        uint64_t min, uint64_t max,
+                                        char const *range)
+{
+    assert(lua_state);
+    assert(key);
+    assert(error_msg);
+    lua_getfield(lua_state, table_index, key);
+    if (lua_isnil(lua_state, -1)) {
+        return 0;
+    }
+    if (!lua_isnumber(lua_state, -1)) {
+        throw fmt_error("{} must contain an integer.", error_msg);
+    }
+
+    auto const num = lua_tonumber(lua_state, -1);
+    if (num < static_cast<double>(min) || num > static_cast<double>(max)) {
+        throw fmt_error("{} must be between {}.", error_msg, range);
+    }
+
+    return static_cast<uint64_t>(num);
+}
+
 // Lua 5.1 doesn't support luaL_traceback, unless LuaJIT is used
 #if LUA_VERSION_NUM < 502 && !defined(HAVE_LUAJIT)
 
diff --git a/src/lua-utils.hpp b/src/lua-utils.hpp
index 8030935b5..979481026 100644
--- a/src/lua-utils.hpp
+++ b/src/lua-utils.hpp
@@ -70,6 +70,11 @@ uint32_t luaX_get_table_optional_uint32(lua_State *lua_state, char const *key,
                                         uint32_t min, uint32_t max,
                                         char const *range);
 
+uint64_t luaX_get_table_optional_uint64(lua_State *lua_state, char const *key,
+                                        int table_index, char const *error_msg,
+                                        uint64_t min, uint64_t max,
+                                        char const *range);
+
 bool luaX_get_table_bool(lua_State *lua_state, char const *key, int table_index,
                          char const *error_msg, bool default_value);
 
diff --git a/src/osm2pgsql-expire.cpp b/src/osm2pgsql-expire.cpp
index 36f9a4163..1859cbed7 100644
--- a/src/osm2pgsql-expire.cpp
+++ b/src/osm2pgsql-expire.cpp
@@ -83,14 +83,14 @@ class output_expire_t : public output_t
     void way_delete(osmium::Way * /*way*/) override {}
     void relation_delete(osmium::Relation const & /*rel*/) override {}
 
-    void merge_expire_trees(output_t * /*other*/) override {}
-
     void print(std::string const &format);
 
 private:
+    void create_expire_tiles(geom::geometry_t const &geom);
+
     config_t m_config;
-    expire_tiles_t m_expire_tiles;
     expire_output_t m_expire_output;
+    expire_tiles_t m_expire_tiles;
 }; // class output_expire_t
 
 std::shared_ptr<output_t> output_expire_t::clone(
@@ -106,20 +106,26 @@ output_expire_t::output_expire_t(std::shared_ptr<middle_query_t> const &mid,
 : output_t(mid, std::move(thread_pool), options), m_config(cfg),
   m_expire_tiles(cfg.zoom, cfg.projection)
 {
+    m_expire_output.set_minzoom(cfg.zoom);
+    m_expire_output.set_maxzoom(cfg.zoom);
 }
 
 output_expire_t::~output_expire_t() = default;
 
+void output_expire_t::create_expire_tiles(geom::geometry_t const &geom)
+{
+    auto const geom_merc = geom::transform(geom, *m_config.projection);
+    m_expire_tiles.from_geometry(geom_merc, m_config.expire_config);
+    m_expire_tiles.commit_tiles(&m_expire_output);
+}
+
 void output_expire_t::node_add(osmium::Node const &node)
 {
     if (node.tags().empty()) {
         return;
     }
 
-    auto const geom_merc =
-        geom::transform(geom::create_point(node), *m_config.projection);
-
-    m_expire_tiles.from_geometry(geom_merc, m_config.expire_config);
+    create_expire_tiles(geom::create_point(node));
 }
 
 void output_expire_t::way_add(osmium::Way *way)
@@ -152,9 +158,7 @@ void output_expire_t::way_add(osmium::Way *way)
         return;
     }
 
-    auto const geom_merc = geom::transform(geom, *m_config.projection);
-
-    m_expire_tiles.from_geometry(geom_merc, m_config.expire_config);
+    create_expire_tiles(geom);
 }
 
 void output_expire_t::relation_add(osmium::Relation const &relation)
@@ -207,9 +211,7 @@ void output_expire_t::relation_add(osmium::Relation const &relation)
         return;
     }
 
-    auto const geom_merc = geom::transform(geom, *m_config.projection);
-
-    m_expire_tiles.from_geometry(geom_merc, m_config.expire_config);
+    create_expire_tiles(geom);
 }
 
 std::string tile_to_json(tile_t const &tile)
@@ -251,6 +253,8 @@ std::string geojson_end() { return "]}\n"; }
 
 void print_tiles(std::vector<tile_t> const &tiles)
 {
+    log_debug("Writing out {} tiles in 'geojson' format...", tiles.size());
+
     fmt::print("{}\n", geojson_start());
     bool first = true;
     for (auto const &tile : tiles) {
@@ -334,7 +338,9 @@ config_t parse_command_line(int argc, char *argv[])
 
 void output_expire_t::print(std::string const &format)
 {
-    auto const tiles = m_expire_tiles.get_tiles();
+    auto const tiles = m_expire_output.get_tiles();
+    log_debug("Writing out {} tiles in '{}' format...", tiles.size(), format);
+
     if (format == "tiles") {
         for (auto const &qk : tiles) {
             auto const tile = tile_t::from_quadkey(qk, m_config.zoom);
@@ -398,6 +404,12 @@ int main(int argc, char *argv[])
         auto const &suffix = input.back();
         if (suffix == "osm" || suffix == "pbf" || suffix == "opl") {
             // input is an OSM file
+
+            if (cfg.zoom == 0) {
+                throw std::runtime_error{
+                    "You have to set the zoom level with -z, --zoom"};
+            }
+
             auto thread_pool = std::make_shared<thread_pool_t>(1U);
             log_debug("Started pool with {} threads.",
                       thread_pool->num_threads());
@@ -427,6 +439,7 @@ int main(int argc, char *argv[])
             }
             print_tiles(tiles);
         }
+        log_debug("Done.");
     } catch (std::exception const &e) {
         log_error("{}", e.what());
         return 1;
diff --git a/src/osmdata.cpp b/src/osmdata.cpp
index 3d87dd175..3f0a5a105 100644
--- a/src/osmdata.cpp
+++ b/src/osmdata.cpp
@@ -252,17 +252,6 @@ class multithreaded_processor_t
                       &output_t::pending_relation_stage1c);
     }
 
-    /**
-     * Collect expiry tree information from all clones and merge it back
-     * into the original output.
-     */
-    void merge_expire_trees()
-    {
-        for (auto const &clone : m_clones) {
-            m_output->merge_expire_trees(clone.get());
-        }
-    }
-
 private:
     /// Get the next id from the queue.
     static osmid_t pop_id(idlist_t *queue, std::mutex *mutex)
@@ -392,7 +381,6 @@ void osmdata_t::process_dependents()
             m_rels_pending_tracker.sort_unique();
             proc.process_relations(std::move(m_rels_pending_tracker));
         }
-        proc.merge_expire_trees();
     }
 
     // stage 1c processing: mark parent relations of marked objects as changed
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index c3d78f9e6..5541da3be 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -809,7 +809,7 @@ int output_flex_t::table_insert()
                 copy_mgr->add_column(id);
             } else {
                 flex_write_column(lua_state(), copy_mgr, column,
-                                  &m_expire_tiles);
+                                  &m_expire_tiles, m_expire_outputs.get());
             }
         }
         table_connection.increment_insert_counter();
@@ -1020,12 +1020,11 @@ void output_flex_t::stop()
 
     assert(m_expire_outputs->size() == m_expire_tiles.size());
     for (std::size_t i = 0; i < m_expire_outputs->size(); ++i) {
-        if (!m_expire_tiles[i].empty()) {
-            auto const &eo = (*m_expire_outputs)[i];
+        if (!(*m_expire_outputs)[i].empty()) {
+            auto &eo = (*m_expire_outputs)[i];
 
             std::size_t const count =
-                eo.output(m_expire_tiles[i].get_tiles(),
-                          get_options()->connection_params);
+                eo.output(get_options()->connection_params);
 
             log_info("Wrote {} entries to expire output [{}].", count, i);
         }
@@ -1113,7 +1112,8 @@ void output_flex_t::delete_from_table(table_connection_t *table_connection,
                 if (column.has_expire()) {
                     for (int i = 0; i < num_tuples; ++i) {
                         auto const geom = ewkb_to_geom(result.get(i, col));
-                        column.do_expire(geom, &m_expire_tiles);
+                        column.do_expire(geom, &m_expire_tiles,
+                                         m_expire_outputs.get());
                     }
                     ++col;
                 }
@@ -1242,7 +1242,8 @@ output_flex_t::output_flex_t(output_flex_t const *other,
     for (auto &expire_output : *m_expire_outputs) {
         m_expire_tiles.emplace_back(
             expire_output.maxzoom(),
-            reprojection_t::create_projection(PROJ_SPHERE_MERC));
+            reprojection_t::create_projection(PROJ_SPHERE_MERC),
+            expire_output.max_tiles_geometry());
     }
 }
 
@@ -1308,7 +1309,8 @@ output_flex_t::output_flex_t(std::shared_ptr<middle_query_t> const &mid,
     for (auto const &expire_output : *m_expire_outputs) {
         m_expire_tiles.emplace_back(
             expire_output.maxzoom(),
-            reprojection_t::create_projection(PROJ_SPHERE_MERC));
+            reprojection_t::create_projection(PROJ_SPHERE_MERC),
+            expire_output.max_tiles_geometry());
     }
 
     create_expire_tables(*m_expire_outputs, get_options()->connection_params);
@@ -1515,12 +1517,3 @@ void output_flex_t::reprocess_marked()
     // We don't need these any more so can free the memory.
     m_stage2_way_ids->clear();
 }
-
-void output_flex_t::merge_expire_trees(output_t *other)
-{
-    auto *const opgsql = dynamic_cast<output_flex_t *>(other);
-    assert(m_expire_tiles.size() == opgsql->m_expire_tiles.size());
-    for (std::size_t i = 0; i < m_expire_tiles.size(); ++i) {
-        m_expire_tiles[i].merge_and_destroy(&opgsql->m_expire_tiles[i]);
-    }
-}
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index 446273a13..427225208 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -151,8 +151,6 @@ class output_flex_t : public output_t
     void way_delete(osmium::Way *way) override;
     void relation_delete(osmium::Relation const &rel) override;
 
-    void merge_expire_trees(output_t *other) override;
-
     int app_as_point();
     int app_as_linestring();
     int app_as_polygon();
diff --git a/src/output-pgsql.cpp b/src/output-pgsql.cpp
index 97316b1b0..de1f51275 100644
--- a/src/output-pgsql.cpp
+++ b/src/output-pgsql.cpp
@@ -102,6 +102,7 @@ void output_pgsql_t::pgsql_out_way(osmium::Way const &way, taglist_t *tags,
         auto const wkb = geom_to_ewkb(projected_geom);
         if (!wkb.empty()) {
             m_expire.from_geometry_if_3857(projected_geom, m_expire_config);
+            m_expire.commit_tiles(&m_expire_output);
             if (m_enable_way_area) {
                 double const area = calculate_area(
                     get_options()->reproject_area, geom, projected_geom);
@@ -117,6 +118,7 @@ void output_pgsql_t::pgsql_out_way(osmium::Way const &way, taglist_t *tags,
             geom::transform(geom::create_linestring(way), *m_proj), split_at));
         for (auto const &sgeom : geoms) {
             m_expire.from_geometry_if_3857(sgeom, m_expire_config);
+            m_expire.commit_tiles(&m_expire_output);
             auto const wkb = geom_to_ewkb(sgeom);
             m_tables[t_line]->write_row(way.id(), *tags, wkb);
             if (roads) {
@@ -180,12 +182,7 @@ void output_pgsql_t::stop()
     }
 
     if (get_options()->expire_tiles_zoom_min > 0) {
-        expire_output_t expire_out;
-        expire_out.set_filename(get_options()->expire_tiles_filename);
-        expire_out.set_minzoom(get_options()->expire_tiles_zoom_min);
-        expire_out.set_maxzoom(get_options()->expire_tiles_zoom);
-        auto const count =
-            expire_out.output_tiles_to_file(m_expire.get_tiles());
+        auto const count = m_expire_output.output(connection_params_t{});
         log_info("Wrote {} entries to expired tiles list", count);
     }
 }
@@ -218,6 +215,7 @@ void output_pgsql_t::node_add(osmium::Node const &node)
 
     auto const geom = geom::transform(geom::create_point(node), *m_proj);
     m_expire.from_geometry_if_3857(geom, m_expire_config);
+    m_expire.commit_tiles(&m_expire_output);
     auto const wkb = geom_to_ewkb(geom);
     m_tables[t_point]->write_row(node.id(), outtags, wkb);
 }
@@ -296,6 +294,7 @@ void output_pgsql_t::pgsql_process_relation(osmium::Relation const &rel)
         auto const geoms = geom::split_multi(std::move(projected_geom));
         for (auto const &sgeom : geoms) {
             m_expire.from_geometry_if_3857(sgeom, m_expire_config);
+            m_expire.commit_tiles(&m_expire_output);
             auto const wkb = geom_to_ewkb(sgeom);
             m_tables[t_line]->write_row(-rel.id(), outtags, wkb);
             if (roads) {
@@ -312,6 +311,7 @@ void output_pgsql_t::pgsql_process_relation(osmium::Relation const &rel)
         for (auto const &sgeom : geoms) {
             auto const projected_geom = geom::transform(sgeom, *m_proj);
             m_expire.from_geometry_if_3857(projected_geom, m_expire_config);
+            m_expire.commit_tiles(&m_expire_output);
             auto const wkb = geom_to_ewkb(projected_geom);
             if (m_enable_way_area) {
                 double const area = calculate_area(
@@ -461,6 +461,10 @@ output_pgsql_t::output_pgsql_t(std::shared_ptr<middle_query_t> const &mid,
              "https://osm2pgsql.org/doc/"
              "faq.html#the-pgsql-output-is-deprecated-what-does-that-mean");
 
+    m_expire_output.set_filename(options.expire_tiles_filename);
+    m_expire_output.set_minzoom(options.expire_tiles_zoom_min);
+    m_expire_output.set_maxzoom(options.expire_tiles_zoom);
+
     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;
@@ -524,6 +528,7 @@ output_pgsql_t::output_pgsql_t(
   m_enable_way_area(other->m_enable_way_area),
   m_ignore_untagged_objects(other->m_ignore_untagged_objects),
   m_proj(get_options()->projection), m_expire_config(other->m_expire_config),
+  m_expire_output(other->m_expire_output),
   m_expire(get_options()->expire_tiles_zoom, get_options()->projection),
   m_buffer(1024, osmium::memory::Buffer::auto_grow::yes),
   m_rels_buffer(1024, osmium::memory::Buffer::auto_grow::yes),
@@ -537,11 +542,3 @@ output_pgsql_t::output_pgsql_t(
 }
 
 output_pgsql_t::~output_pgsql_t() = default;
-
-void output_pgsql_t::merge_expire_trees(output_t *other)
-{
-    auto *const opgsql = dynamic_cast<output_pgsql_t *>(other);
-    if (opgsql) {
-        m_expire.merge_and_destroy(&opgsql->m_expire);
-    }
-}
diff --git a/src/output-pgsql.hpp b/src/output-pgsql.hpp
index dd2679b66..b0cdc45d3 100644
--- a/src/output-pgsql.hpp
+++ b/src/output-pgsql.hpp
@@ -81,8 +81,6 @@ class output_pgsql_t : public output_t
     void way_delete(osmium::Way *way) override;
     void relation_delete(osmium::Relation const &rel) override;
 
-    void merge_expire_trees(output_t *other) override;
-
 private:
     void pgsql_out_way(osmium::Way const &way, taglist_t *tags, bool polygon,
                        bool roads);
@@ -108,6 +106,7 @@ class output_pgsql_t : public output_t
 
     std::shared_ptr<reprojection_t> m_proj;
     expire_config_t m_expire_config;
+    expire_output_t m_expire_output;
     expire_tiles_t m_expire;
 
     osmium::memory::Buffer m_buffer;
diff --git a/src/output.hpp b/src/output.hpp
index f7d3b85bd..54c6b1323 100644
--- a/src/output.hpp
+++ b/src/output.hpp
@@ -102,8 +102,6 @@ class output_t
     virtual void way_delete(osmium::Way *way) = 0;
     virtual void relation_delete(osmium::Relation const &rel) = 0;
 
-    virtual void merge_expire_trees(output_t * /*other*/) {}
-
     output_requirements const &get_requirements() const noexcept
     {
         return m_output_requirements;
diff --git a/tests/bdd/flex/expire-limit.feature b/tests/bdd/flex/expire-limit.feature
new file mode 100644
index 000000000..b40f37062
--- /dev/null
+++ b/tests/bdd/flex/expire-limit.feature
@@ -0,0 +1,98 @@
+Feature: Changes with limited expire on zoom 2
+
+    Background:
+        Given the style file 'test_expire_limit.lua'
+
+        And the OSM data
+            """
+            n10 v1 dV x10 y10
+            n11 v1 dV x100 y10
+            n12 v1 dV x10 y70
+            n13 v1 dV x100 y70
+            """
+        When running osm2pgsql flex with parameters
+            | --slim |
+
+        Then table osm2pgsql_test_t1 contains exactly
+            | way_id |
+        Then table osm2pgsql_test_expire contains exactly
+            | zoom | x | y |
+
+
+    Scenario: short ways are okay
+        Given the OSM data
+            """
+            w20 v1 dV Ta=b Nn10,n11
+            w21 v1 dV Ta=b Nn10,n12
+            """
+
+        When running osm2pgsql flex with parameters
+            | --slim | -a |
+
+        Then table osm2pgsql_test_t1 contains exactly
+            | way_id |
+            | 20     |
+            | 21     |
+        Then table osm2pgsql_test_expire contains exactly
+            | zoom | x | y |
+            | 2    | 2 | 1 |
+            | 2    | 3 | 1 |
+            | 2    | 2 | 0 |
+
+
+    Scenario: long way is not okay
+        Given the OSM data
+            """
+            w20 v1 dV Ta=b Nn10,n11,n13
+            """
+
+        When running osm2pgsql flex with parameters
+            | --slim | -a |
+
+        Then table osm2pgsql_test_t1 contains exactly
+            | way_id |
+            | 20     |
+        Then table osm2pgsql_test_expire contains exactly
+            | zoom | x | y |
+        And the error output contains
+            """
+            Tile limit 2 reached for single geometry!
+            """
+
+    Scenario: too many tiles overall is not okay
+        Given the OSM data
+            """
+            n14 v1 dV x100 y-10
+            n15 v1 dV x100 y-70
+            n16 v1 dV x10 y-70
+            n17 v1 dV x-10 y-70
+            n18 v1 dV x-100 y-70
+            w20 v1 dV Ta=b Nn13,n11
+            w21 v1 dV Ta=b Nn14,n15
+            w22 v1 dV Ta=b Nn15,n16
+            w23 v1 dV Ta=b Nn16,n17
+            w24 v1 dV Ta=b Nn17,n18
+            """
+
+        When running osm2pgsql flex with parameters
+            | --slim | -a |
+
+        Then table osm2pgsql_test_t1 contains exactly
+            | way_id |
+            | 20     |
+            | 21     |
+            | 22     |
+            | 23     |
+            | 24     |
+        Then table osm2pgsql_test_expire contains exactly
+            | zoom | x | y |
+            | 2    | 3 | 0 |
+            | 2    | 3 | 1 |
+            | 2    | 3 | 2 |
+            | 2    | 2 | 3 |
+            | 2    | 3 | 3 |
+        And the error output contains
+            """
+            Overall tile limit 6 reached for this run!
+            """
+
diff --git a/tests/bdd/flex/lua-expire-output-definitions.feature b/tests/bdd/flex/lua-expire-output-definitions.feature
index 500328c72..1a88dddb0 100644
--- a/tests/bdd/flex/lua-expire-output-definitions.feature
+++ b/tests/bdd/flex/lua-expire-output-definitions.feature
@@ -142,3 +142,37 @@ Feature: Expire output definitions in Lua file
             The 'minzoom' field in a expire output must be between 1 and 'maxzoom'.
             """
 
+    Scenario: max_tiles_geometry in expire output definition has to be in range
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            osm2pgsql.define_expire_output({
+                maxzoom = 12,
+                filename = 'somewhere',
+                max_tiles_geometry = 12345678901234567890
+            })
+            """
+        When running osm2pgsql flex
+        Then execution fails
+        And the error output contains
+            """
+            The 'max_tiles_geometry' field in a expire output must be between 1 and 4 << 20.
+            """
+
+    Scenario: max_tiles_overall in expire output definition has to be in range
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            osm2pgsql.define_expire_output({
+                maxzoom = 12,
+                filename = 'somewhere',
+                max_tiles_overall = -1
+            })
+            """
+        When running osm2pgsql flex
+        Then execution fails
+        And the error output contains
+            """
+            The 'max_tiles_overall' field in a expire output must be between 1 and 4 << 20.
+            """
+
diff --git a/tests/data/test_expire_limit.lua b/tests/data/test_expire_limit.lua
new file mode 100644
index 000000000..8dbe62d39
--- /dev/null
+++ b/tests/data/test_expire_limit.lua
@@ -0,0 +1,20 @@
+
+local eo = osm2pgsql.define_expire_output({
+    table = 'osm2pgsql_test_expire',
+    maxzoom = 2,
+    max_tiles_geometry = 2,
+    max_tiles_overall = 6,
+})
+
+local the_table = osm2pgsql.define_way_table('osm2pgsql_test_t1', {
+    { column = 'tags', type = 'hstore' },
+    { column = 'geom', type = 'linestring', expire = {{ output = eo }} },
+})
+
+function osm2pgsql.process_way(object)
+    the_table:insert{
+        tags = object.tags,
+        geom = object:as_linestring()
+    }
+end
+
diff --git a/tests/test-expire-tiles.cpp b/tests/test-expire-tiles.cpp
index 48486f717..22bdfbadf 100644
--- a/tests/test-expire-tiles.cpp
+++ b/tests/test-expire-tiles.cpp
@@ -97,7 +97,7 @@ TEST_CASE("simple expire z1", "[NoDB]")
     et.from_bbox({-10000, -10000, 10000, 10000}, expire_config_t{});
 
     auto const tiles = get_tiles_ordered(&et, zoom, zoom);
-    CHECK(tiles.size() == 4);
+    REQUIRE(tiles.size() == 4);
 
     auto itr = tiles.cbegin();
     CHECK(*(itr++) == tile_t(1, 0, 0));
@@ -376,122 +376,3 @@ TEST_CASE("expire centroids", "[NoDB]")
         CHECK(set == check_set);
     }
 }
-
-/**
- * After expiring a random set of tiles in one expire_tiles_t object
- * and a different set in another, when they are merged together they are the
- * same as if the union of the sets of tiles had been expired.
- */
-TEST_CASE("merge expire sets", "[NoDB]")
-{
-    uint32_t const zoom = 18;
-
-    for (int i = 0; i < 100; ++i) {
-        expire_tiles_t et{zoom, defproj};
-        expire_tiles_t et1{zoom, defproj};
-        expire_tiles_t et2{zoom, defproj};
-
-        auto check_set1 = generate_random(zoom, 100);
-        expire_centroids(&et1, check_set1);
-
-        auto check_set2 = generate_random(zoom, 100);
-        expire_centroids(&et2, check_set2);
-
-        et.merge_and_destroy(&et1);
-        et.merge_and_destroy(&et2);
-
-        check_set1.merge(check_set2);
-
-        auto const set = get_tiles_unordered(&et, zoom);
-
-        CHECK(set == check_set1);
-    }
-}
-
-/**
- * Merging two identical sets results in the same set. This guarantees that
- * we check some pathways of the merging which possibly could be skipped by
- * the random tile set in the previous test.
- */
-TEST_CASE("merge identical expire sets", "[NoDB]")
-{
-    uint32_t const zoom = 18;
-
-    for (int i = 0; i < 100; ++i) {
-        expire_tiles_t et{zoom, defproj};
-        expire_tiles_t et1{zoom, defproj};
-        expire_tiles_t et2{zoom, defproj};
-
-        auto const check_set = generate_random(zoom, 100);
-        expire_centroids(&et1, check_set);
-        expire_centroids(&et2, check_set);
-
-        et.merge_and_destroy(&et1);
-        et.merge_and_destroy(&et2);
-
-        auto const set = get_tiles_unordered(&et, zoom);
-
-        CHECK(set == check_set);
-    }
-}
-
-/**
- * Make sure that we're testing the case where some tiles are in both.
- */
-TEST_CASE("merge overlapping expire sets", "[NoDB]")
-{
-    uint32_t const zoom = 18;
-
-    for (int i = 0; i < 100; ++i) {
-        expire_tiles_t et{zoom, defproj};
-        expire_tiles_t et1{zoom, defproj};
-        expire_tiles_t et2{zoom, defproj};
-
-        auto check_set1 = generate_random(zoom, 100);
-        expire_centroids(&et1, check_set1);
-
-        auto check_set2 = generate_random(zoom, 100);
-        expire_centroids(&et2, check_set2);
-
-        auto check_set3 = generate_random(zoom, 100);
-        expire_centroids(&et1, check_set3);
-        expire_centroids(&et2, check_set3);
-
-        et.merge_and_destroy(&et1);
-        et.merge_and_destroy(&et2);
-
-        check_set1.merge(check_set2);
-        check_set1.merge(check_set3);
-
-        auto const set = get_tiles_unordered(&et, zoom);
-
-        CHECK(set == check_set1);
-    }
-}
-
-/**
- * The set union still works when we expire large contiguous areas of tiles
- * (i.e: ensure that we handle the "complete" flag correctly)
- */
-TEST_CASE("merge with complete flag", "[NoDB]")
-{
-    uint32_t const zoom = 18;
-
-    expire_tiles_t et{zoom, defproj};
-    expire_tiles_t et0{zoom, defproj};
-    expire_tiles_t et1{zoom, defproj};
-    expire_tiles_t et2{zoom, defproj};
-
-    // et1&2 are two halves of et0's box
-    et0.from_bbox({-10000, -10000, 10000, 10000}, expire_config_t{});
-    et1.from_bbox({-10000, -10000, 0, 10000}, expire_config_t{});
-    et2.from_bbox({0, -10000, 10000, 10000}, expire_config_t{});
-
-    et.merge_and_destroy(&et1);
-    et.merge_and_destroy(&et2);
-
-    auto const set = get_tiles_unordered(&et, zoom);
-    auto const set0 = get_tiles_unordered(&et0, zoom);
-
-    CHECK(set == set0);
-}

From 985b652ac7148dec2307ff478073a88bbc453a30 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 28 Oct 2025 09:18:17 +0100
Subject: [PATCH 413/430] Remove special case in expire code that doesn't work
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We have had some code in osm2pgsql basically forever that is supposed to
handle the case where a (multi)polygon crosses the 180° line
(antimeridian).

The idea is as follows: Lets say we have a polygon (like a small island)
straddling the 180° line:

+---------------------+
|                     |
|                     |
|>                   <|
|                     |
+---------------------+

If we calculate the bounding box by taking the smallest and the largest
longitude value for that polygon, we'll get this:

+---------------------+
|                     |
| ___________________ |
|[___________________]|
|                     |
+---------------------+

To detect this, we check the width of the bounding box. If it is larger
than half the circumference of the earth, we assume that we have a case
like this.

Then we create two bounding boxes, one going from -180° to the left edge
of the original bounding box, one from the right edge of the original
bounding box to +180° like this:

+---------------------+
|                     |
|                     |
|]                   [|
|                     |
+---------------------+

The same code is run for multipolygon relations.

So far, so good. The problem is that this is not how we map things. We
don't have polygons crossing the 180° line in OSM, because they lead to
all sorts of problems when using the data.

Instead mapping is done using multipolygon relations. The polygon is
split into two, one to the left and one to the right of the 180° line.

The effect is that we have two polygons, both touching the 180° line.
When we use this algorithm, it calculates the bounding box as going
around the whole earth from -180° to +180°, then decides that this is
more than half the circumference of the earth, so it creates two new
bounding boxes with zero width, one at -180°, one at +180°. That doesn't
make any sense.

So this code handles cases we don't have in our current planet file, but
does the wrong thing for some cases we do have. It comes from way back,
probably before we had relations, we should retire it.
---
 src/expire-tiles.cpp | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/expire-tiles.cpp b/src/expire-tiles.cpp
index 076148571..249365070 100644
--- a/src/expire-tiles.cpp
+++ b/src/expire-tiles.cpp
@@ -240,17 +240,6 @@ int expire_tiles_t::from_bbox(geom::box_t const &box,
 {
     double const width = box.width();
     double const height = box.height();
-    if (width > tile_t::HALF_EARTH_CIRCUMFERENCE + 1) {
-        /* Over half the planet's width within the bounding box - assume the
-           box crosses the international date line and split it into two boxes */
-        int ret = from_bbox({-tile_t::HALF_EARTH_CIRCUMFERENCE, box.min_y(),
-                             box.min_x(), box.max_y()},
-                            expire_config);
-        ret += from_bbox({box.max_x(), box.min_y(),
-                          tile_t::HALF_EARTH_CIRCUMFERENCE, box.max_y()},
-                         expire_config);
-        return ret;
-    }
 
     if (expire_config.mode == expire_mode::hybrid &&
         (width > expire_config.full_area_limit ||

From 47442e506bfa5908e569bb76cae10ec1584d4089 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 31 Jan 2026 15:06:24 +0100
Subject: [PATCH 414/430] Fix: Delete to be expired tiles at the same time as
 reading them

The TRUNCATE didn't work, because there can be tiles from more than one
zoom level in the same table.

Using DELETE ... RETURNING we are ensured to always delete exactly what
we are getting back.
---
 src/gen/osm2pgsql-gen.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index eba14215f..ce3cc42ef 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -175,7 +175,7 @@ void get_tiles_from_table(pg_conn_t const &connection, std::string const &table,
                           std::vector<std::pair<uint32_t, uint32_t>> *tiles)
 {
     auto const result = connection.exec(
-        R"(SELECT x, y FROM "{}" WHERE zoom = {})", table, zoom);
+        R"(DELETE FROM "{}" WHERE zoom = {} RETURNING x, y)", table, zoom);
 
     tiles->reserve(result.num_tuples());
 
@@ -476,8 +476,6 @@ class genproc_t
             log_debug("Running generalizer for expire list from table '{}'...",
                       table);
             get_tiles_from_table(db_connection, table, zoom, &tile_list);
-            log_debug("Truncating table '{}'...", table);
-            db_connection.exec("TRUNCATE {}", table);
         } else {
             auto const extent =
                 get_extent_from_db(db_connection, m_dbschema, params, zoom);

From e6c0986cce8ecbf9f4602d097bd58296e07ef45b Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sat, 31 Jan 2026 16:14:58 +0100
Subject: [PATCH 415/430] Add max_tiles_per_run setting for tile generalizers

Limits the number of tiles for which the generalizer is run. Used when
generalization is too expensive to always run for all expired tiles.
There is a good chance that later changes in the data affect the same
tile again, so in the long run this saves effort.

Tiles are generalized oldest first when this is used. Don't set
max_tiles_per_run or set to 0 to run generalization for all tiles
in the expire table for that zoom level.
---
 src/gen/osm2pgsql-gen.cpp | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
index ce3cc42ef..10f2d5a27 100644
--- a/src/gen/osm2pgsql-gen.cpp
+++ b/src/gen/osm2pgsql-gen.cpp
@@ -171,11 +171,30 @@ tile_extent get_extent_from_db(pg_conn_t const &db_connection,
 }
 
 void get_tiles_from_table(pg_conn_t const &connection, std::string const &table,
-                          uint32_t zoom,
+                          uint32_t zoom, int64_t max_tiles_per_run,
                           std::vector<std::pair<uint32_t, uint32_t>> *tiles)
 {
-    auto const result = connection.exec(
-        R"(DELETE FROM "{}" WHERE zoom = {} RETURNING x, y)", table, zoom);
+    std::string query;
+    if (max_tiles_per_run == 0) {
+        query = fmt::format(
+            R"(DELETE FROM "{}" WHERE zoom = {} RETURNING x, y)", table, zoom);
+    } else {
+        query = fmt::format(R"(
+WITH to_delete AS (
+  SELECT t.ctid FROM "{0}" AS t
+    WHERE zoom = {1}
+    ORDER BY first
+    FOR UPDATE
+    LIMIT {2}
+)
+DELETE FROM "{0}" AS et
+  USING to_delete AS del
+  WHERE et.ctid = del.ctid
+  RETURNING x, y;)",
+                            table, zoom, max_tiles_per_run);
+    }
+
+    auto const result = connection.exec(query);
 
     tiles->reserve(result.num_tuples());
 
@@ -473,9 +492,12 @@ class genproc_t
         std::vector<std::pair<uint32_t, uint32_t>> tile_list;
         if (m_append) {
             auto const table = params.get_string("expire_list");
+            auto const max_tiles_per_run =
+                params.get_int64("max_tiles_per_run", 0);
             log_debug("Running generalizer for expire list from table '{}'...",
                       table);
-            get_tiles_from_table(db_connection, table, zoom, &tile_list);
+            get_tiles_from_table(db_connection, table, zoom, max_tiles_per_run,
+                                 &tile_list);
         } else {
             auto const extent =
                 get_extent_from_db(db_connection, m_dbschema, params, zoom);

From 94bb380c51972afe3ca55690976cb66aae17390a Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 30 Oct 2025 17:34:20 +0100
Subject: [PATCH 416/430] Reorganize expire code

The code was a bit weird, because the decision whether to do full area
expire of boundary only is mixed up with the code to do the full area
expire. This refactoring fixes that, we decide first what to do and then
do it.

What is a bit awkward now is the way we do the box calculation in the
decide_expire_mode() function only if needed and then later if it wasn't
done already. But if all goes well this will be cleaned up in a future
commit when we don't do expire by bounding box any more but by the
actual area.
---
 src/expire-tiles.cpp    | 55 +++++++++++++++++++++++++++--------------
 src/geom-box.hpp        |  5 ++++
 tests/test-geom-box.cpp |  3 +++
 3 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/src/expire-tiles.cpp b/src/expire-tiles.cpp
index 249365070..69ffceda2 100644
--- a/src/expire-tiles.cpp
+++ b/src/expire-tiles.cpp
@@ -114,19 +114,43 @@ void expire_tiles_t::from_polygon_boundary(geom::polygon_t const &geom,
     }
 }
 
+namespace {
+
+template <typename TGEOM>
+expire_mode decide_expire_mode(TGEOM const &geom,
+                               expire_config_t const &expire_config,
+                               geom::box_t *box)
+{
+    if (expire_config.mode != expire_mode::hybrid) {
+        return expire_config.mode;
+    }
+
+    *box = geom::envelope(geom);
+    if (box->width() > expire_config.full_area_limit ||
+        box->height() > expire_config.full_area_limit) {
+        return expire_mode::boundary_only;
+    }
+
+    return expire_mode::full_area;
+}
+
+} // anonymous namespace
+
 void expire_tiles_t::from_geometry(geom::polygon_t const &geom,
                                    expire_config_t const &expire_config)
 {
-    if (expire_config.mode == expire_mode::boundary_only) {
+    geom::box_t box;
+    auto const mode = decide_expire_mode(geom, expire_config, &box);
+
+    if (mode == expire_mode::boundary_only) {
         from_polygon_boundary(geom, expire_config);
         return;
     }
 
-    geom::box_t const box = geom::envelope(geom);
-    if (from_bbox(box, expire_config)) {
-        /* Bounding box too big - just expire tiles on the boundary */
-        from_polygon_boundary(geom, expire_config);
+    if (!box.valid()) {
+        box = geom::envelope(geom);
     }
+    from_bbox(box, expire_config);
 }
 
 void expire_tiles_t::from_polygon_boundary(geom::multipolygon_t const &geom,
@@ -140,16 +164,18 @@ void expire_tiles_t::from_polygon_boundary(geom::multipolygon_t const &geom,
 void expire_tiles_t::from_geometry(geom::multipolygon_t const &geom,
                                    expire_config_t const &expire_config)
 {
-    if (expire_config.mode == expire_mode::boundary_only) {
+    geom::box_t box;
+    auto const mode = decide_expire_mode(geom, expire_config, &box);
+
+    if (mode == expire_mode::boundary_only) {
         from_polygon_boundary(geom, expire_config);
         return;
     }
 
-    geom::box_t const box = geom::envelope(geom);
-    if (from_bbox(box, expire_config)) {
-        /* Bounding box too big - just expire tiles on the boundary */
-        from_polygon_boundary(geom, expire_config);
+    if (!box.valid()) {
+        box = geom::envelope(geom);
     }
+    from_bbox(box, expire_config);
 }
 
 // False positive: Apparently clang-tidy can not see through the visit()
@@ -238,15 +264,6 @@ void expire_tiles_t::from_line_segment(geom::point_t const &a,
 int expire_tiles_t::from_bbox(geom::box_t const &box,
                               expire_config_t const &expire_config)
 {
-    double const width = box.width();
-    double const height = box.height();
-
-    if (expire_config.mode == expire_mode::hybrid &&
-        (width > expire_config.full_area_limit ||
-         height > expire_config.full_area_limit)) {
-        return -1;
-    }
-
     /* Convert the box's Mercator coordinates into tile coordinates */
     auto const tmp_min = coords_to_tile({box.min_x(), box.max_y()});
     int const min_tile_x =
diff --git a/src/geom-box.hpp b/src/geom-box.hpp
index 7bb5f9c76..cd6279ceb 100644
--- a/src/geom-box.hpp
+++ b/src/geom-box.hpp
@@ -72,6 +72,11 @@ class box_t
         return !(a == b);
     }
 
+    bool valid() const noexcept
+    {
+        return m_min_x != std::numeric_limits<double>::max();
+    }
+
 private:
     double m_min_x = std::numeric_limits<double>::max();
     double m_min_y = std::numeric_limits<double>::max();
diff --git a/tests/test-geom-box.cpp b/tests/test-geom-box.cpp
index dec7a96fe..3d1cdd437 100644
--- a/tests/test-geom-box.cpp
+++ b/tests/test-geom-box.cpp
@@ -16,6 +16,7 @@ TEST_CASE("box_t getter/setter", "[NoDB]")
 {
     geom::box_t box{1.0, 2.0, 3.0, 4.0};
 
+    REQUIRE(box.valid());
     REQUIRE(box.min_x() == Approx(1.0));
     REQUIRE(box.max_x() == Approx(3.0));
     REQUIRE(box.min_y() == Approx(2.0));
@@ -57,7 +58,9 @@ TEST_CASE("Extend box_t with points", "[NoDB]")
 {
     geom::box_t box;
 
+    REQUIRE_FALSE(box.valid());
     box.extend(geom::point_t{1.0, 2.0});
+    REQUIRE(box.valid());
 
     REQUIRE(box.min_x() == Approx(1.0));
     REQUIRE(box.max_x() == Approx(1.0));

From b3c1ec6582072cdc3b2092385a126ae087d6959e Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 5 Feb 2026 11:53:55 +0100
Subject: [PATCH 417/430] CMake config: Amend list of PostgreSQL versions

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 566d8b79b..a16578380 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,7 +67,7 @@ endif()
 set(MINIMUM_POSTGRESQL_SERVER_VERSION "11")
 set(MINIMUM_POSTGRESQL_SERVER_VERSION_NUM "110000")
 
-set(PostgreSQL_ADDITIONAL_VERSIONS "17" "16" "15" "14" "13" "12" "11")
+set(PostgreSQL_ADDITIONAL_VERSIONS "19" "18" "17" "16" "15" "14" "13" "12" "11")
 
 #############################################################
 # Version

From dcd5d7e6cb656e743355aea1a1a082fec953cb17 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 5 Feb 2026 11:54:21 +0100
Subject: [PATCH 418/430] CMake config: Fix the way boost is looked for

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a16578380..b1a811b83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -196,7 +196,7 @@ endif()
 
 find_program(LUA_EXE NAMES lua lua5.4 lua5.3 lua5.2 lua5.1)
 
-find_package(Boost 1.50 REQUIRED)
+find_package(Boost CONFIG 1.50 REQUIRED)
 include_directories(SYSTEM ${Boost_INCLUDE_DIR})
 
 find_package(PostgreSQL REQUIRED)

From e859679c3e080efa6155fbfaf8ad175f6f471e9b Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Thu, 5 Feb 2026 12:02:06 +0100
Subject: [PATCH 419/430] CMake config: Disable warnings triggered by Osmium
 behaviour in GCC

Nothing we can do about these false-positives.
---
 .github/workflows/ci.yml           | 2 --
 .github/workflows/test-install.yml | 2 +-
 CMakeLists.txt                     | 4 ++++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 763aa0bd3..bcc026d7a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -165,7 +165,6 @@ jobs:
     env:
       CC: gcc-12
       CXX: g++-12
-      EXTRA_FLAGS: -Wno-stringop-overread
       LUA_VERSION: 5.3
       LUAJIT_OPTION: ON
       POSTGRESQL_VERSION: 13
@@ -262,7 +261,6 @@ jobs:
     env:
       CC: gcc-12
       CXX: g++-12
-      EXTRA_FLAGS: -Wno-stringop-overread
       LUA_VERSION: 5.4
       LUAJIT_OPTION: ON
       POSTGRESQL_VERSION: 16
diff --git a/.github/workflows/test-install.yml b/.github/workflows/test-install.yml
index 1581280d1..eb9f0cc10 100644
--- a/.github/workflows/test-install.yml
+++ b/.github/workflows/test-install.yml
@@ -22,7 +22,7 @@ jobs:
       POSTGRESQL_VERSION: 16
       POSTGIS_VERSION: 3
       BUILD_TYPE: Release
-      CXXFLAGS: -pedantic -Wextra -Wno-stringop-overread -Werror
+      CXXFLAGS: -pedantic -Wextra -Werror
       PREFIX: /usr/local
       OSMURL: https://download.geofabrik.de/europe/monaco-latest.osm.pbf
       OSMFILE: monaco-latest.osm.pbf
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1a811b83..e96d9c49d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,6 +52,10 @@ else()
     add_compile_options(-Wall)
 endif()
 
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    add_definitions(-Wno-stringop-overread -Wno-maybe-uninitialized)
+endif()
+
 option(EXTERNAL_LIBOSMIUM "Do not use the bundled libosmium" OFF)
 option(EXTERNAL_PROTOZERO "Do not use the bundled protozero" OFF)
 option(EXTERNAL_FMT       "Do not use the bundled fmt"       OFF)

From d57ba4070e6876a2381de18cbb21231483c84a56 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 24 Oct 2025 20:13:05 +0200
Subject: [PATCH 420/430] Do area expire based on the actual polygon instead of
 the bbox

Expire (multi)polygons based on their shape, not the complete bounding
box. We use the existing implementation for the boundary expire, to get
the boundary right including the configured buffer. For the rest of the
area inside the polygon we use a "polygon drawing algorithm" to figure
out all tiles which are inside the polygon.

This also contains some changes to the BDD test code to allow running
the osm2pgsql-expire program and check its output against a file.
---
 scripts/osm2pgsql-test-style           |   40 +-
 src/expire-tiles.cpp                   |  132 +-
 src/expire-tiles.hpp                   |    8 +-
 tests/bdd/expire/expire.feature        |   44 +
 tests/data/expire/test-data.osm        |  134 ++
 tests/data/expire/test-raw.osm         |  134 ++
 tests/data/expire/test-z18-b0.geojson  | 1767 ++++++++++++++++++++
 tests/data/expire/test-z18-b0.tiles    | 1764 ++++++++++++++++++++
 tests/data/expire/test-z18-b05.geojson | 2122 ++++++++++++++++++++++++
 tests/data/expire/test-z18-b05.tiles   | 2119 +++++++++++++++++++++++
 tests/test-expire-tiles.cpp            |   79 +-
 11 files changed, 8284 insertions(+), 59 deletions(-)
 create mode 100644 tests/bdd/expire/expire.feature
 create mode 100644 tests/data/expire/test-data.osm
 create mode 100644 tests/data/expire/test-raw.osm
 create mode 100644 tests/data/expire/test-z18-b0.geojson
 create mode 100644 tests/data/expire/test-z18-b0.tiles
 create mode 100644 tests/data/expire/test-z18-b05.geojson
 create mode 100644 tests/data/expire/test-z18-b05.tiles

diff --git a/scripts/osm2pgsql-test-style b/scripts/osm2pgsql-test-style
index b173e2d0c..e4e574ef8 100755
--- a/scripts/osm2pgsql-test-style
+++ b/scripts/osm2pgsql-test-style
@@ -93,7 +93,6 @@ class ReplicationServerMock:
         numdiffs = int((max_size + 1023)/1024)
         return min(self.state_infos[-1].sequence, start_id + numdiffs - 1)
 
-
 # Replication module is optional
 _repfl_spec = importlib.util.spec_from_loader(
     'osm2pgsql_replication',
@@ -510,6 +509,30 @@ def execute_osm2pgsql(context, output):
     context.osm2pgsql_returncode = proc.returncode
     context.osm2pgsql_params = {'-d': context.user_args.test_db}
 
+@when("running osm2pgsql-expire with parameters")
+def execute_osm2pgsql_expire(context):
+
+    cmdline = [context.user_args.osm2pgsql_binary + '-expire']
+
+    test_dir = (context.user_args.test_data_dir or Path('.')).resolve()
+    def _template(param):
+        return param.replace('{TEST_DATA_DIR}', str(test_dir))
+
+    if context.table:
+        assert not any('<' in h for h in context.table.headings), \
+            "Substition in the first line of a table are not supported."
+        cmdline.extend(_template(h) for h in context.table.headings if h)
+        for row in context.table:
+            cmdline.extend(_template(c) for c in row if c)
+
+    proc = Popen(cmdline, cwd=str(context.workdir),
+                 stdout=PIPE, stderr=PIPE)
+
+    outdata = proc.communicate()
+    context.osm2pgsql_cmdline = ' '.join(cmdline)
+    context.osm2pgsql_outdata = [d.decode('utf-8').replace('\\n', '\n') for d in outdata]
+    context.osm2pgsql_returncode = proc.returncode
+
 @then("execution is successful")
 def osm2pgsql_check_success(context):
     assert context.osm2pgsql_returncode == 0, \
@@ -541,6 +564,21 @@ def check_program_output(context, kind):
         assert line in s,\
                f"Output '{line}' not found in {kind} output:\n{s}\n"
 
+@then(r"the (?P<kind>\w+) output matches contents of (?P<result_file>.*)")
+def check_program_output_against_file(context, kind, result_file):
+    if kind == 'error':
+        s = context.osm2pgsql_outdata[1]
+    elif kind == 'standard':
+        s = context.osm2pgsql_outdata[0]
+    else:
+        assert not "Expect one of error, standard"
+
+    test_dir = (context.user_args.test_data_dir or Path('.')).resolve()
+    with open(test_dir / result_file, 'r') as fd:
+        expected = fd.read()
+        assert s == expected, \
+               f"Output does not match contents of {result_file}. Actual output:\n{s}"
+
 ################### Steps: Running Replication #####################
 
 @given("the replication service at (?P<base_url>.*)")
diff --git a/src/expire-tiles.cpp b/src/expire-tiles.cpp
index 69ffceda2..72fa02deb 100644
--- a/src/expire-tiles.cpp
+++ b/src/expire-tiles.cpp
@@ -136,28 +136,90 @@ expire_mode decide_expire_mode(TGEOM const &geom,
 
 } // anonymous namespace
 
-void expire_tiles_t::from_geometry(geom::polygon_t const &geom,
-                                   expire_config_t const &expire_config)
+void expire_tiles_t::build_tile_list(std::vector<uint32_t> *tile_x_list,
+                                     geom::ring_t const &ring, double tile_y)
 {
-    geom::box_t box;
-    auto const mode = decide_expire_mode(geom, expire_config, &box);
-
-    if (mode == expire_mode::boundary_only) {
-        from_polygon_boundary(geom, expire_config);
-        return;
+    assert(!ring.empty());
+    for (std::size_t i = 1; i < ring.size(); ++i) {
+        auto const t1 = coords_to_tile(ring[i]);
+        auto const t2 = coords_to_tile(ring[i - 1]);
+
+        if ((t1.y() < tile_y && t2.y() >= tile_y) ||
+            (t2.y() < tile_y && t1.y() >= tile_y)) {
+            auto const pos =
+                (tile_y - t1.y()) / (t2.y() - t1.y()) * (t2.x() - t1.x());
+            tile_x_list->push_back(static_cast<uint32_t>(std::clamp(
+                t1.x() + pos, 0.0, static_cast<double>(m_map_width - 1))));
+        }
     }
+}
 
+void expire_tiles_t::from_polygon_area(geom::polygon_t const &geom,
+                                       geom::box_t box)
+{
     if (!box.valid()) {
         box = geom::envelope(geom);
     }
-    from_bbox(box, expire_config);
+
+    // This uses a variation on a simple polygon fill algorithm, for instance
+    // described on https://alienryderflex.com/polygon_fill/ . For each row
+    // of tiles we find the intersections with the area boundary and "fill" in
+    // the tiles between them. Note that we don't need to take particular care
+    // about the boundary, because we simply use the algorithm we use for
+    // expiry along a line to do that, which will also take care of the buffer.
+
+    // Coordinates are numbered from bottom to top, tiles are numbered from top
+    // to bottom, so "min" and "max" are switched here.
+    auto const max_tile_y = static_cast<std::uint32_t>(
+        m_map_width * (0.5 - box.min().y() / tile_t::EARTH_CIRCUMFERENCE));
+    auto const min_tile_y = static_cast<std::uint32_t>(
+        m_map_width * (0.5 - box.max().y() / tile_t::EARTH_CIRCUMFERENCE));
+
+    std::vector<uint32_t> tile_x_list;
+
+    //  Loop through the tile rows from top to bottom
+    for (std::uint32_t tile_y = min_tile_y; tile_y < max_tile_y; ++tile_y) {
+
+        // Build a list of tiles crossed by the area boundary
+        tile_x_list.clear();
+        build_tile_list(&tile_x_list, geom.outer(),
+                        static_cast<double>(tile_y));
+        for (auto const &ring : geom.inners()) {
+            build_tile_list(&tile_x_list, ring, static_cast<double>(tile_y));
+        }
+
+        // Sort list of tiles from left to right
+        std::sort(tile_x_list.begin(), tile_x_list.end());
+
+        // Add the tiles between entering and leaving the area to expire list
+        assert(tile_x_list.size() % 2 == 0);
+        for (std::size_t i = 0; i < tile_x_list.size(); i += 2) {
+            if (tile_x_list[i] >= static_cast<uint32_t>(m_map_width - 1)) {
+                break;
+            }
+            if (tile_x_list[i + 1] > 0) {
+                for (std::uint32_t tile_x = tile_x_list[i];
+                     tile_x < tile_x_list[i + 1]; ++tile_x) {
+                    expire_tile(tile_x, tile_y);
+                }
+            }
+        }
+    }
 }
 
-void expire_tiles_t::from_polygon_boundary(geom::multipolygon_t const &geom,
-                                           expire_config_t const &expire_config)
+void expire_tiles_t::from_geometry(geom::polygon_t const &geom,
+                                   expire_config_t const &expire_config)
 {
-    for (auto const &sgeom : geom) {
-        from_polygon_boundary(sgeom, expire_config);
+    geom::box_t box;
+    auto const mode = decide_expire_mode(geom, expire_config, &box);
+
+    from_polygon_boundary(geom, expire_config);
+
+    // Only need to expire area if in full_area mode. If there is only a
+    // single tile expired the whole polygon is inside that tile and we
+    // don't need to do the polygon expire.
+    if (mode == expire_mode::full_area && m_dirty_tiles.size() > 1) {
+        from_polygon_area(geom, box);
     }
 }
 
@@ -167,15 +229,18 @@ void expire_tiles_t::from_geometry(geom::multipolygon_t const &geom,
     geom::box_t box;
     auto const mode = decide_expire_mode(geom, expire_config, &box);
 
-    if (mode == expire_mode::boundary_only) {
-        from_polygon_boundary(geom, expire_config);
-        return;
+    for (auto const &sgeom : geom) {
+        from_polygon_boundary(sgeom, expire_config);
     }
 
-    if (!box.valid()) {
-        box = geom::envelope(geom);
+    // Only need to expire area if in full_area mode. If there is only a
+    // single tile expired the whole polygon is inside that tile and we
+    // don't need to do the polygon expire.
+    if (mode == expire_mode::full_area && m_dirty_tiles.size() > 1) {
+        for (auto const &sgeom : geom) {
+            from_polygon_area(sgeom, geom::box_t{});
+        }
     }
-    from_bbox(box, expire_config);
 }
 
 // False positive: Apparently clang-tidy can not see through the visit()
@@ -258,35 +323,6 @@ void expire_tiles_t::from_line_segment(geom::point_t const &a,
     }
 }
 
-/*
- * Expire tiles within a bounding box
- */
-int expire_tiles_t::from_bbox(geom::box_t const &box,
-                              expire_config_t const &expire_config)
-{
-    /* Convert the box's Mercator coordinates into tile coordinates */
-    auto const tmp_min = coords_to_tile({box.min_x(), box.max_y()});
-    int const min_tile_x =
-        std::clamp(int(tmp_min.x() - expire_config.buffer), 0, m_map_width - 1);
-    int const min_tile_y =
-        std::clamp(int(tmp_min.y() - expire_config.buffer), 0, m_map_width - 1);
-
-    auto const tmp_max = coords_to_tile({box.max_x(), box.min_y()});
-    int const max_tile_x =
-        std::clamp(int(tmp_max.x() + expire_config.buffer), 0, m_map_width - 1);
-    int const max_tile_y =
-        std::clamp(int(tmp_max.y() + expire_config.buffer), 0, m_map_width - 1);
-
-    for (int iterator_x = min_tile_x; iterator_x <= max_tile_x; ++iterator_x) {
-        uint32_t const norm_x = normalise_tile_x_coord(iterator_x);
-        for (int iterator_y = min_tile_y; iterator_y <= max_tile_y;
-             ++iterator_y) {
-            expire_tile(norm_x, static_cast<uint32_t>(iterator_y));
-        }
-    }
-    return 0;
-}
-
 quadkey_list_t expire_tiles_t::get_tiles()
 {
     quadkey_list_t tiles;
diff --git a/src/expire-tiles.hpp b/src/expire-tiles.hpp
index 73ee1add8..43e83f7af 100644
--- a/src/expire-tiles.hpp
+++ b/src/expire-tiles.hpp
@@ -40,8 +40,7 @@ class expire_tiles_t
     void from_polygon_boundary(geom::polygon_t const &geom,
                                expire_config_t const &expire_config);
 
-    void from_polygon_boundary(geom::multipolygon_t const &geom,
-                               expire_config_t const &expire_config);
+    void from_polygon_area(geom::polygon_t const &geom, geom::box_t box);
 
     void from_geometry(geom::nullgeom_t const & /*geom*/,
                        expire_config_t const & /*expire_config*/)
@@ -74,8 +73,6 @@ class expire_tiles_t
     void from_geometry_if_3857(geom::geometry_t const &geom,
                                expire_config_t const &expire_config);
 
-    int from_bbox(geom::box_t const &box, expire_config_t const &expire_config);
-
     /**
      * Get tiles as a vector of quadkeys and remove them from the expire_tiles_t
      * object.
@@ -107,6 +104,9 @@ class expire_tiles_t
 
     uint32_t normalise_tile_x_coord(int x) const;
 
+    void build_tile_list(std::vector<uint32_t> *tile_x_list,
+                         geom::ring_t const &ring, double tile_y);
+
     void from_line_segment(geom::point_t const &a, geom::point_t const &b,
                            expire_config_t const &expire_config);
 
diff --git a/tests/bdd/expire/expire.feature b/tests/bdd/expire/expire.feature
new file mode 100644
index 000000000..0c4a6d3b9
--- /dev/null
+++ b/tests/bdd/expire/expire.feature
@@ -0,0 +1,44 @@
+Feature: Test osm2pgsql-expire
+
+    Scenario: Test with invalid options
+        When running osm2pgsql-expire with parameters
+            | -z18 | -m | abc | {TEST_DATA_DIR}/expire/test-data.osm |
+        Then execution fails
+        Then the error output contains
+            """
+            Value for --mode must be 'boundary_only', 'full_area', or 'hybrid'
+            """
+
+    Scenario: Test with invalid options
+        When running osm2pgsql-expire with parameters
+            | -z18 | -m | full_area | -f | foo | {TEST_DATA_DIR}/expire/test-data.osm |
+        Then execution fails
+        Then the error output contains
+            """
+            Value for --format must be 'tiles' or 'geojson'
+            """
+
+    Scenario: Test expire for various objects on zoom 18 (geojson format)
+        When running osm2pgsql-expire with parameters
+            | -z18 | -m | full_area | -f | geojson | {TEST_DATA_DIR}/expire/test-data.osm |
+        Then execution is successful
+        Then the standard output matches contents of expire/test-z18-b0.geojson
+
+    Scenario: Test expire for various objects on zoom 18 (tiles format)
+        When running osm2pgsql-expire with parameters
+            | -z18 | -m | full_area | -f | tiles | {TEST_DATA_DIR}/expire/test-data.osm |
+        Then execution is successful
+        Then the standard output matches contents of expire/test-z18-b0.tiles
+
+    Scenario: Test expire for various objects on zoom 18 (geojson format)
+        When running osm2pgsql-expire with parameters
+            | -z18 | -m | full_area | -f | geojson | -b | 0.5 | {TEST_DATA_DIR}/expire/test-data.osm |
+        Then execution is successful
+        Then the standard output matches contents of expire/test-z18-b05.geojson
+
+    Scenario: Test expire for various objects on zoom 18 (tiles format)
+        When running osm2pgsql-expire with parameters
+            | -z18 | -m | full_area | -f | tiles | -b | 0.5 | {TEST_DATA_DIR}/expire/test-data.osm |
+        Then execution is successful
+        Then the standard output matches contents of expire/test-z18-b05.tiles
+
diff --git a/tests/data/expire/test-data.osm b/tests/data/expire/test-data.osm
new file mode 100644
index 000000000..f91b93dc6
--- /dev/null
+++ b/tests/data/expire/test-data.osm
@@ -0,0 +1,134 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version="0.6" upload="false" generator="osmium/1.19.0">
+  <bounds minlat="55.5146371" minlon="7.1122742" maxlat="55.5635923" maxlon="7.1768188"/>
+  <bounds minlat="55.5146371" minlon="7.1122742" maxlat="55.5635923" maxlon="7.1768188"/>
+  <node id="1" lat="55.5557179" lon="7.1205162"/>
+  <node id="2" lat="55.5602311" lon="7.1357548"/>
+  <node id="3" lat="55.5553609" lon="7.148108"/>
+  <node id="4" lat="55.5596702" lon="7.1626252"/>
+  <node id="5" lat="55.5544684" lon="7.1701543"/>
+  <node id="6" lat="55.5510001" lon="7.1555469"/>
+  <node id="7" lat="55.5511786" lon="7.1207867"/>
+  <node id="8" lat="55.5464603" lon="7.1213728"/>
+  <node id="9" lat="55.5463838" lon="7.1362057"/>
+  <node id="10" lat="55.5384251" lon="7.1356196"/>
+  <node id="11" lat="55.5386802" lon="7.1208769"/>
+  <node id="12" lat="55.5424046" lon="7.1472965"/>
+  <node id="13" lat="55.5478376" lon="7.1569445"/>
+  <node id="14" lat="55.543578" lon="7.1658713"/>
+  <node id="15" lat="55.5427617" lon="7.1567191"/>
+  <node id="16" lat="55.5340624" lon="7.166277"/>
+  <node id="17" lat="55.534292" lon="7.1429233"/>
+  <node id="18" lat="55.5378638" lon="7.1568093"/>
+  <node id="19" lat="55.5279896" lon="7.1197047"/>
+  <node id="20" lat="55.5320467" lon="7.1315169"/>
+  <node id="21" lat="55.5307199" lon="7.1580266"/>
+  <node id="22" lat="55.5164282" lon="7.1427429"/>
+  <node id="23" lat="55.5192614" lon="7.122545"/>
+  <node id="24" lat="55.5240341" lon="7.1292626"/>
+  <node id="25" lat="55.527913" lon="7.1327342"/>
+  <node id="26" lat="55.5284744" lon="7.1421117"/>
+  <node id="27" lat="55.5240341" lon="7.1438249"/>
+  <node id="28" lat="55.5206907" lon="7.1352589"/>
+  <node id="29" lat="55.5095868" lon="7.1203809"/>
+  <node id="30" lat="55.5096379" lon="7.174302"/>
+  <node id="31" lat="55.4883402" lon="7.1745726"/>
+  <node id="32" lat="55.4744419" lon="7.1446364"/>
+  <node id="33" lat="55.4874717" lon="7.1186677"/>
+  <node id="34" lat="55.5036634" lon="7.1265124"/>
+  <node id="35" lat="55.5065742" lon="7.1320128"/>
+  <node id="36" lat="55.506421" lon="7.1624899"/>
+  <node id="37" lat="55.5034591" lon="7.1691624"/>
+  <node id="38" lat="55.4893108" lon="7.1692526"/>
+  <node id="39" lat="55.4829756" lon="7.1573503"/>
+  <node id="40" lat="55.4831289" lon="7.134267"/>
+  <node id="41" lat="55.4880847" lon="7.1242582"/>
+  <node id="42" lat="55.500446" lon="7.1391361"/>
+  <node id="43" lat="55.500446" lon="7.1572601"/>
+  <node id="44" lat="55.4908434" lon="7.1559977"/>
+  <node id="45" lat="55.490588" lon="7.1378737"/>
+  <node id="46" lat="55.4954918" lon="7.1524811"/>
+  <way id="1">
+    <nd ref="1"/>
+    <nd ref="2"/>
+    <nd ref="3"/>
+    <nd ref="4"/>
+    <nd ref="5"/>
+    <nd ref="6"/>
+    <nd ref="7"/>
+    <tag k="type" v="line"/>
+  </way>
+  <way id="2">
+    <nd ref="8"/>
+    <nd ref="9"/>
+    <nd ref="10"/>
+    <nd ref="11"/>
+    <nd ref="8"/>
+    <tag k="type" v="polygon"/>
+  </way>
+  <way id="3">
+    <nd ref="12"/>
+    <nd ref="13"/>
+    <nd ref="14"/>
+    <nd ref="15"/>
+    <nd ref="16"/>
+    <nd ref="17"/>
+    <nd ref="18"/>
+    <nd ref="12"/>
+    <tag k="type" v="polygon"/>
+  </way>
+  <way id="4">
+    <nd ref="19"/>
+    <nd ref="20"/>
+    <nd ref="21"/>
+    <nd ref="22"/>
+    <nd ref="23"/>
+    <nd ref="19"/>
+  </way>
+  <way id="5">
+    <nd ref="24"/>
+    <nd ref="25"/>
+    <nd ref="26"/>
+    <nd ref="27"/>
+    <nd ref="28"/>
+    <nd ref="24"/>
+  </way>
+  <way id="6">
+    <nd ref="29"/>
+    <nd ref="30"/>
+    <nd ref="31"/>
+    <nd ref="32"/>
+    <nd ref="33"/>
+    <nd ref="29"/>
+  </way>
+  <way id="7">
+    <nd ref="34"/>
+    <nd ref="35"/>
+    <nd ref="36"/>
+    <nd ref="37"/>
+    <nd ref="38"/>
+    <nd ref="39"/>
+    <nd ref="40"/>
+    <nd ref="41"/>
+    <nd ref="34"/>
+  </way>
+  <way id="8">
+    <nd ref="42"/>
+    <nd ref="43"/>
+    <nd ref="44"/>
+    <nd ref="45"/>
+    <nd ref="46"/>
+    <nd ref="42"/>
+  </way>
+  <relation id="1">
+    <member type="way" ref="4" role="outer"/>
+    <member type="way" ref="5" role="inner"/>
+    <tag k="type" v="multipolygon"/>
+  </relation>
+  <relation id="2">
+    <member type="way" ref="8" role="outer"/>
+    <member type="way" ref="6" role="outer"/>
+    <member type="way" ref="7" role="inner"/>
+    <tag k="type" v="multipolygon"/>
+  </relation>
+</osm>
diff --git a/tests/data/expire/test-raw.osm b/tests/data/expire/test-raw.osm
new file mode 100644
index 000000000..64b56d2da
--- /dev/null
+++ b/tests/data/expire/test-raw.osm
@@ -0,0 +1,134 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version='0.6' generator='JOSM'>
+  <bounds minlat='55.5146371' minlon='7.1122742' maxlat='55.5635923' maxlon='7.1768188' origin='openstreetmap-cgimap 2.0.1 (1435312 spike-08.openstreetmap.org)' />
+  <bounds minlat='55.5146371' minlon='7.1122742' maxlat='55.5635923' maxlon='7.1768188' origin='OpenStreetMap server' />
+  <node id='-25397' action='modify' visible='true' lat='55.55571787099' lon='7.1205162424' />
+  <node id='-25398' action='modify' visible='true' lat='55.56023111497' lon='7.13575481541' />
+  <node id='-25399' action='modify' visible='true' lat='55.55536086912' lon='7.14810797814' />
+  <node id='-25400' action='modify' visible='true' lat='55.559670175' lon='7.16262519858' />
+  <node id='-25401' action='modify' visible='true' lat='55.55446835025' lon='7.17015431601' />
+  <node id='-25402' action='modify' visible='true' lat='55.5510000845' lon='7.1555469265' />
+  <node id='-25403' action='modify' visible='true' lat='55.55117860565' lon='7.12078674961' />
+  <node id='-25419' action='modify' visible='true' lat='55.54646027422' lon='7.12137284857' />
+  <node id='-25420' action='modify' visible='true' lat='55.54638375607' lon='7.13620566076' />
+  <node id='-25421' action='modify' visible='true' lat='55.53842505525' lon='7.1356195618' />
+  <node id='-25422' action='modify' visible='true' lat='55.53868016681' lon='7.12087691868' />
+  <node id='-25424' action='modify' visible='true' lat='55.54240460705' lon='7.1472964565' />
+  <node id='-25425' action='modify' visible='true' lat='55.54783757544' lon='7.1569445471' />
+  <node id='-25426' action='modify' visible='true' lat='55.54357798773' lon='7.16587128514' />
+  <node id='-25427' action='modify' visible='true' lat='55.54276172661' lon='7.15671912443' />
+  <node id='-25428' action='modify' visible='true' lat='55.5340623915' lon='7.16627704596' />
+  <node id='-25429' action='modify' visible='true' lat='55.53429201745' lon='7.14292325656' />
+  <node id='-25430' action='modify' visible='true' lat='55.537863804' lon='7.1568092935' />
+  <node id='-25438' action='modify' visible='true' lat='55.52798957434' lon='7.11970472076' />
+  <node id='-25439' action='modify' visible='true' lat='55.53204672842' lon='7.13151686907' />
+  <node id='-25440' action='modify' visible='true' lat='55.53071990647' lon='7.15802657596' />
+  <node id='-25441' action='modify' visible='true' lat='55.51642821802' lon='7.14274291841' />
+  <node id='-25442' action='modify' visible='true' lat='55.51926144738' lon='7.1225450465' />
+  <node id='-25444' action='modify' visible='true' lat='55.5240340842' lon='7.12926264229' />
+  <node id='-25445' action='modify' visible='true' lat='55.52791302024' lon='7.13273415153' />
+  <node id='-25446' action='modify' visible='true' lat='55.52847441351' lon='7.14211173492' />
+  <node id='-25447' action='modify' visible='true' lat='55.5240340842' lon='7.14382494727' />
+  <node id='-25448' action='modify' visible='true' lat='55.52069074694' lon='7.13525888552' />
+  <node id='-25451' action='modify' visible='true' lat='55.50958681293' lon='7.12038094371' />
+  <node id='-25452' action='modify' visible='true' lat='55.50963787278' lon='7.1743020482' />
+  <node id='-25453' action='modify' visible='true' lat='55.48834016745' lon='7.17457255541' />
+  <node id='-25454' action='modify' visible='true' lat='55.47444193141' lon='7.14463642382' />
+  <node id='-25455' action='modify' visible='true' lat='55.48747167131' lon='7.11866773136' />
+  <node id='-25457' action='modify' visible='true' lat='55.50366342011' lon='7.12651244054' />
+  <node id='-25458' action='modify' visible='true' lat='55.50657416416' lon='7.13201275387' />
+  <node id='-25459' action='modify' visible='true' lat='55.50642097246' lon='7.16248989989' />
+  <node id='-25460' action='modify' visible='true' lat='55.50345914928' lon='7.16916241115' />
+  <node id='-25461' action='modify' visible='true' lat='55.48931081696' lon='7.16925258022' />
+  <node id='-25462' action='modify' visible='true' lat='55.48297562046' lon='7.15735026284' />
+  <node id='-25463' action='modify' visible='true' lat='55.48312890337' lon='7.13426698065' />
+  <node id='-25464' action='modify' visible='true' lat='55.4880847294' lon='7.12425821376' />
+  <node id='-25466' action='modify' visible='true' lat='55.50044603157' lon='7.13913611049' />
+  <node id='-25467' action='modify' visible='true' lat='55.50044603157' lon='7.15726009377' />
+  <node id='-25468' action='modify' visible='true' lat='55.49084337275' lon='7.15599772677' />
+  <node id='-25469' action='modify' visible='true' lat='55.49058795093' lon='7.13787374349' />
+  <node id='-25470' action='modify' visible='true' lat='55.49549176061' lon='7.152481133' />
+  <way id='-635' action='modify' visible='true'>
+    <nd ref='-25397' />
+    <nd ref='-25398' />
+    <nd ref='-25399' />
+    <nd ref='-25400' />
+    <nd ref='-25401' />
+    <nd ref='-25402' />
+    <nd ref='-25403' />
+    <tag k='type' v='line' />
+  </way>
+  <way id='-660' action='modify' visible='true'>
+    <nd ref='-25419' />
+    <nd ref='-25420' />
+    <nd ref='-25421' />
+    <nd ref='-25422' />
+    <nd ref='-25419' />
+    <tag k='type' v='polygon' />
+  </way>
+  <way id='-687' action='modify' visible='true'>
+    <nd ref='-25424' />
+    <nd ref='-25425' />
+    <nd ref='-25426' />
+    <nd ref='-25427' />
+    <nd ref='-25428' />
+    <nd ref='-25429' />
+    <nd ref='-25430' />
+    <nd ref='-25424' />
+    <tag k='type' v='polygon' />
+  </way>
+  <way id='-710' action='modify' visible='true'>
+    <nd ref='-25438' />
+    <nd ref='-25439' />
+    <nd ref='-25440' />
+    <nd ref='-25441' />
+    <nd ref='-25442' />
+    <nd ref='-25438' />
+  </way>
+  <way id='-715' action='modify' visible='true'>
+    <nd ref='-25444' />
+    <nd ref='-25445' />
+    <nd ref='-25446' />
+    <nd ref='-25447' />
+    <nd ref='-25448' />
+    <nd ref='-25444' />
+  </way>
+  <way id='-730' action='modify' visible='true'>
+    <nd ref='-25451' />
+    <nd ref='-25452' />
+    <nd ref='-25453' />
+    <nd ref='-25454' />
+    <nd ref='-25455' />
+    <nd ref='-25451' />
+  </way>
+  <way id='-735' action='modify' visible='true'>
+    <nd ref='-25457' />
+    <nd ref='-25458' />
+    <nd ref='-25459' />
+    <nd ref='-25460' />
+    <nd ref='-25461' />
+    <nd ref='-25462' />
+    <nd ref='-25463' />
+    <nd ref='-25464' />
+    <nd ref='-25457' />
+  </way>
+  <way id='-743' action='modify' visible='true'>
+    <nd ref='-25466' />
+    <nd ref='-25467' />
+    <nd ref='-25468' />
+    <nd ref='-25469' />
+    <nd ref='-25470' />
+    <nd ref='-25466' />
+  </way>
+  <relation id='-58' action='modify' visible='true'>
+    <member type='way' ref='-710' role='outer' />
+    <member type='way' ref='-715' role='inner' />
+    <tag k='type' v='multipolygon' />
+  </relation>
+  <relation id='-69' action='modify' visible='true'>
+    <member type='way' ref='-743' role='outer' />
+    <member type='way' ref='-730' role='outer' />
+    <member type='way' ref='-735' role='inner' />
+    <tag k='type' v='multipolygon' />
+  </relation>
+</osm>
diff --git a/tests/data/expire/test-z18-b0.geojson b/tests/data/expire/test-z18-b0.geojson
new file mode 100644
index 000000000..0f71a3630
--- /dev/null
+++ b/tests/data/expire/test-z18-b0.geojson
@@ -0,0 +1,1767 @@
+{"type": "FeatureCollection", "crs":{"properties":{"name":"urn:ogc:def:crs:EPSG::3857"},"type":"name"}, "features": [
+
+{"geometry":{"coordinates":[[[794027.849715881,7471260.89166626],[794027.849715881,7471413.765722809],[794180.7237724289,7471413.765722809],[794180.7237724289,7471260.89166626],[794027.849715881,7471260.89166626]]],"type":"Polygon"},"properties":{"label":"18/136266/82199","x":136266,"y":82199,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7471260.89166626],[794180.7237724289,7471413.765722809],[794333.5978289805,7471413.765722809],[794333.5978289805,7471260.89166626],[794180.7237724289,7471260.89166626]]],"type":"Polygon"},"properties":{"label":"18/136267/82199","x":136267,"y":82199,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7471260.89166626],[794333.5978289805,7471413.765722809],[794486.4718855284,7471413.765722809],[794486.4718855284,7471260.89166626],[794333.5978289805,7471260.89166626]]],"type":"Polygon"},"properties":{"label":"18/136268/82199","x":136268,"y":82199,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7471260.89166626],[794486.4718855284,7471413.765722809],[794639.3459420763,7471413.765722809],[794639.3459420763,7471260.89166626],[794486.4718855284,7471260.89166626]]],"type":"Polygon"},"properties":{"label":"18/136269/82199","x":136269,"y":82199,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7470649.3954400625],[792804.8572634906,7470802.269496612],[792957.7313200384,7470802.269496612],[792957.7313200384,7470649.3954400625],[792804.8572634906,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136258/82203","x":136258,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7470649.3954400625],[792957.7313200384,7470802.269496612],[793110.6053765863,7470802.269496612],[793110.6053765863,7470649.3954400625],[792957.7313200384,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136259/82203","x":136259,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7470955.143553162],[793416.3534896858,7471108.01760971],[793569.2275462337,7471108.01760971],[793569.2275462337,7470955.143553162],[793416.3534896858,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136262/82201","x":136262,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7470955.143553162],[793569.2275462337,7471108.01760971],[793722.1016027816,7471108.01760971],[793722.1016027816,7470955.143553162],[793569.2275462337,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136263/82201","x":136263,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7470802.269496612],[793110.6053765863,7470955.143553162],[793263.4794331342,7470955.143553162],[793263.4794331342,7470802.269496612],[793110.6053765863,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136260/82202","x":136260,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7470802.269496612],[793263.4794331342,7470955.143553162],[793416.3534896858,7470955.143553162],[793416.3534896858,7470802.269496612],[793263.4794331342,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136261/82202","x":136261,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7470649.3954400625],[793110.6053765863,7470802.269496612],[793263.4794331342,7470802.269496612],[793263.4794331342,7470649.3954400625],[793110.6053765863,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136260/82203","x":136260,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7470649.3954400625],[793263.4794331342,7470802.269496612],[793416.3534896858,7470802.269496612],[793416.3534896858,7470649.3954400625],[793263.4794331342,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136261/82203","x":136261,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7470802.269496612],[793416.3534896858,7470955.143553162],[793569.2275462337,7470955.143553162],[793569.2275462337,7470802.269496612],[793416.3534896858,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136262/82202","x":136262,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7470802.269496612],[793569.2275462337,7470955.143553162],[793722.1016027816,7470955.143553162],[793722.1016027816,7470802.269496612],[793569.2275462337,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136263/82202","x":136263,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7470496.521383515],[792499.1091503911,7470649.3954400625],[792651.983206939,7470649.3954400625],[792651.983206939,7470496.521383515],[792499.1091503911,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136256/82204","x":136256,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7470496.521383515],[792651.983206939,7470649.3954400625],[792804.8572634906,7470649.3954400625],[792804.8572634906,7470496.521383515],[792651.983206939,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136257/82204","x":136257,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7470343.647326965],[792499.1091503911,7470496.521383515],[792651.983206939,7470496.521383515],[792651.983206939,7470343.647326965],[792499.1091503911,7470343.647326965]]],"type":"Polygon"},"properties":{"label":"18/136256/82205","x":136256,"y":82205,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7470343.647326965],[792651.983206939,7470496.521383515],[792804.8572634906,7470496.521383515],[792804.8572634906,7470343.647326965],[792651.983206939,7470343.647326965]]],"type":"Polygon"},"properties":{"label":"18/136257/82205","x":136257,"y":82205,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7470496.521383515],[792804.8572634906,7470649.3954400625],[792957.7313200384,7470649.3954400625],[792957.7313200384,7470496.521383515],[792804.8572634906,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136258/82204","x":136258,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7470496.521383515],[792957.7313200384,7470649.3954400625],[793110.6053765863,7470649.3954400625],[793110.6053765863,7470496.521383515],[792957.7313200384,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136259/82204","x":136259,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7471108.01760971],[793722.1016027816,7471260.89166626],[793874.9756593332,7471260.89166626],[793874.9756593332,7471108.01760971],[793722.1016027816,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136264/82200","x":136264,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7471108.01760971],[793874.9756593332,7471260.89166626],[794027.849715881,7471260.89166626],[794027.849715881,7471108.01760971],[793874.9756593332,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136265/82200","x":136265,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7470955.143553162],[793722.1016027816,7471108.01760971],[793874.9756593332,7471108.01760971],[793874.9756593332,7470955.143553162],[793722.1016027816,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136264/82201","x":136264,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7470955.143553162],[793874.9756593332,7471108.01760971],[794027.849715881,7471108.01760971],[794027.849715881,7470955.143553162],[793874.9756593332,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136265/82201","x":136265,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7471108.01760971],[794027.849715881,7471260.89166626],[794180.7237724289,7471260.89166626],[794180.7237724289,7471108.01760971],[794027.849715881,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136266/82200","x":136266,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7471108.01760971],[794180.7237724289,7471260.89166626],[794333.5978289805,7471260.89166626],[794333.5978289805,7471108.01760971],[794180.7237724289,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136267/82200","x":136267,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7471108.01760971],[794333.5978289805,7471260.89166626],[794486.4718855284,7471260.89166626],[794486.4718855284,7471108.01760971],[794333.5978289805,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136268/82200","x":136268,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7471108.01760971],[794486.4718855284,7471260.89166626],[794639.3459420763,7471260.89166626],[794639.3459420763,7471108.01760971],[794486.4718855284,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136269/82200","x":136269,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7470955.143553162],[794486.4718855284,7471108.01760971],[794639.3459420763,7471108.01760971],[794639.3459420763,7470955.143553162],[794486.4718855284,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136269/82201","x":136269,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7471108.01760971],[794639.3459420763,7471260.89166626],[794792.2199986279,7471260.89166626],[794792.2199986279,7471108.01760971],[794639.3459420763,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136270/82200","x":136270,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7470955.143553162],[794639.3459420763,7471108.01760971],[794792.2199986279,7471108.01760971],[794792.2199986279,7470955.143553162],[794639.3459420763,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136270/82201","x":136270,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7470955.143553162],[794792.2199986279,7471108.01760971],[794945.0940551758,7471108.01760971],[794945.0940551758,7470955.143553162],[794792.2199986279,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136271/82201","x":136271,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7470802.269496612],[794792.2199986279,7470955.143553162],[794945.0940551758,7470955.143553162],[794945.0940551758,7470802.269496612],[794792.2199986279,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136271/82202","x":136271,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7471260.89166626],[797238.2049034126,7471413.765722809],[797391.0789599605,7471413.765722809],[797391.0789599605,7471260.89166626],[797238.2049034126,7471260.89166626]]],"type":"Polygon"},"properties":{"label":"18/136287/82199","x":136287,"y":82199,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7470955.143553162],[794945.0940551758,7471108.01760971],[795097.9681117237,7471108.01760971],[795097.9681117237,7470955.143553162],[794945.0940551758,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136272/82201","x":136272,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7470802.269496612],[794945.0940551758,7470955.143553162],[795097.9681117237,7470955.143553162],[795097.9681117237,7470802.269496612],[794945.0940551758,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136272/82202","x":136272,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7470802.269496612],[795097.9681117237,7470955.143553162],[795250.8421682753,7470955.143553162],[795250.8421682753,7470802.269496612],[795097.9681117237,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136273/82202","x":136273,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7470649.3954400625],[794945.0940551758,7470802.269496612],[795097.9681117237,7470802.269496612],[795097.9681117237,7470649.3954400625],[794945.0940551758,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136272/82203","x":136272,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7470649.3954400625],[795097.9681117237,7470802.269496612],[795250.8421682753,7470802.269496612],[795250.8421682753,7470649.3954400625],[795097.9681117237,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136273/82203","x":136273,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7470649.3954400625],[795250.8421682753,7470802.269496612],[795403.7162248231,7470802.269496612],[795403.7162248231,7470649.3954400625],[795250.8421682753,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136274/82203","x":136274,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7470649.3954400625],[795403.7162248231,7470802.269496612],[795556.590281371,7470802.269496612],[795556.590281371,7470649.3954400625],[795403.7162248231,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136275/82203","x":136275,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7470649.3954400625],[796015.2124510184,7470802.269496612],[796168.08650757,7470802.269496612],[796168.08650757,7470649.3954400625],[796015.2124510184,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136279/82203","x":136279,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7470496.521383515],[795250.8421682753,7470649.3954400625],[795403.7162248231,7470649.3954400625],[795403.7162248231,7470496.521383515],[795250.8421682753,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136274/82204","x":136274,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7470496.521383515],[795403.7162248231,7470649.3954400625],[795556.590281371,7470649.3954400625],[795556.590281371,7470496.521383515],[795403.7162248231,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136275/82204","x":136275,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7470343.647326965],[795403.7162248231,7470496.521383515],[795556.590281371,7470496.521383515],[795556.590281371,7470343.647326965],[795403.7162248231,7470343.647326965]]],"type":"Polygon"},"properties":{"label":"18/136275/82205","x":136275,"y":82205,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7470496.521383515],[795556.590281371,7470649.3954400625],[795709.4643379226,7470649.3954400625],[795709.4643379226,7470496.521383515],[795556.590281371,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136276/82204","x":136276,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7470496.521383515],[795709.4643379226,7470649.3954400625],[795862.3383944705,7470649.3954400625],[795862.3383944705,7470496.521383515],[795709.4643379226,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136277/82204","x":136277,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7470343.647326965],[795556.590281371,7470496.521383515],[795709.4643379226,7470496.521383515],[795709.4643379226,7470343.647326965],[795556.590281371,7470343.647326965]]],"type":"Polygon"},"properties":{"label":"18/136276/82205","x":136276,"y":82205,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7470343.647326965],[795709.4643379226,7470496.521383515],[795862.3383944705,7470496.521383515],[795862.3383944705,7470343.647326965],[795709.4643379226,7470343.647326965]]],"type":"Polygon"},"properties":{"label":"18/136277/82205","x":136277,"y":82205,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7470496.521383515],[795862.3383944705,7470649.3954400625],[796015.2124510184,7470649.3954400625],[796015.2124510184,7470496.521383515],[795862.3383944705,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136278/82204","x":136278,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7470496.521383515],[796015.2124510184,7470649.3954400625],[796168.08650757,7470649.3954400625],[796168.08650757,7470496.521383515],[796015.2124510184,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136279/82204","x":136279,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7470343.647326965],[795862.3383944705,7470496.521383515],[796015.2124510184,7470496.521383515],[796015.2124510184,7470343.647326965],[795862.3383944705,7470343.647326965]]],"type":"Polygon"},"properties":{"label":"18/136278/82205","x":136278,"y":82205,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7470955.143553162],[796626.7086772174,7471108.01760971],[796779.5827337652,7471108.01760971],[796779.5827337652,7470955.143553162],[796626.7086772174,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136283/82201","x":136283,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7470802.269496612],[796320.9605641179,7470955.143553162],[796473.8346206658,7470955.143553162],[796473.8346206658,7470802.269496612],[796320.9605641179,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136281/82202","x":136281,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7470649.3954400625],[796168.08650757,7470802.269496612],[796320.9605641179,7470802.269496612],[796320.9605641179,7470649.3954400625],[796168.08650757,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136280/82203","x":136280,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7470649.3954400625],[796320.9605641179,7470802.269496612],[796473.8346206658,7470802.269496612],[796473.8346206658,7470649.3954400625],[796320.9605641179,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136281/82203","x":136281,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7470802.269496612],[796473.8346206658,7470955.143553162],[796626.7086772174,7470955.143553162],[796626.7086772174,7470802.269496612],[796473.8346206658,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136282/82202","x":136282,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7470802.269496612],[796626.7086772174,7470955.143553162],[796779.5827337652,7470955.143553162],[796779.5827337652,7470802.269496612],[796626.7086772174,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136283/82202","x":136283,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7470649.3954400625],[796473.8346206658,7470802.269496612],[796626.7086772174,7470802.269496612],[796626.7086772174,7470649.3954400625],[796473.8346206658,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136282/82203","x":136282,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7471108.01760971],[796932.4567903131,7471260.89166626],[797085.330846861,7471260.89166626],[797085.330846861,7471108.01760971],[796932.4567903131,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136285/82200","x":136285,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7470955.143553162],[796779.5827337652,7471108.01760971],[796932.4567903131,7471108.01760971],[796932.4567903131,7470955.143553162],[796779.5827337652,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136284/82201","x":136284,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7470955.143553162],[796932.4567903131,7471108.01760971],[797085.330846861,7471108.01760971],[797085.330846861,7470955.143553162],[796932.4567903131,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136285/82201","x":136285,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7471108.01760971],[797085.330846861,7471260.89166626],[797238.2049034126,7471260.89166626],[797238.2049034126,7471108.01760971],[797085.330846861,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136286/82200","x":136286,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7471108.01760971],[797238.2049034126,7471260.89166626],[797391.0789599605,7471260.89166626],[797391.0789599605,7471108.01760971],[797238.2049034126,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136287/82200","x":136287,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7470955.143553162],[797085.330846861,7471108.01760971],[797238.2049034126,7471108.01760971],[797238.2049034126,7470955.143553162],[797085.330846861,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136286/82201","x":136286,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7470802.269496612],[796779.5827337652,7470955.143553162],[796932.4567903131,7470955.143553162],[796932.4567903131,7470802.269496612],[796779.5827337652,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136284/82202","x":136284,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7470496.521383515],[796168.08650757,7470649.3954400625],[796320.9605641179,7470649.3954400625],[796320.9605641179,7470496.521383515],[796168.08650757,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136280/82204","x":136280,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7471260.89166626],[797391.0789599605,7471413.765722809],[797543.9530165084,7471413.765722809],[797543.9530165084,7471260.89166626],[797391.0789599605,7471260.89166626]]],"type":"Polygon"},"properties":{"label":"18/136288/82199","x":136288,"y":82199,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7471108.01760971],[797391.0789599605,7471260.89166626],[797543.9530165084,7471260.89166626],[797543.9530165084,7471108.01760971],[797391.0789599605,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136288/82200","x":136288,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7470955.143553162],[797391.0789599605,7471108.01760971],[797543.9530165084,7471108.01760971],[797543.9530165084,7470955.143553162],[797391.0789599605,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136288/82201","x":136288,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7470955.143553162],[797543.9530165084,7471108.01760971],[797696.82707306,7471108.01760971],[797696.82707306,7470955.143553162],[797543.9530165084,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136289/82201","x":136289,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7470802.269496612],[797391.0789599605,7470955.143553162],[797543.9530165084,7470955.143553162],[797543.9530165084,7470802.269496612],[797391.0789599605,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136288/82202","x":136288,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7470802.269496612],[797543.9530165084,7470955.143553162],[797696.82707306,7470955.143553162],[797696.82707306,7470802.269496612],[797543.9530165084,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136289/82202","x":136289,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7470649.3954400625],[797543.9530165084,7470802.269496612],[797696.82707306,7470802.269496612],[797696.82707306,7470649.3954400625],[797543.9530165084,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136289/82203","x":136289,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7470802.269496612],[797696.82707306,7470955.143553162],[797849.7011296079,7470955.143553162],[797849.7011296079,7470802.269496612],[797696.82707306,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136290/82202","x":136290,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7470649.3954400625],[797696.82707306,7470802.269496612],[797849.7011296079,7470802.269496612],[797849.7011296079,7470649.3954400625],[797696.82707306,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136290/82203","x":136290,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7470649.3954400625],[797849.7011296079,7470802.269496612],[798002.5751861557,7470802.269496612],[798002.5751861557,7470649.3954400625],[797849.7011296079,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136291/82203","x":136291,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7470496.521383515],[797696.82707306,7470649.3954400625],[797849.7011296079,7470649.3954400625],[797849.7011296079,7470496.521383515],[797696.82707306,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136290/82204","x":136290,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7470496.521383515],[797849.7011296079,7470649.3954400625],[798002.5751861557,7470649.3954400625],[798002.5751861557,7470496.521383515],[797849.7011296079,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136291/82204","x":136291,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7470343.647326965],[797849.7011296079,7470496.521383515],[798002.5751861557,7470496.521383515],[798002.5751861557,7470343.647326965],[797849.7011296079,7470343.647326965]]],"type":"Polygon"},"properties":{"label":"18/136291/82205","x":136291,"y":82205,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7470037.899213867],[797543.9530165084,7470190.773270417],[797696.82707306,7470190.773270417],[797696.82707306,7470037.899213867],[797543.9530165084,7470037.899213867]]],"type":"Polygon"},"properties":{"label":"18/136289/82207","x":136289,"y":82207,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7470190.773270417],[797849.7011296079,7470343.647326965],[798002.5751861557,7470343.647326965],[798002.5751861557,7470190.773270417],[797849.7011296079,7470190.773270417]]],"type":"Polygon"},"properties":{"label":"18/136291/82206","x":136291,"y":82206,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7470037.899213867],[797696.82707306,7470190.773270417],[797849.7011296079,7470190.773270417],[797849.7011296079,7470037.899213867],[797696.82707306,7470037.899213867]]],"type":"Polygon"},"properties":{"label":"18/136290/82207","x":136290,"y":82207,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7470037.899213867],[797849.7011296079,7470190.773270417],[798002.5751861557,7470190.773270417],[798002.5751861557,7470037.899213867],[797849.7011296079,7470037.899213867]]],"type":"Polygon"},"properties":{"label":"18/136291/82207","x":136291,"y":82207,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7470496.521383515],[798002.5751861557,7470649.3954400625],[798155.4492427073,7470649.3954400625],[798155.4492427073,7470496.521383515],[798002.5751861557,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136292/82204","x":136292,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7470343.647326965],[798002.5751861557,7470496.521383515],[798155.4492427073,7470496.521383515],[798155.4492427073,7470343.647326965],[798002.5751861557,7470343.647326965]]],"type":"Polygon"},"properties":{"label":"18/136292/82205","x":136292,"y":82205,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7470190.773270417],[798002.5751861557,7470343.647326965],[798155.4492427073,7470343.647326965],[798155.4492427073,7470190.773270417],[798002.5751861557,7470190.773270417]]],"type":"Polygon"},"properties":{"label":"18/136292/82206","x":136292,"y":82206,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7470190.773270417],[798155.4492427073,7470343.647326965],[798308.3232992552,7470343.647326965],[798308.3232992552,7470190.773270417],[798155.4492427073,7470190.773270417]]],"type":"Polygon"},"properties":{"label":"18/136293/82206","x":136293,"y":82206,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7470037.899213867],[798002.5751861557,7470190.773270417],[798155.4492427073,7470190.773270417],[798155.4492427073,7470037.899213867],[798002.5751861557,7470037.899213867]]],"type":"Polygon"},"properties":{"label":"18/136292/82207","x":136292,"y":82207,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7469579.27704422],[792651.983206939,7469732.15110077],[792804.8572634906,7469732.15110077],[792804.8572634906,7469579.27704422],[792651.983206939,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136257/82210","x":136257,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7469426.40298767],[792651.983206939,7469579.27704422],[792804.8572634906,7469579.27704422],[792804.8572634906,7469426.40298767],[792651.983206939,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136257/82211","x":136257,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7469579.27704422],[792804.8572634906,7469732.15110077],[792957.7313200384,7469732.15110077],[792957.7313200384,7469579.27704422],[792804.8572634906,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136258/82210","x":136258,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7469579.27704422],[792957.7313200384,7469732.15110077],[793110.6053765863,7469732.15110077],[793110.6053765863,7469579.27704422],[792957.7313200384,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136259/82210","x":136259,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7469426.40298767],[792804.8572634906,7469579.27704422],[792957.7313200384,7469579.27704422],[792957.7313200384,7469426.40298767],[792804.8572634906,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136258/82211","x":136258,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7469426.40298767],[792957.7313200384,7469579.27704422],[793110.6053765863,7469579.27704422],[793110.6053765863,7469426.40298767],[792957.7313200384,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136259/82211","x":136259,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7469579.27704422],[793110.6053765863,7469732.15110077],[793263.4794331342,7469732.15110077],[793263.4794331342,7469579.27704422],[793110.6053765863,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136260/82210","x":136260,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7469579.27704422],[793263.4794331342,7469732.15110077],[793416.3534896858,7469732.15110077],[793416.3534896858,7469579.27704422],[793263.4794331342,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136261/82210","x":136261,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7469426.40298767],[793110.6053765863,7469579.27704422],[793263.4794331342,7469579.27704422],[793263.4794331342,7469426.40298767],[793110.6053765863,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136260/82211","x":136260,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7469426.40298767],[793263.4794331342,7469579.27704422],[793416.3534896858,7469579.27704422],[793416.3534896858,7469426.40298767],[793263.4794331342,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136261/82211","x":136261,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7469579.27704422],[793416.3534896858,7469732.15110077],[793569.2275462337,7469732.15110077],[793569.2275462337,7469579.27704422],[793416.3534896858,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136262/82210","x":136262,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7469579.27704422],[793569.2275462337,7469732.15110077],[793722.1016027816,7469732.15110077],[793722.1016027816,7469579.27704422],[793569.2275462337,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136263/82210","x":136263,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7469426.40298767],[793416.3534896858,7469579.27704422],[793569.2275462337,7469579.27704422],[793569.2275462337,7469426.40298767],[793416.3534896858,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136262/82211","x":136262,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7469426.40298767],[793569.2275462337,7469579.27704422],[793722.1016027816,7469579.27704422],[793722.1016027816,7469426.40298767],[793569.2275462337,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136263/82211","x":136263,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7469579.27704422],[793722.1016027816,7469732.15110077],[793874.9756593332,7469732.15110077],[793874.9756593332,7469579.27704422],[793722.1016027816,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136264/82210","x":136264,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7469579.27704422],[793874.9756593332,7469732.15110077],[794027.849715881,7469732.15110077],[794027.849715881,7469579.27704422],[793874.9756593332,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136265/82210","x":136265,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7469426.40298767],[793722.1016027816,7469579.27704422],[793874.9756593332,7469579.27704422],[793874.9756593332,7469426.40298767],[793722.1016027816,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136264/82211","x":136264,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7469426.40298767],[793874.9756593332,7469579.27704422],[794027.849715881,7469579.27704422],[794027.849715881,7469426.40298767],[793874.9756593332,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136265/82211","x":136265,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7469579.27704422],[794027.849715881,7469732.15110077],[794180.7237724289,7469732.15110077],[794180.7237724289,7469579.27704422],[794027.849715881,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136266/82210","x":136266,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7469579.27704422],[794180.7237724289,7469732.15110077],[794333.5978289805,7469732.15110077],[794333.5978289805,7469579.27704422],[794180.7237724289,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136267/82210","x":136267,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7469426.40298767],[794027.849715881,7469579.27704422],[794180.7237724289,7469579.27704422],[794180.7237724289,7469426.40298767],[794027.849715881,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136266/82211","x":136266,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7469426.40298767],[794180.7237724289,7469579.27704422],[794333.5978289805,7469579.27704422],[794333.5978289805,7469426.40298767],[794180.7237724289,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136267/82211","x":136267,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7469579.27704422],[794333.5978289805,7469732.15110077],[794486.4718855284,7469732.15110077],[794486.4718855284,7469579.27704422],[794333.5978289805,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136268/82210","x":136268,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7469579.27704422],[794486.4718855284,7469732.15110077],[794639.3459420763,7469732.15110077],[794639.3459420763,7469579.27704422],[794486.4718855284,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136269/82210","x":136269,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7469426.40298767],[794333.5978289805,7469579.27704422],[794486.4718855284,7469579.27704422],[794486.4718855284,7469426.40298767],[794333.5978289805,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136268/82211","x":136268,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7469426.40298767],[794486.4718855284,7469579.27704422],[794639.3459420763,7469579.27704422],[794639.3459420763,7469426.40298767],[794486.4718855284,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136269/82211","x":136269,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7469579.27704422],[794639.3459420763,7469732.15110077],[794792.2199986279,7469732.15110077],[794792.2199986279,7469579.27704422],[794639.3459420763,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136270/82210","x":136270,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7469426.40298767],[794639.3459420763,7469579.27704422],[794792.2199986279,7469579.27704422],[794792.2199986279,7469426.40298767],[794639.3459420763,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136270/82211","x":136270,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7469426.40298767],[794792.2199986279,7469579.27704422],[794945.0940551758,7469579.27704422],[794945.0940551758,7469426.40298767],[794792.2199986279,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136271/82211","x":136271,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7468662.032704925],[792651.983206939,7468814.906761475],[792804.8572634906,7468814.906761475],[792804.8572634906,7468662.032704925],[792651.983206939,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136257/82216","x":136257,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7468509.158648377],[792651.983206939,7468662.032704925],[792804.8572634906,7468662.032704925],[792804.8572634906,7468509.158648377],[792651.983206939,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136257/82217","x":136257,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7468662.032704925],[792804.8572634906,7468814.906761475],[792957.7313200384,7468814.906761475],[792957.7313200384,7468662.032704925],[792804.8572634906,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136258/82216","x":136258,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7468662.032704925],[792957.7313200384,7468814.906761475],[793110.6053765863,7468814.906761475],[793110.6053765863,7468662.032704925],[792957.7313200384,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136259/82216","x":136259,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7468509.158648377],[792804.8572634906,7468662.032704925],[792957.7313200384,7468662.032704925],[792957.7313200384,7468509.158648377],[792804.8572634906,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136258/82217","x":136258,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7468509.158648377],[792957.7313200384,7468662.032704925],[793110.6053765863,7468662.032704925],[793110.6053765863,7468509.158648377],[792957.7313200384,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136259/82217","x":136259,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7468356.284591828],[792651.983206939,7468509.158648377],[792804.8572634906,7468509.158648377],[792804.8572634906,7468356.284591828],[792651.983206939,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136257/82218","x":136257,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7468203.410535278],[792651.983206939,7468356.284591828],[792804.8572634906,7468356.284591828],[792804.8572634906,7468203.410535278],[792651.983206939,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136257/82219","x":136257,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7468356.284591828],[792804.8572634906,7468509.158648377],[792957.7313200384,7468509.158648377],[792957.7313200384,7468356.284591828],[792804.8572634906,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136258/82218","x":136258,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7468356.284591828],[792957.7313200384,7468509.158648377],[793110.6053765863,7468509.158648377],[793110.6053765863,7468356.284591828],[792957.7313200384,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136259/82218","x":136259,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7468203.410535278],[792804.8572634906,7468356.284591828],[792957.7313200384,7468356.284591828],[792957.7313200384,7468203.410535278],[792804.8572634906,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136258/82219","x":136258,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7468203.410535278],[792957.7313200384,7468356.284591828],[793110.6053765863,7468356.284591828],[793110.6053765863,7468203.410535278],[792957.7313200384,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136259/82219","x":136259,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7468662.032704925],[793110.6053765863,7468814.906761475],[793263.4794331342,7468814.906761475],[793263.4794331342,7468662.032704925],[793110.6053765863,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136260/82216","x":136260,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7468662.032704925],[793263.4794331342,7468814.906761475],[793416.3534896858,7468814.906761475],[793416.3534896858,7468662.032704925],[793263.4794331342,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136261/82216","x":136261,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7468509.158648377],[793110.6053765863,7468662.032704925],[793263.4794331342,7468662.032704925],[793263.4794331342,7468509.158648377],[793110.6053765863,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136260/82217","x":136260,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7468509.158648377],[793263.4794331342,7468662.032704925],[793416.3534896858,7468662.032704925],[793416.3534896858,7468509.158648377],[793263.4794331342,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136261/82217","x":136261,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7468662.032704925],[793416.3534896858,7468814.906761475],[793569.2275462337,7468814.906761475],[793569.2275462337,7468662.032704925],[793416.3534896858,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136262/82216","x":136262,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7468509.158648377],[793416.3534896858,7468662.032704925],[793569.2275462337,7468662.032704925],[793569.2275462337,7468509.158648377],[793416.3534896858,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136262/82217","x":136262,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7468509.158648377],[793569.2275462337,7468662.032704925],[793722.1016027816,7468662.032704925],[793722.1016027816,7468509.158648377],[793569.2275462337,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136263/82217","x":136263,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7468356.284591828],[793110.6053765863,7468509.158648377],[793263.4794331342,7468509.158648377],[793263.4794331342,7468356.284591828],[793110.6053765863,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136260/82218","x":136260,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7468356.284591828],[793263.4794331342,7468509.158648377],[793416.3534896858,7468509.158648377],[793416.3534896858,7468356.284591828],[793263.4794331342,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136261/82218","x":136261,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7468203.410535278],[793110.6053765863,7468356.284591828],[793263.4794331342,7468356.284591828],[793263.4794331342,7468203.410535278],[793110.6053765863,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136260/82219","x":136260,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7468203.410535278],[793263.4794331342,7468356.284591828],[793416.3534896858,7468356.284591828],[793416.3534896858,7468203.410535278],[793263.4794331342,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136261/82219","x":136261,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7468356.284591828],[793416.3534896858,7468509.158648377],[793569.2275462337,7468509.158648377],[793569.2275462337,7468356.284591828],[793416.3534896858,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136262/82218","x":136262,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7468356.284591828],[793569.2275462337,7468509.158648377],[793722.1016027816,7468509.158648377],[793722.1016027816,7468356.284591828],[793569.2275462337,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136263/82218","x":136263,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7468203.410535278],[793416.3534896858,7468356.284591828],[793569.2275462337,7468356.284591828],[793569.2275462337,7468203.410535278],[793416.3534896858,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136262/82219","x":136262,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7468203.410535278],[793569.2275462337,7468356.284591828],[793722.1016027816,7468356.284591828],[793722.1016027816,7468203.410535278],[793569.2275462337,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136263/82219","x":136263,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7468050.53647873],[792651.983206939,7468203.410535278],[792804.8572634906,7468203.410535278],[792804.8572634906,7468050.53647873],[792651.983206939,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136257/82220","x":136257,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7467897.66242218],[792651.983206939,7468050.53647873],[792804.8572634906,7468050.53647873],[792804.8572634906,7467897.66242218],[792651.983206939,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136257/82221","x":136257,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7468050.53647873],[792804.8572634906,7468203.410535278],[792957.7313200384,7468203.410535278],[792957.7313200384,7468050.53647873],[792804.8572634906,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136258/82220","x":136258,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7468050.53647873],[792957.7313200384,7468203.410535278],[793110.6053765863,7468203.410535278],[793110.6053765863,7468050.53647873],[792957.7313200384,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136259/82220","x":136259,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7467897.66242218],[792804.8572634906,7468050.53647873],[792957.7313200384,7468050.53647873],[792957.7313200384,7467897.66242218],[792804.8572634906,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136258/82221","x":136258,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7467897.66242218],[792957.7313200384,7468050.53647873],[793110.6053765863,7468050.53647873],[793110.6053765863,7467897.66242218],[792957.7313200384,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136259/82221","x":136259,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7467744.78836563],[792651.983206939,7467897.66242218],[792804.8572634906,7467897.66242218],[792804.8572634906,7467744.78836563],[792651.983206939,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136257/82222","x":136257,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7467591.914309083],[792651.983206939,7467744.78836563],[792804.8572634906,7467744.78836563],[792804.8572634906,7467591.914309083],[792651.983206939,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136257/82223","x":136257,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7467744.78836563],[792804.8572634906,7467897.66242218],[792957.7313200384,7467897.66242218],[792957.7313200384,7467744.78836563],[792804.8572634906,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136258/82222","x":136258,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7467744.78836563],[792957.7313200384,7467897.66242218],[793110.6053765863,7467897.66242218],[793110.6053765863,7467744.78836563],[792957.7313200384,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136259/82222","x":136259,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7467591.914309083],[792804.8572634906,7467744.78836563],[792957.7313200384,7467744.78836563],[792957.7313200384,7467591.914309083],[792804.8572634906,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136258/82223","x":136258,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7467591.914309083],[792957.7313200384,7467744.78836563],[793110.6053765863,7467744.78836563],[793110.6053765863,7467591.914309083],[792957.7313200384,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136259/82223","x":136259,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7468050.53647873],[793110.6053765863,7468203.410535278],[793263.4794331342,7468203.410535278],[793263.4794331342,7468050.53647873],[793110.6053765863,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136260/82220","x":136260,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7468050.53647873],[793263.4794331342,7468203.410535278],[793416.3534896858,7468203.410535278],[793416.3534896858,7468050.53647873],[793263.4794331342,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136261/82220","x":136261,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7467897.66242218],[793110.6053765863,7468050.53647873],[793263.4794331342,7468050.53647873],[793263.4794331342,7467897.66242218],[793110.6053765863,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136260/82221","x":136260,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7467897.66242218],[793263.4794331342,7468050.53647873],[793416.3534896858,7468050.53647873],[793416.3534896858,7467897.66242218],[793263.4794331342,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136261/82221","x":136261,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7468050.53647873],[793416.3534896858,7468203.410535278],[793569.2275462337,7468203.410535278],[793569.2275462337,7468050.53647873],[793416.3534896858,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136262/82220","x":136262,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7468050.53647873],[793569.2275462337,7468203.410535278],[793722.1016027816,7468203.410535278],[793722.1016027816,7468050.53647873],[793569.2275462337,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136263/82220","x":136263,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7467897.66242218],[793416.3534896858,7468050.53647873],[793569.2275462337,7468050.53647873],[793569.2275462337,7467897.66242218],[793416.3534896858,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136262/82221","x":136262,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7467897.66242218],[793569.2275462337,7468050.53647873],[793722.1016027816,7468050.53647873],[793722.1016027816,7467897.66242218],[793569.2275462337,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136263/82221","x":136263,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7467744.78836563],[793110.6053765863,7467897.66242218],[793263.4794331342,7467897.66242218],[793263.4794331342,7467744.78836563],[793110.6053765863,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136260/82222","x":136260,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7467744.78836563],[793263.4794331342,7467897.66242218],[793416.3534896858,7467897.66242218],[793416.3534896858,7467744.78836563],[793263.4794331342,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136261/82222","x":136261,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7467591.914309083],[793110.6053765863,7467744.78836563],[793263.4794331342,7467744.78836563],[793263.4794331342,7467591.914309083],[793110.6053765863,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136260/82223","x":136260,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7467591.914309083],[793263.4794331342,7467744.78836563],[793416.3534896858,7467744.78836563],[793416.3534896858,7467591.914309083],[793263.4794331342,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136261/82223","x":136261,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7467744.78836563],[793416.3534896858,7467897.66242218],[793569.2275462337,7467897.66242218],[793569.2275462337,7467744.78836563],[793416.3534896858,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136262/82222","x":136262,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7467744.78836563],[793569.2275462337,7467897.66242218],[793722.1016027816,7467897.66242218],[793722.1016027816,7467744.78836563],[793569.2275462337,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136263/82222","x":136263,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7467591.914309083],[793416.3534896858,7467744.78836563],[793569.2275462337,7467744.78836563],[793569.2275462337,7467591.914309083],[793416.3534896858,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136262/82223","x":136262,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7467591.914309083],[793569.2275462337,7467744.78836563],[793722.1016027816,7467744.78836563],[793722.1016027816,7467591.914309083],[793569.2275462337,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136263/82223","x":136263,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7468509.158648377],[793722.1016027816,7468662.032704925],[793874.9756593332,7468662.032704925],[793874.9756593332,7468509.158648377],[793722.1016027816,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136264/82217","x":136264,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7468509.158648377],[793874.9756593332,7468662.032704925],[794027.849715881,7468662.032704925],[794027.849715881,7468509.158648377],[793874.9756593332,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136265/82217","x":136265,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7468509.158648377],[794027.849715881,7468662.032704925],[794180.7237724289,7468662.032704925],[794180.7237724289,7468509.158648377],[794027.849715881,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136266/82217","x":136266,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7468509.158648377],[794180.7237724289,7468662.032704925],[794333.5978289805,7468662.032704925],[794333.5978289805,7468509.158648377],[794180.7237724289,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136267/82217","x":136267,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7468356.284591828],[793722.1016027816,7468509.158648377],[793874.9756593332,7468509.158648377],[793874.9756593332,7468356.284591828],[793722.1016027816,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136264/82218","x":136264,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7468356.284591828],[793874.9756593332,7468509.158648377],[794027.849715881,7468509.158648377],[794027.849715881,7468356.284591828],[793874.9756593332,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136265/82218","x":136265,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7468203.410535278],[793722.1016027816,7468356.284591828],[793874.9756593332,7468356.284591828],[793874.9756593332,7468203.410535278],[793722.1016027816,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136264/82219","x":136264,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7468203.410535278],[793874.9756593332,7468356.284591828],[794027.849715881,7468356.284591828],[794027.849715881,7468203.410535278],[793874.9756593332,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136265/82219","x":136265,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7468356.284591828],[794027.849715881,7468509.158648377],[794180.7237724289,7468509.158648377],[794180.7237724289,7468356.284591828],[794027.849715881,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136266/82218","x":136266,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7468356.284591828],[794180.7237724289,7468509.158648377],[794333.5978289805,7468509.158648377],[794333.5978289805,7468356.284591828],[794180.7237724289,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136267/82218","x":136267,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7468203.410535278],[794027.849715881,7468356.284591828],[794180.7237724289,7468356.284591828],[794180.7237724289,7468203.410535278],[794027.849715881,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136266/82219","x":136266,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7468203.410535278],[794180.7237724289,7468356.284591828],[794333.5978289805,7468356.284591828],[794333.5978289805,7468203.410535278],[794180.7237724289,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136267/82219","x":136267,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7468509.158648377],[794333.5978289805,7468662.032704925],[794486.4718855284,7468662.032704925],[794486.4718855284,7468509.158648377],[794333.5978289805,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136268/82217","x":136268,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7468356.284591828],[794333.5978289805,7468509.158648377],[794486.4718855284,7468509.158648377],[794486.4718855284,7468356.284591828],[794333.5978289805,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136268/82218","x":136268,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7468203.410535278],[794333.5978289805,7468356.284591828],[794486.4718855284,7468356.284591828],[794486.4718855284,7468203.410535278],[794333.5978289805,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136268/82219","x":136268,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7468050.53647873],[793722.1016027816,7468203.410535278],[793874.9756593332,7468203.410535278],[793874.9756593332,7468050.53647873],[793722.1016027816,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136264/82220","x":136264,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7468050.53647873],[793874.9756593332,7468203.410535278],[794027.849715881,7468203.410535278],[794027.849715881,7468050.53647873],[793874.9756593332,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136265/82220","x":136265,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7467897.66242218],[793722.1016027816,7468050.53647873],[793874.9756593332,7468050.53647873],[793874.9756593332,7467897.66242218],[793722.1016027816,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136264/82221","x":136264,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7467897.66242218],[793874.9756593332,7468050.53647873],[794027.849715881,7468050.53647873],[794027.849715881,7467897.66242218],[793874.9756593332,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136265/82221","x":136265,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7468050.53647873],[794027.849715881,7468203.410535278],[794180.7237724289,7468203.410535278],[794180.7237724289,7468050.53647873],[794027.849715881,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136266/82220","x":136266,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7468050.53647873],[794180.7237724289,7468203.410535278],[794333.5978289805,7468203.410535278],[794333.5978289805,7468050.53647873],[794180.7237724289,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136267/82220","x":136267,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7467897.66242218],[794027.849715881,7468050.53647873],[794180.7237724289,7468050.53647873],[794180.7237724289,7467897.66242218],[794027.849715881,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136266/82221","x":136266,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7467897.66242218],[794180.7237724289,7468050.53647873],[794333.5978289805,7468050.53647873],[794333.5978289805,7467897.66242218],[794180.7237724289,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136267/82221","x":136267,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7467744.78836563],[793722.1016027816,7467897.66242218],[793874.9756593332,7467897.66242218],[793874.9756593332,7467744.78836563],[793722.1016027816,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136264/82222","x":136264,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7467744.78836563],[793874.9756593332,7467897.66242218],[794027.849715881,7467897.66242218],[794027.849715881,7467744.78836563],[793874.9756593332,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136265/82222","x":136265,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7467591.914309083],[793722.1016027816,7467744.78836563],[793874.9756593332,7467744.78836563],[793874.9756593332,7467591.914309083],[793722.1016027816,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136264/82223","x":136264,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7467591.914309083],[793874.9756593332,7467744.78836563],[794027.849715881,7467744.78836563],[794027.849715881,7467591.914309083],[793874.9756593332,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136265/82223","x":136265,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7467744.78836563],[794027.849715881,7467897.66242218],[794180.7237724289,7467897.66242218],[794180.7237724289,7467744.78836563],[794027.849715881,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136266/82222","x":136266,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7467744.78836563],[794180.7237724289,7467897.66242218],[794333.5978289805,7467897.66242218],[794333.5978289805,7467744.78836563],[794180.7237724289,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136267/82222","x":136267,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7467591.914309083],[794027.849715881,7467744.78836563],[794180.7237724289,7467744.78836563],[794180.7237724289,7467591.914309083],[794027.849715881,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136266/82223","x":136266,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7467591.914309083],[794180.7237724289,7467744.78836563],[794333.5978289805,7467744.78836563],[794333.5978289805,7467591.914309083],[794180.7237724289,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136267/82223","x":136267,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7468050.53647873],[794333.5978289805,7468203.410535278],[794486.4718855284,7468203.410535278],[794486.4718855284,7468050.53647873],[794333.5978289805,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136268/82220","x":136268,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7467897.66242218],[794333.5978289805,7468050.53647873],[794486.4718855284,7468050.53647873],[794486.4718855284,7467897.66242218],[794333.5978289805,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136268/82221","x":136268,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7467744.78836563],[794333.5978289805,7467897.66242218],[794486.4718855284,7467897.66242218],[794486.4718855284,7467744.78836563],[794333.5978289805,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136268/82222","x":136268,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7467591.914309083],[794333.5978289805,7467744.78836563],[794486.4718855284,7467744.78836563],[794486.4718855284,7467591.914309083],[794333.5978289805,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136268/82223","x":136268,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7469426.40298767],[794945.0940551758,7469579.27704422],[795097.9681117237,7469579.27704422],[795097.9681117237,7469426.40298767],[794945.0940551758,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136272/82211","x":136272,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7469426.40298767],[795097.9681117237,7469579.27704422],[795250.8421682753,7469579.27704422],[795250.8421682753,7469426.40298767],[795097.9681117237,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136273/82211","x":136273,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7469426.40298767],[795250.8421682753,7469579.27704422],[795403.7162248231,7469579.27704422],[795403.7162248231,7469426.40298767],[795250.8421682753,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136274/82211","x":136274,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7469426.40298767],[795403.7162248231,7469579.27704422],[795556.590281371,7469579.27704422],[795556.590281371,7469426.40298767],[795403.7162248231,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136275/82211","x":136275,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7469426.40298767],[795556.590281371,7469579.27704422],[795709.4643379226,7469579.27704422],[795709.4643379226,7469426.40298767],[795556.590281371,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136276/82211","x":136276,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7469426.40298767],[795709.4643379226,7469579.27704422],[795862.3383944705,7469579.27704422],[795862.3383944705,7469426.40298767],[795709.4643379226,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136277/82211","x":136277,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7469426.40298767],[795862.3383944705,7469579.27704422],[796015.2124510184,7469579.27704422],[796015.2124510184,7469426.40298767],[795862.3383944705,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136278/82211","x":136278,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7469426.40298767],[796015.2124510184,7469579.27704422],[796168.08650757,7469579.27704422],[796168.08650757,7469426.40298767],[796015.2124510184,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136279/82211","x":136279,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7469426.40298767],[796168.08650757,7469579.27704422],[796320.9605641179,7469579.27704422],[796320.9605641179,7469426.40298767],[796168.08650757,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136280/82211","x":136280,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7469426.40298767],[796320.9605641179,7469579.27704422],[796473.8346206658,7469579.27704422],[796473.8346206658,7469426.40298767],[796320.9605641179,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136281/82211","x":136281,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7469579.27704422],[796473.8346206658,7469732.15110077],[796626.7086772174,7469732.15110077],[796626.7086772174,7469579.27704422],[796473.8346206658,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136282/82210","x":136282,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7469579.27704422],[796626.7086772174,7469732.15110077],[796779.5827337652,7469732.15110077],[796779.5827337652,7469579.27704422],[796626.7086772174,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136283/82210","x":136283,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7469426.40298767],[796473.8346206658,7469579.27704422],[796626.7086772174,7469579.27704422],[796626.7086772174,7469426.40298767],[796473.8346206658,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136282/82211","x":136282,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7469426.40298767],[796626.7086772174,7469579.27704422],[796779.5827337652,7469579.27704422],[796779.5827337652,7469426.40298767],[796626.7086772174,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136283/82211","x":136283,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7469732.15110077],[796779.5827337652,7469885.0251573175],[796932.4567903131,7469885.0251573175],[796932.4567903131,7469732.15110077],[796779.5827337652,7469732.15110077]]],"type":"Polygon"},"properties":{"label":"18/136284/82209","x":136284,"y":82209,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7469732.15110077],[796932.4567903131,7469885.0251573175],[797085.330846861,7469885.0251573175],[797085.330846861,7469732.15110077],[796932.4567903131,7469732.15110077]]],"type":"Polygon"},"properties":{"label":"18/136285/82209","x":136285,"y":82209,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7469885.0251573175],[797238.2049034126,7470037.899213867],[797391.0789599605,7470037.899213867],[797391.0789599605,7469885.0251573175],[797238.2049034126,7469885.0251573175]]],"type":"Polygon"},"properties":{"label":"18/136287/82208","x":136287,"y":82208,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7469732.15110077],[797085.330846861,7469885.0251573175],[797238.2049034126,7469885.0251573175],[797238.2049034126,7469732.15110077],[797085.330846861,7469732.15110077]]],"type":"Polygon"},"properties":{"label":"18/136286/82209","x":136286,"y":82209,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7469732.15110077],[797238.2049034126,7469885.0251573175],[797391.0789599605,7469885.0251573175],[797391.0789599605,7469732.15110077],[797238.2049034126,7469732.15110077]]],"type":"Polygon"},"properties":{"label":"18/136287/82209","x":136287,"y":82209,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7469579.27704422],[796779.5827337652,7469732.15110077],[796932.4567903131,7469732.15110077],[796932.4567903131,7469579.27704422],[796779.5827337652,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136284/82210","x":136284,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7469579.27704422],[796932.4567903131,7469732.15110077],[797085.330846861,7469732.15110077],[797085.330846861,7469579.27704422],[796932.4567903131,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136285/82210","x":136285,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7468814.906761475],[796473.8346206658,7468967.780818023],[796626.7086772174,7468967.780818023],[796626.7086772174,7468814.906761475],[796473.8346206658,7468814.906761475]]],"type":"Polygon"},"properties":{"label":"18/136282/82215","x":136282,"y":82215,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7468814.906761475],[796626.7086772174,7468967.780818023],[796779.5827337652,7468967.780818023],[796779.5827337652,7468814.906761475],[796626.7086772174,7468814.906761475]]],"type":"Polygon"},"properties":{"label":"18/136283/82215","x":136283,"y":82215,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7468814.906761475],[796779.5827337652,7468967.780818023],[796932.4567903131,7468967.780818023],[796932.4567903131,7468814.906761475],[796779.5827337652,7468814.906761475]]],"type":"Polygon"},"properties":{"label":"18/136284/82215","x":136284,"y":82215,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7468356.284591828],[796015.2124510184,7468509.158648377],[796168.08650757,7468509.158648377],[796168.08650757,7468356.284591828],[796015.2124510184,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136279/82218","x":136279,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7468203.410535278],[795862.3383944705,7468356.284591828],[796015.2124510184,7468356.284591828],[796015.2124510184,7468203.410535278],[795862.3383944705,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136278/82219","x":136278,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7468203.410535278],[796015.2124510184,7468356.284591828],[796168.08650757,7468356.284591828],[796168.08650757,7468203.410535278],[796015.2124510184,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136279/82219","x":136279,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7468050.53647873],[795709.4643379226,7468203.410535278],[795862.3383944705,7468203.410535278],[795862.3383944705,7468050.53647873],[795709.4643379226,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136277/82220","x":136277,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7467897.66242218],[795556.590281371,7468050.53647873],[795709.4643379226,7468050.53647873],[795709.4643379226,7467897.66242218],[795556.590281371,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136276/82221","x":136276,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7467897.66242218],[795709.4643379226,7468050.53647873],[795862.3383944705,7468050.53647873],[795862.3383944705,7467897.66242218],[795709.4643379226,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136277/82221","x":136277,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7468050.53647873],[795862.3383944705,7468203.410535278],[796015.2124510184,7468203.410535278],[796015.2124510184,7468050.53647873],[795862.3383944705,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136278/82220","x":136278,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7468050.53647873],[796015.2124510184,7468203.410535278],[796168.08650757,7468203.410535278],[796168.08650757,7468050.53647873],[796015.2124510184,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136279/82220","x":136279,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7467897.66242218],[795862.3383944705,7468050.53647873],[796015.2124510184,7468050.53647873],[796015.2124510184,7467897.66242218],[795862.3383944705,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136278/82221","x":136278,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7467897.66242218],[796015.2124510184,7468050.53647873],[796168.08650757,7468050.53647873],[796168.08650757,7467897.66242218],[796015.2124510184,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136279/82221","x":136279,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7467744.78836563],[795556.590281371,7467897.66242218],[795709.4643379226,7467897.66242218],[795709.4643379226,7467744.78836563],[795556.590281371,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136276/82222","x":136276,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7467744.78836563],[795709.4643379226,7467897.66242218],[795862.3383944705,7467897.66242218],[795862.3383944705,7467744.78836563],[795709.4643379226,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136277/82222","x":136277,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7467591.914309083],[795709.4643379226,7467744.78836563],[795862.3383944705,7467744.78836563],[795862.3383944705,7467591.914309083],[795709.4643379226,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136277/82223","x":136277,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7467744.78836563],[795862.3383944705,7467897.66242218],[796015.2124510184,7467897.66242218],[796015.2124510184,7467744.78836563],[795862.3383944705,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136278/82222","x":136278,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7467744.78836563],[796015.2124510184,7467897.66242218],[796168.08650757,7467897.66242218],[796168.08650757,7467744.78836563],[796015.2124510184,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136279/82222","x":136279,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7467591.914309083],[795862.3383944705,7467744.78836563],[796015.2124510184,7467744.78836563],[796015.2124510184,7467591.914309083],[795862.3383944705,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136278/82223","x":136278,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7467591.914309083],[796015.2124510184,7467744.78836563],[796168.08650757,7467744.78836563],[796168.08650757,7467591.914309083],[796015.2124510184,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136279/82223","x":136279,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7468662.032704925],[796320.9605641179,7468814.906761475],[796473.8346206658,7468814.906761475],[796473.8346206658,7468662.032704925],[796320.9605641179,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136281/82216","x":136281,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7468509.158648377],[796168.08650757,7468662.032704925],[796320.9605641179,7468662.032704925],[796320.9605641179,7468509.158648377],[796168.08650757,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136280/82217","x":136280,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7468509.158648377],[796320.9605641179,7468662.032704925],[796473.8346206658,7468662.032704925],[796473.8346206658,7468509.158648377],[796320.9605641179,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136281/82217","x":136281,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7468662.032704925],[796473.8346206658,7468814.906761475],[796626.7086772174,7468814.906761475],[796626.7086772174,7468662.032704925],[796473.8346206658,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136282/82216","x":136282,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7468662.032704925],[796626.7086772174,7468814.906761475],[796779.5827337652,7468814.906761475],[796779.5827337652,7468662.032704925],[796626.7086772174,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136283/82216","x":136283,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7468509.158648377],[796473.8346206658,7468662.032704925],[796626.7086772174,7468662.032704925],[796626.7086772174,7468509.158648377],[796473.8346206658,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136282/82217","x":136282,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7468509.158648377],[796626.7086772174,7468662.032704925],[796779.5827337652,7468662.032704925],[796779.5827337652,7468509.158648377],[796626.7086772174,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136283/82217","x":136283,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7468356.284591828],[796168.08650757,7468509.158648377],[796320.9605641179,7468509.158648377],[796320.9605641179,7468356.284591828],[796168.08650757,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136280/82218","x":136280,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7468356.284591828],[796320.9605641179,7468509.158648377],[796473.8346206658,7468509.158648377],[796473.8346206658,7468356.284591828],[796320.9605641179,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136281/82218","x":136281,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7468203.410535278],[796168.08650757,7468356.284591828],[796320.9605641179,7468356.284591828],[796320.9605641179,7468203.410535278],[796168.08650757,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136280/82219","x":136280,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7468203.410535278],[796320.9605641179,7468356.284591828],[796473.8346206658,7468356.284591828],[796473.8346206658,7468203.410535278],[796320.9605641179,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136281/82219","x":136281,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7468356.284591828],[796473.8346206658,7468509.158648377],[796626.7086772174,7468509.158648377],[796626.7086772174,7468356.284591828],[796473.8346206658,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136282/82218","x":136282,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7468356.284591828],[796626.7086772174,7468509.158648377],[796779.5827337652,7468509.158648377],[796779.5827337652,7468356.284591828],[796626.7086772174,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136283/82218","x":136283,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7468203.410535278],[796473.8346206658,7468356.284591828],[796626.7086772174,7468356.284591828],[796626.7086772174,7468203.410535278],[796473.8346206658,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136282/82219","x":136282,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7468203.410535278],[796626.7086772174,7468356.284591828],[796779.5827337652,7468356.284591828],[796779.5827337652,7468203.410535278],[796626.7086772174,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136283/82219","x":136283,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7468662.032704925],[796779.5827337652,7468814.906761475],[796932.4567903131,7468814.906761475],[796932.4567903131,7468662.032704925],[796779.5827337652,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136284/82216","x":136284,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7468662.032704925],[796932.4567903131,7468814.906761475],[797085.330846861,7468814.906761475],[797085.330846861,7468662.032704925],[796932.4567903131,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136285/82216","x":136285,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7468509.158648377],[796779.5827337652,7468662.032704925],[796932.4567903131,7468662.032704925],[796932.4567903131,7468509.158648377],[796779.5827337652,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136284/82217","x":136284,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7468509.158648377],[796932.4567903131,7468662.032704925],[797085.330846861,7468662.032704925],[797085.330846861,7468509.158648377],[796932.4567903131,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136285/82217","x":136285,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7468662.032704925],[797085.330846861,7468814.906761475],[797238.2049034126,7468814.906761475],[797238.2049034126,7468662.032704925],[797085.330846861,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136286/82216","x":136286,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7468509.158648377],[797085.330846861,7468662.032704925],[797238.2049034126,7468662.032704925],[797238.2049034126,7468509.158648377],[797085.330846861,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136286/82217","x":136286,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7468356.284591828],[796779.5827337652,7468509.158648377],[796932.4567903131,7468509.158648377],[796932.4567903131,7468356.284591828],[796779.5827337652,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136284/82218","x":136284,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7468356.284591828],[796932.4567903131,7468509.158648377],[797085.330846861,7468509.158648377],[797085.330846861,7468356.284591828],[796932.4567903131,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136285/82218","x":136285,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7468203.410535278],[796779.5827337652,7468356.284591828],[796932.4567903131,7468356.284591828],[796932.4567903131,7468203.410535278],[796779.5827337652,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136284/82219","x":136284,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7468203.410535278],[796932.4567903131,7468356.284591828],[797085.330846861,7468356.284591828],[797085.330846861,7468203.410535278],[796932.4567903131,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136285/82219","x":136285,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7468356.284591828],[797085.330846861,7468509.158648377],[797238.2049034126,7468509.158648377],[797238.2049034126,7468356.284591828],[797085.330846861,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136286/82218","x":136286,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7468356.284591828],[797238.2049034126,7468509.158648377],[797391.0789599605,7468509.158648377],[797391.0789599605,7468356.284591828],[797238.2049034126,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136287/82218","x":136287,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7468203.410535278],[797085.330846861,7468356.284591828],[797238.2049034126,7468356.284591828],[797238.2049034126,7468203.410535278],[797085.330846861,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136286/82219","x":136286,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7468203.410535278],[797238.2049034126,7468356.284591828],[797391.0789599605,7468356.284591828],[797391.0789599605,7468203.410535278],[797238.2049034126,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136287/82219","x":136287,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7468050.53647873],[796168.08650757,7468203.410535278],[796320.9605641179,7468203.410535278],[796320.9605641179,7468050.53647873],[796168.08650757,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136280/82220","x":136280,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7468050.53647873],[796320.9605641179,7468203.410535278],[796473.8346206658,7468203.410535278],[796473.8346206658,7468050.53647873],[796320.9605641179,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136281/82220","x":136281,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7467897.66242218],[796168.08650757,7468050.53647873],[796320.9605641179,7468050.53647873],[796320.9605641179,7467897.66242218],[796168.08650757,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136280/82221","x":136280,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7467897.66242218],[796320.9605641179,7468050.53647873],[796473.8346206658,7468050.53647873],[796473.8346206658,7467897.66242218],[796320.9605641179,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136281/82221","x":136281,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7468050.53647873],[796473.8346206658,7468203.410535278],[796626.7086772174,7468203.410535278],[796626.7086772174,7468050.53647873],[796473.8346206658,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136282/82220","x":136282,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7468050.53647873],[796626.7086772174,7468203.410535278],[796779.5827337652,7468203.410535278],[796779.5827337652,7468050.53647873],[796626.7086772174,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136283/82220","x":136283,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7467897.66242218],[796473.8346206658,7468050.53647873],[796626.7086772174,7468050.53647873],[796626.7086772174,7467897.66242218],[796473.8346206658,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136282/82221","x":136282,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7467897.66242218],[796626.7086772174,7468050.53647873],[796779.5827337652,7468050.53647873],[796779.5827337652,7467897.66242218],[796626.7086772174,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136283/82221","x":136283,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7467744.78836563],[796168.08650757,7467897.66242218],[796320.9605641179,7467897.66242218],[796320.9605641179,7467744.78836563],[796168.08650757,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136280/82222","x":136280,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7467744.78836563],[796320.9605641179,7467897.66242218],[796473.8346206658,7467897.66242218],[796473.8346206658,7467744.78836563],[796320.9605641179,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136281/82222","x":136281,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7467591.914309083],[796168.08650757,7467744.78836563],[796320.9605641179,7467744.78836563],[796320.9605641179,7467591.914309083],[796168.08650757,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136280/82223","x":136280,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7467591.914309083],[796320.9605641179,7467744.78836563],[796473.8346206658,7467744.78836563],[796473.8346206658,7467591.914309083],[796320.9605641179,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136281/82223","x":136281,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7467744.78836563],[796473.8346206658,7467897.66242218],[796626.7086772174,7467897.66242218],[796626.7086772174,7467744.78836563],[796473.8346206658,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136282/82222","x":136282,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7467744.78836563],[796626.7086772174,7467897.66242218],[796779.5827337652,7467897.66242218],[796779.5827337652,7467744.78836563],[796626.7086772174,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136283/82222","x":136283,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7467591.914309083],[796473.8346206658,7467744.78836563],[796626.7086772174,7467744.78836563],[796626.7086772174,7467591.914309083],[796473.8346206658,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136282/82223","x":136282,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7467591.914309083],[796626.7086772174,7467744.78836563],[796779.5827337652,7467744.78836563],[796779.5827337652,7467591.914309083],[796626.7086772174,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136283/82223","x":136283,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7468050.53647873],[796779.5827337652,7468203.410535278],[796932.4567903131,7468203.410535278],[796932.4567903131,7468050.53647873],[796779.5827337652,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136284/82220","x":136284,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7468050.53647873],[796932.4567903131,7468203.410535278],[797085.330846861,7468203.410535278],[797085.330846861,7468050.53647873],[796932.4567903131,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136285/82220","x":136285,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7467897.66242218],[796779.5827337652,7468050.53647873],[796932.4567903131,7468050.53647873],[796932.4567903131,7467897.66242218],[796779.5827337652,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136284/82221","x":136284,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7467897.66242218],[796932.4567903131,7468050.53647873],[797085.330846861,7468050.53647873],[797085.330846861,7467897.66242218],[796932.4567903131,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136285/82221","x":136285,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7468050.53647873],[797085.330846861,7468203.410535278],[797238.2049034126,7468203.410535278],[797238.2049034126,7468050.53647873],[797085.330846861,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136286/82220","x":136286,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7468050.53647873],[797238.2049034126,7468203.410535278],[797391.0789599605,7468203.410535278],[797391.0789599605,7468050.53647873],[797238.2049034126,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136287/82220","x":136287,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7467897.66242218],[797085.330846861,7468050.53647873],[797238.2049034126,7468050.53647873],[797238.2049034126,7467897.66242218],[797085.330846861,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136286/82221","x":136286,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7467897.66242218],[797238.2049034126,7468050.53647873],[797391.0789599605,7468050.53647873],[797391.0789599605,7467897.66242218],[797238.2049034126,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136287/82221","x":136287,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7467744.78836563],[796779.5827337652,7467897.66242218],[796932.4567903131,7467897.66242218],[796932.4567903131,7467744.78836563],[796779.5827337652,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136284/82222","x":136284,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7467591.914309083],[796779.5827337652,7467744.78836563],[796932.4567903131,7467744.78836563],[796932.4567903131,7467591.914309083],[796779.5827337652,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136284/82223","x":136284,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7467439.040252533],[792651.983206939,7467591.914309083],[792804.8572634906,7467591.914309083],[792804.8572634906,7467439.040252533],[792651.983206939,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136257/82224","x":136257,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7467286.166195983],[792651.983206939,7467439.040252533],[792804.8572634906,7467439.040252533],[792804.8572634906,7467286.166195983],[792651.983206939,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136257/82225","x":136257,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7467439.040252533],[792804.8572634906,7467591.914309083],[792957.7313200384,7467591.914309083],[792957.7313200384,7467439.040252533],[792804.8572634906,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136258/82224","x":136258,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7467439.040252533],[792957.7313200384,7467591.914309083],[793110.6053765863,7467591.914309083],[793110.6053765863,7467439.040252533],[792957.7313200384,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136259/82224","x":136259,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7467286.166195983],[792804.8572634906,7467439.040252533],[792957.7313200384,7467439.040252533],[792957.7313200384,7467286.166195983],[792804.8572634906,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136258/82225","x":136258,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7467286.166195983],[792957.7313200384,7467439.040252533],[793110.6053765863,7467439.040252533],[793110.6053765863,7467286.166195983],[792957.7313200384,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136259/82225","x":136259,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7467133.292139435],[792651.983206939,7467286.166195983],[792804.8572634906,7467286.166195983],[792804.8572634906,7467133.292139435],[792651.983206939,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136257/82226","x":136257,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7466980.418082885],[792651.983206939,7467133.292139435],[792804.8572634906,7467133.292139435],[792804.8572634906,7466980.418082885],[792651.983206939,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136257/82227","x":136257,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7467133.292139435],[792804.8572634906,7467286.166195983],[792957.7313200384,7467286.166195983],[792957.7313200384,7467133.292139435],[792804.8572634906,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136258/82226","x":136258,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7467133.292139435],[792957.7313200384,7467286.166195983],[793110.6053765863,7467286.166195983],[793110.6053765863,7467133.292139435],[792957.7313200384,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136259/82226","x":136259,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7466980.418082885],[792804.8572634906,7467133.292139435],[792957.7313200384,7467133.292139435],[792957.7313200384,7466980.418082885],[792804.8572634906,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136258/82227","x":136258,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7466980.418082885],[792957.7313200384,7467133.292139435],[793110.6053765863,7467133.292139435],[793110.6053765863,7466980.418082885],[792957.7313200384,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136259/82227","x":136259,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7467439.040252533],[793110.6053765863,7467591.914309083],[793263.4794331342,7467591.914309083],[793263.4794331342,7467439.040252533],[793110.6053765863,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136260/82224","x":136260,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7467439.040252533],[793263.4794331342,7467591.914309083],[793416.3534896858,7467591.914309083],[793416.3534896858,7467439.040252533],[793263.4794331342,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136261/82224","x":136261,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7467286.166195983],[793110.6053765863,7467439.040252533],[793263.4794331342,7467439.040252533],[793263.4794331342,7467286.166195983],[793110.6053765863,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136260/82225","x":136260,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7467286.166195983],[793263.4794331342,7467439.040252533],[793416.3534896858,7467439.040252533],[793416.3534896858,7467286.166195983],[793263.4794331342,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136261/82225","x":136261,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7467439.040252533],[793416.3534896858,7467591.914309083],[793569.2275462337,7467591.914309083],[793569.2275462337,7467439.040252533],[793416.3534896858,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136262/82224","x":136262,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7467439.040252533],[793569.2275462337,7467591.914309083],[793722.1016027816,7467591.914309083],[793722.1016027816,7467439.040252533],[793569.2275462337,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136263/82224","x":136263,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7467286.166195983],[793416.3534896858,7467439.040252533],[793569.2275462337,7467439.040252533],[793569.2275462337,7467286.166195983],[793416.3534896858,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136262/82225","x":136262,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7467286.166195983],[793569.2275462337,7467439.040252533],[793722.1016027816,7467439.040252533],[793722.1016027816,7467286.166195983],[793569.2275462337,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136263/82225","x":136263,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7467133.292139435],[793110.6053765863,7467286.166195983],[793263.4794331342,7467286.166195983],[793263.4794331342,7467133.292139435],[793110.6053765863,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136260/82226","x":136260,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7467133.292139435],[793263.4794331342,7467286.166195983],[793416.3534896858,7467286.166195983],[793416.3534896858,7467133.292139435],[793263.4794331342,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136261/82226","x":136261,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7466980.418082885],[793110.6053765863,7467133.292139435],[793263.4794331342,7467133.292139435],[793263.4794331342,7466980.418082885],[793110.6053765863,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136260/82227","x":136260,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7466980.418082885],[793263.4794331342,7467133.292139435],[793416.3534896858,7467133.292139435],[793416.3534896858,7466980.418082885],[793263.4794331342,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136261/82227","x":136261,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7467133.292139435],[793416.3534896858,7467286.166195983],[793569.2275462337,7467286.166195983],[793569.2275462337,7467133.292139435],[793416.3534896858,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136262/82226","x":136262,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7467133.292139435],[793569.2275462337,7467286.166195983],[793722.1016027816,7467286.166195983],[793722.1016027816,7467133.292139435],[793569.2275462337,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136263/82226","x":136263,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7466980.418082885],[793416.3534896858,7467133.292139435],[793569.2275462337,7467133.292139435],[793569.2275462337,7466980.418082885],[793416.3534896858,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136262/82227","x":136262,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7466980.418082885],[793569.2275462337,7467133.292139435],[793722.1016027816,7467133.292139435],[793722.1016027816,7466980.418082885],[793569.2275462337,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136263/82227","x":136263,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7467439.040252533],[793722.1016027816,7467591.914309083],[793874.9756593332,7467591.914309083],[793874.9756593332,7467439.040252533],[793722.1016027816,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136264/82224","x":136264,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7467439.040252533],[793874.9756593332,7467591.914309083],[794027.849715881,7467591.914309083],[794027.849715881,7467439.040252533],[793874.9756593332,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136265/82224","x":136265,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7467286.166195983],[793722.1016027816,7467439.040252533],[793874.9756593332,7467439.040252533],[793874.9756593332,7467286.166195983],[793722.1016027816,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136264/82225","x":136264,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7467286.166195983],[793874.9756593332,7467439.040252533],[794027.849715881,7467439.040252533],[794027.849715881,7467286.166195983],[793874.9756593332,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136265/82225","x":136265,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7467439.040252533],[794027.849715881,7467591.914309083],[794180.7237724289,7467591.914309083],[794180.7237724289,7467439.040252533],[794027.849715881,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136266/82224","x":136266,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7467439.040252533],[794180.7237724289,7467591.914309083],[794333.5978289805,7467591.914309083],[794333.5978289805,7467439.040252533],[794180.7237724289,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136267/82224","x":136267,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7467286.166195983],[794027.849715881,7467439.040252533],[794180.7237724289,7467439.040252533],[794180.7237724289,7467286.166195983],[794027.849715881,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136266/82225","x":136266,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7467286.166195983],[794180.7237724289,7467439.040252533],[794333.5978289805,7467439.040252533],[794333.5978289805,7467286.166195983],[794180.7237724289,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136267/82225","x":136267,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7467133.292139435],[793722.1016027816,7467286.166195983],[793874.9756593332,7467286.166195983],[793874.9756593332,7467133.292139435],[793722.1016027816,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136264/82226","x":136264,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7467133.292139435],[793874.9756593332,7467286.166195983],[794027.849715881,7467286.166195983],[794027.849715881,7467133.292139435],[793874.9756593332,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136265/82226","x":136265,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7466980.418082885],[793722.1016027816,7467133.292139435],[793874.9756593332,7467133.292139435],[793874.9756593332,7466980.418082885],[793722.1016027816,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136264/82227","x":136264,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7466980.418082885],[793874.9756593332,7467133.292139435],[794027.849715881,7467133.292139435],[794027.849715881,7466980.418082885],[793874.9756593332,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136265/82227","x":136265,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7467133.292139435],[794027.849715881,7467286.166195983],[794180.7237724289,7467286.166195983],[794180.7237724289,7467133.292139435],[794027.849715881,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136266/82226","x":136266,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7467133.292139435],[794180.7237724289,7467286.166195983],[794333.5978289805,7467286.166195983],[794333.5978289805,7467133.292139435],[794180.7237724289,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136267/82226","x":136267,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7466980.418082885],[794027.849715881,7467133.292139435],[794180.7237724289,7467133.292139435],[794180.7237724289,7466980.418082885],[794027.849715881,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136266/82227","x":136266,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7466980.418082885],[794180.7237724289,7467133.292139435],[794333.5978289805,7467133.292139435],[794333.5978289805,7466980.418082885],[794180.7237724289,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136267/82227","x":136267,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7467439.040252533],[794333.5978289805,7467591.914309083],[794486.4718855284,7467591.914309083],[794486.4718855284,7467439.040252533],[794333.5978289805,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136268/82224","x":136268,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7467286.166195983],[794333.5978289805,7467439.040252533],[794486.4718855284,7467439.040252533],[794486.4718855284,7467286.166195983],[794333.5978289805,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136268/82225","x":136268,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7467133.292139435],[794333.5978289805,7467286.166195983],[794486.4718855284,7467286.166195983],[794486.4718855284,7467133.292139435],[794333.5978289805,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136268/82226","x":136268,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7466980.418082885],[794333.5978289805,7467133.292139435],[794486.4718855284,7467133.292139435],[794486.4718855284,7466980.418082885],[794333.5978289805,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136268/82227","x":136268,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7465757.425630493],[793569.2275462337,7465910.299687043],[793722.1016027816,7465910.299687043],[793722.1016027816,7465757.425630493],[793569.2275462337,7465757.425630493]]],"type":"Polygon"},"properties":{"label":"18/136263/82235","x":136263,"y":82235,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7465145.929404296],[792651.983206939,7465298.803460846],[792804.8572634906,7465298.803460846],[792804.8572634906,7465145.929404296],[792651.983206939,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136257/82239","x":136257,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7465298.803460846],[792957.7313200384,7465451.6775173955],[793110.6053765863,7465451.6775173955],[793110.6053765863,7465298.803460846],[792957.7313200384,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136259/82238","x":136259,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7465145.929404296],[792804.8572634906,7465298.803460846],[792957.7313200384,7465298.803460846],[792957.7313200384,7465145.929404296],[792804.8572634906,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136258/82239","x":136258,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7465145.929404296],[792957.7313200384,7465298.803460846],[793110.6053765863,7465298.803460846],[793110.6053765863,7465145.929404296],[792957.7313200384,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136259/82239","x":136259,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7465451.6775173955],[793110.6053765863,7465604.551573943],[793263.4794331342,7465604.551573943],[793263.4794331342,7465451.6775173955],[793110.6053765863,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136260/82237","x":136260,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7465451.6775173955],[793263.4794331342,7465604.551573943],[793416.3534896858,7465604.551573943],[793416.3534896858,7465451.6775173955],[793263.4794331342,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136261/82237","x":136261,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7465604.551573943],[793416.3534896858,7465757.425630493],[793569.2275462337,7465757.425630493],[793569.2275462337,7465604.551573943],[793416.3534896858,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136262/82236","x":136262,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7465604.551573943],[793569.2275462337,7465757.425630493],[793722.1016027816,7465757.425630493],[793722.1016027816,7465604.551573943],[793569.2275462337,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136263/82236","x":136263,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7465451.6775173955],[793416.3534896858,7465604.551573943],[793569.2275462337,7465604.551573943],[793569.2275462337,7465451.6775173955],[793416.3534896858,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136262/82237","x":136262,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7465451.6775173955],[793569.2275462337,7465604.551573943],[793722.1016027816,7465604.551573943],[793722.1016027816,7465451.6775173955],[793569.2275462337,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136263/82237","x":136263,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7465298.803460846],[793110.6053765863,7465451.6775173955],[793263.4794331342,7465451.6775173955],[793263.4794331342,7465298.803460846],[793110.6053765863,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136260/82238","x":136260,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7465298.803460846],[793263.4794331342,7465451.6775173955],[793416.3534896858,7465451.6775173955],[793416.3534896858,7465298.803460846],[793263.4794331342,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136261/82238","x":136261,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7465145.929404296],[793110.6053765863,7465298.803460846],[793263.4794331342,7465298.803460846],[793263.4794331342,7465145.929404296],[793110.6053765863,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136260/82239","x":136260,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7465145.929404296],[793263.4794331342,7465298.803460846],[793416.3534896858,7465298.803460846],[793416.3534896858,7465145.929404296],[793263.4794331342,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136261/82239","x":136261,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7465298.803460846],[793416.3534896858,7465451.6775173955],[793569.2275462337,7465451.6775173955],[793569.2275462337,7465298.803460846],[793416.3534896858,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136262/82238","x":136262,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7465298.803460846],[793569.2275462337,7465451.6775173955],[793722.1016027816,7465451.6775173955],[793722.1016027816,7465298.803460846],[793569.2275462337,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136263/82238","x":136263,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7465145.929404296],[793416.3534896858,7465298.803460846],[793569.2275462337,7465298.803460846],[793569.2275462337,7465145.929404296],[793416.3534896858,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136262/82239","x":136262,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7465145.929404296],[793569.2275462337,7465298.803460846],[793722.1016027816,7465298.803460846],[793722.1016027816,7465145.929404296],[793569.2275462337,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136263/82239","x":136263,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7465757.425630493],[793722.1016027816,7465910.299687043],[793874.9756593332,7465910.299687043],[793874.9756593332,7465757.425630493],[793722.1016027816,7465757.425630493]]],"type":"Polygon"},"properties":{"label":"18/136264/82235","x":136264,"y":82235,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7465757.425630493],[793874.9756593332,7465910.299687043],[794027.849715881,7465910.299687043],[794027.849715881,7465757.425630493],[793874.9756593332,7465757.425630493]]],"type":"Polygon"},"properties":{"label":"18/136265/82235","x":136265,"y":82235,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7465757.425630493],[794027.849715881,7465910.299687043],[794180.7237724289,7465910.299687043],[794180.7237724289,7465757.425630493],[794027.849715881,7465757.425630493]]],"type":"Polygon"},"properties":{"label":"18/136266/82235","x":136266,"y":82235,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7465757.425630493],[794180.7237724289,7465910.299687043],[794333.5978289805,7465910.299687043],[794333.5978289805,7465757.425630493],[794180.7237724289,7465757.425630493]]],"type":"Polygon"},"properties":{"label":"18/136267/82235","x":136267,"y":82235,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7465757.425630493],[794333.5978289805,7465910.299687043],[794486.4718855284,7465910.299687043],[794486.4718855284,7465757.425630493],[794333.5978289805,7465757.425630493]]],"type":"Polygon"},"properties":{"label":"18/136268/82235","x":136268,"y":82235,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7465757.425630493],[794486.4718855284,7465910.299687043],[794639.3459420763,7465910.299687043],[794639.3459420763,7465757.425630493],[794486.4718855284,7465757.425630493]]],"type":"Polygon"},"properties":{"label":"18/136269/82235","x":136269,"y":82235,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7465757.425630493],[794639.3459420763,7465910.299687043],[794792.2199986279,7465910.299687043],[794792.2199986279,7465757.425630493],[794639.3459420763,7465757.425630493]]],"type":"Polygon"},"properties":{"label":"18/136270/82235","x":136270,"y":82235,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7465757.425630493],[794792.2199986279,7465910.299687043],[794945.0940551758,7465910.299687043],[794945.0940551758,7465757.425630493],[794792.2199986279,7465757.425630493]]],"type":"Polygon"},"properties":{"label":"18/136271/82235","x":136271,"y":82235,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7465604.551573943],[793722.1016027816,7465757.425630493],[793874.9756593332,7465757.425630493],[793874.9756593332,7465604.551573943],[793722.1016027816,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136264/82236","x":136264,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7465604.551573943],[793874.9756593332,7465757.425630493],[794027.849715881,7465757.425630493],[794027.849715881,7465604.551573943],[793874.9756593332,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136265/82236","x":136265,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7465451.6775173955],[793722.1016027816,7465604.551573943],[793874.9756593332,7465604.551573943],[793874.9756593332,7465451.6775173955],[793722.1016027816,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136264/82237","x":136264,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7465451.6775173955],[793874.9756593332,7465604.551573943],[794027.849715881,7465604.551573943],[794027.849715881,7465451.6775173955],[793874.9756593332,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136265/82237","x":136265,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7465604.551573943],[794027.849715881,7465757.425630493],[794180.7237724289,7465757.425630493],[794180.7237724289,7465604.551573943],[794027.849715881,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136266/82236","x":136266,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7465604.551573943],[794180.7237724289,7465757.425630493],[794333.5978289805,7465757.425630493],[794333.5978289805,7465604.551573943],[794180.7237724289,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136267/82236","x":136267,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7465451.6775173955],[794027.849715881,7465604.551573943],[794180.7237724289,7465604.551573943],[794180.7237724289,7465451.6775173955],[794027.849715881,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136266/82237","x":136266,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7465451.6775173955],[794180.7237724289,7465604.551573943],[794333.5978289805,7465604.551573943],[794333.5978289805,7465451.6775173955],[794180.7237724289,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136267/82237","x":136267,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7465298.803460846],[793722.1016027816,7465451.6775173955],[793874.9756593332,7465451.6775173955],[793874.9756593332,7465298.803460846],[793722.1016027816,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136264/82238","x":136264,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7465298.803460846],[793874.9756593332,7465451.6775173955],[794027.849715881,7465451.6775173955],[794027.849715881,7465298.803460846],[793874.9756593332,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136265/82238","x":136265,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7465145.929404296],[793722.1016027816,7465298.803460846],[793874.9756593332,7465298.803460846],[793874.9756593332,7465145.929404296],[793722.1016027816,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136264/82239","x":136264,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7465145.929404296],[793874.9756593332,7465298.803460846],[794027.849715881,7465298.803460846],[794027.849715881,7465145.929404296],[793874.9756593332,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136265/82239","x":136265,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7465298.803460846],[794027.849715881,7465451.6775173955],[794180.7237724289,7465451.6775173955],[794180.7237724289,7465298.803460846],[794027.849715881,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136266/82238","x":136266,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7465298.803460846],[794180.7237724289,7465451.6775173955],[794333.5978289805,7465451.6775173955],[794333.5978289805,7465298.803460846],[794180.7237724289,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136267/82238","x":136267,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7465145.929404296],[794027.849715881,7465298.803460846],[794180.7237724289,7465298.803460846],[794180.7237724289,7465145.929404296],[794027.849715881,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136266/82239","x":136266,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7465145.929404296],[794180.7237724289,7465298.803460846],[794333.5978289805,7465298.803460846],[794333.5978289805,7465145.929404296],[794180.7237724289,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136267/82239","x":136267,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7465604.551573943],[794333.5978289805,7465757.425630493],[794486.4718855284,7465757.425630493],[794486.4718855284,7465604.551573943],[794333.5978289805,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136268/82236","x":136268,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7465604.551573943],[794486.4718855284,7465757.425630493],[794639.3459420763,7465757.425630493],[794639.3459420763,7465604.551573943],[794486.4718855284,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136269/82236","x":136269,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7465451.6775173955],[794333.5978289805,7465604.551573943],[794486.4718855284,7465604.551573943],[794486.4718855284,7465451.6775173955],[794333.5978289805,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136268/82237","x":136268,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7465451.6775173955],[794486.4718855284,7465604.551573943],[794639.3459420763,7465604.551573943],[794639.3459420763,7465451.6775173955],[794486.4718855284,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136269/82237","x":136269,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7465604.551573943],[794639.3459420763,7465757.425630493],[794792.2199986279,7465757.425630493],[794792.2199986279,7465604.551573943],[794639.3459420763,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136270/82236","x":136270,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7465604.551573943],[794792.2199986279,7465757.425630493],[794945.0940551758,7465757.425630493],[794945.0940551758,7465604.551573943],[794792.2199986279,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136271/82236","x":136271,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7465451.6775173955],[794639.3459420763,7465604.551573943],[794792.2199986279,7465604.551573943],[794792.2199986279,7465451.6775173955],[794639.3459420763,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136270/82237","x":136270,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7465451.6775173955],[794792.2199986279,7465604.551573943],[794945.0940551758,7465604.551573943],[794945.0940551758,7465451.6775173955],[794792.2199986279,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136271/82237","x":136271,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7465298.803460846],[794333.5978289805,7465451.6775173955],[794486.4718855284,7465451.6775173955],[794486.4718855284,7465298.803460846],[794333.5978289805,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136268/82238","x":136268,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7465298.803460846],[794486.4718855284,7465451.6775173955],[794639.3459420763,7465451.6775173955],[794639.3459420763,7465298.803460846],[794486.4718855284,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136269/82238","x":136269,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7465145.929404296],[794333.5978289805,7465298.803460846],[794486.4718855284,7465298.803460846],[794486.4718855284,7465145.929404296],[794333.5978289805,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136268/82239","x":136268,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7465145.929404296],[794486.4718855284,7465298.803460846],[794639.3459420763,7465298.803460846],[794639.3459420763,7465145.929404296],[794486.4718855284,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136269/82239","x":136269,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7465298.803460846],[794639.3459420763,7465451.6775173955],[794792.2199986279,7465451.6775173955],[794792.2199986279,7465298.803460846],[794639.3459420763,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136270/82238","x":136270,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7465298.803460846],[794792.2199986279,7465451.6775173955],[794945.0940551758,7465451.6775173955],[794945.0940551758,7465298.803460846],[794792.2199986279,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136271/82238","x":136271,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7465145.929404296],[794639.3459420763,7465298.803460846],[794792.2199986279,7465298.803460846],[794792.2199986279,7465145.929404296],[794639.3459420763,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136270/82239","x":136270,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7465145.929404296],[794792.2199986279,7465298.803460846],[794945.0940551758,7465298.803460846],[794945.0940551758,7465145.929404296],[794792.2199986279,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136271/82239","x":136271,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7467439.040252533],[795862.3383944705,7467591.914309083],[796015.2124510184,7467591.914309083],[796015.2124510184,7467439.040252533],[795862.3383944705,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136278/82224","x":136278,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7467439.040252533],[796015.2124510184,7467591.914309083],[796168.08650757,7467591.914309083],[796168.08650757,7467439.040252533],[796015.2124510184,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136279/82224","x":136279,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7467286.166195983],[796015.2124510184,7467439.040252533],[796168.08650757,7467439.040252533],[796168.08650757,7467286.166195983],[796015.2124510184,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136279/82225","x":136279,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7466368.92185669],[795250.8421682753,7466521.795913238],[795403.7162248231,7466521.795913238],[795403.7162248231,7466368.92185669],[795250.8421682753,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136274/82231","x":136274,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7466368.92185669],[795403.7162248231,7466521.795913238],[795556.590281371,7466521.795913238],[795556.590281371,7466368.92185669],[795403.7162248231,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136275/82231","x":136275,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7466674.669969788],[795862.3383944705,7466827.544026336],[796015.2124510184,7466827.544026336],[796015.2124510184,7466674.669969788],[795862.3383944705,7466674.669969788]]],"type":"Polygon"},"properties":{"label":"18/136278/82229","x":136278,"y":82229,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7466674.669969788],[796015.2124510184,7466827.544026336],[796168.08650757,7466827.544026336],[796168.08650757,7466674.669969788],[796015.2124510184,7466674.669969788]]],"type":"Polygon"},"properties":{"label":"18/136279/82229","x":136279,"y":82229,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7466521.795913238],[795556.590281371,7466674.669969788],[795709.4643379226,7466674.669969788],[795709.4643379226,7466521.795913238],[795556.590281371,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136276/82230","x":136276,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7466521.795913238],[795709.4643379226,7466674.669969788],[795862.3383944705,7466674.669969788],[795862.3383944705,7466521.795913238],[795709.4643379226,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136277/82230","x":136277,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7466368.92185669],[795556.590281371,7466521.795913238],[795709.4643379226,7466521.795913238],[795709.4643379226,7466368.92185669],[795556.590281371,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136276/82231","x":136276,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7466368.92185669],[795709.4643379226,7466521.795913238],[795862.3383944705,7466521.795913238],[795862.3383944705,7466368.92185669],[795709.4643379226,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136277/82231","x":136277,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7466521.795913238],[795862.3383944705,7466674.669969788],[796015.2124510184,7466674.669969788],[796015.2124510184,7466521.795913238],[795862.3383944705,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136278/82230","x":136278,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7466521.795913238],[796015.2124510184,7466674.669969788],[796168.08650757,7466674.669969788],[796168.08650757,7466521.795913238],[796015.2124510184,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136279/82230","x":136279,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7466368.92185669],[795862.3383944705,7466521.795913238],[796015.2124510184,7466521.795913238],[796015.2124510184,7466368.92185669],[795862.3383944705,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136278/82231","x":136278,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7466368.92185669],[796015.2124510184,7466521.795913238],[796168.08650757,7466521.795913238],[796168.08650757,7466368.92185669],[796015.2124510184,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136279/82231","x":136279,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7467439.040252533],[796168.08650757,7467591.914309083],[796320.9605641179,7467591.914309083],[796320.9605641179,7467439.040252533],[796168.08650757,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136280/82224","x":136280,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7467439.040252533],[796320.9605641179,7467591.914309083],[796473.8346206658,7467591.914309083],[796473.8346206658,7467439.040252533],[796320.9605641179,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136281/82224","x":136281,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7467286.166195983],[796168.08650757,7467439.040252533],[796320.9605641179,7467439.040252533],[796320.9605641179,7467286.166195983],[796168.08650757,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136280/82225","x":136280,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7467286.166195983],[796320.9605641179,7467439.040252533],[796473.8346206658,7467439.040252533],[796473.8346206658,7467286.166195983],[796320.9605641179,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136281/82225","x":136281,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7467439.040252533],[796473.8346206658,7467591.914309083],[796626.7086772174,7467591.914309083],[796626.7086772174,7467439.040252533],[796473.8346206658,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136282/82224","x":136282,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7467439.040252533],[796626.7086772174,7467591.914309083],[796779.5827337652,7467591.914309083],[796779.5827337652,7467439.040252533],[796626.7086772174,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136283/82224","x":136283,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7467286.166195983],[796473.8346206658,7467439.040252533],[796626.7086772174,7467439.040252533],[796626.7086772174,7467286.166195983],[796473.8346206658,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136282/82225","x":136282,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7467286.166195983],[796626.7086772174,7467439.040252533],[796779.5827337652,7467439.040252533],[796779.5827337652,7467286.166195983],[796626.7086772174,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136283/82225","x":136283,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7467133.292139435],[796168.08650757,7467286.166195983],[796320.9605641179,7467286.166195983],[796320.9605641179,7467133.292139435],[796168.08650757,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136280/82226","x":136280,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7467133.292139435],[796320.9605641179,7467286.166195983],[796473.8346206658,7467286.166195983],[796473.8346206658,7467133.292139435],[796320.9605641179,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136281/82226","x":136281,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7466980.418082885],[796320.9605641179,7467133.292139435],[796473.8346206658,7467133.292139435],[796473.8346206658,7466980.418082885],[796320.9605641179,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136281/82227","x":136281,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7467133.292139435],[796473.8346206658,7467286.166195983],[796626.7086772174,7467286.166195983],[796626.7086772174,7467133.292139435],[796473.8346206658,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136282/82226","x":136282,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7467133.292139435],[796626.7086772174,7467286.166195983],[796779.5827337652,7467286.166195983],[796779.5827337652,7467133.292139435],[796626.7086772174,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136283/82226","x":136283,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7466980.418082885],[796473.8346206658,7467133.292139435],[796626.7086772174,7467133.292139435],[796626.7086772174,7466980.418082885],[796473.8346206658,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136282/82227","x":136282,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7466980.418082885],[796626.7086772174,7467133.292139435],[796779.5827337652,7467133.292139435],[796779.5827337652,7466980.418082885],[796626.7086772174,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136283/82227","x":136283,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7467439.040252533],[796779.5827337652,7467591.914309083],[796932.4567903131,7467591.914309083],[796932.4567903131,7467439.040252533],[796779.5827337652,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136284/82224","x":136284,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7467439.040252533],[796932.4567903131,7467591.914309083],[797085.330846861,7467591.914309083],[797085.330846861,7467439.040252533],[796932.4567903131,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136285/82224","x":136285,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7467286.166195983],[796779.5827337652,7467439.040252533],[796932.4567903131,7467439.040252533],[796932.4567903131,7467286.166195983],[796779.5827337652,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136284/82225","x":136284,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7467286.166195983],[796932.4567903131,7467439.040252533],[797085.330846861,7467439.040252533],[797085.330846861,7467286.166195983],[796932.4567903131,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136285/82225","x":136285,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7467286.166195983],[797085.330846861,7467439.040252533],[797238.2049034126,7467439.040252533],[797238.2049034126,7467286.166195983],[797085.330846861,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136286/82225","x":136286,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7467133.292139435],[796779.5827337652,7467286.166195983],[796932.4567903131,7467286.166195983],[796932.4567903131,7467133.292139435],[796779.5827337652,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136284/82226","x":136284,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7467133.292139435],[796932.4567903131,7467286.166195983],[797085.330846861,7467286.166195983],[797085.330846861,7467133.292139435],[796932.4567903131,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136285/82226","x":136285,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7466980.418082885],[796779.5827337652,7467133.292139435],[796932.4567903131,7467133.292139435],[796932.4567903131,7466980.418082885],[796779.5827337652,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136284/82227","x":136284,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7466980.418082885],[796932.4567903131,7467133.292139435],[797085.330846861,7467133.292139435],[797085.330846861,7466980.418082885],[796932.4567903131,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136285/82227","x":136285,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7467133.292139435],[797085.330846861,7467286.166195983],[797238.2049034126,7467286.166195983],[797238.2049034126,7467133.292139435],[797085.330846861,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136286/82226","x":136286,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7466980.418082885],[797085.330846861,7467133.292139435],[797238.2049034126,7467133.292139435],[797238.2049034126,7466980.418082885],[797085.330846861,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136286/82227","x":136286,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7466980.418082885],[797238.2049034126,7467133.292139435],[797391.0789599605,7467133.292139435],[797391.0789599605,7466980.418082885],[797238.2049034126,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136287/82227","x":136287,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7466827.544026336],[796168.08650757,7466980.418082885],[796320.9605641179,7466980.418082885],[796320.9605641179,7466827.544026336],[796168.08650757,7466827.544026336]]],"type":"Polygon"},"properties":{"label":"18/136280/82228","x":136280,"y":82228,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7466827.544026336],[796320.9605641179,7466980.418082885],[796473.8346206658,7466980.418082885],[796473.8346206658,7466827.544026336],[796320.9605641179,7466827.544026336]]],"type":"Polygon"},"properties":{"label":"18/136281/82228","x":136281,"y":82228,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7466674.669969788],[796168.08650757,7466827.544026336],[796320.9605641179,7466827.544026336],[796320.9605641179,7466674.669969788],[796168.08650757,7466674.669969788]]],"type":"Polygon"},"properties":{"label":"18/136280/82229","x":136280,"y":82229,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7466674.669969788],[796320.9605641179,7466827.544026336],[796473.8346206658,7466827.544026336],[796473.8346206658,7466674.669969788],[796320.9605641179,7466674.669969788]]],"type":"Polygon"},"properties":{"label":"18/136281/82229","x":136281,"y":82229,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7466827.544026336],[796473.8346206658,7466980.418082885],[796626.7086772174,7466980.418082885],[796626.7086772174,7466827.544026336],[796473.8346206658,7466827.544026336]]],"type":"Polygon"},"properties":{"label":"18/136282/82228","x":136282,"y":82228,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7466827.544026336],[796626.7086772174,7466980.418082885],[796779.5827337652,7466980.418082885],[796779.5827337652,7466827.544026336],[796626.7086772174,7466827.544026336]]],"type":"Polygon"},"properties":{"label":"18/136283/82228","x":136283,"y":82228,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7466674.669969788],[796473.8346206658,7466827.544026336],[796626.7086772174,7466827.544026336],[796626.7086772174,7466674.669969788],[796473.8346206658,7466674.669969788]]],"type":"Polygon"},"properties":{"label":"18/136282/82229","x":136282,"y":82229,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7466674.669969788],[796626.7086772174,7466827.544026336],[796779.5827337652,7466827.544026336],[796779.5827337652,7466674.669969788],[796626.7086772174,7466674.669969788]]],"type":"Polygon"},"properties":{"label":"18/136283/82229","x":136283,"y":82229,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7466521.795913238],[796168.08650757,7466674.669969788],[796320.9605641179,7466674.669969788],[796320.9605641179,7466521.795913238],[796168.08650757,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136280/82230","x":136280,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7466521.795913238],[796320.9605641179,7466674.669969788],[796473.8346206658,7466674.669969788],[796473.8346206658,7466521.795913238],[796320.9605641179,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136281/82230","x":136281,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7466368.92185669],[796168.08650757,7466521.795913238],[796320.9605641179,7466521.795913238],[796320.9605641179,7466368.92185669],[796168.08650757,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136280/82231","x":136280,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7466368.92185669],[796320.9605641179,7466521.795913238],[796473.8346206658,7466521.795913238],[796473.8346206658,7466368.92185669],[796320.9605641179,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136281/82231","x":136281,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7466521.795913238],[796473.8346206658,7466674.669969788],[796626.7086772174,7466674.669969788],[796626.7086772174,7466521.795913238],[796473.8346206658,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136282/82230","x":136282,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7466521.795913238],[796626.7086772174,7466674.669969788],[796779.5827337652,7466674.669969788],[796779.5827337652,7466521.795913238],[796626.7086772174,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136283/82230","x":136283,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7466368.92185669],[796473.8346206658,7466521.795913238],[796626.7086772174,7466521.795913238],[796626.7086772174,7466368.92185669],[796473.8346206658,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136282/82231","x":136282,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7466368.92185669],[796626.7086772174,7466521.795913238],[796779.5827337652,7466521.795913238],[796779.5827337652,7466368.92185669],[796626.7086772174,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136283/82231","x":136283,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7466827.544026336],[796779.5827337652,7466980.418082885],[796932.4567903131,7466980.418082885],[796932.4567903131,7466827.544026336],[796779.5827337652,7466827.544026336]]],"type":"Polygon"},"properties":{"label":"18/136284/82228","x":136284,"y":82228,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7466827.544026336],[796932.4567903131,7466980.418082885],[797085.330846861,7466980.418082885],[797085.330846861,7466827.544026336],[796932.4567903131,7466827.544026336]]],"type":"Polygon"},"properties":{"label":"18/136285/82228","x":136285,"y":82228,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7466674.669969788],[796779.5827337652,7466827.544026336],[796932.4567903131,7466827.544026336],[796932.4567903131,7466674.669969788],[796779.5827337652,7466674.669969788]]],"type":"Polygon"},"properties":{"label":"18/136284/82229","x":136284,"y":82229,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7466674.669969788],[796932.4567903131,7466827.544026336],[797085.330846861,7466827.544026336],[797085.330846861,7466674.669969788],[796932.4567903131,7466674.669969788]]],"type":"Polygon"},"properties":{"label":"18/136285/82229","x":136285,"y":82229,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7466827.544026336],[797085.330846861,7466980.418082885],[797238.2049034126,7466980.418082885],[797238.2049034126,7466827.544026336],[797085.330846861,7466827.544026336]]],"type":"Polygon"},"properties":{"label":"18/136286/82228","x":136286,"y":82228,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7466827.544026336],[797238.2049034126,7466980.418082885],[797391.0789599605,7466980.418082885],[797391.0789599605,7466827.544026336],[797238.2049034126,7466827.544026336]]],"type":"Polygon"},"properties":{"label":"18/136287/82228","x":136287,"y":82228,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7466674.669969788],[797085.330846861,7466827.544026336],[797238.2049034126,7466827.544026336],[797238.2049034126,7466674.669969788],[797085.330846861,7466674.669969788]]],"type":"Polygon"},"properties":{"label":"18/136286/82229","x":136286,"y":82229,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7466674.669969788],[797238.2049034126,7466827.544026336],[797391.0789599605,7466827.544026336],[797391.0789599605,7466674.669969788],[797238.2049034126,7466674.669969788]]],"type":"Polygon"},"properties":{"label":"18/136287/82229","x":136287,"y":82229,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7466521.795913238],[796779.5827337652,7466674.669969788],[796932.4567903131,7466674.669969788],[796932.4567903131,7466521.795913238],[796779.5827337652,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136284/82230","x":136284,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7466521.795913238],[796932.4567903131,7466674.669969788],[797085.330846861,7466674.669969788],[797085.330846861,7466521.795913238],[796932.4567903131,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136285/82230","x":136285,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7466368.92185669],[796779.5827337652,7466521.795913238],[796932.4567903131,7466521.795913238],[796932.4567903131,7466368.92185669],[796779.5827337652,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136284/82231","x":136284,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7466368.92185669],[796932.4567903131,7466521.795913238],[797085.330846861,7466521.795913238],[797085.330846861,7466368.92185669],[796932.4567903131,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136285/82231","x":136285,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7466521.795913238],[797085.330846861,7466674.669969788],[797238.2049034126,7466674.669969788],[797238.2049034126,7466521.795913238],[797085.330846861,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136286/82230","x":136286,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7466521.795913238],[797238.2049034126,7466674.669969788],[797391.0789599605,7466674.669969788],[797391.0789599605,7466521.795913238],[797238.2049034126,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136287/82230","x":136287,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7466368.92185669],[797085.330846861,7466521.795913238],[797238.2049034126,7466521.795913238],[797238.2049034126,7466368.92185669],[797085.330846861,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136286/82231","x":136286,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7466368.92185669],[797238.2049034126,7466521.795913238],[797391.0789599605,7466521.795913238],[797391.0789599605,7466368.92185669],[797238.2049034126,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136287/82231","x":136287,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7466216.04780014],[795097.9681117237,7466368.92185669],[795250.8421682753,7466368.92185669],[795250.8421682753,7466216.04780014],[795097.9681117237,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136273/82232","x":136273,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7466216.04780014],[795250.8421682753,7466368.92185669],[795403.7162248231,7466368.92185669],[795403.7162248231,7466216.04780014],[795250.8421682753,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136274/82232","x":136274,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7466216.04780014],[795403.7162248231,7466368.92185669],[795556.590281371,7466368.92185669],[795556.590281371,7466216.04780014],[795403.7162248231,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136275/82232","x":136275,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7466216.04780014],[795556.590281371,7466368.92185669],[795709.4643379226,7466368.92185669],[795709.4643379226,7466216.04780014],[795556.590281371,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136276/82232","x":136276,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7466216.04780014],[795709.4643379226,7466368.92185669],[795862.3383944705,7466368.92185669],[795862.3383944705,7466216.04780014],[795709.4643379226,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136277/82232","x":136277,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7466216.04780014],[795862.3383944705,7466368.92185669],[796015.2124510184,7466368.92185669],[796015.2124510184,7466216.04780014],[795862.3383944705,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136278/82232","x":136278,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7466216.04780014],[796015.2124510184,7466368.92185669],[796168.08650757,7466368.92185669],[796168.08650757,7466216.04780014],[796015.2124510184,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136279/82232","x":136279,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7465604.551573943],[794945.0940551758,7465757.425630493],[795097.9681117237,7465757.425630493],[795097.9681117237,7465604.551573943],[794945.0940551758,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136272/82236","x":136272,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7465604.551573943],[795097.9681117237,7465757.425630493],[795250.8421682753,7465757.425630493],[795250.8421682753,7465604.551573943],[795097.9681117237,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136273/82236","x":136273,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7465451.6775173955],[794945.0940551758,7465604.551573943],[795097.9681117237,7465604.551573943],[795097.9681117237,7465451.6775173955],[794945.0940551758,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136272/82237","x":136272,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7465451.6775173955],[795097.9681117237,7465604.551573943],[795250.8421682753,7465604.551573943],[795250.8421682753,7465451.6775173955],[795097.9681117237,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136273/82237","x":136273,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7465604.551573943],[795250.8421682753,7465757.425630493],[795403.7162248231,7465757.425630493],[795403.7162248231,7465604.551573943],[795250.8421682753,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136274/82236","x":136274,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7465604.551573943],[795403.7162248231,7465757.425630493],[795556.590281371,7465757.425630493],[795556.590281371,7465604.551573943],[795403.7162248231,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136275/82236","x":136275,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7465451.6775173955],[795250.8421682753,7465604.551573943],[795403.7162248231,7465604.551573943],[795403.7162248231,7465451.6775173955],[795250.8421682753,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136274/82237","x":136274,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7465451.6775173955],[795403.7162248231,7465604.551573943],[795556.590281371,7465604.551573943],[795556.590281371,7465451.6775173955],[795403.7162248231,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136275/82237","x":136275,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7465298.803460846],[794945.0940551758,7465451.6775173955],[795097.9681117237,7465451.6775173955],[795097.9681117237,7465298.803460846],[794945.0940551758,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136272/82238","x":136272,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7465298.803460846],[795097.9681117237,7465451.6775173955],[795250.8421682753,7465451.6775173955],[795250.8421682753,7465298.803460846],[795097.9681117237,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136273/82238","x":136273,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7465145.929404296],[794945.0940551758,7465298.803460846],[795097.9681117237,7465298.803460846],[795097.9681117237,7465145.929404296],[794945.0940551758,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136272/82239","x":136272,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7465145.929404296],[795097.9681117237,7465298.803460846],[795250.8421682753,7465298.803460846],[795250.8421682753,7465145.929404296],[795097.9681117237,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136273/82239","x":136273,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7465298.803460846],[795250.8421682753,7465451.6775173955],[795403.7162248231,7465451.6775173955],[795403.7162248231,7465298.803460846],[795250.8421682753,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136274/82238","x":136274,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7465298.803460846],[795403.7162248231,7465451.6775173955],[795556.590281371,7465451.6775173955],[795556.590281371,7465298.803460846],[795403.7162248231,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136275/82238","x":136275,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7465145.929404296],[795250.8421682753,7465298.803460846],[795403.7162248231,7465298.803460846],[795403.7162248231,7465145.929404296],[795250.8421682753,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136274/82239","x":136274,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7465145.929404296],[795403.7162248231,7465298.803460846],[795556.590281371,7465298.803460846],[795556.590281371,7465145.929404296],[795403.7162248231,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136275/82239","x":136275,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7465604.551573943],[795556.590281371,7465757.425630493],[795709.4643379226,7465757.425630493],[795709.4643379226,7465604.551573943],[795556.590281371,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136276/82236","x":136276,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7465604.551573943],[795709.4643379226,7465757.425630493],[795862.3383944705,7465757.425630493],[795862.3383944705,7465604.551573943],[795709.4643379226,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136277/82236","x":136277,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7465451.6775173955],[795556.590281371,7465604.551573943],[795709.4643379226,7465604.551573943],[795709.4643379226,7465451.6775173955],[795556.590281371,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136276/82237","x":136276,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7465451.6775173955],[795709.4643379226,7465604.551573943],[795862.3383944705,7465604.551573943],[795862.3383944705,7465451.6775173955],[795709.4643379226,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136277/82237","x":136277,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7465604.551573943],[795862.3383944705,7465757.425630493],[796015.2124510184,7465757.425630493],[796015.2124510184,7465604.551573943],[795862.3383944705,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136278/82236","x":136278,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7465604.551573943],[796015.2124510184,7465757.425630493],[796168.08650757,7465757.425630493],[796168.08650757,7465604.551573943],[796015.2124510184,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136279/82236","x":136279,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7465451.6775173955],[795862.3383944705,7465604.551573943],[796015.2124510184,7465604.551573943],[796015.2124510184,7465451.6775173955],[795862.3383944705,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136278/82237","x":136278,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7465451.6775173955],[796015.2124510184,7465604.551573943],[796168.08650757,7465604.551573943],[796168.08650757,7465451.6775173955],[796015.2124510184,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136279/82237","x":136279,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7465298.803460846],[795556.590281371,7465451.6775173955],[795709.4643379226,7465451.6775173955],[795709.4643379226,7465298.803460846],[795556.590281371,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136276/82238","x":136276,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7465298.803460846],[795709.4643379226,7465451.6775173955],[795862.3383944705,7465451.6775173955],[795862.3383944705,7465298.803460846],[795709.4643379226,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136277/82238","x":136277,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7465145.929404296],[795556.590281371,7465298.803460846],[795709.4643379226,7465298.803460846],[795709.4643379226,7465145.929404296],[795556.590281371,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136276/82239","x":136276,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7465145.929404296],[795709.4643379226,7465298.803460846],[795862.3383944705,7465298.803460846],[795862.3383944705,7465145.929404296],[795709.4643379226,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136277/82239","x":136277,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7465298.803460846],[795862.3383944705,7465451.6775173955],[796015.2124510184,7465451.6775173955],[796015.2124510184,7465298.803460846],[795862.3383944705,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136278/82238","x":136278,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7465298.803460846],[796015.2124510184,7465451.6775173955],[796168.08650757,7465451.6775173955],[796168.08650757,7465298.803460846],[796015.2124510184,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136279/82238","x":136279,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7465145.929404296],[795862.3383944705,7465298.803460846],[796015.2124510184,7465298.803460846],[796015.2124510184,7465145.929404296],[795862.3383944705,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136278/82239","x":136278,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7465145.929404296],[796015.2124510184,7465298.803460846],[796168.08650757,7465298.803460846],[796168.08650757,7465145.929404296],[796015.2124510184,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136279/82239","x":136279,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7466216.04780014],[796168.08650757,7466368.92185669],[796320.9605641179,7466368.92185669],[796320.9605641179,7466216.04780014],[796168.08650757,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136280/82232","x":136280,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7466216.04780014],[796320.9605641179,7466368.92185669],[796473.8346206658,7466368.92185669],[796473.8346206658,7466216.04780014],[796320.9605641179,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136281/82232","x":136281,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7466216.04780014],[796473.8346206658,7466368.92185669],[796626.7086772174,7466368.92185669],[796626.7086772174,7466216.04780014],[796473.8346206658,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136282/82232","x":136282,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7466216.04780014],[796626.7086772174,7466368.92185669],[796779.5827337652,7466368.92185669],[796779.5827337652,7466216.04780014],[796626.7086772174,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136283/82232","x":136283,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7466063.173743591],[796626.7086772174,7466216.04780014],[796779.5827337652,7466216.04780014],[796779.5827337652,7466063.173743591],[796626.7086772174,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136283/82233","x":136283,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7466216.04780014],[796779.5827337652,7466368.92185669],[796932.4567903131,7466368.92185669],[796932.4567903131,7466216.04780014],[796779.5827337652,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136284/82232","x":136284,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7466216.04780014],[796932.4567903131,7466368.92185669],[797085.330846861,7466368.92185669],[797085.330846861,7466216.04780014],[796932.4567903131,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136285/82232","x":136285,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7466063.173743591],[796779.5827337652,7466216.04780014],[796932.4567903131,7466216.04780014],[796932.4567903131,7466063.173743591],[796779.5827337652,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136284/82233","x":136284,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7466063.173743591],[796932.4567903131,7466216.04780014],[797085.330846861,7466216.04780014],[797085.330846861,7466063.173743591],[796932.4567903131,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136285/82233","x":136285,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7466216.04780014],[797085.330846861,7466368.92185669],[797238.2049034126,7466368.92185669],[797238.2049034126,7466216.04780014],[797085.330846861,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136286/82232","x":136286,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7466216.04780014],[797238.2049034126,7466368.92185669],[797391.0789599605,7466368.92185669],[797391.0789599605,7466216.04780014],[797238.2049034126,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136287/82232","x":136287,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7466063.173743591],[797085.330846861,7466216.04780014],[797238.2049034126,7466216.04780014],[797238.2049034126,7466063.173743591],[797085.330846861,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136286/82233","x":136286,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7466063.173743591],[797238.2049034126,7466216.04780014],[797391.0789599605,7466216.04780014],[797391.0789599605,7466063.173743591],[797238.2049034126,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136287/82233","x":136287,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7465604.551573943],[796168.08650757,7465757.425630493],[796320.9605641179,7465757.425630493],[796320.9605641179,7465604.551573943],[796168.08650757,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136280/82236","x":136280,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7465604.551573943],[796320.9605641179,7465757.425630493],[796473.8346206658,7465757.425630493],[796473.8346206658,7465604.551573943],[796320.9605641179,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136281/82236","x":136281,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7465451.6775173955],[796168.08650757,7465604.551573943],[796320.9605641179,7465604.551573943],[796320.9605641179,7465451.6775173955],[796168.08650757,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136280/82237","x":136280,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7465451.6775173955],[796320.9605641179,7465604.551573943],[796473.8346206658,7465604.551573943],[796473.8346206658,7465451.6775173955],[796320.9605641179,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136281/82237","x":136281,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7465604.551573943],[796473.8346206658,7465757.425630493],[796626.7086772174,7465757.425630493],[796626.7086772174,7465604.551573943],[796473.8346206658,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136282/82236","x":136282,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7465451.6775173955],[796473.8346206658,7465604.551573943],[796626.7086772174,7465604.551573943],[796626.7086772174,7465451.6775173955],[796473.8346206658,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136282/82237","x":136282,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7465451.6775173955],[796626.7086772174,7465604.551573943],[796779.5827337652,7465604.551573943],[796779.5827337652,7465451.6775173955],[796626.7086772174,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136283/82237","x":136283,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7465298.803460846],[796168.08650757,7465451.6775173955],[796320.9605641179,7465451.6775173955],[796320.9605641179,7465298.803460846],[796168.08650757,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136280/82238","x":136280,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7465298.803460846],[796320.9605641179,7465451.6775173955],[796473.8346206658,7465451.6775173955],[796473.8346206658,7465298.803460846],[796320.9605641179,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136281/82238","x":136281,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7465145.929404296],[796168.08650757,7465298.803460846],[796320.9605641179,7465298.803460846],[796320.9605641179,7465145.929404296],[796168.08650757,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136280/82239","x":136280,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7465145.929404296],[796320.9605641179,7465298.803460846],[796473.8346206658,7465298.803460846],[796473.8346206658,7465145.929404296],[796320.9605641179,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136281/82239","x":136281,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7465298.803460846],[796473.8346206658,7465451.6775173955],[796626.7086772174,7465451.6775173955],[796626.7086772174,7465298.803460846],[796473.8346206658,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136282/82238","x":136282,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7465298.803460846],[796626.7086772174,7465451.6775173955],[796779.5827337652,7465451.6775173955],[796779.5827337652,7465298.803460846],[796626.7086772174,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136283/82238","x":136283,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7465145.929404296],[796473.8346206658,7465298.803460846],[796626.7086772174,7465298.803460846],[796626.7086772174,7465145.929404296],[796473.8346206658,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136282/82239","x":136282,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7465145.929404296],[796626.7086772174,7465298.803460846],[796779.5827337652,7465298.803460846],[796779.5827337652,7465145.929404296],[796626.7086772174,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136283/82239","x":136283,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7465451.6775173955],[796779.5827337652,7465604.551573943],[796932.4567903131,7465604.551573943],[796932.4567903131,7465451.6775173955],[796779.5827337652,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136284/82237","x":136284,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7465298.803460846],[796779.5827337652,7465451.6775173955],[796932.4567903131,7465451.6775173955],[796932.4567903131,7465298.803460846],[796779.5827337652,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136284/82238","x":136284,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7469885.0251573175],[797391.0789599605,7470037.899213867],[797543.9530165084,7470037.899213867],[797543.9530165084,7469885.0251573175],[797391.0789599605,7469885.0251573175]]],"type":"Polygon"},"properties":{"label":"18/136288/82208","x":136288,"y":82208,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7469885.0251573175],[797543.9530165084,7470037.899213867],[797696.82707306,7470037.899213867],[797696.82707306,7469885.0251573175],[797543.9530165084,7469885.0251573175]]],"type":"Polygon"},"properties":{"label":"18/136289/82208","x":136289,"y":82208,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7469732.15110077],[797391.0789599605,7469885.0251573175],[797543.9530165084,7469885.0251573175],[797543.9530165084,7469732.15110077],[797391.0789599605,7469732.15110077]]],"type":"Polygon"},"properties":{"label":"18/136288/82209","x":136288,"y":82209,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7469885.0251573175],[797696.82707306,7470037.899213867],[797849.7011296079,7470037.899213867],[797849.7011296079,7469885.0251573175],[797696.82707306,7469885.0251573175]]],"type":"Polygon"},"properties":{"label":"18/136290/82208","x":136290,"y":82208,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7468356.284591828],[797391.0789599605,7468509.158648377],[797543.9530165084,7468509.158648377],[797543.9530165084,7468356.284591828],[797391.0789599605,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136288/82218","x":136288,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7468203.410535278],[797391.0789599605,7468356.284591828],[797543.9530165084,7468356.284591828],[797543.9530165084,7468203.410535278],[797391.0789599605,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136288/82219","x":136288,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7468203.410535278],[797543.9530165084,7468356.284591828],[797696.82707306,7468356.284591828],[797696.82707306,7468203.410535278],[797543.9530165084,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136289/82219","x":136289,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7468050.53647873],[797391.0789599605,7468203.410535278],[797543.9530165084,7468203.410535278],[797543.9530165084,7468050.53647873],[797391.0789599605,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136288/82220","x":136288,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7468050.53647873],[797543.9530165084,7468203.410535278],[797696.82707306,7468203.410535278],[797696.82707306,7468050.53647873],[797543.9530165084,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136289/82220","x":136289,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7467897.66242218],[797391.0789599605,7468050.53647873],[797543.9530165084,7468050.53647873],[797543.9530165084,7467897.66242218],[797391.0789599605,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136288/82221","x":136288,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7467897.66242218],[797543.9530165084,7468050.53647873],[797696.82707306,7468050.53647873],[797696.82707306,7467897.66242218],[797543.9530165084,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136289/82221","x":136289,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7468050.53647873],[797696.82707306,7468203.410535278],[797849.7011296079,7468203.410535278],[797849.7011296079,7468050.53647873],[797696.82707306,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136290/82220","x":136290,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7466827.544026336],[797391.0789599605,7466980.418082885],[797543.9530165084,7466980.418082885],[797543.9530165084,7466827.544026336],[797391.0789599605,7466827.544026336]]],"type":"Polygon"},"properties":{"label":"18/136288/82228","x":136288,"y":82228,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7466674.669969788],[797391.0789599605,7466827.544026336],[797543.9530165084,7466827.544026336],[797543.9530165084,7466674.669969788],[797391.0789599605,7466674.669969788]]],"type":"Polygon"},"properties":{"label":"18/136288/82229","x":136288,"y":82229,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7466521.795913238],[797391.0789599605,7466674.669969788],[797543.9530165084,7466674.669969788],[797543.9530165084,7466521.795913238],[797391.0789599605,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136288/82230","x":136288,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7466521.795913238],[797543.9530165084,7466674.669969788],[797696.82707306,7466674.669969788],[797696.82707306,7466521.795913238],[797543.9530165084,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136289/82230","x":136289,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7466368.92185669],[797391.0789599605,7466521.795913238],[797543.9530165084,7466521.795913238],[797543.9530165084,7466368.92185669],[797391.0789599605,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136288/82231","x":136288,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7466368.92185669],[797543.9530165084,7466521.795913238],[797696.82707306,7466521.795913238],[797696.82707306,7466368.92185669],[797543.9530165084,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136289/82231","x":136289,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7466368.92185669],[797696.82707306,7466521.795913238],[797849.7011296079,7466521.795913238],[797849.7011296079,7466368.92185669],[797696.82707306,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136290/82231","x":136290,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7466216.04780014],[797391.0789599605,7466368.92185669],[797543.9530165084,7466368.92185669],[797543.9530165084,7466216.04780014],[797391.0789599605,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136288/82232","x":136288,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7466216.04780014],[797543.9530165084,7466368.92185669],[797696.82707306,7466368.92185669],[797696.82707306,7466216.04780014],[797543.9530165084,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136289/82232","x":136289,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7466063.173743591],[797391.0789599605,7466216.04780014],[797543.9530165084,7466216.04780014],[797543.9530165084,7466063.173743591],[797391.0789599605,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136288/82233","x":136288,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7466063.173743591],[797543.9530165084,7466216.04780014],[797696.82707306,7466216.04780014],[797696.82707306,7466063.173743591],[797543.9530165084,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136289/82233","x":136289,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7466216.04780014],[797696.82707306,7466368.92185669],[797849.7011296079,7466368.92185669],[797849.7011296079,7466216.04780014],[797696.82707306,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136290/82232","x":136290,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7466063.173743591],[797696.82707306,7466216.04780014],[797849.7011296079,7466216.04780014],[797849.7011296079,7466063.173743591],[797696.82707306,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136290/82233","x":136290,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7458572.344972687],[792346.2350938432,7458725.219029237],[792499.1091503911,7458725.219029237],[792499.1091503911,7458572.344972687],[792346.2350938432,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136255/82282","x":136255,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7458419.470916137],[792346.2350938432,7458572.344972687],[792499.1091503911,7458572.344972687],[792499.1091503911,7458419.470916137],[792346.2350938432,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136255/82283","x":136255,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7458266.596859589],[792346.2350938432,7458419.470916137],[792499.1091503911,7458419.470916137],[792499.1091503911,7458266.596859589],[792346.2350938432,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136255/82284","x":136255,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7458113.7228030395],[792346.2350938432,7458266.596859589],[792499.1091503911,7458266.596859589],[792499.1091503911,7458113.7228030395],[792346.2350938432,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136255/82285","x":136255,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7457960.84874649],[792346.2350938432,7458113.7228030395],[792499.1091503911,7458113.7228030395],[792499.1091503911,7457960.84874649],[792346.2350938432,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136255/82286","x":136255,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7457807.974689942],[792346.2350938432,7457960.84874649],[792499.1091503911,7457960.84874649],[792499.1091503911,7457807.974689942],[792346.2350938432,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136255/82287","x":136255,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7457655.100633392],[792346.2350938432,7457807.974689942],[792499.1091503911,7457807.974689942],[792499.1091503911,7457655.100633392],[792346.2350938432,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136255/82288","x":136255,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7457502.226576842],[792346.2350938432,7457655.100633392],[792499.1091503911,7457655.100633392],[792499.1091503911,7457502.226576842],[792346.2350938432,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136255/82289","x":136255,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7457349.3525202945],[792346.2350938432,7457502.226576842],[792499.1091503911,7457502.226576842],[792499.1091503911,7457349.3525202945],[792346.2350938432,7457349.3525202945]]],"type":"Polygon"},"properties":{"label":"18/136255/82290","x":136255,"y":82290,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7457196.478463745],[792346.2350938432,7457349.3525202945],[792499.1091503911,7457349.3525202945],[792499.1091503911,7457196.478463745],[792346.2350938432,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136255/82291","x":136255,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7457043.604407197],[792346.2350938432,7457196.478463745],[792499.1091503911,7457196.478463745],[792499.1091503911,7457043.604407197],[792346.2350938432,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136255/82292","x":136255,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7456890.730350647],[792346.2350938432,7457043.604407197],[792499.1091503911,7457043.604407197],[792499.1091503911,7456890.730350647],[792346.2350938432,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136255/82293","x":136255,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7464993.055347748],[792499.1091503911,7465145.929404296],[792651.983206939,7465145.929404296],[792651.983206939,7464993.055347748],[792499.1091503911,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136256/82240","x":136256,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7464993.055347748],[792651.983206939,7465145.929404296],[792804.8572634906,7465145.929404296],[792804.8572634906,7464993.055347748],[792651.983206939,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136257/82240","x":136257,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7464840.181291198],[792499.1091503911,7464993.055347748],[792651.983206939,7464993.055347748],[792651.983206939,7464840.181291198],[792499.1091503911,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136256/82241","x":136256,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7464840.181291198],[792651.983206939,7464993.055347748],[792804.8572634906,7464993.055347748],[792804.8572634906,7464840.181291198],[792651.983206939,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136257/82241","x":136257,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7464993.055347748],[792804.8572634906,7465145.929404296],[792957.7313200384,7465145.929404296],[792957.7313200384,7464993.055347748],[792804.8572634906,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136258/82240","x":136258,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7464993.055347748],[792957.7313200384,7465145.929404296],[793110.6053765863,7465145.929404296],[793110.6053765863,7464993.055347748],[792957.7313200384,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136259/82240","x":136259,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7464840.181291198],[792804.8572634906,7464993.055347748],[792957.7313200384,7464993.055347748],[792957.7313200384,7464840.181291198],[792804.8572634906,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136258/82241","x":136258,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7464840.181291198],[792957.7313200384,7464993.055347748],[793110.6053765863,7464993.055347748],[793110.6053765863,7464840.181291198],[792957.7313200384,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136259/82241","x":136259,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7464687.3072346505],[792499.1091503911,7464840.181291198],[792651.983206939,7464840.181291198],[792651.983206939,7464687.3072346505],[792499.1091503911,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136256/82242","x":136256,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7464687.3072346505],[792651.983206939,7464840.181291198],[792804.8572634906,7464840.181291198],[792804.8572634906,7464687.3072346505],[792651.983206939,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136257/82242","x":136257,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7464534.433178101],[792499.1091503911,7464687.3072346505],[792651.983206939,7464687.3072346505],[792651.983206939,7464534.433178101],[792499.1091503911,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136256/82243","x":136256,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7464534.433178101],[792651.983206939,7464687.3072346505],[792804.8572634906,7464687.3072346505],[792804.8572634906,7464534.433178101],[792651.983206939,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136257/82243","x":136257,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7464687.3072346505],[792804.8572634906,7464840.181291198],[792957.7313200384,7464840.181291198],[792957.7313200384,7464687.3072346505],[792804.8572634906,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136258/82242","x":136258,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7464687.3072346505],[792957.7313200384,7464840.181291198],[793110.6053765863,7464840.181291198],[793110.6053765863,7464687.3072346505],[792957.7313200384,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136259/82242","x":136259,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7464534.433178101],[792804.8572634906,7464687.3072346505],[792957.7313200384,7464687.3072346505],[792957.7313200384,7464534.433178101],[792804.8572634906,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136258/82243","x":136258,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7464534.433178101],[792957.7313200384,7464687.3072346505],[793110.6053765863,7464687.3072346505],[793110.6053765863,7464534.433178101],[792957.7313200384,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136259/82243","x":136259,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7464993.055347748],[793110.6053765863,7465145.929404296],[793263.4794331342,7465145.929404296],[793263.4794331342,7464993.055347748],[793110.6053765863,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136260/82240","x":136260,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7464993.055347748],[793263.4794331342,7465145.929404296],[793416.3534896858,7465145.929404296],[793416.3534896858,7464993.055347748],[793263.4794331342,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136261/82240","x":136261,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7464840.181291198],[793110.6053765863,7464993.055347748],[793263.4794331342,7464993.055347748],[793263.4794331342,7464840.181291198],[793110.6053765863,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136260/82241","x":136260,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7464840.181291198],[793263.4794331342,7464993.055347748],[793416.3534896858,7464993.055347748],[793416.3534896858,7464840.181291198],[793263.4794331342,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136261/82241","x":136261,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7464993.055347748],[793416.3534896858,7465145.929404296],[793569.2275462337,7465145.929404296],[793569.2275462337,7464993.055347748],[793416.3534896858,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136262/82240","x":136262,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7464993.055347748],[793569.2275462337,7465145.929404296],[793722.1016027816,7465145.929404296],[793722.1016027816,7464993.055347748],[793569.2275462337,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136263/82240","x":136263,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7464840.181291198],[793416.3534896858,7464993.055347748],[793569.2275462337,7464993.055347748],[793569.2275462337,7464840.181291198],[793416.3534896858,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136262/82241","x":136262,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7464840.181291198],[793569.2275462337,7464993.055347748],[793722.1016027816,7464993.055347748],[793722.1016027816,7464840.181291198],[793569.2275462337,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136263/82241","x":136263,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7464687.3072346505],[793110.6053765863,7464840.181291198],[793263.4794331342,7464840.181291198],[793263.4794331342,7464687.3072346505],[793110.6053765863,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136260/82242","x":136260,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7464687.3072346505],[793263.4794331342,7464840.181291198],[793416.3534896858,7464840.181291198],[793416.3534896858,7464687.3072346505],[793263.4794331342,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136261/82242","x":136261,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7464534.433178101],[793110.6053765863,7464687.3072346505],[793263.4794331342,7464687.3072346505],[793263.4794331342,7464534.433178101],[793110.6053765863,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136260/82243","x":136260,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7464534.433178101],[793263.4794331342,7464687.3072346505],[793416.3534896858,7464687.3072346505],[793416.3534896858,7464534.433178101],[793263.4794331342,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136261/82243","x":136261,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7464687.3072346505],[793416.3534896858,7464840.181291198],[793569.2275462337,7464840.181291198],[793569.2275462337,7464687.3072346505],[793416.3534896858,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136262/82242","x":136262,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7464687.3072346505],[793569.2275462337,7464840.181291198],[793722.1016027816,7464840.181291198],[793722.1016027816,7464687.3072346505],[793569.2275462337,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136263/82242","x":136263,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7464534.433178101],[793416.3534896858,7464687.3072346505],[793569.2275462337,7464687.3072346505],[793569.2275462337,7464534.433178101],[793416.3534896858,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136262/82243","x":136262,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7464534.433178101],[793569.2275462337,7464687.3072346505],[793722.1016027816,7464687.3072346505],[793722.1016027816,7464534.433178101],[793569.2275462337,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136263/82243","x":136263,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7464381.559121551],[792499.1091503911,7464534.433178101],[792651.983206939,7464534.433178101],[792651.983206939,7464381.559121551],[792499.1091503911,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136256/82244","x":136256,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7464381.559121551],[792651.983206939,7464534.433178101],[792804.8572634906,7464534.433178101],[792804.8572634906,7464381.559121551],[792651.983206939,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136257/82244","x":136257,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7464228.685065003],[792651.983206939,7464381.559121551],[792804.8572634906,7464381.559121551],[792804.8572634906,7464228.685065003],[792651.983206939,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136257/82245","x":136257,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7464381.559121551],[792804.8572634906,7464534.433178101],[792957.7313200384,7464534.433178101],[792957.7313200384,7464381.559121551],[792804.8572634906,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136258/82244","x":136258,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7464381.559121551],[792957.7313200384,7464534.433178101],[793110.6053765863,7464534.433178101],[793110.6053765863,7464381.559121551],[792957.7313200384,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136259/82244","x":136259,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7464228.685065003],[792804.8572634906,7464381.559121551],[792957.7313200384,7464381.559121551],[792957.7313200384,7464228.685065003],[792804.8572634906,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136258/82245","x":136258,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7464228.685065003],[792957.7313200384,7464381.559121551],[793110.6053765863,7464381.559121551],[793110.6053765863,7464228.685065003],[792957.7313200384,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136259/82245","x":136259,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7464075.811008453],[792651.983206939,7464228.685065003],[792804.8572634906,7464228.685065003],[792804.8572634906,7464075.811008453],[792651.983206939,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136257/82246","x":136257,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7463922.936951904],[792651.983206939,7464075.811008453],[792804.8572634906,7464075.811008453],[792804.8572634906,7463922.936951904],[792651.983206939,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136257/82247","x":136257,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7464075.811008453],[792804.8572634906,7464228.685065003],[792957.7313200384,7464228.685065003],[792957.7313200384,7464075.811008453],[792804.8572634906,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136258/82246","x":136258,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7464075.811008453],[792957.7313200384,7464228.685065003],[793110.6053765863,7464228.685065003],[793110.6053765863,7464075.811008453],[792957.7313200384,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136259/82246","x":136259,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7463922.936951904],[792804.8572634906,7464075.811008453],[792957.7313200384,7464075.811008453],[792957.7313200384,7463922.936951904],[792804.8572634906,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136258/82247","x":136258,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7463922.936951904],[792957.7313200384,7464075.811008453],[793110.6053765863,7464075.811008453],[793110.6053765863,7463922.936951904],[792957.7313200384,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136259/82247","x":136259,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7464381.559121551],[793110.6053765863,7464534.433178101],[793263.4794331342,7464534.433178101],[793263.4794331342,7464381.559121551],[793110.6053765863,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136260/82244","x":136260,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7464381.559121551],[793263.4794331342,7464534.433178101],[793416.3534896858,7464534.433178101],[793416.3534896858,7464381.559121551],[793263.4794331342,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136261/82244","x":136261,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7464228.685065003],[793110.6053765863,7464381.559121551],[793263.4794331342,7464381.559121551],[793263.4794331342,7464228.685065003],[793110.6053765863,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136260/82245","x":136260,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7464228.685065003],[793263.4794331342,7464381.559121551],[793416.3534896858,7464381.559121551],[793416.3534896858,7464228.685065003],[793263.4794331342,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136261/82245","x":136261,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7464381.559121551],[793416.3534896858,7464534.433178101],[793569.2275462337,7464534.433178101],[793569.2275462337,7464381.559121551],[793416.3534896858,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136262/82244","x":136262,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7464381.559121551],[793569.2275462337,7464534.433178101],[793722.1016027816,7464534.433178101],[793722.1016027816,7464381.559121551],[793569.2275462337,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136263/82244","x":136263,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7464228.685065003],[793416.3534896858,7464381.559121551],[793569.2275462337,7464381.559121551],[793569.2275462337,7464228.685065003],[793416.3534896858,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136262/82245","x":136262,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7464228.685065003],[793569.2275462337,7464381.559121551],[793722.1016027816,7464381.559121551],[793722.1016027816,7464228.685065003],[793569.2275462337,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136263/82245","x":136263,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7464075.811008453],[793110.6053765863,7464228.685065003],[793263.4794331342,7464228.685065003],[793263.4794331342,7464075.811008453],[793110.6053765863,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136260/82246","x":136260,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7464075.811008453],[793263.4794331342,7464228.685065003],[793416.3534896858,7464228.685065003],[793416.3534896858,7464075.811008453],[793263.4794331342,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136261/82246","x":136261,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7463922.936951904],[793110.6053765863,7464075.811008453],[793263.4794331342,7464075.811008453],[793263.4794331342,7463922.936951904],[793110.6053765863,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136260/82247","x":136260,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7463922.936951904],[793263.4794331342,7464075.811008453],[793416.3534896858,7464075.811008453],[793416.3534896858,7463922.936951904],[793263.4794331342,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136261/82247","x":136261,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7464075.811008453],[793416.3534896858,7464228.685065003],[793569.2275462337,7464228.685065003],[793569.2275462337,7464075.811008453],[793416.3534896858,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136262/82246","x":136262,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7464075.811008453],[793569.2275462337,7464228.685065003],[793722.1016027816,7464228.685065003],[793722.1016027816,7464075.811008453],[793569.2275462337,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136263/82246","x":136263,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7463922.936951904],[793416.3534896858,7464075.811008453],[793569.2275462337,7464075.811008453],[793569.2275462337,7463922.936951904],[793416.3534896858,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136262/82247","x":136262,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7463922.936951904],[793569.2275462337,7464075.811008453],[793722.1016027816,7464075.811008453],[793722.1016027816,7463922.936951904],[793569.2275462337,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136263/82247","x":136263,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7464993.055347748],[793722.1016027816,7465145.929404296],[793874.9756593332,7465145.929404296],[793874.9756593332,7464993.055347748],[793722.1016027816,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136264/82240","x":136264,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7464993.055347748],[793874.9756593332,7465145.929404296],[794027.849715881,7465145.929404296],[794027.849715881,7464993.055347748],[793874.9756593332,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136265/82240","x":136265,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7464840.181291198],[793722.1016027816,7464993.055347748],[793874.9756593332,7464993.055347748],[793874.9756593332,7464840.181291198],[793722.1016027816,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136264/82241","x":136264,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7464840.181291198],[793874.9756593332,7464993.055347748],[794027.849715881,7464993.055347748],[794027.849715881,7464840.181291198],[793874.9756593332,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136265/82241","x":136265,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7464993.055347748],[794027.849715881,7465145.929404296],[794180.7237724289,7465145.929404296],[794180.7237724289,7464993.055347748],[794027.849715881,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136266/82240","x":136266,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7464993.055347748],[794180.7237724289,7465145.929404296],[794333.5978289805,7465145.929404296],[794333.5978289805,7464993.055347748],[794180.7237724289,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136267/82240","x":136267,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7464840.181291198],[794027.849715881,7464993.055347748],[794180.7237724289,7464993.055347748],[794180.7237724289,7464840.181291198],[794027.849715881,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136266/82241","x":136266,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7464687.3072346505],[793722.1016027816,7464840.181291198],[793874.9756593332,7464840.181291198],[793874.9756593332,7464687.3072346505],[793722.1016027816,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136264/82242","x":136264,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7464687.3072346505],[793874.9756593332,7464840.181291198],[794027.849715881,7464840.181291198],[794027.849715881,7464687.3072346505],[793874.9756593332,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136265/82242","x":136265,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7464534.433178101],[793722.1016027816,7464687.3072346505],[793874.9756593332,7464687.3072346505],[793874.9756593332,7464534.433178101],[793722.1016027816,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136264/82243","x":136264,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7464534.433178101],[793874.9756593332,7464687.3072346505],[794027.849715881,7464687.3072346505],[794027.849715881,7464534.433178101],[793874.9756593332,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136265/82243","x":136265,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7464993.055347748],[794333.5978289805,7465145.929404296],[794486.4718855284,7465145.929404296],[794486.4718855284,7464993.055347748],[794333.5978289805,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136268/82240","x":136268,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7464993.055347748],[794486.4718855284,7465145.929404296],[794639.3459420763,7465145.929404296],[794639.3459420763,7464993.055347748],[794486.4718855284,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136269/82240","x":136269,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7464993.055347748],[794639.3459420763,7465145.929404296],[794792.2199986279,7465145.929404296],[794792.2199986279,7464993.055347748],[794639.3459420763,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136270/82240","x":136270,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7464993.055347748],[794792.2199986279,7465145.929404296],[794945.0940551758,7465145.929404296],[794945.0940551758,7464993.055347748],[794792.2199986279,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136271/82240","x":136271,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7464381.559121551],[793722.1016027816,7464534.433178101],[793874.9756593332,7464534.433178101],[793874.9756593332,7464381.559121551],[793722.1016027816,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136264/82244","x":136264,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7464228.685065003],[793722.1016027816,7464381.559121551],[793874.9756593332,7464381.559121551],[793874.9756593332,7464228.685065003],[793722.1016027816,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136264/82245","x":136264,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7464075.811008453],[793722.1016027816,7464228.685065003],[793874.9756593332,7464228.685065003],[793874.9756593332,7464075.811008453],[793722.1016027816,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136264/82246","x":136264,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7463922.936951904],[793722.1016027816,7464075.811008453],[793874.9756593332,7464075.811008453],[793874.9756593332,7463922.936951904],[793722.1016027816,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136264/82247","x":136264,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7463922.936951904],[793874.9756593332,7464075.811008453],[794027.849715881,7464075.811008453],[794027.849715881,7463922.936951904],[793874.9756593332,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136265/82247","x":136265,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7464075.811008453],[794792.2199986279,7464228.685065003],[794945.0940551758,7464228.685065003],[794945.0940551758,7464075.811008453],[794792.2199986279,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136271/82246","x":136271,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7463922.936951904],[794639.3459420763,7464075.811008453],[794792.2199986279,7464075.811008453],[794792.2199986279,7463922.936951904],[794639.3459420763,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136270/82247","x":136270,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7463922.936951904],[794792.2199986279,7464075.811008453],[794945.0940551758,7464075.811008453],[794945.0940551758,7463922.936951904],[794792.2199986279,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136271/82247","x":136271,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7463770.062895356],[792651.983206939,7463922.936951904],[792804.8572634906,7463922.936951904],[792804.8572634906,7463770.062895356],[792651.983206939,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136257/82248","x":136257,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7463617.188838806],[792651.983206939,7463770.062895356],[792804.8572634906,7463770.062895356],[792804.8572634906,7463617.188838806],[792651.983206939,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136257/82249","x":136257,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7463770.062895356],[792804.8572634906,7463922.936951904],[792957.7313200384,7463922.936951904],[792957.7313200384,7463770.062895356],[792804.8572634906,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136258/82248","x":136258,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7463770.062895356],[792957.7313200384,7463922.936951904],[793110.6053765863,7463922.936951904],[793110.6053765863,7463770.062895356],[792957.7313200384,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136259/82248","x":136259,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7463617.188838806],[792804.8572634906,7463770.062895356],[792957.7313200384,7463770.062895356],[792957.7313200384,7463617.188838806],[792804.8572634906,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136258/82249","x":136258,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7463617.188838806],[792957.7313200384,7463770.062895356],[793110.6053765863,7463770.062895356],[793110.6053765863,7463617.188838806],[792957.7313200384,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136259/82249","x":136259,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7463464.314782256],[792651.983206939,7463617.188838806],[792804.8572634906,7463617.188838806],[792804.8572634906,7463464.314782256],[792651.983206939,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136257/82250","x":136257,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7463464.314782256],[792804.8572634906,7463617.188838806],[792957.7313200384,7463617.188838806],[792957.7313200384,7463464.314782256],[792804.8572634906,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136258/82250","x":136258,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7463464.314782256],[792957.7313200384,7463617.188838806],[793110.6053765863,7463617.188838806],[793110.6053765863,7463464.314782256],[792957.7313200384,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136259/82250","x":136259,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7463311.440725708],[792804.8572634906,7463464.314782256],[792957.7313200384,7463464.314782256],[792957.7313200384,7463311.440725708],[792804.8572634906,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136258/82251","x":136258,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7463311.440725708],[792957.7313200384,7463464.314782256],[793110.6053765863,7463464.314782256],[793110.6053765863,7463311.440725708],[792957.7313200384,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136259/82251","x":136259,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7463770.062895356],[793110.6053765863,7463922.936951904],[793263.4794331342,7463922.936951904],[793263.4794331342,7463770.062895356],[793110.6053765863,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136260/82248","x":136260,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7463770.062895356],[793263.4794331342,7463922.936951904],[793416.3534896858,7463922.936951904],[793416.3534896858,7463770.062895356],[793263.4794331342,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136261/82248","x":136261,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7463617.188838806],[793110.6053765863,7463770.062895356],[793263.4794331342,7463770.062895356],[793263.4794331342,7463617.188838806],[793110.6053765863,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136260/82249","x":136260,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7463617.188838806],[793263.4794331342,7463770.062895356],[793416.3534896858,7463770.062895356],[793416.3534896858,7463617.188838806],[793263.4794331342,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136261/82249","x":136261,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7463770.062895356],[793416.3534896858,7463922.936951904],[793569.2275462337,7463922.936951904],[793569.2275462337,7463770.062895356],[793416.3534896858,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136262/82248","x":136262,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7463770.062895356],[793569.2275462337,7463922.936951904],[793722.1016027816,7463922.936951904],[793722.1016027816,7463770.062895356],[793569.2275462337,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136263/82248","x":136263,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7463617.188838806],[793416.3534896858,7463770.062895356],[793569.2275462337,7463770.062895356],[793569.2275462337,7463617.188838806],[793416.3534896858,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136262/82249","x":136262,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7463617.188838806],[793569.2275462337,7463770.062895356],[793722.1016027816,7463770.062895356],[793722.1016027816,7463617.188838806],[793569.2275462337,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136263/82249","x":136263,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7463464.314782256],[793110.6053765863,7463617.188838806],[793263.4794331342,7463617.188838806],[793263.4794331342,7463464.314782256],[793110.6053765863,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136260/82250","x":136260,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7463464.314782256],[793263.4794331342,7463617.188838806],[793416.3534896858,7463617.188838806],[793416.3534896858,7463464.314782256],[793263.4794331342,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136261/82250","x":136261,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7463311.440725708],[793110.6053765863,7463464.314782256],[793263.4794331342,7463464.314782256],[793263.4794331342,7463311.440725708],[793110.6053765863,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136260/82251","x":136260,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7463311.440725708],[793263.4794331342,7463464.314782256],[793416.3534896858,7463464.314782256],[793416.3534896858,7463311.440725708],[793263.4794331342,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136261/82251","x":136261,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7463464.314782256],[793416.3534896858,7463617.188838806],[793569.2275462337,7463617.188838806],[793569.2275462337,7463464.314782256],[793416.3534896858,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136262/82250","x":136262,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7463464.314782256],[793569.2275462337,7463617.188838806],[793722.1016027816,7463617.188838806],[793722.1016027816,7463464.314782256],[793569.2275462337,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136263/82250","x":136263,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7463311.440725708],[793416.3534896858,7463464.314782256],[793569.2275462337,7463464.314782256],[793569.2275462337,7463311.440725708],[793416.3534896858,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136262/82251","x":136262,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7463311.440725708],[793569.2275462337,7463464.314782256],[793722.1016027816,7463464.314782256],[793722.1016027816,7463311.440725708],[793569.2275462337,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136263/82251","x":136263,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7463158.566669159],[792804.8572634906,7463311.440725708],[792957.7313200384,7463311.440725708],[792957.7313200384,7463158.566669159],[792804.8572634906,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136258/82252","x":136258,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7463158.566669159],[792957.7313200384,7463311.440725708],[793110.6053765863,7463311.440725708],[793110.6053765863,7463158.566669159],[792957.7313200384,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136259/82252","x":136259,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7463158.566669159],[793110.6053765863,7463311.440725708],[793263.4794331342,7463311.440725708],[793263.4794331342,7463158.566669159],[793110.6053765863,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136260/82252","x":136260,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7463158.566669159],[793263.4794331342,7463311.440725708],[793416.3534896858,7463311.440725708],[793416.3534896858,7463158.566669159],[793263.4794331342,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136261/82252","x":136261,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7463005.692612609],[793263.4794331342,7463158.566669159],[793416.3534896858,7463158.566669159],[793416.3534896858,7463005.692612609],[793263.4794331342,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136261/82253","x":136261,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7463158.566669159],[793416.3534896858,7463311.440725708],[793569.2275462337,7463311.440725708],[793569.2275462337,7463158.566669159],[793416.3534896858,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136262/82252","x":136262,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7463158.566669159],[793569.2275462337,7463311.440725708],[793722.1016027816,7463311.440725708],[793722.1016027816,7463158.566669159],[793569.2275462337,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136263/82252","x":136263,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7463005.692612609],[793416.3534896858,7463158.566669159],[793569.2275462337,7463158.566669159],[793569.2275462337,7463005.692612609],[793416.3534896858,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136262/82253","x":136262,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7463005.692612609],[793569.2275462337,7463158.566669159],[793722.1016027816,7463158.566669159],[793722.1016027816,7463005.692612609],[793569.2275462337,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136263/82253","x":136263,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7463770.062895356],[793722.1016027816,7463922.936951904],[793874.9756593332,7463922.936951904],[793874.9756593332,7463770.062895356],[793722.1016027816,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136264/82248","x":136264,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7463770.062895356],[793874.9756593332,7463922.936951904],[794027.849715881,7463922.936951904],[794027.849715881,7463770.062895356],[793874.9756593332,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136265/82248","x":136265,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7463617.188838806],[793722.1016027816,7463770.062895356],[793874.9756593332,7463770.062895356],[793874.9756593332,7463617.188838806],[793722.1016027816,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136264/82249","x":136264,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7463617.188838806],[793874.9756593332,7463770.062895356],[794027.849715881,7463770.062895356],[794027.849715881,7463617.188838806],[793874.9756593332,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136265/82249","x":136265,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7463770.062895356],[794027.849715881,7463922.936951904],[794180.7237724289,7463922.936951904],[794180.7237724289,7463770.062895356],[794027.849715881,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136266/82248","x":136266,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7463617.188838806],[794027.849715881,7463770.062895356],[794180.7237724289,7463770.062895356],[794180.7237724289,7463617.188838806],[794027.849715881,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136266/82249","x":136266,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7463617.188838806],[794180.7237724289,7463770.062895356],[794333.5978289805,7463770.062895356],[794333.5978289805,7463617.188838806],[794180.7237724289,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136267/82249","x":136267,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7463464.314782256],[793722.1016027816,7463617.188838806],[793874.9756593332,7463617.188838806],[793874.9756593332,7463464.314782256],[793722.1016027816,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136264/82250","x":136264,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7463464.314782256],[793874.9756593332,7463617.188838806],[794027.849715881,7463617.188838806],[794027.849715881,7463464.314782256],[793874.9756593332,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136265/82250","x":136265,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7463311.440725708],[793722.1016027816,7463464.314782256],[793874.9756593332,7463464.314782256],[793874.9756593332,7463311.440725708],[793722.1016027816,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136264/82251","x":136264,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7463311.440725708],[793874.9756593332,7463464.314782256],[794027.849715881,7463464.314782256],[794027.849715881,7463311.440725708],[793874.9756593332,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136265/82251","x":136265,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7463464.314782256],[794027.849715881,7463617.188838806],[794180.7237724289,7463617.188838806],[794180.7237724289,7463464.314782256],[794027.849715881,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136266/82250","x":136266,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7463464.314782256],[794180.7237724289,7463617.188838806],[794333.5978289805,7463617.188838806],[794333.5978289805,7463464.314782256],[794180.7237724289,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136267/82250","x":136267,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7463311.440725708],[794027.849715881,7463464.314782256],[794180.7237724289,7463464.314782256],[794180.7237724289,7463311.440725708],[794027.849715881,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136266/82251","x":136266,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7463311.440725708],[794180.7237724289,7463464.314782256],[794333.5978289805,7463464.314782256],[794333.5978289805,7463311.440725708],[794180.7237724289,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136267/82251","x":136267,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7463770.062895356],[794333.5978289805,7463922.936951904],[794486.4718855284,7463922.936951904],[794486.4718855284,7463770.062895356],[794333.5978289805,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136268/82248","x":136268,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7463770.062895356],[794486.4718855284,7463922.936951904],[794639.3459420763,7463922.936951904],[794639.3459420763,7463770.062895356],[794486.4718855284,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136269/82248","x":136269,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7463617.188838806],[794333.5978289805,7463770.062895356],[794486.4718855284,7463770.062895356],[794486.4718855284,7463617.188838806],[794333.5978289805,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136268/82249","x":136268,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7463617.188838806],[794486.4718855284,7463770.062895356],[794639.3459420763,7463770.062895356],[794639.3459420763,7463617.188838806],[794486.4718855284,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136269/82249","x":136269,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7463770.062895356],[794639.3459420763,7463922.936951904],[794792.2199986279,7463922.936951904],[794792.2199986279,7463770.062895356],[794639.3459420763,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136270/82248","x":136270,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7463770.062895356],[794792.2199986279,7463922.936951904],[794945.0940551758,7463922.936951904],[794945.0940551758,7463770.062895356],[794792.2199986279,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136271/82248","x":136271,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7463617.188838806],[794639.3459420763,7463770.062895356],[794792.2199986279,7463770.062895356],[794792.2199986279,7463617.188838806],[794639.3459420763,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136270/82249","x":136270,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7463617.188838806],[794792.2199986279,7463770.062895356],[794945.0940551758,7463770.062895356],[794945.0940551758,7463617.188838806],[794792.2199986279,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136271/82249","x":136271,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7463464.314782256],[794333.5978289805,7463617.188838806],[794486.4718855284,7463617.188838806],[794486.4718855284,7463464.314782256],[794333.5978289805,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136268/82250","x":136268,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7463464.314782256],[794486.4718855284,7463617.188838806],[794639.3459420763,7463617.188838806],[794639.3459420763,7463464.314782256],[794486.4718855284,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136269/82250","x":136269,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7463311.440725708],[794333.5978289805,7463464.314782256],[794486.4718855284,7463464.314782256],[794486.4718855284,7463311.440725708],[794333.5978289805,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136268/82251","x":136268,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7463311.440725708],[794486.4718855284,7463464.314782256],[794639.3459420763,7463464.314782256],[794639.3459420763,7463311.440725708],[794486.4718855284,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136269/82251","x":136269,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7463464.314782256],[794639.3459420763,7463617.188838806],[794792.2199986279,7463617.188838806],[794792.2199986279,7463464.314782256],[794639.3459420763,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136270/82250","x":136270,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7463464.314782256],[794792.2199986279,7463617.188838806],[794945.0940551758,7463617.188838806],[794945.0940551758,7463464.314782256],[794792.2199986279,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136271/82250","x":136271,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7463311.440725708],[794639.3459420763,7463464.314782256],[794792.2199986279,7463464.314782256],[794792.2199986279,7463311.440725708],[794639.3459420763,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136270/82251","x":136270,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7463311.440725708],[794792.2199986279,7463464.314782256],[794945.0940551758,7463464.314782256],[794945.0940551758,7463311.440725708],[794792.2199986279,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136271/82251","x":136271,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7463158.566669159],[793722.1016027816,7463311.440725708],[793874.9756593332,7463311.440725708],[793874.9756593332,7463158.566669159],[793722.1016027816,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136264/82252","x":136264,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7463158.566669159],[793874.9756593332,7463311.440725708],[794027.849715881,7463311.440725708],[794027.849715881,7463158.566669159],[793874.9756593332,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136265/82252","x":136265,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7463005.692612609],[793722.1016027816,7463158.566669159],[793874.9756593332,7463158.566669159],[793874.9756593332,7463005.692612609],[793722.1016027816,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136264/82253","x":136264,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7463005.692612609],[793874.9756593332,7463158.566669159],[794027.849715881,7463158.566669159],[794027.849715881,7463005.692612609],[793874.9756593332,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136265/82253","x":136265,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7463158.566669159],[794027.849715881,7463311.440725708],[794180.7237724289,7463311.440725708],[794180.7237724289,7463158.566669159],[794027.849715881,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136266/82252","x":136266,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7463158.566669159],[794180.7237724289,7463311.440725708],[794333.5978289805,7463311.440725708],[794333.5978289805,7463158.566669159],[794180.7237724289,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136267/82252","x":136267,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7463005.692612609],[794027.849715881,7463158.566669159],[794180.7237724289,7463158.566669159],[794180.7237724289,7463005.692612609],[794027.849715881,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136266/82253","x":136266,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7463005.692612609],[794180.7237724289,7463158.566669159],[794333.5978289805,7463158.566669159],[794333.5978289805,7463005.692612609],[794180.7237724289,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136267/82253","x":136267,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7462852.818556061],[793874.9756593332,7463005.692612609],[794027.849715881,7463005.692612609],[794027.849715881,7462852.818556061],[793874.9756593332,7462852.818556061]]],"type":"Polygon"},"properties":{"label":"18/136265/82254","x":136265,"y":82254,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7462852.818556061],[794027.849715881,7463005.692612609],[794180.7237724289,7463005.692612609],[794180.7237724289,7462852.818556061],[794027.849715881,7462852.818556061]]],"type":"Polygon"},"properties":{"label":"18/136266/82254","x":136266,"y":82254,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7462852.818556061],[794180.7237724289,7463005.692612609],[794333.5978289805,7463005.692612609],[794333.5978289805,7462852.818556061],[794180.7237724289,7462852.818556061]]],"type":"Polygon"},"properties":{"label":"18/136267/82254","x":136267,"y":82254,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7463158.566669159],[794333.5978289805,7463311.440725708],[794486.4718855284,7463311.440725708],[794486.4718855284,7463158.566669159],[794333.5978289805,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136268/82252","x":136268,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7463158.566669159],[794486.4718855284,7463311.440725708],[794639.3459420763,7463311.440725708],[794639.3459420763,7463158.566669159],[794486.4718855284,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136269/82252","x":136269,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7463005.692612609],[794333.5978289805,7463158.566669159],[794486.4718855284,7463158.566669159],[794486.4718855284,7463005.692612609],[794333.5978289805,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136268/82253","x":136268,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7463005.692612609],[794486.4718855284,7463158.566669159],[794639.3459420763,7463158.566669159],[794639.3459420763,7463005.692612609],[794486.4718855284,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136269/82253","x":136269,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7463158.566669159],[794639.3459420763,7463311.440725708],[794792.2199986279,7463311.440725708],[794792.2199986279,7463158.566669159],[794639.3459420763,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136270/82252","x":136270,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7463158.566669159],[794792.2199986279,7463311.440725708],[794945.0940551758,7463311.440725708],[794945.0940551758,7463158.566669159],[794792.2199986279,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136271/82252","x":136271,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7463005.692612609],[794639.3459420763,7463158.566669159],[794792.2199986279,7463158.566669159],[794792.2199986279,7463005.692612609],[794639.3459420763,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136270/82253","x":136270,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7463005.692612609],[794792.2199986279,7463158.566669159],[794945.0940551758,7463158.566669159],[794945.0940551758,7463005.692612609],[794792.2199986279,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136271/82253","x":136271,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7462852.818556061],[794333.5978289805,7463005.692612609],[794486.4718855284,7463005.692612609],[794486.4718855284,7462852.818556061],[794333.5978289805,7462852.818556061]]],"type":"Polygon"},"properties":{"label":"18/136268/82254","x":136268,"y":82254,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7462852.818556061],[794486.4718855284,7463005.692612609],[794639.3459420763,7463005.692612609],[794639.3459420763,7462852.818556061],[794486.4718855284,7462852.818556061]]],"type":"Polygon"},"properties":{"label":"18/136269/82254","x":136269,"y":82254,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7462699.944499511],[794486.4718855284,7462852.818556061],[794639.3459420763,7462852.818556061],[794639.3459420763,7462699.944499511],[794486.4718855284,7462699.944499511]]],"type":"Polygon"},"properties":{"label":"18/136269/82255","x":136269,"y":82255,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7462852.818556061],[794639.3459420763,7463005.692612609],[794792.2199986279,7463005.692612609],[794792.2199986279,7462852.818556061],[794639.3459420763,7462852.818556061]]],"type":"Polygon"},"properties":{"label":"18/136270/82254","x":136270,"y":82254,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7462852.818556061],[794792.2199986279,7463005.692612609],[794945.0940551758,7463005.692612609],[794945.0940551758,7462852.818556061],[794792.2199986279,7462852.818556061]]],"type":"Polygon"},"properties":{"label":"18/136271/82254","x":136271,"y":82254,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7462699.944499511],[794639.3459420763,7462852.818556061],[794792.2199986279,7462852.818556061],[794792.2199986279,7462699.944499511],[794639.3459420763,7462699.944499511]]],"type":"Polygon"},"properties":{"label":"18/136270/82255","x":136270,"y":82255,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7462699.944499511],[794792.2199986279,7462852.818556061],[794945.0940551758,7462852.818556061],[794945.0940551758,7462699.944499511],[794792.2199986279,7462699.944499511]]],"type":"Polygon"},"properties":{"label":"18/136271/82255","x":136271,"y":82255,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7464993.055347748],[794945.0940551758,7465145.929404296],[795097.9681117237,7465145.929404296],[795097.9681117237,7464993.055347748],[794945.0940551758,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136272/82240","x":136272,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7464993.055347748],[795097.9681117237,7465145.929404296],[795250.8421682753,7465145.929404296],[795250.8421682753,7464993.055347748],[795097.9681117237,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136273/82240","x":136273,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7464840.181291198],[794945.0940551758,7464993.055347748],[795097.9681117237,7464993.055347748],[795097.9681117237,7464840.181291198],[794945.0940551758,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136272/82241","x":136272,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7464840.181291198],[795097.9681117237,7464993.055347748],[795250.8421682753,7464993.055347748],[795250.8421682753,7464840.181291198],[795097.9681117237,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136273/82241","x":136273,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7464993.055347748],[795250.8421682753,7465145.929404296],[795403.7162248231,7465145.929404296],[795403.7162248231,7464993.055347748],[795250.8421682753,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136274/82240","x":136274,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7464993.055347748],[795403.7162248231,7465145.929404296],[795556.590281371,7465145.929404296],[795556.590281371,7464993.055347748],[795403.7162248231,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136275/82240","x":136275,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7464840.181291198],[795250.8421682753,7464993.055347748],[795403.7162248231,7464993.055347748],[795403.7162248231,7464840.181291198],[795250.8421682753,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136274/82241","x":136274,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7464840.181291198],[795403.7162248231,7464993.055347748],[795556.590281371,7464993.055347748],[795556.590281371,7464840.181291198],[795403.7162248231,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136275/82241","x":136275,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7464687.3072346505],[794945.0940551758,7464840.181291198],[795097.9681117237,7464840.181291198],[795097.9681117237,7464687.3072346505],[794945.0940551758,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136272/82242","x":136272,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7464687.3072346505],[795097.9681117237,7464840.181291198],[795250.8421682753,7464840.181291198],[795250.8421682753,7464687.3072346505],[795097.9681117237,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136273/82242","x":136273,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7464534.433178101],[795097.9681117237,7464687.3072346505],[795250.8421682753,7464687.3072346505],[795250.8421682753,7464534.433178101],[795097.9681117237,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136273/82243","x":136273,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7464687.3072346505],[795250.8421682753,7464840.181291198],[795403.7162248231,7464840.181291198],[795403.7162248231,7464687.3072346505],[795250.8421682753,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136274/82242","x":136274,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7464687.3072346505],[795403.7162248231,7464840.181291198],[795556.590281371,7464840.181291198],[795556.590281371,7464687.3072346505],[795403.7162248231,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136275/82242","x":136275,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7464534.433178101],[795250.8421682753,7464687.3072346505],[795403.7162248231,7464687.3072346505],[795403.7162248231,7464534.433178101],[795250.8421682753,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136274/82243","x":136274,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7464534.433178101],[795403.7162248231,7464687.3072346505],[795556.590281371,7464687.3072346505],[795556.590281371,7464534.433178101],[795403.7162248231,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136275/82243","x":136275,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7464993.055347748],[795556.590281371,7465145.929404296],[795709.4643379226,7465145.929404296],[795709.4643379226,7464993.055347748],[795556.590281371,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136276/82240","x":136276,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7464993.055347748],[795709.4643379226,7465145.929404296],[795862.3383944705,7465145.929404296],[795862.3383944705,7464993.055347748],[795709.4643379226,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136277/82240","x":136277,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7464840.181291198],[795556.590281371,7464993.055347748],[795709.4643379226,7464993.055347748],[795709.4643379226,7464840.181291198],[795556.590281371,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136276/82241","x":136276,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7464840.181291198],[795709.4643379226,7464993.055347748],[795862.3383944705,7464993.055347748],[795862.3383944705,7464840.181291198],[795709.4643379226,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136277/82241","x":136277,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7464993.055347748],[795862.3383944705,7465145.929404296],[796015.2124510184,7465145.929404296],[796015.2124510184,7464993.055347748],[795862.3383944705,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136278/82240","x":136278,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7464993.055347748],[796015.2124510184,7465145.929404296],[796168.08650757,7465145.929404296],[796168.08650757,7464993.055347748],[796015.2124510184,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136279/82240","x":136279,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7464840.181291198],[795862.3383944705,7464993.055347748],[796015.2124510184,7464993.055347748],[796015.2124510184,7464840.181291198],[795862.3383944705,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136278/82241","x":136278,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7464840.181291198],[796015.2124510184,7464993.055347748],[796168.08650757,7464993.055347748],[796168.08650757,7464840.181291198],[796015.2124510184,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136279/82241","x":136279,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7464687.3072346505],[795556.590281371,7464840.181291198],[795709.4643379226,7464840.181291198],[795709.4643379226,7464687.3072346505],[795556.590281371,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136276/82242","x":136276,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7464687.3072346505],[795709.4643379226,7464840.181291198],[795862.3383944705,7464840.181291198],[795862.3383944705,7464687.3072346505],[795709.4643379226,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136277/82242","x":136277,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7464534.433178101],[795556.590281371,7464687.3072346505],[795709.4643379226,7464687.3072346505],[795709.4643379226,7464534.433178101],[795556.590281371,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136276/82243","x":136276,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7464534.433178101],[795709.4643379226,7464687.3072346505],[795862.3383944705,7464687.3072346505],[795862.3383944705,7464534.433178101],[795709.4643379226,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136277/82243","x":136277,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7464687.3072346505],[795862.3383944705,7464840.181291198],[796015.2124510184,7464840.181291198],[796015.2124510184,7464687.3072346505],[795862.3383944705,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136278/82242","x":136278,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7464687.3072346505],[796015.2124510184,7464840.181291198],[796168.08650757,7464840.181291198],[796168.08650757,7464687.3072346505],[796015.2124510184,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136279/82242","x":136279,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7464534.433178101],[795862.3383944705,7464687.3072346505],[796015.2124510184,7464687.3072346505],[796015.2124510184,7464534.433178101],[795862.3383944705,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136278/82243","x":136278,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7464534.433178101],[796015.2124510184,7464687.3072346505],[796168.08650757,7464687.3072346505],[796168.08650757,7464534.433178101],[796015.2124510184,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136279/82243","x":136279,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7464381.559121551],[795097.9681117237,7464534.433178101],[795250.8421682753,7464534.433178101],[795250.8421682753,7464381.559121551],[795097.9681117237,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136273/82244","x":136273,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7464228.685065003],[795097.9681117237,7464381.559121551],[795250.8421682753,7464381.559121551],[795250.8421682753,7464228.685065003],[795097.9681117237,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136273/82245","x":136273,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7464381.559121551],[795250.8421682753,7464534.433178101],[795403.7162248231,7464534.433178101],[795403.7162248231,7464381.559121551],[795250.8421682753,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136274/82244","x":136274,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7464381.559121551],[795403.7162248231,7464534.433178101],[795556.590281371,7464534.433178101],[795556.590281371,7464381.559121551],[795403.7162248231,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136275/82244","x":136275,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7464228.685065003],[795250.8421682753,7464381.559121551],[795403.7162248231,7464381.559121551],[795403.7162248231,7464228.685065003],[795250.8421682753,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136274/82245","x":136274,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7464228.685065003],[795403.7162248231,7464381.559121551],[795556.590281371,7464381.559121551],[795556.590281371,7464228.685065003],[795403.7162248231,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136275/82245","x":136275,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7464075.811008453],[794945.0940551758,7464228.685065003],[795097.9681117237,7464228.685065003],[795097.9681117237,7464075.811008453],[794945.0940551758,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136272/82246","x":136272,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7464075.811008453],[795097.9681117237,7464228.685065003],[795250.8421682753,7464228.685065003],[795250.8421682753,7464075.811008453],[795097.9681117237,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136273/82246","x":136273,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7463922.936951904],[794945.0940551758,7464075.811008453],[795097.9681117237,7464075.811008453],[795097.9681117237,7463922.936951904],[794945.0940551758,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136272/82247","x":136272,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7463922.936951904],[795097.9681117237,7464075.811008453],[795250.8421682753,7464075.811008453],[795250.8421682753,7463922.936951904],[795097.9681117237,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136273/82247","x":136273,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7464075.811008453],[795250.8421682753,7464228.685065003],[795403.7162248231,7464228.685065003],[795403.7162248231,7464075.811008453],[795250.8421682753,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136274/82246","x":136274,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7464075.811008453],[795403.7162248231,7464228.685065003],[795556.590281371,7464228.685065003],[795556.590281371,7464075.811008453],[795403.7162248231,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136275/82246","x":136275,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7463922.936951904],[795250.8421682753,7464075.811008453],[795403.7162248231,7464075.811008453],[795403.7162248231,7463922.936951904],[795250.8421682753,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136274/82247","x":136274,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7463922.936951904],[795403.7162248231,7464075.811008453],[795556.590281371,7464075.811008453],[795556.590281371,7463922.936951904],[795403.7162248231,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136275/82247","x":136275,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7464381.559121551],[795556.590281371,7464534.433178101],[795709.4643379226,7464534.433178101],[795709.4643379226,7464381.559121551],[795556.590281371,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136276/82244","x":136276,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7464381.559121551],[795709.4643379226,7464534.433178101],[795862.3383944705,7464534.433178101],[795862.3383944705,7464381.559121551],[795709.4643379226,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136277/82244","x":136277,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7464228.685065003],[795556.590281371,7464381.559121551],[795709.4643379226,7464381.559121551],[795709.4643379226,7464228.685065003],[795556.590281371,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136276/82245","x":136276,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7464228.685065003],[795709.4643379226,7464381.559121551],[795862.3383944705,7464381.559121551],[795862.3383944705,7464228.685065003],[795709.4643379226,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136277/82245","x":136277,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7464381.559121551],[795862.3383944705,7464534.433178101],[796015.2124510184,7464534.433178101],[796015.2124510184,7464381.559121551],[795862.3383944705,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136278/82244","x":136278,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7464381.559121551],[796015.2124510184,7464534.433178101],[796168.08650757,7464534.433178101],[796168.08650757,7464381.559121551],[796015.2124510184,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136279/82244","x":136279,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7464228.685065003],[795862.3383944705,7464381.559121551],[796015.2124510184,7464381.559121551],[796015.2124510184,7464228.685065003],[795862.3383944705,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136278/82245","x":136278,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7464228.685065003],[796015.2124510184,7464381.559121551],[796168.08650757,7464381.559121551],[796168.08650757,7464228.685065003],[796015.2124510184,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136279/82245","x":136279,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7464075.811008453],[795556.590281371,7464228.685065003],[795709.4643379226,7464228.685065003],[795709.4643379226,7464075.811008453],[795556.590281371,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136276/82246","x":136276,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7464075.811008453],[795709.4643379226,7464228.685065003],[795862.3383944705,7464228.685065003],[795862.3383944705,7464075.811008453],[795709.4643379226,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136277/82246","x":136277,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7463922.936951904],[795556.590281371,7464075.811008453],[795709.4643379226,7464075.811008453],[795709.4643379226,7463922.936951904],[795556.590281371,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136276/82247","x":136276,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7463922.936951904],[795709.4643379226,7464075.811008453],[795862.3383944705,7464075.811008453],[795862.3383944705,7463922.936951904],[795709.4643379226,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136277/82247","x":136277,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7464075.811008453],[795862.3383944705,7464228.685065003],[796015.2124510184,7464228.685065003],[796015.2124510184,7464075.811008453],[795862.3383944705,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136278/82246","x":136278,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7464075.811008453],[796015.2124510184,7464228.685065003],[796168.08650757,7464228.685065003],[796168.08650757,7464075.811008453],[796015.2124510184,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136279/82246","x":136279,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7463922.936951904],[795862.3383944705,7464075.811008453],[796015.2124510184,7464075.811008453],[796015.2124510184,7463922.936951904],[795862.3383944705,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136278/82247","x":136278,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7464993.055347748],[796168.08650757,7465145.929404296],[796320.9605641179,7465145.929404296],[796320.9605641179,7464993.055347748],[796168.08650757,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136280/82240","x":136280,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7464993.055347748],[796320.9605641179,7465145.929404296],[796473.8346206658,7465145.929404296],[796473.8346206658,7464993.055347748],[796320.9605641179,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136281/82240","x":136281,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7464840.181291198],[796168.08650757,7464993.055347748],[796320.9605641179,7464993.055347748],[796320.9605641179,7464840.181291198],[796168.08650757,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136280/82241","x":136280,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7464840.181291198],[796320.9605641179,7464993.055347748],[796473.8346206658,7464993.055347748],[796473.8346206658,7464840.181291198],[796320.9605641179,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136281/82241","x":136281,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7464993.055347748],[796473.8346206658,7465145.929404296],[796626.7086772174,7465145.929404296],[796626.7086772174,7464993.055347748],[796473.8346206658,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136282/82240","x":136282,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7464993.055347748],[796626.7086772174,7465145.929404296],[796779.5827337652,7465145.929404296],[796779.5827337652,7464993.055347748],[796626.7086772174,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136283/82240","x":136283,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7464840.181291198],[796473.8346206658,7464993.055347748],[796626.7086772174,7464993.055347748],[796626.7086772174,7464840.181291198],[796473.8346206658,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136282/82241","x":136282,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7464687.3072346505],[796168.08650757,7464840.181291198],[796320.9605641179,7464840.181291198],[796320.9605641179,7464687.3072346505],[796168.08650757,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136280/82242","x":136280,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7464687.3072346505],[796320.9605641179,7464840.181291198],[796473.8346206658,7464840.181291198],[796473.8346206658,7464687.3072346505],[796320.9605641179,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136281/82242","x":136281,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7464534.433178101],[796168.08650757,7464687.3072346505],[796320.9605641179,7464687.3072346505],[796320.9605641179,7464534.433178101],[796168.08650757,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136280/82243","x":136280,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7464534.433178101],[796320.9605641179,7464687.3072346505],[796473.8346206658,7464687.3072346505],[796473.8346206658,7464534.433178101],[796320.9605641179,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136281/82243","x":136281,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7464381.559121551],[796168.08650757,7464534.433178101],[796320.9605641179,7464534.433178101],[796320.9605641179,7464381.559121551],[796168.08650757,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136280/82244","x":136280,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7463770.062895356],[794945.0940551758,7463922.936951904],[795097.9681117237,7463922.936951904],[795097.9681117237,7463770.062895356],[794945.0940551758,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136272/82248","x":136272,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7463770.062895356],[795097.9681117237,7463922.936951904],[795250.8421682753,7463922.936951904],[795250.8421682753,7463770.062895356],[795097.9681117237,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136273/82248","x":136273,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7463617.188838806],[794945.0940551758,7463770.062895356],[795097.9681117237,7463770.062895356],[795097.9681117237,7463617.188838806],[794945.0940551758,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136272/82249","x":136272,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7463617.188838806],[795097.9681117237,7463770.062895356],[795250.8421682753,7463770.062895356],[795250.8421682753,7463617.188838806],[795097.9681117237,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136273/82249","x":136273,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7463770.062895356],[795250.8421682753,7463922.936951904],[795403.7162248231,7463922.936951904],[795403.7162248231,7463770.062895356],[795250.8421682753,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136274/82248","x":136274,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7463770.062895356],[795403.7162248231,7463922.936951904],[795556.590281371,7463922.936951904],[795556.590281371,7463770.062895356],[795403.7162248231,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136275/82248","x":136275,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7463617.188838806],[795250.8421682753,7463770.062895356],[795403.7162248231,7463770.062895356],[795403.7162248231,7463617.188838806],[795250.8421682753,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136274/82249","x":136274,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7463617.188838806],[795403.7162248231,7463770.062895356],[795556.590281371,7463770.062895356],[795556.590281371,7463617.188838806],[795403.7162248231,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136275/82249","x":136275,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7463464.314782256],[794945.0940551758,7463617.188838806],[795097.9681117237,7463617.188838806],[795097.9681117237,7463464.314782256],[794945.0940551758,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136272/82250","x":136272,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7463464.314782256],[795097.9681117237,7463617.188838806],[795250.8421682753,7463617.188838806],[795250.8421682753,7463464.314782256],[795097.9681117237,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136273/82250","x":136273,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7463311.440725708],[794945.0940551758,7463464.314782256],[795097.9681117237,7463464.314782256],[795097.9681117237,7463311.440725708],[794945.0940551758,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136272/82251","x":136272,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7463311.440725708],[795097.9681117237,7463464.314782256],[795250.8421682753,7463464.314782256],[795250.8421682753,7463311.440725708],[795097.9681117237,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136273/82251","x":136273,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7463464.314782256],[795250.8421682753,7463617.188838806],[795403.7162248231,7463617.188838806],[795403.7162248231,7463464.314782256],[795250.8421682753,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136274/82250","x":136274,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7463464.314782256],[795403.7162248231,7463617.188838806],[795556.590281371,7463617.188838806],[795556.590281371,7463464.314782256],[795403.7162248231,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136275/82250","x":136275,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7463311.440725708],[795250.8421682753,7463464.314782256],[795403.7162248231,7463464.314782256],[795403.7162248231,7463311.440725708],[795250.8421682753,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136274/82251","x":136274,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7463311.440725708],[795403.7162248231,7463464.314782256],[795556.590281371,7463464.314782256],[795556.590281371,7463311.440725708],[795403.7162248231,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136275/82251","x":136275,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7463770.062895356],[795556.590281371,7463922.936951904],[795709.4643379226,7463922.936951904],[795709.4643379226,7463770.062895356],[795556.590281371,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136276/82248","x":136276,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7463770.062895356],[795709.4643379226,7463922.936951904],[795862.3383944705,7463922.936951904],[795862.3383944705,7463770.062895356],[795709.4643379226,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136277/82248","x":136277,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7463617.188838806],[795556.590281371,7463770.062895356],[795709.4643379226,7463770.062895356],[795709.4643379226,7463617.188838806],[795556.590281371,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136276/82249","x":136276,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7463617.188838806],[795709.4643379226,7463770.062895356],[795862.3383944705,7463770.062895356],[795862.3383944705,7463617.188838806],[795709.4643379226,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136277/82249","x":136277,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7463770.062895356],[795862.3383944705,7463922.936951904],[796015.2124510184,7463922.936951904],[796015.2124510184,7463770.062895356],[795862.3383944705,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136278/82248","x":136278,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7463464.314782256],[795556.590281371,7463617.188838806],[795709.4643379226,7463617.188838806],[795709.4643379226,7463464.314782256],[795556.590281371,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136276/82250","x":136276,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7463311.440725708],[795556.590281371,7463464.314782256],[795709.4643379226,7463464.314782256],[795709.4643379226,7463311.440725708],[795556.590281371,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136276/82251","x":136276,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7463158.566669159],[794945.0940551758,7463311.440725708],[795097.9681117237,7463311.440725708],[795097.9681117237,7463158.566669159],[794945.0940551758,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136272/82252","x":136272,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7463158.566669159],[795097.9681117237,7463311.440725708],[795250.8421682753,7463311.440725708],[795250.8421682753,7463158.566669159],[795097.9681117237,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136273/82252","x":136273,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7463005.692612609],[794945.0940551758,7463158.566669159],[795097.9681117237,7463158.566669159],[795097.9681117237,7463005.692612609],[794945.0940551758,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136272/82253","x":136272,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7463005.692612609],[795097.9681117237,7463158.566669159],[795250.8421682753,7463158.566669159],[795250.8421682753,7463005.692612609],[795097.9681117237,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136273/82253","x":136273,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7463158.566669159],[795250.8421682753,7463311.440725708],[795403.7162248231,7463311.440725708],[795403.7162248231,7463158.566669159],[795250.8421682753,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136274/82252","x":136274,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7463158.566669159],[795403.7162248231,7463311.440725708],[795556.590281371,7463311.440725708],[795556.590281371,7463158.566669159],[795403.7162248231,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136275/82252","x":136275,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7463005.692612609],[795250.8421682753,7463158.566669159],[795403.7162248231,7463158.566669159],[795403.7162248231,7463005.692612609],[795250.8421682753,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136274/82253","x":136274,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7463005.692612609],[795403.7162248231,7463158.566669159],[795556.590281371,7463158.566669159],[795556.590281371,7463005.692612609],[795403.7162248231,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136275/82253","x":136275,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7462852.818556061],[794945.0940551758,7463005.692612609],[795097.9681117237,7463005.692612609],[795097.9681117237,7462852.818556061],[794945.0940551758,7462852.818556061]]],"type":"Polygon"},"properties":{"label":"18/136272/82254","x":136272,"y":82254,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7462852.818556061],[795097.9681117237,7463005.692612609],[795250.8421682753,7463005.692612609],[795250.8421682753,7462852.818556061],[795097.9681117237,7462852.818556061]]],"type":"Polygon"},"properties":{"label":"18/136273/82254","x":136273,"y":82254,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7462699.944499511],[794945.0940551758,7462852.818556061],[795097.9681117237,7462852.818556061],[795097.9681117237,7462699.944499511],[794945.0940551758,7462699.944499511]]],"type":"Polygon"},"properties":{"label":"18/136272/82255","x":136272,"y":82255,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7462699.944499511],[795097.9681117237,7462852.818556061],[795250.8421682753,7462852.818556061],[795250.8421682753,7462699.944499511],[795097.9681117237,7462699.944499511]]],"type":"Polygon"},"properties":{"label":"18/136273/82255","x":136273,"y":82255,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7462852.818556061],[795250.8421682753,7463005.692612609],[795403.7162248231,7463005.692612609],[795403.7162248231,7462852.818556061],[795250.8421682753,7462852.818556061]]],"type":"Polygon"},"properties":{"label":"18/136274/82254","x":136274,"y":82254,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7461324.077990569],[792499.1091503911,7461476.952047119],[792651.983206939,7461476.952047119],[792651.983206939,7461324.077990569],[792499.1091503911,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136256/82264","x":136256,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7461324.077990569],[792651.983206939,7461476.952047119],[792804.8572634906,7461476.952047119],[792804.8572634906,7461324.077990569],[792651.983206939,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136257/82264","x":136257,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7461171.203934021],[792499.1091503911,7461324.077990569],[792651.983206939,7461324.077990569],[792651.983206939,7461171.203934021],[792499.1091503911,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136256/82265","x":136256,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7461171.203934021],[792651.983206939,7461324.077990569],[792804.8572634906,7461324.077990569],[792804.8572634906,7461171.203934021],[792651.983206939,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136257/82265","x":136257,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7461324.077990569],[792804.8572634906,7461476.952047119],[792957.7313200384,7461476.952047119],[792957.7313200384,7461324.077990569],[792804.8572634906,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136258/82264","x":136258,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7461324.077990569],[792957.7313200384,7461476.952047119],[793110.6053765863,7461476.952047119],[793110.6053765863,7461324.077990569],[792957.7313200384,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136259/82264","x":136259,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7461171.203934021],[792804.8572634906,7461324.077990569],[792957.7313200384,7461324.077990569],[792957.7313200384,7461171.203934021],[792804.8572634906,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136258/82265","x":136258,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7461171.203934021],[792957.7313200384,7461324.077990569],[793110.6053765863,7461324.077990569],[793110.6053765863,7461171.203934021],[792957.7313200384,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136259/82265","x":136259,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7461018.329877472],[792499.1091503911,7461171.203934021],[792651.983206939,7461171.203934021],[792651.983206939,7461018.329877472],[792499.1091503911,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136256/82266","x":136256,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7461018.329877472],[792651.983206939,7461171.203934021],[792804.8572634906,7461171.203934021],[792804.8572634906,7461018.329877472],[792651.983206939,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136257/82266","x":136257,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7460865.455820924],[792499.1091503911,7461018.329877472],[792651.983206939,7461018.329877472],[792651.983206939,7460865.455820924],[792499.1091503911,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136256/82267","x":136256,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7460865.455820924],[792651.983206939,7461018.329877472],[792804.8572634906,7461018.329877472],[792804.8572634906,7460865.455820924],[792651.983206939,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136257/82267","x":136257,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7461018.329877472],[792804.8572634906,7461171.203934021],[792957.7313200384,7461171.203934021],[792957.7313200384,7461018.329877472],[792804.8572634906,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136258/82266","x":136258,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7461018.329877472],[792957.7313200384,7461171.203934021],[793110.6053765863,7461171.203934021],[793110.6053765863,7461018.329877472],[792957.7313200384,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136259/82266","x":136259,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7460865.455820924],[792804.8572634906,7461018.329877472],[792957.7313200384,7461018.329877472],[792957.7313200384,7460865.455820924],[792804.8572634906,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136258/82267","x":136258,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7460865.455820924],[792957.7313200384,7461018.329877472],[793110.6053765863,7461018.329877472],[793110.6053765863,7460865.455820924],[792957.7313200384,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136259/82267","x":136259,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7461324.077990569],[793110.6053765863,7461476.952047119],[793263.4794331342,7461476.952047119],[793263.4794331342,7461324.077990569],[793110.6053765863,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136260/82264","x":136260,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7461324.077990569],[793263.4794331342,7461476.952047119],[793416.3534896858,7461476.952047119],[793416.3534896858,7461324.077990569],[793263.4794331342,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136261/82264","x":136261,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7461171.203934021],[793110.6053765863,7461324.077990569],[793263.4794331342,7461324.077990569],[793263.4794331342,7461171.203934021],[793110.6053765863,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136260/82265","x":136260,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7461171.203934021],[793263.4794331342,7461324.077990569],[793416.3534896858,7461324.077990569],[793416.3534896858,7461171.203934021],[793263.4794331342,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136261/82265","x":136261,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7461324.077990569],[793416.3534896858,7461476.952047119],[793569.2275462337,7461476.952047119],[793569.2275462337,7461324.077990569],[793416.3534896858,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136262/82264","x":136262,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7461324.077990569],[793569.2275462337,7461476.952047119],[793722.1016027816,7461476.952047119],[793722.1016027816,7461324.077990569],[793569.2275462337,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136263/82264","x":136263,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7461171.203934021],[793416.3534896858,7461324.077990569],[793569.2275462337,7461324.077990569],[793569.2275462337,7461171.203934021],[793416.3534896858,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136262/82265","x":136262,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7461171.203934021],[793569.2275462337,7461324.077990569],[793722.1016027816,7461324.077990569],[793722.1016027816,7461171.203934021],[793569.2275462337,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136263/82265","x":136263,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7461018.329877472],[793110.6053765863,7461171.203934021],[793263.4794331342,7461171.203934021],[793263.4794331342,7461018.329877472],[793110.6053765863,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136260/82266","x":136260,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7461018.329877472],[793263.4794331342,7461171.203934021],[793416.3534896858,7461171.203934021],[793416.3534896858,7461018.329877472],[793263.4794331342,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136261/82266","x":136261,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7460865.455820924],[793110.6053765863,7461018.329877472],[793263.4794331342,7461018.329877472],[793263.4794331342,7460865.455820924],[793110.6053765863,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136260/82267","x":136260,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7460865.455820924],[793263.4794331342,7461018.329877472],[793416.3534896858,7461018.329877472],[793416.3534896858,7460865.455820924],[793263.4794331342,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136261/82267","x":136261,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7461018.329877472],[793416.3534896858,7461171.203934021],[793569.2275462337,7461171.203934021],[793569.2275462337,7461018.329877472],[793416.3534896858,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136262/82266","x":136262,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7461018.329877472],[793569.2275462337,7461171.203934021],[793722.1016027816,7461171.203934021],[793722.1016027816,7461018.329877472],[793569.2275462337,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136263/82266","x":136263,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7460865.455820924],[793416.3534896858,7461018.329877472],[793569.2275462337,7461018.329877472],[793569.2275462337,7460865.455820924],[793416.3534896858,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136262/82267","x":136262,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7460865.455820924],[793569.2275462337,7461018.329877472],[793722.1016027816,7461018.329877472],[793722.1016027816,7460865.455820924],[793569.2275462337,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136263/82267","x":136263,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7460712.581764374],[792499.1091503911,7460865.455820924],[792651.983206939,7460865.455820924],[792651.983206939,7460712.581764374],[792499.1091503911,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136256/82268","x":136256,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7460712.581764374],[792651.983206939,7460865.455820924],[792804.8572634906,7460865.455820924],[792804.8572634906,7460712.581764374],[792651.983206939,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136257/82268","x":136257,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7460559.707707824],[792499.1091503911,7460712.581764374],[792651.983206939,7460712.581764374],[792651.983206939,7460559.707707824],[792499.1091503911,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136256/82269","x":136256,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7460559.707707824],[792651.983206939,7460712.581764374],[792804.8572634906,7460712.581764374],[792804.8572634906,7460559.707707824],[792651.983206939,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136257/82269","x":136257,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7460712.581764374],[792804.8572634906,7460865.455820924],[792957.7313200384,7460865.455820924],[792957.7313200384,7460712.581764374],[792804.8572634906,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136258/82268","x":136258,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7460712.581764374],[792957.7313200384,7460865.455820924],[793110.6053765863,7460865.455820924],[793110.6053765863,7460712.581764374],[792957.7313200384,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136259/82268","x":136259,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7460559.707707824],[792804.8572634906,7460712.581764374],[792957.7313200384,7460712.581764374],[792957.7313200384,7460559.707707824],[792804.8572634906,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136258/82269","x":136258,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7460559.707707824],[792957.7313200384,7460712.581764374],[793110.6053765863,7460712.581764374],[793110.6053765863,7460559.707707824],[792957.7313200384,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136259/82269","x":136259,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7460406.833651276],[792499.1091503911,7460559.707707824],[792651.983206939,7460559.707707824],[792651.983206939,7460406.833651276],[792499.1091503911,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136256/82270","x":136256,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7460406.833651276],[792651.983206939,7460559.707707824],[792804.8572634906,7460559.707707824],[792804.8572634906,7460406.833651276],[792651.983206939,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136257/82270","x":136257,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7460253.959594727],[792499.1091503911,7460406.833651276],[792651.983206939,7460406.833651276],[792651.983206939,7460253.959594727],[792499.1091503911,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136256/82271","x":136256,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7460253.959594727],[792651.983206939,7460406.833651276],[792804.8572634906,7460406.833651276],[792804.8572634906,7460253.959594727],[792651.983206939,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136257/82271","x":136257,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7460406.833651276],[792804.8572634906,7460559.707707824],[792957.7313200384,7460559.707707824],[792957.7313200384,7460406.833651276],[792804.8572634906,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136258/82270","x":136258,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7460406.833651276],[792957.7313200384,7460559.707707824],[793110.6053765863,7460559.707707824],[793110.6053765863,7460406.833651276],[792957.7313200384,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136259/82270","x":136259,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7460253.959594727],[792804.8572634906,7460406.833651276],[792957.7313200384,7460406.833651276],[792957.7313200384,7460253.959594727],[792804.8572634906,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136258/82271","x":136258,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7460253.959594727],[792957.7313200384,7460406.833651276],[793110.6053765863,7460406.833651276],[793110.6053765863,7460253.959594727],[792957.7313200384,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136259/82271","x":136259,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7460712.581764374],[793110.6053765863,7460865.455820924],[793263.4794331342,7460865.455820924],[793263.4794331342,7460712.581764374],[793110.6053765863,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136260/82268","x":136260,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7460712.581764374],[793263.4794331342,7460865.455820924],[793416.3534896858,7460865.455820924],[793416.3534896858,7460712.581764374],[793263.4794331342,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136261/82268","x":136261,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7460559.707707824],[793110.6053765863,7460712.581764374],[793263.4794331342,7460712.581764374],[793263.4794331342,7460559.707707824],[793110.6053765863,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136260/82269","x":136260,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7460559.707707824],[793263.4794331342,7460712.581764374],[793416.3534896858,7460712.581764374],[793416.3534896858,7460559.707707824],[793263.4794331342,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136261/82269","x":136261,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7460712.581764374],[793416.3534896858,7460865.455820924],[793569.2275462337,7460865.455820924],[793569.2275462337,7460712.581764374],[793416.3534896858,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136262/82268","x":136262,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7460712.581764374],[793569.2275462337,7460865.455820924],[793722.1016027816,7460865.455820924],[793722.1016027816,7460712.581764374],[793569.2275462337,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136263/82268","x":136263,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7460559.707707824],[793416.3534896858,7460712.581764374],[793569.2275462337,7460712.581764374],[793569.2275462337,7460559.707707824],[793416.3534896858,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136262/82269","x":136262,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7460559.707707824],[793569.2275462337,7460712.581764374],[793722.1016027816,7460712.581764374],[793722.1016027816,7460559.707707824],[793569.2275462337,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136263/82269","x":136263,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7460406.833651276],[793110.6053765863,7460559.707707824],[793263.4794331342,7460559.707707824],[793263.4794331342,7460406.833651276],[793110.6053765863,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136260/82270","x":136260,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7460406.833651276],[793263.4794331342,7460559.707707824],[793416.3534896858,7460559.707707824],[793416.3534896858,7460406.833651276],[793263.4794331342,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136261/82270","x":136261,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7460253.959594727],[793110.6053765863,7460406.833651276],[793263.4794331342,7460406.833651276],[793263.4794331342,7460253.959594727],[793110.6053765863,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136260/82271","x":136260,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7460253.959594727],[793263.4794331342,7460406.833651276],[793416.3534896858,7460406.833651276],[793416.3534896858,7460253.959594727],[793263.4794331342,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136261/82271","x":136261,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7460406.833651276],[793416.3534896858,7460559.707707824],[793569.2275462337,7460559.707707824],[793569.2275462337,7460406.833651276],[793416.3534896858,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136262/82270","x":136262,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7460406.833651276],[793569.2275462337,7460559.707707824],[793722.1016027816,7460559.707707824],[793722.1016027816,7460406.833651276],[793569.2275462337,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136263/82270","x":136263,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7460253.959594727],[793416.3534896858,7460406.833651276],[793569.2275462337,7460406.833651276],[793569.2275462337,7460253.959594727],[793416.3534896858,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136262/82271","x":136262,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7461324.077990569],[793722.1016027816,7461476.952047119],[793874.9756593332,7461476.952047119],[793874.9756593332,7461324.077990569],[793722.1016027816,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136264/82264","x":136264,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7461324.077990569],[793874.9756593332,7461476.952047119],[794027.849715881,7461476.952047119],[794027.849715881,7461324.077990569],[793874.9756593332,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136265/82264","x":136265,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7461171.203934021],[793722.1016027816,7461324.077990569],[793874.9756593332,7461324.077990569],[793874.9756593332,7461171.203934021],[793722.1016027816,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136264/82265","x":136264,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7461171.203934021],[793874.9756593332,7461324.077990569],[794027.849715881,7461324.077990569],[794027.849715881,7461171.203934021],[793874.9756593332,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136265/82265","x":136265,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7461324.077990569],[794027.849715881,7461476.952047119],[794180.7237724289,7461476.952047119],[794180.7237724289,7461324.077990569],[794027.849715881,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136266/82264","x":136266,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7461324.077990569],[794180.7237724289,7461476.952047119],[794333.5978289805,7461476.952047119],[794333.5978289805,7461324.077990569],[794180.7237724289,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136267/82264","x":136267,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7461171.203934021],[794027.849715881,7461324.077990569],[794180.7237724289,7461324.077990569],[794180.7237724289,7461171.203934021],[794027.849715881,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136266/82265","x":136266,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7461171.203934021],[794180.7237724289,7461324.077990569],[794333.5978289805,7461324.077990569],[794333.5978289805,7461171.203934021],[794180.7237724289,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136267/82265","x":136267,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7461018.329877472],[793722.1016027816,7461171.203934021],[793874.9756593332,7461171.203934021],[793874.9756593332,7461018.329877472],[793722.1016027816,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136264/82266","x":136264,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7461018.329877472],[793874.9756593332,7461171.203934021],[794027.849715881,7461171.203934021],[794027.849715881,7461018.329877472],[793874.9756593332,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136265/82266","x":136265,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7460865.455820924],[793722.1016027816,7461018.329877472],[793874.9756593332,7461018.329877472],[793874.9756593332,7460865.455820924],[793722.1016027816,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136264/82267","x":136264,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7460865.455820924],[793874.9756593332,7461018.329877472],[794027.849715881,7461018.329877472],[794027.849715881,7460865.455820924],[793874.9756593332,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136265/82267","x":136265,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7461018.329877472],[794027.849715881,7461171.203934021],[794180.7237724289,7461171.203934021],[794180.7237724289,7461018.329877472],[794027.849715881,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136266/82266","x":136266,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7461018.329877472],[794180.7237724289,7461171.203934021],[794333.5978289805,7461171.203934021],[794333.5978289805,7461018.329877472],[794180.7237724289,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136267/82266","x":136267,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7460865.455820924],[794027.849715881,7461018.329877472],[794180.7237724289,7461018.329877472],[794180.7237724289,7460865.455820924],[794027.849715881,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136266/82267","x":136266,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7460865.455820924],[794180.7237724289,7461018.329877472],[794333.5978289805,7461018.329877472],[794333.5978289805,7460865.455820924],[794180.7237724289,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136267/82267","x":136267,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7461324.077990569],[794333.5978289805,7461476.952047119],[794486.4718855284,7461476.952047119],[794486.4718855284,7461324.077990569],[794333.5978289805,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136268/82264","x":136268,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7461324.077990569],[794486.4718855284,7461476.952047119],[794639.3459420763,7461476.952047119],[794639.3459420763,7461324.077990569],[794486.4718855284,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136269/82264","x":136269,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7461171.203934021],[794333.5978289805,7461324.077990569],[794486.4718855284,7461324.077990569],[794486.4718855284,7461171.203934021],[794333.5978289805,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136268/82265","x":136268,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7461171.203934021],[794486.4718855284,7461324.077990569],[794639.3459420763,7461324.077990569],[794639.3459420763,7461171.203934021],[794486.4718855284,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136269/82265","x":136269,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7461324.077990569],[794639.3459420763,7461476.952047119],[794792.2199986279,7461476.952047119],[794792.2199986279,7461324.077990569],[794639.3459420763,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136270/82264","x":136270,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7461324.077990569],[794792.2199986279,7461476.952047119],[794945.0940551758,7461476.952047119],[794945.0940551758,7461324.077990569],[794792.2199986279,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136271/82264","x":136271,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7461171.203934021],[794639.3459420763,7461324.077990569],[794792.2199986279,7461324.077990569],[794792.2199986279,7461171.203934021],[794639.3459420763,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136270/82265","x":136270,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7461171.203934021],[794792.2199986279,7461324.077990569],[794945.0940551758,7461324.077990569],[794945.0940551758,7461171.203934021],[794792.2199986279,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136271/82265","x":136271,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7461018.329877472],[794333.5978289805,7461171.203934021],[794486.4718855284,7461171.203934021],[794486.4718855284,7461018.329877472],[794333.5978289805,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136268/82266","x":136268,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7461018.329877472],[794486.4718855284,7461171.203934021],[794639.3459420763,7461171.203934021],[794639.3459420763,7461018.329877472],[794486.4718855284,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136269/82266","x":136269,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7460865.455820924],[794333.5978289805,7461018.329877472],[794486.4718855284,7461018.329877472],[794486.4718855284,7460865.455820924],[794333.5978289805,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136268/82267","x":136268,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7460865.455820924],[794486.4718855284,7461018.329877472],[794639.3459420763,7461018.329877472],[794639.3459420763,7460865.455820924],[794486.4718855284,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136269/82267","x":136269,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7461018.329877472],[794639.3459420763,7461171.203934021],[794792.2199986279,7461171.203934021],[794792.2199986279,7461018.329877472],[794639.3459420763,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136270/82266","x":136270,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7461018.329877472],[794792.2199986279,7461171.203934021],[794945.0940551758,7461171.203934021],[794945.0940551758,7461018.329877472],[794792.2199986279,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136271/82266","x":136271,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7460865.455820924],[794639.3459420763,7461018.329877472],[794792.2199986279,7461018.329877472],[794792.2199986279,7460865.455820924],[794639.3459420763,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136270/82267","x":136270,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7460865.455820924],[794792.2199986279,7461018.329877472],[794945.0940551758,7461018.329877472],[794945.0940551758,7460865.455820924],[794792.2199986279,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136271/82267","x":136271,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7460712.581764374],[793722.1016027816,7460865.455820924],[793874.9756593332,7460865.455820924],[793874.9756593332,7460712.581764374],[793722.1016027816,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136264/82268","x":136264,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7460712.581764374],[793874.9756593332,7460865.455820924],[794027.849715881,7460865.455820924],[794027.849715881,7460712.581764374],[793874.9756593332,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136265/82268","x":136265,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7460559.707707824],[793722.1016027816,7460712.581764374],[793874.9756593332,7460712.581764374],[793874.9756593332,7460559.707707824],[793722.1016027816,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136264/82269","x":136264,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7460712.581764374],[794027.849715881,7460865.455820924],[794180.7237724289,7460865.455820924],[794180.7237724289,7460712.581764374],[794027.849715881,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136266/82268","x":136266,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7460712.581764374],[794180.7237724289,7460865.455820924],[794333.5978289805,7460865.455820924],[794333.5978289805,7460712.581764374],[794180.7237724289,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136267/82268","x":136267,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7460406.833651276],[793722.1016027816,7460559.707707824],[793874.9756593332,7460559.707707824],[793874.9756593332,7460406.833651276],[793722.1016027816,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136264/82270","x":136264,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7460712.581764374],[794333.5978289805,7460865.455820924],[794486.4718855284,7460865.455820924],[794486.4718855284,7460712.581764374],[794333.5978289805,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136268/82268","x":136268,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7460712.581764374],[794486.4718855284,7460865.455820924],[794639.3459420763,7460865.455820924],[794639.3459420763,7460712.581764374],[794486.4718855284,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136269/82268","x":136269,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7460712.581764374],[794639.3459420763,7460865.455820924],[794792.2199986279,7460865.455820924],[794792.2199986279,7460712.581764374],[794639.3459420763,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136270/82268","x":136270,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7460712.581764374],[794792.2199986279,7460865.455820924],[794945.0940551758,7460865.455820924],[794945.0940551758,7460712.581764374],[794792.2199986279,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136271/82268","x":136271,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7461324.077990569],[794945.0940551758,7461476.952047119],[795097.9681117237,7461476.952047119],[795097.9681117237,7461324.077990569],[794945.0940551758,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136272/82264","x":136272,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7461324.077990569],[795097.9681117237,7461476.952047119],[795250.8421682753,7461476.952047119],[795250.8421682753,7461324.077990569],[795097.9681117237,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136273/82264","x":136273,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7461171.203934021],[794945.0940551758,7461324.077990569],[795097.9681117237,7461324.077990569],[795097.9681117237,7461171.203934021],[794945.0940551758,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136272/82265","x":136272,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7461171.203934021],[795097.9681117237,7461324.077990569],[795250.8421682753,7461324.077990569],[795250.8421682753,7461171.203934021],[795097.9681117237,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136273/82265","x":136273,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7461324.077990569],[795250.8421682753,7461476.952047119],[795403.7162248231,7461476.952047119],[795403.7162248231,7461324.077990569],[795250.8421682753,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136274/82264","x":136274,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7461324.077990569],[795403.7162248231,7461476.952047119],[795556.590281371,7461476.952047119],[795556.590281371,7461324.077990569],[795403.7162248231,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136275/82264","x":136275,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7461171.203934021],[795250.8421682753,7461324.077990569],[795403.7162248231,7461324.077990569],[795403.7162248231,7461171.203934021],[795250.8421682753,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136274/82265","x":136274,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7461171.203934021],[795403.7162248231,7461324.077990569],[795556.590281371,7461324.077990569],[795556.590281371,7461171.203934021],[795403.7162248231,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136275/82265","x":136275,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7461018.329877472],[794945.0940551758,7461171.203934021],[795097.9681117237,7461171.203934021],[795097.9681117237,7461018.329877472],[794945.0940551758,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136272/82266","x":136272,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7461018.329877472],[795097.9681117237,7461171.203934021],[795250.8421682753,7461171.203934021],[795250.8421682753,7461018.329877472],[795097.9681117237,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136273/82266","x":136273,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7460865.455820924],[794945.0940551758,7461018.329877472],[795097.9681117237,7461018.329877472],[795097.9681117237,7460865.455820924],[794945.0940551758,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136272/82267","x":136272,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7460865.455820924],[795097.9681117237,7461018.329877472],[795250.8421682753,7461018.329877472],[795250.8421682753,7460865.455820924],[795097.9681117237,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136273/82267","x":136273,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7461018.329877472],[795250.8421682753,7461171.203934021],[795403.7162248231,7461171.203934021],[795403.7162248231,7461018.329877472],[795250.8421682753,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136274/82266","x":136274,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7461018.329877472],[795403.7162248231,7461171.203934021],[795556.590281371,7461171.203934021],[795556.590281371,7461018.329877472],[795403.7162248231,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136275/82266","x":136275,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7460865.455820924],[795250.8421682753,7461018.329877472],[795403.7162248231,7461018.329877472],[795403.7162248231,7460865.455820924],[795250.8421682753,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136274/82267","x":136274,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7460865.455820924],[795403.7162248231,7461018.329877472],[795556.590281371,7461018.329877472],[795556.590281371,7460865.455820924],[795403.7162248231,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136275/82267","x":136275,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7461324.077990569],[795556.590281371,7461476.952047119],[795709.4643379226,7461476.952047119],[795709.4643379226,7461324.077990569],[795556.590281371,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136276/82264","x":136276,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7461324.077990569],[795709.4643379226,7461476.952047119],[795862.3383944705,7461476.952047119],[795862.3383944705,7461324.077990569],[795709.4643379226,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136277/82264","x":136277,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7461171.203934021],[795556.590281371,7461324.077990569],[795709.4643379226,7461324.077990569],[795709.4643379226,7461171.203934021],[795556.590281371,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136276/82265","x":136276,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7461171.203934021],[795709.4643379226,7461324.077990569],[795862.3383944705,7461324.077990569],[795862.3383944705,7461171.203934021],[795709.4643379226,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136277/82265","x":136277,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7461324.077990569],[795862.3383944705,7461476.952047119],[796015.2124510184,7461476.952047119],[796015.2124510184,7461324.077990569],[795862.3383944705,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136278/82264","x":136278,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7461324.077990569],[796015.2124510184,7461476.952047119],[796168.08650757,7461476.952047119],[796168.08650757,7461324.077990569],[796015.2124510184,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136279/82264","x":136279,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7461171.203934021],[795862.3383944705,7461324.077990569],[796015.2124510184,7461324.077990569],[796015.2124510184,7461171.203934021],[795862.3383944705,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136278/82265","x":136278,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7461171.203934021],[796015.2124510184,7461324.077990569],[796168.08650757,7461324.077990569],[796168.08650757,7461171.203934021],[796015.2124510184,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136279/82265","x":136279,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7461018.329877472],[795556.590281371,7461171.203934021],[795709.4643379226,7461171.203934021],[795709.4643379226,7461018.329877472],[795556.590281371,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136276/82266","x":136276,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7461018.329877472],[795709.4643379226,7461171.203934021],[795862.3383944705,7461171.203934021],[795862.3383944705,7461018.329877472],[795709.4643379226,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136277/82266","x":136277,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7460865.455820924],[795556.590281371,7461018.329877472],[795709.4643379226,7461018.329877472],[795709.4643379226,7460865.455820924],[795556.590281371,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136276/82267","x":136276,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7460865.455820924],[795709.4643379226,7461018.329877472],[795862.3383944705,7461018.329877472],[795862.3383944705,7460865.455820924],[795709.4643379226,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136277/82267","x":136277,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7461018.329877472],[795862.3383944705,7461171.203934021],[796015.2124510184,7461171.203934021],[796015.2124510184,7461018.329877472],[795862.3383944705,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136278/82266","x":136278,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7461018.329877472],[796015.2124510184,7461171.203934021],[796168.08650757,7461171.203934021],[796168.08650757,7461018.329877472],[796015.2124510184,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136279/82266","x":136279,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7460865.455820924],[795862.3383944705,7461018.329877472],[796015.2124510184,7461018.329877472],[796015.2124510184,7460865.455820924],[795862.3383944705,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136278/82267","x":136278,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7460865.455820924],[796015.2124510184,7461018.329877472],[796168.08650757,7461018.329877472],[796168.08650757,7460865.455820924],[796015.2124510184,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136279/82267","x":136279,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7460712.581764374],[794945.0940551758,7460865.455820924],[795097.9681117237,7460865.455820924],[795097.9681117237,7460712.581764374],[794945.0940551758,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136272/82268","x":136272,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7460712.581764374],[795097.9681117237,7460865.455820924],[795250.8421682753,7460865.455820924],[795250.8421682753,7460712.581764374],[795097.9681117237,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136273/82268","x":136273,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7460712.581764374],[795250.8421682753,7460865.455820924],[795403.7162248231,7460865.455820924],[795403.7162248231,7460712.581764374],[795250.8421682753,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136274/82268","x":136274,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7460712.581764374],[795403.7162248231,7460865.455820924],[795556.590281371,7460865.455820924],[795556.590281371,7460712.581764374],[795403.7162248231,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136275/82268","x":136275,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7460712.581764374],[795556.590281371,7460865.455820924],[795709.4643379226,7460865.455820924],[795709.4643379226,7460712.581764374],[795556.590281371,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136276/82268","x":136276,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7460712.581764374],[795709.4643379226,7460865.455820924],[795862.3383944705,7460865.455820924],[795862.3383944705,7460712.581764374],[795709.4643379226,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136277/82268","x":136277,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7460712.581764374],[795862.3383944705,7460865.455820924],[796015.2124510184,7460865.455820924],[796015.2124510184,7460712.581764374],[795862.3383944705,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136278/82268","x":136278,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7460712.581764374],[796015.2124510184,7460865.455820924],[796168.08650757,7460865.455820924],[796168.08650757,7460712.581764374],[796015.2124510184,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136279/82268","x":136279,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7461324.077990569],[796168.08650757,7461476.952047119],[796320.9605641179,7461476.952047119],[796320.9605641179,7461324.077990569],[796168.08650757,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136280/82264","x":136280,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7461324.077990569],[796320.9605641179,7461476.952047119],[796473.8346206658,7461476.952047119],[796473.8346206658,7461324.077990569],[796320.9605641179,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136281/82264","x":136281,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7461171.203934021],[796168.08650757,7461324.077990569],[796320.9605641179,7461324.077990569],[796320.9605641179,7461171.203934021],[796168.08650757,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136280/82265","x":136280,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7461171.203934021],[796320.9605641179,7461324.077990569],[796473.8346206658,7461324.077990569],[796473.8346206658,7461171.203934021],[796320.9605641179,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136281/82265","x":136281,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7461324.077990569],[796473.8346206658,7461476.952047119],[796626.7086772174,7461476.952047119],[796626.7086772174,7461324.077990569],[796473.8346206658,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136282/82264","x":136282,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7461324.077990569],[796626.7086772174,7461476.952047119],[796779.5827337652,7461476.952047119],[796779.5827337652,7461324.077990569],[796626.7086772174,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136283/82264","x":136283,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7461171.203934021],[796473.8346206658,7461324.077990569],[796626.7086772174,7461324.077990569],[796626.7086772174,7461171.203934021],[796473.8346206658,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136282/82265","x":136282,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7461171.203934021],[796626.7086772174,7461324.077990569],[796779.5827337652,7461324.077990569],[796779.5827337652,7461171.203934021],[796626.7086772174,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136283/82265","x":136283,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7461018.329877472],[796168.08650757,7461171.203934021],[796320.9605641179,7461171.203934021],[796320.9605641179,7461018.329877472],[796168.08650757,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136280/82266","x":136280,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7461018.329877472],[796320.9605641179,7461171.203934021],[796473.8346206658,7461171.203934021],[796473.8346206658,7461018.329877472],[796320.9605641179,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136281/82266","x":136281,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7460865.455820924],[796168.08650757,7461018.329877472],[796320.9605641179,7461018.329877472],[796320.9605641179,7460865.455820924],[796168.08650757,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136280/82267","x":136280,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7460865.455820924],[796320.9605641179,7461018.329877472],[796473.8346206658,7461018.329877472],[796473.8346206658,7460865.455820924],[796320.9605641179,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136281/82267","x":136281,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7461018.329877472],[796473.8346206658,7461171.203934021],[796626.7086772174,7461171.203934021],[796626.7086772174,7461018.329877472],[796473.8346206658,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136282/82266","x":136282,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7461018.329877472],[796626.7086772174,7461171.203934021],[796779.5827337652,7461171.203934021],[796779.5827337652,7461018.329877472],[796626.7086772174,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136283/82266","x":136283,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7460865.455820924],[796473.8346206658,7461018.329877472],[796626.7086772174,7461018.329877472],[796626.7086772174,7460865.455820924],[796473.8346206658,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136282/82267","x":136282,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7460865.455820924],[796626.7086772174,7461018.329877472],[796779.5827337652,7461018.329877472],[796779.5827337652,7460865.455820924],[796626.7086772174,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136283/82267","x":136283,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7461324.077990569],[796779.5827337652,7461476.952047119],[796932.4567903131,7461476.952047119],[796932.4567903131,7461324.077990569],[796779.5827337652,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136284/82264","x":136284,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7461324.077990569],[796932.4567903131,7461476.952047119],[797085.330846861,7461476.952047119],[797085.330846861,7461324.077990569],[796932.4567903131,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136285/82264","x":136285,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7461171.203934021],[796779.5827337652,7461324.077990569],[796932.4567903131,7461324.077990569],[796932.4567903131,7461171.203934021],[796779.5827337652,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136284/82265","x":136284,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7461171.203934021],[796932.4567903131,7461324.077990569],[797085.330846861,7461324.077990569],[797085.330846861,7461171.203934021],[796932.4567903131,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136285/82265","x":136285,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7461324.077990569],[797085.330846861,7461476.952047119],[797238.2049034126,7461476.952047119],[797238.2049034126,7461324.077990569],[797085.330846861,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136286/82264","x":136286,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7461324.077990569],[797238.2049034126,7461476.952047119],[797391.0789599605,7461476.952047119],[797391.0789599605,7461324.077990569],[797238.2049034126,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136287/82264","x":136287,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7461171.203934021],[797085.330846861,7461324.077990569],[797238.2049034126,7461324.077990569],[797238.2049034126,7461171.203934021],[797085.330846861,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136286/82265","x":136286,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7461171.203934021],[797238.2049034126,7461324.077990569],[797391.0789599605,7461324.077990569],[797391.0789599605,7461171.203934021],[797238.2049034126,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136287/82265","x":136287,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7461018.329877472],[796779.5827337652,7461171.203934021],[796932.4567903131,7461171.203934021],[796932.4567903131,7461018.329877472],[796779.5827337652,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136284/82266","x":136284,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7461018.329877472],[796932.4567903131,7461171.203934021],[797085.330846861,7461171.203934021],[797085.330846861,7461018.329877472],[796932.4567903131,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136285/82266","x":136285,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7460865.455820924],[796779.5827337652,7461018.329877472],[796932.4567903131,7461018.329877472],[796932.4567903131,7460865.455820924],[796779.5827337652,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136284/82267","x":136284,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7460865.455820924],[796932.4567903131,7461018.329877472],[797085.330846861,7461018.329877472],[797085.330846861,7460865.455820924],[796932.4567903131,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136285/82267","x":136285,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7461018.329877472],[797085.330846861,7461171.203934021],[797238.2049034126,7461171.203934021],[797238.2049034126,7461018.329877472],[797085.330846861,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136286/82266","x":136286,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7461018.329877472],[797238.2049034126,7461171.203934021],[797391.0789599605,7461171.203934021],[797391.0789599605,7461018.329877472],[797238.2049034126,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136287/82266","x":136287,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7460865.455820924],[797085.330846861,7461018.329877472],[797238.2049034126,7461018.329877472],[797238.2049034126,7460865.455820924],[797085.330846861,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136286/82267","x":136286,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7460865.455820924],[797238.2049034126,7461018.329877472],[797391.0789599605,7461018.329877472],[797391.0789599605,7460865.455820924],[797238.2049034126,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136287/82267","x":136287,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7460712.581764374],[796168.08650757,7460865.455820924],[796320.9605641179,7460865.455820924],[796320.9605641179,7460712.581764374],[796168.08650757,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136280/82268","x":136280,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7460712.581764374],[796320.9605641179,7460865.455820924],[796473.8346206658,7460865.455820924],[796473.8346206658,7460712.581764374],[796320.9605641179,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136281/82268","x":136281,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7460712.581764374],[796473.8346206658,7460865.455820924],[796626.7086772174,7460865.455820924],[796626.7086772174,7460712.581764374],[796473.8346206658,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136282/82268","x":136282,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7460712.581764374],[796626.7086772174,7460865.455820924],[796779.5827337652,7460865.455820924],[796779.5827337652,7460712.581764374],[796626.7086772174,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136283/82268","x":136283,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7460712.581764374],[796779.5827337652,7460865.455820924],[796932.4567903131,7460865.455820924],[796932.4567903131,7460712.581764374],[796779.5827337652,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136284/82268","x":136284,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7460712.581764374],[796932.4567903131,7460865.455820924],[797085.330846861,7460865.455820924],[797085.330846861,7460712.581764374],[796932.4567903131,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136285/82268","x":136285,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7460712.581764374],[797085.330846861,7460865.455820924],[797238.2049034126,7460865.455820924],[797238.2049034126,7460712.581764374],[797085.330846861,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136286/82268","x":136286,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7460712.581764374],[797238.2049034126,7460865.455820924],[797391.0789599605,7460865.455820924],[797391.0789599605,7460712.581764374],[797238.2049034126,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136287/82268","x":136287,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7460559.707707824],[797238.2049034126,7460712.581764374],[797391.0789599605,7460712.581764374],[797391.0789599605,7460559.707707824],[797238.2049034126,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136287/82269","x":136287,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7461324.077990569],[797391.0789599605,7461476.952047119],[797543.9530165084,7461476.952047119],[797543.9530165084,7461324.077990569],[797391.0789599605,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136288/82264","x":136288,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7461324.077990569],[797543.9530165084,7461476.952047119],[797696.82707306,7461476.952047119],[797696.82707306,7461324.077990569],[797543.9530165084,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136289/82264","x":136289,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7461171.203934021],[797391.0789599605,7461324.077990569],[797543.9530165084,7461324.077990569],[797543.9530165084,7461171.203934021],[797391.0789599605,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136288/82265","x":136288,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7461171.203934021],[797543.9530165084,7461324.077990569],[797696.82707306,7461324.077990569],[797696.82707306,7461171.203934021],[797543.9530165084,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136289/82265","x":136289,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7461324.077990569],[797696.82707306,7461476.952047119],[797849.7011296079,7461476.952047119],[797849.7011296079,7461324.077990569],[797696.82707306,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136290/82264","x":136290,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7461324.077990569],[797849.7011296079,7461476.952047119],[798002.5751861557,7461476.952047119],[798002.5751861557,7461324.077990569],[797849.7011296079,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136291/82264","x":136291,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7461171.203934021],[797696.82707306,7461324.077990569],[797849.7011296079,7461324.077990569],[797849.7011296079,7461171.203934021],[797696.82707306,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136290/82265","x":136290,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7461171.203934021],[797849.7011296079,7461324.077990569],[798002.5751861557,7461324.077990569],[798002.5751861557,7461171.203934021],[797849.7011296079,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136291/82265","x":136291,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7461018.329877472],[797391.0789599605,7461171.203934021],[797543.9530165084,7461171.203934021],[797543.9530165084,7461018.329877472],[797391.0789599605,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136288/82266","x":136288,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7461018.329877472],[797543.9530165084,7461171.203934021],[797696.82707306,7461171.203934021],[797696.82707306,7461018.329877472],[797543.9530165084,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136289/82266","x":136289,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7460865.455820924],[797391.0789599605,7461018.329877472],[797543.9530165084,7461018.329877472],[797543.9530165084,7460865.455820924],[797391.0789599605,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136288/82267","x":136288,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7460865.455820924],[797543.9530165084,7461018.329877472],[797696.82707306,7461018.329877472],[797696.82707306,7460865.455820924],[797543.9530165084,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136289/82267","x":136289,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7461018.329877472],[797696.82707306,7461171.203934021],[797849.7011296079,7461171.203934021],[797849.7011296079,7461018.329877472],[797696.82707306,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136290/82266","x":136290,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7461018.329877472],[797849.7011296079,7461171.203934021],[798002.5751861557,7461171.203934021],[798002.5751861557,7461018.329877472],[797849.7011296079,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136291/82266","x":136291,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7460865.455820924],[797696.82707306,7461018.329877472],[797849.7011296079,7461018.329877472],[797849.7011296079,7460865.455820924],[797696.82707306,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136290/82267","x":136290,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7460865.455820924],[797849.7011296079,7461018.329877472],[798002.5751861557,7461018.329877472],[798002.5751861557,7460865.455820924],[797849.7011296079,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136291/82267","x":136291,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7461324.077990569],[798002.5751861557,7461476.952047119],[798155.4492427073,7461476.952047119],[798155.4492427073,7461324.077990569],[798002.5751861557,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136292/82264","x":136292,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7461324.077990569],[798155.4492427073,7461476.952047119],[798308.3232992552,7461476.952047119],[798308.3232992552,7461324.077990569],[798155.4492427073,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136293/82264","x":136293,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7461171.203934021],[798002.5751861557,7461324.077990569],[798155.4492427073,7461324.077990569],[798155.4492427073,7461171.203934021],[798002.5751861557,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136292/82265","x":136292,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7461171.203934021],[798155.4492427073,7461324.077990569],[798308.3232992552,7461324.077990569],[798308.3232992552,7461171.203934021],[798155.4492427073,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136293/82265","x":136293,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7461324.077990569],[798308.3232992552,7461476.952047119],[798461.1973558031,7461476.952047119],[798461.1973558031,7461324.077990569],[798308.3232992552,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136294/82264","x":136294,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7461324.077990569],[798461.1973558031,7461476.952047119],[798614.0714123547,7461476.952047119],[798614.0714123547,7461324.077990569],[798461.1973558031,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136295/82264","x":136295,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7461171.203934021],[798308.3232992552,7461324.077990569],[798461.1973558031,7461324.077990569],[798461.1973558031,7461171.203934021],[798308.3232992552,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136294/82265","x":136294,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7461171.203934021],[798461.1973558031,7461324.077990569],[798614.0714123547,7461324.077990569],[798614.0714123547,7461171.203934021],[798461.1973558031,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136295/82265","x":136295,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7461018.329877472],[798002.5751861557,7461171.203934021],[798155.4492427073,7461171.203934021],[798155.4492427073,7461018.329877472],[798002.5751861557,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136292/82266","x":136292,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7461018.329877472],[798155.4492427073,7461171.203934021],[798308.3232992552,7461171.203934021],[798308.3232992552,7461018.329877472],[798155.4492427073,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136293/82266","x":136293,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7460865.455820924],[798002.5751861557,7461018.329877472],[798155.4492427073,7461018.329877472],[798155.4492427073,7460865.455820924],[798002.5751861557,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136292/82267","x":136292,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7460865.455820924],[798155.4492427073,7461018.329877472],[798308.3232992552,7461018.329877472],[798308.3232992552,7460865.455820924],[798155.4492427073,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136293/82267","x":136293,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7461018.329877472],[798308.3232992552,7461171.203934021],[798461.1973558031,7461171.203934021],[798461.1973558031,7461018.329877472],[798308.3232992552,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136294/82266","x":136294,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7461018.329877472],[798461.1973558031,7461171.203934021],[798614.0714123547,7461171.203934021],[798614.0714123547,7461018.329877472],[798461.1973558031,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136295/82266","x":136295,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7460865.455820924],[798308.3232992552,7461018.329877472],[798461.1973558031,7461018.329877472],[798461.1973558031,7460865.455820924],[798308.3232992552,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136294/82267","x":136294,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7460865.455820924],[798461.1973558031,7461018.329877472],[798614.0714123547,7461018.329877472],[798614.0714123547,7460865.455820924],[798461.1973558031,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136295/82267","x":136295,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7460712.581764374],[797391.0789599605,7460865.455820924],[797543.9530165084,7460865.455820924],[797543.9530165084,7460712.581764374],[797391.0789599605,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136288/82268","x":136288,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7460712.581764374],[797543.9530165084,7460865.455820924],[797696.82707306,7460865.455820924],[797696.82707306,7460712.581764374],[797543.9530165084,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136289/82268","x":136289,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7460559.707707824],[797391.0789599605,7460712.581764374],[797543.9530165084,7460712.581764374],[797543.9530165084,7460559.707707824],[797391.0789599605,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136288/82269","x":136288,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7460559.707707824],[797543.9530165084,7460712.581764374],[797696.82707306,7460712.581764374],[797696.82707306,7460559.707707824],[797543.9530165084,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136289/82269","x":136289,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7460712.581764374],[797696.82707306,7460865.455820924],[797849.7011296079,7460865.455820924],[797849.7011296079,7460712.581764374],[797696.82707306,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136290/82268","x":136290,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7460712.581764374],[797849.7011296079,7460865.455820924],[798002.5751861557,7460865.455820924],[798002.5751861557,7460712.581764374],[797849.7011296079,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136291/82268","x":136291,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7460559.707707824],[797696.82707306,7460712.581764374],[797849.7011296079,7460712.581764374],[797849.7011296079,7460559.707707824],[797696.82707306,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136290/82269","x":136290,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7460559.707707824],[797849.7011296079,7460712.581764374],[798002.5751861557,7460712.581764374],[798002.5751861557,7460559.707707824],[797849.7011296079,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136291/82269","x":136291,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7460406.833651276],[797543.9530165084,7460559.707707824],[797696.82707306,7460559.707707824],[797696.82707306,7460406.833651276],[797543.9530165084,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136289/82270","x":136289,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7460406.833651276],[797696.82707306,7460559.707707824],[797849.7011296079,7460559.707707824],[797849.7011296079,7460406.833651276],[797696.82707306,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136290/82270","x":136290,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7460406.833651276],[797849.7011296079,7460559.707707824],[798002.5751861557,7460559.707707824],[798002.5751861557,7460406.833651276],[797849.7011296079,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136291/82270","x":136291,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7460253.959594727],[797696.82707306,7460406.833651276],[797849.7011296079,7460406.833651276],[797849.7011296079,7460253.959594727],[797696.82707306,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136290/82271","x":136290,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7460253.959594727],[797849.7011296079,7460406.833651276],[798002.5751861557,7460406.833651276],[798002.5751861557,7460253.959594727],[797849.7011296079,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136291/82271","x":136291,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7460712.581764374],[798002.5751861557,7460865.455820924],[798155.4492427073,7460865.455820924],[798155.4492427073,7460712.581764374],[798002.5751861557,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136292/82268","x":136292,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7460712.581764374],[798155.4492427073,7460865.455820924],[798308.3232992552,7460865.455820924],[798308.3232992552,7460712.581764374],[798155.4492427073,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136293/82268","x":136293,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7460559.707707824],[798002.5751861557,7460712.581764374],[798155.4492427073,7460712.581764374],[798155.4492427073,7460559.707707824],[798002.5751861557,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136292/82269","x":136292,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7460559.707707824],[798155.4492427073,7460712.581764374],[798308.3232992552,7460712.581764374],[798308.3232992552,7460559.707707824],[798155.4492427073,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136293/82269","x":136293,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7460712.581764374],[798308.3232992552,7460865.455820924],[798461.1973558031,7460865.455820924],[798461.1973558031,7460712.581764374],[798308.3232992552,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136294/82268","x":136294,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7460712.581764374],[798461.1973558031,7460865.455820924],[798614.0714123547,7460865.455820924],[798614.0714123547,7460712.581764374],[798461.1973558031,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136295/82268","x":136295,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7460559.707707824],[798308.3232992552,7460712.581764374],[798461.1973558031,7460712.581764374],[798461.1973558031,7460559.707707824],[798308.3232992552,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136294/82269","x":136294,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7460559.707707824],[798461.1973558031,7460712.581764374],[798614.0714123547,7460712.581764374],[798614.0714123547,7460559.707707824],[798461.1973558031,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136295/82269","x":136295,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7460406.833651276],[798002.5751861557,7460559.707707824],[798155.4492427073,7460559.707707824],[798155.4492427073,7460406.833651276],[798002.5751861557,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136292/82270","x":136292,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7460406.833651276],[798155.4492427073,7460559.707707824],[798308.3232992552,7460559.707707824],[798308.3232992552,7460406.833651276],[798155.4492427073,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136293/82270","x":136293,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7460253.959594727],[798002.5751861557,7460406.833651276],[798155.4492427073,7460406.833651276],[798155.4492427073,7460253.959594727],[798002.5751861557,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136292/82271","x":136292,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7460253.959594727],[798155.4492427073,7460406.833651276],[798308.3232992552,7460406.833651276],[798308.3232992552,7460253.959594727],[798155.4492427073,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136293/82271","x":136293,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7460406.833651276],[798308.3232992552,7460559.707707824],[798461.1973558031,7460559.707707824],[798461.1973558031,7460406.833651276],[798308.3232992552,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136294/82270","x":136294,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7460406.833651276],[798461.1973558031,7460559.707707824],[798614.0714123547,7460559.707707824],[798614.0714123547,7460406.833651276],[798461.1973558031,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136295/82270","x":136295,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7460253.959594727],[798308.3232992552,7460406.833651276],[798461.1973558031,7460406.833651276],[798461.1973558031,7460253.959594727],[798308.3232992552,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136294/82271","x":136294,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7460253.959594727],[798461.1973558031,7460406.833651276],[798614.0714123547,7460406.833651276],[798614.0714123547,7460253.959594727],[798461.1973558031,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136295/82271","x":136295,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7461324.077990569],[798614.0714123547,7461476.952047119],[798766.9454689026,7461476.952047119],[798766.9454689026,7461324.077990569],[798614.0714123547,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136296/82264","x":136296,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7461171.203934021],[798614.0714123547,7461324.077990569],[798766.9454689026,7461324.077990569],[798766.9454689026,7461171.203934021],[798614.0714123547,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136296/82265","x":136296,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7461018.329877472],[798614.0714123547,7461171.203934021],[798766.9454689026,7461171.203934021],[798766.9454689026,7461018.329877472],[798614.0714123547,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136296/82266","x":136296,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7460865.455820924],[798614.0714123547,7461018.329877472],[798766.9454689026,7461018.329877472],[798766.9454689026,7460865.455820924],[798614.0714123547,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136296/82267","x":136296,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7460712.581764374],[798614.0714123547,7460865.455820924],[798766.9454689026,7460865.455820924],[798766.9454689026,7460712.581764374],[798614.0714123547,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136296/82268","x":136296,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7460559.707707824],[798614.0714123547,7460712.581764374],[798766.9454689026,7460712.581764374],[798766.9454689026,7460559.707707824],[798614.0714123547,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136296/82269","x":136296,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7460406.833651276],[798614.0714123547,7460559.707707824],[798766.9454689026,7460559.707707824],[798766.9454689026,7460406.833651276],[798614.0714123547,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136296/82270","x":136296,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7460253.959594727],[798614.0714123547,7460406.833651276],[798766.9454689026,7460406.833651276],[798766.9454689026,7460253.959594727],[798614.0714123547,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136296/82271","x":136296,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7460101.085538177],[792499.1091503911,7460253.959594727],[792651.983206939,7460253.959594727],[792651.983206939,7460101.085538177],[792499.1091503911,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136256/82272","x":136256,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7460101.085538177],[792651.983206939,7460253.959594727],[792804.8572634906,7460253.959594727],[792804.8572634906,7460101.085538177],[792651.983206939,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136257/82272","x":136257,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7459948.211481629],[792499.1091503911,7460101.085538177],[792651.983206939,7460101.085538177],[792651.983206939,7459948.211481629],[792499.1091503911,7459948.211481629]]],"type":"Polygon"},"properties":{"label":"18/136256/82273","x":136256,"y":82273,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7459948.211481629],[792651.983206939,7460101.085538177],[792804.8572634906,7460101.085538177],[792804.8572634906,7459948.211481629],[792651.983206939,7459948.211481629]]],"type":"Polygon"},"properties":{"label":"18/136257/82273","x":136257,"y":82273,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7460101.085538177],[792804.8572634906,7460253.959594727],[792957.7313200384,7460253.959594727],[792957.7313200384,7460101.085538177],[792804.8572634906,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136258/82272","x":136258,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7460101.085538177],[792957.7313200384,7460253.959594727],[793110.6053765863,7460253.959594727],[793110.6053765863,7460101.085538177],[792957.7313200384,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136259/82272","x":136259,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7459948.211481629],[792804.8572634906,7460101.085538177],[792957.7313200384,7460101.085538177],[792957.7313200384,7459948.211481629],[792804.8572634906,7459948.211481629]]],"type":"Polygon"},"properties":{"label":"18/136258/82273","x":136258,"y":82273,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7459948.211481629],[792957.7313200384,7460101.085538177],[793110.6053765863,7460101.085538177],[793110.6053765863,7459948.211481629],[792957.7313200384,7459948.211481629]]],"type":"Polygon"},"properties":{"label":"18/136259/82273","x":136259,"y":82273,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7459795.337425079],[792499.1091503911,7459948.211481629],[792651.983206939,7459948.211481629],[792651.983206939,7459795.337425079],[792499.1091503911,7459795.337425079]]],"type":"Polygon"},"properties":{"label":"18/136256/82274","x":136256,"y":82274,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7459795.337425079],[792651.983206939,7459948.211481629],[792804.8572634906,7459948.211481629],[792804.8572634906,7459795.337425079],[792651.983206939,7459795.337425079]]],"type":"Polygon"},"properties":{"label":"18/136257/82274","x":136257,"y":82274,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7459642.463368529],[792499.1091503911,7459795.337425079],[792651.983206939,7459795.337425079],[792651.983206939,7459642.463368529],[792499.1091503911,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136256/82275","x":136256,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7459642.463368529],[792651.983206939,7459795.337425079],[792804.8572634906,7459795.337425079],[792804.8572634906,7459642.463368529],[792651.983206939,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136257/82275","x":136257,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7459795.337425079],[792804.8572634906,7459948.211481629],[792957.7313200384,7459948.211481629],[792957.7313200384,7459795.337425079],[792804.8572634906,7459795.337425079]]],"type":"Polygon"},"properties":{"label":"18/136258/82274","x":136258,"y":82274,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7459795.337425079],[792957.7313200384,7459948.211481629],[793110.6053765863,7459948.211481629],[793110.6053765863,7459795.337425079],[792957.7313200384,7459795.337425079]]],"type":"Polygon"},"properties":{"label":"18/136259/82274","x":136259,"y":82274,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7459642.463368529],[792804.8572634906,7459795.337425079],[792957.7313200384,7459795.337425079],[792957.7313200384,7459642.463368529],[792804.8572634906,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136258/82275","x":136258,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7459642.463368529],[792957.7313200384,7459795.337425079],[793110.6053765863,7459795.337425079],[793110.6053765863,7459642.463368529],[792957.7313200384,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136259/82275","x":136259,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7460101.085538177],[793110.6053765863,7460253.959594727],[793263.4794331342,7460253.959594727],[793263.4794331342,7460101.085538177],[793110.6053765863,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136260/82272","x":136260,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7460101.085538177],[793263.4794331342,7460253.959594727],[793416.3534896858,7460253.959594727],[793416.3534896858,7460101.085538177],[793263.4794331342,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136261/82272","x":136261,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7459948.211481629],[793110.6053765863,7460101.085538177],[793263.4794331342,7460101.085538177],[793263.4794331342,7459948.211481629],[793110.6053765863,7459948.211481629]]],"type":"Polygon"},"properties":{"label":"18/136260/82273","x":136260,"y":82273,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7459948.211481629],[793263.4794331342,7460101.085538177],[793416.3534896858,7460101.085538177],[793416.3534896858,7459948.211481629],[793263.4794331342,7459948.211481629]]],"type":"Polygon"},"properties":{"label":"18/136261/82273","x":136261,"y":82273,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7459795.337425079],[793110.6053765863,7459948.211481629],[793263.4794331342,7459948.211481629],[793263.4794331342,7459795.337425079],[793110.6053765863,7459795.337425079]]],"type":"Polygon"},"properties":{"label":"18/136260/82274","x":136260,"y":82274,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7459795.337425079],[793263.4794331342,7459948.211481629],[793416.3534896858,7459948.211481629],[793416.3534896858,7459795.337425079],[793263.4794331342,7459795.337425079]]],"type":"Polygon"},"properties":{"label":"18/136261/82274","x":136261,"y":82274,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7459642.463368529],[793110.6053765863,7459795.337425079],[793263.4794331342,7459795.337425079],[793263.4794331342,7459642.463368529],[793110.6053765863,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136260/82275","x":136260,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7459642.463368529],[793263.4794331342,7459795.337425079],[793416.3534896858,7459795.337425079],[793416.3534896858,7459642.463368529],[793263.4794331342,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136261/82275","x":136261,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7459489.589311982],[792499.1091503911,7459642.463368529],[792651.983206939,7459642.463368529],[792651.983206939,7459489.589311982],[792499.1091503911,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136256/82276","x":136256,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7459489.589311982],[792651.983206939,7459642.463368529],[792804.8572634906,7459642.463368529],[792804.8572634906,7459489.589311982],[792651.983206939,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136257/82276","x":136257,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7459336.715255432],[792499.1091503911,7459489.589311982],[792651.983206939,7459489.589311982],[792651.983206939,7459336.715255432],[792499.1091503911,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136256/82277","x":136256,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7459336.715255432],[792651.983206939,7459489.589311982],[792804.8572634906,7459489.589311982],[792804.8572634906,7459336.715255432],[792651.983206939,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136257/82277","x":136257,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7459489.589311982],[792804.8572634906,7459642.463368529],[792957.7313200384,7459642.463368529],[792957.7313200384,7459489.589311982],[792804.8572634906,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136258/82276","x":136258,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7459489.589311982],[792957.7313200384,7459642.463368529],[793110.6053765863,7459642.463368529],[793110.6053765863,7459489.589311982],[792957.7313200384,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136259/82276","x":136259,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7459336.715255432],[792804.8572634906,7459489.589311982],[792957.7313200384,7459489.589311982],[792957.7313200384,7459336.715255432],[792804.8572634906,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136258/82277","x":136258,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7459336.715255432],[792957.7313200384,7459489.589311982],[793110.6053765863,7459489.589311982],[793110.6053765863,7459336.715255432],[792957.7313200384,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136259/82277","x":136259,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7459183.841198882],[792499.1091503911,7459336.715255432],[792651.983206939,7459336.715255432],[792651.983206939,7459183.841198882],[792499.1091503911,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136256/82278","x":136256,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7459183.841198882],[792651.983206939,7459336.715255432],[792804.8572634906,7459336.715255432],[792804.8572634906,7459183.841198882],[792651.983206939,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136257/82278","x":136257,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7459030.967142334],[792499.1091503911,7459183.841198882],[792651.983206939,7459183.841198882],[792651.983206939,7459030.967142334],[792499.1091503911,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136256/82279","x":136256,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7459030.967142334],[792651.983206939,7459183.841198882],[792804.8572634906,7459183.841198882],[792804.8572634906,7459030.967142334],[792651.983206939,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136257/82279","x":136257,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7459183.841198882],[792804.8572634906,7459336.715255432],[792957.7313200384,7459336.715255432],[792957.7313200384,7459183.841198882],[792804.8572634906,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136258/82278","x":136258,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7459183.841198882],[792957.7313200384,7459336.715255432],[793110.6053765863,7459336.715255432],[793110.6053765863,7459183.841198882],[792957.7313200384,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136259/82278","x":136259,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7459030.967142334],[792804.8572634906,7459183.841198882],[792957.7313200384,7459183.841198882],[792957.7313200384,7459030.967142334],[792804.8572634906,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136258/82279","x":136258,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7459030.967142334],[792957.7313200384,7459183.841198882],[793110.6053765863,7459183.841198882],[793110.6053765863,7459030.967142334],[792957.7313200384,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136259/82279","x":136259,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7459489.589311982],[793110.6053765863,7459642.463368529],[793263.4794331342,7459642.463368529],[793263.4794331342,7459489.589311982],[793110.6053765863,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136260/82276","x":136260,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7459489.589311982],[793263.4794331342,7459642.463368529],[793416.3534896858,7459642.463368529],[793416.3534896858,7459489.589311982],[793263.4794331342,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136261/82276","x":136261,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7459336.715255432],[793110.6053765863,7459489.589311982],[793263.4794331342,7459489.589311982],[793263.4794331342,7459336.715255432],[793110.6053765863,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136260/82277","x":136260,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7459336.715255432],[793263.4794331342,7459489.589311982],[793416.3534896858,7459489.589311982],[793416.3534896858,7459336.715255432],[793263.4794331342,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136261/82277","x":136261,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7459183.841198882],[793110.6053765863,7459336.715255432],[793263.4794331342,7459336.715255432],[793263.4794331342,7459183.841198882],[793110.6053765863,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136260/82278","x":136260,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7459183.841198882],[793263.4794331342,7459336.715255432],[793416.3534896858,7459336.715255432],[793416.3534896858,7459183.841198882],[793263.4794331342,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136261/82278","x":136261,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7459030.967142334],[793110.6053765863,7459183.841198882],[793263.4794331342,7459183.841198882],[793263.4794331342,7459030.967142334],[793110.6053765863,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136260/82279","x":136260,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7459489.589311982],[794639.3459420763,7459642.463368529],[794792.2199986279,7459642.463368529],[794792.2199986279,7459489.589311982],[794639.3459420763,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136270/82276","x":136270,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7459489.589311982],[794792.2199986279,7459642.463368529],[794945.0940551758,7459642.463368529],[794945.0940551758,7459489.589311982],[794792.2199986279,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136271/82276","x":136271,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7459336.715255432],[794792.2199986279,7459489.589311982],[794945.0940551758,7459489.589311982],[794945.0940551758,7459336.715255432],[794792.2199986279,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136271/82277","x":136271,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7458878.0930857845],[792499.1091503911,7459030.967142334],[792651.983206939,7459030.967142334],[792651.983206939,7458878.0930857845],[792499.1091503911,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136256/82280","x":136256,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7458878.0930857845],[792651.983206939,7459030.967142334],[792804.8572634906,7459030.967142334],[792804.8572634906,7458878.0930857845],[792651.983206939,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136257/82280","x":136257,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7458725.219029237],[792499.1091503911,7458878.0930857845],[792651.983206939,7458878.0930857845],[792651.983206939,7458725.219029237],[792499.1091503911,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136256/82281","x":136256,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7458725.219029237],[792651.983206939,7458878.0930857845],[792804.8572634906,7458878.0930857845],[792804.8572634906,7458725.219029237],[792651.983206939,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136257/82281","x":136257,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7458878.0930857845],[792804.8572634906,7459030.967142334],[792957.7313200384,7459030.967142334],[792957.7313200384,7458878.0930857845],[792804.8572634906,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136258/82280","x":136258,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7458878.0930857845],[792957.7313200384,7459030.967142334],[793110.6053765863,7459030.967142334],[793110.6053765863,7458878.0930857845],[792957.7313200384,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136259/82280","x":136259,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7458725.219029237],[792804.8572634906,7458878.0930857845],[792957.7313200384,7458878.0930857845],[792957.7313200384,7458725.219029237],[792804.8572634906,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136258/82281","x":136258,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7458725.219029237],[792957.7313200384,7458878.0930857845],[793110.6053765863,7458878.0930857845],[793110.6053765863,7458725.219029237],[792957.7313200384,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136259/82281","x":136259,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7458572.344972687],[792499.1091503911,7458725.219029237],[792651.983206939,7458725.219029237],[792651.983206939,7458572.344972687],[792499.1091503911,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136256/82282","x":136256,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7458572.344972687],[792651.983206939,7458725.219029237],[792804.8572634906,7458725.219029237],[792804.8572634906,7458572.344972687],[792651.983206939,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136257/82282","x":136257,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7458419.470916137],[792499.1091503911,7458572.344972687],[792651.983206939,7458572.344972687],[792651.983206939,7458419.470916137],[792499.1091503911,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136256/82283","x":136256,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7458419.470916137],[792651.983206939,7458572.344972687],[792804.8572634906,7458572.344972687],[792804.8572634906,7458419.470916137],[792651.983206939,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136257/82283","x":136257,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7458572.344972687],[792804.8572634906,7458725.219029237],[792957.7313200384,7458725.219029237],[792957.7313200384,7458572.344972687],[792804.8572634906,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136258/82282","x":136258,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7458572.344972687],[792957.7313200384,7458725.219029237],[793110.6053765863,7458725.219029237],[793110.6053765863,7458572.344972687],[792957.7313200384,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136259/82282","x":136259,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7458419.470916137],[792804.8572634906,7458572.344972687],[792957.7313200384,7458572.344972687],[792957.7313200384,7458419.470916137],[792804.8572634906,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136258/82283","x":136258,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7458419.470916137],[792957.7313200384,7458572.344972687],[793110.6053765863,7458572.344972687],[793110.6053765863,7458419.470916137],[792957.7313200384,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136259/82283","x":136259,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7458878.0930857845],[793110.6053765863,7459030.967142334],[793263.4794331342,7459030.967142334],[793263.4794331342,7458878.0930857845],[793110.6053765863,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136260/82280","x":136260,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7458725.219029237],[793110.6053765863,7458878.0930857845],[793263.4794331342,7458878.0930857845],[793263.4794331342,7458725.219029237],[793110.6053765863,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136260/82281","x":136260,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7458572.344972687],[793110.6053765863,7458725.219029237],[793263.4794331342,7458725.219029237],[793263.4794331342,7458572.344972687],[793110.6053765863,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136260/82282","x":136260,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7458419.470916137],[793110.6053765863,7458572.344972687],[793263.4794331342,7458572.344972687],[793263.4794331342,7458419.470916137],[793110.6053765863,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136260/82283","x":136260,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7458266.596859589],[792499.1091503911,7458419.470916137],[792651.983206939,7458419.470916137],[792651.983206939,7458266.596859589],[792499.1091503911,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136256/82284","x":136256,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7458266.596859589],[792651.983206939,7458419.470916137],[792804.8572634906,7458419.470916137],[792804.8572634906,7458266.596859589],[792651.983206939,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136257/82284","x":136257,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7458113.7228030395],[792499.1091503911,7458266.596859589],[792651.983206939,7458266.596859589],[792651.983206939,7458113.7228030395],[792499.1091503911,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136256/82285","x":136256,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7458113.7228030395],[792651.983206939,7458266.596859589],[792804.8572634906,7458266.596859589],[792804.8572634906,7458113.7228030395],[792651.983206939,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136257/82285","x":136257,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7458266.596859589],[792804.8572634906,7458419.470916137],[792957.7313200384,7458419.470916137],[792957.7313200384,7458266.596859589],[792804.8572634906,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136258/82284","x":136258,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7458266.596859589],[792957.7313200384,7458419.470916137],[793110.6053765863,7458419.470916137],[793110.6053765863,7458266.596859589],[792957.7313200384,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136259/82284","x":136259,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7458113.7228030395],[792804.8572634906,7458266.596859589],[792957.7313200384,7458266.596859589],[792957.7313200384,7458113.7228030395],[792804.8572634906,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136258/82285","x":136258,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7458113.7228030395],[792957.7313200384,7458266.596859589],[793110.6053765863,7458266.596859589],[793110.6053765863,7458113.7228030395],[792957.7313200384,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136259/82285","x":136259,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7457960.84874649],[792499.1091503911,7458113.7228030395],[792651.983206939,7458113.7228030395],[792651.983206939,7457960.84874649],[792499.1091503911,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136256/82286","x":136256,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7457960.84874649],[792651.983206939,7458113.7228030395],[792804.8572634906,7458113.7228030395],[792804.8572634906,7457960.84874649],[792651.983206939,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136257/82286","x":136257,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7457807.974689942],[792499.1091503911,7457960.84874649],[792651.983206939,7457960.84874649],[792651.983206939,7457807.974689942],[792499.1091503911,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136256/82287","x":136256,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7457807.974689942],[792651.983206939,7457960.84874649],[792804.8572634906,7457960.84874649],[792804.8572634906,7457807.974689942],[792651.983206939,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136257/82287","x":136257,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7457960.84874649],[792804.8572634906,7458113.7228030395],[792957.7313200384,7458113.7228030395],[792957.7313200384,7457960.84874649],[792804.8572634906,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136258/82286","x":136258,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7457960.84874649],[792957.7313200384,7458113.7228030395],[793110.6053765863,7458113.7228030395],[793110.6053765863,7457960.84874649],[792957.7313200384,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136259/82286","x":136259,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7457807.974689942],[792804.8572634906,7457960.84874649],[792957.7313200384,7457960.84874649],[792957.7313200384,7457807.974689942],[792804.8572634906,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136258/82287","x":136258,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7457807.974689942],[792957.7313200384,7457960.84874649],[793110.6053765863,7457960.84874649],[793110.6053765863,7457807.974689942],[792957.7313200384,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136259/82287","x":136259,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7458266.596859589],[793110.6053765863,7458419.470916137],[793263.4794331342,7458419.470916137],[793263.4794331342,7458266.596859589],[793110.6053765863,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136260/82284","x":136260,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7458113.7228030395],[793110.6053765863,7458266.596859589],[793263.4794331342,7458266.596859589],[793263.4794331342,7458113.7228030395],[793110.6053765863,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136260/82285","x":136260,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7457960.84874649],[793110.6053765863,7458113.7228030395],[793263.4794331342,7458113.7228030395],[793263.4794331342,7457960.84874649],[793110.6053765863,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136260/82286","x":136260,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7457807.974689942],[793110.6053765863,7457960.84874649],[793263.4794331342,7457960.84874649],[793263.4794331342,7457807.974689942],[793110.6053765863,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136260/82287","x":136260,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7457807.974689942],[794639.3459420763,7457960.84874649],[794792.2199986279,7457960.84874649],[794792.2199986279,7457807.974689942],[794639.3459420763,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136270/82287","x":136270,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7457807.974689942],[794792.2199986279,7457960.84874649],[794945.0940551758,7457960.84874649],[794945.0940551758,7457807.974689942],[794792.2199986279,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136271/82287","x":136271,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7459489.589311982],[794945.0940551758,7459642.463368529],[795097.9681117237,7459642.463368529],[795097.9681117237,7459489.589311982],[794945.0940551758,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136272/82276","x":136272,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7459489.589311982],[795097.9681117237,7459642.463368529],[795250.8421682753,7459642.463368529],[795250.8421682753,7459489.589311982],[795097.9681117237,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136273/82276","x":136273,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7459336.715255432],[794945.0940551758,7459489.589311982],[795097.9681117237,7459489.589311982],[795097.9681117237,7459336.715255432],[794945.0940551758,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136272/82277","x":136272,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7459336.715255432],[795097.9681117237,7459489.589311982],[795250.8421682753,7459489.589311982],[795250.8421682753,7459336.715255432],[795097.9681117237,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136273/82277","x":136273,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7459489.589311982],[795250.8421682753,7459642.463368529],[795403.7162248231,7459642.463368529],[795403.7162248231,7459489.589311982],[795250.8421682753,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136274/82276","x":136274,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7459489.589311982],[795403.7162248231,7459642.463368529],[795556.590281371,7459642.463368529],[795556.590281371,7459489.589311982],[795403.7162248231,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136275/82276","x":136275,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7459336.715255432],[795250.8421682753,7459489.589311982],[795403.7162248231,7459489.589311982],[795403.7162248231,7459336.715255432],[795250.8421682753,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136274/82277","x":136274,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7459336.715255432],[795403.7162248231,7459489.589311982],[795556.590281371,7459489.589311982],[795556.590281371,7459336.715255432],[795403.7162248231,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136275/82277","x":136275,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7459183.841198882],[794945.0940551758,7459336.715255432],[795097.9681117237,7459336.715255432],[795097.9681117237,7459183.841198882],[794945.0940551758,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136272/82278","x":136272,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7459183.841198882],[795097.9681117237,7459336.715255432],[795250.8421682753,7459336.715255432],[795250.8421682753,7459183.841198882],[795097.9681117237,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136273/82278","x":136273,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7459183.841198882],[795250.8421682753,7459336.715255432],[795403.7162248231,7459336.715255432],[795403.7162248231,7459183.841198882],[795250.8421682753,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136274/82278","x":136274,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7459183.841198882],[795403.7162248231,7459336.715255432],[795556.590281371,7459336.715255432],[795556.590281371,7459183.841198882],[795403.7162248231,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136275/82278","x":136275,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7459030.967142334],[795250.8421682753,7459183.841198882],[795403.7162248231,7459183.841198882],[795403.7162248231,7459030.967142334],[795250.8421682753,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136274/82279","x":136274,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7459030.967142334],[795403.7162248231,7459183.841198882],[795556.590281371,7459183.841198882],[795556.590281371,7459030.967142334],[795403.7162248231,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136275/82279","x":136275,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7459489.589311982],[795556.590281371,7459642.463368529],[795709.4643379226,7459642.463368529],[795709.4643379226,7459489.589311982],[795556.590281371,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136276/82276","x":136276,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7459489.589311982],[795709.4643379226,7459642.463368529],[795862.3383944705,7459642.463368529],[795862.3383944705,7459489.589311982],[795709.4643379226,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136277/82276","x":136277,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7459336.715255432],[795556.590281371,7459489.589311982],[795709.4643379226,7459489.589311982],[795709.4643379226,7459336.715255432],[795556.590281371,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136276/82277","x":136276,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7459336.715255432],[795709.4643379226,7459489.589311982],[795862.3383944705,7459489.589311982],[795862.3383944705,7459336.715255432],[795709.4643379226,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136277/82277","x":136277,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7459489.589311982],[795862.3383944705,7459642.463368529],[796015.2124510184,7459642.463368529],[796015.2124510184,7459489.589311982],[795862.3383944705,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136278/82276","x":136278,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7459489.589311982],[796015.2124510184,7459642.463368529],[796168.08650757,7459642.463368529],[796168.08650757,7459489.589311982],[796015.2124510184,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136279/82276","x":136279,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7459336.715255432],[795862.3383944705,7459489.589311982],[796015.2124510184,7459489.589311982],[796015.2124510184,7459336.715255432],[795862.3383944705,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136278/82277","x":136278,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7459336.715255432],[796015.2124510184,7459489.589311982],[796168.08650757,7459489.589311982],[796168.08650757,7459336.715255432],[796015.2124510184,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136279/82277","x":136279,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7459183.841198882],[795556.590281371,7459336.715255432],[795709.4643379226,7459336.715255432],[795709.4643379226,7459183.841198882],[795556.590281371,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136276/82278","x":136276,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7459183.841198882],[795709.4643379226,7459336.715255432],[795862.3383944705,7459336.715255432],[795862.3383944705,7459183.841198882],[795709.4643379226,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136277/82278","x":136277,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7459030.967142334],[795556.590281371,7459183.841198882],[795709.4643379226,7459183.841198882],[795709.4643379226,7459030.967142334],[795556.590281371,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136276/82279","x":136276,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7459030.967142334],[795709.4643379226,7459183.841198882],[795862.3383944705,7459183.841198882],[795862.3383944705,7459030.967142334],[795709.4643379226,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136277/82279","x":136277,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7459183.841198882],[795862.3383944705,7459336.715255432],[796015.2124510184,7459336.715255432],[796015.2124510184,7459183.841198882],[795862.3383944705,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136278/82278","x":136278,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7459183.841198882],[796015.2124510184,7459336.715255432],[796168.08650757,7459336.715255432],[796168.08650757,7459183.841198882],[796015.2124510184,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136279/82278","x":136279,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7459030.967142334],[795862.3383944705,7459183.841198882],[796015.2124510184,7459183.841198882],[796015.2124510184,7459030.967142334],[795862.3383944705,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136278/82279","x":136278,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7459030.967142334],[796015.2124510184,7459183.841198882],[796168.08650757,7459183.841198882],[796168.08650757,7459030.967142334],[796015.2124510184,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136279/82279","x":136279,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7459489.589311982],[796168.08650757,7459642.463368529],[796320.9605641179,7459642.463368529],[796320.9605641179,7459489.589311982],[796168.08650757,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136280/82276","x":136280,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7459489.589311982],[796320.9605641179,7459642.463368529],[796473.8346206658,7459642.463368529],[796473.8346206658,7459489.589311982],[796320.9605641179,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136281/82276","x":136281,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7459336.715255432],[796168.08650757,7459489.589311982],[796320.9605641179,7459489.589311982],[796320.9605641179,7459336.715255432],[796168.08650757,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136280/82277","x":136280,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7459336.715255432],[796320.9605641179,7459489.589311982],[796473.8346206658,7459489.589311982],[796473.8346206658,7459336.715255432],[796320.9605641179,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136281/82277","x":136281,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7459489.589311982],[796473.8346206658,7459642.463368529],[796626.7086772174,7459642.463368529],[796626.7086772174,7459489.589311982],[796473.8346206658,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136282/82276","x":136282,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7459489.589311982],[796626.7086772174,7459642.463368529],[796779.5827337652,7459642.463368529],[796779.5827337652,7459489.589311982],[796626.7086772174,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136283/82276","x":136283,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7459336.715255432],[796473.8346206658,7459489.589311982],[796626.7086772174,7459489.589311982],[796626.7086772174,7459336.715255432],[796473.8346206658,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136282/82277","x":136282,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7459336.715255432],[796626.7086772174,7459489.589311982],[796779.5827337652,7459489.589311982],[796779.5827337652,7459336.715255432],[796626.7086772174,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136283/82277","x":136283,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7459183.841198882],[796168.08650757,7459336.715255432],[796320.9605641179,7459336.715255432],[796320.9605641179,7459183.841198882],[796168.08650757,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136280/82278","x":136280,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7459183.841198882],[796320.9605641179,7459336.715255432],[796473.8346206658,7459336.715255432],[796473.8346206658,7459183.841198882],[796320.9605641179,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136281/82278","x":136281,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7459030.967142334],[796168.08650757,7459183.841198882],[796320.9605641179,7459183.841198882],[796320.9605641179,7459030.967142334],[796168.08650757,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136280/82279","x":136280,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7459030.967142334],[796320.9605641179,7459183.841198882],[796473.8346206658,7459183.841198882],[796473.8346206658,7459030.967142334],[796320.9605641179,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136281/82279","x":136281,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7459183.841198882],[796473.8346206658,7459336.715255432],[796626.7086772174,7459336.715255432],[796626.7086772174,7459183.841198882],[796473.8346206658,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136282/82278","x":136282,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7459183.841198882],[796626.7086772174,7459336.715255432],[796779.5827337652,7459336.715255432],[796779.5827337652,7459183.841198882],[796626.7086772174,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136283/82278","x":136283,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7459030.967142334],[796473.8346206658,7459183.841198882],[796626.7086772174,7459183.841198882],[796626.7086772174,7459030.967142334],[796473.8346206658,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136282/82279","x":136282,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7459030.967142334],[796626.7086772174,7459183.841198882],[796779.5827337652,7459183.841198882],[796779.5827337652,7459030.967142334],[796626.7086772174,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136283/82279","x":136283,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7458878.0930857845],[795403.7162248231,7459030.967142334],[795556.590281371,7459030.967142334],[795556.590281371,7458878.0930857845],[795403.7162248231,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136275/82280","x":136275,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7458878.0930857845],[795556.590281371,7459030.967142334],[795709.4643379226,7459030.967142334],[795709.4643379226,7458878.0930857845],[795556.590281371,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136276/82280","x":136276,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7458878.0930857845],[795709.4643379226,7459030.967142334],[795862.3383944705,7459030.967142334],[795862.3383944705,7458878.0930857845],[795709.4643379226,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136277/82280","x":136277,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7458725.219029237],[795709.4643379226,7458878.0930857845],[795862.3383944705,7458878.0930857845],[795862.3383944705,7458725.219029237],[795709.4643379226,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136277/82281","x":136277,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7458878.0930857845],[795862.3383944705,7459030.967142334],[796015.2124510184,7459030.967142334],[796015.2124510184,7458878.0930857845],[795862.3383944705,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136278/82280","x":136278,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7458878.0930857845],[796015.2124510184,7459030.967142334],[796168.08650757,7459030.967142334],[796168.08650757,7458878.0930857845],[796015.2124510184,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136279/82280","x":136279,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7458725.219029237],[795862.3383944705,7458878.0930857845],[796015.2124510184,7458878.0930857845],[796015.2124510184,7458725.219029237],[795862.3383944705,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136278/82281","x":136278,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7458725.219029237],[796015.2124510184,7458878.0930857845],[796168.08650757,7458878.0930857845],[796168.08650757,7458725.219029237],[796015.2124510184,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136279/82281","x":136279,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7458419.470916137],[795709.4643379226,7458572.344972687],[795862.3383944705,7458572.344972687],[795862.3383944705,7458419.470916137],[795709.4643379226,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136277/82283","x":136277,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7458572.344972687],[795862.3383944705,7458725.219029237],[796015.2124510184,7458725.219029237],[796015.2124510184,7458572.344972687],[795862.3383944705,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136278/82282","x":136278,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7458572.344972687],[796015.2124510184,7458725.219029237],[796168.08650757,7458725.219029237],[796168.08650757,7458572.344972687],[796015.2124510184,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136279/82282","x":136279,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7458419.470916137],[795862.3383944705,7458572.344972687],[796015.2124510184,7458572.344972687],[796015.2124510184,7458419.470916137],[795862.3383944705,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136278/82283","x":136278,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7458419.470916137],[796015.2124510184,7458572.344972687],[796168.08650757,7458572.344972687],[796168.08650757,7458419.470916137],[796015.2124510184,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136279/82283","x":136279,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7458266.596859589],[795403.7162248231,7458419.470916137],[795556.590281371,7458419.470916137],[795556.590281371,7458266.596859589],[795403.7162248231,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136275/82284","x":136275,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7458113.7228030395],[795250.8421682753,7458266.596859589],[795403.7162248231,7458266.596859589],[795403.7162248231,7458113.7228030395],[795250.8421682753,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136274/82285","x":136274,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7458113.7228030395],[795403.7162248231,7458266.596859589],[795556.590281371,7458266.596859589],[795556.590281371,7458113.7228030395],[795403.7162248231,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136275/82285","x":136275,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7457960.84874649],[794945.0940551758,7458113.7228030395],[795097.9681117237,7458113.7228030395],[795097.9681117237,7457960.84874649],[794945.0940551758,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136272/82286","x":136272,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7457960.84874649],[795097.9681117237,7458113.7228030395],[795250.8421682753,7458113.7228030395],[795250.8421682753,7457960.84874649],[795097.9681117237,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136273/82286","x":136273,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7457807.974689942],[794945.0940551758,7457960.84874649],[795097.9681117237,7457960.84874649],[795097.9681117237,7457807.974689942],[794945.0940551758,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136272/82287","x":136272,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7457807.974689942],[795097.9681117237,7457960.84874649],[795250.8421682753,7457960.84874649],[795250.8421682753,7457807.974689942],[795097.9681117237,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136273/82287","x":136273,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7457960.84874649],[795250.8421682753,7458113.7228030395],[795403.7162248231,7458113.7228030395],[795403.7162248231,7457960.84874649],[795250.8421682753,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136274/82286","x":136274,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7457960.84874649],[795403.7162248231,7458113.7228030395],[795556.590281371,7458113.7228030395],[795556.590281371,7457960.84874649],[795403.7162248231,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136275/82286","x":136275,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7457807.974689942],[795250.8421682753,7457960.84874649],[795403.7162248231,7457960.84874649],[795403.7162248231,7457807.974689942],[795250.8421682753,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136274/82287","x":136274,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7457807.974689942],[795403.7162248231,7457960.84874649],[795556.590281371,7457960.84874649],[795556.590281371,7457807.974689942],[795403.7162248231,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136275/82287","x":136275,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7458266.596859589],[795556.590281371,7458419.470916137],[795709.4643379226,7458419.470916137],[795709.4643379226,7458266.596859589],[795556.590281371,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136276/82284","x":136276,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7458266.596859589],[795709.4643379226,7458419.470916137],[795862.3383944705,7458419.470916137],[795862.3383944705,7458266.596859589],[795709.4643379226,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136277/82284","x":136277,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7458113.7228030395],[795556.590281371,7458266.596859589],[795709.4643379226,7458266.596859589],[795709.4643379226,7458113.7228030395],[795556.590281371,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136276/82285","x":136276,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7458113.7228030395],[795709.4643379226,7458266.596859589],[795862.3383944705,7458266.596859589],[795862.3383944705,7458113.7228030395],[795709.4643379226,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136277/82285","x":136277,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7458266.596859589],[795862.3383944705,7458419.470916137],[796015.2124510184,7458419.470916137],[796015.2124510184,7458266.596859589],[795862.3383944705,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136278/82284","x":136278,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7458266.596859589],[796015.2124510184,7458419.470916137],[796168.08650757,7458419.470916137],[796168.08650757,7458266.596859589],[796015.2124510184,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136279/82284","x":136279,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7458113.7228030395],[795862.3383944705,7458266.596859589],[796015.2124510184,7458266.596859589],[796015.2124510184,7458113.7228030395],[795862.3383944705,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136278/82285","x":136278,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7458113.7228030395],[796015.2124510184,7458266.596859589],[796168.08650757,7458266.596859589],[796168.08650757,7458113.7228030395],[796015.2124510184,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136279/82285","x":136279,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7457960.84874649],[795556.590281371,7458113.7228030395],[795709.4643379226,7458113.7228030395],[795709.4643379226,7457960.84874649],[795556.590281371,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136276/82286","x":136276,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7457960.84874649],[795709.4643379226,7458113.7228030395],[795862.3383944705,7458113.7228030395],[795862.3383944705,7457960.84874649],[795709.4643379226,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136277/82286","x":136277,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7457807.974689942],[795556.590281371,7457960.84874649],[795709.4643379226,7457960.84874649],[795709.4643379226,7457807.974689942],[795556.590281371,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136276/82287","x":136276,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7457807.974689942],[795709.4643379226,7457960.84874649],[795862.3383944705,7457960.84874649],[795862.3383944705,7457807.974689942],[795709.4643379226,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136277/82287","x":136277,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7457960.84874649],[795862.3383944705,7458113.7228030395],[796015.2124510184,7458113.7228030395],[796015.2124510184,7457960.84874649],[795862.3383944705,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136278/82286","x":136278,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7457960.84874649],[796015.2124510184,7458113.7228030395],[796168.08650757,7458113.7228030395],[796168.08650757,7457960.84874649],[796015.2124510184,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136279/82286","x":136279,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7457807.974689942],[795862.3383944705,7457960.84874649],[796015.2124510184,7457960.84874649],[796015.2124510184,7457807.974689942],[795862.3383944705,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136278/82287","x":136278,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7457807.974689942],[796015.2124510184,7457960.84874649],[796168.08650757,7457960.84874649],[796168.08650757,7457807.974689942],[796015.2124510184,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136279/82287","x":136279,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7458878.0930857845],[796168.08650757,7459030.967142334],[796320.9605641179,7459030.967142334],[796320.9605641179,7458878.0930857845],[796168.08650757,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136280/82280","x":136280,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7458878.0930857845],[796320.9605641179,7459030.967142334],[796473.8346206658,7459030.967142334],[796473.8346206658,7458878.0930857845],[796320.9605641179,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136281/82280","x":136281,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7458725.219029237],[796168.08650757,7458878.0930857845],[796320.9605641179,7458878.0930857845],[796320.9605641179,7458725.219029237],[796168.08650757,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136280/82281","x":136280,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7458725.219029237],[796320.9605641179,7458878.0930857845],[796473.8346206658,7458878.0930857845],[796473.8346206658,7458725.219029237],[796320.9605641179,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136281/82281","x":136281,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7458878.0930857845],[796473.8346206658,7459030.967142334],[796626.7086772174,7459030.967142334],[796626.7086772174,7458878.0930857845],[796473.8346206658,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136282/82280","x":136282,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7458878.0930857845],[796626.7086772174,7459030.967142334],[796779.5827337652,7459030.967142334],[796779.5827337652,7458878.0930857845],[796626.7086772174,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136283/82280","x":136283,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7458725.219029237],[796473.8346206658,7458878.0930857845],[796626.7086772174,7458878.0930857845],[796626.7086772174,7458725.219029237],[796473.8346206658,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136282/82281","x":136282,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7458725.219029237],[796626.7086772174,7458878.0930857845],[796779.5827337652,7458878.0930857845],[796779.5827337652,7458725.219029237],[796626.7086772174,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136283/82281","x":136283,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7458572.344972687],[796168.08650757,7458725.219029237],[796320.9605641179,7458725.219029237],[796320.9605641179,7458572.344972687],[796168.08650757,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136280/82282","x":136280,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7458572.344972687],[796320.9605641179,7458725.219029237],[796473.8346206658,7458725.219029237],[796473.8346206658,7458572.344972687],[796320.9605641179,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136281/82282","x":136281,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7458419.470916137],[796168.08650757,7458572.344972687],[796320.9605641179,7458572.344972687],[796320.9605641179,7458419.470916137],[796168.08650757,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136280/82283","x":136280,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7458419.470916137],[796320.9605641179,7458572.344972687],[796473.8346206658,7458572.344972687],[796473.8346206658,7458419.470916137],[796320.9605641179,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136281/82283","x":136281,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7458572.344972687],[796473.8346206658,7458725.219029237],[796626.7086772174,7458725.219029237],[796626.7086772174,7458572.344972687],[796473.8346206658,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136282/82282","x":136282,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7458572.344972687],[796626.7086772174,7458725.219029237],[796779.5827337652,7458725.219029237],[796779.5827337652,7458572.344972687],[796626.7086772174,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136283/82282","x":136283,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7458419.470916137],[796473.8346206658,7458572.344972687],[796626.7086772174,7458572.344972687],[796626.7086772174,7458419.470916137],[796473.8346206658,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136282/82283","x":136282,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7458419.470916137],[796626.7086772174,7458572.344972687],[796779.5827337652,7458572.344972687],[796779.5827337652,7458419.470916137],[796626.7086772174,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136283/82283","x":136283,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7458266.596859589],[796168.08650757,7458419.470916137],[796320.9605641179,7458419.470916137],[796320.9605641179,7458266.596859589],[796168.08650757,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136280/82284","x":136280,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7458266.596859589],[796320.9605641179,7458419.470916137],[796473.8346206658,7458419.470916137],[796473.8346206658,7458266.596859589],[796320.9605641179,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136281/82284","x":136281,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7458113.7228030395],[796168.08650757,7458266.596859589],[796320.9605641179,7458266.596859589],[796320.9605641179,7458113.7228030395],[796168.08650757,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136280/82285","x":136280,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7458113.7228030395],[796320.9605641179,7458266.596859589],[796473.8346206658,7458266.596859589],[796473.8346206658,7458113.7228030395],[796320.9605641179,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136281/82285","x":136281,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7458266.596859589],[796473.8346206658,7458419.470916137],[796626.7086772174,7458419.470916137],[796626.7086772174,7458266.596859589],[796473.8346206658,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136282/82284","x":136282,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7458266.596859589],[796626.7086772174,7458419.470916137],[796779.5827337652,7458419.470916137],[796779.5827337652,7458266.596859589],[796626.7086772174,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136283/82284","x":136283,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7458113.7228030395],[796473.8346206658,7458266.596859589],[796626.7086772174,7458266.596859589],[796626.7086772174,7458113.7228030395],[796473.8346206658,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136282/82285","x":136282,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7458113.7228030395],[796626.7086772174,7458266.596859589],[796779.5827337652,7458266.596859589],[796779.5827337652,7458113.7228030395],[796626.7086772174,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136283/82285","x":136283,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7457960.84874649],[796168.08650757,7458113.7228030395],[796320.9605641179,7458113.7228030395],[796320.9605641179,7457960.84874649],[796168.08650757,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136280/82286","x":136280,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7457960.84874649],[796320.9605641179,7458113.7228030395],[796473.8346206658,7458113.7228030395],[796473.8346206658,7457960.84874649],[796320.9605641179,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136281/82286","x":136281,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7457807.974689942],[796168.08650757,7457960.84874649],[796320.9605641179,7457960.84874649],[796320.9605641179,7457807.974689942],[796168.08650757,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136280/82287","x":136280,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7457807.974689942],[796320.9605641179,7457960.84874649],[796473.8346206658,7457960.84874649],[796473.8346206658,7457807.974689942],[796320.9605641179,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136281/82287","x":136281,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7457960.84874649],[796473.8346206658,7458113.7228030395],[796626.7086772174,7458113.7228030395],[796626.7086772174,7457960.84874649],[796473.8346206658,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136282/82286","x":136282,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7457960.84874649],[796626.7086772174,7458113.7228030395],[796779.5827337652,7458113.7228030395],[796779.5827337652,7457960.84874649],[796626.7086772174,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136283/82286","x":136283,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7457807.974689942],[796473.8346206658,7457960.84874649],[796626.7086772174,7457960.84874649],[796626.7086772174,7457807.974689942],[796473.8346206658,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136282/82287","x":136282,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7457807.974689942],[796626.7086772174,7457960.84874649],[796779.5827337652,7457960.84874649],[796779.5827337652,7457807.974689942],[796626.7086772174,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136283/82287","x":136283,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7457655.100633392],[792499.1091503911,7457807.974689942],[792651.983206939,7457807.974689942],[792651.983206939,7457655.100633392],[792499.1091503911,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136256/82288","x":136256,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7457655.100633392],[792651.983206939,7457807.974689942],[792804.8572634906,7457807.974689942],[792804.8572634906,7457655.100633392],[792651.983206939,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136257/82288","x":136257,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7457502.226576842],[792499.1091503911,7457655.100633392],[792651.983206939,7457655.100633392],[792651.983206939,7457502.226576842],[792499.1091503911,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136256/82289","x":136256,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7457502.226576842],[792651.983206939,7457655.100633392],[792804.8572634906,7457655.100633392],[792804.8572634906,7457502.226576842],[792651.983206939,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136257/82289","x":136257,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7457655.100633392],[792804.8572634906,7457807.974689942],[792957.7313200384,7457807.974689942],[792957.7313200384,7457655.100633392],[792804.8572634906,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136258/82288","x":136258,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7457655.100633392],[792957.7313200384,7457807.974689942],[793110.6053765863,7457807.974689942],[793110.6053765863,7457655.100633392],[792957.7313200384,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136259/82288","x":136259,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7457502.226576842],[792804.8572634906,7457655.100633392],[792957.7313200384,7457655.100633392],[792957.7313200384,7457502.226576842],[792804.8572634906,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136258/82289","x":136258,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7457502.226576842],[792957.7313200384,7457655.100633392],[793110.6053765863,7457655.100633392],[793110.6053765863,7457502.226576842],[792957.7313200384,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136259/82289","x":136259,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7457349.3525202945],[792499.1091503911,7457502.226576842],[792651.983206939,7457502.226576842],[792651.983206939,7457349.3525202945],[792499.1091503911,7457349.3525202945]]],"type":"Polygon"},"properties":{"label":"18/136256/82290","x":136256,"y":82290,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7457349.3525202945],[792651.983206939,7457502.226576842],[792804.8572634906,7457502.226576842],[792804.8572634906,7457349.3525202945],[792651.983206939,7457349.3525202945]]],"type":"Polygon"},"properties":{"label":"18/136257/82290","x":136257,"y":82290,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7457196.478463745],[792499.1091503911,7457349.3525202945],[792651.983206939,7457349.3525202945],[792651.983206939,7457196.478463745],[792499.1091503911,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136256/82291","x":136256,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7457196.478463745],[792651.983206939,7457349.3525202945],[792804.8572634906,7457349.3525202945],[792804.8572634906,7457196.478463745],[792651.983206939,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136257/82291","x":136257,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7457349.3525202945],[792804.8572634906,7457502.226576842],[792957.7313200384,7457502.226576842],[792957.7313200384,7457349.3525202945],[792804.8572634906,7457349.3525202945]]],"type":"Polygon"},"properties":{"label":"18/136258/82290","x":136258,"y":82290,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7457349.3525202945],[792957.7313200384,7457502.226576842],[793110.6053765863,7457502.226576842],[793110.6053765863,7457349.3525202945],[792957.7313200384,7457349.3525202945]]],"type":"Polygon"},"properties":{"label":"18/136259/82290","x":136259,"y":82290,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7457196.478463745],[792804.8572634906,7457349.3525202945],[792957.7313200384,7457349.3525202945],[792957.7313200384,7457196.478463745],[792804.8572634906,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136258/82291","x":136258,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7457196.478463745],[792957.7313200384,7457349.3525202945],[793110.6053765863,7457349.3525202945],[793110.6053765863,7457196.478463745],[792957.7313200384,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136259/82291","x":136259,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7457655.100633392],[793110.6053765863,7457807.974689942],[793263.4794331342,7457807.974689942],[793263.4794331342,7457655.100633392],[793110.6053765863,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136260/82288","x":136260,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7457502.226576842],[793110.6053765863,7457655.100633392],[793263.4794331342,7457655.100633392],[793263.4794331342,7457502.226576842],[793110.6053765863,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136260/82289","x":136260,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7457349.3525202945],[793110.6053765863,7457502.226576842],[793263.4794331342,7457502.226576842],[793263.4794331342,7457349.3525202945],[793110.6053765863,7457349.3525202945]]],"type":"Polygon"},"properties":{"label":"18/136260/82290","x":136260,"y":82290,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7457043.604407197],[792499.1091503911,7457196.478463745],[792651.983206939,7457196.478463745],[792651.983206939,7457043.604407197],[792499.1091503911,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136256/82292","x":136256,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7457043.604407197],[792651.983206939,7457196.478463745],[792804.8572634906,7457196.478463745],[792804.8572634906,7457043.604407197],[792651.983206939,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136257/82292","x":136257,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7456890.730350647],[792499.1091503911,7457043.604407197],[792651.983206939,7457043.604407197],[792651.983206939,7456890.730350647],[792499.1091503911,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136256/82293","x":136256,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7456890.730350647],[792651.983206939,7457043.604407197],[792804.8572634906,7457043.604407197],[792804.8572634906,7456890.730350647],[792651.983206939,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136257/82293","x":136257,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7457043.604407197],[792804.8572634906,7457196.478463745],[792957.7313200384,7457196.478463745],[792957.7313200384,7457043.604407197],[792804.8572634906,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136258/82292","x":136258,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7457043.604407197],[792957.7313200384,7457196.478463745],[793110.6053765863,7457196.478463745],[793110.6053765863,7457043.604407197],[792957.7313200384,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136259/82292","x":136259,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7456890.730350647],[792804.8572634906,7457043.604407197],[792957.7313200384,7457043.604407197],[792957.7313200384,7456890.730350647],[792804.8572634906,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136258/82293","x":136258,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7456890.730350647],[792957.7313200384,7457043.604407197],[793110.6053765863,7457043.604407197],[793110.6053765863,7456890.730350647],[792957.7313200384,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136259/82293","x":136259,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7456737.856294097],[792499.1091503911,7456890.730350647],[792651.983206939,7456890.730350647],[792651.983206939,7456737.856294097],[792499.1091503911,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136256/82294","x":136256,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7456737.856294097],[792651.983206939,7456890.730350647],[792804.8572634906,7456890.730350647],[792804.8572634906,7456737.856294097],[792651.983206939,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136257/82294","x":136257,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7456584.9822375495],[792651.983206939,7456737.856294097],[792804.8572634906,7456737.856294097],[792804.8572634906,7456584.9822375495],[792651.983206939,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136257/82295","x":136257,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7456737.856294097],[792804.8572634906,7456890.730350647],[792957.7313200384,7456890.730350647],[792957.7313200384,7456737.856294097],[792804.8572634906,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136258/82294","x":136258,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7456737.856294097],[792957.7313200384,7456890.730350647],[793110.6053765863,7456890.730350647],[793110.6053765863,7456737.856294097],[792957.7313200384,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136259/82294","x":136259,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7456584.9822375495],[792804.8572634906,7456737.856294097],[792957.7313200384,7456737.856294097],[792957.7313200384,7456584.9822375495],[792804.8572634906,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136258/82295","x":136258,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7456584.9822375495],[792957.7313200384,7456737.856294097],[793110.6053765863,7456737.856294097],[793110.6053765863,7456584.9822375495],[792957.7313200384,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136259/82295","x":136259,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7457043.604407197],[793110.6053765863,7457196.478463745],[793263.4794331342,7457196.478463745],[793263.4794331342,7457043.604407197],[793110.6053765863,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136260/82292","x":136260,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7457043.604407197],[793263.4794331342,7457196.478463745],[793416.3534896858,7457196.478463745],[793416.3534896858,7457043.604407197],[793263.4794331342,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136261/82292","x":136261,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7456890.730350647],[793110.6053765863,7457043.604407197],[793263.4794331342,7457043.604407197],[793263.4794331342,7456890.730350647],[793110.6053765863,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136260/82293","x":136260,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7456890.730350647],[793263.4794331342,7457043.604407197],[793416.3534896858,7457043.604407197],[793416.3534896858,7456890.730350647],[793263.4794331342,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136261/82293","x":136261,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7456890.730350647],[793416.3534896858,7457043.604407197],[793569.2275462337,7457043.604407197],[793569.2275462337,7456890.730350647],[793416.3534896858,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136262/82293","x":136262,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7456737.856294097],[793110.6053765863,7456890.730350647],[793263.4794331342,7456890.730350647],[793263.4794331342,7456737.856294097],[793110.6053765863,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136260/82294","x":136260,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7456737.856294097],[793263.4794331342,7456890.730350647],[793416.3534896858,7456890.730350647],[793416.3534896858,7456737.856294097],[793263.4794331342,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136261/82294","x":136261,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7456584.9822375495],[793110.6053765863,7456737.856294097],[793263.4794331342,7456737.856294097],[793263.4794331342,7456584.9822375495],[793110.6053765863,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136260/82295","x":136260,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7456584.9822375495],[793263.4794331342,7456737.856294097],[793416.3534896858,7456737.856294097],[793416.3534896858,7456584.9822375495],[793263.4794331342,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136261/82295","x":136261,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7456737.856294097],[793416.3534896858,7456890.730350647],[793569.2275462337,7456890.730350647],[793569.2275462337,7456737.856294097],[793416.3534896858,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136262/82294","x":136262,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7456737.856294097],[793569.2275462337,7456890.730350647],[793722.1016027816,7456890.730350647],[793722.1016027816,7456737.856294097],[793569.2275462337,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136263/82294","x":136263,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7456584.9822375495],[793416.3534896858,7456737.856294097],[793569.2275462337,7456737.856294097],[793569.2275462337,7456584.9822375495],[793416.3534896858,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136262/82295","x":136262,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7456584.9822375495],[793569.2275462337,7456737.856294097],[793722.1016027816,7456737.856294097],[793722.1016027816,7456584.9822375495],[793569.2275462337,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136263/82295","x":136263,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7457655.100633392],[794486.4718855284,7457807.974689942],[794639.3459420763,7457807.974689942],[794639.3459420763,7457655.100633392],[794486.4718855284,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136269/82288","x":136269,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7457502.226576842],[794486.4718855284,7457655.100633392],[794639.3459420763,7457655.100633392],[794639.3459420763,7457502.226576842],[794486.4718855284,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136269/82289","x":136269,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7457655.100633392],[794639.3459420763,7457807.974689942],[794792.2199986279,7457807.974689942],[794792.2199986279,7457655.100633392],[794639.3459420763,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136270/82288","x":136270,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7457655.100633392],[794792.2199986279,7457807.974689942],[794945.0940551758,7457807.974689942],[794945.0940551758,7457655.100633392],[794792.2199986279,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136271/82288","x":136271,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7457502.226576842],[794639.3459420763,7457655.100633392],[794792.2199986279,7457655.100633392],[794792.2199986279,7457502.226576842],[794639.3459420763,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136270/82289","x":136270,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7456584.9822375495],[793722.1016027816,7456737.856294097],[793874.9756593332,7456737.856294097],[793874.9756593332,7456584.9822375495],[793722.1016027816,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136264/82295","x":136264,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7456432.108181],[792804.8572634906,7456584.9822375495],[792957.7313200384,7456584.9822375495],[792957.7313200384,7456432.108181],[792804.8572634906,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136258/82296","x":136258,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7456432.108181],[792957.7313200384,7456584.9822375495],[793110.6053765863,7456584.9822375495],[793110.6053765863,7456432.108181],[792957.7313200384,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136259/82296","x":136259,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7456279.23412445],[792957.7313200384,7456432.108181],[793110.6053765863,7456432.108181],[793110.6053765863,7456279.23412445],[792957.7313200384,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136259/82297","x":136259,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7456432.108181],[793110.6053765863,7456584.9822375495],[793263.4794331342,7456584.9822375495],[793263.4794331342,7456432.108181],[793110.6053765863,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136260/82296","x":136260,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7456432.108181],[793263.4794331342,7456584.9822375495],[793416.3534896858,7456584.9822375495],[793416.3534896858,7456432.108181],[793263.4794331342,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136261/82296","x":136261,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7456279.23412445],[793110.6053765863,7456432.108181],[793263.4794331342,7456432.108181],[793263.4794331342,7456279.23412445],[793110.6053765863,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136260/82297","x":136260,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7456279.23412445],[793263.4794331342,7456432.108181],[793416.3534896858,7456432.108181],[793416.3534896858,7456279.23412445],[793263.4794331342,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136261/82297","x":136261,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7456432.108181],[793416.3534896858,7456584.9822375495],[793569.2275462337,7456584.9822375495],[793569.2275462337,7456432.108181],[793416.3534896858,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136262/82296","x":136262,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7456432.108181],[793569.2275462337,7456584.9822375495],[793722.1016027816,7456584.9822375495],[793722.1016027816,7456432.108181],[793569.2275462337,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136263/82296","x":136263,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7456279.23412445],[793416.3534896858,7456432.108181],[793569.2275462337,7456432.108181],[793569.2275462337,7456279.23412445],[793416.3534896858,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136262/82297","x":136262,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7456279.23412445],[793569.2275462337,7456432.108181],[793722.1016027816,7456432.108181],[793722.1016027816,7456279.23412445],[793569.2275462337,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136263/82297","x":136263,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7456126.360067902],[793110.6053765863,7456279.23412445],[793263.4794331342,7456279.23412445],[793263.4794331342,7456126.360067902],[793110.6053765863,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136260/82298","x":136260,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7456126.360067902],[793263.4794331342,7456279.23412445],[793416.3534896858,7456279.23412445],[793416.3534896858,7456126.360067902],[793263.4794331342,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136261/82298","x":136261,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7456126.360067902],[793416.3534896858,7456279.23412445],[793569.2275462337,7456279.23412445],[793569.2275462337,7456126.360067902],[793416.3534896858,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136262/82298","x":136262,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7456126.360067902],[793569.2275462337,7456279.23412445],[793722.1016027816,7456279.23412445],[793722.1016027816,7456126.360067902],[793569.2275462337,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136263/82298","x":136263,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7455973.486011352],[793416.3534896858,7456126.360067902],[793569.2275462337,7456126.360067902],[793569.2275462337,7455973.486011352],[793416.3534896858,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136262/82299","x":136262,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7455973.486011352],[793569.2275462337,7456126.360067902],[793722.1016027816,7456126.360067902],[793722.1016027816,7455973.486011352],[793569.2275462337,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136263/82299","x":136263,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7455820.611954803],[793569.2275462337,7455973.486011352],[793722.1016027816,7455973.486011352],[793722.1016027816,7455820.611954803],[793569.2275462337,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136263/82300","x":136263,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7456432.108181],[793722.1016027816,7456584.9822375495],[793874.9756593332,7456584.9822375495],[793874.9756593332,7456432.108181],[793722.1016027816,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136264/82296","x":136264,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7456432.108181],[793874.9756593332,7456584.9822375495],[794027.849715881,7456584.9822375495],[794027.849715881,7456432.108181],[793874.9756593332,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136265/82296","x":136265,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7456279.23412445],[793722.1016027816,7456432.108181],[793874.9756593332,7456432.108181],[793874.9756593332,7456279.23412445],[793722.1016027816,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136264/82297","x":136264,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7456279.23412445],[793874.9756593332,7456432.108181],[794027.849715881,7456432.108181],[794027.849715881,7456279.23412445],[793874.9756593332,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136265/82297","x":136265,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7456279.23412445],[794027.849715881,7456432.108181],[794180.7237724289,7456432.108181],[794180.7237724289,7456279.23412445],[794027.849715881,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136266/82297","x":136266,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7456126.360067902],[793722.1016027816,7456279.23412445],[793874.9756593332,7456279.23412445],[793874.9756593332,7456126.360067902],[793722.1016027816,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136264/82298","x":136264,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7456126.360067902],[793874.9756593332,7456279.23412445],[794027.849715881,7456279.23412445],[794027.849715881,7456126.360067902],[793874.9756593332,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136265/82298","x":136265,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7455973.486011352],[793722.1016027816,7456126.360067902],[793874.9756593332,7456126.360067902],[793874.9756593332,7455973.486011352],[793722.1016027816,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136264/82299","x":136264,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7455973.486011352],[793874.9756593332,7456126.360067902],[794027.849715881,7456126.360067902],[794027.849715881,7455973.486011352],[793874.9756593332,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136265/82299","x":136265,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7456126.360067902],[794027.849715881,7456279.23412445],[794180.7237724289,7456279.23412445],[794180.7237724289,7456126.360067902],[794027.849715881,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136266/82298","x":136266,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7456126.360067902],[794180.7237724289,7456279.23412445],[794333.5978289805,7456279.23412445],[794333.5978289805,7456126.360067902],[794180.7237724289,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136267/82298","x":136267,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7455973.486011352],[794027.849715881,7456126.360067902],[794180.7237724289,7456126.360067902],[794180.7237724289,7455973.486011352],[794027.849715881,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136266/82299","x":136266,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7455973.486011352],[794180.7237724289,7456126.360067902],[794333.5978289805,7456126.360067902],[794333.5978289805,7455973.486011352],[794180.7237724289,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136267/82299","x":136267,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7456126.360067902],[794333.5978289805,7456279.23412445],[794486.4718855284,7456279.23412445],[794486.4718855284,7456126.360067902],[794333.5978289805,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136268/82298","x":136268,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7456126.360067902],[794486.4718855284,7456279.23412445],[794639.3459420763,7456279.23412445],[794639.3459420763,7456126.360067902],[794486.4718855284,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136269/82298","x":136269,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7455973.486011352],[794333.5978289805,7456126.360067902],[794486.4718855284,7456126.360067902],[794486.4718855284,7455973.486011352],[794333.5978289805,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136268/82299","x":136268,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7455973.486011352],[794486.4718855284,7456126.360067902],[794639.3459420763,7456126.360067902],[794639.3459420763,7455973.486011352],[794486.4718855284,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136269/82299","x":136269,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7456126.360067902],[794639.3459420763,7456279.23412445],[794792.2199986279,7456279.23412445],[794792.2199986279,7456126.360067902],[794639.3459420763,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136270/82298","x":136270,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7456126.360067902],[794792.2199986279,7456279.23412445],[794945.0940551758,7456279.23412445],[794945.0940551758,7456126.360067902],[794792.2199986279,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136271/82298","x":136271,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7455973.486011352],[794639.3459420763,7456126.360067902],[794792.2199986279,7456126.360067902],[794792.2199986279,7455973.486011352],[794639.3459420763,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136270/82299","x":136270,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7455973.486011352],[794792.2199986279,7456126.360067902],[794945.0940551758,7456126.360067902],[794945.0940551758,7455973.486011352],[794792.2199986279,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136271/82299","x":136271,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7455820.611954803],[793722.1016027816,7455973.486011352],[793874.9756593332,7455973.486011352],[793874.9756593332,7455820.611954803],[793722.1016027816,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136264/82300","x":136264,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7455820.611954803],[793874.9756593332,7455973.486011352],[794027.849715881,7455973.486011352],[794027.849715881,7455820.611954803],[793874.9756593332,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136265/82300","x":136265,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7455667.737898255],[793722.1016027816,7455820.611954803],[793874.9756593332,7455820.611954803],[793874.9756593332,7455667.737898255],[793722.1016027816,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136264/82301","x":136264,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7455667.737898255],[793874.9756593332,7455820.611954803],[794027.849715881,7455820.611954803],[794027.849715881,7455667.737898255],[793874.9756593332,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136265/82301","x":136265,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7455820.611954803],[794027.849715881,7455973.486011352],[794180.7237724289,7455973.486011352],[794180.7237724289,7455820.611954803],[794027.849715881,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136266/82300","x":136266,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7455820.611954803],[794180.7237724289,7455973.486011352],[794333.5978289805,7455973.486011352],[794333.5978289805,7455820.611954803],[794180.7237724289,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136267/82300","x":136267,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7455667.737898255],[794027.849715881,7455820.611954803],[794180.7237724289,7455820.611954803],[794180.7237724289,7455667.737898255],[794027.849715881,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136266/82301","x":136266,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7455667.737898255],[794180.7237724289,7455820.611954803],[794333.5978289805,7455820.611954803],[794333.5978289805,7455667.737898255],[794180.7237724289,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136267/82301","x":136267,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7455514.863841705],[793874.9756593332,7455667.737898255],[794027.849715881,7455667.737898255],[794027.849715881,7455514.863841705],[793874.9756593332,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136265/82302","x":136265,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7455514.863841705],[794027.849715881,7455667.737898255],[794180.7237724289,7455667.737898255],[794180.7237724289,7455514.863841705],[794027.849715881,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136266/82302","x":136266,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7455514.863841705],[794180.7237724289,7455667.737898255],[794333.5978289805,7455667.737898255],[794333.5978289805,7455514.863841705],[794180.7237724289,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136267/82302","x":136267,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7455361.989785155],[794027.849715881,7455514.863841705],[794180.7237724289,7455514.863841705],[794180.7237724289,7455361.989785155],[794027.849715881,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136266/82303","x":136266,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7455361.989785155],[794180.7237724289,7455514.863841705],[794333.5978289805,7455514.863841705],[794333.5978289805,7455361.989785155],[794180.7237724289,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136267/82303","x":136267,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7455820.611954803],[794333.5978289805,7455973.486011352],[794486.4718855284,7455973.486011352],[794486.4718855284,7455820.611954803],[794333.5978289805,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136268/82300","x":136268,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7455820.611954803],[794486.4718855284,7455973.486011352],[794639.3459420763,7455973.486011352],[794639.3459420763,7455820.611954803],[794486.4718855284,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136269/82300","x":136269,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7455667.737898255],[794333.5978289805,7455820.611954803],[794486.4718855284,7455820.611954803],[794486.4718855284,7455667.737898255],[794333.5978289805,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136268/82301","x":136268,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7455667.737898255],[794486.4718855284,7455820.611954803],[794639.3459420763,7455820.611954803],[794639.3459420763,7455667.737898255],[794486.4718855284,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136269/82301","x":136269,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7455820.611954803],[794639.3459420763,7455973.486011352],[794792.2199986279,7455973.486011352],[794792.2199986279,7455820.611954803],[794639.3459420763,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136270/82300","x":136270,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7455820.611954803],[794792.2199986279,7455973.486011352],[794945.0940551758,7455973.486011352],[794945.0940551758,7455820.611954803],[794792.2199986279,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136271/82300","x":136271,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7455667.737898255],[794639.3459420763,7455820.611954803],[794792.2199986279,7455820.611954803],[794792.2199986279,7455667.737898255],[794639.3459420763,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136270/82301","x":136270,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7455667.737898255],[794792.2199986279,7455820.611954803],[794945.0940551758,7455820.611954803],[794945.0940551758,7455667.737898255],[794792.2199986279,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136271/82301","x":136271,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7455514.863841705],[794333.5978289805,7455667.737898255],[794486.4718855284,7455667.737898255],[794486.4718855284,7455514.863841705],[794333.5978289805,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136268/82302","x":136268,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7455514.863841705],[794486.4718855284,7455667.737898255],[794639.3459420763,7455667.737898255],[794639.3459420763,7455514.863841705],[794486.4718855284,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136269/82302","x":136269,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7455361.989785155],[794333.5978289805,7455514.863841705],[794486.4718855284,7455514.863841705],[794486.4718855284,7455361.989785155],[794333.5978289805,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136268/82303","x":136268,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7455361.989785155],[794486.4718855284,7455514.863841705],[794639.3459420763,7455514.863841705],[794639.3459420763,7455361.989785155],[794486.4718855284,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136269/82303","x":136269,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7455514.863841705],[794639.3459420763,7455667.737898255],[794792.2199986279,7455667.737898255],[794792.2199986279,7455514.863841705],[794639.3459420763,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136270/82302","x":136270,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7455514.863841705],[794792.2199986279,7455667.737898255],[794945.0940551758,7455667.737898255],[794945.0940551758,7455514.863841705],[794792.2199986279,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136271/82302","x":136271,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7455361.989785155],[794639.3459420763,7455514.863841705],[794792.2199986279,7455514.863841705],[794792.2199986279,7455361.989785155],[794639.3459420763,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136270/82303","x":136270,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7455361.989785155],[794792.2199986279,7455514.863841705],[794945.0940551758,7455514.863841705],[794945.0940551758,7455361.989785155],[794792.2199986279,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136271/82303","x":136271,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7457655.100633392],[794945.0940551758,7457807.974689942],[795097.9681117237,7457807.974689942],[795097.9681117237,7457655.100633392],[794945.0940551758,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136272/82288","x":136272,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7457655.100633392],[795097.9681117237,7457807.974689942],[795250.8421682753,7457807.974689942],[795250.8421682753,7457655.100633392],[795097.9681117237,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136273/82288","x":136273,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7457655.100633392],[795250.8421682753,7457807.974689942],[795403.7162248231,7457807.974689942],[795403.7162248231,7457655.100633392],[795250.8421682753,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136274/82288","x":136274,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7457655.100633392],[795403.7162248231,7457807.974689942],[795556.590281371,7457807.974689942],[795556.590281371,7457655.100633392],[795403.7162248231,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136275/82288","x":136275,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7457655.100633392],[795556.590281371,7457807.974689942],[795709.4643379226,7457807.974689942],[795709.4643379226,7457655.100633392],[795556.590281371,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136276/82288","x":136276,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7457655.100633392],[795709.4643379226,7457807.974689942],[795862.3383944705,7457807.974689942],[795862.3383944705,7457655.100633392],[795709.4643379226,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136277/82288","x":136277,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7457655.100633392],[795862.3383944705,7457807.974689942],[796015.2124510184,7457807.974689942],[796015.2124510184,7457655.100633392],[795862.3383944705,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136278/82288","x":136278,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7457655.100633392],[796015.2124510184,7457807.974689942],[796168.08650757,7457807.974689942],[796168.08650757,7457655.100633392],[796015.2124510184,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136279/82288","x":136279,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7457655.100633392],[796168.08650757,7457807.974689942],[796320.9605641179,7457807.974689942],[796320.9605641179,7457655.100633392],[796168.08650757,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136280/82288","x":136280,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7457655.100633392],[796320.9605641179,7457807.974689942],[796473.8346206658,7457807.974689942],[796473.8346206658,7457655.100633392],[796320.9605641179,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136281/82288","x":136281,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7457655.100633392],[796473.8346206658,7457807.974689942],[796626.7086772174,7457807.974689942],[796626.7086772174,7457655.100633392],[796473.8346206658,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136282/82288","x":136282,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7456737.856294097],[797238.2049034126,7456890.730350647],[797391.0789599605,7456890.730350647],[797391.0789599605,7456737.856294097],[797238.2049034126,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136287/82294","x":136287,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7456584.9822375495],[797085.330846861,7456737.856294097],[797238.2049034126,7456737.856294097],[797238.2049034126,7456584.9822375495],[797085.330846861,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136286/82295","x":136286,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7456584.9822375495],[797238.2049034126,7456737.856294097],[797391.0789599605,7456737.856294097],[797391.0789599605,7456584.9822375495],[797238.2049034126,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136287/82295","x":136287,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7456126.360067902],[794945.0940551758,7456279.23412445],[795097.9681117237,7456279.23412445],[795097.9681117237,7456126.360067902],[794945.0940551758,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136272/82298","x":136272,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7456126.360067902],[795097.9681117237,7456279.23412445],[795250.8421682753,7456279.23412445],[795250.8421682753,7456126.360067902],[795097.9681117237,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136273/82298","x":136273,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7455973.486011352],[794945.0940551758,7456126.360067902],[795097.9681117237,7456126.360067902],[795097.9681117237,7455973.486011352],[794945.0940551758,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136272/82299","x":136272,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7455973.486011352],[795097.9681117237,7456126.360067902],[795250.8421682753,7456126.360067902],[795250.8421682753,7455973.486011352],[795097.9681117237,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136273/82299","x":136273,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7456126.360067902],[795250.8421682753,7456279.23412445],[795403.7162248231,7456279.23412445],[795403.7162248231,7456126.360067902],[795250.8421682753,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136274/82298","x":136274,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7456126.360067902],[795403.7162248231,7456279.23412445],[795556.590281371,7456279.23412445],[795556.590281371,7456126.360067902],[795403.7162248231,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136275/82298","x":136275,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7455973.486011352],[795250.8421682753,7456126.360067902],[795403.7162248231,7456126.360067902],[795403.7162248231,7455973.486011352],[795250.8421682753,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136274/82299","x":136274,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7455973.486011352],[795403.7162248231,7456126.360067902],[795556.590281371,7456126.360067902],[795556.590281371,7455973.486011352],[795403.7162248231,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136275/82299","x":136275,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7456126.360067902],[795556.590281371,7456279.23412445],[795709.4643379226,7456279.23412445],[795709.4643379226,7456126.360067902],[795556.590281371,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136276/82298","x":136276,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7456126.360067902],[795709.4643379226,7456279.23412445],[795862.3383944705,7456279.23412445],[795862.3383944705,7456126.360067902],[795709.4643379226,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136277/82298","x":136277,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7455973.486011352],[795556.590281371,7456126.360067902],[795709.4643379226,7456126.360067902],[795709.4643379226,7455973.486011352],[795556.590281371,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136276/82299","x":136276,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7455973.486011352],[795709.4643379226,7456126.360067902],[795862.3383944705,7456126.360067902],[795862.3383944705,7455973.486011352],[795709.4643379226,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136277/82299","x":136277,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7456126.360067902],[795862.3383944705,7456279.23412445],[796015.2124510184,7456279.23412445],[796015.2124510184,7456126.360067902],[795862.3383944705,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136278/82298","x":136278,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7456126.360067902],[796015.2124510184,7456279.23412445],[796168.08650757,7456279.23412445],[796168.08650757,7456126.360067902],[796015.2124510184,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136279/82298","x":136279,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7455973.486011352],[795862.3383944705,7456126.360067902],[796015.2124510184,7456126.360067902],[796015.2124510184,7455973.486011352],[795862.3383944705,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136278/82299","x":136278,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7455973.486011352],[796015.2124510184,7456126.360067902],[796168.08650757,7456126.360067902],[796168.08650757,7455973.486011352],[796015.2124510184,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136279/82299","x":136279,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7455820.611954803],[794945.0940551758,7455973.486011352],[795097.9681117237,7455973.486011352],[795097.9681117237,7455820.611954803],[794945.0940551758,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136272/82300","x":136272,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7455820.611954803],[795097.9681117237,7455973.486011352],[795250.8421682753,7455973.486011352],[795250.8421682753,7455820.611954803],[795097.9681117237,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136273/82300","x":136273,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7455667.737898255],[794945.0940551758,7455820.611954803],[795097.9681117237,7455820.611954803],[795097.9681117237,7455667.737898255],[794945.0940551758,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136272/82301","x":136272,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7455667.737898255],[795097.9681117237,7455820.611954803],[795250.8421682753,7455820.611954803],[795250.8421682753,7455667.737898255],[795097.9681117237,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136273/82301","x":136273,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7455820.611954803],[795250.8421682753,7455973.486011352],[795403.7162248231,7455973.486011352],[795403.7162248231,7455820.611954803],[795250.8421682753,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136274/82300","x":136274,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7455820.611954803],[795403.7162248231,7455973.486011352],[795556.590281371,7455973.486011352],[795556.590281371,7455820.611954803],[795403.7162248231,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136275/82300","x":136275,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7455667.737898255],[795250.8421682753,7455820.611954803],[795403.7162248231,7455820.611954803],[795403.7162248231,7455667.737898255],[795250.8421682753,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136274/82301","x":136274,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7455667.737898255],[795403.7162248231,7455820.611954803],[795556.590281371,7455820.611954803],[795556.590281371,7455667.737898255],[795403.7162248231,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136275/82301","x":136275,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7455514.863841705],[794945.0940551758,7455667.737898255],[795097.9681117237,7455667.737898255],[795097.9681117237,7455514.863841705],[794945.0940551758,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136272/82302","x":136272,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7455514.863841705],[795097.9681117237,7455667.737898255],[795250.8421682753,7455667.737898255],[795250.8421682753,7455514.863841705],[795097.9681117237,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136273/82302","x":136273,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7455361.989785155],[794945.0940551758,7455514.863841705],[795097.9681117237,7455514.863841705],[795097.9681117237,7455361.989785155],[794945.0940551758,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136272/82303","x":136272,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7455361.989785155],[795097.9681117237,7455514.863841705],[795250.8421682753,7455514.863841705],[795250.8421682753,7455361.989785155],[795097.9681117237,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136273/82303","x":136273,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7455514.863841705],[795250.8421682753,7455667.737898255],[795403.7162248231,7455667.737898255],[795403.7162248231,7455514.863841705],[795250.8421682753,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136274/82302","x":136274,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7455514.863841705],[795403.7162248231,7455667.737898255],[795556.590281371,7455667.737898255],[795556.590281371,7455514.863841705],[795403.7162248231,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136275/82302","x":136275,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7455361.989785155],[795250.8421682753,7455514.863841705],[795403.7162248231,7455514.863841705],[795403.7162248231,7455361.989785155],[795250.8421682753,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136274/82303","x":136274,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7455361.989785155],[795403.7162248231,7455514.863841705],[795556.590281371,7455514.863841705],[795556.590281371,7455361.989785155],[795403.7162248231,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136275/82303","x":136275,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7455820.611954803],[795556.590281371,7455973.486011352],[795709.4643379226,7455973.486011352],[795709.4643379226,7455820.611954803],[795556.590281371,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136276/82300","x":136276,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7455820.611954803],[795709.4643379226,7455973.486011352],[795862.3383944705,7455973.486011352],[795862.3383944705,7455820.611954803],[795709.4643379226,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136277/82300","x":136277,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7455667.737898255],[795556.590281371,7455820.611954803],[795709.4643379226,7455820.611954803],[795709.4643379226,7455667.737898255],[795556.590281371,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136276/82301","x":136276,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7455667.737898255],[795709.4643379226,7455820.611954803],[795862.3383944705,7455820.611954803],[795862.3383944705,7455667.737898255],[795709.4643379226,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136277/82301","x":136277,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7455820.611954803],[795862.3383944705,7455973.486011352],[796015.2124510184,7455973.486011352],[796015.2124510184,7455820.611954803],[795862.3383944705,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136278/82300","x":136278,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7455820.611954803],[796015.2124510184,7455973.486011352],[796168.08650757,7455973.486011352],[796168.08650757,7455820.611954803],[796015.2124510184,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136279/82300","x":136279,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7455667.737898255],[795862.3383944705,7455820.611954803],[796015.2124510184,7455820.611954803],[796015.2124510184,7455667.737898255],[795862.3383944705,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136278/82301","x":136278,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7455667.737898255],[796015.2124510184,7455820.611954803],[796168.08650757,7455820.611954803],[796168.08650757,7455667.737898255],[796015.2124510184,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136279/82301","x":136279,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7455514.863841705],[795556.590281371,7455667.737898255],[795709.4643379226,7455667.737898255],[795709.4643379226,7455514.863841705],[795556.590281371,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136276/82302","x":136276,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7455514.863841705],[795709.4643379226,7455667.737898255],[795862.3383944705,7455667.737898255],[795862.3383944705,7455514.863841705],[795709.4643379226,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136277/82302","x":136277,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7455361.989785155],[795556.590281371,7455514.863841705],[795709.4643379226,7455514.863841705],[795709.4643379226,7455361.989785155],[795556.590281371,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136276/82303","x":136276,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7455361.989785155],[795709.4643379226,7455514.863841705],[795862.3383944705,7455514.863841705],[795862.3383944705,7455361.989785155],[795709.4643379226,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136277/82303","x":136277,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7455514.863841705],[795862.3383944705,7455667.737898255],[796015.2124510184,7455667.737898255],[796015.2124510184,7455514.863841705],[795862.3383944705,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136278/82302","x":136278,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7455514.863841705],[796015.2124510184,7455667.737898255],[796168.08650757,7455667.737898255],[796168.08650757,7455514.863841705],[796015.2124510184,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136279/82302","x":136279,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7455361.989785155],[795862.3383944705,7455514.863841705],[796015.2124510184,7455514.863841705],[796015.2124510184,7455361.989785155],[795862.3383944705,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136278/82303","x":136278,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7455361.989785155],[796015.2124510184,7455514.863841705],[796168.08650757,7455514.863841705],[796168.08650757,7455361.989785155],[796015.2124510184,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136279/82303","x":136279,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7456126.360067902],[796168.08650757,7456279.23412445],[796320.9605641179,7456279.23412445],[796320.9605641179,7456126.360067902],[796168.08650757,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136280/82298","x":136280,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7456126.360067902],[796320.9605641179,7456279.23412445],[796473.8346206658,7456279.23412445],[796473.8346206658,7456126.360067902],[796320.9605641179,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136281/82298","x":136281,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7455973.486011352],[796168.08650757,7456126.360067902],[796320.9605641179,7456126.360067902],[796320.9605641179,7455973.486011352],[796168.08650757,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136280/82299","x":136280,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7455973.486011352],[796320.9605641179,7456126.360067902],[796473.8346206658,7456126.360067902],[796473.8346206658,7455973.486011352],[796320.9605641179,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136281/82299","x":136281,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7456126.360067902],[796473.8346206658,7456279.23412445],[796626.7086772174,7456279.23412445],[796626.7086772174,7456126.360067902],[796473.8346206658,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136282/82298","x":136282,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7456126.360067902],[796626.7086772174,7456279.23412445],[796779.5827337652,7456279.23412445],[796779.5827337652,7456126.360067902],[796626.7086772174,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136283/82298","x":136283,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7455973.486011352],[796473.8346206658,7456126.360067902],[796626.7086772174,7456126.360067902],[796626.7086772174,7455973.486011352],[796473.8346206658,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136282/82299","x":136282,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7455973.486011352],[796626.7086772174,7456126.360067902],[796779.5827337652,7456126.360067902],[796779.5827337652,7455973.486011352],[796626.7086772174,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136283/82299","x":136283,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7456432.108181],[796932.4567903131,7456584.9822375495],[797085.330846861,7456584.9822375495],[797085.330846861,7456432.108181],[796932.4567903131,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136285/82296","x":136285,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7456279.23412445],[796779.5827337652,7456432.108181],[796932.4567903131,7456432.108181],[796932.4567903131,7456279.23412445],[796779.5827337652,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136284/82297","x":136284,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7456279.23412445],[796932.4567903131,7456432.108181],[797085.330846861,7456432.108181],[797085.330846861,7456279.23412445],[796932.4567903131,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136285/82297","x":136285,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7456432.108181],[797085.330846861,7456584.9822375495],[797238.2049034126,7456584.9822375495],[797238.2049034126,7456432.108181],[797085.330846861,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136286/82296","x":136286,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7456432.108181],[797238.2049034126,7456584.9822375495],[797391.0789599605,7456584.9822375495],[797391.0789599605,7456432.108181],[797238.2049034126,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136287/82296","x":136287,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7456279.23412445],[797085.330846861,7456432.108181],[797238.2049034126,7456432.108181],[797238.2049034126,7456279.23412445],[797085.330846861,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136286/82297","x":136286,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7456279.23412445],[797238.2049034126,7456432.108181],[797391.0789599605,7456432.108181],[797391.0789599605,7456279.23412445],[797238.2049034126,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136287/82297","x":136287,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7456126.360067902],[796779.5827337652,7456279.23412445],[796932.4567903131,7456279.23412445],[796932.4567903131,7456126.360067902],[796779.5827337652,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136284/82298","x":136284,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7456126.360067902],[796932.4567903131,7456279.23412445],[797085.330846861,7456279.23412445],[797085.330846861,7456126.360067902],[796932.4567903131,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136285/82298","x":136285,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7455973.486011352],[796779.5827337652,7456126.360067902],[796932.4567903131,7456126.360067902],[796932.4567903131,7455973.486011352],[796779.5827337652,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136284/82299","x":136284,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7455973.486011352],[796932.4567903131,7456126.360067902],[797085.330846861,7456126.360067902],[797085.330846861,7455973.486011352],[796932.4567903131,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136285/82299","x":136285,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7456126.360067902],[797085.330846861,7456279.23412445],[797238.2049034126,7456279.23412445],[797238.2049034126,7456126.360067902],[797085.330846861,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136286/82298","x":136286,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7456126.360067902],[797238.2049034126,7456279.23412445],[797391.0789599605,7456279.23412445],[797391.0789599605,7456126.360067902],[797238.2049034126,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136287/82298","x":136287,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7455973.486011352],[797085.330846861,7456126.360067902],[797238.2049034126,7456126.360067902],[797238.2049034126,7455973.486011352],[797085.330846861,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136286/82299","x":136286,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7455973.486011352],[797238.2049034126,7456126.360067902],[797391.0789599605,7456126.360067902],[797391.0789599605,7455973.486011352],[797238.2049034126,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136287/82299","x":136287,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7455820.611954803],[796168.08650757,7455973.486011352],[796320.9605641179,7455973.486011352],[796320.9605641179,7455820.611954803],[796168.08650757,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136280/82300","x":136280,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7455820.611954803],[796320.9605641179,7455973.486011352],[796473.8346206658,7455973.486011352],[796473.8346206658,7455820.611954803],[796320.9605641179,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136281/82300","x":136281,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7455667.737898255],[796168.08650757,7455820.611954803],[796320.9605641179,7455820.611954803],[796320.9605641179,7455667.737898255],[796168.08650757,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136280/82301","x":136280,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7455667.737898255],[796320.9605641179,7455820.611954803],[796473.8346206658,7455820.611954803],[796473.8346206658,7455667.737898255],[796320.9605641179,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136281/82301","x":136281,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7455820.611954803],[796473.8346206658,7455973.486011352],[796626.7086772174,7455973.486011352],[796626.7086772174,7455820.611954803],[796473.8346206658,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136282/82300","x":136282,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7455820.611954803],[796626.7086772174,7455973.486011352],[796779.5827337652,7455973.486011352],[796779.5827337652,7455820.611954803],[796626.7086772174,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136283/82300","x":136283,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7455667.737898255],[796473.8346206658,7455820.611954803],[796626.7086772174,7455820.611954803],[796626.7086772174,7455667.737898255],[796473.8346206658,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136282/82301","x":136282,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7455667.737898255],[796626.7086772174,7455820.611954803],[796779.5827337652,7455820.611954803],[796779.5827337652,7455667.737898255],[796626.7086772174,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136283/82301","x":136283,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7455514.863841705],[796168.08650757,7455667.737898255],[796320.9605641179,7455667.737898255],[796320.9605641179,7455514.863841705],[796168.08650757,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136280/82302","x":136280,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7455514.863841705],[796320.9605641179,7455667.737898255],[796473.8346206658,7455667.737898255],[796473.8346206658,7455514.863841705],[796320.9605641179,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136281/82302","x":136281,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7455361.989785155],[796168.08650757,7455514.863841705],[796320.9605641179,7455514.863841705],[796320.9605641179,7455361.989785155],[796168.08650757,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136280/82303","x":136280,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7455361.989785155],[796320.9605641179,7455514.863841705],[796473.8346206658,7455514.863841705],[796473.8346206658,7455361.989785155],[796320.9605641179,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136281/82303","x":136281,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7455514.863841705],[796473.8346206658,7455667.737898255],[796626.7086772174,7455667.737898255],[796626.7086772174,7455514.863841705],[796473.8346206658,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136282/82302","x":136282,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7455514.863841705],[796626.7086772174,7455667.737898255],[796779.5827337652,7455667.737898255],[796779.5827337652,7455514.863841705],[796626.7086772174,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136283/82302","x":136283,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7455361.989785155],[796473.8346206658,7455514.863841705],[796626.7086772174,7455514.863841705],[796626.7086772174,7455361.989785155],[796473.8346206658,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136282/82303","x":136282,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7455361.989785155],[796626.7086772174,7455514.863841705],[796779.5827337652,7455514.863841705],[796779.5827337652,7455361.989785155],[796626.7086772174,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136283/82303","x":136283,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7455820.611954803],[796779.5827337652,7455973.486011352],[796932.4567903131,7455973.486011352],[796932.4567903131,7455820.611954803],[796779.5827337652,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136284/82300","x":136284,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7455820.611954803],[796932.4567903131,7455973.486011352],[797085.330846861,7455973.486011352],[797085.330846861,7455820.611954803],[796932.4567903131,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136285/82300","x":136285,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7455667.737898255],[796779.5827337652,7455820.611954803],[796932.4567903131,7455820.611954803],[796932.4567903131,7455667.737898255],[796779.5827337652,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136284/82301","x":136284,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7455667.737898255],[796932.4567903131,7455820.611954803],[797085.330846861,7455820.611954803],[797085.330846861,7455667.737898255],[796932.4567903131,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136285/82301","x":136285,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7455820.611954803],[797085.330846861,7455973.486011352],[797238.2049034126,7455973.486011352],[797238.2049034126,7455820.611954803],[797085.330846861,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136286/82300","x":136286,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7455514.863841705],[796779.5827337652,7455667.737898255],[796932.4567903131,7455667.737898255],[796932.4567903131,7455514.863841705],[796779.5827337652,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136284/82302","x":136284,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7460101.085538177],[797849.7011296079,7460253.959594727],[798002.5751861557,7460253.959594727],[798002.5751861557,7460101.085538177],[797849.7011296079,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136291/82272","x":136291,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7460101.085538177],[798002.5751861557,7460253.959594727],[798155.4492427073,7460253.959594727],[798155.4492427073,7460101.085538177],[798002.5751861557,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136292/82272","x":136292,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7460101.085538177],[798155.4492427073,7460253.959594727],[798308.3232992552,7460253.959594727],[798308.3232992552,7460101.085538177],[798155.4492427073,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136293/82272","x":136293,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7459948.211481629],[798002.5751861557,7460101.085538177],[798155.4492427073,7460101.085538177],[798155.4492427073,7459948.211481629],[798002.5751861557,7459948.211481629]]],"type":"Polygon"},"properties":{"label":"18/136292/82273","x":136292,"y":82273,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7459948.211481629],[798155.4492427073,7460101.085538177],[798308.3232992552,7460101.085538177],[798308.3232992552,7459948.211481629],[798155.4492427073,7459948.211481629]]],"type":"Polygon"},"properties":{"label":"18/136293/82273","x":136293,"y":82273,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7460101.085538177],[798308.3232992552,7460253.959594727],[798461.1973558031,7460253.959594727],[798461.1973558031,7460101.085538177],[798308.3232992552,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136294/82272","x":136294,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7460101.085538177],[798461.1973558031,7460253.959594727],[798614.0714123547,7460253.959594727],[798614.0714123547,7460101.085538177],[798461.1973558031,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136295/82272","x":136295,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7459948.211481629],[798308.3232992552,7460101.085538177],[798461.1973558031,7460101.085538177],[798461.1973558031,7459948.211481629],[798308.3232992552,7459948.211481629]]],"type":"Polygon"},"properties":{"label":"18/136294/82273","x":136294,"y":82273,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7459948.211481629],[798461.1973558031,7460101.085538177],[798614.0714123547,7460101.085538177],[798614.0714123547,7459948.211481629],[798461.1973558031,7459948.211481629]]],"type":"Polygon"},"properties":{"label":"18/136295/82273","x":136295,"y":82273,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7459795.337425079],[798002.5751861557,7459948.211481629],[798155.4492427073,7459948.211481629],[798155.4492427073,7459795.337425079],[798002.5751861557,7459795.337425079]]],"type":"Polygon"},"properties":{"label":"18/136292/82274","x":136292,"y":82274,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7459795.337425079],[798155.4492427073,7459948.211481629],[798308.3232992552,7459948.211481629],[798308.3232992552,7459795.337425079],[798155.4492427073,7459795.337425079]]],"type":"Polygon"},"properties":{"label":"18/136293/82274","x":136293,"y":82274,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7459642.463368529],[798002.5751861557,7459795.337425079],[798155.4492427073,7459795.337425079],[798155.4492427073,7459642.463368529],[798002.5751861557,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136292/82275","x":136292,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7459642.463368529],[798155.4492427073,7459795.337425079],[798308.3232992552,7459795.337425079],[798308.3232992552,7459642.463368529],[798155.4492427073,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136293/82275","x":136293,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7459795.337425079],[798308.3232992552,7459948.211481629],[798461.1973558031,7459948.211481629],[798461.1973558031,7459795.337425079],[798308.3232992552,7459795.337425079]]],"type":"Polygon"},"properties":{"label":"18/136294/82274","x":136294,"y":82274,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7459795.337425079],[798461.1973558031,7459948.211481629],[798614.0714123547,7459948.211481629],[798614.0714123547,7459795.337425079],[798461.1973558031,7459795.337425079]]],"type":"Polygon"},"properties":{"label":"18/136295/82274","x":136295,"y":82274,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7459642.463368529],[798308.3232992552,7459795.337425079],[798461.1973558031,7459795.337425079],[798461.1973558031,7459642.463368529],[798308.3232992552,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136294/82275","x":136294,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7459642.463368529],[798461.1973558031,7459795.337425079],[798614.0714123547,7459795.337425079],[798614.0714123547,7459642.463368529],[798461.1973558031,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136295/82275","x":136295,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7459489.589311982],[798002.5751861557,7459642.463368529],[798155.4492427073,7459642.463368529],[798155.4492427073,7459489.589311982],[798002.5751861557,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136292/82276","x":136292,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7459489.589311982],[798155.4492427073,7459642.463368529],[798308.3232992552,7459642.463368529],[798308.3232992552,7459489.589311982],[798155.4492427073,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136293/82276","x":136293,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7459336.715255432],[798002.5751861557,7459489.589311982],[798155.4492427073,7459489.589311982],[798155.4492427073,7459336.715255432],[798002.5751861557,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136292/82277","x":136292,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7459336.715255432],[798155.4492427073,7459489.589311982],[798308.3232992552,7459489.589311982],[798308.3232992552,7459336.715255432],[798155.4492427073,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136293/82277","x":136293,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7459489.589311982],[798308.3232992552,7459642.463368529],[798461.1973558031,7459642.463368529],[798461.1973558031,7459489.589311982],[798308.3232992552,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136294/82276","x":136294,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7459489.589311982],[798461.1973558031,7459642.463368529],[798614.0714123547,7459642.463368529],[798614.0714123547,7459489.589311982],[798461.1973558031,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136295/82276","x":136295,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7459336.715255432],[798308.3232992552,7459489.589311982],[798461.1973558031,7459489.589311982],[798461.1973558031,7459336.715255432],[798308.3232992552,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136294/82277","x":136294,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7459336.715255432],[798461.1973558031,7459489.589311982],[798614.0714123547,7459489.589311982],[798614.0714123547,7459336.715255432],[798461.1973558031,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136295/82277","x":136295,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7459183.841198882],[798002.5751861557,7459336.715255432],[798155.4492427073,7459336.715255432],[798155.4492427073,7459183.841198882],[798002.5751861557,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136292/82278","x":136292,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7459183.841198882],[798155.4492427073,7459336.715255432],[798308.3232992552,7459336.715255432],[798308.3232992552,7459183.841198882],[798155.4492427073,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136293/82278","x":136293,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7459030.967142334],[798002.5751861557,7459183.841198882],[798155.4492427073,7459183.841198882],[798155.4492427073,7459030.967142334],[798002.5751861557,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136292/82279","x":136292,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7459030.967142334],[798155.4492427073,7459183.841198882],[798308.3232992552,7459183.841198882],[798308.3232992552,7459030.967142334],[798155.4492427073,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136293/82279","x":136293,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7459183.841198882],[798308.3232992552,7459336.715255432],[798461.1973558031,7459336.715255432],[798461.1973558031,7459183.841198882],[798308.3232992552,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136294/82278","x":136294,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7459183.841198882],[798461.1973558031,7459336.715255432],[798614.0714123547,7459336.715255432],[798614.0714123547,7459183.841198882],[798461.1973558031,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136295/82278","x":136295,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7459030.967142334],[798308.3232992552,7459183.841198882],[798461.1973558031,7459183.841198882],[798461.1973558031,7459030.967142334],[798308.3232992552,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136294/82279","x":136294,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7459030.967142334],[798461.1973558031,7459183.841198882],[798614.0714123547,7459183.841198882],[798614.0714123547,7459030.967142334],[798461.1973558031,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136295/82279","x":136295,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7460101.085538177],[798614.0714123547,7460253.959594727],[798766.9454689026,7460253.959594727],[798766.9454689026,7460101.085538177],[798614.0714123547,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136296/82272","x":136296,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7459948.211481629],[798614.0714123547,7460101.085538177],[798766.9454689026,7460101.085538177],[798766.9454689026,7459948.211481629],[798614.0714123547,7459948.211481629]]],"type":"Polygon"},"properties":{"label":"18/136296/82273","x":136296,"y":82273,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7459795.337425079],[798614.0714123547,7459948.211481629],[798766.9454689026,7459948.211481629],[798766.9454689026,7459795.337425079],[798614.0714123547,7459795.337425079]]],"type":"Polygon"},"properties":{"label":"18/136296/82274","x":136296,"y":82274,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7459642.463368529],[798614.0714123547,7459795.337425079],[798766.9454689026,7459795.337425079],[798766.9454689026,7459642.463368529],[798614.0714123547,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136296/82275","x":136296,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7459489.589311982],[798614.0714123547,7459642.463368529],[798766.9454689026,7459642.463368529],[798766.9454689026,7459489.589311982],[798614.0714123547,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136296/82276","x":136296,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7459336.715255432],[798614.0714123547,7459489.589311982],[798766.9454689026,7459489.589311982],[798766.9454689026,7459336.715255432],[798614.0714123547,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136296/82277","x":136296,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7459183.841198882],[798614.0714123547,7459336.715255432],[798766.9454689026,7459336.715255432],[798766.9454689026,7459183.841198882],[798614.0714123547,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136296/82278","x":136296,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7459030.967142334],[798614.0714123547,7459183.841198882],[798766.9454689026,7459183.841198882],[798766.9454689026,7459030.967142334],[798614.0714123547,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136296/82279","x":136296,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7458878.0930857845],[798002.5751861557,7459030.967142334],[798155.4492427073,7459030.967142334],[798155.4492427073,7458878.0930857845],[798002.5751861557,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136292/82280","x":136292,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7458878.0930857845],[798155.4492427073,7459030.967142334],[798308.3232992552,7459030.967142334],[798308.3232992552,7458878.0930857845],[798155.4492427073,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136293/82280","x":136293,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7458725.219029237],[798002.5751861557,7458878.0930857845],[798155.4492427073,7458878.0930857845],[798155.4492427073,7458725.219029237],[798002.5751861557,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136292/82281","x":136292,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7458725.219029237],[798155.4492427073,7458878.0930857845],[798308.3232992552,7458878.0930857845],[798308.3232992552,7458725.219029237],[798155.4492427073,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136293/82281","x":136293,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7458878.0930857845],[798308.3232992552,7459030.967142334],[798461.1973558031,7459030.967142334],[798461.1973558031,7458878.0930857845],[798308.3232992552,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136294/82280","x":136294,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7458878.0930857845],[798461.1973558031,7459030.967142334],[798614.0714123547,7459030.967142334],[798614.0714123547,7458878.0930857845],[798461.1973558031,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136295/82280","x":136295,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7458725.219029237],[798308.3232992552,7458878.0930857845],[798461.1973558031,7458878.0930857845],[798461.1973558031,7458725.219029237],[798308.3232992552,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136294/82281","x":136294,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7458725.219029237],[798461.1973558031,7458878.0930857845],[798614.0714123547,7458878.0930857845],[798614.0714123547,7458725.219029237],[798461.1973558031,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136295/82281","x":136295,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7458572.344972687],[798002.5751861557,7458725.219029237],[798155.4492427073,7458725.219029237],[798155.4492427073,7458572.344972687],[798002.5751861557,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136292/82282","x":136292,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7458572.344972687],[798155.4492427073,7458725.219029237],[798308.3232992552,7458725.219029237],[798308.3232992552,7458572.344972687],[798155.4492427073,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136293/82282","x":136293,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7458419.470916137],[798002.5751861557,7458572.344972687],[798155.4492427073,7458572.344972687],[798155.4492427073,7458419.470916137],[798002.5751861557,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136292/82283","x":136292,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7458419.470916137],[798155.4492427073,7458572.344972687],[798308.3232992552,7458572.344972687],[798308.3232992552,7458419.470916137],[798155.4492427073,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136293/82283","x":136293,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7458572.344972687],[798308.3232992552,7458725.219029237],[798461.1973558031,7458725.219029237],[798461.1973558031,7458572.344972687],[798308.3232992552,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136294/82282","x":136294,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7458572.344972687],[798461.1973558031,7458725.219029237],[798614.0714123547,7458725.219029237],[798614.0714123547,7458572.344972687],[798461.1973558031,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136295/82282","x":136295,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7458419.470916137],[798308.3232992552,7458572.344972687],[798461.1973558031,7458572.344972687],[798461.1973558031,7458419.470916137],[798308.3232992552,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136294/82283","x":136294,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7458419.470916137],[798461.1973558031,7458572.344972687],[798614.0714123547,7458572.344972687],[798614.0714123547,7458419.470916137],[798461.1973558031,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136295/82283","x":136295,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7458266.596859589],[798002.5751861557,7458419.470916137],[798155.4492427073,7458419.470916137],[798155.4492427073,7458266.596859589],[798002.5751861557,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136292/82284","x":136292,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7458266.596859589],[798155.4492427073,7458419.470916137],[798308.3232992552,7458419.470916137],[798308.3232992552,7458266.596859589],[798155.4492427073,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136293/82284","x":136293,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7458113.7228030395],[798002.5751861557,7458266.596859589],[798155.4492427073,7458266.596859589],[798155.4492427073,7458113.7228030395],[798002.5751861557,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136292/82285","x":136292,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7458113.7228030395],[798155.4492427073,7458266.596859589],[798308.3232992552,7458266.596859589],[798308.3232992552,7458113.7228030395],[798155.4492427073,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136293/82285","x":136293,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7458266.596859589],[798308.3232992552,7458419.470916137],[798461.1973558031,7458419.470916137],[798461.1973558031,7458266.596859589],[798308.3232992552,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136294/82284","x":136294,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7458266.596859589],[798461.1973558031,7458419.470916137],[798614.0714123547,7458419.470916137],[798614.0714123547,7458266.596859589],[798461.1973558031,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136295/82284","x":136295,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7458113.7228030395],[798308.3232992552,7458266.596859589],[798461.1973558031,7458266.596859589],[798461.1973558031,7458113.7228030395],[798308.3232992552,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136294/82285","x":136294,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7458113.7228030395],[798461.1973558031,7458266.596859589],[798614.0714123547,7458266.596859589],[798614.0714123547,7458113.7228030395],[798461.1973558031,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136295/82285","x":136295,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7457960.84874649],[798002.5751861557,7458113.7228030395],[798155.4492427073,7458113.7228030395],[798155.4492427073,7457960.84874649],[798002.5751861557,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136292/82286","x":136292,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7457960.84874649],[798155.4492427073,7458113.7228030395],[798308.3232992552,7458113.7228030395],[798308.3232992552,7457960.84874649],[798155.4492427073,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136293/82286","x":136293,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7457807.974689942],[798002.5751861557,7457960.84874649],[798155.4492427073,7457960.84874649],[798155.4492427073,7457807.974689942],[798002.5751861557,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136292/82287","x":136292,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7457807.974689942],[798155.4492427073,7457960.84874649],[798308.3232992552,7457960.84874649],[798308.3232992552,7457807.974689942],[798155.4492427073,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136293/82287","x":136293,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7457960.84874649],[798308.3232992552,7458113.7228030395],[798461.1973558031,7458113.7228030395],[798461.1973558031,7457960.84874649],[798308.3232992552,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136294/82286","x":136294,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7457960.84874649],[798461.1973558031,7458113.7228030395],[798614.0714123547,7458113.7228030395],[798614.0714123547,7457960.84874649],[798461.1973558031,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136295/82286","x":136295,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7457807.974689942],[798308.3232992552,7457960.84874649],[798461.1973558031,7457960.84874649],[798461.1973558031,7457807.974689942],[798308.3232992552,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136294/82287","x":136294,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7457807.974689942],[798461.1973558031,7457960.84874649],[798614.0714123547,7457960.84874649],[798614.0714123547,7457807.974689942],[798461.1973558031,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136295/82287","x":136295,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7458878.0930857845],[798614.0714123547,7459030.967142334],[798766.9454689026,7459030.967142334],[798766.9454689026,7458878.0930857845],[798614.0714123547,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136296/82280","x":136296,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7458725.219029237],[798614.0714123547,7458878.0930857845],[798766.9454689026,7458878.0930857845],[798766.9454689026,7458725.219029237],[798614.0714123547,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136296/82281","x":136296,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7458572.344972687],[798614.0714123547,7458725.219029237],[798766.9454689026,7458725.219029237],[798766.9454689026,7458572.344972687],[798614.0714123547,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136296/82282","x":136296,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7458419.470916137],[798614.0714123547,7458572.344972687],[798766.9454689026,7458572.344972687],[798766.9454689026,7458419.470916137],[798614.0714123547,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136296/82283","x":136296,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7458266.596859589],[798614.0714123547,7458419.470916137],[798766.9454689026,7458419.470916137],[798766.9454689026,7458266.596859589],[798614.0714123547,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136296/82284","x":136296,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7458113.7228030395],[798614.0714123547,7458266.596859589],[798766.9454689026,7458266.596859589],[798766.9454689026,7458113.7228030395],[798614.0714123547,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136296/82285","x":136296,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7457960.84874649],[798614.0714123547,7458113.7228030395],[798766.9454689026,7458113.7228030395],[798766.9454689026,7457960.84874649],[798614.0714123547,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136296/82286","x":136296,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7457807.974689942],[798614.0714123547,7457960.84874649],[798766.9454689026,7457960.84874649],[798766.9454689026,7457807.974689942],[798614.0714123547,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136296/82287","x":136296,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7457349.3525202945],[797849.7011296079,7457502.226576842],[798002.5751861557,7457502.226576842],[798002.5751861557,7457349.3525202945],[797849.7011296079,7457349.3525202945]]],"type":"Polygon"},"properties":{"label":"18/136291/82290","x":136291,"y":82290,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7457196.478463745],[797696.82707306,7457349.3525202945],[797849.7011296079,7457349.3525202945],[797849.7011296079,7457196.478463745],[797696.82707306,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136290/82291","x":136290,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7457196.478463745],[797849.7011296079,7457349.3525202945],[798002.5751861557,7457349.3525202945],[798002.5751861557,7457196.478463745],[797849.7011296079,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136291/82291","x":136291,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7457655.100633392],[798002.5751861557,7457807.974689942],[798155.4492427073,7457807.974689942],[798155.4492427073,7457655.100633392],[798002.5751861557,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136292/82288","x":136292,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7457655.100633392],[798155.4492427073,7457807.974689942],[798308.3232992552,7457807.974689942],[798308.3232992552,7457655.100633392],[798155.4492427073,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136293/82288","x":136293,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7457502.226576842],[798002.5751861557,7457655.100633392],[798155.4492427073,7457655.100633392],[798155.4492427073,7457502.226576842],[798002.5751861557,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136292/82289","x":136292,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7457502.226576842],[798155.4492427073,7457655.100633392],[798308.3232992552,7457655.100633392],[798308.3232992552,7457502.226576842],[798155.4492427073,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136293/82289","x":136293,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7457655.100633392],[798308.3232992552,7457807.974689942],[798461.1973558031,7457807.974689942],[798461.1973558031,7457655.100633392],[798308.3232992552,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136294/82288","x":136294,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7457655.100633392],[798461.1973558031,7457807.974689942],[798614.0714123547,7457807.974689942],[798614.0714123547,7457655.100633392],[798461.1973558031,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136295/82288","x":136295,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7457502.226576842],[798308.3232992552,7457655.100633392],[798461.1973558031,7457655.100633392],[798461.1973558031,7457502.226576842],[798308.3232992552,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136294/82289","x":136294,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7457502.226576842],[798461.1973558031,7457655.100633392],[798614.0714123547,7457655.100633392],[798614.0714123547,7457502.226576842],[798461.1973558031,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136295/82289","x":136295,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7457349.3525202945],[798002.5751861557,7457502.226576842],[798155.4492427073,7457502.226576842],[798155.4492427073,7457349.3525202945],[798002.5751861557,7457349.3525202945]]],"type":"Polygon"},"properties":{"label":"18/136292/82290","x":136292,"y":82290,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7457349.3525202945],[798155.4492427073,7457502.226576842],[798308.3232992552,7457502.226576842],[798308.3232992552,7457349.3525202945],[798155.4492427073,7457349.3525202945]]],"type":"Polygon"},"properties":{"label":"18/136293/82290","x":136293,"y":82290,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7457196.478463745],[798002.5751861557,7457349.3525202945],[798155.4492427073,7457349.3525202945],[798155.4492427073,7457196.478463745],[798002.5751861557,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136292/82291","x":136292,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7457196.478463745],[798155.4492427073,7457349.3525202945],[798308.3232992552,7457349.3525202945],[798308.3232992552,7457196.478463745],[798155.4492427073,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136293/82291","x":136293,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7457349.3525202945],[798308.3232992552,7457502.226576842],[798461.1973558031,7457502.226576842],[798461.1973558031,7457349.3525202945],[798308.3232992552,7457349.3525202945]]],"type":"Polygon"},"properties":{"label":"18/136294/82290","x":136294,"y":82290,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7457349.3525202945],[798461.1973558031,7457502.226576842],[798614.0714123547,7457502.226576842],[798614.0714123547,7457349.3525202945],[798461.1973558031,7457349.3525202945]]],"type":"Polygon"},"properties":{"label":"18/136295/82290","x":136295,"y":82290,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7457196.478463745],[798308.3232992552,7457349.3525202945],[798461.1973558031,7457349.3525202945],[798461.1973558031,7457196.478463745],[798308.3232992552,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136294/82291","x":136294,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7457196.478463745],[798461.1973558031,7457349.3525202945],[798614.0714123547,7457349.3525202945],[798614.0714123547,7457196.478463745],[798461.1973558031,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136295/82291","x":136295,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7457043.604407197],[797543.9530165084,7457196.478463745],[797696.82707306,7457196.478463745],[797696.82707306,7457043.604407197],[797543.9530165084,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136289/82292","x":136289,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7456890.730350647],[797391.0789599605,7457043.604407197],[797543.9530165084,7457043.604407197],[797543.9530165084,7456890.730350647],[797391.0789599605,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136288/82293","x":136288,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7456890.730350647],[797543.9530165084,7457043.604407197],[797696.82707306,7457043.604407197],[797696.82707306,7456890.730350647],[797543.9530165084,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136289/82293","x":136289,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7457043.604407197],[797696.82707306,7457196.478463745],[797849.7011296079,7457196.478463745],[797849.7011296079,7457043.604407197],[797696.82707306,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136290/82292","x":136290,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7457043.604407197],[797849.7011296079,7457196.478463745],[798002.5751861557,7457196.478463745],[798002.5751861557,7457043.604407197],[797849.7011296079,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136291/82292","x":136291,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7456890.730350647],[797696.82707306,7457043.604407197],[797849.7011296079,7457043.604407197],[797849.7011296079,7456890.730350647],[797696.82707306,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136290/82293","x":136290,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7456890.730350647],[797849.7011296079,7457043.604407197],[798002.5751861557,7457043.604407197],[798002.5751861557,7456890.730350647],[797849.7011296079,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136291/82293","x":136291,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7456737.856294097],[797391.0789599605,7456890.730350647],[797543.9530165084,7456890.730350647],[797543.9530165084,7456737.856294097],[797391.0789599605,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136288/82294","x":136288,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7456737.856294097],[797543.9530165084,7456890.730350647],[797696.82707306,7456890.730350647],[797696.82707306,7456737.856294097],[797543.9530165084,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136289/82294","x":136289,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7456584.9822375495],[797391.0789599605,7456737.856294097],[797543.9530165084,7456737.856294097],[797543.9530165084,7456584.9822375495],[797391.0789599605,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136288/82295","x":136288,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7456584.9822375495],[797543.9530165084,7456737.856294097],[797696.82707306,7456737.856294097],[797696.82707306,7456584.9822375495],[797543.9530165084,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136289/82295","x":136289,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7456737.856294097],[797696.82707306,7456890.730350647],[797849.7011296079,7456890.730350647],[797849.7011296079,7456737.856294097],[797696.82707306,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136290/82294","x":136290,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7456737.856294097],[797849.7011296079,7456890.730350647],[798002.5751861557,7456890.730350647],[798002.5751861557,7456737.856294097],[797849.7011296079,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136291/82294","x":136291,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7456584.9822375495],[797696.82707306,7456737.856294097],[797849.7011296079,7456737.856294097],[797849.7011296079,7456584.9822375495],[797696.82707306,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136290/82295","x":136290,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7456584.9822375495],[797849.7011296079,7456737.856294097],[798002.5751861557,7456737.856294097],[798002.5751861557,7456584.9822375495],[797849.7011296079,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136291/82295","x":136291,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7457043.604407197],[798002.5751861557,7457196.478463745],[798155.4492427073,7457196.478463745],[798155.4492427073,7457043.604407197],[798002.5751861557,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136292/82292","x":136292,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7457043.604407197],[798155.4492427073,7457196.478463745],[798308.3232992552,7457196.478463745],[798308.3232992552,7457043.604407197],[798155.4492427073,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136293/82292","x":136293,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7456890.730350647],[798002.5751861557,7457043.604407197],[798155.4492427073,7457043.604407197],[798155.4492427073,7456890.730350647],[798002.5751861557,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136292/82293","x":136292,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7456890.730350647],[798155.4492427073,7457043.604407197],[798308.3232992552,7457043.604407197],[798308.3232992552,7456890.730350647],[798155.4492427073,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136293/82293","x":136293,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7457043.604407197],[798308.3232992552,7457196.478463745],[798461.1973558031,7457196.478463745],[798461.1973558031,7457043.604407197],[798308.3232992552,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136294/82292","x":136294,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7457043.604407197],[798461.1973558031,7457196.478463745],[798614.0714123547,7457196.478463745],[798614.0714123547,7457043.604407197],[798461.1973558031,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136295/82292","x":136295,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7456890.730350647],[798308.3232992552,7457043.604407197],[798461.1973558031,7457043.604407197],[798461.1973558031,7456890.730350647],[798308.3232992552,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136294/82293","x":136294,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7456890.730350647],[798461.1973558031,7457043.604407197],[798614.0714123547,7457043.604407197],[798614.0714123547,7456890.730350647],[798461.1973558031,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136295/82293","x":136295,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7456737.856294097],[798002.5751861557,7456890.730350647],[798155.4492427073,7456890.730350647],[798155.4492427073,7456737.856294097],[798002.5751861557,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136292/82294","x":136292,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7456737.856294097],[798155.4492427073,7456890.730350647],[798308.3232992552,7456890.730350647],[798308.3232992552,7456737.856294097],[798155.4492427073,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136293/82294","x":136293,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7456584.9822375495],[798002.5751861557,7456737.856294097],[798155.4492427073,7456737.856294097],[798155.4492427073,7456584.9822375495],[798002.5751861557,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136292/82295","x":136292,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7456737.856294097],[798308.3232992552,7456890.730350647],[798461.1973558031,7456890.730350647],[798461.1973558031,7456737.856294097],[798308.3232992552,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136294/82294","x":136294,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7457655.100633392],[798614.0714123547,7457807.974689942],[798766.9454689026,7457807.974689942],[798766.9454689026,7457655.100633392],[798614.0714123547,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136296/82288","x":136296,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7457502.226576842],[798614.0714123547,7457655.100633392],[798766.9454689026,7457655.100633392],[798766.9454689026,7457502.226576842],[798614.0714123547,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136296/82289","x":136296,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7457349.3525202945],[798614.0714123547,7457502.226576842],[798766.9454689026,7457502.226576842],[798766.9454689026,7457349.3525202945],[798614.0714123547,7457349.3525202945]]],"type":"Polygon"},"properties":{"label":"18/136296/82290","x":136296,"y":82290,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7457196.478463745],[798614.0714123547,7457349.3525202945],[798766.9454689026,7457349.3525202945],[798766.9454689026,7457196.478463745],[798614.0714123547,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136296/82291","x":136296,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7457043.604407197],[798614.0714123547,7457196.478463745],[798766.9454689026,7457196.478463745],[798766.9454689026,7457043.604407197],[798614.0714123547,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136296/82292","x":136296,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7456432.108181],[797391.0789599605,7456584.9822375495],[797543.9530165084,7456584.9822375495],[797543.9530165084,7456432.108181],[797391.0789599605,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136288/82296","x":136288,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7456432.108181],[797543.9530165084,7456584.9822375495],[797696.82707306,7456584.9822375495],[797696.82707306,7456432.108181],[797543.9530165084,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136289/82296","x":136289,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7456279.23412445],[797391.0789599605,7456432.108181],[797543.9530165084,7456432.108181],[797543.9530165084,7456279.23412445],[797391.0789599605,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136288/82297","x":136288,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7456279.23412445],[797543.9530165084,7456432.108181],[797696.82707306,7456432.108181],[797696.82707306,7456279.23412445],[797543.9530165084,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136289/82297","x":136289,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7456432.108181],[797696.82707306,7456584.9822375495],[797849.7011296079,7456584.9822375495],[797849.7011296079,7456432.108181],[797696.82707306,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136290/82296","x":136290,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7456432.108181],[797849.7011296079,7456584.9822375495],[798002.5751861557,7456584.9822375495],[798002.5751861557,7456432.108181],[797849.7011296079,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136291/82296","x":136291,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7456279.23412445],[797696.82707306,7456432.108181],[797849.7011296079,7456432.108181],[797849.7011296079,7456279.23412445],[797696.82707306,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136290/82297","x":136290,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7456126.360067902],[797391.0789599605,7456279.23412445],[797543.9530165084,7456279.23412445],[797543.9530165084,7456126.360067902],[797391.0789599605,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136288/82298","x":136288,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7456126.360067902],[797543.9530165084,7456279.23412445],[797696.82707306,7456279.23412445],[797696.82707306,7456126.360067902],[797543.9530165084,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136289/82298","x":136289,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7455209.115728607],[794180.7237724289,7455361.989785155],[794333.5978289805,7455361.989785155],[794333.5978289805,7455209.115728607],[794180.7237724289,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136267/82304","x":136267,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7455209.115728607],[794333.5978289805,7455361.989785155],[794486.4718855284,7455361.989785155],[794486.4718855284,7455209.115728607],[794333.5978289805,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136268/82304","x":136268,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7455209.115728607],[794486.4718855284,7455361.989785155],[794639.3459420763,7455361.989785155],[794639.3459420763,7455209.115728607],[794486.4718855284,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136269/82304","x":136269,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7455056.241672058],[794486.4718855284,7455209.115728607],[794639.3459420763,7455209.115728607],[794639.3459420763,7455056.241672058],[794486.4718855284,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136269/82305","x":136269,"y":82305,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7455209.115728607],[794639.3459420763,7455361.989785155],[794792.2199986279,7455361.989785155],[794792.2199986279,7455209.115728607],[794639.3459420763,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136270/82304","x":136270,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7455209.115728607],[794792.2199986279,7455361.989785155],[794945.0940551758,7455361.989785155],[794945.0940551758,7455209.115728607],[794792.2199986279,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136271/82304","x":136271,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7455056.241672058],[794639.3459420763,7455209.115728607],[794792.2199986279,7455209.115728607],[794792.2199986279,7455056.241672058],[794639.3459420763,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136270/82305","x":136270,"y":82305,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7455056.241672058],[794792.2199986279,7455209.115728607],[794945.0940551758,7455209.115728607],[794945.0940551758,7455056.241672058],[794792.2199986279,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136271/82305","x":136271,"y":82305,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7454903.36761551],[794486.4718855284,7455056.241672058],[794639.3459420763,7455056.241672058],[794639.3459420763,7454903.36761551],[794486.4718855284,7454903.36761551]]],"type":"Polygon"},"properties":{"label":"18/136269/82306","x":136269,"y":82306,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7454903.36761551],[794639.3459420763,7455056.241672058],[794792.2199986279,7455056.241672058],[794792.2199986279,7454903.36761551],[794639.3459420763,7454903.36761551]]],"type":"Polygon"},"properties":{"label":"18/136270/82306","x":136270,"y":82306,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7454903.36761551],[794792.2199986279,7455056.241672058],[794945.0940551758,7455056.241672058],[794945.0940551758,7454903.36761551],[794792.2199986279,7454903.36761551]]],"type":"Polygon"},"properties":{"label":"18/136271/82306","x":136271,"y":82306,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7454750.49355896],[794792.2199986279,7454903.36761551],[794945.0940551758,7454903.36761551],[794945.0940551758,7454750.49355896],[794792.2199986279,7454750.49355896]]],"type":"Polygon"},"properties":{"label":"18/136271/82307","x":136271,"y":82307,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7455209.115728607],[794945.0940551758,7455361.989785155],[795097.9681117237,7455361.989785155],[795097.9681117237,7455209.115728607],[794945.0940551758,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136272/82304","x":136272,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7455209.115728607],[795097.9681117237,7455361.989785155],[795250.8421682753,7455361.989785155],[795250.8421682753,7455209.115728607],[795097.9681117237,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136273/82304","x":136273,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7455056.241672058],[794945.0940551758,7455209.115728607],[795097.9681117237,7455209.115728607],[795097.9681117237,7455056.241672058],[794945.0940551758,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136272/82305","x":136272,"y":82305,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7455056.241672058],[795097.9681117237,7455209.115728607],[795250.8421682753,7455209.115728607],[795250.8421682753,7455056.241672058],[795097.9681117237,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136273/82305","x":136273,"y":82305,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7455209.115728607],[795250.8421682753,7455361.989785155],[795403.7162248231,7455361.989785155],[795403.7162248231,7455209.115728607],[795250.8421682753,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136274/82304","x":136274,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7455209.115728607],[795403.7162248231,7455361.989785155],[795556.590281371,7455361.989785155],[795556.590281371,7455209.115728607],[795403.7162248231,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136275/82304","x":136275,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7455056.241672058],[795250.8421682753,7455209.115728607],[795403.7162248231,7455209.115728607],[795403.7162248231,7455056.241672058],[795250.8421682753,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136274/82305","x":136274,"y":82305,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7455056.241672058],[795403.7162248231,7455209.115728607],[795556.590281371,7455209.115728607],[795556.590281371,7455056.241672058],[795403.7162248231,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136275/82305","x":136275,"y":82305,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7454903.36761551],[794945.0940551758,7455056.241672058],[795097.9681117237,7455056.241672058],[795097.9681117237,7454903.36761551],[794945.0940551758,7454903.36761551]]],"type":"Polygon"},"properties":{"label":"18/136272/82306","x":136272,"y":82306,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7454903.36761551],[795097.9681117237,7455056.241672058],[795250.8421682753,7455056.241672058],[795250.8421682753,7454903.36761551],[795097.9681117237,7454903.36761551]]],"type":"Polygon"},"properties":{"label":"18/136273/82306","x":136273,"y":82306,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7454750.49355896],[794945.0940551758,7454903.36761551],[795097.9681117237,7454903.36761551],[795097.9681117237,7454750.49355896],[794945.0940551758,7454750.49355896]]],"type":"Polygon"},"properties":{"label":"18/136272/82307","x":136272,"y":82307,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7454750.49355896],[795097.9681117237,7454903.36761551],[795250.8421682753,7454903.36761551],[795250.8421682753,7454750.49355896],[795097.9681117237,7454750.49355896]]],"type":"Polygon"},"properties":{"label":"18/136273/82307","x":136273,"y":82307,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7454903.36761551],[795250.8421682753,7455056.241672058],[795403.7162248231,7455056.241672058],[795403.7162248231,7454903.36761551],[795250.8421682753,7454903.36761551]]],"type":"Polygon"},"properties":{"label":"18/136274/82306","x":136274,"y":82306,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7454903.36761551],[795403.7162248231,7455056.241672058],[795556.590281371,7455056.241672058],[795556.590281371,7454903.36761551],[795403.7162248231,7454903.36761551]]],"type":"Polygon"},"properties":{"label":"18/136275/82306","x":136275,"y":82306,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7454750.49355896],[795250.8421682753,7454903.36761551],[795403.7162248231,7454903.36761551],[795403.7162248231,7454750.49355896],[795250.8421682753,7454750.49355896]]],"type":"Polygon"},"properties":{"label":"18/136274/82307","x":136274,"y":82307,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7454750.49355896],[795403.7162248231,7454903.36761551],[795556.590281371,7454903.36761551],[795556.590281371,7454750.49355896],[795403.7162248231,7454750.49355896]]],"type":"Polygon"},"properties":{"label":"18/136275/82307","x":136275,"y":82307,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7455209.115728607],[795556.590281371,7455361.989785155],[795709.4643379226,7455361.989785155],[795709.4643379226,7455209.115728607],[795556.590281371,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136276/82304","x":136276,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7455209.115728607],[795709.4643379226,7455361.989785155],[795862.3383944705,7455361.989785155],[795862.3383944705,7455209.115728607],[795709.4643379226,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136277/82304","x":136277,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7455056.241672058],[795556.590281371,7455209.115728607],[795709.4643379226,7455209.115728607],[795709.4643379226,7455056.241672058],[795556.590281371,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136276/82305","x":136276,"y":82305,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7455056.241672058],[795709.4643379226,7455209.115728607],[795862.3383944705,7455209.115728607],[795862.3383944705,7455056.241672058],[795709.4643379226,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136277/82305","x":136277,"y":82305,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7455209.115728607],[795862.3383944705,7455361.989785155],[796015.2124510184,7455361.989785155],[796015.2124510184,7455209.115728607],[795862.3383944705,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136278/82304","x":136278,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7455209.115728607],[796015.2124510184,7455361.989785155],[796168.08650757,7455361.989785155],[796168.08650757,7455209.115728607],[796015.2124510184,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136279/82304","x":136279,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7455056.241672058],[795862.3383944705,7455209.115728607],[796015.2124510184,7455209.115728607],[796015.2124510184,7455056.241672058],[795862.3383944705,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136278/82305","x":136278,"y":82305,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7455056.241672058],[796015.2124510184,7455209.115728607],[796168.08650757,7455209.115728607],[796168.08650757,7455056.241672058],[796015.2124510184,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136279/82305","x":136279,"y":82305,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7454903.36761551],[795556.590281371,7455056.241672058],[795709.4643379226,7455056.241672058],[795709.4643379226,7454903.36761551],[795556.590281371,7454903.36761551]]],"type":"Polygon"},"properties":{"label":"18/136276/82306","x":136276,"y":82306,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7454903.36761551],[795709.4643379226,7455056.241672058],[795862.3383944705,7455056.241672058],[795862.3383944705,7454903.36761551],[795709.4643379226,7454903.36761551]]],"type":"Polygon"},"properties":{"label":"18/136277/82306","x":136277,"y":82306,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7454750.49355896],[795556.590281371,7454903.36761551],[795709.4643379226,7454903.36761551],[795709.4643379226,7454750.49355896],[795556.590281371,7454750.49355896]]],"type":"Polygon"},"properties":{"label":"18/136276/82307","x":136276,"y":82307,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7454750.49355896],[795709.4643379226,7454903.36761551],[795862.3383944705,7454903.36761551],[795862.3383944705,7454750.49355896],[795709.4643379226,7454750.49355896]]],"type":"Polygon"},"properties":{"label":"18/136277/82307","x":136277,"y":82307,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7454903.36761551],[795862.3383944705,7455056.241672058],[796015.2124510184,7455056.241672058],[796015.2124510184,7454903.36761551],[795862.3383944705,7454903.36761551]]],"type":"Polygon"},"properties":{"label":"18/136278/82306","x":136278,"y":82306,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7454903.36761551],[796015.2124510184,7455056.241672058],[796168.08650757,7455056.241672058],[796168.08650757,7454903.36761551],[796015.2124510184,7454903.36761551]]],"type":"Polygon"},"properties":{"label":"18/136279/82306","x":136279,"y":82306,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7454750.49355896],[795862.3383944705,7454903.36761551],[796015.2124510184,7454903.36761551],[796015.2124510184,7454750.49355896],[795862.3383944705,7454750.49355896]]],"type":"Polygon"},"properties":{"label":"18/136278/82307","x":136278,"y":82307,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7454597.61950241],[794945.0940551758,7454750.49355896],[795097.9681117237,7454750.49355896],[795097.9681117237,7454597.61950241],[794945.0940551758,7454597.61950241]]],"type":"Polygon"},"properties":{"label":"18/136272/82308","x":136272,"y":82308,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7454597.61950241],[795097.9681117237,7454750.49355896],[795250.8421682753,7454750.49355896],[795250.8421682753,7454597.61950241],[795097.9681117237,7454597.61950241]]],"type":"Polygon"},"properties":{"label":"18/136273/82308","x":136273,"y":82308,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7454444.745445862],[795097.9681117237,7454597.61950241],[795250.8421682753,7454597.61950241],[795250.8421682753,7454444.745445862],[795097.9681117237,7454444.745445862]]],"type":"Polygon"},"properties":{"label":"18/136273/82309","x":136273,"y":82309,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7454597.61950241],[795250.8421682753,7454750.49355896],[795403.7162248231,7454750.49355896],[795403.7162248231,7454597.61950241],[795250.8421682753,7454597.61950241]]],"type":"Polygon"},"properties":{"label":"18/136274/82308","x":136274,"y":82308,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7454597.61950241],[795403.7162248231,7454750.49355896],[795556.590281371,7454750.49355896],[795556.590281371,7454597.61950241],[795403.7162248231,7454597.61950241]]],"type":"Polygon"},"properties":{"label":"18/136275/82308","x":136275,"y":82308,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7454444.745445862],[795250.8421682753,7454597.61950241],[795403.7162248231,7454597.61950241],[795403.7162248231,7454444.745445862],[795250.8421682753,7454444.745445862]]],"type":"Polygon"},"properties":{"label":"18/136274/82309","x":136274,"y":82309,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7454444.745445862],[795403.7162248231,7454597.61950241],[795556.590281371,7454597.61950241],[795556.590281371,7454444.745445862],[795403.7162248231,7454444.745445862]]],"type":"Polygon"},"properties":{"label":"18/136275/82309","x":136275,"y":82309,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7454597.61950241],[795556.590281371,7454750.49355896],[795709.4643379226,7454750.49355896],[795709.4643379226,7454597.61950241],[795556.590281371,7454597.61950241]]],"type":"Polygon"},"properties":{"label":"18/136276/82308","x":136276,"y":82308,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7455209.115728607],[796168.08650757,7455361.989785155],[796320.9605641179,7455361.989785155],[796320.9605641179,7455209.115728607],[796168.08650757,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136280/82304","x":136280,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7455209.115728607],[796320.9605641179,7455361.989785155],[796473.8346206658,7455361.989785155],[796473.8346206658,7455209.115728607],[796320.9605641179,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136281/82304","x":136281,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7455056.241672058],[796168.08650757,7455209.115728607],[796320.9605641179,7455209.115728607],[796320.9605641179,7455056.241672058],[796168.08650757,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136280/82305","x":136280,"y":82305,"z":18},"type":"Feature"}
+]}
diff --git a/tests/data/expire/test-z18-b0.tiles b/tests/data/expire/test-z18-b0.tiles
new file mode 100644
index 000000000..b5998d135
--- /dev/null
+++ b/tests/data/expire/test-z18-b0.tiles
@@ -0,0 +1,1764 @@
+18/136266/82199
+18/136267/82199
+18/136268/82199
+18/136269/82199
+18/136258/82203
+18/136259/82203
+18/136262/82201
+18/136263/82201
+18/136260/82202
+18/136261/82202
+18/136260/82203
+18/136261/82203
+18/136262/82202
+18/136263/82202
+18/136256/82204
+18/136257/82204
+18/136256/82205
+18/136257/82205
+18/136258/82204
+18/136259/82204
+18/136264/82200
+18/136265/82200
+18/136264/82201
+18/136265/82201
+18/136266/82200
+18/136267/82200
+18/136268/82200
+18/136269/82200
+18/136269/82201
+18/136270/82200
+18/136270/82201
+18/136271/82201
+18/136271/82202
+18/136287/82199
+18/136272/82201
+18/136272/82202
+18/136273/82202
+18/136272/82203
+18/136273/82203
+18/136274/82203
+18/136275/82203
+18/136279/82203
+18/136274/82204
+18/136275/82204
+18/136275/82205
+18/136276/82204
+18/136277/82204
+18/136276/82205
+18/136277/82205
+18/136278/82204
+18/136279/82204
+18/136278/82205
+18/136283/82201
+18/136281/82202
+18/136280/82203
+18/136281/82203
+18/136282/82202
+18/136283/82202
+18/136282/82203
+18/136285/82200
+18/136284/82201
+18/136285/82201
+18/136286/82200
+18/136287/82200
+18/136286/82201
+18/136284/82202
+18/136280/82204
+18/136288/82199
+18/136288/82200
+18/136288/82201
+18/136289/82201
+18/136288/82202
+18/136289/82202
+18/136289/82203
+18/136290/82202
+18/136290/82203
+18/136291/82203
+18/136290/82204
+18/136291/82204
+18/136291/82205
+18/136289/82207
+18/136291/82206
+18/136290/82207
+18/136291/82207
+18/136292/82204
+18/136292/82205
+18/136292/82206
+18/136293/82206
+18/136292/82207
+18/136257/82210
+18/136257/82211
+18/136258/82210
+18/136259/82210
+18/136258/82211
+18/136259/82211
+18/136260/82210
+18/136261/82210
+18/136260/82211
+18/136261/82211
+18/136262/82210
+18/136263/82210
+18/136262/82211
+18/136263/82211
+18/136264/82210
+18/136265/82210
+18/136264/82211
+18/136265/82211
+18/136266/82210
+18/136267/82210
+18/136266/82211
+18/136267/82211
+18/136268/82210
+18/136269/82210
+18/136268/82211
+18/136269/82211
+18/136270/82210
+18/136270/82211
+18/136271/82211
+18/136257/82216
+18/136257/82217
+18/136258/82216
+18/136259/82216
+18/136258/82217
+18/136259/82217
+18/136257/82218
+18/136257/82219
+18/136258/82218
+18/136259/82218
+18/136258/82219
+18/136259/82219
+18/136260/82216
+18/136261/82216
+18/136260/82217
+18/136261/82217
+18/136262/82216
+18/136262/82217
+18/136263/82217
+18/136260/82218
+18/136261/82218
+18/136260/82219
+18/136261/82219
+18/136262/82218
+18/136263/82218
+18/136262/82219
+18/136263/82219
+18/136257/82220
+18/136257/82221
+18/136258/82220
+18/136259/82220
+18/136258/82221
+18/136259/82221
+18/136257/82222
+18/136257/82223
+18/136258/82222
+18/136259/82222
+18/136258/82223
+18/136259/82223
+18/136260/82220
+18/136261/82220
+18/136260/82221
+18/136261/82221
+18/136262/82220
+18/136263/82220
+18/136262/82221
+18/136263/82221
+18/136260/82222
+18/136261/82222
+18/136260/82223
+18/136261/82223
+18/136262/82222
+18/136263/82222
+18/136262/82223
+18/136263/82223
+18/136264/82217
+18/136265/82217
+18/136266/82217
+18/136267/82217
+18/136264/82218
+18/136265/82218
+18/136264/82219
+18/136265/82219
+18/136266/82218
+18/136267/82218
+18/136266/82219
+18/136267/82219
+18/136268/82217
+18/136268/82218
+18/136268/82219
+18/136264/82220
+18/136265/82220
+18/136264/82221
+18/136265/82221
+18/136266/82220
+18/136267/82220
+18/136266/82221
+18/136267/82221
+18/136264/82222
+18/136265/82222
+18/136264/82223
+18/136265/82223
+18/136266/82222
+18/136267/82222
+18/136266/82223
+18/136267/82223
+18/136268/82220
+18/136268/82221
+18/136268/82222
+18/136268/82223
+18/136272/82211
+18/136273/82211
+18/136274/82211
+18/136275/82211
+18/136276/82211
+18/136277/82211
+18/136278/82211
+18/136279/82211
+18/136280/82211
+18/136281/82211
+18/136282/82210
+18/136283/82210
+18/136282/82211
+18/136283/82211
+18/136284/82209
+18/136285/82209
+18/136287/82208
+18/136286/82209
+18/136287/82209
+18/136284/82210
+18/136285/82210
+18/136282/82215
+18/136283/82215
+18/136284/82215
+18/136279/82218
+18/136278/82219
+18/136279/82219
+18/136277/82220
+18/136276/82221
+18/136277/82221
+18/136278/82220
+18/136279/82220
+18/136278/82221
+18/136279/82221
+18/136276/82222
+18/136277/82222
+18/136277/82223
+18/136278/82222
+18/136279/82222
+18/136278/82223
+18/136279/82223
+18/136281/82216
+18/136280/82217
+18/136281/82217
+18/136282/82216
+18/136283/82216
+18/136282/82217
+18/136283/82217
+18/136280/82218
+18/136281/82218
+18/136280/82219
+18/136281/82219
+18/136282/82218
+18/136283/82218
+18/136282/82219
+18/136283/82219
+18/136284/82216
+18/136285/82216
+18/136284/82217
+18/136285/82217
+18/136286/82216
+18/136286/82217
+18/136284/82218
+18/136285/82218
+18/136284/82219
+18/136285/82219
+18/136286/82218
+18/136287/82218
+18/136286/82219
+18/136287/82219
+18/136280/82220
+18/136281/82220
+18/136280/82221
+18/136281/82221
+18/136282/82220
+18/136283/82220
+18/136282/82221
+18/136283/82221
+18/136280/82222
+18/136281/82222
+18/136280/82223
+18/136281/82223
+18/136282/82222
+18/136283/82222
+18/136282/82223
+18/136283/82223
+18/136284/82220
+18/136285/82220
+18/136284/82221
+18/136285/82221
+18/136286/82220
+18/136287/82220
+18/136286/82221
+18/136287/82221
+18/136284/82222
+18/136284/82223
+18/136257/82224
+18/136257/82225
+18/136258/82224
+18/136259/82224
+18/136258/82225
+18/136259/82225
+18/136257/82226
+18/136257/82227
+18/136258/82226
+18/136259/82226
+18/136258/82227
+18/136259/82227
+18/136260/82224
+18/136261/82224
+18/136260/82225
+18/136261/82225
+18/136262/82224
+18/136263/82224
+18/136262/82225
+18/136263/82225
+18/136260/82226
+18/136261/82226
+18/136260/82227
+18/136261/82227
+18/136262/82226
+18/136263/82226
+18/136262/82227
+18/136263/82227
+18/136264/82224
+18/136265/82224
+18/136264/82225
+18/136265/82225
+18/136266/82224
+18/136267/82224
+18/136266/82225
+18/136267/82225
+18/136264/82226
+18/136265/82226
+18/136264/82227
+18/136265/82227
+18/136266/82226
+18/136267/82226
+18/136266/82227
+18/136267/82227
+18/136268/82224
+18/136268/82225
+18/136268/82226
+18/136268/82227
+18/136263/82235
+18/136257/82239
+18/136259/82238
+18/136258/82239
+18/136259/82239
+18/136260/82237
+18/136261/82237
+18/136262/82236
+18/136263/82236
+18/136262/82237
+18/136263/82237
+18/136260/82238
+18/136261/82238
+18/136260/82239
+18/136261/82239
+18/136262/82238
+18/136263/82238
+18/136262/82239
+18/136263/82239
+18/136264/82235
+18/136265/82235
+18/136266/82235
+18/136267/82235
+18/136268/82235
+18/136269/82235
+18/136270/82235
+18/136271/82235
+18/136264/82236
+18/136265/82236
+18/136264/82237
+18/136265/82237
+18/136266/82236
+18/136267/82236
+18/136266/82237
+18/136267/82237
+18/136264/82238
+18/136265/82238
+18/136264/82239
+18/136265/82239
+18/136266/82238
+18/136267/82238
+18/136266/82239
+18/136267/82239
+18/136268/82236
+18/136269/82236
+18/136268/82237
+18/136269/82237
+18/136270/82236
+18/136271/82236
+18/136270/82237
+18/136271/82237
+18/136268/82238
+18/136269/82238
+18/136268/82239
+18/136269/82239
+18/136270/82238
+18/136271/82238
+18/136270/82239
+18/136271/82239
+18/136278/82224
+18/136279/82224
+18/136279/82225
+18/136274/82231
+18/136275/82231
+18/136278/82229
+18/136279/82229
+18/136276/82230
+18/136277/82230
+18/136276/82231
+18/136277/82231
+18/136278/82230
+18/136279/82230
+18/136278/82231
+18/136279/82231
+18/136280/82224
+18/136281/82224
+18/136280/82225
+18/136281/82225
+18/136282/82224
+18/136283/82224
+18/136282/82225
+18/136283/82225
+18/136280/82226
+18/136281/82226
+18/136281/82227
+18/136282/82226
+18/136283/82226
+18/136282/82227
+18/136283/82227
+18/136284/82224
+18/136285/82224
+18/136284/82225
+18/136285/82225
+18/136286/82225
+18/136284/82226
+18/136285/82226
+18/136284/82227
+18/136285/82227
+18/136286/82226
+18/136286/82227
+18/136287/82227
+18/136280/82228
+18/136281/82228
+18/136280/82229
+18/136281/82229
+18/136282/82228
+18/136283/82228
+18/136282/82229
+18/136283/82229
+18/136280/82230
+18/136281/82230
+18/136280/82231
+18/136281/82231
+18/136282/82230
+18/136283/82230
+18/136282/82231
+18/136283/82231
+18/136284/82228
+18/136285/82228
+18/136284/82229
+18/136285/82229
+18/136286/82228
+18/136287/82228
+18/136286/82229
+18/136287/82229
+18/136284/82230
+18/136285/82230
+18/136284/82231
+18/136285/82231
+18/136286/82230
+18/136287/82230
+18/136286/82231
+18/136287/82231
+18/136273/82232
+18/136274/82232
+18/136275/82232
+18/136276/82232
+18/136277/82232
+18/136278/82232
+18/136279/82232
+18/136272/82236
+18/136273/82236
+18/136272/82237
+18/136273/82237
+18/136274/82236
+18/136275/82236
+18/136274/82237
+18/136275/82237
+18/136272/82238
+18/136273/82238
+18/136272/82239
+18/136273/82239
+18/136274/82238
+18/136275/82238
+18/136274/82239
+18/136275/82239
+18/136276/82236
+18/136277/82236
+18/136276/82237
+18/136277/82237
+18/136278/82236
+18/136279/82236
+18/136278/82237
+18/136279/82237
+18/136276/82238
+18/136277/82238
+18/136276/82239
+18/136277/82239
+18/136278/82238
+18/136279/82238
+18/136278/82239
+18/136279/82239
+18/136280/82232
+18/136281/82232
+18/136282/82232
+18/136283/82232
+18/136283/82233
+18/136284/82232
+18/136285/82232
+18/136284/82233
+18/136285/82233
+18/136286/82232
+18/136287/82232
+18/136286/82233
+18/136287/82233
+18/136280/82236
+18/136281/82236
+18/136280/82237
+18/136281/82237
+18/136282/82236
+18/136282/82237
+18/136283/82237
+18/136280/82238
+18/136281/82238
+18/136280/82239
+18/136281/82239
+18/136282/82238
+18/136283/82238
+18/136282/82239
+18/136283/82239
+18/136284/82237
+18/136284/82238
+18/136288/82208
+18/136289/82208
+18/136288/82209
+18/136290/82208
+18/136288/82218
+18/136288/82219
+18/136289/82219
+18/136288/82220
+18/136289/82220
+18/136288/82221
+18/136289/82221
+18/136290/82220
+18/136288/82228
+18/136288/82229
+18/136288/82230
+18/136289/82230
+18/136288/82231
+18/136289/82231
+18/136290/82231
+18/136288/82232
+18/136289/82232
+18/136288/82233
+18/136289/82233
+18/136290/82232
+18/136290/82233
+18/136255/82282
+18/136255/82283
+18/136255/82284
+18/136255/82285
+18/136255/82286
+18/136255/82287
+18/136255/82288
+18/136255/82289
+18/136255/82290
+18/136255/82291
+18/136255/82292
+18/136255/82293
+18/136256/82240
+18/136257/82240
+18/136256/82241
+18/136257/82241
+18/136258/82240
+18/136259/82240
+18/136258/82241
+18/136259/82241
+18/136256/82242
+18/136257/82242
+18/136256/82243
+18/136257/82243
+18/136258/82242
+18/136259/82242
+18/136258/82243
+18/136259/82243
+18/136260/82240
+18/136261/82240
+18/136260/82241
+18/136261/82241
+18/136262/82240
+18/136263/82240
+18/136262/82241
+18/136263/82241
+18/136260/82242
+18/136261/82242
+18/136260/82243
+18/136261/82243
+18/136262/82242
+18/136263/82242
+18/136262/82243
+18/136263/82243
+18/136256/82244
+18/136257/82244
+18/136257/82245
+18/136258/82244
+18/136259/82244
+18/136258/82245
+18/136259/82245
+18/136257/82246
+18/136257/82247
+18/136258/82246
+18/136259/82246
+18/136258/82247
+18/136259/82247
+18/136260/82244
+18/136261/82244
+18/136260/82245
+18/136261/82245
+18/136262/82244
+18/136263/82244
+18/136262/82245
+18/136263/82245
+18/136260/82246
+18/136261/82246
+18/136260/82247
+18/136261/82247
+18/136262/82246
+18/136263/82246
+18/136262/82247
+18/136263/82247
+18/136264/82240
+18/136265/82240
+18/136264/82241
+18/136265/82241
+18/136266/82240
+18/136267/82240
+18/136266/82241
+18/136264/82242
+18/136265/82242
+18/136264/82243
+18/136265/82243
+18/136268/82240
+18/136269/82240
+18/136270/82240
+18/136271/82240
+18/136264/82244
+18/136264/82245
+18/136264/82246
+18/136264/82247
+18/136265/82247
+18/136271/82246
+18/136270/82247
+18/136271/82247
+18/136257/82248
+18/136257/82249
+18/136258/82248
+18/136259/82248
+18/136258/82249
+18/136259/82249
+18/136257/82250
+18/136258/82250
+18/136259/82250
+18/136258/82251
+18/136259/82251
+18/136260/82248
+18/136261/82248
+18/136260/82249
+18/136261/82249
+18/136262/82248
+18/136263/82248
+18/136262/82249
+18/136263/82249
+18/136260/82250
+18/136261/82250
+18/136260/82251
+18/136261/82251
+18/136262/82250
+18/136263/82250
+18/136262/82251
+18/136263/82251
+18/136258/82252
+18/136259/82252
+18/136260/82252
+18/136261/82252
+18/136261/82253
+18/136262/82252
+18/136263/82252
+18/136262/82253
+18/136263/82253
+18/136264/82248
+18/136265/82248
+18/136264/82249
+18/136265/82249
+18/136266/82248
+18/136266/82249
+18/136267/82249
+18/136264/82250
+18/136265/82250
+18/136264/82251
+18/136265/82251
+18/136266/82250
+18/136267/82250
+18/136266/82251
+18/136267/82251
+18/136268/82248
+18/136269/82248
+18/136268/82249
+18/136269/82249
+18/136270/82248
+18/136271/82248
+18/136270/82249
+18/136271/82249
+18/136268/82250
+18/136269/82250
+18/136268/82251
+18/136269/82251
+18/136270/82250
+18/136271/82250
+18/136270/82251
+18/136271/82251
+18/136264/82252
+18/136265/82252
+18/136264/82253
+18/136265/82253
+18/136266/82252
+18/136267/82252
+18/136266/82253
+18/136267/82253
+18/136265/82254
+18/136266/82254
+18/136267/82254
+18/136268/82252
+18/136269/82252
+18/136268/82253
+18/136269/82253
+18/136270/82252
+18/136271/82252
+18/136270/82253
+18/136271/82253
+18/136268/82254
+18/136269/82254
+18/136269/82255
+18/136270/82254
+18/136271/82254
+18/136270/82255
+18/136271/82255
+18/136272/82240
+18/136273/82240
+18/136272/82241
+18/136273/82241
+18/136274/82240
+18/136275/82240
+18/136274/82241
+18/136275/82241
+18/136272/82242
+18/136273/82242
+18/136273/82243
+18/136274/82242
+18/136275/82242
+18/136274/82243
+18/136275/82243
+18/136276/82240
+18/136277/82240
+18/136276/82241
+18/136277/82241
+18/136278/82240
+18/136279/82240
+18/136278/82241
+18/136279/82241
+18/136276/82242
+18/136277/82242
+18/136276/82243
+18/136277/82243
+18/136278/82242
+18/136279/82242
+18/136278/82243
+18/136279/82243
+18/136273/82244
+18/136273/82245
+18/136274/82244
+18/136275/82244
+18/136274/82245
+18/136275/82245
+18/136272/82246
+18/136273/82246
+18/136272/82247
+18/136273/82247
+18/136274/82246
+18/136275/82246
+18/136274/82247
+18/136275/82247
+18/136276/82244
+18/136277/82244
+18/136276/82245
+18/136277/82245
+18/136278/82244
+18/136279/82244
+18/136278/82245
+18/136279/82245
+18/136276/82246
+18/136277/82246
+18/136276/82247
+18/136277/82247
+18/136278/82246
+18/136279/82246
+18/136278/82247
+18/136280/82240
+18/136281/82240
+18/136280/82241
+18/136281/82241
+18/136282/82240
+18/136283/82240
+18/136282/82241
+18/136280/82242
+18/136281/82242
+18/136280/82243
+18/136281/82243
+18/136280/82244
+18/136272/82248
+18/136273/82248
+18/136272/82249
+18/136273/82249
+18/136274/82248
+18/136275/82248
+18/136274/82249
+18/136275/82249
+18/136272/82250
+18/136273/82250
+18/136272/82251
+18/136273/82251
+18/136274/82250
+18/136275/82250
+18/136274/82251
+18/136275/82251
+18/136276/82248
+18/136277/82248
+18/136276/82249
+18/136277/82249
+18/136278/82248
+18/136276/82250
+18/136276/82251
+18/136272/82252
+18/136273/82252
+18/136272/82253
+18/136273/82253
+18/136274/82252
+18/136275/82252
+18/136274/82253
+18/136275/82253
+18/136272/82254
+18/136273/82254
+18/136272/82255
+18/136273/82255
+18/136274/82254
+18/136256/82264
+18/136257/82264
+18/136256/82265
+18/136257/82265
+18/136258/82264
+18/136259/82264
+18/136258/82265
+18/136259/82265
+18/136256/82266
+18/136257/82266
+18/136256/82267
+18/136257/82267
+18/136258/82266
+18/136259/82266
+18/136258/82267
+18/136259/82267
+18/136260/82264
+18/136261/82264
+18/136260/82265
+18/136261/82265
+18/136262/82264
+18/136263/82264
+18/136262/82265
+18/136263/82265
+18/136260/82266
+18/136261/82266
+18/136260/82267
+18/136261/82267
+18/136262/82266
+18/136263/82266
+18/136262/82267
+18/136263/82267
+18/136256/82268
+18/136257/82268
+18/136256/82269
+18/136257/82269
+18/136258/82268
+18/136259/82268
+18/136258/82269
+18/136259/82269
+18/136256/82270
+18/136257/82270
+18/136256/82271
+18/136257/82271
+18/136258/82270
+18/136259/82270
+18/136258/82271
+18/136259/82271
+18/136260/82268
+18/136261/82268
+18/136260/82269
+18/136261/82269
+18/136262/82268
+18/136263/82268
+18/136262/82269
+18/136263/82269
+18/136260/82270
+18/136261/82270
+18/136260/82271
+18/136261/82271
+18/136262/82270
+18/136263/82270
+18/136262/82271
+18/136264/82264
+18/136265/82264
+18/136264/82265
+18/136265/82265
+18/136266/82264
+18/136267/82264
+18/136266/82265
+18/136267/82265
+18/136264/82266
+18/136265/82266
+18/136264/82267
+18/136265/82267
+18/136266/82266
+18/136267/82266
+18/136266/82267
+18/136267/82267
+18/136268/82264
+18/136269/82264
+18/136268/82265
+18/136269/82265
+18/136270/82264
+18/136271/82264
+18/136270/82265
+18/136271/82265
+18/136268/82266
+18/136269/82266
+18/136268/82267
+18/136269/82267
+18/136270/82266
+18/136271/82266
+18/136270/82267
+18/136271/82267
+18/136264/82268
+18/136265/82268
+18/136264/82269
+18/136266/82268
+18/136267/82268
+18/136264/82270
+18/136268/82268
+18/136269/82268
+18/136270/82268
+18/136271/82268
+18/136272/82264
+18/136273/82264
+18/136272/82265
+18/136273/82265
+18/136274/82264
+18/136275/82264
+18/136274/82265
+18/136275/82265
+18/136272/82266
+18/136273/82266
+18/136272/82267
+18/136273/82267
+18/136274/82266
+18/136275/82266
+18/136274/82267
+18/136275/82267
+18/136276/82264
+18/136277/82264
+18/136276/82265
+18/136277/82265
+18/136278/82264
+18/136279/82264
+18/136278/82265
+18/136279/82265
+18/136276/82266
+18/136277/82266
+18/136276/82267
+18/136277/82267
+18/136278/82266
+18/136279/82266
+18/136278/82267
+18/136279/82267
+18/136272/82268
+18/136273/82268
+18/136274/82268
+18/136275/82268
+18/136276/82268
+18/136277/82268
+18/136278/82268
+18/136279/82268
+18/136280/82264
+18/136281/82264
+18/136280/82265
+18/136281/82265
+18/136282/82264
+18/136283/82264
+18/136282/82265
+18/136283/82265
+18/136280/82266
+18/136281/82266
+18/136280/82267
+18/136281/82267
+18/136282/82266
+18/136283/82266
+18/136282/82267
+18/136283/82267
+18/136284/82264
+18/136285/82264
+18/136284/82265
+18/136285/82265
+18/136286/82264
+18/136287/82264
+18/136286/82265
+18/136287/82265
+18/136284/82266
+18/136285/82266
+18/136284/82267
+18/136285/82267
+18/136286/82266
+18/136287/82266
+18/136286/82267
+18/136287/82267
+18/136280/82268
+18/136281/82268
+18/136282/82268
+18/136283/82268
+18/136284/82268
+18/136285/82268
+18/136286/82268
+18/136287/82268
+18/136287/82269
+18/136288/82264
+18/136289/82264
+18/136288/82265
+18/136289/82265
+18/136290/82264
+18/136291/82264
+18/136290/82265
+18/136291/82265
+18/136288/82266
+18/136289/82266
+18/136288/82267
+18/136289/82267
+18/136290/82266
+18/136291/82266
+18/136290/82267
+18/136291/82267
+18/136292/82264
+18/136293/82264
+18/136292/82265
+18/136293/82265
+18/136294/82264
+18/136295/82264
+18/136294/82265
+18/136295/82265
+18/136292/82266
+18/136293/82266
+18/136292/82267
+18/136293/82267
+18/136294/82266
+18/136295/82266
+18/136294/82267
+18/136295/82267
+18/136288/82268
+18/136289/82268
+18/136288/82269
+18/136289/82269
+18/136290/82268
+18/136291/82268
+18/136290/82269
+18/136291/82269
+18/136289/82270
+18/136290/82270
+18/136291/82270
+18/136290/82271
+18/136291/82271
+18/136292/82268
+18/136293/82268
+18/136292/82269
+18/136293/82269
+18/136294/82268
+18/136295/82268
+18/136294/82269
+18/136295/82269
+18/136292/82270
+18/136293/82270
+18/136292/82271
+18/136293/82271
+18/136294/82270
+18/136295/82270
+18/136294/82271
+18/136295/82271
+18/136296/82264
+18/136296/82265
+18/136296/82266
+18/136296/82267
+18/136296/82268
+18/136296/82269
+18/136296/82270
+18/136296/82271
+18/136256/82272
+18/136257/82272
+18/136256/82273
+18/136257/82273
+18/136258/82272
+18/136259/82272
+18/136258/82273
+18/136259/82273
+18/136256/82274
+18/136257/82274
+18/136256/82275
+18/136257/82275
+18/136258/82274
+18/136259/82274
+18/136258/82275
+18/136259/82275
+18/136260/82272
+18/136261/82272
+18/136260/82273
+18/136261/82273
+18/136260/82274
+18/136261/82274
+18/136260/82275
+18/136261/82275
+18/136256/82276
+18/136257/82276
+18/136256/82277
+18/136257/82277
+18/136258/82276
+18/136259/82276
+18/136258/82277
+18/136259/82277
+18/136256/82278
+18/136257/82278
+18/136256/82279
+18/136257/82279
+18/136258/82278
+18/136259/82278
+18/136258/82279
+18/136259/82279
+18/136260/82276
+18/136261/82276
+18/136260/82277
+18/136261/82277
+18/136260/82278
+18/136261/82278
+18/136260/82279
+18/136270/82276
+18/136271/82276
+18/136271/82277
+18/136256/82280
+18/136257/82280
+18/136256/82281
+18/136257/82281
+18/136258/82280
+18/136259/82280
+18/136258/82281
+18/136259/82281
+18/136256/82282
+18/136257/82282
+18/136256/82283
+18/136257/82283
+18/136258/82282
+18/136259/82282
+18/136258/82283
+18/136259/82283
+18/136260/82280
+18/136260/82281
+18/136260/82282
+18/136260/82283
+18/136256/82284
+18/136257/82284
+18/136256/82285
+18/136257/82285
+18/136258/82284
+18/136259/82284
+18/136258/82285
+18/136259/82285
+18/136256/82286
+18/136257/82286
+18/136256/82287
+18/136257/82287
+18/136258/82286
+18/136259/82286
+18/136258/82287
+18/136259/82287
+18/136260/82284
+18/136260/82285
+18/136260/82286
+18/136260/82287
+18/136270/82287
+18/136271/82287
+18/136272/82276
+18/136273/82276
+18/136272/82277
+18/136273/82277
+18/136274/82276
+18/136275/82276
+18/136274/82277
+18/136275/82277
+18/136272/82278
+18/136273/82278
+18/136274/82278
+18/136275/82278
+18/136274/82279
+18/136275/82279
+18/136276/82276
+18/136277/82276
+18/136276/82277
+18/136277/82277
+18/136278/82276
+18/136279/82276
+18/136278/82277
+18/136279/82277
+18/136276/82278
+18/136277/82278
+18/136276/82279
+18/136277/82279
+18/136278/82278
+18/136279/82278
+18/136278/82279
+18/136279/82279
+18/136280/82276
+18/136281/82276
+18/136280/82277
+18/136281/82277
+18/136282/82276
+18/136283/82276
+18/136282/82277
+18/136283/82277
+18/136280/82278
+18/136281/82278
+18/136280/82279
+18/136281/82279
+18/136282/82278
+18/136283/82278
+18/136282/82279
+18/136283/82279
+18/136275/82280
+18/136276/82280
+18/136277/82280
+18/136277/82281
+18/136278/82280
+18/136279/82280
+18/136278/82281
+18/136279/82281
+18/136277/82283
+18/136278/82282
+18/136279/82282
+18/136278/82283
+18/136279/82283
+18/136275/82284
+18/136274/82285
+18/136275/82285
+18/136272/82286
+18/136273/82286
+18/136272/82287
+18/136273/82287
+18/136274/82286
+18/136275/82286
+18/136274/82287
+18/136275/82287
+18/136276/82284
+18/136277/82284
+18/136276/82285
+18/136277/82285
+18/136278/82284
+18/136279/82284
+18/136278/82285
+18/136279/82285
+18/136276/82286
+18/136277/82286
+18/136276/82287
+18/136277/82287
+18/136278/82286
+18/136279/82286
+18/136278/82287
+18/136279/82287
+18/136280/82280
+18/136281/82280
+18/136280/82281
+18/136281/82281
+18/136282/82280
+18/136283/82280
+18/136282/82281
+18/136283/82281
+18/136280/82282
+18/136281/82282
+18/136280/82283
+18/136281/82283
+18/136282/82282
+18/136283/82282
+18/136282/82283
+18/136283/82283
+18/136280/82284
+18/136281/82284
+18/136280/82285
+18/136281/82285
+18/136282/82284
+18/136283/82284
+18/136282/82285
+18/136283/82285
+18/136280/82286
+18/136281/82286
+18/136280/82287
+18/136281/82287
+18/136282/82286
+18/136283/82286
+18/136282/82287
+18/136283/82287
+18/136256/82288
+18/136257/82288
+18/136256/82289
+18/136257/82289
+18/136258/82288
+18/136259/82288
+18/136258/82289
+18/136259/82289
+18/136256/82290
+18/136257/82290
+18/136256/82291
+18/136257/82291
+18/136258/82290
+18/136259/82290
+18/136258/82291
+18/136259/82291
+18/136260/82288
+18/136260/82289
+18/136260/82290
+18/136256/82292
+18/136257/82292
+18/136256/82293
+18/136257/82293
+18/136258/82292
+18/136259/82292
+18/136258/82293
+18/136259/82293
+18/136256/82294
+18/136257/82294
+18/136257/82295
+18/136258/82294
+18/136259/82294
+18/136258/82295
+18/136259/82295
+18/136260/82292
+18/136261/82292
+18/136260/82293
+18/136261/82293
+18/136262/82293
+18/136260/82294
+18/136261/82294
+18/136260/82295
+18/136261/82295
+18/136262/82294
+18/136263/82294
+18/136262/82295
+18/136263/82295
+18/136269/82288
+18/136269/82289
+18/136270/82288
+18/136271/82288
+18/136270/82289
+18/136264/82295
+18/136258/82296
+18/136259/82296
+18/136259/82297
+18/136260/82296
+18/136261/82296
+18/136260/82297
+18/136261/82297
+18/136262/82296
+18/136263/82296
+18/136262/82297
+18/136263/82297
+18/136260/82298
+18/136261/82298
+18/136262/82298
+18/136263/82298
+18/136262/82299
+18/136263/82299
+18/136263/82300
+18/136264/82296
+18/136265/82296
+18/136264/82297
+18/136265/82297
+18/136266/82297
+18/136264/82298
+18/136265/82298
+18/136264/82299
+18/136265/82299
+18/136266/82298
+18/136267/82298
+18/136266/82299
+18/136267/82299
+18/136268/82298
+18/136269/82298
+18/136268/82299
+18/136269/82299
+18/136270/82298
+18/136271/82298
+18/136270/82299
+18/136271/82299
+18/136264/82300
+18/136265/82300
+18/136264/82301
+18/136265/82301
+18/136266/82300
+18/136267/82300
+18/136266/82301
+18/136267/82301
+18/136265/82302
+18/136266/82302
+18/136267/82302
+18/136266/82303
+18/136267/82303
+18/136268/82300
+18/136269/82300
+18/136268/82301
+18/136269/82301
+18/136270/82300
+18/136271/82300
+18/136270/82301
+18/136271/82301
+18/136268/82302
+18/136269/82302
+18/136268/82303
+18/136269/82303
+18/136270/82302
+18/136271/82302
+18/136270/82303
+18/136271/82303
+18/136272/82288
+18/136273/82288
+18/136274/82288
+18/136275/82288
+18/136276/82288
+18/136277/82288
+18/136278/82288
+18/136279/82288
+18/136280/82288
+18/136281/82288
+18/136282/82288
+18/136287/82294
+18/136286/82295
+18/136287/82295
+18/136272/82298
+18/136273/82298
+18/136272/82299
+18/136273/82299
+18/136274/82298
+18/136275/82298
+18/136274/82299
+18/136275/82299
+18/136276/82298
+18/136277/82298
+18/136276/82299
+18/136277/82299
+18/136278/82298
+18/136279/82298
+18/136278/82299
+18/136279/82299
+18/136272/82300
+18/136273/82300
+18/136272/82301
+18/136273/82301
+18/136274/82300
+18/136275/82300
+18/136274/82301
+18/136275/82301
+18/136272/82302
+18/136273/82302
+18/136272/82303
+18/136273/82303
+18/136274/82302
+18/136275/82302
+18/136274/82303
+18/136275/82303
+18/136276/82300
+18/136277/82300
+18/136276/82301
+18/136277/82301
+18/136278/82300
+18/136279/82300
+18/136278/82301
+18/136279/82301
+18/136276/82302
+18/136277/82302
+18/136276/82303
+18/136277/82303
+18/136278/82302
+18/136279/82302
+18/136278/82303
+18/136279/82303
+18/136280/82298
+18/136281/82298
+18/136280/82299
+18/136281/82299
+18/136282/82298
+18/136283/82298
+18/136282/82299
+18/136283/82299
+18/136285/82296
+18/136284/82297
+18/136285/82297
+18/136286/82296
+18/136287/82296
+18/136286/82297
+18/136287/82297
+18/136284/82298
+18/136285/82298
+18/136284/82299
+18/136285/82299
+18/136286/82298
+18/136287/82298
+18/136286/82299
+18/136287/82299
+18/136280/82300
+18/136281/82300
+18/136280/82301
+18/136281/82301
+18/136282/82300
+18/136283/82300
+18/136282/82301
+18/136283/82301
+18/136280/82302
+18/136281/82302
+18/136280/82303
+18/136281/82303
+18/136282/82302
+18/136283/82302
+18/136282/82303
+18/136283/82303
+18/136284/82300
+18/136285/82300
+18/136284/82301
+18/136285/82301
+18/136286/82300
+18/136284/82302
+18/136291/82272
+18/136292/82272
+18/136293/82272
+18/136292/82273
+18/136293/82273
+18/136294/82272
+18/136295/82272
+18/136294/82273
+18/136295/82273
+18/136292/82274
+18/136293/82274
+18/136292/82275
+18/136293/82275
+18/136294/82274
+18/136295/82274
+18/136294/82275
+18/136295/82275
+18/136292/82276
+18/136293/82276
+18/136292/82277
+18/136293/82277
+18/136294/82276
+18/136295/82276
+18/136294/82277
+18/136295/82277
+18/136292/82278
+18/136293/82278
+18/136292/82279
+18/136293/82279
+18/136294/82278
+18/136295/82278
+18/136294/82279
+18/136295/82279
+18/136296/82272
+18/136296/82273
+18/136296/82274
+18/136296/82275
+18/136296/82276
+18/136296/82277
+18/136296/82278
+18/136296/82279
+18/136292/82280
+18/136293/82280
+18/136292/82281
+18/136293/82281
+18/136294/82280
+18/136295/82280
+18/136294/82281
+18/136295/82281
+18/136292/82282
+18/136293/82282
+18/136292/82283
+18/136293/82283
+18/136294/82282
+18/136295/82282
+18/136294/82283
+18/136295/82283
+18/136292/82284
+18/136293/82284
+18/136292/82285
+18/136293/82285
+18/136294/82284
+18/136295/82284
+18/136294/82285
+18/136295/82285
+18/136292/82286
+18/136293/82286
+18/136292/82287
+18/136293/82287
+18/136294/82286
+18/136295/82286
+18/136294/82287
+18/136295/82287
+18/136296/82280
+18/136296/82281
+18/136296/82282
+18/136296/82283
+18/136296/82284
+18/136296/82285
+18/136296/82286
+18/136296/82287
+18/136291/82290
+18/136290/82291
+18/136291/82291
+18/136292/82288
+18/136293/82288
+18/136292/82289
+18/136293/82289
+18/136294/82288
+18/136295/82288
+18/136294/82289
+18/136295/82289
+18/136292/82290
+18/136293/82290
+18/136292/82291
+18/136293/82291
+18/136294/82290
+18/136295/82290
+18/136294/82291
+18/136295/82291
+18/136289/82292
+18/136288/82293
+18/136289/82293
+18/136290/82292
+18/136291/82292
+18/136290/82293
+18/136291/82293
+18/136288/82294
+18/136289/82294
+18/136288/82295
+18/136289/82295
+18/136290/82294
+18/136291/82294
+18/136290/82295
+18/136291/82295
+18/136292/82292
+18/136293/82292
+18/136292/82293
+18/136293/82293
+18/136294/82292
+18/136295/82292
+18/136294/82293
+18/136295/82293
+18/136292/82294
+18/136293/82294
+18/136292/82295
+18/136294/82294
+18/136296/82288
+18/136296/82289
+18/136296/82290
+18/136296/82291
+18/136296/82292
+18/136288/82296
+18/136289/82296
+18/136288/82297
+18/136289/82297
+18/136290/82296
+18/136291/82296
+18/136290/82297
+18/136288/82298
+18/136289/82298
+18/136267/82304
+18/136268/82304
+18/136269/82304
+18/136269/82305
+18/136270/82304
+18/136271/82304
+18/136270/82305
+18/136271/82305
+18/136269/82306
+18/136270/82306
+18/136271/82306
+18/136271/82307
+18/136272/82304
+18/136273/82304
+18/136272/82305
+18/136273/82305
+18/136274/82304
+18/136275/82304
+18/136274/82305
+18/136275/82305
+18/136272/82306
+18/136273/82306
+18/136272/82307
+18/136273/82307
+18/136274/82306
+18/136275/82306
+18/136274/82307
+18/136275/82307
+18/136276/82304
+18/136277/82304
+18/136276/82305
+18/136277/82305
+18/136278/82304
+18/136279/82304
+18/136278/82305
+18/136279/82305
+18/136276/82306
+18/136277/82306
+18/136276/82307
+18/136277/82307
+18/136278/82306
+18/136279/82306
+18/136278/82307
+18/136272/82308
+18/136273/82308
+18/136273/82309
+18/136274/82308
+18/136275/82308
+18/136274/82309
+18/136275/82309
+18/136276/82308
+18/136280/82304
+18/136281/82304
+18/136280/82305
diff --git a/tests/data/expire/test-z18-b05.geojson b/tests/data/expire/test-z18-b05.geojson
new file mode 100644
index 000000000..a8ddadc73
--- /dev/null
+++ b/tests/data/expire/test-z18-b05.geojson
@@ -0,0 +1,2122 @@
+{"type": "FeatureCollection", "crs":{"properties":{"name":"urn:ogc:def:crs:EPSG::3857"},"type":"name"}, "features": [
+
+{"geometry":{"coordinates":[[[793874.9756593332,7471260.89166626],[793874.9756593332,7471413.765722809],[794027.849715881,7471413.765722809],[794027.849715881,7471260.89166626],[793874.9756593332,7471260.89166626]]],"type":"Polygon"},"properties":{"label":"18/136265/82199","x":136265,"y":82199,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7471413.765722809],[794180.7237724289,7471566.639779357],[794333.5978289805,7471566.639779357],[794333.5978289805,7471413.765722809],[794180.7237724289,7471413.765722809]]],"type":"Polygon"},"properties":{"label":"18/136267/82198","x":136267,"y":82198,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7471260.89166626],[794027.849715881,7471413.765722809],[794180.7237724289,7471413.765722809],[794180.7237724289,7471260.89166626],[794027.849715881,7471260.89166626]]],"type":"Polygon"},"properties":{"label":"18/136266/82199","x":136266,"y":82199,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7471260.89166626],[794180.7237724289,7471413.765722809],[794333.5978289805,7471413.765722809],[794333.5978289805,7471260.89166626],[794180.7237724289,7471260.89166626]]],"type":"Polygon"},"properties":{"label":"18/136267/82199","x":136267,"y":82199,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7471413.765722809],[794333.5978289805,7471566.639779357],[794486.4718855284,7471566.639779357],[794486.4718855284,7471413.765722809],[794333.5978289805,7471413.765722809]]],"type":"Polygon"},"properties":{"label":"18/136268/82198","x":136268,"y":82198,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7471260.89166626],[794333.5978289805,7471413.765722809],[794486.4718855284,7471413.765722809],[794486.4718855284,7471260.89166626],[794333.5978289805,7471260.89166626]]],"type":"Polygon"},"properties":{"label":"18/136268/82199","x":136268,"y":82199,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7471260.89166626],[794486.4718855284,7471413.765722809],[794639.3459420763,7471413.765722809],[794639.3459420763,7471260.89166626],[794486.4718855284,7471260.89166626]]],"type":"Polygon"},"properties":{"label":"18/136269/82199","x":136269,"y":82199,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7471260.89166626],[794639.3459420763,7471413.765722809],[794792.2199986279,7471413.765722809],[794792.2199986279,7471260.89166626],[794639.3459420763,7471260.89166626]]],"type":"Polygon"},"properties":{"label":"18/136270/82199","x":136270,"y":82199,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7470649.3954400625],[792651.983206939,7470802.269496612],[792804.8572634906,7470802.269496612],[792804.8572634906,7470649.3954400625],[792651.983206939,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136257/82203","x":136257,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7470802.269496612],[792957.7313200384,7470955.143553162],[793110.6053765863,7470955.143553162],[793110.6053765863,7470802.269496612],[792957.7313200384,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136259/82202","x":136259,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7470649.3954400625],[792804.8572634906,7470802.269496612],[792957.7313200384,7470802.269496612],[792957.7313200384,7470649.3954400625],[792804.8572634906,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136258/82203","x":136258,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7470649.3954400625],[792957.7313200384,7470802.269496612],[793110.6053765863,7470802.269496612],[793110.6053765863,7470649.3954400625],[792957.7313200384,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136259/82203","x":136259,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7470955.143553162],[793263.4794331342,7471108.01760971],[793416.3534896858,7471108.01760971],[793416.3534896858,7470955.143553162],[793263.4794331342,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136261/82201","x":136261,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7471108.01760971],[793569.2275462337,7471260.89166626],[793722.1016027816,7471260.89166626],[793722.1016027816,7471108.01760971],[793569.2275462337,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136263/82200","x":136263,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7470955.143553162],[793416.3534896858,7471108.01760971],[793569.2275462337,7471108.01760971],[793569.2275462337,7470955.143553162],[793416.3534896858,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136262/82201","x":136262,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7470955.143553162],[793569.2275462337,7471108.01760971],[793722.1016027816,7471108.01760971],[793722.1016027816,7470955.143553162],[793569.2275462337,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136263/82201","x":136263,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7470802.269496612],[793110.6053765863,7470955.143553162],[793263.4794331342,7470955.143553162],[793263.4794331342,7470802.269496612],[793110.6053765863,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136260/82202","x":136260,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7470802.269496612],[793263.4794331342,7470955.143553162],[793416.3534896858,7470955.143553162],[793416.3534896858,7470802.269496612],[793263.4794331342,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136261/82202","x":136261,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7470649.3954400625],[793110.6053765863,7470802.269496612],[793263.4794331342,7470802.269496612],[793263.4794331342,7470649.3954400625],[793110.6053765863,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136260/82203","x":136260,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7470649.3954400625],[793263.4794331342,7470802.269496612],[793416.3534896858,7470802.269496612],[793416.3534896858,7470649.3954400625],[793263.4794331342,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136261/82203","x":136261,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7470802.269496612],[793416.3534896858,7470955.143553162],[793569.2275462337,7470955.143553162],[793569.2275462337,7470802.269496612],[793416.3534896858,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136262/82202","x":136262,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7470802.269496612],[793569.2275462337,7470955.143553162],[793722.1016027816,7470955.143553162],[793722.1016027816,7470802.269496612],[793569.2275462337,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136263/82202","x":136263,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7470649.3954400625],[793416.3534896858,7470802.269496612],[793569.2275462337,7470802.269496612],[793569.2275462337,7470649.3954400625],[793416.3534896858,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136262/82203","x":136262,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7470496.521383515],[792499.1091503911,7470649.3954400625],[792651.983206939,7470649.3954400625],[792651.983206939,7470496.521383515],[792499.1091503911,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136256/82204","x":136256,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7470496.521383515],[792651.983206939,7470649.3954400625],[792804.8572634906,7470649.3954400625],[792804.8572634906,7470496.521383515],[792651.983206939,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136257/82204","x":136257,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7470343.647326965],[792499.1091503911,7470496.521383515],[792651.983206939,7470496.521383515],[792651.983206939,7470343.647326965],[792499.1091503911,7470343.647326965]]],"type":"Polygon"},"properties":{"label":"18/136256/82205","x":136256,"y":82205,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7470343.647326965],[792651.983206939,7470496.521383515],[792804.8572634906,7470496.521383515],[792804.8572634906,7470343.647326965],[792651.983206939,7470343.647326965]]],"type":"Polygon"},"properties":{"label":"18/136257/82205","x":136257,"y":82205,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7470496.521383515],[792804.8572634906,7470649.3954400625],[792957.7313200384,7470649.3954400625],[792957.7313200384,7470496.521383515],[792804.8572634906,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136258/82204","x":136258,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7470496.521383515],[792957.7313200384,7470649.3954400625],[793110.6053765863,7470649.3954400625],[793110.6053765863,7470496.521383515],[792957.7313200384,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136259/82204","x":136259,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7470343.647326965],[792804.8572634906,7470496.521383515],[792957.7313200384,7470496.521383515],[792957.7313200384,7470343.647326965],[792804.8572634906,7470343.647326965]]],"type":"Polygon"},"properties":{"label":"18/136258/82205","x":136258,"y":82205,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7470496.521383515],[793110.6053765863,7470649.3954400625],[793263.4794331342,7470649.3954400625],[793263.4794331342,7470496.521383515],[793110.6053765863,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136260/82204","x":136260,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7471108.01760971],[793722.1016027816,7471260.89166626],[793874.9756593332,7471260.89166626],[793874.9756593332,7471108.01760971],[793722.1016027816,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136264/82200","x":136264,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7471108.01760971],[793874.9756593332,7471260.89166626],[794027.849715881,7471260.89166626],[794027.849715881,7471108.01760971],[793874.9756593332,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136265/82200","x":136265,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7470955.143553162],[793722.1016027816,7471108.01760971],[793874.9756593332,7471108.01760971],[793874.9756593332,7470955.143553162],[793722.1016027816,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136264/82201","x":136264,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7470955.143553162],[793874.9756593332,7471108.01760971],[794027.849715881,7471108.01760971],[794027.849715881,7470955.143553162],[793874.9756593332,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136265/82201","x":136265,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7471108.01760971],[794027.849715881,7471260.89166626],[794180.7237724289,7471260.89166626],[794180.7237724289,7471108.01760971],[794027.849715881,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136266/82200","x":136266,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7471108.01760971],[794180.7237724289,7471260.89166626],[794333.5978289805,7471260.89166626],[794333.5978289805,7471108.01760971],[794180.7237724289,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136267/82200","x":136267,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7470955.143553162],[794027.849715881,7471108.01760971],[794180.7237724289,7471108.01760971],[794180.7237724289,7470955.143553162],[794027.849715881,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136266/82201","x":136266,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7470802.269496612],[793722.1016027816,7470955.143553162],[793874.9756593332,7470955.143553162],[793874.9756593332,7470802.269496612],[793722.1016027816,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136264/82202","x":136264,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7471108.01760971],[794333.5978289805,7471260.89166626],[794486.4718855284,7471260.89166626],[794486.4718855284,7471108.01760971],[794333.5978289805,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136268/82200","x":136268,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7471108.01760971],[794486.4718855284,7471260.89166626],[794639.3459420763,7471260.89166626],[794639.3459420763,7471108.01760971],[794486.4718855284,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136269/82200","x":136269,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7470955.143553162],[794486.4718855284,7471108.01760971],[794639.3459420763,7471108.01760971],[794639.3459420763,7470955.143553162],[794486.4718855284,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136269/82201","x":136269,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7471108.01760971],[794639.3459420763,7471260.89166626],[794792.2199986279,7471260.89166626],[794792.2199986279,7471108.01760971],[794639.3459420763,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136270/82200","x":136270,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7471108.01760971],[794792.2199986279,7471260.89166626],[794945.0940551758,7471260.89166626],[794945.0940551758,7471108.01760971],[794792.2199986279,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136271/82200","x":136271,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7470955.143553162],[794639.3459420763,7471108.01760971],[794792.2199986279,7471108.01760971],[794792.2199986279,7470955.143553162],[794639.3459420763,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136270/82201","x":136270,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7470955.143553162],[794792.2199986279,7471108.01760971],[794945.0940551758,7471108.01760971],[794945.0940551758,7470955.143553162],[794792.2199986279,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136271/82201","x":136271,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7470802.269496612],[794639.3459420763,7470955.143553162],[794792.2199986279,7470955.143553162],[794792.2199986279,7470802.269496612],[794639.3459420763,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136270/82202","x":136270,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7470802.269496612],[794792.2199986279,7470955.143553162],[794945.0940551758,7470955.143553162],[794945.0940551758,7470802.269496612],[794792.2199986279,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136271/82202","x":136271,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7470649.3954400625],[794792.2199986279,7470802.269496612],[794945.0940551758,7470802.269496612],[794945.0940551758,7470649.3954400625],[794792.2199986279,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136271/82203","x":136271,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7471260.89166626],[797085.330846861,7471413.765722809],[797238.2049034126,7471413.765722809],[797238.2049034126,7471260.89166626],[797085.330846861,7471260.89166626]]],"type":"Polygon"},"properties":{"label":"18/136286/82199","x":136286,"y":82199,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7471260.89166626],[797238.2049034126,7471413.765722809],[797391.0789599605,7471413.765722809],[797391.0789599605,7471260.89166626],[797238.2049034126,7471260.89166626]]],"type":"Polygon"},"properties":{"label":"18/136287/82199","x":136287,"y":82199,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7470955.143553162],[794945.0940551758,7471108.01760971],[795097.9681117237,7471108.01760971],[795097.9681117237,7470955.143553162],[794945.0940551758,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136272/82201","x":136272,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7470955.143553162],[795097.9681117237,7471108.01760971],[795250.8421682753,7471108.01760971],[795250.8421682753,7470955.143553162],[795097.9681117237,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136273/82201","x":136273,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7470802.269496612],[794945.0940551758,7470955.143553162],[795097.9681117237,7470955.143553162],[795097.9681117237,7470802.269496612],[794945.0940551758,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136272/82202","x":136272,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7470802.269496612],[795097.9681117237,7470955.143553162],[795250.8421682753,7470955.143553162],[795250.8421682753,7470802.269496612],[795097.9681117237,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136273/82202","x":136273,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7470649.3954400625],[794945.0940551758,7470802.269496612],[795097.9681117237,7470802.269496612],[795097.9681117237,7470649.3954400625],[794945.0940551758,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136272/82203","x":136272,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7470649.3954400625],[795097.9681117237,7470802.269496612],[795250.8421682753,7470802.269496612],[795250.8421682753,7470649.3954400625],[795097.9681117237,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136273/82203","x":136273,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7470802.269496612],[795250.8421682753,7470955.143553162],[795403.7162248231,7470955.143553162],[795403.7162248231,7470802.269496612],[795250.8421682753,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136274/82202","x":136274,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7470649.3954400625],[795250.8421682753,7470802.269496612],[795403.7162248231,7470802.269496612],[795403.7162248231,7470649.3954400625],[795250.8421682753,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136274/82203","x":136274,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7470649.3954400625],[795403.7162248231,7470802.269496612],[795556.590281371,7470802.269496612],[795556.590281371,7470649.3954400625],[795403.7162248231,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136275/82203","x":136275,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7470649.3954400625],[795556.590281371,7470802.269496612],[795709.4643379226,7470802.269496612],[795709.4643379226,7470649.3954400625],[795556.590281371,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136276/82203","x":136276,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7470649.3954400625],[795862.3383944705,7470802.269496612],[796015.2124510184,7470802.269496612],[796015.2124510184,7470649.3954400625],[795862.3383944705,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136278/82203","x":136278,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7470649.3954400625],[796015.2124510184,7470802.269496612],[796168.08650757,7470802.269496612],[796168.08650757,7470649.3954400625],[796015.2124510184,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136279/82203","x":136279,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7470496.521383515],[795097.9681117237,7470649.3954400625],[795250.8421682753,7470649.3954400625],[795250.8421682753,7470496.521383515],[795097.9681117237,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136273/82204","x":136273,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7470496.521383515],[795250.8421682753,7470649.3954400625],[795403.7162248231,7470649.3954400625],[795403.7162248231,7470496.521383515],[795250.8421682753,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136274/82204","x":136274,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7470496.521383515],[795403.7162248231,7470649.3954400625],[795556.590281371,7470649.3954400625],[795556.590281371,7470496.521383515],[795403.7162248231,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136275/82204","x":136275,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7470343.647326965],[795250.8421682753,7470496.521383515],[795403.7162248231,7470496.521383515],[795403.7162248231,7470343.647326965],[795250.8421682753,7470343.647326965]]],"type":"Polygon"},"properties":{"label":"18/136274/82205","x":136274,"y":82205,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7470343.647326965],[795403.7162248231,7470496.521383515],[795556.590281371,7470496.521383515],[795556.590281371,7470343.647326965],[795403.7162248231,7470343.647326965]]],"type":"Polygon"},"properties":{"label":"18/136275/82205","x":136275,"y":82205,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7470496.521383515],[795556.590281371,7470649.3954400625],[795709.4643379226,7470649.3954400625],[795709.4643379226,7470496.521383515],[795556.590281371,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136276/82204","x":136276,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7470496.521383515],[795709.4643379226,7470649.3954400625],[795862.3383944705,7470649.3954400625],[795862.3383944705,7470496.521383515],[795709.4643379226,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136277/82204","x":136277,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7470343.647326965],[795556.590281371,7470496.521383515],[795709.4643379226,7470496.521383515],[795709.4643379226,7470343.647326965],[795556.590281371,7470343.647326965]]],"type":"Polygon"},"properties":{"label":"18/136276/82205","x":136276,"y":82205,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7470343.647326965],[795709.4643379226,7470496.521383515],[795862.3383944705,7470496.521383515],[795862.3383944705,7470343.647326965],[795709.4643379226,7470343.647326965]]],"type":"Polygon"},"properties":{"label":"18/136277/82205","x":136277,"y":82205,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7470496.521383515],[795862.3383944705,7470649.3954400625],[796015.2124510184,7470649.3954400625],[796015.2124510184,7470496.521383515],[795862.3383944705,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136278/82204","x":136278,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7470496.521383515],[796015.2124510184,7470649.3954400625],[796168.08650757,7470649.3954400625],[796168.08650757,7470496.521383515],[796015.2124510184,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136279/82204","x":136279,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7470343.647326965],[795862.3383944705,7470496.521383515],[796015.2124510184,7470496.521383515],[796015.2124510184,7470343.647326965],[795862.3383944705,7470343.647326965]]],"type":"Polygon"},"properties":{"label":"18/136278/82205","x":136278,"y":82205,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7470343.647326965],[796015.2124510184,7470496.521383515],[796168.08650757,7470496.521383515],[796168.08650757,7470343.647326965],[796015.2124510184,7470343.647326965]]],"type":"Polygon"},"properties":{"label":"18/136279/82205","x":136279,"y":82205,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7470190.773270417],[795556.590281371,7470343.647326965],[795709.4643379226,7470343.647326965],[795709.4643379226,7470190.773270417],[795556.590281371,7470190.773270417]]],"type":"Polygon"},"properties":{"label":"18/136276/82206","x":136276,"y":82206,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7470190.773270417],[795709.4643379226,7470343.647326965],[795862.3383944705,7470343.647326965],[795862.3383944705,7470190.773270417],[795709.4643379226,7470190.773270417]]],"type":"Polygon"},"properties":{"label":"18/136277/82206","x":136277,"y":82206,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7470955.143553162],[796473.8346206658,7471108.01760971],[796626.7086772174,7471108.01760971],[796626.7086772174,7470955.143553162],[796473.8346206658,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136282/82201","x":136282,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7470955.143553162],[796626.7086772174,7471108.01760971],[796779.5827337652,7471108.01760971],[796779.5827337652,7470955.143553162],[796626.7086772174,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136283/82201","x":136283,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7470802.269496612],[796168.08650757,7470955.143553162],[796320.9605641179,7470955.143553162],[796320.9605641179,7470802.269496612],[796168.08650757,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136280/82202","x":136280,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7470802.269496612],[796320.9605641179,7470955.143553162],[796473.8346206658,7470955.143553162],[796473.8346206658,7470802.269496612],[796320.9605641179,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136281/82202","x":136281,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7470649.3954400625],[796168.08650757,7470802.269496612],[796320.9605641179,7470802.269496612],[796320.9605641179,7470649.3954400625],[796168.08650757,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136280/82203","x":136280,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7470649.3954400625],[796320.9605641179,7470802.269496612],[796473.8346206658,7470802.269496612],[796473.8346206658,7470649.3954400625],[796320.9605641179,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136281/82203","x":136281,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7470802.269496612],[796473.8346206658,7470955.143553162],[796626.7086772174,7470955.143553162],[796626.7086772174,7470802.269496612],[796473.8346206658,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136282/82202","x":136282,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7470802.269496612],[796626.7086772174,7470955.143553162],[796779.5827337652,7470955.143553162],[796779.5827337652,7470802.269496612],[796626.7086772174,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136283/82202","x":136283,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7470649.3954400625],[796473.8346206658,7470802.269496612],[796626.7086772174,7470802.269496612],[796626.7086772174,7470649.3954400625],[796473.8346206658,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136282/82203","x":136282,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7470649.3954400625],[796626.7086772174,7470802.269496612],[796779.5827337652,7470802.269496612],[796779.5827337652,7470649.3954400625],[796626.7086772174,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136283/82203","x":136283,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7471108.01760971],[796779.5827337652,7471260.89166626],[796932.4567903131,7471260.89166626],[796932.4567903131,7471108.01760971],[796779.5827337652,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136284/82200","x":136284,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7471108.01760971],[796932.4567903131,7471260.89166626],[797085.330846861,7471260.89166626],[797085.330846861,7471108.01760971],[796932.4567903131,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136285/82200","x":136285,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7470955.143553162],[796779.5827337652,7471108.01760971],[796932.4567903131,7471108.01760971],[796932.4567903131,7470955.143553162],[796779.5827337652,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136284/82201","x":136284,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7470955.143553162],[796932.4567903131,7471108.01760971],[797085.330846861,7471108.01760971],[797085.330846861,7470955.143553162],[796932.4567903131,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136285/82201","x":136285,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7471108.01760971],[797085.330846861,7471260.89166626],[797238.2049034126,7471260.89166626],[797238.2049034126,7471108.01760971],[797085.330846861,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136286/82200","x":136286,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7471108.01760971],[797238.2049034126,7471260.89166626],[797391.0789599605,7471260.89166626],[797391.0789599605,7471108.01760971],[797238.2049034126,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136287/82200","x":136287,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7470955.143553162],[797085.330846861,7471108.01760971],[797238.2049034126,7471108.01760971],[797238.2049034126,7470955.143553162],[797085.330846861,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136286/82201","x":136286,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7470955.143553162],[797238.2049034126,7471108.01760971],[797391.0789599605,7471108.01760971],[797391.0789599605,7470955.143553162],[797238.2049034126,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136287/82201","x":136287,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7470802.269496612],[796779.5827337652,7470955.143553162],[796932.4567903131,7470955.143553162],[796932.4567903131,7470802.269496612],[796779.5827337652,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136284/82202","x":136284,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7470802.269496612],[796932.4567903131,7470955.143553162],[797085.330846861,7470955.143553162],[797085.330846861,7470802.269496612],[796932.4567903131,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136285/82202","x":136285,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7470496.521383515],[796168.08650757,7470649.3954400625],[796320.9605641179,7470649.3954400625],[796320.9605641179,7470496.521383515],[796168.08650757,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136280/82204","x":136280,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7470496.521383515],[796320.9605641179,7470649.3954400625],[796473.8346206658,7470649.3954400625],[796473.8346206658,7470496.521383515],[796320.9605641179,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136281/82204","x":136281,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7471260.89166626],[797391.0789599605,7471413.765722809],[797543.9530165084,7471413.765722809],[797543.9530165084,7471260.89166626],[797391.0789599605,7471260.89166626]]],"type":"Polygon"},"properties":{"label":"18/136288/82199","x":136288,"y":82199,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7471108.01760971],[797391.0789599605,7471260.89166626],[797543.9530165084,7471260.89166626],[797543.9530165084,7471108.01760971],[797391.0789599605,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136288/82200","x":136288,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7471108.01760971],[797543.9530165084,7471260.89166626],[797696.82707306,7471260.89166626],[797696.82707306,7471108.01760971],[797543.9530165084,7471108.01760971]]],"type":"Polygon"},"properties":{"label":"18/136289/82200","x":136289,"y":82200,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7470955.143553162],[797391.0789599605,7471108.01760971],[797543.9530165084,7471108.01760971],[797543.9530165084,7470955.143553162],[797391.0789599605,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136288/82201","x":136288,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7470955.143553162],[797543.9530165084,7471108.01760971],[797696.82707306,7471108.01760971],[797696.82707306,7470955.143553162],[797543.9530165084,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136289/82201","x":136289,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7470955.143553162],[797696.82707306,7471108.01760971],[797849.7011296079,7471108.01760971],[797849.7011296079,7470955.143553162],[797696.82707306,7470955.143553162]]],"type":"Polygon"},"properties":{"label":"18/136290/82201","x":136290,"y":82201,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7470802.269496612],[797391.0789599605,7470955.143553162],[797543.9530165084,7470955.143553162],[797543.9530165084,7470802.269496612],[797391.0789599605,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136288/82202","x":136288,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7470802.269496612],[797543.9530165084,7470955.143553162],[797696.82707306,7470955.143553162],[797696.82707306,7470802.269496612],[797543.9530165084,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136289/82202","x":136289,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7470649.3954400625],[797391.0789599605,7470802.269496612],[797543.9530165084,7470802.269496612],[797543.9530165084,7470649.3954400625],[797391.0789599605,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136288/82203","x":136288,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7470649.3954400625],[797543.9530165084,7470802.269496612],[797696.82707306,7470802.269496612],[797696.82707306,7470649.3954400625],[797543.9530165084,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136289/82203","x":136289,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7470802.269496612],[797696.82707306,7470955.143553162],[797849.7011296079,7470955.143553162],[797849.7011296079,7470802.269496612],[797696.82707306,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136290/82202","x":136290,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7470802.269496612],[797849.7011296079,7470955.143553162],[798002.5751861557,7470955.143553162],[798002.5751861557,7470802.269496612],[797849.7011296079,7470802.269496612]]],"type":"Polygon"},"properties":{"label":"18/136291/82202","x":136291,"y":82202,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7470649.3954400625],[797696.82707306,7470802.269496612],[797849.7011296079,7470802.269496612],[797849.7011296079,7470649.3954400625],[797696.82707306,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136290/82203","x":136290,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7470649.3954400625],[797849.7011296079,7470802.269496612],[798002.5751861557,7470802.269496612],[798002.5751861557,7470649.3954400625],[797849.7011296079,7470649.3954400625]]],"type":"Polygon"},"properties":{"label":"18/136291/82203","x":136291,"y":82203,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7470496.521383515],[797543.9530165084,7470649.3954400625],[797696.82707306,7470649.3954400625],[797696.82707306,7470496.521383515],[797543.9530165084,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136289/82204","x":136289,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7470496.521383515],[797696.82707306,7470649.3954400625],[797849.7011296079,7470649.3954400625],[797849.7011296079,7470496.521383515],[797696.82707306,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136290/82204","x":136290,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7470496.521383515],[797849.7011296079,7470649.3954400625],[798002.5751861557,7470649.3954400625],[798002.5751861557,7470496.521383515],[797849.7011296079,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136291/82204","x":136291,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7470343.647326965],[797696.82707306,7470496.521383515],[797849.7011296079,7470496.521383515],[797849.7011296079,7470343.647326965],[797696.82707306,7470343.647326965]]],"type":"Polygon"},"properties":{"label":"18/136290/82205","x":136290,"y":82205,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7470343.647326965],[797849.7011296079,7470496.521383515],[798002.5751861557,7470496.521383515],[798002.5751861557,7470343.647326965],[797849.7011296079,7470343.647326965]]],"type":"Polygon"},"properties":{"label":"18/136291/82205","x":136291,"y":82205,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7470037.899213867],[797391.0789599605,7470190.773270417],[797543.9530165084,7470190.773270417],[797543.9530165084,7470037.899213867],[797391.0789599605,7470037.899213867]]],"type":"Polygon"},"properties":{"label":"18/136288/82207","x":136288,"y":82207,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7470037.899213867],[797543.9530165084,7470190.773270417],[797696.82707306,7470190.773270417],[797696.82707306,7470037.899213867],[797543.9530165084,7470037.899213867]]],"type":"Polygon"},"properties":{"label":"18/136289/82207","x":136289,"y":82207,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7470190.773270417],[797696.82707306,7470343.647326965],[797849.7011296079,7470343.647326965],[797849.7011296079,7470190.773270417],[797696.82707306,7470190.773270417]]],"type":"Polygon"},"properties":{"label":"18/136290/82206","x":136290,"y":82206,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7470190.773270417],[797849.7011296079,7470343.647326965],[798002.5751861557,7470343.647326965],[798002.5751861557,7470190.773270417],[797849.7011296079,7470190.773270417]]],"type":"Polygon"},"properties":{"label":"18/136291/82206","x":136291,"y":82206,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7470037.899213867],[797696.82707306,7470190.773270417],[797849.7011296079,7470190.773270417],[797849.7011296079,7470037.899213867],[797696.82707306,7470037.899213867]]],"type":"Polygon"},"properties":{"label":"18/136290/82207","x":136290,"y":82207,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7470037.899213867],[797849.7011296079,7470190.773270417],[798002.5751861557,7470190.773270417],[798002.5751861557,7470037.899213867],[797849.7011296079,7470037.899213867]]],"type":"Polygon"},"properties":{"label":"18/136291/82207","x":136291,"y":82207,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7470496.521383515],[798002.5751861557,7470649.3954400625],[798155.4492427073,7470649.3954400625],[798155.4492427073,7470496.521383515],[798002.5751861557,7470496.521383515]]],"type":"Polygon"},"properties":{"label":"18/136292/82204","x":136292,"y":82204,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7470343.647326965],[798002.5751861557,7470496.521383515],[798155.4492427073,7470496.521383515],[798155.4492427073,7470343.647326965],[798002.5751861557,7470343.647326965]]],"type":"Polygon"},"properties":{"label":"18/136292/82205","x":136292,"y":82205,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7470343.647326965],[798155.4492427073,7470496.521383515],[798308.3232992552,7470496.521383515],[798308.3232992552,7470343.647326965],[798155.4492427073,7470343.647326965]]],"type":"Polygon"},"properties":{"label":"18/136293/82205","x":136293,"y":82205,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7470190.773270417],[798002.5751861557,7470343.647326965],[798155.4492427073,7470343.647326965],[798155.4492427073,7470190.773270417],[798002.5751861557,7470190.773270417]]],"type":"Polygon"},"properties":{"label":"18/136292/82206","x":136292,"y":82206,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7470190.773270417],[798155.4492427073,7470343.647326965],[798308.3232992552,7470343.647326965],[798308.3232992552,7470190.773270417],[798155.4492427073,7470190.773270417]]],"type":"Polygon"},"properties":{"label":"18/136293/82206","x":136293,"y":82206,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7470037.899213867],[798002.5751861557,7470190.773270417],[798155.4492427073,7470190.773270417],[798155.4492427073,7470037.899213867],[798002.5751861557,7470037.899213867]]],"type":"Polygon"},"properties":{"label":"18/136292/82207","x":136292,"y":82207,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7470037.899213867],[798155.4492427073,7470190.773270417],[798308.3232992552,7470190.773270417],[798308.3232992552,7470037.899213867],[798155.4492427073,7470037.899213867]]],"type":"Polygon"},"properties":{"label":"18/136293/82207","x":136293,"y":82207,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7469579.27704422],[792499.1091503911,7469732.15110077],[792651.983206939,7469732.15110077],[792651.983206939,7469579.27704422],[792499.1091503911,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136256/82210","x":136256,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7469579.27704422],[792651.983206939,7469732.15110077],[792804.8572634906,7469732.15110077],[792804.8572634906,7469579.27704422],[792651.983206939,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136257/82210","x":136257,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7469426.40298767],[792499.1091503911,7469579.27704422],[792651.983206939,7469579.27704422],[792651.983206939,7469426.40298767],[792499.1091503911,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136256/82211","x":136256,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7469426.40298767],[792651.983206939,7469579.27704422],[792804.8572634906,7469579.27704422],[792804.8572634906,7469426.40298767],[792651.983206939,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136257/82211","x":136257,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7469579.27704422],[792804.8572634906,7469732.15110077],[792957.7313200384,7469732.15110077],[792957.7313200384,7469579.27704422],[792804.8572634906,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136258/82210","x":136258,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7469579.27704422],[792957.7313200384,7469732.15110077],[793110.6053765863,7469732.15110077],[793110.6053765863,7469579.27704422],[792957.7313200384,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136259/82210","x":136259,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7469426.40298767],[792804.8572634906,7469579.27704422],[792957.7313200384,7469579.27704422],[792957.7313200384,7469426.40298767],[792804.8572634906,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136258/82211","x":136258,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7469426.40298767],[792957.7313200384,7469579.27704422],[793110.6053765863,7469579.27704422],[793110.6053765863,7469426.40298767],[792957.7313200384,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136259/82211","x":136259,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7469579.27704422],[793110.6053765863,7469732.15110077],[793263.4794331342,7469732.15110077],[793263.4794331342,7469579.27704422],[793110.6053765863,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136260/82210","x":136260,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7469579.27704422],[793263.4794331342,7469732.15110077],[793416.3534896858,7469732.15110077],[793416.3534896858,7469579.27704422],[793263.4794331342,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136261/82210","x":136261,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7469426.40298767],[793110.6053765863,7469579.27704422],[793263.4794331342,7469579.27704422],[793263.4794331342,7469426.40298767],[793110.6053765863,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136260/82211","x":136260,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7469426.40298767],[793263.4794331342,7469579.27704422],[793416.3534896858,7469579.27704422],[793416.3534896858,7469426.40298767],[793263.4794331342,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136261/82211","x":136261,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7469579.27704422],[793416.3534896858,7469732.15110077],[793569.2275462337,7469732.15110077],[793569.2275462337,7469579.27704422],[793416.3534896858,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136262/82210","x":136262,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7469579.27704422],[793569.2275462337,7469732.15110077],[793722.1016027816,7469732.15110077],[793722.1016027816,7469579.27704422],[793569.2275462337,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136263/82210","x":136263,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7469426.40298767],[793416.3534896858,7469579.27704422],[793569.2275462337,7469579.27704422],[793569.2275462337,7469426.40298767],[793416.3534896858,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136262/82211","x":136262,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7469426.40298767],[793569.2275462337,7469579.27704422],[793722.1016027816,7469579.27704422],[793722.1016027816,7469426.40298767],[793569.2275462337,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136263/82211","x":136263,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7469579.27704422],[793722.1016027816,7469732.15110077],[793874.9756593332,7469732.15110077],[793874.9756593332,7469579.27704422],[793722.1016027816,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136264/82210","x":136264,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7469579.27704422],[793874.9756593332,7469732.15110077],[794027.849715881,7469732.15110077],[794027.849715881,7469579.27704422],[793874.9756593332,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136265/82210","x":136265,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7469426.40298767],[793722.1016027816,7469579.27704422],[793874.9756593332,7469579.27704422],[793874.9756593332,7469426.40298767],[793722.1016027816,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136264/82211","x":136264,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7469426.40298767],[793874.9756593332,7469579.27704422],[794027.849715881,7469579.27704422],[794027.849715881,7469426.40298767],[793874.9756593332,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136265/82211","x":136265,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7469579.27704422],[794027.849715881,7469732.15110077],[794180.7237724289,7469732.15110077],[794180.7237724289,7469579.27704422],[794027.849715881,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136266/82210","x":136266,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7469579.27704422],[794180.7237724289,7469732.15110077],[794333.5978289805,7469732.15110077],[794333.5978289805,7469579.27704422],[794180.7237724289,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136267/82210","x":136267,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7469426.40298767],[794027.849715881,7469579.27704422],[794180.7237724289,7469579.27704422],[794180.7237724289,7469426.40298767],[794027.849715881,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136266/82211","x":136266,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7469426.40298767],[794180.7237724289,7469579.27704422],[794333.5978289805,7469579.27704422],[794333.5978289805,7469426.40298767],[794180.7237724289,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136267/82211","x":136267,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7469579.27704422],[794333.5978289805,7469732.15110077],[794486.4718855284,7469732.15110077],[794486.4718855284,7469579.27704422],[794333.5978289805,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136268/82210","x":136268,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7469579.27704422],[794486.4718855284,7469732.15110077],[794639.3459420763,7469732.15110077],[794639.3459420763,7469579.27704422],[794486.4718855284,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136269/82210","x":136269,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7469426.40298767],[794333.5978289805,7469579.27704422],[794486.4718855284,7469579.27704422],[794486.4718855284,7469426.40298767],[794333.5978289805,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136268/82211","x":136268,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7469426.40298767],[794486.4718855284,7469579.27704422],[794639.3459420763,7469579.27704422],[794639.3459420763,7469426.40298767],[794486.4718855284,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136269/82211","x":136269,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7469579.27704422],[794639.3459420763,7469732.15110077],[794792.2199986279,7469732.15110077],[794792.2199986279,7469579.27704422],[794639.3459420763,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136270/82210","x":136270,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7469579.27704422],[794792.2199986279,7469732.15110077],[794945.0940551758,7469732.15110077],[794945.0940551758,7469579.27704422],[794792.2199986279,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136271/82210","x":136271,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7469426.40298767],[794639.3459420763,7469579.27704422],[794792.2199986279,7469579.27704422],[794792.2199986279,7469426.40298767],[794639.3459420763,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136270/82211","x":136270,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7469426.40298767],[794792.2199986279,7469579.27704422],[794945.0940551758,7469579.27704422],[794945.0940551758,7469426.40298767],[794792.2199986279,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136271/82211","x":136271,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7468662.032704925],[792651.983206939,7468814.906761475],[792804.8572634906,7468814.906761475],[792804.8572634906,7468662.032704925],[792651.983206939,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136257/82216","x":136257,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7468509.158648377],[792651.983206939,7468662.032704925],[792804.8572634906,7468662.032704925],[792804.8572634906,7468509.158648377],[792651.983206939,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136257/82217","x":136257,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7468662.032704925],[792804.8572634906,7468814.906761475],[792957.7313200384,7468814.906761475],[792957.7313200384,7468662.032704925],[792804.8572634906,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136258/82216","x":136258,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7468662.032704925],[792957.7313200384,7468814.906761475],[793110.6053765863,7468814.906761475],[793110.6053765863,7468662.032704925],[792957.7313200384,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136259/82216","x":136259,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7468509.158648377],[792804.8572634906,7468662.032704925],[792957.7313200384,7468662.032704925],[792957.7313200384,7468509.158648377],[792804.8572634906,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136258/82217","x":136258,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7468509.158648377],[792957.7313200384,7468662.032704925],[793110.6053765863,7468662.032704925],[793110.6053765863,7468509.158648377],[792957.7313200384,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136259/82217","x":136259,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7468356.284591828],[792651.983206939,7468509.158648377],[792804.8572634906,7468509.158648377],[792804.8572634906,7468356.284591828],[792651.983206939,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136257/82218","x":136257,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7468203.410535278],[792499.1091503911,7468356.284591828],[792651.983206939,7468356.284591828],[792651.983206939,7468203.410535278],[792499.1091503911,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136256/82219","x":136256,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7468203.410535278],[792651.983206939,7468356.284591828],[792804.8572634906,7468356.284591828],[792804.8572634906,7468203.410535278],[792651.983206939,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136257/82219","x":136257,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7468356.284591828],[792804.8572634906,7468509.158648377],[792957.7313200384,7468509.158648377],[792957.7313200384,7468356.284591828],[792804.8572634906,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136258/82218","x":136258,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7468356.284591828],[792957.7313200384,7468509.158648377],[793110.6053765863,7468509.158648377],[793110.6053765863,7468356.284591828],[792957.7313200384,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136259/82218","x":136259,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7468203.410535278],[792804.8572634906,7468356.284591828],[792957.7313200384,7468356.284591828],[792957.7313200384,7468203.410535278],[792804.8572634906,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136258/82219","x":136258,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7468203.410535278],[792957.7313200384,7468356.284591828],[793110.6053765863,7468356.284591828],[793110.6053765863,7468203.410535278],[792957.7313200384,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136259/82219","x":136259,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7468662.032704925],[793110.6053765863,7468814.906761475],[793263.4794331342,7468814.906761475],[793263.4794331342,7468662.032704925],[793110.6053765863,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136260/82216","x":136260,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7468662.032704925],[793263.4794331342,7468814.906761475],[793416.3534896858,7468814.906761475],[793416.3534896858,7468662.032704925],[793263.4794331342,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136261/82216","x":136261,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7468509.158648377],[793110.6053765863,7468662.032704925],[793263.4794331342,7468662.032704925],[793263.4794331342,7468509.158648377],[793110.6053765863,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136260/82217","x":136260,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7468509.158648377],[793263.4794331342,7468662.032704925],[793416.3534896858,7468662.032704925],[793416.3534896858,7468509.158648377],[793263.4794331342,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136261/82217","x":136261,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7468662.032704925],[793416.3534896858,7468814.906761475],[793569.2275462337,7468814.906761475],[793569.2275462337,7468662.032704925],[793416.3534896858,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136262/82216","x":136262,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7468662.032704925],[793569.2275462337,7468814.906761475],[793722.1016027816,7468814.906761475],[793722.1016027816,7468662.032704925],[793569.2275462337,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136263/82216","x":136263,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7468509.158648377],[793416.3534896858,7468662.032704925],[793569.2275462337,7468662.032704925],[793569.2275462337,7468509.158648377],[793416.3534896858,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136262/82217","x":136262,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7468509.158648377],[793569.2275462337,7468662.032704925],[793722.1016027816,7468662.032704925],[793722.1016027816,7468509.158648377],[793569.2275462337,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136263/82217","x":136263,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7468356.284591828],[793110.6053765863,7468509.158648377],[793263.4794331342,7468509.158648377],[793263.4794331342,7468356.284591828],[793110.6053765863,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136260/82218","x":136260,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7468356.284591828],[793263.4794331342,7468509.158648377],[793416.3534896858,7468509.158648377],[793416.3534896858,7468356.284591828],[793263.4794331342,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136261/82218","x":136261,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7468203.410535278],[793110.6053765863,7468356.284591828],[793263.4794331342,7468356.284591828],[793263.4794331342,7468203.410535278],[793110.6053765863,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136260/82219","x":136260,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7468203.410535278],[793263.4794331342,7468356.284591828],[793416.3534896858,7468356.284591828],[793416.3534896858,7468203.410535278],[793263.4794331342,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136261/82219","x":136261,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7468356.284591828],[793416.3534896858,7468509.158648377],[793569.2275462337,7468509.158648377],[793569.2275462337,7468356.284591828],[793416.3534896858,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136262/82218","x":136262,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7468356.284591828],[793569.2275462337,7468509.158648377],[793722.1016027816,7468509.158648377],[793722.1016027816,7468356.284591828],[793569.2275462337,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136263/82218","x":136263,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7468203.410535278],[793416.3534896858,7468356.284591828],[793569.2275462337,7468356.284591828],[793569.2275462337,7468203.410535278],[793416.3534896858,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136262/82219","x":136262,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7468203.410535278],[793569.2275462337,7468356.284591828],[793722.1016027816,7468356.284591828],[793722.1016027816,7468203.410535278],[793569.2275462337,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136263/82219","x":136263,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7468050.53647873],[792499.1091503911,7468203.410535278],[792651.983206939,7468203.410535278],[792651.983206939,7468050.53647873],[792499.1091503911,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136256/82220","x":136256,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7468050.53647873],[792651.983206939,7468203.410535278],[792804.8572634906,7468203.410535278],[792804.8572634906,7468050.53647873],[792651.983206939,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136257/82220","x":136257,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7467897.66242218],[792499.1091503911,7468050.53647873],[792651.983206939,7468050.53647873],[792651.983206939,7467897.66242218],[792499.1091503911,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136256/82221","x":136256,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7467897.66242218],[792651.983206939,7468050.53647873],[792804.8572634906,7468050.53647873],[792804.8572634906,7467897.66242218],[792651.983206939,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136257/82221","x":136257,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7468050.53647873],[792804.8572634906,7468203.410535278],[792957.7313200384,7468203.410535278],[792957.7313200384,7468050.53647873],[792804.8572634906,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136258/82220","x":136258,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7468050.53647873],[792957.7313200384,7468203.410535278],[793110.6053765863,7468203.410535278],[793110.6053765863,7468050.53647873],[792957.7313200384,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136259/82220","x":136259,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7467897.66242218],[792804.8572634906,7468050.53647873],[792957.7313200384,7468050.53647873],[792957.7313200384,7467897.66242218],[792804.8572634906,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136258/82221","x":136258,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7467897.66242218],[792957.7313200384,7468050.53647873],[793110.6053765863,7468050.53647873],[793110.6053765863,7467897.66242218],[792957.7313200384,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136259/82221","x":136259,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7467744.78836563],[792499.1091503911,7467897.66242218],[792651.983206939,7467897.66242218],[792651.983206939,7467744.78836563],[792499.1091503911,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136256/82222","x":136256,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7467744.78836563],[792651.983206939,7467897.66242218],[792804.8572634906,7467897.66242218],[792804.8572634906,7467744.78836563],[792651.983206939,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136257/82222","x":136257,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7467591.914309083],[792499.1091503911,7467744.78836563],[792651.983206939,7467744.78836563],[792651.983206939,7467591.914309083],[792499.1091503911,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136256/82223","x":136256,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7467591.914309083],[792651.983206939,7467744.78836563],[792804.8572634906,7467744.78836563],[792804.8572634906,7467591.914309083],[792651.983206939,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136257/82223","x":136257,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7467744.78836563],[792804.8572634906,7467897.66242218],[792957.7313200384,7467897.66242218],[792957.7313200384,7467744.78836563],[792804.8572634906,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136258/82222","x":136258,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7467744.78836563],[792957.7313200384,7467897.66242218],[793110.6053765863,7467897.66242218],[793110.6053765863,7467744.78836563],[792957.7313200384,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136259/82222","x":136259,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7467591.914309083],[792804.8572634906,7467744.78836563],[792957.7313200384,7467744.78836563],[792957.7313200384,7467591.914309083],[792804.8572634906,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136258/82223","x":136258,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7467591.914309083],[792957.7313200384,7467744.78836563],[793110.6053765863,7467744.78836563],[793110.6053765863,7467591.914309083],[792957.7313200384,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136259/82223","x":136259,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7468050.53647873],[793110.6053765863,7468203.410535278],[793263.4794331342,7468203.410535278],[793263.4794331342,7468050.53647873],[793110.6053765863,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136260/82220","x":136260,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7468050.53647873],[793263.4794331342,7468203.410535278],[793416.3534896858,7468203.410535278],[793416.3534896858,7468050.53647873],[793263.4794331342,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136261/82220","x":136261,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7467897.66242218],[793110.6053765863,7468050.53647873],[793263.4794331342,7468050.53647873],[793263.4794331342,7467897.66242218],[793110.6053765863,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136260/82221","x":136260,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7467897.66242218],[793263.4794331342,7468050.53647873],[793416.3534896858,7468050.53647873],[793416.3534896858,7467897.66242218],[793263.4794331342,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136261/82221","x":136261,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7468050.53647873],[793416.3534896858,7468203.410535278],[793569.2275462337,7468203.410535278],[793569.2275462337,7468050.53647873],[793416.3534896858,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136262/82220","x":136262,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7468050.53647873],[793569.2275462337,7468203.410535278],[793722.1016027816,7468203.410535278],[793722.1016027816,7468050.53647873],[793569.2275462337,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136263/82220","x":136263,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7467897.66242218],[793416.3534896858,7468050.53647873],[793569.2275462337,7468050.53647873],[793569.2275462337,7467897.66242218],[793416.3534896858,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136262/82221","x":136262,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7467897.66242218],[793569.2275462337,7468050.53647873],[793722.1016027816,7468050.53647873],[793722.1016027816,7467897.66242218],[793569.2275462337,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136263/82221","x":136263,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7467744.78836563],[793110.6053765863,7467897.66242218],[793263.4794331342,7467897.66242218],[793263.4794331342,7467744.78836563],[793110.6053765863,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136260/82222","x":136260,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7467744.78836563],[793263.4794331342,7467897.66242218],[793416.3534896858,7467897.66242218],[793416.3534896858,7467744.78836563],[793263.4794331342,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136261/82222","x":136261,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7467591.914309083],[793110.6053765863,7467744.78836563],[793263.4794331342,7467744.78836563],[793263.4794331342,7467591.914309083],[793110.6053765863,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136260/82223","x":136260,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7467591.914309083],[793263.4794331342,7467744.78836563],[793416.3534896858,7467744.78836563],[793416.3534896858,7467591.914309083],[793263.4794331342,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136261/82223","x":136261,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7467744.78836563],[793416.3534896858,7467897.66242218],[793569.2275462337,7467897.66242218],[793569.2275462337,7467744.78836563],[793416.3534896858,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136262/82222","x":136262,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7467744.78836563],[793569.2275462337,7467897.66242218],[793722.1016027816,7467897.66242218],[793722.1016027816,7467744.78836563],[793569.2275462337,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136263/82222","x":136263,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7467591.914309083],[793416.3534896858,7467744.78836563],[793569.2275462337,7467744.78836563],[793569.2275462337,7467591.914309083],[793416.3534896858,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136262/82223","x":136262,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7467591.914309083],[793569.2275462337,7467744.78836563],[793722.1016027816,7467744.78836563],[793722.1016027816,7467591.914309083],[793569.2275462337,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136263/82223","x":136263,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7468662.032704925],[793722.1016027816,7468814.906761475],[793874.9756593332,7468814.906761475],[793874.9756593332,7468662.032704925],[793722.1016027816,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136264/82216","x":136264,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7468662.032704925],[793874.9756593332,7468814.906761475],[794027.849715881,7468814.906761475],[794027.849715881,7468662.032704925],[793874.9756593332,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136265/82216","x":136265,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7468509.158648377],[793722.1016027816,7468662.032704925],[793874.9756593332,7468662.032704925],[793874.9756593332,7468509.158648377],[793722.1016027816,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136264/82217","x":136264,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7468509.158648377],[793874.9756593332,7468662.032704925],[794027.849715881,7468662.032704925],[794027.849715881,7468509.158648377],[793874.9756593332,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136265/82217","x":136265,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7468662.032704925],[794027.849715881,7468814.906761475],[794180.7237724289,7468814.906761475],[794180.7237724289,7468662.032704925],[794027.849715881,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136266/82216","x":136266,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7468662.032704925],[794180.7237724289,7468814.906761475],[794333.5978289805,7468814.906761475],[794333.5978289805,7468662.032704925],[794180.7237724289,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136267/82216","x":136267,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7468509.158648377],[794027.849715881,7468662.032704925],[794180.7237724289,7468662.032704925],[794180.7237724289,7468509.158648377],[794027.849715881,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136266/82217","x":136266,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7468509.158648377],[794180.7237724289,7468662.032704925],[794333.5978289805,7468662.032704925],[794333.5978289805,7468509.158648377],[794180.7237724289,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136267/82217","x":136267,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7468356.284591828],[793722.1016027816,7468509.158648377],[793874.9756593332,7468509.158648377],[793874.9756593332,7468356.284591828],[793722.1016027816,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136264/82218","x":136264,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7468356.284591828],[793874.9756593332,7468509.158648377],[794027.849715881,7468509.158648377],[794027.849715881,7468356.284591828],[793874.9756593332,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136265/82218","x":136265,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7468203.410535278],[793722.1016027816,7468356.284591828],[793874.9756593332,7468356.284591828],[793874.9756593332,7468203.410535278],[793722.1016027816,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136264/82219","x":136264,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7468203.410535278],[793874.9756593332,7468356.284591828],[794027.849715881,7468356.284591828],[794027.849715881,7468203.410535278],[793874.9756593332,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136265/82219","x":136265,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7468356.284591828],[794027.849715881,7468509.158648377],[794180.7237724289,7468509.158648377],[794180.7237724289,7468356.284591828],[794027.849715881,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136266/82218","x":136266,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7468356.284591828],[794180.7237724289,7468509.158648377],[794333.5978289805,7468509.158648377],[794333.5978289805,7468356.284591828],[794180.7237724289,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136267/82218","x":136267,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7468203.410535278],[794027.849715881,7468356.284591828],[794180.7237724289,7468356.284591828],[794180.7237724289,7468203.410535278],[794027.849715881,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136266/82219","x":136266,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7468203.410535278],[794180.7237724289,7468356.284591828],[794333.5978289805,7468356.284591828],[794333.5978289805,7468203.410535278],[794180.7237724289,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136267/82219","x":136267,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7468662.032704925],[794333.5978289805,7468814.906761475],[794486.4718855284,7468814.906761475],[794486.4718855284,7468662.032704925],[794333.5978289805,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136268/82216","x":136268,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7468509.158648377],[794333.5978289805,7468662.032704925],[794486.4718855284,7468662.032704925],[794486.4718855284,7468509.158648377],[794333.5978289805,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136268/82217","x":136268,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7468356.284591828],[794333.5978289805,7468509.158648377],[794486.4718855284,7468509.158648377],[794486.4718855284,7468356.284591828],[794333.5978289805,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136268/82218","x":136268,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7468203.410535278],[794333.5978289805,7468356.284591828],[794486.4718855284,7468356.284591828],[794486.4718855284,7468203.410535278],[794333.5978289805,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136268/82219","x":136268,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7468050.53647873],[793722.1016027816,7468203.410535278],[793874.9756593332,7468203.410535278],[793874.9756593332,7468050.53647873],[793722.1016027816,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136264/82220","x":136264,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7468050.53647873],[793874.9756593332,7468203.410535278],[794027.849715881,7468203.410535278],[794027.849715881,7468050.53647873],[793874.9756593332,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136265/82220","x":136265,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7467897.66242218],[793722.1016027816,7468050.53647873],[793874.9756593332,7468050.53647873],[793874.9756593332,7467897.66242218],[793722.1016027816,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136264/82221","x":136264,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7467897.66242218],[793874.9756593332,7468050.53647873],[794027.849715881,7468050.53647873],[794027.849715881,7467897.66242218],[793874.9756593332,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136265/82221","x":136265,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7468050.53647873],[794027.849715881,7468203.410535278],[794180.7237724289,7468203.410535278],[794180.7237724289,7468050.53647873],[794027.849715881,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136266/82220","x":136266,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7468050.53647873],[794180.7237724289,7468203.410535278],[794333.5978289805,7468203.410535278],[794333.5978289805,7468050.53647873],[794180.7237724289,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136267/82220","x":136267,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7467897.66242218],[794027.849715881,7468050.53647873],[794180.7237724289,7468050.53647873],[794180.7237724289,7467897.66242218],[794027.849715881,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136266/82221","x":136266,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7467897.66242218],[794180.7237724289,7468050.53647873],[794333.5978289805,7468050.53647873],[794333.5978289805,7467897.66242218],[794180.7237724289,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136267/82221","x":136267,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7467744.78836563],[793722.1016027816,7467897.66242218],[793874.9756593332,7467897.66242218],[793874.9756593332,7467744.78836563],[793722.1016027816,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136264/82222","x":136264,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7467744.78836563],[793874.9756593332,7467897.66242218],[794027.849715881,7467897.66242218],[794027.849715881,7467744.78836563],[793874.9756593332,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136265/82222","x":136265,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7467591.914309083],[793722.1016027816,7467744.78836563],[793874.9756593332,7467744.78836563],[793874.9756593332,7467591.914309083],[793722.1016027816,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136264/82223","x":136264,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7467591.914309083],[793874.9756593332,7467744.78836563],[794027.849715881,7467744.78836563],[794027.849715881,7467591.914309083],[793874.9756593332,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136265/82223","x":136265,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7467744.78836563],[794027.849715881,7467897.66242218],[794180.7237724289,7467897.66242218],[794180.7237724289,7467744.78836563],[794027.849715881,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136266/82222","x":136266,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7467744.78836563],[794180.7237724289,7467897.66242218],[794333.5978289805,7467897.66242218],[794333.5978289805,7467744.78836563],[794180.7237724289,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136267/82222","x":136267,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7467591.914309083],[794027.849715881,7467744.78836563],[794180.7237724289,7467744.78836563],[794180.7237724289,7467591.914309083],[794027.849715881,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136266/82223","x":136266,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7467591.914309083],[794180.7237724289,7467744.78836563],[794333.5978289805,7467744.78836563],[794333.5978289805,7467591.914309083],[794180.7237724289,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136267/82223","x":136267,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7468050.53647873],[794333.5978289805,7468203.410535278],[794486.4718855284,7468203.410535278],[794486.4718855284,7468050.53647873],[794333.5978289805,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136268/82220","x":136268,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7467897.66242218],[794333.5978289805,7468050.53647873],[794486.4718855284,7468050.53647873],[794486.4718855284,7467897.66242218],[794333.5978289805,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136268/82221","x":136268,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7467744.78836563],[794333.5978289805,7467897.66242218],[794486.4718855284,7467897.66242218],[794486.4718855284,7467744.78836563],[794333.5978289805,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136268/82222","x":136268,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7467591.914309083],[794333.5978289805,7467744.78836563],[794486.4718855284,7467744.78836563],[794486.4718855284,7467591.914309083],[794333.5978289805,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136268/82223","x":136268,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7469579.27704422],[794945.0940551758,7469732.15110077],[795097.9681117237,7469732.15110077],[795097.9681117237,7469579.27704422],[794945.0940551758,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136272/82210","x":136272,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7469579.27704422],[795097.9681117237,7469732.15110077],[795250.8421682753,7469732.15110077],[795250.8421682753,7469579.27704422],[795097.9681117237,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136273/82210","x":136273,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7469426.40298767],[794945.0940551758,7469579.27704422],[795097.9681117237,7469579.27704422],[795097.9681117237,7469426.40298767],[794945.0940551758,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136272/82211","x":136272,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7469426.40298767],[795097.9681117237,7469579.27704422],[795250.8421682753,7469579.27704422],[795250.8421682753,7469426.40298767],[795097.9681117237,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136273/82211","x":136273,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7469579.27704422],[795250.8421682753,7469732.15110077],[795403.7162248231,7469732.15110077],[795403.7162248231,7469579.27704422],[795250.8421682753,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136274/82210","x":136274,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7469579.27704422],[795403.7162248231,7469732.15110077],[795556.590281371,7469732.15110077],[795556.590281371,7469579.27704422],[795403.7162248231,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136275/82210","x":136275,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7469426.40298767],[795250.8421682753,7469579.27704422],[795403.7162248231,7469579.27704422],[795403.7162248231,7469426.40298767],[795250.8421682753,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136274/82211","x":136274,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7469426.40298767],[795403.7162248231,7469579.27704422],[795556.590281371,7469579.27704422],[795556.590281371,7469426.40298767],[795403.7162248231,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136275/82211","x":136275,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7469579.27704422],[795556.590281371,7469732.15110077],[795709.4643379226,7469732.15110077],[795709.4643379226,7469579.27704422],[795556.590281371,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136276/82210","x":136276,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7469579.27704422],[795709.4643379226,7469732.15110077],[795862.3383944705,7469732.15110077],[795862.3383944705,7469579.27704422],[795709.4643379226,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136277/82210","x":136277,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7469426.40298767],[795556.590281371,7469579.27704422],[795709.4643379226,7469579.27704422],[795709.4643379226,7469426.40298767],[795556.590281371,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136276/82211","x":136276,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7469426.40298767],[795709.4643379226,7469579.27704422],[795862.3383944705,7469579.27704422],[795862.3383944705,7469426.40298767],[795709.4643379226,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136277/82211","x":136277,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7469579.27704422],[795862.3383944705,7469732.15110077],[796015.2124510184,7469732.15110077],[796015.2124510184,7469579.27704422],[795862.3383944705,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136278/82210","x":136278,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7469579.27704422],[796015.2124510184,7469732.15110077],[796168.08650757,7469732.15110077],[796168.08650757,7469579.27704422],[796015.2124510184,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136279/82210","x":136279,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7469426.40298767],[795862.3383944705,7469579.27704422],[796015.2124510184,7469579.27704422],[796015.2124510184,7469426.40298767],[795862.3383944705,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136278/82211","x":136278,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7469426.40298767],[796015.2124510184,7469579.27704422],[796168.08650757,7469579.27704422],[796168.08650757,7469426.40298767],[796015.2124510184,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136279/82211","x":136279,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7469732.15110077],[796626.7086772174,7469885.0251573175],[796779.5827337652,7469885.0251573175],[796779.5827337652,7469732.15110077],[796626.7086772174,7469732.15110077]]],"type":"Polygon"},"properties":{"label":"18/136283/82209","x":136283,"y":82209,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7469579.27704422],[796168.08650757,7469732.15110077],[796320.9605641179,7469732.15110077],[796320.9605641179,7469579.27704422],[796168.08650757,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136280/82210","x":136280,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7469579.27704422],[796320.9605641179,7469732.15110077],[796473.8346206658,7469732.15110077],[796473.8346206658,7469579.27704422],[796320.9605641179,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136281/82210","x":136281,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7469426.40298767],[796168.08650757,7469579.27704422],[796320.9605641179,7469579.27704422],[796320.9605641179,7469426.40298767],[796168.08650757,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136280/82211","x":136280,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7469426.40298767],[796320.9605641179,7469579.27704422],[796473.8346206658,7469579.27704422],[796473.8346206658,7469426.40298767],[796320.9605641179,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136281/82211","x":136281,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7469579.27704422],[796473.8346206658,7469732.15110077],[796626.7086772174,7469732.15110077],[796626.7086772174,7469579.27704422],[796473.8346206658,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136282/82210","x":136282,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7469579.27704422],[796626.7086772174,7469732.15110077],[796779.5827337652,7469732.15110077],[796779.5827337652,7469579.27704422],[796626.7086772174,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136283/82210","x":136283,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7469426.40298767],[796473.8346206658,7469579.27704422],[796626.7086772174,7469579.27704422],[796626.7086772174,7469426.40298767],[796473.8346206658,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136282/82211","x":136282,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7469426.40298767],[796626.7086772174,7469579.27704422],[796779.5827337652,7469579.27704422],[796779.5827337652,7469426.40298767],[796626.7086772174,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136283/82211","x":136283,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7469732.15110077],[796779.5827337652,7469885.0251573175],[796932.4567903131,7469885.0251573175],[796932.4567903131,7469732.15110077],[796779.5827337652,7469732.15110077]]],"type":"Polygon"},"properties":{"label":"18/136284/82209","x":136284,"y":82209,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7469732.15110077],[796932.4567903131,7469885.0251573175],[797085.330846861,7469885.0251573175],[797085.330846861,7469732.15110077],[796932.4567903131,7469732.15110077]]],"type":"Polygon"},"properties":{"label":"18/136285/82209","x":136285,"y":82209,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7469885.0251573175],[797085.330846861,7470037.899213867],[797238.2049034126,7470037.899213867],[797238.2049034126,7469885.0251573175],[797085.330846861,7469885.0251573175]]],"type":"Polygon"},"properties":{"label":"18/136286/82208","x":136286,"y":82208,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7469885.0251573175],[797238.2049034126,7470037.899213867],[797391.0789599605,7470037.899213867],[797391.0789599605,7469885.0251573175],[797238.2049034126,7469885.0251573175]]],"type":"Polygon"},"properties":{"label":"18/136287/82208","x":136287,"y":82208,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7469732.15110077],[797085.330846861,7469885.0251573175],[797238.2049034126,7469885.0251573175],[797238.2049034126,7469732.15110077],[797085.330846861,7469732.15110077]]],"type":"Polygon"},"properties":{"label":"18/136286/82209","x":136286,"y":82209,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7469732.15110077],[797238.2049034126,7469885.0251573175],[797391.0789599605,7469885.0251573175],[797391.0789599605,7469732.15110077],[797238.2049034126,7469732.15110077]]],"type":"Polygon"},"properties":{"label":"18/136287/82209","x":136287,"y":82209,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7469579.27704422],[796779.5827337652,7469732.15110077],[796932.4567903131,7469732.15110077],[796932.4567903131,7469579.27704422],[796779.5827337652,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136284/82210","x":136284,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7469579.27704422],[796932.4567903131,7469732.15110077],[797085.330846861,7469732.15110077],[797085.330846861,7469579.27704422],[796932.4567903131,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136285/82210","x":136285,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7469426.40298767],[796779.5827337652,7469579.27704422],[796932.4567903131,7469579.27704422],[796932.4567903131,7469426.40298767],[796779.5827337652,7469426.40298767]]],"type":"Polygon"},"properties":{"label":"18/136284/82211","x":136284,"y":82211,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7469579.27704422],[797085.330846861,7469732.15110077],[797238.2049034126,7469732.15110077],[797238.2049034126,7469579.27704422],[797085.330846861,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136286/82210","x":136286,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7469579.27704422],[797238.2049034126,7469732.15110077],[797391.0789599605,7469732.15110077],[797391.0789599605,7469579.27704422],[797238.2049034126,7469579.27704422]]],"type":"Polygon"},"properties":{"label":"18/136287/82210","x":136287,"y":82210,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7468814.906761475],[796320.9605641179,7468967.780818023],[796473.8346206658,7468967.780818023],[796473.8346206658,7468814.906761475],[796320.9605641179,7468814.906761475]]],"type":"Polygon"},"properties":{"label":"18/136281/82215","x":136281,"y":82215,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7468967.780818023],[796473.8346206658,7469120.6548745725],[796626.7086772174,7469120.6548745725],[796626.7086772174,7468967.780818023],[796473.8346206658,7468967.780818023]]],"type":"Polygon"},"properties":{"label":"18/136282/82214","x":136282,"y":82214,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7468967.780818023],[796626.7086772174,7469120.6548745725],[796779.5827337652,7469120.6548745725],[796779.5827337652,7468967.780818023],[796626.7086772174,7468967.780818023]]],"type":"Polygon"},"properties":{"label":"18/136283/82214","x":136283,"y":82214,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7468814.906761475],[796473.8346206658,7468967.780818023],[796626.7086772174,7468967.780818023],[796626.7086772174,7468814.906761475],[796473.8346206658,7468814.906761475]]],"type":"Polygon"},"properties":{"label":"18/136282/82215","x":136282,"y":82215,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7468814.906761475],[796626.7086772174,7468967.780818023],[796779.5827337652,7468967.780818023],[796779.5827337652,7468814.906761475],[796626.7086772174,7468814.906761475]]],"type":"Polygon"},"properties":{"label":"18/136283/82215","x":136283,"y":82215,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7468967.780818023],[796779.5827337652,7469120.6548745725],[796932.4567903131,7469120.6548745725],[796932.4567903131,7468967.780818023],[796779.5827337652,7468967.780818023]]],"type":"Polygon"},"properties":{"label":"18/136284/82214","x":136284,"y":82214,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7468814.906761475],[796779.5827337652,7468967.780818023],[796932.4567903131,7468967.780818023],[796932.4567903131,7468814.906761475],[796779.5827337652,7468814.906761475]]],"type":"Polygon"},"properties":{"label":"18/136284/82215","x":136284,"y":82215,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7468814.906761475],[796932.4567903131,7468967.780818023],[797085.330846861,7468967.780818023],[797085.330846861,7468814.906761475],[796932.4567903131,7468814.906761475]]],"type":"Polygon"},"properties":{"label":"18/136285/82215","x":136285,"y":82215,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7468509.158648377],[796015.2124510184,7468662.032704925],[796168.08650757,7468662.032704925],[796168.08650757,7468509.158648377],[796015.2124510184,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136279/82217","x":136279,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7468203.410535278],[795709.4643379226,7468356.284591828],[795862.3383944705,7468356.284591828],[795862.3383944705,7468203.410535278],[795709.4643379226,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136277/82219","x":136277,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7468356.284591828],[795862.3383944705,7468509.158648377],[796015.2124510184,7468509.158648377],[796015.2124510184,7468356.284591828],[795862.3383944705,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136278/82218","x":136278,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7468356.284591828],[796015.2124510184,7468509.158648377],[796168.08650757,7468509.158648377],[796168.08650757,7468356.284591828],[796015.2124510184,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136279/82218","x":136279,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7468203.410535278],[795862.3383944705,7468356.284591828],[796015.2124510184,7468356.284591828],[796015.2124510184,7468203.410535278],[795862.3383944705,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136278/82219","x":136278,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7468203.410535278],[796015.2124510184,7468356.284591828],[796168.08650757,7468356.284591828],[796168.08650757,7468203.410535278],[796015.2124510184,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136279/82219","x":136279,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7468050.53647873],[795556.590281371,7468203.410535278],[795709.4643379226,7468203.410535278],[795709.4643379226,7468050.53647873],[795556.590281371,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136276/82220","x":136276,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7468050.53647873],[795709.4643379226,7468203.410535278],[795862.3383944705,7468203.410535278],[795862.3383944705,7468050.53647873],[795709.4643379226,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136277/82220","x":136277,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7467897.66242218],[795556.590281371,7468050.53647873],[795709.4643379226,7468050.53647873],[795709.4643379226,7467897.66242218],[795556.590281371,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136276/82221","x":136276,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7467897.66242218],[795709.4643379226,7468050.53647873],[795862.3383944705,7468050.53647873],[795862.3383944705,7467897.66242218],[795709.4643379226,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136277/82221","x":136277,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7468050.53647873],[795862.3383944705,7468203.410535278],[796015.2124510184,7468203.410535278],[796015.2124510184,7468050.53647873],[795862.3383944705,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136278/82220","x":136278,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7468050.53647873],[796015.2124510184,7468203.410535278],[796168.08650757,7468203.410535278],[796168.08650757,7468050.53647873],[796015.2124510184,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136279/82220","x":136279,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7467897.66242218],[795862.3383944705,7468050.53647873],[796015.2124510184,7468050.53647873],[796015.2124510184,7467897.66242218],[795862.3383944705,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136278/82221","x":136278,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7467897.66242218],[796015.2124510184,7468050.53647873],[796168.08650757,7468050.53647873],[796168.08650757,7467897.66242218],[796015.2124510184,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136279/82221","x":136279,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7467744.78836563],[795556.590281371,7467897.66242218],[795709.4643379226,7467897.66242218],[795709.4643379226,7467744.78836563],[795556.590281371,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136276/82222","x":136276,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7467744.78836563],[795709.4643379226,7467897.66242218],[795862.3383944705,7467897.66242218],[795862.3383944705,7467744.78836563],[795709.4643379226,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136277/82222","x":136277,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7467591.914309083],[795556.590281371,7467744.78836563],[795709.4643379226,7467744.78836563],[795709.4643379226,7467591.914309083],[795556.590281371,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136276/82223","x":136276,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7467591.914309083],[795709.4643379226,7467744.78836563],[795862.3383944705,7467744.78836563],[795862.3383944705,7467591.914309083],[795709.4643379226,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136277/82223","x":136277,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7467744.78836563],[795862.3383944705,7467897.66242218],[796015.2124510184,7467897.66242218],[796015.2124510184,7467744.78836563],[795862.3383944705,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136278/82222","x":136278,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7467744.78836563],[796015.2124510184,7467897.66242218],[796168.08650757,7467897.66242218],[796168.08650757,7467744.78836563],[796015.2124510184,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136279/82222","x":136279,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7467591.914309083],[795862.3383944705,7467744.78836563],[796015.2124510184,7467744.78836563],[796015.2124510184,7467591.914309083],[795862.3383944705,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136278/82223","x":136278,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7467591.914309083],[796015.2124510184,7467744.78836563],[796168.08650757,7467744.78836563],[796168.08650757,7467591.914309083],[796015.2124510184,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136279/82223","x":136279,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7468662.032704925],[796168.08650757,7468814.906761475],[796320.9605641179,7468814.906761475],[796320.9605641179,7468662.032704925],[796168.08650757,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136280/82216","x":136280,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7468662.032704925],[796320.9605641179,7468814.906761475],[796473.8346206658,7468814.906761475],[796473.8346206658,7468662.032704925],[796320.9605641179,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136281/82216","x":136281,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7468509.158648377],[796168.08650757,7468662.032704925],[796320.9605641179,7468662.032704925],[796320.9605641179,7468509.158648377],[796168.08650757,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136280/82217","x":136280,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7468509.158648377],[796320.9605641179,7468662.032704925],[796473.8346206658,7468662.032704925],[796473.8346206658,7468509.158648377],[796320.9605641179,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136281/82217","x":136281,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7468662.032704925],[796473.8346206658,7468814.906761475],[796626.7086772174,7468814.906761475],[796626.7086772174,7468662.032704925],[796473.8346206658,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136282/82216","x":136282,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7468662.032704925],[796626.7086772174,7468814.906761475],[796779.5827337652,7468814.906761475],[796779.5827337652,7468662.032704925],[796626.7086772174,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136283/82216","x":136283,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7468509.158648377],[796473.8346206658,7468662.032704925],[796626.7086772174,7468662.032704925],[796626.7086772174,7468509.158648377],[796473.8346206658,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136282/82217","x":136282,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7468509.158648377],[796626.7086772174,7468662.032704925],[796779.5827337652,7468662.032704925],[796779.5827337652,7468509.158648377],[796626.7086772174,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136283/82217","x":136283,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7468356.284591828],[796168.08650757,7468509.158648377],[796320.9605641179,7468509.158648377],[796320.9605641179,7468356.284591828],[796168.08650757,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136280/82218","x":136280,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7468356.284591828],[796320.9605641179,7468509.158648377],[796473.8346206658,7468509.158648377],[796473.8346206658,7468356.284591828],[796320.9605641179,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136281/82218","x":136281,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7468203.410535278],[796168.08650757,7468356.284591828],[796320.9605641179,7468356.284591828],[796320.9605641179,7468203.410535278],[796168.08650757,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136280/82219","x":136280,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7468203.410535278],[796320.9605641179,7468356.284591828],[796473.8346206658,7468356.284591828],[796473.8346206658,7468203.410535278],[796320.9605641179,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136281/82219","x":136281,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7468356.284591828],[796473.8346206658,7468509.158648377],[796626.7086772174,7468509.158648377],[796626.7086772174,7468356.284591828],[796473.8346206658,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136282/82218","x":136282,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7468356.284591828],[796626.7086772174,7468509.158648377],[796779.5827337652,7468509.158648377],[796779.5827337652,7468356.284591828],[796626.7086772174,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136283/82218","x":136283,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7468203.410535278],[796473.8346206658,7468356.284591828],[796626.7086772174,7468356.284591828],[796626.7086772174,7468203.410535278],[796473.8346206658,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136282/82219","x":136282,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7468203.410535278],[796626.7086772174,7468356.284591828],[796779.5827337652,7468356.284591828],[796779.5827337652,7468203.410535278],[796626.7086772174,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136283/82219","x":136283,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7468662.032704925],[796779.5827337652,7468814.906761475],[796932.4567903131,7468814.906761475],[796932.4567903131,7468662.032704925],[796779.5827337652,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136284/82216","x":136284,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7468662.032704925],[796932.4567903131,7468814.906761475],[797085.330846861,7468814.906761475],[797085.330846861,7468662.032704925],[796932.4567903131,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136285/82216","x":136285,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7468509.158648377],[796779.5827337652,7468662.032704925],[796932.4567903131,7468662.032704925],[796932.4567903131,7468509.158648377],[796779.5827337652,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136284/82217","x":136284,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7468509.158648377],[796932.4567903131,7468662.032704925],[797085.330846861,7468662.032704925],[797085.330846861,7468509.158648377],[796932.4567903131,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136285/82217","x":136285,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7468662.032704925],[797085.330846861,7468814.906761475],[797238.2049034126,7468814.906761475],[797238.2049034126,7468662.032704925],[797085.330846861,7468662.032704925]]],"type":"Polygon"},"properties":{"label":"18/136286/82216","x":136286,"y":82216,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7468509.158648377],[797085.330846861,7468662.032704925],[797238.2049034126,7468662.032704925],[797238.2049034126,7468509.158648377],[797085.330846861,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136286/82217","x":136286,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7468509.158648377],[797238.2049034126,7468662.032704925],[797391.0789599605,7468662.032704925],[797391.0789599605,7468509.158648377],[797238.2049034126,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136287/82217","x":136287,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7468356.284591828],[796779.5827337652,7468509.158648377],[796932.4567903131,7468509.158648377],[796932.4567903131,7468356.284591828],[796779.5827337652,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136284/82218","x":136284,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7468356.284591828],[796932.4567903131,7468509.158648377],[797085.330846861,7468509.158648377],[797085.330846861,7468356.284591828],[796932.4567903131,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136285/82218","x":136285,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7468203.410535278],[796779.5827337652,7468356.284591828],[796932.4567903131,7468356.284591828],[796932.4567903131,7468203.410535278],[796779.5827337652,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136284/82219","x":136284,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7468203.410535278],[796932.4567903131,7468356.284591828],[797085.330846861,7468356.284591828],[797085.330846861,7468203.410535278],[796932.4567903131,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136285/82219","x":136285,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7468356.284591828],[797085.330846861,7468509.158648377],[797238.2049034126,7468509.158648377],[797238.2049034126,7468356.284591828],[797085.330846861,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136286/82218","x":136286,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7468356.284591828],[797238.2049034126,7468509.158648377],[797391.0789599605,7468509.158648377],[797391.0789599605,7468356.284591828],[797238.2049034126,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136287/82218","x":136287,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7468203.410535278],[797085.330846861,7468356.284591828],[797238.2049034126,7468356.284591828],[797238.2049034126,7468203.410535278],[797085.330846861,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136286/82219","x":136286,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7468203.410535278],[797238.2049034126,7468356.284591828],[797391.0789599605,7468356.284591828],[797391.0789599605,7468203.410535278],[797238.2049034126,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136287/82219","x":136287,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7468050.53647873],[796168.08650757,7468203.410535278],[796320.9605641179,7468203.410535278],[796320.9605641179,7468050.53647873],[796168.08650757,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136280/82220","x":136280,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7468050.53647873],[796320.9605641179,7468203.410535278],[796473.8346206658,7468203.410535278],[796473.8346206658,7468050.53647873],[796320.9605641179,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136281/82220","x":136281,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7467897.66242218],[796168.08650757,7468050.53647873],[796320.9605641179,7468050.53647873],[796320.9605641179,7467897.66242218],[796168.08650757,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136280/82221","x":136280,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7467897.66242218],[796320.9605641179,7468050.53647873],[796473.8346206658,7468050.53647873],[796473.8346206658,7467897.66242218],[796320.9605641179,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136281/82221","x":136281,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7468050.53647873],[796473.8346206658,7468203.410535278],[796626.7086772174,7468203.410535278],[796626.7086772174,7468050.53647873],[796473.8346206658,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136282/82220","x":136282,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7468050.53647873],[796626.7086772174,7468203.410535278],[796779.5827337652,7468203.410535278],[796779.5827337652,7468050.53647873],[796626.7086772174,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136283/82220","x":136283,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7467897.66242218],[796473.8346206658,7468050.53647873],[796626.7086772174,7468050.53647873],[796626.7086772174,7467897.66242218],[796473.8346206658,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136282/82221","x":136282,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7467897.66242218],[796626.7086772174,7468050.53647873],[796779.5827337652,7468050.53647873],[796779.5827337652,7467897.66242218],[796626.7086772174,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136283/82221","x":136283,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7467744.78836563],[796168.08650757,7467897.66242218],[796320.9605641179,7467897.66242218],[796320.9605641179,7467744.78836563],[796168.08650757,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136280/82222","x":136280,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7467744.78836563],[796320.9605641179,7467897.66242218],[796473.8346206658,7467897.66242218],[796473.8346206658,7467744.78836563],[796320.9605641179,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136281/82222","x":136281,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7467591.914309083],[796168.08650757,7467744.78836563],[796320.9605641179,7467744.78836563],[796320.9605641179,7467591.914309083],[796168.08650757,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136280/82223","x":136280,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7467591.914309083],[796320.9605641179,7467744.78836563],[796473.8346206658,7467744.78836563],[796473.8346206658,7467591.914309083],[796320.9605641179,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136281/82223","x":136281,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7467744.78836563],[796473.8346206658,7467897.66242218],[796626.7086772174,7467897.66242218],[796626.7086772174,7467744.78836563],[796473.8346206658,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136282/82222","x":136282,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7467744.78836563],[796626.7086772174,7467897.66242218],[796779.5827337652,7467897.66242218],[796779.5827337652,7467744.78836563],[796626.7086772174,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136283/82222","x":136283,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7467591.914309083],[796473.8346206658,7467744.78836563],[796626.7086772174,7467744.78836563],[796626.7086772174,7467591.914309083],[796473.8346206658,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136282/82223","x":136282,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7467591.914309083],[796626.7086772174,7467744.78836563],[796779.5827337652,7467744.78836563],[796779.5827337652,7467591.914309083],[796626.7086772174,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136283/82223","x":136283,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7468050.53647873],[796779.5827337652,7468203.410535278],[796932.4567903131,7468203.410535278],[796932.4567903131,7468050.53647873],[796779.5827337652,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136284/82220","x":136284,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7468050.53647873],[796932.4567903131,7468203.410535278],[797085.330846861,7468203.410535278],[797085.330846861,7468050.53647873],[796932.4567903131,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136285/82220","x":136285,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7467897.66242218],[796779.5827337652,7468050.53647873],[796932.4567903131,7468050.53647873],[796932.4567903131,7467897.66242218],[796779.5827337652,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136284/82221","x":136284,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7467897.66242218],[796932.4567903131,7468050.53647873],[797085.330846861,7468050.53647873],[797085.330846861,7467897.66242218],[796932.4567903131,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136285/82221","x":136285,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7468050.53647873],[797085.330846861,7468203.410535278],[797238.2049034126,7468203.410535278],[797238.2049034126,7468050.53647873],[797085.330846861,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136286/82220","x":136286,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7468050.53647873],[797238.2049034126,7468203.410535278],[797391.0789599605,7468203.410535278],[797391.0789599605,7468050.53647873],[797238.2049034126,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136287/82220","x":136287,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7467897.66242218],[797085.330846861,7468050.53647873],[797238.2049034126,7468050.53647873],[797238.2049034126,7467897.66242218],[797085.330846861,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136286/82221","x":136286,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7467897.66242218],[797238.2049034126,7468050.53647873],[797391.0789599605,7468050.53647873],[797391.0789599605,7467897.66242218],[797238.2049034126,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136287/82221","x":136287,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7467744.78836563],[796779.5827337652,7467897.66242218],[796932.4567903131,7467897.66242218],[796932.4567903131,7467744.78836563],[796779.5827337652,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136284/82222","x":136284,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7467744.78836563],[796932.4567903131,7467897.66242218],[797085.330846861,7467897.66242218],[797085.330846861,7467744.78836563],[796932.4567903131,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136285/82222","x":136285,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7467591.914309083],[796779.5827337652,7467744.78836563],[796932.4567903131,7467744.78836563],[796932.4567903131,7467591.914309083],[796779.5827337652,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136284/82223","x":136284,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7467591.914309083],[796932.4567903131,7467744.78836563],[797085.330846861,7467744.78836563],[797085.330846861,7467591.914309083],[796932.4567903131,7467591.914309083]]],"type":"Polygon"},"properties":{"label":"18/136285/82223","x":136285,"y":82223,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7467744.78836563],[797085.330846861,7467897.66242218],[797238.2049034126,7467897.66242218],[797238.2049034126,7467744.78836563],[797085.330846861,7467744.78836563]]],"type":"Polygon"},"properties":{"label":"18/136286/82222","x":136286,"y":82222,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7467439.040252533],[792499.1091503911,7467591.914309083],[792651.983206939,7467591.914309083],[792651.983206939,7467439.040252533],[792499.1091503911,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136256/82224","x":136256,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7467439.040252533],[792651.983206939,7467591.914309083],[792804.8572634906,7467591.914309083],[792804.8572634906,7467439.040252533],[792651.983206939,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136257/82224","x":136257,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7467286.166195983],[792499.1091503911,7467439.040252533],[792651.983206939,7467439.040252533],[792651.983206939,7467286.166195983],[792499.1091503911,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136256/82225","x":136256,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7467286.166195983],[792651.983206939,7467439.040252533],[792804.8572634906,7467439.040252533],[792804.8572634906,7467286.166195983],[792651.983206939,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136257/82225","x":136257,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7467439.040252533],[792804.8572634906,7467591.914309083],[792957.7313200384,7467591.914309083],[792957.7313200384,7467439.040252533],[792804.8572634906,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136258/82224","x":136258,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7467439.040252533],[792957.7313200384,7467591.914309083],[793110.6053765863,7467591.914309083],[793110.6053765863,7467439.040252533],[792957.7313200384,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136259/82224","x":136259,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7467286.166195983],[792804.8572634906,7467439.040252533],[792957.7313200384,7467439.040252533],[792957.7313200384,7467286.166195983],[792804.8572634906,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136258/82225","x":136258,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7467286.166195983],[792957.7313200384,7467439.040252533],[793110.6053765863,7467439.040252533],[793110.6053765863,7467286.166195983],[792957.7313200384,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136259/82225","x":136259,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7467133.292139435],[792499.1091503911,7467286.166195983],[792651.983206939,7467286.166195983],[792651.983206939,7467133.292139435],[792499.1091503911,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136256/82226","x":136256,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7467133.292139435],[792651.983206939,7467286.166195983],[792804.8572634906,7467286.166195983],[792804.8572634906,7467133.292139435],[792651.983206939,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136257/82226","x":136257,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7466980.418082885],[792499.1091503911,7467133.292139435],[792651.983206939,7467133.292139435],[792651.983206939,7466980.418082885],[792499.1091503911,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136256/82227","x":136256,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7466980.418082885],[792651.983206939,7467133.292139435],[792804.8572634906,7467133.292139435],[792804.8572634906,7466980.418082885],[792651.983206939,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136257/82227","x":136257,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7467133.292139435],[792804.8572634906,7467286.166195983],[792957.7313200384,7467286.166195983],[792957.7313200384,7467133.292139435],[792804.8572634906,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136258/82226","x":136258,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7467133.292139435],[792957.7313200384,7467286.166195983],[793110.6053765863,7467286.166195983],[793110.6053765863,7467133.292139435],[792957.7313200384,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136259/82226","x":136259,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7466980.418082885],[792804.8572634906,7467133.292139435],[792957.7313200384,7467133.292139435],[792957.7313200384,7466980.418082885],[792804.8572634906,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136258/82227","x":136258,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7466980.418082885],[792957.7313200384,7467133.292139435],[793110.6053765863,7467133.292139435],[793110.6053765863,7466980.418082885],[792957.7313200384,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136259/82227","x":136259,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7467439.040252533],[793110.6053765863,7467591.914309083],[793263.4794331342,7467591.914309083],[793263.4794331342,7467439.040252533],[793110.6053765863,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136260/82224","x":136260,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7467439.040252533],[793263.4794331342,7467591.914309083],[793416.3534896858,7467591.914309083],[793416.3534896858,7467439.040252533],[793263.4794331342,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136261/82224","x":136261,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7467286.166195983],[793110.6053765863,7467439.040252533],[793263.4794331342,7467439.040252533],[793263.4794331342,7467286.166195983],[793110.6053765863,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136260/82225","x":136260,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7467286.166195983],[793263.4794331342,7467439.040252533],[793416.3534896858,7467439.040252533],[793416.3534896858,7467286.166195983],[793263.4794331342,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136261/82225","x":136261,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7467439.040252533],[793416.3534896858,7467591.914309083],[793569.2275462337,7467591.914309083],[793569.2275462337,7467439.040252533],[793416.3534896858,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136262/82224","x":136262,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7467439.040252533],[793569.2275462337,7467591.914309083],[793722.1016027816,7467591.914309083],[793722.1016027816,7467439.040252533],[793569.2275462337,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136263/82224","x":136263,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7467286.166195983],[793416.3534896858,7467439.040252533],[793569.2275462337,7467439.040252533],[793569.2275462337,7467286.166195983],[793416.3534896858,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136262/82225","x":136262,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7467286.166195983],[793569.2275462337,7467439.040252533],[793722.1016027816,7467439.040252533],[793722.1016027816,7467286.166195983],[793569.2275462337,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136263/82225","x":136263,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7467133.292139435],[793110.6053765863,7467286.166195983],[793263.4794331342,7467286.166195983],[793263.4794331342,7467133.292139435],[793110.6053765863,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136260/82226","x":136260,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7467133.292139435],[793263.4794331342,7467286.166195983],[793416.3534896858,7467286.166195983],[793416.3534896858,7467133.292139435],[793263.4794331342,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136261/82226","x":136261,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7466980.418082885],[793110.6053765863,7467133.292139435],[793263.4794331342,7467133.292139435],[793263.4794331342,7466980.418082885],[793110.6053765863,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136260/82227","x":136260,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7466980.418082885],[793263.4794331342,7467133.292139435],[793416.3534896858,7467133.292139435],[793416.3534896858,7466980.418082885],[793263.4794331342,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136261/82227","x":136261,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7467133.292139435],[793416.3534896858,7467286.166195983],[793569.2275462337,7467286.166195983],[793569.2275462337,7467133.292139435],[793416.3534896858,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136262/82226","x":136262,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7467133.292139435],[793569.2275462337,7467286.166195983],[793722.1016027816,7467286.166195983],[793722.1016027816,7467133.292139435],[793569.2275462337,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136263/82226","x":136263,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7466980.418082885],[793416.3534896858,7467133.292139435],[793569.2275462337,7467133.292139435],[793569.2275462337,7466980.418082885],[793416.3534896858,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136262/82227","x":136262,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7466980.418082885],[793569.2275462337,7467133.292139435],[793722.1016027816,7467133.292139435],[793722.1016027816,7466980.418082885],[793569.2275462337,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136263/82227","x":136263,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7467439.040252533],[793722.1016027816,7467591.914309083],[793874.9756593332,7467591.914309083],[793874.9756593332,7467439.040252533],[793722.1016027816,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136264/82224","x":136264,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7467439.040252533],[793874.9756593332,7467591.914309083],[794027.849715881,7467591.914309083],[794027.849715881,7467439.040252533],[793874.9756593332,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136265/82224","x":136265,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7467286.166195983],[793722.1016027816,7467439.040252533],[793874.9756593332,7467439.040252533],[793874.9756593332,7467286.166195983],[793722.1016027816,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136264/82225","x":136264,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7467286.166195983],[793874.9756593332,7467439.040252533],[794027.849715881,7467439.040252533],[794027.849715881,7467286.166195983],[793874.9756593332,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136265/82225","x":136265,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7467439.040252533],[794027.849715881,7467591.914309083],[794180.7237724289,7467591.914309083],[794180.7237724289,7467439.040252533],[794027.849715881,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136266/82224","x":136266,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7467439.040252533],[794180.7237724289,7467591.914309083],[794333.5978289805,7467591.914309083],[794333.5978289805,7467439.040252533],[794180.7237724289,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136267/82224","x":136267,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7467286.166195983],[794027.849715881,7467439.040252533],[794180.7237724289,7467439.040252533],[794180.7237724289,7467286.166195983],[794027.849715881,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136266/82225","x":136266,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7467286.166195983],[794180.7237724289,7467439.040252533],[794333.5978289805,7467439.040252533],[794333.5978289805,7467286.166195983],[794180.7237724289,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136267/82225","x":136267,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7467133.292139435],[793722.1016027816,7467286.166195983],[793874.9756593332,7467286.166195983],[793874.9756593332,7467133.292139435],[793722.1016027816,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136264/82226","x":136264,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7467133.292139435],[793874.9756593332,7467286.166195983],[794027.849715881,7467286.166195983],[794027.849715881,7467133.292139435],[793874.9756593332,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136265/82226","x":136265,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7466980.418082885],[793722.1016027816,7467133.292139435],[793874.9756593332,7467133.292139435],[793874.9756593332,7466980.418082885],[793722.1016027816,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136264/82227","x":136264,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7466980.418082885],[793874.9756593332,7467133.292139435],[794027.849715881,7467133.292139435],[794027.849715881,7466980.418082885],[793874.9756593332,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136265/82227","x":136265,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7467133.292139435],[794027.849715881,7467286.166195983],[794180.7237724289,7467286.166195983],[794180.7237724289,7467133.292139435],[794027.849715881,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136266/82226","x":136266,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7467133.292139435],[794180.7237724289,7467286.166195983],[794333.5978289805,7467286.166195983],[794333.5978289805,7467133.292139435],[794180.7237724289,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136267/82226","x":136267,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7466980.418082885],[794027.849715881,7467133.292139435],[794180.7237724289,7467133.292139435],[794180.7237724289,7466980.418082885],[794027.849715881,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136266/82227","x":136266,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7466980.418082885],[794180.7237724289,7467133.292139435],[794333.5978289805,7467133.292139435],[794333.5978289805,7466980.418082885],[794180.7237724289,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136267/82227","x":136267,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7467439.040252533],[794333.5978289805,7467591.914309083],[794486.4718855284,7467591.914309083],[794486.4718855284,7467439.040252533],[794333.5978289805,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136268/82224","x":136268,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7467286.166195983],[794333.5978289805,7467439.040252533],[794486.4718855284,7467439.040252533],[794486.4718855284,7467286.166195983],[794333.5978289805,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136268/82225","x":136268,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7467133.292139435],[794333.5978289805,7467286.166195983],[794486.4718855284,7467286.166195983],[794486.4718855284,7467133.292139435],[794333.5978289805,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136268/82226","x":136268,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7466980.418082885],[794333.5978289805,7467133.292139435],[794486.4718855284,7467133.292139435],[794486.4718855284,7466980.418082885],[794333.5978289805,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136268/82227","x":136268,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7465757.425630493],[793416.3534896858,7465910.299687043],[793569.2275462337,7465910.299687043],[793569.2275462337,7465757.425630493],[793416.3534896858,7465757.425630493]]],"type":"Polygon"},"properties":{"label":"18/136262/82235","x":136262,"y":82235,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7465757.425630493],[793569.2275462337,7465910.299687043],[793722.1016027816,7465910.299687043],[793722.1016027816,7465757.425630493],[793569.2275462337,7465757.425630493]]],"type":"Polygon"},"properties":{"label":"18/136263/82235","x":136263,"y":82235,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7465451.6775173955],[792957.7313200384,7465604.551573943],[793110.6053765863,7465604.551573943],[793110.6053765863,7465451.6775173955],[792957.7313200384,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136259/82237","x":136259,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7465298.803460846],[792651.983206939,7465451.6775173955],[792804.8572634906,7465451.6775173955],[792804.8572634906,7465298.803460846],[792651.983206939,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136257/82238","x":136257,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7465145.929404296],[792499.1091503911,7465298.803460846],[792651.983206939,7465298.803460846],[792651.983206939,7465145.929404296],[792499.1091503911,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136256/82239","x":136256,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7465145.929404296],[792651.983206939,7465298.803460846],[792804.8572634906,7465298.803460846],[792804.8572634906,7465145.929404296],[792651.983206939,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136257/82239","x":136257,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7465298.803460846],[792804.8572634906,7465451.6775173955],[792957.7313200384,7465451.6775173955],[792957.7313200384,7465298.803460846],[792804.8572634906,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136258/82238","x":136258,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7465298.803460846],[792957.7313200384,7465451.6775173955],[793110.6053765863,7465451.6775173955],[793110.6053765863,7465298.803460846],[792957.7313200384,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136259/82238","x":136259,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7465145.929404296],[792804.8572634906,7465298.803460846],[792957.7313200384,7465298.803460846],[792957.7313200384,7465145.929404296],[792804.8572634906,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136258/82239","x":136258,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7465145.929404296],[792957.7313200384,7465298.803460846],[793110.6053765863,7465298.803460846],[793110.6053765863,7465145.929404296],[792957.7313200384,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136259/82239","x":136259,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7465604.551573943],[793263.4794331342,7465757.425630493],[793416.3534896858,7465757.425630493],[793416.3534896858,7465604.551573943],[793263.4794331342,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136261/82236","x":136261,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7465451.6775173955],[793110.6053765863,7465604.551573943],[793263.4794331342,7465604.551573943],[793263.4794331342,7465451.6775173955],[793110.6053765863,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136260/82237","x":136260,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7465451.6775173955],[793263.4794331342,7465604.551573943],[793416.3534896858,7465604.551573943],[793416.3534896858,7465451.6775173955],[793263.4794331342,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136261/82237","x":136261,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7465604.551573943],[793416.3534896858,7465757.425630493],[793569.2275462337,7465757.425630493],[793569.2275462337,7465604.551573943],[793416.3534896858,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136262/82236","x":136262,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7465604.551573943],[793569.2275462337,7465757.425630493],[793722.1016027816,7465757.425630493],[793722.1016027816,7465604.551573943],[793569.2275462337,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136263/82236","x":136263,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7465451.6775173955],[793416.3534896858,7465604.551573943],[793569.2275462337,7465604.551573943],[793569.2275462337,7465451.6775173955],[793416.3534896858,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136262/82237","x":136262,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7465451.6775173955],[793569.2275462337,7465604.551573943],[793722.1016027816,7465604.551573943],[793722.1016027816,7465451.6775173955],[793569.2275462337,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136263/82237","x":136263,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7465298.803460846],[793110.6053765863,7465451.6775173955],[793263.4794331342,7465451.6775173955],[793263.4794331342,7465298.803460846],[793110.6053765863,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136260/82238","x":136260,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7465298.803460846],[793263.4794331342,7465451.6775173955],[793416.3534896858,7465451.6775173955],[793416.3534896858,7465298.803460846],[793263.4794331342,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136261/82238","x":136261,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7465145.929404296],[793110.6053765863,7465298.803460846],[793263.4794331342,7465298.803460846],[793263.4794331342,7465145.929404296],[793110.6053765863,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136260/82239","x":136260,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7465145.929404296],[793263.4794331342,7465298.803460846],[793416.3534896858,7465298.803460846],[793416.3534896858,7465145.929404296],[793263.4794331342,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136261/82239","x":136261,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7465298.803460846],[793416.3534896858,7465451.6775173955],[793569.2275462337,7465451.6775173955],[793569.2275462337,7465298.803460846],[793416.3534896858,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136262/82238","x":136262,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7465298.803460846],[793569.2275462337,7465451.6775173955],[793722.1016027816,7465451.6775173955],[793722.1016027816,7465298.803460846],[793569.2275462337,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136263/82238","x":136263,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7465145.929404296],[793416.3534896858,7465298.803460846],[793569.2275462337,7465298.803460846],[793569.2275462337,7465145.929404296],[793416.3534896858,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136262/82239","x":136262,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7465145.929404296],[793569.2275462337,7465298.803460846],[793722.1016027816,7465298.803460846],[793722.1016027816,7465145.929404296],[793569.2275462337,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136263/82239","x":136263,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7465757.425630493],[793722.1016027816,7465910.299687043],[793874.9756593332,7465910.299687043],[793874.9756593332,7465757.425630493],[793722.1016027816,7465757.425630493]]],"type":"Polygon"},"properties":{"label":"18/136264/82235","x":136264,"y":82235,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7465757.425630493],[793874.9756593332,7465910.299687043],[794027.849715881,7465910.299687043],[794027.849715881,7465757.425630493],[793874.9756593332,7465757.425630493]]],"type":"Polygon"},"properties":{"label":"18/136265/82235","x":136265,"y":82235,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7465757.425630493],[794027.849715881,7465910.299687043],[794180.7237724289,7465910.299687043],[794180.7237724289,7465757.425630493],[794027.849715881,7465757.425630493]]],"type":"Polygon"},"properties":{"label":"18/136266/82235","x":136266,"y":82235,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7465757.425630493],[794180.7237724289,7465910.299687043],[794333.5978289805,7465910.299687043],[794333.5978289805,7465757.425630493],[794180.7237724289,7465757.425630493]]],"type":"Polygon"},"properties":{"label":"18/136267/82235","x":136267,"y":82235,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7465757.425630493],[794333.5978289805,7465910.299687043],[794486.4718855284,7465910.299687043],[794486.4718855284,7465757.425630493],[794333.5978289805,7465757.425630493]]],"type":"Polygon"},"properties":{"label":"18/136268/82235","x":136268,"y":82235,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7465757.425630493],[794486.4718855284,7465910.299687043],[794639.3459420763,7465910.299687043],[794639.3459420763,7465757.425630493],[794486.4718855284,7465757.425630493]]],"type":"Polygon"},"properties":{"label":"18/136269/82235","x":136269,"y":82235,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7465757.425630493],[794639.3459420763,7465910.299687043],[794792.2199986279,7465910.299687043],[794792.2199986279,7465757.425630493],[794639.3459420763,7465757.425630493]]],"type":"Polygon"},"properties":{"label":"18/136270/82235","x":136270,"y":82235,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7465757.425630493],[794792.2199986279,7465910.299687043],[794945.0940551758,7465910.299687043],[794945.0940551758,7465757.425630493],[794792.2199986279,7465757.425630493]]],"type":"Polygon"},"properties":{"label":"18/136271/82235","x":136271,"y":82235,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7465604.551573943],[793722.1016027816,7465757.425630493],[793874.9756593332,7465757.425630493],[793874.9756593332,7465604.551573943],[793722.1016027816,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136264/82236","x":136264,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7465604.551573943],[793874.9756593332,7465757.425630493],[794027.849715881,7465757.425630493],[794027.849715881,7465604.551573943],[793874.9756593332,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136265/82236","x":136265,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7465451.6775173955],[793722.1016027816,7465604.551573943],[793874.9756593332,7465604.551573943],[793874.9756593332,7465451.6775173955],[793722.1016027816,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136264/82237","x":136264,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7465451.6775173955],[793874.9756593332,7465604.551573943],[794027.849715881,7465604.551573943],[794027.849715881,7465451.6775173955],[793874.9756593332,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136265/82237","x":136265,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7465604.551573943],[794027.849715881,7465757.425630493],[794180.7237724289,7465757.425630493],[794180.7237724289,7465604.551573943],[794027.849715881,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136266/82236","x":136266,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7465604.551573943],[794180.7237724289,7465757.425630493],[794333.5978289805,7465757.425630493],[794333.5978289805,7465604.551573943],[794180.7237724289,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136267/82236","x":136267,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7465451.6775173955],[794027.849715881,7465604.551573943],[794180.7237724289,7465604.551573943],[794180.7237724289,7465451.6775173955],[794027.849715881,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136266/82237","x":136266,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7465451.6775173955],[794180.7237724289,7465604.551573943],[794333.5978289805,7465604.551573943],[794333.5978289805,7465451.6775173955],[794180.7237724289,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136267/82237","x":136267,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7465298.803460846],[793722.1016027816,7465451.6775173955],[793874.9756593332,7465451.6775173955],[793874.9756593332,7465298.803460846],[793722.1016027816,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136264/82238","x":136264,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7465298.803460846],[793874.9756593332,7465451.6775173955],[794027.849715881,7465451.6775173955],[794027.849715881,7465298.803460846],[793874.9756593332,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136265/82238","x":136265,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7465145.929404296],[793722.1016027816,7465298.803460846],[793874.9756593332,7465298.803460846],[793874.9756593332,7465145.929404296],[793722.1016027816,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136264/82239","x":136264,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7465145.929404296],[793874.9756593332,7465298.803460846],[794027.849715881,7465298.803460846],[794027.849715881,7465145.929404296],[793874.9756593332,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136265/82239","x":136265,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7465298.803460846],[794027.849715881,7465451.6775173955],[794180.7237724289,7465451.6775173955],[794180.7237724289,7465298.803460846],[794027.849715881,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136266/82238","x":136266,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7465298.803460846],[794180.7237724289,7465451.6775173955],[794333.5978289805,7465451.6775173955],[794333.5978289805,7465298.803460846],[794180.7237724289,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136267/82238","x":136267,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7465145.929404296],[794027.849715881,7465298.803460846],[794180.7237724289,7465298.803460846],[794180.7237724289,7465145.929404296],[794027.849715881,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136266/82239","x":136266,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7465145.929404296],[794180.7237724289,7465298.803460846],[794333.5978289805,7465298.803460846],[794333.5978289805,7465145.929404296],[794180.7237724289,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136267/82239","x":136267,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7465604.551573943],[794333.5978289805,7465757.425630493],[794486.4718855284,7465757.425630493],[794486.4718855284,7465604.551573943],[794333.5978289805,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136268/82236","x":136268,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7465604.551573943],[794486.4718855284,7465757.425630493],[794639.3459420763,7465757.425630493],[794639.3459420763,7465604.551573943],[794486.4718855284,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136269/82236","x":136269,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7465451.6775173955],[794333.5978289805,7465604.551573943],[794486.4718855284,7465604.551573943],[794486.4718855284,7465451.6775173955],[794333.5978289805,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136268/82237","x":136268,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7465451.6775173955],[794486.4718855284,7465604.551573943],[794639.3459420763,7465604.551573943],[794639.3459420763,7465451.6775173955],[794486.4718855284,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136269/82237","x":136269,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7465604.551573943],[794639.3459420763,7465757.425630493],[794792.2199986279,7465757.425630493],[794792.2199986279,7465604.551573943],[794639.3459420763,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136270/82236","x":136270,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7465604.551573943],[794792.2199986279,7465757.425630493],[794945.0940551758,7465757.425630493],[794945.0940551758,7465604.551573943],[794792.2199986279,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136271/82236","x":136271,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7465451.6775173955],[794639.3459420763,7465604.551573943],[794792.2199986279,7465604.551573943],[794792.2199986279,7465451.6775173955],[794639.3459420763,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136270/82237","x":136270,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7465451.6775173955],[794792.2199986279,7465604.551573943],[794945.0940551758,7465604.551573943],[794945.0940551758,7465451.6775173955],[794792.2199986279,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136271/82237","x":136271,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7465298.803460846],[794333.5978289805,7465451.6775173955],[794486.4718855284,7465451.6775173955],[794486.4718855284,7465298.803460846],[794333.5978289805,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136268/82238","x":136268,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7465298.803460846],[794486.4718855284,7465451.6775173955],[794639.3459420763,7465451.6775173955],[794639.3459420763,7465298.803460846],[794486.4718855284,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136269/82238","x":136269,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7465145.929404296],[794333.5978289805,7465298.803460846],[794486.4718855284,7465298.803460846],[794486.4718855284,7465145.929404296],[794333.5978289805,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136268/82239","x":136268,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7465145.929404296],[794486.4718855284,7465298.803460846],[794639.3459420763,7465298.803460846],[794639.3459420763,7465145.929404296],[794486.4718855284,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136269/82239","x":136269,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7465298.803460846],[794639.3459420763,7465451.6775173955],[794792.2199986279,7465451.6775173955],[794792.2199986279,7465298.803460846],[794639.3459420763,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136270/82238","x":136270,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7465298.803460846],[794792.2199986279,7465451.6775173955],[794945.0940551758,7465451.6775173955],[794945.0940551758,7465298.803460846],[794792.2199986279,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136271/82238","x":136271,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7465145.929404296],[794639.3459420763,7465298.803460846],[794792.2199986279,7465298.803460846],[794792.2199986279,7465145.929404296],[794639.3459420763,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136270/82239","x":136270,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7465145.929404296],[794792.2199986279,7465298.803460846],[794945.0940551758,7465298.803460846],[794945.0940551758,7465145.929404296],[794792.2199986279,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136271/82239","x":136271,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7467439.040252533],[795709.4643379226,7467591.914309083],[795862.3383944705,7467591.914309083],[795862.3383944705,7467439.040252533],[795709.4643379226,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136277/82224","x":136277,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7467439.040252533],[795862.3383944705,7467591.914309083],[796015.2124510184,7467591.914309083],[796015.2124510184,7467439.040252533],[795862.3383944705,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136278/82224","x":136278,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7467439.040252533],[796015.2124510184,7467591.914309083],[796168.08650757,7467591.914309083],[796168.08650757,7467439.040252533],[796015.2124510184,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136279/82224","x":136279,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7467286.166195983],[795862.3383944705,7467439.040252533],[796015.2124510184,7467439.040252533],[796015.2124510184,7467286.166195983],[795862.3383944705,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136278/82225","x":136278,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7467286.166195983],[796015.2124510184,7467439.040252533],[796168.08650757,7467439.040252533],[796168.08650757,7467286.166195983],[796015.2124510184,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136279/82225","x":136279,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7467133.292139435],[796015.2124510184,7467286.166195983],[796168.08650757,7467286.166195983],[796168.08650757,7467133.292139435],[796015.2124510184,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136279/82226","x":136279,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7466368.92185669],[795097.9681117237,7466521.795913238],[795250.8421682753,7466521.795913238],[795250.8421682753,7466368.92185669],[795097.9681117237,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136273/82231","x":136273,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7466521.795913238],[795403.7162248231,7466674.669969788],[795556.590281371,7466674.669969788],[795556.590281371,7466521.795913238],[795403.7162248231,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136275/82230","x":136275,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7466368.92185669],[795250.8421682753,7466521.795913238],[795403.7162248231,7466521.795913238],[795403.7162248231,7466368.92185669],[795250.8421682753,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136274/82231","x":136274,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7466368.92185669],[795403.7162248231,7466521.795913238],[795556.590281371,7466521.795913238],[795556.590281371,7466368.92185669],[795403.7162248231,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136275/82231","x":136275,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7466674.669969788],[795709.4643379226,7466827.544026336],[795862.3383944705,7466827.544026336],[795862.3383944705,7466674.669969788],[795709.4643379226,7466674.669969788]]],"type":"Polygon"},"properties":{"label":"18/136277/82229","x":136277,"y":82229,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7466827.544026336],[796015.2124510184,7466980.418082885],[796168.08650757,7466980.418082885],[796168.08650757,7466827.544026336],[796015.2124510184,7466827.544026336]]],"type":"Polygon"},"properties":{"label":"18/136279/82228","x":136279,"y":82228,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7466674.669969788],[795862.3383944705,7466827.544026336],[796015.2124510184,7466827.544026336],[796015.2124510184,7466674.669969788],[795862.3383944705,7466674.669969788]]],"type":"Polygon"},"properties":{"label":"18/136278/82229","x":136278,"y":82229,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7466674.669969788],[796015.2124510184,7466827.544026336],[796168.08650757,7466827.544026336],[796168.08650757,7466674.669969788],[796015.2124510184,7466674.669969788]]],"type":"Polygon"},"properties":{"label":"18/136279/82229","x":136279,"y":82229,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7466521.795913238],[795556.590281371,7466674.669969788],[795709.4643379226,7466674.669969788],[795709.4643379226,7466521.795913238],[795556.590281371,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136276/82230","x":136276,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7466521.795913238],[795709.4643379226,7466674.669969788],[795862.3383944705,7466674.669969788],[795862.3383944705,7466521.795913238],[795709.4643379226,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136277/82230","x":136277,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7466368.92185669],[795556.590281371,7466521.795913238],[795709.4643379226,7466521.795913238],[795709.4643379226,7466368.92185669],[795556.590281371,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136276/82231","x":136276,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7466368.92185669],[795709.4643379226,7466521.795913238],[795862.3383944705,7466521.795913238],[795862.3383944705,7466368.92185669],[795709.4643379226,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136277/82231","x":136277,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7466521.795913238],[795862.3383944705,7466674.669969788],[796015.2124510184,7466674.669969788],[796015.2124510184,7466521.795913238],[795862.3383944705,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136278/82230","x":136278,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7466521.795913238],[796015.2124510184,7466674.669969788],[796168.08650757,7466674.669969788],[796168.08650757,7466521.795913238],[796015.2124510184,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136279/82230","x":136279,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7466368.92185669],[795862.3383944705,7466521.795913238],[796015.2124510184,7466521.795913238],[796015.2124510184,7466368.92185669],[795862.3383944705,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136278/82231","x":136278,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7466368.92185669],[796015.2124510184,7466521.795913238],[796168.08650757,7466521.795913238],[796168.08650757,7466368.92185669],[796015.2124510184,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136279/82231","x":136279,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7467439.040252533],[796168.08650757,7467591.914309083],[796320.9605641179,7467591.914309083],[796320.9605641179,7467439.040252533],[796168.08650757,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136280/82224","x":136280,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7467439.040252533],[796320.9605641179,7467591.914309083],[796473.8346206658,7467591.914309083],[796473.8346206658,7467439.040252533],[796320.9605641179,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136281/82224","x":136281,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7467286.166195983],[796168.08650757,7467439.040252533],[796320.9605641179,7467439.040252533],[796320.9605641179,7467286.166195983],[796168.08650757,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136280/82225","x":136280,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7467286.166195983],[796320.9605641179,7467439.040252533],[796473.8346206658,7467439.040252533],[796473.8346206658,7467286.166195983],[796320.9605641179,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136281/82225","x":136281,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7467439.040252533],[796473.8346206658,7467591.914309083],[796626.7086772174,7467591.914309083],[796626.7086772174,7467439.040252533],[796473.8346206658,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136282/82224","x":136282,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7467439.040252533],[796626.7086772174,7467591.914309083],[796779.5827337652,7467591.914309083],[796779.5827337652,7467439.040252533],[796626.7086772174,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136283/82224","x":136283,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7467286.166195983],[796473.8346206658,7467439.040252533],[796626.7086772174,7467439.040252533],[796626.7086772174,7467286.166195983],[796473.8346206658,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136282/82225","x":136282,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7467286.166195983],[796626.7086772174,7467439.040252533],[796779.5827337652,7467439.040252533],[796779.5827337652,7467286.166195983],[796626.7086772174,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136283/82225","x":136283,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7467133.292139435],[796168.08650757,7467286.166195983],[796320.9605641179,7467286.166195983],[796320.9605641179,7467133.292139435],[796168.08650757,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136280/82226","x":136280,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7467133.292139435],[796320.9605641179,7467286.166195983],[796473.8346206658,7467286.166195983],[796473.8346206658,7467133.292139435],[796320.9605641179,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136281/82226","x":136281,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7466980.418082885],[796168.08650757,7467133.292139435],[796320.9605641179,7467133.292139435],[796320.9605641179,7466980.418082885],[796168.08650757,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136280/82227","x":136280,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7466980.418082885],[796320.9605641179,7467133.292139435],[796473.8346206658,7467133.292139435],[796473.8346206658,7466980.418082885],[796320.9605641179,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136281/82227","x":136281,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7467133.292139435],[796473.8346206658,7467286.166195983],[796626.7086772174,7467286.166195983],[796626.7086772174,7467133.292139435],[796473.8346206658,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136282/82226","x":136282,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7467133.292139435],[796626.7086772174,7467286.166195983],[796779.5827337652,7467286.166195983],[796779.5827337652,7467133.292139435],[796626.7086772174,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136283/82226","x":136283,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7466980.418082885],[796473.8346206658,7467133.292139435],[796626.7086772174,7467133.292139435],[796626.7086772174,7466980.418082885],[796473.8346206658,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136282/82227","x":136282,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7466980.418082885],[796626.7086772174,7467133.292139435],[796779.5827337652,7467133.292139435],[796779.5827337652,7466980.418082885],[796626.7086772174,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136283/82227","x":136283,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7467439.040252533],[796779.5827337652,7467591.914309083],[796932.4567903131,7467591.914309083],[796932.4567903131,7467439.040252533],[796779.5827337652,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136284/82224","x":136284,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7467439.040252533],[796932.4567903131,7467591.914309083],[797085.330846861,7467591.914309083],[797085.330846861,7467439.040252533],[796932.4567903131,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136285/82224","x":136285,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7467286.166195983],[796779.5827337652,7467439.040252533],[796932.4567903131,7467439.040252533],[796932.4567903131,7467286.166195983],[796779.5827337652,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136284/82225","x":136284,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7467286.166195983],[796932.4567903131,7467439.040252533],[797085.330846861,7467439.040252533],[797085.330846861,7467286.166195983],[796932.4567903131,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136285/82225","x":136285,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7467439.040252533],[797085.330846861,7467591.914309083],[797238.2049034126,7467591.914309083],[797238.2049034126,7467439.040252533],[797085.330846861,7467439.040252533]]],"type":"Polygon"},"properties":{"label":"18/136286/82224","x":136286,"y":82224,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7467286.166195983],[797085.330846861,7467439.040252533],[797238.2049034126,7467439.040252533],[797238.2049034126,7467286.166195983],[797085.330846861,7467286.166195983]]],"type":"Polygon"},"properties":{"label":"18/136286/82225","x":136286,"y":82225,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7467133.292139435],[796779.5827337652,7467286.166195983],[796932.4567903131,7467286.166195983],[796932.4567903131,7467133.292139435],[796779.5827337652,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136284/82226","x":136284,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7467133.292139435],[796932.4567903131,7467286.166195983],[797085.330846861,7467286.166195983],[797085.330846861,7467133.292139435],[796932.4567903131,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136285/82226","x":136285,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7466980.418082885],[796779.5827337652,7467133.292139435],[796932.4567903131,7467133.292139435],[796932.4567903131,7466980.418082885],[796779.5827337652,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136284/82227","x":136284,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7466980.418082885],[796932.4567903131,7467133.292139435],[797085.330846861,7467133.292139435],[797085.330846861,7466980.418082885],[796932.4567903131,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136285/82227","x":136285,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7467133.292139435],[797085.330846861,7467286.166195983],[797238.2049034126,7467286.166195983],[797238.2049034126,7467133.292139435],[797085.330846861,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136286/82226","x":136286,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7467133.292139435],[797238.2049034126,7467286.166195983],[797391.0789599605,7467286.166195983],[797391.0789599605,7467133.292139435],[797238.2049034126,7467133.292139435]]],"type":"Polygon"},"properties":{"label":"18/136287/82226","x":136287,"y":82226,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7466980.418082885],[797085.330846861,7467133.292139435],[797238.2049034126,7467133.292139435],[797238.2049034126,7466980.418082885],[797085.330846861,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136286/82227","x":136286,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7466980.418082885],[797238.2049034126,7467133.292139435],[797391.0789599605,7467133.292139435],[797391.0789599605,7466980.418082885],[797238.2049034126,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136287/82227","x":136287,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7466827.544026336],[796168.08650757,7466980.418082885],[796320.9605641179,7466980.418082885],[796320.9605641179,7466827.544026336],[796168.08650757,7466827.544026336]]],"type":"Polygon"},"properties":{"label":"18/136280/82228","x":136280,"y":82228,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7466827.544026336],[796320.9605641179,7466980.418082885],[796473.8346206658,7466980.418082885],[796473.8346206658,7466827.544026336],[796320.9605641179,7466827.544026336]]],"type":"Polygon"},"properties":{"label":"18/136281/82228","x":136281,"y":82228,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7466674.669969788],[796168.08650757,7466827.544026336],[796320.9605641179,7466827.544026336],[796320.9605641179,7466674.669969788],[796168.08650757,7466674.669969788]]],"type":"Polygon"},"properties":{"label":"18/136280/82229","x":136280,"y":82229,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7466674.669969788],[796320.9605641179,7466827.544026336],[796473.8346206658,7466827.544026336],[796473.8346206658,7466674.669969788],[796320.9605641179,7466674.669969788]]],"type":"Polygon"},"properties":{"label":"18/136281/82229","x":136281,"y":82229,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7466827.544026336],[796473.8346206658,7466980.418082885],[796626.7086772174,7466980.418082885],[796626.7086772174,7466827.544026336],[796473.8346206658,7466827.544026336]]],"type":"Polygon"},"properties":{"label":"18/136282/82228","x":136282,"y":82228,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7466827.544026336],[796626.7086772174,7466980.418082885],[796779.5827337652,7466980.418082885],[796779.5827337652,7466827.544026336],[796626.7086772174,7466827.544026336]]],"type":"Polygon"},"properties":{"label":"18/136283/82228","x":136283,"y":82228,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7466674.669969788],[796473.8346206658,7466827.544026336],[796626.7086772174,7466827.544026336],[796626.7086772174,7466674.669969788],[796473.8346206658,7466674.669969788]]],"type":"Polygon"},"properties":{"label":"18/136282/82229","x":136282,"y":82229,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7466674.669969788],[796626.7086772174,7466827.544026336],[796779.5827337652,7466827.544026336],[796779.5827337652,7466674.669969788],[796626.7086772174,7466674.669969788]]],"type":"Polygon"},"properties":{"label":"18/136283/82229","x":136283,"y":82229,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7466521.795913238],[796168.08650757,7466674.669969788],[796320.9605641179,7466674.669969788],[796320.9605641179,7466521.795913238],[796168.08650757,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136280/82230","x":136280,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7466521.795913238],[796320.9605641179,7466674.669969788],[796473.8346206658,7466674.669969788],[796473.8346206658,7466521.795913238],[796320.9605641179,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136281/82230","x":136281,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7466368.92185669],[796168.08650757,7466521.795913238],[796320.9605641179,7466521.795913238],[796320.9605641179,7466368.92185669],[796168.08650757,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136280/82231","x":136280,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7466368.92185669],[796320.9605641179,7466521.795913238],[796473.8346206658,7466521.795913238],[796473.8346206658,7466368.92185669],[796320.9605641179,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136281/82231","x":136281,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7466521.795913238],[796473.8346206658,7466674.669969788],[796626.7086772174,7466674.669969788],[796626.7086772174,7466521.795913238],[796473.8346206658,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136282/82230","x":136282,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7466521.795913238],[796626.7086772174,7466674.669969788],[796779.5827337652,7466674.669969788],[796779.5827337652,7466521.795913238],[796626.7086772174,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136283/82230","x":136283,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7466368.92185669],[796473.8346206658,7466521.795913238],[796626.7086772174,7466521.795913238],[796626.7086772174,7466368.92185669],[796473.8346206658,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136282/82231","x":136282,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7466368.92185669],[796626.7086772174,7466521.795913238],[796779.5827337652,7466521.795913238],[796779.5827337652,7466368.92185669],[796626.7086772174,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136283/82231","x":136283,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7466827.544026336],[796779.5827337652,7466980.418082885],[796932.4567903131,7466980.418082885],[796932.4567903131,7466827.544026336],[796779.5827337652,7466827.544026336]]],"type":"Polygon"},"properties":{"label":"18/136284/82228","x":136284,"y":82228,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7466827.544026336],[796932.4567903131,7466980.418082885],[797085.330846861,7466980.418082885],[797085.330846861,7466827.544026336],[796932.4567903131,7466827.544026336]]],"type":"Polygon"},"properties":{"label":"18/136285/82228","x":136285,"y":82228,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7466674.669969788],[796779.5827337652,7466827.544026336],[796932.4567903131,7466827.544026336],[796932.4567903131,7466674.669969788],[796779.5827337652,7466674.669969788]]],"type":"Polygon"},"properties":{"label":"18/136284/82229","x":136284,"y":82229,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7466674.669969788],[796932.4567903131,7466827.544026336],[797085.330846861,7466827.544026336],[797085.330846861,7466674.669969788],[796932.4567903131,7466674.669969788]]],"type":"Polygon"},"properties":{"label":"18/136285/82229","x":136285,"y":82229,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7466827.544026336],[797085.330846861,7466980.418082885],[797238.2049034126,7466980.418082885],[797238.2049034126,7466827.544026336],[797085.330846861,7466827.544026336]]],"type":"Polygon"},"properties":{"label":"18/136286/82228","x":136286,"y":82228,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7466827.544026336],[797238.2049034126,7466980.418082885],[797391.0789599605,7466980.418082885],[797391.0789599605,7466827.544026336],[797238.2049034126,7466827.544026336]]],"type":"Polygon"},"properties":{"label":"18/136287/82228","x":136287,"y":82228,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7466674.669969788],[797085.330846861,7466827.544026336],[797238.2049034126,7466827.544026336],[797238.2049034126,7466674.669969788],[797085.330846861,7466674.669969788]]],"type":"Polygon"},"properties":{"label":"18/136286/82229","x":136286,"y":82229,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7466674.669969788],[797238.2049034126,7466827.544026336],[797391.0789599605,7466827.544026336],[797391.0789599605,7466674.669969788],[797238.2049034126,7466674.669969788]]],"type":"Polygon"},"properties":{"label":"18/136287/82229","x":136287,"y":82229,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7466521.795913238],[796779.5827337652,7466674.669969788],[796932.4567903131,7466674.669969788],[796932.4567903131,7466521.795913238],[796779.5827337652,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136284/82230","x":136284,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7466521.795913238],[796932.4567903131,7466674.669969788],[797085.330846861,7466674.669969788],[797085.330846861,7466521.795913238],[796932.4567903131,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136285/82230","x":136285,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7466368.92185669],[796779.5827337652,7466521.795913238],[796932.4567903131,7466521.795913238],[796932.4567903131,7466368.92185669],[796779.5827337652,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136284/82231","x":136284,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7466368.92185669],[796932.4567903131,7466521.795913238],[797085.330846861,7466521.795913238],[797085.330846861,7466368.92185669],[796932.4567903131,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136285/82231","x":136285,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7466521.795913238],[797085.330846861,7466674.669969788],[797238.2049034126,7466674.669969788],[797238.2049034126,7466521.795913238],[797085.330846861,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136286/82230","x":136286,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7466521.795913238],[797238.2049034126,7466674.669969788],[797391.0789599605,7466674.669969788],[797391.0789599605,7466521.795913238],[797238.2049034126,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136287/82230","x":136287,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7466368.92185669],[797085.330846861,7466521.795913238],[797238.2049034126,7466521.795913238],[797238.2049034126,7466368.92185669],[797085.330846861,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136286/82231","x":136286,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7466368.92185669],[797238.2049034126,7466521.795913238],[797391.0789599605,7466521.795913238],[797391.0789599605,7466368.92185669],[797238.2049034126,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136287/82231","x":136287,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7466216.04780014],[794945.0940551758,7466368.92185669],[795097.9681117237,7466368.92185669],[795097.9681117237,7466216.04780014],[794945.0940551758,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136272/82232","x":136272,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7466216.04780014],[795097.9681117237,7466368.92185669],[795250.8421682753,7466368.92185669],[795250.8421682753,7466216.04780014],[795097.9681117237,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136273/82232","x":136273,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7466063.173743591],[794945.0940551758,7466216.04780014],[795097.9681117237,7466216.04780014],[795097.9681117237,7466063.173743591],[794945.0940551758,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136272/82233","x":136272,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7466063.173743591],[795097.9681117237,7466216.04780014],[795250.8421682753,7466216.04780014],[795250.8421682753,7466063.173743591],[795097.9681117237,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136273/82233","x":136273,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7466216.04780014],[795250.8421682753,7466368.92185669],[795403.7162248231,7466368.92185669],[795403.7162248231,7466216.04780014],[795250.8421682753,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136274/82232","x":136274,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7466216.04780014],[795403.7162248231,7466368.92185669],[795556.590281371,7466368.92185669],[795556.590281371,7466216.04780014],[795403.7162248231,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136275/82232","x":136275,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7466063.173743591],[795250.8421682753,7466216.04780014],[795403.7162248231,7466216.04780014],[795403.7162248231,7466063.173743591],[795250.8421682753,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136274/82233","x":136274,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7466063.173743591],[795403.7162248231,7466216.04780014],[795556.590281371,7466216.04780014],[795556.590281371,7466063.173743591],[795403.7162248231,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136275/82233","x":136275,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7465757.425630493],[794945.0940551758,7465910.299687043],[795097.9681117237,7465910.299687043],[795097.9681117237,7465757.425630493],[794945.0940551758,7465757.425630493]]],"type":"Polygon"},"properties":{"label":"18/136272/82235","x":136272,"y":82235,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7465757.425630493],[795097.9681117237,7465910.299687043],[795250.8421682753,7465910.299687043],[795250.8421682753,7465757.425630493],[795097.9681117237,7465757.425630493]]],"type":"Polygon"},"properties":{"label":"18/136273/82235","x":136273,"y":82235,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7465757.425630493],[795250.8421682753,7465910.299687043],[795403.7162248231,7465910.299687043],[795403.7162248231,7465757.425630493],[795250.8421682753,7465757.425630493]]],"type":"Polygon"},"properties":{"label":"18/136274/82235","x":136274,"y":82235,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7465757.425630493],[795403.7162248231,7465910.299687043],[795556.590281371,7465910.299687043],[795556.590281371,7465757.425630493],[795403.7162248231,7465757.425630493]]],"type":"Polygon"},"properties":{"label":"18/136275/82235","x":136275,"y":82235,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7466216.04780014],[795556.590281371,7466368.92185669],[795709.4643379226,7466368.92185669],[795709.4643379226,7466216.04780014],[795556.590281371,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136276/82232","x":136276,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7466216.04780014],[795709.4643379226,7466368.92185669],[795862.3383944705,7466368.92185669],[795862.3383944705,7466216.04780014],[795709.4643379226,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136277/82232","x":136277,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7466063.173743591],[795556.590281371,7466216.04780014],[795709.4643379226,7466216.04780014],[795709.4643379226,7466063.173743591],[795556.590281371,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136276/82233","x":136276,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7466063.173743591],[795709.4643379226,7466216.04780014],[795862.3383944705,7466216.04780014],[795862.3383944705,7466063.173743591],[795709.4643379226,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136277/82233","x":136277,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7466216.04780014],[795862.3383944705,7466368.92185669],[796015.2124510184,7466368.92185669],[796015.2124510184,7466216.04780014],[795862.3383944705,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136278/82232","x":136278,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7466216.04780014],[796015.2124510184,7466368.92185669],[796168.08650757,7466368.92185669],[796168.08650757,7466216.04780014],[796015.2124510184,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136279/82232","x":136279,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7466063.173743591],[795862.3383944705,7466216.04780014],[796015.2124510184,7466216.04780014],[796015.2124510184,7466063.173743591],[795862.3383944705,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136278/82233","x":136278,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7466063.173743591],[796015.2124510184,7466216.04780014],[796168.08650757,7466216.04780014],[796168.08650757,7466063.173743591],[796015.2124510184,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136279/82233","x":136279,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7465604.551573943],[794945.0940551758,7465757.425630493],[795097.9681117237,7465757.425630493],[795097.9681117237,7465604.551573943],[794945.0940551758,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136272/82236","x":136272,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7465604.551573943],[795097.9681117237,7465757.425630493],[795250.8421682753,7465757.425630493],[795250.8421682753,7465604.551573943],[795097.9681117237,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136273/82236","x":136273,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7465451.6775173955],[794945.0940551758,7465604.551573943],[795097.9681117237,7465604.551573943],[795097.9681117237,7465451.6775173955],[794945.0940551758,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136272/82237","x":136272,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7465451.6775173955],[795097.9681117237,7465604.551573943],[795250.8421682753,7465604.551573943],[795250.8421682753,7465451.6775173955],[795097.9681117237,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136273/82237","x":136273,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7465604.551573943],[795250.8421682753,7465757.425630493],[795403.7162248231,7465757.425630493],[795403.7162248231,7465604.551573943],[795250.8421682753,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136274/82236","x":136274,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7465604.551573943],[795403.7162248231,7465757.425630493],[795556.590281371,7465757.425630493],[795556.590281371,7465604.551573943],[795403.7162248231,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136275/82236","x":136275,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7465451.6775173955],[795250.8421682753,7465604.551573943],[795403.7162248231,7465604.551573943],[795403.7162248231,7465451.6775173955],[795250.8421682753,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136274/82237","x":136274,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7465451.6775173955],[795403.7162248231,7465604.551573943],[795556.590281371,7465604.551573943],[795556.590281371,7465451.6775173955],[795403.7162248231,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136275/82237","x":136275,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7465298.803460846],[794945.0940551758,7465451.6775173955],[795097.9681117237,7465451.6775173955],[795097.9681117237,7465298.803460846],[794945.0940551758,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136272/82238","x":136272,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7465298.803460846],[795097.9681117237,7465451.6775173955],[795250.8421682753,7465451.6775173955],[795250.8421682753,7465298.803460846],[795097.9681117237,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136273/82238","x":136273,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7465145.929404296],[794945.0940551758,7465298.803460846],[795097.9681117237,7465298.803460846],[795097.9681117237,7465145.929404296],[794945.0940551758,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136272/82239","x":136272,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7465145.929404296],[795097.9681117237,7465298.803460846],[795250.8421682753,7465298.803460846],[795250.8421682753,7465145.929404296],[795097.9681117237,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136273/82239","x":136273,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7465298.803460846],[795250.8421682753,7465451.6775173955],[795403.7162248231,7465451.6775173955],[795403.7162248231,7465298.803460846],[795250.8421682753,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136274/82238","x":136274,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7465298.803460846],[795403.7162248231,7465451.6775173955],[795556.590281371,7465451.6775173955],[795556.590281371,7465298.803460846],[795403.7162248231,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136275/82238","x":136275,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7465145.929404296],[795250.8421682753,7465298.803460846],[795403.7162248231,7465298.803460846],[795403.7162248231,7465145.929404296],[795250.8421682753,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136274/82239","x":136274,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7465145.929404296],[795403.7162248231,7465298.803460846],[795556.590281371,7465298.803460846],[795556.590281371,7465145.929404296],[795403.7162248231,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136275/82239","x":136275,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7465604.551573943],[795556.590281371,7465757.425630493],[795709.4643379226,7465757.425630493],[795709.4643379226,7465604.551573943],[795556.590281371,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136276/82236","x":136276,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7465604.551573943],[795709.4643379226,7465757.425630493],[795862.3383944705,7465757.425630493],[795862.3383944705,7465604.551573943],[795709.4643379226,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136277/82236","x":136277,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7465451.6775173955],[795556.590281371,7465604.551573943],[795709.4643379226,7465604.551573943],[795709.4643379226,7465451.6775173955],[795556.590281371,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136276/82237","x":136276,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7465451.6775173955],[795709.4643379226,7465604.551573943],[795862.3383944705,7465604.551573943],[795862.3383944705,7465451.6775173955],[795709.4643379226,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136277/82237","x":136277,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7465604.551573943],[795862.3383944705,7465757.425630493],[796015.2124510184,7465757.425630493],[796015.2124510184,7465604.551573943],[795862.3383944705,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136278/82236","x":136278,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7465604.551573943],[796015.2124510184,7465757.425630493],[796168.08650757,7465757.425630493],[796168.08650757,7465604.551573943],[796015.2124510184,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136279/82236","x":136279,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7465451.6775173955],[795862.3383944705,7465604.551573943],[796015.2124510184,7465604.551573943],[796015.2124510184,7465451.6775173955],[795862.3383944705,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136278/82237","x":136278,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7465451.6775173955],[796015.2124510184,7465604.551573943],[796168.08650757,7465604.551573943],[796168.08650757,7465451.6775173955],[796015.2124510184,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136279/82237","x":136279,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7465298.803460846],[795556.590281371,7465451.6775173955],[795709.4643379226,7465451.6775173955],[795709.4643379226,7465298.803460846],[795556.590281371,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136276/82238","x":136276,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7465298.803460846],[795709.4643379226,7465451.6775173955],[795862.3383944705,7465451.6775173955],[795862.3383944705,7465298.803460846],[795709.4643379226,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136277/82238","x":136277,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7465145.929404296],[795556.590281371,7465298.803460846],[795709.4643379226,7465298.803460846],[795709.4643379226,7465145.929404296],[795556.590281371,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136276/82239","x":136276,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7465145.929404296],[795709.4643379226,7465298.803460846],[795862.3383944705,7465298.803460846],[795862.3383944705,7465145.929404296],[795709.4643379226,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136277/82239","x":136277,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7465298.803460846],[795862.3383944705,7465451.6775173955],[796015.2124510184,7465451.6775173955],[796015.2124510184,7465298.803460846],[795862.3383944705,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136278/82238","x":136278,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7465298.803460846],[796015.2124510184,7465451.6775173955],[796168.08650757,7465451.6775173955],[796168.08650757,7465298.803460846],[796015.2124510184,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136279/82238","x":136279,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7465145.929404296],[795862.3383944705,7465298.803460846],[796015.2124510184,7465298.803460846],[796015.2124510184,7465145.929404296],[795862.3383944705,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136278/82239","x":136278,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7465145.929404296],[796015.2124510184,7465298.803460846],[796168.08650757,7465298.803460846],[796168.08650757,7465145.929404296],[796015.2124510184,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136279/82239","x":136279,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7466216.04780014],[796168.08650757,7466368.92185669],[796320.9605641179,7466368.92185669],[796320.9605641179,7466216.04780014],[796168.08650757,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136280/82232","x":136280,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7466216.04780014],[796320.9605641179,7466368.92185669],[796473.8346206658,7466368.92185669],[796473.8346206658,7466216.04780014],[796320.9605641179,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136281/82232","x":136281,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7466063.173743591],[796168.08650757,7466216.04780014],[796320.9605641179,7466216.04780014],[796320.9605641179,7466063.173743591],[796168.08650757,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136280/82233","x":136280,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7466063.173743591],[796320.9605641179,7466216.04780014],[796473.8346206658,7466216.04780014],[796473.8346206658,7466063.173743591],[796320.9605641179,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136281/82233","x":136281,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7466216.04780014],[796473.8346206658,7466368.92185669],[796626.7086772174,7466368.92185669],[796626.7086772174,7466216.04780014],[796473.8346206658,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136282/82232","x":136282,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7466216.04780014],[796626.7086772174,7466368.92185669],[796779.5827337652,7466368.92185669],[796779.5827337652,7466216.04780014],[796626.7086772174,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136283/82232","x":136283,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7466063.173743591],[796473.8346206658,7466216.04780014],[796626.7086772174,7466216.04780014],[796626.7086772174,7466063.173743591],[796473.8346206658,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136282/82233","x":136282,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7466063.173743591],[796626.7086772174,7466216.04780014],[796779.5827337652,7466216.04780014],[796779.5827337652,7466063.173743591],[796626.7086772174,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136283/82233","x":136283,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7466216.04780014],[796779.5827337652,7466368.92185669],[796932.4567903131,7466368.92185669],[796932.4567903131,7466216.04780014],[796779.5827337652,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136284/82232","x":136284,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7466216.04780014],[796932.4567903131,7466368.92185669],[797085.330846861,7466368.92185669],[797085.330846861,7466216.04780014],[796932.4567903131,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136285/82232","x":136285,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7466063.173743591],[796779.5827337652,7466216.04780014],[796932.4567903131,7466216.04780014],[796932.4567903131,7466063.173743591],[796779.5827337652,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136284/82233","x":136284,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7466063.173743591],[796932.4567903131,7466216.04780014],[797085.330846861,7466216.04780014],[797085.330846861,7466063.173743591],[796932.4567903131,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136285/82233","x":136285,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7466216.04780014],[797085.330846861,7466368.92185669],[797238.2049034126,7466368.92185669],[797238.2049034126,7466216.04780014],[797085.330846861,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136286/82232","x":136286,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7466216.04780014],[797238.2049034126,7466368.92185669],[797391.0789599605,7466368.92185669],[797391.0789599605,7466216.04780014],[797238.2049034126,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136287/82232","x":136287,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7466063.173743591],[797085.330846861,7466216.04780014],[797238.2049034126,7466216.04780014],[797238.2049034126,7466063.173743591],[797085.330846861,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136286/82233","x":136286,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7466063.173743591],[797238.2049034126,7466216.04780014],[797391.0789599605,7466216.04780014],[797391.0789599605,7466063.173743591],[797238.2049034126,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136287/82233","x":136287,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7465604.551573943],[796168.08650757,7465757.425630493],[796320.9605641179,7465757.425630493],[796320.9605641179,7465604.551573943],[796168.08650757,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136280/82236","x":136280,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7465604.551573943],[796320.9605641179,7465757.425630493],[796473.8346206658,7465757.425630493],[796473.8346206658,7465604.551573943],[796320.9605641179,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136281/82236","x":136281,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7465451.6775173955],[796168.08650757,7465604.551573943],[796320.9605641179,7465604.551573943],[796320.9605641179,7465451.6775173955],[796168.08650757,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136280/82237","x":136280,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7465451.6775173955],[796320.9605641179,7465604.551573943],[796473.8346206658,7465604.551573943],[796473.8346206658,7465451.6775173955],[796320.9605641179,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136281/82237","x":136281,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7465604.551573943],[796473.8346206658,7465757.425630493],[796626.7086772174,7465757.425630493],[796626.7086772174,7465604.551573943],[796473.8346206658,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136282/82236","x":136282,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7465604.551573943],[796626.7086772174,7465757.425630493],[796779.5827337652,7465757.425630493],[796779.5827337652,7465604.551573943],[796626.7086772174,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136283/82236","x":136283,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7465451.6775173955],[796473.8346206658,7465604.551573943],[796626.7086772174,7465604.551573943],[796626.7086772174,7465451.6775173955],[796473.8346206658,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136282/82237","x":136282,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7465451.6775173955],[796626.7086772174,7465604.551573943],[796779.5827337652,7465604.551573943],[796779.5827337652,7465451.6775173955],[796626.7086772174,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136283/82237","x":136283,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7465298.803460846],[796168.08650757,7465451.6775173955],[796320.9605641179,7465451.6775173955],[796320.9605641179,7465298.803460846],[796168.08650757,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136280/82238","x":136280,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7465298.803460846],[796320.9605641179,7465451.6775173955],[796473.8346206658,7465451.6775173955],[796473.8346206658,7465298.803460846],[796320.9605641179,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136281/82238","x":136281,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7465145.929404296],[796168.08650757,7465298.803460846],[796320.9605641179,7465298.803460846],[796320.9605641179,7465145.929404296],[796168.08650757,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136280/82239","x":136280,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7465145.929404296],[796320.9605641179,7465298.803460846],[796473.8346206658,7465298.803460846],[796473.8346206658,7465145.929404296],[796320.9605641179,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136281/82239","x":136281,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7465298.803460846],[796473.8346206658,7465451.6775173955],[796626.7086772174,7465451.6775173955],[796626.7086772174,7465298.803460846],[796473.8346206658,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136282/82238","x":136282,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7465298.803460846],[796626.7086772174,7465451.6775173955],[796779.5827337652,7465451.6775173955],[796779.5827337652,7465298.803460846],[796626.7086772174,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136283/82238","x":136283,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7465145.929404296],[796473.8346206658,7465298.803460846],[796626.7086772174,7465298.803460846],[796626.7086772174,7465145.929404296],[796473.8346206658,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136282/82239","x":136282,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7465145.929404296],[796626.7086772174,7465298.803460846],[796779.5827337652,7465298.803460846],[796779.5827337652,7465145.929404296],[796626.7086772174,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136283/82239","x":136283,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7465604.551573943],[796779.5827337652,7465757.425630493],[796932.4567903131,7465757.425630493],[796932.4567903131,7465604.551573943],[796779.5827337652,7465604.551573943]]],"type":"Polygon"},"properties":{"label":"18/136284/82236","x":136284,"y":82236,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7465451.6775173955],[796779.5827337652,7465604.551573943],[796932.4567903131,7465604.551573943],[796932.4567903131,7465451.6775173955],[796779.5827337652,7465451.6775173955]]],"type":"Polygon"},"properties":{"label":"18/136284/82237","x":136284,"y":82237,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7465298.803460846],[796779.5827337652,7465451.6775173955],[796932.4567903131,7465451.6775173955],[796932.4567903131,7465298.803460846],[796779.5827337652,7465298.803460846]]],"type":"Polygon"},"properties":{"label":"18/136284/82238","x":136284,"y":82238,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7465145.929404296],[796779.5827337652,7465298.803460846],[796932.4567903131,7465298.803460846],[796932.4567903131,7465145.929404296],[796779.5827337652,7465145.929404296]]],"type":"Polygon"},"properties":{"label":"18/136284/82239","x":136284,"y":82239,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7469885.0251573175],[797391.0789599605,7470037.899213867],[797543.9530165084,7470037.899213867],[797543.9530165084,7469885.0251573175],[797391.0789599605,7469885.0251573175]]],"type":"Polygon"},"properties":{"label":"18/136288/82208","x":136288,"y":82208,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7469885.0251573175],[797543.9530165084,7470037.899213867],[797696.82707306,7470037.899213867],[797696.82707306,7469885.0251573175],[797543.9530165084,7469885.0251573175]]],"type":"Polygon"},"properties":{"label":"18/136289/82208","x":136289,"y":82208,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7469732.15110077],[797391.0789599605,7469885.0251573175],[797543.9530165084,7469885.0251573175],[797543.9530165084,7469732.15110077],[797391.0789599605,7469732.15110077]]],"type":"Polygon"},"properties":{"label":"18/136288/82209","x":136288,"y":82209,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7469732.15110077],[797543.9530165084,7469885.0251573175],[797696.82707306,7469885.0251573175],[797696.82707306,7469732.15110077],[797543.9530165084,7469732.15110077]]],"type":"Polygon"},"properties":{"label":"18/136289/82209","x":136289,"y":82209,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7469885.0251573175],[797696.82707306,7470037.899213867],[797849.7011296079,7470037.899213867],[797849.7011296079,7469885.0251573175],[797696.82707306,7469885.0251573175]]],"type":"Polygon"},"properties":{"label":"18/136290/82208","x":136290,"y":82208,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7469885.0251573175],[797849.7011296079,7470037.899213867],[798002.5751861557,7470037.899213867],[798002.5751861557,7469885.0251573175],[797849.7011296079,7469885.0251573175]]],"type":"Polygon"},"properties":{"label":"18/136291/82208","x":136291,"y":82208,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7468509.158648377],[797391.0789599605,7468662.032704925],[797543.9530165084,7468662.032704925],[797543.9530165084,7468509.158648377],[797391.0789599605,7468509.158648377]]],"type":"Polygon"},"properties":{"label":"18/136288/82217","x":136288,"y":82217,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7468356.284591828],[797391.0789599605,7468509.158648377],[797543.9530165084,7468509.158648377],[797543.9530165084,7468356.284591828],[797391.0789599605,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136288/82218","x":136288,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7468356.284591828],[797543.9530165084,7468509.158648377],[797696.82707306,7468509.158648377],[797696.82707306,7468356.284591828],[797543.9530165084,7468356.284591828]]],"type":"Polygon"},"properties":{"label":"18/136289/82218","x":136289,"y":82218,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7468203.410535278],[797391.0789599605,7468356.284591828],[797543.9530165084,7468356.284591828],[797543.9530165084,7468203.410535278],[797391.0789599605,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136288/82219","x":136288,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7468203.410535278],[797543.9530165084,7468356.284591828],[797696.82707306,7468356.284591828],[797696.82707306,7468203.410535278],[797543.9530165084,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136289/82219","x":136289,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7468203.410535278],[797696.82707306,7468356.284591828],[797849.7011296079,7468356.284591828],[797849.7011296079,7468203.410535278],[797696.82707306,7468203.410535278]]],"type":"Polygon"},"properties":{"label":"18/136290/82219","x":136290,"y":82219,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7468050.53647873],[797391.0789599605,7468203.410535278],[797543.9530165084,7468203.410535278],[797543.9530165084,7468050.53647873],[797391.0789599605,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136288/82220","x":136288,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7468050.53647873],[797543.9530165084,7468203.410535278],[797696.82707306,7468203.410535278],[797696.82707306,7468050.53647873],[797543.9530165084,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136289/82220","x":136289,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7467897.66242218],[797391.0789599605,7468050.53647873],[797543.9530165084,7468050.53647873],[797543.9530165084,7467897.66242218],[797391.0789599605,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136288/82221","x":136288,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7467897.66242218],[797543.9530165084,7468050.53647873],[797696.82707306,7468050.53647873],[797696.82707306,7467897.66242218],[797543.9530165084,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136289/82221","x":136289,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7468050.53647873],[797696.82707306,7468203.410535278],[797849.7011296079,7468203.410535278],[797849.7011296079,7468050.53647873],[797696.82707306,7468050.53647873]]],"type":"Polygon"},"properties":{"label":"18/136290/82220","x":136290,"y":82220,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7467897.66242218],[797696.82707306,7468050.53647873],[797849.7011296079,7468050.53647873],[797849.7011296079,7467897.66242218],[797696.82707306,7467897.66242218]]],"type":"Polygon"},"properties":{"label":"18/136290/82221","x":136290,"y":82221,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7466980.418082885],[797391.0789599605,7467133.292139435],[797543.9530165084,7467133.292139435],[797543.9530165084,7466980.418082885],[797391.0789599605,7466980.418082885]]],"type":"Polygon"},"properties":{"label":"18/136288/82227","x":136288,"y":82227,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7466827.544026336],[797391.0789599605,7466980.418082885],[797543.9530165084,7466980.418082885],[797543.9530165084,7466827.544026336],[797391.0789599605,7466827.544026336]]],"type":"Polygon"},"properties":{"label":"18/136288/82228","x":136288,"y":82228,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7466674.669969788],[797391.0789599605,7466827.544026336],[797543.9530165084,7466827.544026336],[797543.9530165084,7466674.669969788],[797391.0789599605,7466674.669969788]]],"type":"Polygon"},"properties":{"label":"18/136288/82229","x":136288,"y":82229,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7466674.669969788],[797543.9530165084,7466827.544026336],[797696.82707306,7466827.544026336],[797696.82707306,7466674.669969788],[797543.9530165084,7466674.669969788]]],"type":"Polygon"},"properties":{"label":"18/136289/82229","x":136289,"y":82229,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7466521.795913238],[797391.0789599605,7466674.669969788],[797543.9530165084,7466674.669969788],[797543.9530165084,7466521.795913238],[797391.0789599605,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136288/82230","x":136288,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7466521.795913238],[797543.9530165084,7466674.669969788],[797696.82707306,7466674.669969788],[797696.82707306,7466521.795913238],[797543.9530165084,7466521.795913238]]],"type":"Polygon"},"properties":{"label":"18/136289/82230","x":136289,"y":82230,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7466368.92185669],[797391.0789599605,7466521.795913238],[797543.9530165084,7466521.795913238],[797543.9530165084,7466368.92185669],[797391.0789599605,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136288/82231","x":136288,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7466368.92185669],[797543.9530165084,7466521.795913238],[797696.82707306,7466521.795913238],[797696.82707306,7466368.92185669],[797543.9530165084,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136289/82231","x":136289,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7466368.92185669],[797696.82707306,7466521.795913238],[797849.7011296079,7466521.795913238],[797849.7011296079,7466368.92185669],[797696.82707306,7466368.92185669]]],"type":"Polygon"},"properties":{"label":"18/136290/82231","x":136290,"y":82231,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7466216.04780014],[797391.0789599605,7466368.92185669],[797543.9530165084,7466368.92185669],[797543.9530165084,7466216.04780014],[797391.0789599605,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136288/82232","x":136288,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7466216.04780014],[797543.9530165084,7466368.92185669],[797696.82707306,7466368.92185669],[797696.82707306,7466216.04780014],[797543.9530165084,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136289/82232","x":136289,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7466063.173743591],[797391.0789599605,7466216.04780014],[797543.9530165084,7466216.04780014],[797543.9530165084,7466063.173743591],[797391.0789599605,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136288/82233","x":136288,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7466063.173743591],[797543.9530165084,7466216.04780014],[797696.82707306,7466216.04780014],[797696.82707306,7466063.173743591],[797543.9530165084,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136289/82233","x":136289,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7466216.04780014],[797696.82707306,7466368.92185669],[797849.7011296079,7466368.92185669],[797849.7011296079,7466216.04780014],[797696.82707306,7466216.04780014]]],"type":"Polygon"},"properties":{"label":"18/136290/82232","x":136290,"y":82232,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7466063.173743591],[797696.82707306,7466216.04780014],[797849.7011296079,7466216.04780014],[797849.7011296079,7466063.173743591],[797696.82707306,7466063.173743591]]],"type":"Polygon"},"properties":{"label":"18/136290/82233","x":136290,"y":82233,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7464993.055347748],[792346.2350938432,7465145.929404296],[792499.1091503911,7465145.929404296],[792499.1091503911,7464993.055347748],[792346.2350938432,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136255/82240","x":136255,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7464840.181291198],[792346.2350938432,7464993.055347748],[792499.1091503911,7464993.055347748],[792499.1091503911,7464840.181291198],[792346.2350938432,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136255/82241","x":136255,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7464687.3072346505],[792346.2350938432,7464840.181291198],[792499.1091503911,7464840.181291198],[792499.1091503911,7464687.3072346505],[792346.2350938432,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136255/82242","x":136255,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7460101.085538177],[792346.2350938432,7460253.959594727],[792499.1091503911,7460253.959594727],[792499.1091503911,7460101.085538177],[792346.2350938432,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136255/82272","x":136255,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7459948.211481629],[792346.2350938432,7460101.085538177],[792499.1091503911,7460101.085538177],[792499.1091503911,7459948.211481629],[792346.2350938432,7459948.211481629]]],"type":"Polygon"},"properties":{"label":"18/136255/82273","x":136255,"y":82273,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7459795.337425079],[792346.2350938432,7459948.211481629],[792499.1091503911,7459948.211481629],[792499.1091503911,7459795.337425079],[792346.2350938432,7459795.337425079]]],"type":"Polygon"},"properties":{"label":"18/136255/82274","x":136255,"y":82274,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7459642.463368529],[792346.2350938432,7459795.337425079],[792499.1091503911,7459795.337425079],[792499.1091503911,7459642.463368529],[792346.2350938432,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136255/82275","x":136255,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7459489.589311982],[792346.2350938432,7459642.463368529],[792499.1091503911,7459642.463368529],[792499.1091503911,7459489.589311982],[792346.2350938432,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136255/82276","x":136255,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7459336.715255432],[792346.2350938432,7459489.589311982],[792499.1091503911,7459489.589311982],[792499.1091503911,7459336.715255432],[792346.2350938432,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136255/82277","x":136255,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7459183.841198882],[792346.2350938432,7459336.715255432],[792499.1091503911,7459336.715255432],[792499.1091503911,7459183.841198882],[792346.2350938432,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136255/82278","x":136255,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7459030.967142334],[792346.2350938432,7459183.841198882],[792499.1091503911,7459183.841198882],[792499.1091503911,7459030.967142334],[792346.2350938432,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136255/82279","x":136255,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7458878.0930857845],[792346.2350938432,7459030.967142334],[792499.1091503911,7459030.967142334],[792499.1091503911,7458878.0930857845],[792346.2350938432,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136255/82280","x":136255,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7458725.219029237],[792346.2350938432,7458878.0930857845],[792499.1091503911,7458878.0930857845],[792499.1091503911,7458725.219029237],[792346.2350938432,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136255/82281","x":136255,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7458572.344972687],[792346.2350938432,7458725.219029237],[792499.1091503911,7458725.219029237],[792499.1091503911,7458572.344972687],[792346.2350938432,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136255/82282","x":136255,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7458419.470916137],[792346.2350938432,7458572.344972687],[792499.1091503911,7458572.344972687],[792499.1091503911,7458419.470916137],[792346.2350938432,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136255/82283","x":136255,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7458266.596859589],[792346.2350938432,7458419.470916137],[792499.1091503911,7458419.470916137],[792499.1091503911,7458266.596859589],[792346.2350938432,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136255/82284","x":136255,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7458113.7228030395],[792346.2350938432,7458266.596859589],[792499.1091503911,7458266.596859589],[792499.1091503911,7458113.7228030395],[792346.2350938432,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136255/82285","x":136255,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7457960.84874649],[792346.2350938432,7458113.7228030395],[792499.1091503911,7458113.7228030395],[792499.1091503911,7457960.84874649],[792346.2350938432,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136255/82286","x":136255,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7457807.974689942],[792346.2350938432,7457960.84874649],[792499.1091503911,7457960.84874649],[792499.1091503911,7457807.974689942],[792346.2350938432,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136255/82287","x":136255,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7457655.100633392],[792346.2350938432,7457807.974689942],[792499.1091503911,7457807.974689942],[792499.1091503911,7457655.100633392],[792346.2350938432,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136255/82288","x":136255,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7457502.226576842],[792346.2350938432,7457655.100633392],[792499.1091503911,7457655.100633392],[792499.1091503911,7457502.226576842],[792346.2350938432,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136255/82289","x":136255,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7457349.3525202945],[792346.2350938432,7457502.226576842],[792499.1091503911,7457502.226576842],[792499.1091503911,7457349.3525202945],[792346.2350938432,7457349.3525202945]]],"type":"Polygon"},"properties":{"label":"18/136255/82290","x":136255,"y":82290,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7457196.478463745],[792346.2350938432,7457349.3525202945],[792499.1091503911,7457349.3525202945],[792499.1091503911,7457196.478463745],[792346.2350938432,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136255/82291","x":136255,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7457043.604407197],[792346.2350938432,7457196.478463745],[792499.1091503911,7457196.478463745],[792499.1091503911,7457043.604407197],[792346.2350938432,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136255/82292","x":136255,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7456890.730350647],[792346.2350938432,7457043.604407197],[792499.1091503911,7457043.604407197],[792499.1091503911,7456890.730350647],[792346.2350938432,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136255/82293","x":136255,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792346.2350938432,7456737.856294097],[792346.2350938432,7456890.730350647],[792499.1091503911,7456890.730350647],[792499.1091503911,7456737.856294097],[792346.2350938432,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136255/82294","x":136255,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7464993.055347748],[792499.1091503911,7465145.929404296],[792651.983206939,7465145.929404296],[792651.983206939,7464993.055347748],[792499.1091503911,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136256/82240","x":136256,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7464993.055347748],[792651.983206939,7465145.929404296],[792804.8572634906,7465145.929404296],[792804.8572634906,7464993.055347748],[792651.983206939,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136257/82240","x":136257,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7464840.181291198],[792499.1091503911,7464993.055347748],[792651.983206939,7464993.055347748],[792651.983206939,7464840.181291198],[792499.1091503911,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136256/82241","x":136256,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7464840.181291198],[792651.983206939,7464993.055347748],[792804.8572634906,7464993.055347748],[792804.8572634906,7464840.181291198],[792651.983206939,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136257/82241","x":136257,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7464993.055347748],[792804.8572634906,7465145.929404296],[792957.7313200384,7465145.929404296],[792957.7313200384,7464993.055347748],[792804.8572634906,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136258/82240","x":136258,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7464993.055347748],[792957.7313200384,7465145.929404296],[793110.6053765863,7465145.929404296],[793110.6053765863,7464993.055347748],[792957.7313200384,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136259/82240","x":136259,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7464840.181291198],[792804.8572634906,7464993.055347748],[792957.7313200384,7464993.055347748],[792957.7313200384,7464840.181291198],[792804.8572634906,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136258/82241","x":136258,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7464840.181291198],[792957.7313200384,7464993.055347748],[793110.6053765863,7464993.055347748],[793110.6053765863,7464840.181291198],[792957.7313200384,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136259/82241","x":136259,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7464687.3072346505],[792499.1091503911,7464840.181291198],[792651.983206939,7464840.181291198],[792651.983206939,7464687.3072346505],[792499.1091503911,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136256/82242","x":136256,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7464687.3072346505],[792651.983206939,7464840.181291198],[792804.8572634906,7464840.181291198],[792804.8572634906,7464687.3072346505],[792651.983206939,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136257/82242","x":136257,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7464534.433178101],[792499.1091503911,7464687.3072346505],[792651.983206939,7464687.3072346505],[792651.983206939,7464534.433178101],[792499.1091503911,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136256/82243","x":136256,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7464534.433178101],[792651.983206939,7464687.3072346505],[792804.8572634906,7464687.3072346505],[792804.8572634906,7464534.433178101],[792651.983206939,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136257/82243","x":136257,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7464687.3072346505],[792804.8572634906,7464840.181291198],[792957.7313200384,7464840.181291198],[792957.7313200384,7464687.3072346505],[792804.8572634906,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136258/82242","x":136258,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7464687.3072346505],[792957.7313200384,7464840.181291198],[793110.6053765863,7464840.181291198],[793110.6053765863,7464687.3072346505],[792957.7313200384,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136259/82242","x":136259,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7464534.433178101],[792804.8572634906,7464687.3072346505],[792957.7313200384,7464687.3072346505],[792957.7313200384,7464534.433178101],[792804.8572634906,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136258/82243","x":136258,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7464534.433178101],[792957.7313200384,7464687.3072346505],[793110.6053765863,7464687.3072346505],[793110.6053765863,7464534.433178101],[792957.7313200384,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136259/82243","x":136259,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7464993.055347748],[793110.6053765863,7465145.929404296],[793263.4794331342,7465145.929404296],[793263.4794331342,7464993.055347748],[793110.6053765863,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136260/82240","x":136260,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7464993.055347748],[793263.4794331342,7465145.929404296],[793416.3534896858,7465145.929404296],[793416.3534896858,7464993.055347748],[793263.4794331342,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136261/82240","x":136261,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7464840.181291198],[793110.6053765863,7464993.055347748],[793263.4794331342,7464993.055347748],[793263.4794331342,7464840.181291198],[793110.6053765863,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136260/82241","x":136260,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7464840.181291198],[793263.4794331342,7464993.055347748],[793416.3534896858,7464993.055347748],[793416.3534896858,7464840.181291198],[793263.4794331342,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136261/82241","x":136261,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7464993.055347748],[793416.3534896858,7465145.929404296],[793569.2275462337,7465145.929404296],[793569.2275462337,7464993.055347748],[793416.3534896858,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136262/82240","x":136262,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7464993.055347748],[793569.2275462337,7465145.929404296],[793722.1016027816,7465145.929404296],[793722.1016027816,7464993.055347748],[793569.2275462337,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136263/82240","x":136263,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7464840.181291198],[793416.3534896858,7464993.055347748],[793569.2275462337,7464993.055347748],[793569.2275462337,7464840.181291198],[793416.3534896858,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136262/82241","x":136262,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7464840.181291198],[793569.2275462337,7464993.055347748],[793722.1016027816,7464993.055347748],[793722.1016027816,7464840.181291198],[793569.2275462337,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136263/82241","x":136263,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7464687.3072346505],[793110.6053765863,7464840.181291198],[793263.4794331342,7464840.181291198],[793263.4794331342,7464687.3072346505],[793110.6053765863,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136260/82242","x":136260,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7464687.3072346505],[793263.4794331342,7464840.181291198],[793416.3534896858,7464840.181291198],[793416.3534896858,7464687.3072346505],[793263.4794331342,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136261/82242","x":136261,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7464534.433178101],[793110.6053765863,7464687.3072346505],[793263.4794331342,7464687.3072346505],[793263.4794331342,7464534.433178101],[793110.6053765863,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136260/82243","x":136260,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7464534.433178101],[793263.4794331342,7464687.3072346505],[793416.3534896858,7464687.3072346505],[793416.3534896858,7464534.433178101],[793263.4794331342,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136261/82243","x":136261,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7464687.3072346505],[793416.3534896858,7464840.181291198],[793569.2275462337,7464840.181291198],[793569.2275462337,7464687.3072346505],[793416.3534896858,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136262/82242","x":136262,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7464687.3072346505],[793569.2275462337,7464840.181291198],[793722.1016027816,7464840.181291198],[793722.1016027816,7464687.3072346505],[793569.2275462337,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136263/82242","x":136263,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7464534.433178101],[793416.3534896858,7464687.3072346505],[793569.2275462337,7464687.3072346505],[793569.2275462337,7464534.433178101],[793416.3534896858,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136262/82243","x":136262,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7464534.433178101],[793569.2275462337,7464687.3072346505],[793722.1016027816,7464687.3072346505],[793722.1016027816,7464534.433178101],[793569.2275462337,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136263/82243","x":136263,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7464381.559121551],[792499.1091503911,7464534.433178101],[792651.983206939,7464534.433178101],[792651.983206939,7464381.559121551],[792499.1091503911,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136256/82244","x":136256,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7464381.559121551],[792651.983206939,7464534.433178101],[792804.8572634906,7464534.433178101],[792804.8572634906,7464381.559121551],[792651.983206939,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136257/82244","x":136257,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7464228.685065003],[792499.1091503911,7464381.559121551],[792651.983206939,7464381.559121551],[792651.983206939,7464228.685065003],[792499.1091503911,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136256/82245","x":136256,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7464228.685065003],[792651.983206939,7464381.559121551],[792804.8572634906,7464381.559121551],[792804.8572634906,7464228.685065003],[792651.983206939,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136257/82245","x":136257,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7464381.559121551],[792804.8572634906,7464534.433178101],[792957.7313200384,7464534.433178101],[792957.7313200384,7464381.559121551],[792804.8572634906,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136258/82244","x":136258,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7464381.559121551],[792957.7313200384,7464534.433178101],[793110.6053765863,7464534.433178101],[793110.6053765863,7464381.559121551],[792957.7313200384,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136259/82244","x":136259,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7464228.685065003],[792804.8572634906,7464381.559121551],[792957.7313200384,7464381.559121551],[792957.7313200384,7464228.685065003],[792804.8572634906,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136258/82245","x":136258,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7464228.685065003],[792957.7313200384,7464381.559121551],[793110.6053765863,7464381.559121551],[793110.6053765863,7464228.685065003],[792957.7313200384,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136259/82245","x":136259,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7464075.811008453],[792499.1091503911,7464228.685065003],[792651.983206939,7464228.685065003],[792651.983206939,7464075.811008453],[792499.1091503911,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136256/82246","x":136256,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7464075.811008453],[792651.983206939,7464228.685065003],[792804.8572634906,7464228.685065003],[792804.8572634906,7464075.811008453],[792651.983206939,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136257/82246","x":136257,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7463922.936951904],[792499.1091503911,7464075.811008453],[792651.983206939,7464075.811008453],[792651.983206939,7463922.936951904],[792499.1091503911,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136256/82247","x":136256,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7463922.936951904],[792651.983206939,7464075.811008453],[792804.8572634906,7464075.811008453],[792804.8572634906,7463922.936951904],[792651.983206939,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136257/82247","x":136257,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7464075.811008453],[792804.8572634906,7464228.685065003],[792957.7313200384,7464228.685065003],[792957.7313200384,7464075.811008453],[792804.8572634906,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136258/82246","x":136258,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7464075.811008453],[792957.7313200384,7464228.685065003],[793110.6053765863,7464228.685065003],[793110.6053765863,7464075.811008453],[792957.7313200384,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136259/82246","x":136259,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7463922.936951904],[792804.8572634906,7464075.811008453],[792957.7313200384,7464075.811008453],[792957.7313200384,7463922.936951904],[792804.8572634906,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136258/82247","x":136258,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7463922.936951904],[792957.7313200384,7464075.811008453],[793110.6053765863,7464075.811008453],[793110.6053765863,7463922.936951904],[792957.7313200384,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136259/82247","x":136259,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7464381.559121551],[793110.6053765863,7464534.433178101],[793263.4794331342,7464534.433178101],[793263.4794331342,7464381.559121551],[793110.6053765863,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136260/82244","x":136260,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7464381.559121551],[793263.4794331342,7464534.433178101],[793416.3534896858,7464534.433178101],[793416.3534896858,7464381.559121551],[793263.4794331342,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136261/82244","x":136261,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7464228.685065003],[793110.6053765863,7464381.559121551],[793263.4794331342,7464381.559121551],[793263.4794331342,7464228.685065003],[793110.6053765863,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136260/82245","x":136260,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7464228.685065003],[793263.4794331342,7464381.559121551],[793416.3534896858,7464381.559121551],[793416.3534896858,7464228.685065003],[793263.4794331342,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136261/82245","x":136261,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7464381.559121551],[793416.3534896858,7464534.433178101],[793569.2275462337,7464534.433178101],[793569.2275462337,7464381.559121551],[793416.3534896858,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136262/82244","x":136262,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7464381.559121551],[793569.2275462337,7464534.433178101],[793722.1016027816,7464534.433178101],[793722.1016027816,7464381.559121551],[793569.2275462337,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136263/82244","x":136263,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7464228.685065003],[793416.3534896858,7464381.559121551],[793569.2275462337,7464381.559121551],[793569.2275462337,7464228.685065003],[793416.3534896858,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136262/82245","x":136262,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7464228.685065003],[793569.2275462337,7464381.559121551],[793722.1016027816,7464381.559121551],[793722.1016027816,7464228.685065003],[793569.2275462337,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136263/82245","x":136263,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7464075.811008453],[793110.6053765863,7464228.685065003],[793263.4794331342,7464228.685065003],[793263.4794331342,7464075.811008453],[793110.6053765863,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136260/82246","x":136260,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7464075.811008453],[793263.4794331342,7464228.685065003],[793416.3534896858,7464228.685065003],[793416.3534896858,7464075.811008453],[793263.4794331342,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136261/82246","x":136261,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7463922.936951904],[793110.6053765863,7464075.811008453],[793263.4794331342,7464075.811008453],[793263.4794331342,7463922.936951904],[793110.6053765863,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136260/82247","x":136260,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7463922.936951904],[793263.4794331342,7464075.811008453],[793416.3534896858,7464075.811008453],[793416.3534896858,7463922.936951904],[793263.4794331342,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136261/82247","x":136261,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7464075.811008453],[793416.3534896858,7464228.685065003],[793569.2275462337,7464228.685065003],[793569.2275462337,7464075.811008453],[793416.3534896858,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136262/82246","x":136262,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7464075.811008453],[793569.2275462337,7464228.685065003],[793722.1016027816,7464228.685065003],[793722.1016027816,7464075.811008453],[793569.2275462337,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136263/82246","x":136263,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7463922.936951904],[793416.3534896858,7464075.811008453],[793569.2275462337,7464075.811008453],[793569.2275462337,7463922.936951904],[793416.3534896858,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136262/82247","x":136262,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7463922.936951904],[793569.2275462337,7464075.811008453],[793722.1016027816,7464075.811008453],[793722.1016027816,7463922.936951904],[793569.2275462337,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136263/82247","x":136263,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7464993.055347748],[793722.1016027816,7465145.929404296],[793874.9756593332,7465145.929404296],[793874.9756593332,7464993.055347748],[793722.1016027816,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136264/82240","x":136264,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7464993.055347748],[793874.9756593332,7465145.929404296],[794027.849715881,7465145.929404296],[794027.849715881,7464993.055347748],[793874.9756593332,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136265/82240","x":136265,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7464840.181291198],[793722.1016027816,7464993.055347748],[793874.9756593332,7464993.055347748],[793874.9756593332,7464840.181291198],[793722.1016027816,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136264/82241","x":136264,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7464840.181291198],[793874.9756593332,7464993.055347748],[794027.849715881,7464993.055347748],[794027.849715881,7464840.181291198],[793874.9756593332,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136265/82241","x":136265,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7464993.055347748],[794027.849715881,7465145.929404296],[794180.7237724289,7465145.929404296],[794180.7237724289,7464993.055347748],[794027.849715881,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136266/82240","x":136266,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7464993.055347748],[794180.7237724289,7465145.929404296],[794333.5978289805,7465145.929404296],[794333.5978289805,7464993.055347748],[794180.7237724289,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136267/82240","x":136267,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7464840.181291198],[794027.849715881,7464993.055347748],[794180.7237724289,7464993.055347748],[794180.7237724289,7464840.181291198],[794027.849715881,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136266/82241","x":136266,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7464840.181291198],[794180.7237724289,7464993.055347748],[794333.5978289805,7464993.055347748],[794333.5978289805,7464840.181291198],[794180.7237724289,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136267/82241","x":136267,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7464687.3072346505],[793722.1016027816,7464840.181291198],[793874.9756593332,7464840.181291198],[793874.9756593332,7464687.3072346505],[793722.1016027816,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136264/82242","x":136264,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7464687.3072346505],[793874.9756593332,7464840.181291198],[794027.849715881,7464840.181291198],[794027.849715881,7464687.3072346505],[793874.9756593332,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136265/82242","x":136265,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7464534.433178101],[793722.1016027816,7464687.3072346505],[793874.9756593332,7464687.3072346505],[793874.9756593332,7464534.433178101],[793722.1016027816,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136264/82243","x":136264,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7464534.433178101],[793874.9756593332,7464687.3072346505],[794027.849715881,7464687.3072346505],[794027.849715881,7464534.433178101],[793874.9756593332,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136265/82243","x":136265,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7464687.3072346505],[794027.849715881,7464840.181291198],[794180.7237724289,7464840.181291198],[794180.7237724289,7464687.3072346505],[794027.849715881,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136266/82242","x":136266,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7464993.055347748],[794333.5978289805,7465145.929404296],[794486.4718855284,7465145.929404296],[794486.4718855284,7464993.055347748],[794333.5978289805,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136268/82240","x":136268,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7464993.055347748],[794486.4718855284,7465145.929404296],[794639.3459420763,7465145.929404296],[794639.3459420763,7464993.055347748],[794486.4718855284,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136269/82240","x":136269,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7464840.181291198],[794333.5978289805,7464993.055347748],[794486.4718855284,7464993.055347748],[794486.4718855284,7464840.181291198],[794333.5978289805,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136268/82241","x":136268,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7464840.181291198],[794486.4718855284,7464993.055347748],[794639.3459420763,7464993.055347748],[794639.3459420763,7464840.181291198],[794486.4718855284,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136269/82241","x":136269,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7464993.055347748],[794639.3459420763,7465145.929404296],[794792.2199986279,7465145.929404296],[794792.2199986279,7464993.055347748],[794639.3459420763,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136270/82240","x":136270,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7464993.055347748],[794792.2199986279,7465145.929404296],[794945.0940551758,7465145.929404296],[794945.0940551758,7464993.055347748],[794792.2199986279,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136271/82240","x":136271,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7464840.181291198],[794639.3459420763,7464993.055347748],[794792.2199986279,7464993.055347748],[794792.2199986279,7464840.181291198],[794639.3459420763,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136270/82241","x":136270,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7464381.559121551],[793722.1016027816,7464534.433178101],[793874.9756593332,7464534.433178101],[793874.9756593332,7464381.559121551],[793722.1016027816,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136264/82244","x":136264,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7464381.559121551],[793874.9756593332,7464534.433178101],[794027.849715881,7464534.433178101],[794027.849715881,7464381.559121551],[793874.9756593332,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136265/82244","x":136265,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7464228.685065003],[793722.1016027816,7464381.559121551],[793874.9756593332,7464381.559121551],[793874.9756593332,7464228.685065003],[793722.1016027816,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136264/82245","x":136264,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7464075.811008453],[793722.1016027816,7464228.685065003],[793874.9756593332,7464228.685065003],[793874.9756593332,7464075.811008453],[793722.1016027816,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136264/82246","x":136264,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7464075.811008453],[793874.9756593332,7464228.685065003],[794027.849715881,7464228.685065003],[794027.849715881,7464075.811008453],[793874.9756593332,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136265/82246","x":136265,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7463922.936951904],[793722.1016027816,7464075.811008453],[793874.9756593332,7464075.811008453],[793874.9756593332,7463922.936951904],[793722.1016027816,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136264/82247","x":136264,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7463922.936951904],[793874.9756593332,7464075.811008453],[794027.849715881,7464075.811008453],[794027.849715881,7463922.936951904],[793874.9756593332,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136265/82247","x":136265,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7463922.936951904],[794027.849715881,7464075.811008453],[794180.7237724289,7464075.811008453],[794180.7237724289,7463922.936951904],[794027.849715881,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136266/82247","x":136266,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7463922.936951904],[794486.4718855284,7464075.811008453],[794639.3459420763,7464075.811008453],[794639.3459420763,7463922.936951904],[794486.4718855284,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136269/82247","x":136269,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7464075.811008453],[794639.3459420763,7464228.685065003],[794792.2199986279,7464228.685065003],[794792.2199986279,7464075.811008453],[794639.3459420763,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136270/82246","x":136270,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7464075.811008453],[794792.2199986279,7464228.685065003],[794945.0940551758,7464228.685065003],[794945.0940551758,7464075.811008453],[794792.2199986279,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136271/82246","x":136271,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7463922.936951904],[794639.3459420763,7464075.811008453],[794792.2199986279,7464075.811008453],[794792.2199986279,7463922.936951904],[794639.3459420763,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136270/82247","x":136270,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7463922.936951904],[794792.2199986279,7464075.811008453],[794945.0940551758,7464075.811008453],[794945.0940551758,7463922.936951904],[794792.2199986279,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136271/82247","x":136271,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7463770.062895356],[792651.983206939,7463922.936951904],[792804.8572634906,7463922.936951904],[792804.8572634906,7463770.062895356],[792651.983206939,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136257/82248","x":136257,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7463617.188838806],[792651.983206939,7463770.062895356],[792804.8572634906,7463770.062895356],[792804.8572634906,7463617.188838806],[792651.983206939,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136257/82249","x":136257,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7463770.062895356],[792804.8572634906,7463922.936951904],[792957.7313200384,7463922.936951904],[792957.7313200384,7463770.062895356],[792804.8572634906,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136258/82248","x":136258,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7463770.062895356],[792957.7313200384,7463922.936951904],[793110.6053765863,7463922.936951904],[793110.6053765863,7463770.062895356],[792957.7313200384,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136259/82248","x":136259,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7463617.188838806],[792804.8572634906,7463770.062895356],[792957.7313200384,7463770.062895356],[792957.7313200384,7463617.188838806],[792804.8572634906,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136258/82249","x":136258,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7463617.188838806],[792957.7313200384,7463770.062895356],[793110.6053765863,7463770.062895356],[793110.6053765863,7463617.188838806],[792957.7313200384,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136259/82249","x":136259,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7463464.314782256],[792651.983206939,7463617.188838806],[792804.8572634906,7463617.188838806],[792804.8572634906,7463464.314782256],[792651.983206939,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136257/82250","x":136257,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7463311.440725708],[792651.983206939,7463464.314782256],[792804.8572634906,7463464.314782256],[792804.8572634906,7463311.440725708],[792651.983206939,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136257/82251","x":136257,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7463464.314782256],[792804.8572634906,7463617.188838806],[792957.7313200384,7463617.188838806],[792957.7313200384,7463464.314782256],[792804.8572634906,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136258/82250","x":136258,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7463464.314782256],[792957.7313200384,7463617.188838806],[793110.6053765863,7463617.188838806],[793110.6053765863,7463464.314782256],[792957.7313200384,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136259/82250","x":136259,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7463311.440725708],[792804.8572634906,7463464.314782256],[792957.7313200384,7463464.314782256],[792957.7313200384,7463311.440725708],[792804.8572634906,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136258/82251","x":136258,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7463311.440725708],[792957.7313200384,7463464.314782256],[793110.6053765863,7463464.314782256],[793110.6053765863,7463311.440725708],[792957.7313200384,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136259/82251","x":136259,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7463770.062895356],[793110.6053765863,7463922.936951904],[793263.4794331342,7463922.936951904],[793263.4794331342,7463770.062895356],[793110.6053765863,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136260/82248","x":136260,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7463770.062895356],[793263.4794331342,7463922.936951904],[793416.3534896858,7463922.936951904],[793416.3534896858,7463770.062895356],[793263.4794331342,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136261/82248","x":136261,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7463617.188838806],[793110.6053765863,7463770.062895356],[793263.4794331342,7463770.062895356],[793263.4794331342,7463617.188838806],[793110.6053765863,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136260/82249","x":136260,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7463617.188838806],[793263.4794331342,7463770.062895356],[793416.3534896858,7463770.062895356],[793416.3534896858,7463617.188838806],[793263.4794331342,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136261/82249","x":136261,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7463770.062895356],[793416.3534896858,7463922.936951904],[793569.2275462337,7463922.936951904],[793569.2275462337,7463770.062895356],[793416.3534896858,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136262/82248","x":136262,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7463770.062895356],[793569.2275462337,7463922.936951904],[793722.1016027816,7463922.936951904],[793722.1016027816,7463770.062895356],[793569.2275462337,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136263/82248","x":136263,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7463617.188838806],[793416.3534896858,7463770.062895356],[793569.2275462337,7463770.062895356],[793569.2275462337,7463617.188838806],[793416.3534896858,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136262/82249","x":136262,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7463617.188838806],[793569.2275462337,7463770.062895356],[793722.1016027816,7463770.062895356],[793722.1016027816,7463617.188838806],[793569.2275462337,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136263/82249","x":136263,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7463464.314782256],[793110.6053765863,7463617.188838806],[793263.4794331342,7463617.188838806],[793263.4794331342,7463464.314782256],[793110.6053765863,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136260/82250","x":136260,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7463464.314782256],[793263.4794331342,7463617.188838806],[793416.3534896858,7463617.188838806],[793416.3534896858,7463464.314782256],[793263.4794331342,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136261/82250","x":136261,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7463311.440725708],[793110.6053765863,7463464.314782256],[793263.4794331342,7463464.314782256],[793263.4794331342,7463311.440725708],[793110.6053765863,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136260/82251","x":136260,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7463311.440725708],[793263.4794331342,7463464.314782256],[793416.3534896858,7463464.314782256],[793416.3534896858,7463311.440725708],[793263.4794331342,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136261/82251","x":136261,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7463464.314782256],[793416.3534896858,7463617.188838806],[793569.2275462337,7463617.188838806],[793569.2275462337,7463464.314782256],[793416.3534896858,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136262/82250","x":136262,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7463464.314782256],[793569.2275462337,7463617.188838806],[793722.1016027816,7463617.188838806],[793722.1016027816,7463464.314782256],[793569.2275462337,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136263/82250","x":136263,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7463311.440725708],[793416.3534896858,7463464.314782256],[793569.2275462337,7463464.314782256],[793569.2275462337,7463311.440725708],[793416.3534896858,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136262/82251","x":136262,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7463311.440725708],[793569.2275462337,7463464.314782256],[793722.1016027816,7463464.314782256],[793722.1016027816,7463311.440725708],[793569.2275462337,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136263/82251","x":136263,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7463158.566669159],[792651.983206939,7463311.440725708],[792804.8572634906,7463311.440725708],[792804.8572634906,7463158.566669159],[792651.983206939,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136257/82252","x":136257,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7463158.566669159],[792804.8572634906,7463311.440725708],[792957.7313200384,7463311.440725708],[792957.7313200384,7463158.566669159],[792804.8572634906,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136258/82252","x":136258,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7463158.566669159],[792957.7313200384,7463311.440725708],[793110.6053765863,7463311.440725708],[793110.6053765863,7463158.566669159],[792957.7313200384,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136259/82252","x":136259,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7463005.692612609],[792957.7313200384,7463158.566669159],[793110.6053765863,7463158.566669159],[793110.6053765863,7463005.692612609],[792957.7313200384,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136259/82253","x":136259,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7463158.566669159],[793110.6053765863,7463311.440725708],[793263.4794331342,7463311.440725708],[793263.4794331342,7463158.566669159],[793110.6053765863,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136260/82252","x":136260,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7463158.566669159],[793263.4794331342,7463311.440725708],[793416.3534896858,7463311.440725708],[793416.3534896858,7463158.566669159],[793263.4794331342,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136261/82252","x":136261,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7463005.692612609],[793110.6053765863,7463158.566669159],[793263.4794331342,7463158.566669159],[793263.4794331342,7463005.692612609],[793110.6053765863,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136260/82253","x":136260,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7463005.692612609],[793263.4794331342,7463158.566669159],[793416.3534896858,7463158.566669159],[793416.3534896858,7463005.692612609],[793263.4794331342,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136261/82253","x":136261,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7463158.566669159],[793416.3534896858,7463311.440725708],[793569.2275462337,7463311.440725708],[793569.2275462337,7463158.566669159],[793416.3534896858,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136262/82252","x":136262,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7463158.566669159],[793569.2275462337,7463311.440725708],[793722.1016027816,7463311.440725708],[793722.1016027816,7463158.566669159],[793569.2275462337,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136263/82252","x":136263,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7463005.692612609],[793416.3534896858,7463158.566669159],[793569.2275462337,7463158.566669159],[793569.2275462337,7463005.692612609],[793416.3534896858,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136262/82253","x":136262,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7463005.692612609],[793569.2275462337,7463158.566669159],[793722.1016027816,7463158.566669159],[793722.1016027816,7463005.692612609],[793569.2275462337,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136263/82253","x":136263,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7462852.818556061],[793569.2275462337,7463005.692612609],[793722.1016027816,7463005.692612609],[793722.1016027816,7462852.818556061],[793569.2275462337,7462852.818556061]]],"type":"Polygon"},"properties":{"label":"18/136263/82254","x":136263,"y":82254,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7463770.062895356],[793722.1016027816,7463922.936951904],[793874.9756593332,7463922.936951904],[793874.9756593332,7463770.062895356],[793722.1016027816,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136264/82248","x":136264,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7463770.062895356],[793874.9756593332,7463922.936951904],[794027.849715881,7463922.936951904],[794027.849715881,7463770.062895356],[793874.9756593332,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136265/82248","x":136265,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7463617.188838806],[793722.1016027816,7463770.062895356],[793874.9756593332,7463770.062895356],[793874.9756593332,7463617.188838806],[793722.1016027816,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136264/82249","x":136264,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7463617.188838806],[793874.9756593332,7463770.062895356],[794027.849715881,7463770.062895356],[794027.849715881,7463617.188838806],[793874.9756593332,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136265/82249","x":136265,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7463770.062895356],[794027.849715881,7463922.936951904],[794180.7237724289,7463922.936951904],[794180.7237724289,7463770.062895356],[794027.849715881,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136266/82248","x":136266,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7463770.062895356],[794180.7237724289,7463922.936951904],[794333.5978289805,7463922.936951904],[794333.5978289805,7463770.062895356],[794180.7237724289,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136267/82248","x":136267,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7463617.188838806],[794027.849715881,7463770.062895356],[794180.7237724289,7463770.062895356],[794180.7237724289,7463617.188838806],[794027.849715881,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136266/82249","x":136266,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7463617.188838806],[794180.7237724289,7463770.062895356],[794333.5978289805,7463770.062895356],[794333.5978289805,7463617.188838806],[794180.7237724289,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136267/82249","x":136267,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7463464.314782256],[793722.1016027816,7463617.188838806],[793874.9756593332,7463617.188838806],[793874.9756593332,7463464.314782256],[793722.1016027816,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136264/82250","x":136264,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7463464.314782256],[793874.9756593332,7463617.188838806],[794027.849715881,7463617.188838806],[794027.849715881,7463464.314782256],[793874.9756593332,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136265/82250","x":136265,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7463311.440725708],[793722.1016027816,7463464.314782256],[793874.9756593332,7463464.314782256],[793874.9756593332,7463311.440725708],[793722.1016027816,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136264/82251","x":136264,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7463311.440725708],[793874.9756593332,7463464.314782256],[794027.849715881,7463464.314782256],[794027.849715881,7463311.440725708],[793874.9756593332,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136265/82251","x":136265,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7463464.314782256],[794027.849715881,7463617.188838806],[794180.7237724289,7463617.188838806],[794180.7237724289,7463464.314782256],[794027.849715881,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136266/82250","x":136266,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7463464.314782256],[794180.7237724289,7463617.188838806],[794333.5978289805,7463617.188838806],[794333.5978289805,7463464.314782256],[794180.7237724289,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136267/82250","x":136267,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7463311.440725708],[794027.849715881,7463464.314782256],[794180.7237724289,7463464.314782256],[794180.7237724289,7463311.440725708],[794027.849715881,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136266/82251","x":136266,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7463311.440725708],[794180.7237724289,7463464.314782256],[794333.5978289805,7463464.314782256],[794333.5978289805,7463311.440725708],[794180.7237724289,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136267/82251","x":136267,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7463770.062895356],[794333.5978289805,7463922.936951904],[794486.4718855284,7463922.936951904],[794486.4718855284,7463770.062895356],[794333.5978289805,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136268/82248","x":136268,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7463770.062895356],[794486.4718855284,7463922.936951904],[794639.3459420763,7463922.936951904],[794639.3459420763,7463770.062895356],[794486.4718855284,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136269/82248","x":136269,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7463617.188838806],[794333.5978289805,7463770.062895356],[794486.4718855284,7463770.062895356],[794486.4718855284,7463617.188838806],[794333.5978289805,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136268/82249","x":136268,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7463617.188838806],[794486.4718855284,7463770.062895356],[794639.3459420763,7463770.062895356],[794639.3459420763,7463617.188838806],[794486.4718855284,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136269/82249","x":136269,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7463770.062895356],[794639.3459420763,7463922.936951904],[794792.2199986279,7463922.936951904],[794792.2199986279,7463770.062895356],[794639.3459420763,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136270/82248","x":136270,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7463770.062895356],[794792.2199986279,7463922.936951904],[794945.0940551758,7463922.936951904],[794945.0940551758,7463770.062895356],[794792.2199986279,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136271/82248","x":136271,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7463617.188838806],[794639.3459420763,7463770.062895356],[794792.2199986279,7463770.062895356],[794792.2199986279,7463617.188838806],[794639.3459420763,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136270/82249","x":136270,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7463617.188838806],[794792.2199986279,7463770.062895356],[794945.0940551758,7463770.062895356],[794945.0940551758,7463617.188838806],[794792.2199986279,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136271/82249","x":136271,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7463464.314782256],[794333.5978289805,7463617.188838806],[794486.4718855284,7463617.188838806],[794486.4718855284,7463464.314782256],[794333.5978289805,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136268/82250","x":136268,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7463464.314782256],[794486.4718855284,7463617.188838806],[794639.3459420763,7463617.188838806],[794639.3459420763,7463464.314782256],[794486.4718855284,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136269/82250","x":136269,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7463311.440725708],[794333.5978289805,7463464.314782256],[794486.4718855284,7463464.314782256],[794486.4718855284,7463311.440725708],[794333.5978289805,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136268/82251","x":136268,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7463311.440725708],[794486.4718855284,7463464.314782256],[794639.3459420763,7463464.314782256],[794639.3459420763,7463311.440725708],[794486.4718855284,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136269/82251","x":136269,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7463464.314782256],[794639.3459420763,7463617.188838806],[794792.2199986279,7463617.188838806],[794792.2199986279,7463464.314782256],[794639.3459420763,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136270/82250","x":136270,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7463464.314782256],[794792.2199986279,7463617.188838806],[794945.0940551758,7463617.188838806],[794945.0940551758,7463464.314782256],[794792.2199986279,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136271/82250","x":136271,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7463311.440725708],[794639.3459420763,7463464.314782256],[794792.2199986279,7463464.314782256],[794792.2199986279,7463311.440725708],[794639.3459420763,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136270/82251","x":136270,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7463311.440725708],[794792.2199986279,7463464.314782256],[794945.0940551758,7463464.314782256],[794945.0940551758,7463311.440725708],[794792.2199986279,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136271/82251","x":136271,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7463158.566669159],[793722.1016027816,7463311.440725708],[793874.9756593332,7463311.440725708],[793874.9756593332,7463158.566669159],[793722.1016027816,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136264/82252","x":136264,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7463158.566669159],[793874.9756593332,7463311.440725708],[794027.849715881,7463311.440725708],[794027.849715881,7463158.566669159],[793874.9756593332,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136265/82252","x":136265,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7463005.692612609],[793722.1016027816,7463158.566669159],[793874.9756593332,7463158.566669159],[793874.9756593332,7463005.692612609],[793722.1016027816,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136264/82253","x":136264,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7463005.692612609],[793874.9756593332,7463158.566669159],[794027.849715881,7463158.566669159],[794027.849715881,7463005.692612609],[793874.9756593332,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136265/82253","x":136265,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7463158.566669159],[794027.849715881,7463311.440725708],[794180.7237724289,7463311.440725708],[794180.7237724289,7463158.566669159],[794027.849715881,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136266/82252","x":136266,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7463158.566669159],[794180.7237724289,7463311.440725708],[794333.5978289805,7463311.440725708],[794333.5978289805,7463158.566669159],[794180.7237724289,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136267/82252","x":136267,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7463005.692612609],[794027.849715881,7463158.566669159],[794180.7237724289,7463158.566669159],[794180.7237724289,7463005.692612609],[794027.849715881,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136266/82253","x":136266,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7463005.692612609],[794180.7237724289,7463158.566669159],[794333.5978289805,7463158.566669159],[794333.5978289805,7463005.692612609],[794180.7237724289,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136267/82253","x":136267,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7462852.818556061],[793722.1016027816,7463005.692612609],[793874.9756593332,7463005.692612609],[793874.9756593332,7462852.818556061],[793722.1016027816,7462852.818556061]]],"type":"Polygon"},"properties":{"label":"18/136264/82254","x":136264,"y":82254,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7462852.818556061],[793874.9756593332,7463005.692612609],[794027.849715881,7463005.692612609],[794027.849715881,7462852.818556061],[793874.9756593332,7462852.818556061]]],"type":"Polygon"},"properties":{"label":"18/136265/82254","x":136265,"y":82254,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7462852.818556061],[794027.849715881,7463005.692612609],[794180.7237724289,7463005.692612609],[794180.7237724289,7462852.818556061],[794027.849715881,7462852.818556061]]],"type":"Polygon"},"properties":{"label":"18/136266/82254","x":136266,"y":82254,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7462852.818556061],[794180.7237724289,7463005.692612609],[794333.5978289805,7463005.692612609],[794333.5978289805,7462852.818556061],[794180.7237724289,7462852.818556061]]],"type":"Polygon"},"properties":{"label":"18/136267/82254","x":136267,"y":82254,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7462699.944499511],[794180.7237724289,7462852.818556061],[794333.5978289805,7462852.818556061],[794333.5978289805,7462699.944499511],[794180.7237724289,7462699.944499511]]],"type":"Polygon"},"properties":{"label":"18/136267/82255","x":136267,"y":82255,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7463158.566669159],[794333.5978289805,7463311.440725708],[794486.4718855284,7463311.440725708],[794486.4718855284,7463158.566669159],[794333.5978289805,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136268/82252","x":136268,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7463158.566669159],[794486.4718855284,7463311.440725708],[794639.3459420763,7463311.440725708],[794639.3459420763,7463158.566669159],[794486.4718855284,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136269/82252","x":136269,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7463005.692612609],[794333.5978289805,7463158.566669159],[794486.4718855284,7463158.566669159],[794486.4718855284,7463005.692612609],[794333.5978289805,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136268/82253","x":136268,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7463005.692612609],[794486.4718855284,7463158.566669159],[794639.3459420763,7463158.566669159],[794639.3459420763,7463005.692612609],[794486.4718855284,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136269/82253","x":136269,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7463158.566669159],[794639.3459420763,7463311.440725708],[794792.2199986279,7463311.440725708],[794792.2199986279,7463158.566669159],[794639.3459420763,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136270/82252","x":136270,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7463158.566669159],[794792.2199986279,7463311.440725708],[794945.0940551758,7463311.440725708],[794945.0940551758,7463158.566669159],[794792.2199986279,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136271/82252","x":136271,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7463005.692612609],[794639.3459420763,7463158.566669159],[794792.2199986279,7463158.566669159],[794792.2199986279,7463005.692612609],[794639.3459420763,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136270/82253","x":136270,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7463005.692612609],[794792.2199986279,7463158.566669159],[794945.0940551758,7463158.566669159],[794945.0940551758,7463005.692612609],[794792.2199986279,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136271/82253","x":136271,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7462852.818556061],[794333.5978289805,7463005.692612609],[794486.4718855284,7463005.692612609],[794486.4718855284,7462852.818556061],[794333.5978289805,7462852.818556061]]],"type":"Polygon"},"properties":{"label":"18/136268/82254","x":136268,"y":82254,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7462852.818556061],[794486.4718855284,7463005.692612609],[794639.3459420763,7463005.692612609],[794639.3459420763,7462852.818556061],[794486.4718855284,7462852.818556061]]],"type":"Polygon"},"properties":{"label":"18/136269/82254","x":136269,"y":82254,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7462699.944499511],[794333.5978289805,7462852.818556061],[794486.4718855284,7462852.818556061],[794486.4718855284,7462699.944499511],[794333.5978289805,7462699.944499511]]],"type":"Polygon"},"properties":{"label":"18/136268/82255","x":136268,"y":82255,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7462699.944499511],[794486.4718855284,7462852.818556061],[794639.3459420763,7462852.818556061],[794639.3459420763,7462699.944499511],[794486.4718855284,7462699.944499511]]],"type":"Polygon"},"properties":{"label":"18/136269/82255","x":136269,"y":82255,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7462852.818556061],[794639.3459420763,7463005.692612609],[794792.2199986279,7463005.692612609],[794792.2199986279,7462852.818556061],[794639.3459420763,7462852.818556061]]],"type":"Polygon"},"properties":{"label":"18/136270/82254","x":136270,"y":82254,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7462852.818556061],[794792.2199986279,7463005.692612609],[794945.0940551758,7463005.692612609],[794945.0940551758,7462852.818556061],[794792.2199986279,7462852.818556061]]],"type":"Polygon"},"properties":{"label":"18/136271/82254","x":136271,"y":82254,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7462699.944499511],[794639.3459420763,7462852.818556061],[794792.2199986279,7462852.818556061],[794792.2199986279,7462699.944499511],[794639.3459420763,7462699.944499511]]],"type":"Polygon"},"properties":{"label":"18/136270/82255","x":136270,"y":82255,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7462699.944499511],[794792.2199986279,7462852.818556061],[794945.0940551758,7462852.818556061],[794945.0940551758,7462699.944499511],[794792.2199986279,7462699.944499511]]],"type":"Polygon"},"properties":{"label":"18/136271/82255","x":136271,"y":82255,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7464993.055347748],[794945.0940551758,7465145.929404296],[795097.9681117237,7465145.929404296],[795097.9681117237,7464993.055347748],[794945.0940551758,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136272/82240","x":136272,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7464993.055347748],[795097.9681117237,7465145.929404296],[795250.8421682753,7465145.929404296],[795250.8421682753,7464993.055347748],[795097.9681117237,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136273/82240","x":136273,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7464840.181291198],[794945.0940551758,7464993.055347748],[795097.9681117237,7464993.055347748],[795097.9681117237,7464840.181291198],[794945.0940551758,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136272/82241","x":136272,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7464840.181291198],[795097.9681117237,7464993.055347748],[795250.8421682753,7464993.055347748],[795250.8421682753,7464840.181291198],[795097.9681117237,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136273/82241","x":136273,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7464993.055347748],[795250.8421682753,7465145.929404296],[795403.7162248231,7465145.929404296],[795403.7162248231,7464993.055347748],[795250.8421682753,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136274/82240","x":136274,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7464993.055347748],[795403.7162248231,7465145.929404296],[795556.590281371,7465145.929404296],[795556.590281371,7464993.055347748],[795403.7162248231,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136275/82240","x":136275,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7464840.181291198],[795250.8421682753,7464993.055347748],[795403.7162248231,7464993.055347748],[795403.7162248231,7464840.181291198],[795250.8421682753,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136274/82241","x":136274,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7464840.181291198],[795403.7162248231,7464993.055347748],[795556.590281371,7464993.055347748],[795556.590281371,7464840.181291198],[795403.7162248231,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136275/82241","x":136275,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7464687.3072346505],[794945.0940551758,7464840.181291198],[795097.9681117237,7464840.181291198],[795097.9681117237,7464687.3072346505],[794945.0940551758,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136272/82242","x":136272,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7464687.3072346505],[795097.9681117237,7464840.181291198],[795250.8421682753,7464840.181291198],[795250.8421682753,7464687.3072346505],[795097.9681117237,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136273/82242","x":136273,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7464534.433178101],[794945.0940551758,7464687.3072346505],[795097.9681117237,7464687.3072346505],[795097.9681117237,7464534.433178101],[794945.0940551758,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136272/82243","x":136272,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7464534.433178101],[795097.9681117237,7464687.3072346505],[795250.8421682753,7464687.3072346505],[795250.8421682753,7464534.433178101],[795097.9681117237,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136273/82243","x":136273,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7464687.3072346505],[795250.8421682753,7464840.181291198],[795403.7162248231,7464840.181291198],[795403.7162248231,7464687.3072346505],[795250.8421682753,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136274/82242","x":136274,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7464687.3072346505],[795403.7162248231,7464840.181291198],[795556.590281371,7464840.181291198],[795556.590281371,7464687.3072346505],[795403.7162248231,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136275/82242","x":136275,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7464534.433178101],[795250.8421682753,7464687.3072346505],[795403.7162248231,7464687.3072346505],[795403.7162248231,7464534.433178101],[795250.8421682753,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136274/82243","x":136274,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7464534.433178101],[795403.7162248231,7464687.3072346505],[795556.590281371,7464687.3072346505],[795556.590281371,7464534.433178101],[795403.7162248231,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136275/82243","x":136275,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7464993.055347748],[795556.590281371,7465145.929404296],[795709.4643379226,7465145.929404296],[795709.4643379226,7464993.055347748],[795556.590281371,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136276/82240","x":136276,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7464993.055347748],[795709.4643379226,7465145.929404296],[795862.3383944705,7465145.929404296],[795862.3383944705,7464993.055347748],[795709.4643379226,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136277/82240","x":136277,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7464840.181291198],[795556.590281371,7464993.055347748],[795709.4643379226,7464993.055347748],[795709.4643379226,7464840.181291198],[795556.590281371,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136276/82241","x":136276,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7464840.181291198],[795709.4643379226,7464993.055347748],[795862.3383944705,7464993.055347748],[795862.3383944705,7464840.181291198],[795709.4643379226,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136277/82241","x":136277,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7464993.055347748],[795862.3383944705,7465145.929404296],[796015.2124510184,7465145.929404296],[796015.2124510184,7464993.055347748],[795862.3383944705,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136278/82240","x":136278,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7464993.055347748],[796015.2124510184,7465145.929404296],[796168.08650757,7465145.929404296],[796168.08650757,7464993.055347748],[796015.2124510184,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136279/82240","x":136279,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7464840.181291198],[795862.3383944705,7464993.055347748],[796015.2124510184,7464993.055347748],[796015.2124510184,7464840.181291198],[795862.3383944705,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136278/82241","x":136278,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7464840.181291198],[796015.2124510184,7464993.055347748],[796168.08650757,7464993.055347748],[796168.08650757,7464840.181291198],[796015.2124510184,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136279/82241","x":136279,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7464687.3072346505],[795556.590281371,7464840.181291198],[795709.4643379226,7464840.181291198],[795709.4643379226,7464687.3072346505],[795556.590281371,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136276/82242","x":136276,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7464687.3072346505],[795709.4643379226,7464840.181291198],[795862.3383944705,7464840.181291198],[795862.3383944705,7464687.3072346505],[795709.4643379226,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136277/82242","x":136277,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7464534.433178101],[795556.590281371,7464687.3072346505],[795709.4643379226,7464687.3072346505],[795709.4643379226,7464534.433178101],[795556.590281371,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136276/82243","x":136276,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7464534.433178101],[795709.4643379226,7464687.3072346505],[795862.3383944705,7464687.3072346505],[795862.3383944705,7464534.433178101],[795709.4643379226,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136277/82243","x":136277,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7464687.3072346505],[795862.3383944705,7464840.181291198],[796015.2124510184,7464840.181291198],[796015.2124510184,7464687.3072346505],[795862.3383944705,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136278/82242","x":136278,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7464687.3072346505],[796015.2124510184,7464840.181291198],[796168.08650757,7464840.181291198],[796168.08650757,7464687.3072346505],[796015.2124510184,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136279/82242","x":136279,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7464534.433178101],[795862.3383944705,7464687.3072346505],[796015.2124510184,7464687.3072346505],[796015.2124510184,7464534.433178101],[795862.3383944705,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136278/82243","x":136278,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7464534.433178101],[796015.2124510184,7464687.3072346505],[796168.08650757,7464687.3072346505],[796168.08650757,7464534.433178101],[796015.2124510184,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136279/82243","x":136279,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7464381.559121551],[794945.0940551758,7464534.433178101],[795097.9681117237,7464534.433178101],[795097.9681117237,7464381.559121551],[794945.0940551758,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136272/82244","x":136272,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7464381.559121551],[795097.9681117237,7464534.433178101],[795250.8421682753,7464534.433178101],[795250.8421682753,7464381.559121551],[795097.9681117237,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136273/82244","x":136273,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7464228.685065003],[794945.0940551758,7464381.559121551],[795097.9681117237,7464381.559121551],[795097.9681117237,7464228.685065003],[794945.0940551758,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136272/82245","x":136272,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7464228.685065003],[795097.9681117237,7464381.559121551],[795250.8421682753,7464381.559121551],[795250.8421682753,7464228.685065003],[795097.9681117237,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136273/82245","x":136273,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7464381.559121551],[795250.8421682753,7464534.433178101],[795403.7162248231,7464534.433178101],[795403.7162248231,7464381.559121551],[795250.8421682753,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136274/82244","x":136274,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7464381.559121551],[795403.7162248231,7464534.433178101],[795556.590281371,7464534.433178101],[795556.590281371,7464381.559121551],[795403.7162248231,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136275/82244","x":136275,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7464228.685065003],[795250.8421682753,7464381.559121551],[795403.7162248231,7464381.559121551],[795403.7162248231,7464228.685065003],[795250.8421682753,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136274/82245","x":136274,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7464228.685065003],[795403.7162248231,7464381.559121551],[795556.590281371,7464381.559121551],[795556.590281371,7464228.685065003],[795403.7162248231,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136275/82245","x":136275,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7464075.811008453],[794945.0940551758,7464228.685065003],[795097.9681117237,7464228.685065003],[795097.9681117237,7464075.811008453],[794945.0940551758,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136272/82246","x":136272,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7464075.811008453],[795097.9681117237,7464228.685065003],[795250.8421682753,7464228.685065003],[795250.8421682753,7464075.811008453],[795097.9681117237,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136273/82246","x":136273,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7463922.936951904],[794945.0940551758,7464075.811008453],[795097.9681117237,7464075.811008453],[795097.9681117237,7463922.936951904],[794945.0940551758,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136272/82247","x":136272,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7463922.936951904],[795097.9681117237,7464075.811008453],[795250.8421682753,7464075.811008453],[795250.8421682753,7463922.936951904],[795097.9681117237,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136273/82247","x":136273,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7464075.811008453],[795250.8421682753,7464228.685065003],[795403.7162248231,7464228.685065003],[795403.7162248231,7464075.811008453],[795250.8421682753,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136274/82246","x":136274,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7464075.811008453],[795403.7162248231,7464228.685065003],[795556.590281371,7464228.685065003],[795556.590281371,7464075.811008453],[795403.7162248231,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136275/82246","x":136275,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7463922.936951904],[795250.8421682753,7464075.811008453],[795403.7162248231,7464075.811008453],[795403.7162248231,7463922.936951904],[795250.8421682753,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136274/82247","x":136274,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7463922.936951904],[795403.7162248231,7464075.811008453],[795556.590281371,7464075.811008453],[795556.590281371,7463922.936951904],[795403.7162248231,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136275/82247","x":136275,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7464381.559121551],[795556.590281371,7464534.433178101],[795709.4643379226,7464534.433178101],[795709.4643379226,7464381.559121551],[795556.590281371,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136276/82244","x":136276,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7464381.559121551],[795709.4643379226,7464534.433178101],[795862.3383944705,7464534.433178101],[795862.3383944705,7464381.559121551],[795709.4643379226,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136277/82244","x":136277,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7464228.685065003],[795556.590281371,7464381.559121551],[795709.4643379226,7464381.559121551],[795709.4643379226,7464228.685065003],[795556.590281371,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136276/82245","x":136276,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7464228.685065003],[795709.4643379226,7464381.559121551],[795862.3383944705,7464381.559121551],[795862.3383944705,7464228.685065003],[795709.4643379226,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136277/82245","x":136277,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7464381.559121551],[795862.3383944705,7464534.433178101],[796015.2124510184,7464534.433178101],[796015.2124510184,7464381.559121551],[795862.3383944705,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136278/82244","x":136278,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7464381.559121551],[796015.2124510184,7464534.433178101],[796168.08650757,7464534.433178101],[796168.08650757,7464381.559121551],[796015.2124510184,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136279/82244","x":136279,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7464228.685065003],[795862.3383944705,7464381.559121551],[796015.2124510184,7464381.559121551],[796015.2124510184,7464228.685065003],[795862.3383944705,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136278/82245","x":136278,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7464228.685065003],[796015.2124510184,7464381.559121551],[796168.08650757,7464381.559121551],[796168.08650757,7464228.685065003],[796015.2124510184,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136279/82245","x":136279,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7464075.811008453],[795556.590281371,7464228.685065003],[795709.4643379226,7464228.685065003],[795709.4643379226,7464075.811008453],[795556.590281371,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136276/82246","x":136276,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7464075.811008453],[795709.4643379226,7464228.685065003],[795862.3383944705,7464228.685065003],[795862.3383944705,7464075.811008453],[795709.4643379226,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136277/82246","x":136277,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7463922.936951904],[795556.590281371,7464075.811008453],[795709.4643379226,7464075.811008453],[795709.4643379226,7463922.936951904],[795556.590281371,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136276/82247","x":136276,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7463922.936951904],[795709.4643379226,7464075.811008453],[795862.3383944705,7464075.811008453],[795862.3383944705,7463922.936951904],[795709.4643379226,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136277/82247","x":136277,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7464075.811008453],[795862.3383944705,7464228.685065003],[796015.2124510184,7464228.685065003],[796015.2124510184,7464075.811008453],[795862.3383944705,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136278/82246","x":136278,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7464075.811008453],[796015.2124510184,7464228.685065003],[796168.08650757,7464228.685065003],[796168.08650757,7464075.811008453],[796015.2124510184,7464075.811008453]]],"type":"Polygon"},"properties":{"label":"18/136279/82246","x":136279,"y":82246,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7463922.936951904],[795862.3383944705,7464075.811008453],[796015.2124510184,7464075.811008453],[796015.2124510184,7463922.936951904],[795862.3383944705,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136278/82247","x":136278,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7463922.936951904],[796015.2124510184,7464075.811008453],[796168.08650757,7464075.811008453],[796168.08650757,7463922.936951904],[796015.2124510184,7463922.936951904]]],"type":"Polygon"},"properties":{"label":"18/136279/82247","x":136279,"y":82247,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7464993.055347748],[796168.08650757,7465145.929404296],[796320.9605641179,7465145.929404296],[796320.9605641179,7464993.055347748],[796168.08650757,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136280/82240","x":136280,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7464993.055347748],[796320.9605641179,7465145.929404296],[796473.8346206658,7465145.929404296],[796473.8346206658,7464993.055347748],[796320.9605641179,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136281/82240","x":136281,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7464840.181291198],[796168.08650757,7464993.055347748],[796320.9605641179,7464993.055347748],[796320.9605641179,7464840.181291198],[796168.08650757,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136280/82241","x":136280,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7464840.181291198],[796320.9605641179,7464993.055347748],[796473.8346206658,7464993.055347748],[796473.8346206658,7464840.181291198],[796320.9605641179,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136281/82241","x":136281,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7464993.055347748],[796473.8346206658,7465145.929404296],[796626.7086772174,7465145.929404296],[796626.7086772174,7464993.055347748],[796473.8346206658,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136282/82240","x":136282,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7464993.055347748],[796626.7086772174,7465145.929404296],[796779.5827337652,7465145.929404296],[796779.5827337652,7464993.055347748],[796626.7086772174,7464993.055347748]]],"type":"Polygon"},"properties":{"label":"18/136283/82240","x":136283,"y":82240,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7464840.181291198],[796473.8346206658,7464993.055347748],[796626.7086772174,7464993.055347748],[796626.7086772174,7464840.181291198],[796473.8346206658,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136282/82241","x":136282,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7464840.181291198],[796626.7086772174,7464993.055347748],[796779.5827337652,7464993.055347748],[796779.5827337652,7464840.181291198],[796626.7086772174,7464840.181291198]]],"type":"Polygon"},"properties":{"label":"18/136283/82241","x":136283,"y":82241,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7464687.3072346505],[796168.08650757,7464840.181291198],[796320.9605641179,7464840.181291198],[796320.9605641179,7464687.3072346505],[796168.08650757,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136280/82242","x":136280,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7464687.3072346505],[796320.9605641179,7464840.181291198],[796473.8346206658,7464840.181291198],[796473.8346206658,7464687.3072346505],[796320.9605641179,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136281/82242","x":136281,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7464534.433178101],[796168.08650757,7464687.3072346505],[796320.9605641179,7464687.3072346505],[796320.9605641179,7464534.433178101],[796168.08650757,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136280/82243","x":136280,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7464534.433178101],[796320.9605641179,7464687.3072346505],[796473.8346206658,7464687.3072346505],[796473.8346206658,7464534.433178101],[796320.9605641179,7464534.433178101]]],"type":"Polygon"},"properties":{"label":"18/136281/82243","x":136281,"y":82243,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7464687.3072346505],[796473.8346206658,7464840.181291198],[796626.7086772174,7464840.181291198],[796626.7086772174,7464687.3072346505],[796473.8346206658,7464687.3072346505]]],"type":"Polygon"},"properties":{"label":"18/136282/82242","x":136282,"y":82242,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7464381.559121551],[796168.08650757,7464534.433178101],[796320.9605641179,7464534.433178101],[796320.9605641179,7464381.559121551],[796168.08650757,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136280/82244","x":136280,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7464381.559121551],[796320.9605641179,7464534.433178101],[796473.8346206658,7464534.433178101],[796473.8346206658,7464381.559121551],[796320.9605641179,7464381.559121551]]],"type":"Polygon"},"properties":{"label":"18/136281/82244","x":136281,"y":82244,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7464228.685065003],[796168.08650757,7464381.559121551],[796320.9605641179,7464381.559121551],[796320.9605641179,7464228.685065003],[796168.08650757,7464228.685065003]]],"type":"Polygon"},"properties":{"label":"18/136280/82245","x":136280,"y":82245,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7463770.062895356],[794945.0940551758,7463922.936951904],[795097.9681117237,7463922.936951904],[795097.9681117237,7463770.062895356],[794945.0940551758,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136272/82248","x":136272,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7463770.062895356],[795097.9681117237,7463922.936951904],[795250.8421682753,7463922.936951904],[795250.8421682753,7463770.062895356],[795097.9681117237,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136273/82248","x":136273,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7463617.188838806],[794945.0940551758,7463770.062895356],[795097.9681117237,7463770.062895356],[795097.9681117237,7463617.188838806],[794945.0940551758,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136272/82249","x":136272,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7463617.188838806],[795097.9681117237,7463770.062895356],[795250.8421682753,7463770.062895356],[795250.8421682753,7463617.188838806],[795097.9681117237,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136273/82249","x":136273,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7463770.062895356],[795250.8421682753,7463922.936951904],[795403.7162248231,7463922.936951904],[795403.7162248231,7463770.062895356],[795250.8421682753,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136274/82248","x":136274,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7463770.062895356],[795403.7162248231,7463922.936951904],[795556.590281371,7463922.936951904],[795556.590281371,7463770.062895356],[795403.7162248231,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136275/82248","x":136275,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7463617.188838806],[795250.8421682753,7463770.062895356],[795403.7162248231,7463770.062895356],[795403.7162248231,7463617.188838806],[795250.8421682753,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136274/82249","x":136274,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7463617.188838806],[795403.7162248231,7463770.062895356],[795556.590281371,7463770.062895356],[795556.590281371,7463617.188838806],[795403.7162248231,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136275/82249","x":136275,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7463464.314782256],[794945.0940551758,7463617.188838806],[795097.9681117237,7463617.188838806],[795097.9681117237,7463464.314782256],[794945.0940551758,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136272/82250","x":136272,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7463464.314782256],[795097.9681117237,7463617.188838806],[795250.8421682753,7463617.188838806],[795250.8421682753,7463464.314782256],[795097.9681117237,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136273/82250","x":136273,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7463311.440725708],[794945.0940551758,7463464.314782256],[795097.9681117237,7463464.314782256],[795097.9681117237,7463311.440725708],[794945.0940551758,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136272/82251","x":136272,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7463311.440725708],[795097.9681117237,7463464.314782256],[795250.8421682753,7463464.314782256],[795250.8421682753,7463311.440725708],[795097.9681117237,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136273/82251","x":136273,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7463464.314782256],[795250.8421682753,7463617.188838806],[795403.7162248231,7463617.188838806],[795403.7162248231,7463464.314782256],[795250.8421682753,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136274/82250","x":136274,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7463464.314782256],[795403.7162248231,7463617.188838806],[795556.590281371,7463617.188838806],[795556.590281371,7463464.314782256],[795403.7162248231,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136275/82250","x":136275,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7463311.440725708],[795250.8421682753,7463464.314782256],[795403.7162248231,7463464.314782256],[795403.7162248231,7463311.440725708],[795250.8421682753,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136274/82251","x":136274,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7463311.440725708],[795403.7162248231,7463464.314782256],[795556.590281371,7463464.314782256],[795556.590281371,7463311.440725708],[795403.7162248231,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136275/82251","x":136275,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7463770.062895356],[795556.590281371,7463922.936951904],[795709.4643379226,7463922.936951904],[795709.4643379226,7463770.062895356],[795556.590281371,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136276/82248","x":136276,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7463770.062895356],[795709.4643379226,7463922.936951904],[795862.3383944705,7463922.936951904],[795862.3383944705,7463770.062895356],[795709.4643379226,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136277/82248","x":136277,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7463617.188838806],[795556.590281371,7463770.062895356],[795709.4643379226,7463770.062895356],[795709.4643379226,7463617.188838806],[795556.590281371,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136276/82249","x":136276,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7463617.188838806],[795709.4643379226,7463770.062895356],[795862.3383944705,7463770.062895356],[795862.3383944705,7463617.188838806],[795709.4643379226,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136277/82249","x":136277,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7463770.062895356],[795862.3383944705,7463922.936951904],[796015.2124510184,7463922.936951904],[796015.2124510184,7463770.062895356],[795862.3383944705,7463770.062895356]]],"type":"Polygon"},"properties":{"label":"18/136278/82248","x":136278,"y":82248,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7463617.188838806],[795862.3383944705,7463770.062895356],[796015.2124510184,7463770.062895356],[796015.2124510184,7463617.188838806],[795862.3383944705,7463617.188838806]]],"type":"Polygon"},"properties":{"label":"18/136278/82249","x":136278,"y":82249,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7463464.314782256],[795556.590281371,7463617.188838806],[795709.4643379226,7463617.188838806],[795709.4643379226,7463464.314782256],[795556.590281371,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136276/82250","x":136276,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7463464.314782256],[795709.4643379226,7463617.188838806],[795862.3383944705,7463617.188838806],[795862.3383944705,7463464.314782256],[795709.4643379226,7463464.314782256]]],"type":"Polygon"},"properties":{"label":"18/136277/82250","x":136277,"y":82250,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7463311.440725708],[795556.590281371,7463464.314782256],[795709.4643379226,7463464.314782256],[795709.4643379226,7463311.440725708],[795556.590281371,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136276/82251","x":136276,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7463311.440725708],[795709.4643379226,7463464.314782256],[795862.3383944705,7463464.314782256],[795862.3383944705,7463311.440725708],[795709.4643379226,7463311.440725708]]],"type":"Polygon"},"properties":{"label":"18/136277/82251","x":136277,"y":82251,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7463158.566669159],[794945.0940551758,7463311.440725708],[795097.9681117237,7463311.440725708],[795097.9681117237,7463158.566669159],[794945.0940551758,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136272/82252","x":136272,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7463158.566669159],[795097.9681117237,7463311.440725708],[795250.8421682753,7463311.440725708],[795250.8421682753,7463158.566669159],[795097.9681117237,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136273/82252","x":136273,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7463005.692612609],[794945.0940551758,7463158.566669159],[795097.9681117237,7463158.566669159],[795097.9681117237,7463005.692612609],[794945.0940551758,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136272/82253","x":136272,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7463005.692612609],[795097.9681117237,7463158.566669159],[795250.8421682753,7463158.566669159],[795250.8421682753,7463005.692612609],[795097.9681117237,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136273/82253","x":136273,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7463158.566669159],[795250.8421682753,7463311.440725708],[795403.7162248231,7463311.440725708],[795403.7162248231,7463158.566669159],[795250.8421682753,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136274/82252","x":136274,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7463158.566669159],[795403.7162248231,7463311.440725708],[795556.590281371,7463311.440725708],[795556.590281371,7463158.566669159],[795403.7162248231,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136275/82252","x":136275,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7463005.692612609],[795250.8421682753,7463158.566669159],[795403.7162248231,7463158.566669159],[795403.7162248231,7463005.692612609],[795250.8421682753,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136274/82253","x":136274,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7463005.692612609],[795403.7162248231,7463158.566669159],[795556.590281371,7463158.566669159],[795556.590281371,7463005.692612609],[795403.7162248231,7463005.692612609]]],"type":"Polygon"},"properties":{"label":"18/136275/82253","x":136275,"y":82253,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7462852.818556061],[794945.0940551758,7463005.692612609],[795097.9681117237,7463005.692612609],[795097.9681117237,7462852.818556061],[794945.0940551758,7462852.818556061]]],"type":"Polygon"},"properties":{"label":"18/136272/82254","x":136272,"y":82254,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7462852.818556061],[795097.9681117237,7463005.692612609],[795250.8421682753,7463005.692612609],[795250.8421682753,7462852.818556061],[795097.9681117237,7462852.818556061]]],"type":"Polygon"},"properties":{"label":"18/136273/82254","x":136273,"y":82254,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7462699.944499511],[794945.0940551758,7462852.818556061],[795097.9681117237,7462852.818556061],[795097.9681117237,7462699.944499511],[794945.0940551758,7462699.944499511]]],"type":"Polygon"},"properties":{"label":"18/136272/82255","x":136272,"y":82255,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7462699.944499511],[795097.9681117237,7462852.818556061],[795250.8421682753,7462852.818556061],[795250.8421682753,7462699.944499511],[795097.9681117237,7462699.944499511]]],"type":"Polygon"},"properties":{"label":"18/136273/82255","x":136273,"y":82255,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7462852.818556061],[795250.8421682753,7463005.692612609],[795403.7162248231,7463005.692612609],[795403.7162248231,7462852.818556061],[795250.8421682753,7462852.818556061]]],"type":"Polygon"},"properties":{"label":"18/136274/82254","x":136274,"y":82254,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7462852.818556061],[795403.7162248231,7463005.692612609],[795556.590281371,7463005.692612609],[795556.590281371,7462852.818556061],[795403.7162248231,7462852.818556061]]],"type":"Polygon"},"properties":{"label":"18/136275/82254","x":136275,"y":82254,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7462699.944499511],[795250.8421682753,7462852.818556061],[795403.7162248231,7462852.818556061],[795403.7162248231,7462699.944499511],[795250.8421682753,7462699.944499511]]],"type":"Polygon"},"properties":{"label":"18/136274/82255","x":136274,"y":82255,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7463158.566669159],[795556.590281371,7463311.440725708],[795709.4643379226,7463311.440725708],[795709.4643379226,7463158.566669159],[795556.590281371,7463158.566669159]]],"type":"Polygon"},"properties":{"label":"18/136276/82252","x":136276,"y":82252,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7461476.952047119],[792499.1091503911,7461629.826103669],[792651.983206939,7461629.826103669],[792651.983206939,7461476.952047119],[792499.1091503911,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136256/82263","x":136256,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7461476.952047119],[792651.983206939,7461629.826103669],[792804.8572634906,7461629.826103669],[792804.8572634906,7461476.952047119],[792651.983206939,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136257/82263","x":136257,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7461476.952047119],[792804.8572634906,7461629.826103669],[792957.7313200384,7461629.826103669],[792957.7313200384,7461476.952047119],[792804.8572634906,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136258/82263","x":136258,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7461476.952047119],[792957.7313200384,7461629.826103669],[793110.6053765863,7461629.826103669],[793110.6053765863,7461476.952047119],[792957.7313200384,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136259/82263","x":136259,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7461476.952047119],[793110.6053765863,7461629.826103669],[793263.4794331342,7461629.826103669],[793263.4794331342,7461476.952047119],[793110.6053765863,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136260/82263","x":136260,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7461476.952047119],[793263.4794331342,7461629.826103669],[793416.3534896858,7461629.826103669],[793416.3534896858,7461476.952047119],[793263.4794331342,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136261/82263","x":136261,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7461476.952047119],[793416.3534896858,7461629.826103669],[793569.2275462337,7461629.826103669],[793569.2275462337,7461476.952047119],[793416.3534896858,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136262/82263","x":136262,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7461476.952047119],[793569.2275462337,7461629.826103669],[793722.1016027816,7461629.826103669],[793722.1016027816,7461476.952047119],[793569.2275462337,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136263/82263","x":136263,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7462547.070442963],[794792.2199986279,7462699.944499511],[794945.0940551758,7462699.944499511],[794945.0940551758,7462547.070442963],[794792.2199986279,7462547.070442963]]],"type":"Polygon"},"properties":{"label":"18/136271/82256","x":136271,"y":82256,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7461476.952047119],[793722.1016027816,7461629.826103669],[793874.9756593332,7461629.826103669],[793874.9756593332,7461476.952047119],[793722.1016027816,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136264/82263","x":136264,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7461476.952047119],[793874.9756593332,7461629.826103669],[794027.849715881,7461629.826103669],[794027.849715881,7461476.952047119],[793874.9756593332,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136265/82263","x":136265,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7461476.952047119],[794027.849715881,7461629.826103669],[794180.7237724289,7461629.826103669],[794180.7237724289,7461476.952047119],[794027.849715881,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136266/82263","x":136266,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7461476.952047119],[794180.7237724289,7461629.826103669],[794333.5978289805,7461629.826103669],[794333.5978289805,7461476.952047119],[794180.7237724289,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136267/82263","x":136267,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7461476.952047119],[794333.5978289805,7461629.826103669],[794486.4718855284,7461629.826103669],[794486.4718855284,7461476.952047119],[794333.5978289805,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136268/82263","x":136268,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7461476.952047119],[794486.4718855284,7461629.826103669],[794639.3459420763,7461629.826103669],[794639.3459420763,7461476.952047119],[794486.4718855284,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136269/82263","x":136269,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7461476.952047119],[794639.3459420763,7461629.826103669],[794792.2199986279,7461629.826103669],[794792.2199986279,7461476.952047119],[794639.3459420763,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136270/82263","x":136270,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7461476.952047119],[794792.2199986279,7461629.826103669],[794945.0940551758,7461629.826103669],[794945.0940551758,7461476.952047119],[794792.2199986279,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136271/82263","x":136271,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7461324.077990569],[792499.1091503911,7461476.952047119],[792651.983206939,7461476.952047119],[792651.983206939,7461324.077990569],[792499.1091503911,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136256/82264","x":136256,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7461324.077990569],[792651.983206939,7461476.952047119],[792804.8572634906,7461476.952047119],[792804.8572634906,7461324.077990569],[792651.983206939,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136257/82264","x":136257,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7461171.203934021],[792499.1091503911,7461324.077990569],[792651.983206939,7461324.077990569],[792651.983206939,7461171.203934021],[792499.1091503911,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136256/82265","x":136256,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7461171.203934021],[792651.983206939,7461324.077990569],[792804.8572634906,7461324.077990569],[792804.8572634906,7461171.203934021],[792651.983206939,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136257/82265","x":136257,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7461324.077990569],[792804.8572634906,7461476.952047119],[792957.7313200384,7461476.952047119],[792957.7313200384,7461324.077990569],[792804.8572634906,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136258/82264","x":136258,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7461324.077990569],[792957.7313200384,7461476.952047119],[793110.6053765863,7461476.952047119],[793110.6053765863,7461324.077990569],[792957.7313200384,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136259/82264","x":136259,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7461171.203934021],[792804.8572634906,7461324.077990569],[792957.7313200384,7461324.077990569],[792957.7313200384,7461171.203934021],[792804.8572634906,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136258/82265","x":136258,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7461171.203934021],[792957.7313200384,7461324.077990569],[793110.6053765863,7461324.077990569],[793110.6053765863,7461171.203934021],[792957.7313200384,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136259/82265","x":136259,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7461018.329877472],[792499.1091503911,7461171.203934021],[792651.983206939,7461171.203934021],[792651.983206939,7461018.329877472],[792499.1091503911,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136256/82266","x":136256,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7461018.329877472],[792651.983206939,7461171.203934021],[792804.8572634906,7461171.203934021],[792804.8572634906,7461018.329877472],[792651.983206939,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136257/82266","x":136257,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7460865.455820924],[792499.1091503911,7461018.329877472],[792651.983206939,7461018.329877472],[792651.983206939,7460865.455820924],[792499.1091503911,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136256/82267","x":136256,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7460865.455820924],[792651.983206939,7461018.329877472],[792804.8572634906,7461018.329877472],[792804.8572634906,7460865.455820924],[792651.983206939,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136257/82267","x":136257,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7461018.329877472],[792804.8572634906,7461171.203934021],[792957.7313200384,7461171.203934021],[792957.7313200384,7461018.329877472],[792804.8572634906,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136258/82266","x":136258,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7461018.329877472],[792957.7313200384,7461171.203934021],[793110.6053765863,7461171.203934021],[793110.6053765863,7461018.329877472],[792957.7313200384,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136259/82266","x":136259,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7460865.455820924],[792804.8572634906,7461018.329877472],[792957.7313200384,7461018.329877472],[792957.7313200384,7460865.455820924],[792804.8572634906,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136258/82267","x":136258,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7460865.455820924],[792957.7313200384,7461018.329877472],[793110.6053765863,7461018.329877472],[793110.6053765863,7460865.455820924],[792957.7313200384,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136259/82267","x":136259,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7461324.077990569],[793110.6053765863,7461476.952047119],[793263.4794331342,7461476.952047119],[793263.4794331342,7461324.077990569],[793110.6053765863,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136260/82264","x":136260,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7461324.077990569],[793263.4794331342,7461476.952047119],[793416.3534896858,7461476.952047119],[793416.3534896858,7461324.077990569],[793263.4794331342,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136261/82264","x":136261,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7461171.203934021],[793110.6053765863,7461324.077990569],[793263.4794331342,7461324.077990569],[793263.4794331342,7461171.203934021],[793110.6053765863,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136260/82265","x":136260,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7461171.203934021],[793263.4794331342,7461324.077990569],[793416.3534896858,7461324.077990569],[793416.3534896858,7461171.203934021],[793263.4794331342,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136261/82265","x":136261,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7461324.077990569],[793416.3534896858,7461476.952047119],[793569.2275462337,7461476.952047119],[793569.2275462337,7461324.077990569],[793416.3534896858,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136262/82264","x":136262,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7461324.077990569],[793569.2275462337,7461476.952047119],[793722.1016027816,7461476.952047119],[793722.1016027816,7461324.077990569],[793569.2275462337,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136263/82264","x":136263,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7461171.203934021],[793416.3534896858,7461324.077990569],[793569.2275462337,7461324.077990569],[793569.2275462337,7461171.203934021],[793416.3534896858,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136262/82265","x":136262,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7461171.203934021],[793569.2275462337,7461324.077990569],[793722.1016027816,7461324.077990569],[793722.1016027816,7461171.203934021],[793569.2275462337,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136263/82265","x":136263,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7461018.329877472],[793110.6053765863,7461171.203934021],[793263.4794331342,7461171.203934021],[793263.4794331342,7461018.329877472],[793110.6053765863,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136260/82266","x":136260,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7461018.329877472],[793263.4794331342,7461171.203934021],[793416.3534896858,7461171.203934021],[793416.3534896858,7461018.329877472],[793263.4794331342,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136261/82266","x":136261,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7460865.455820924],[793110.6053765863,7461018.329877472],[793263.4794331342,7461018.329877472],[793263.4794331342,7460865.455820924],[793110.6053765863,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136260/82267","x":136260,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7460865.455820924],[793263.4794331342,7461018.329877472],[793416.3534896858,7461018.329877472],[793416.3534896858,7460865.455820924],[793263.4794331342,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136261/82267","x":136261,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7461018.329877472],[793416.3534896858,7461171.203934021],[793569.2275462337,7461171.203934021],[793569.2275462337,7461018.329877472],[793416.3534896858,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136262/82266","x":136262,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7461018.329877472],[793569.2275462337,7461171.203934021],[793722.1016027816,7461171.203934021],[793722.1016027816,7461018.329877472],[793569.2275462337,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136263/82266","x":136263,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7460865.455820924],[793416.3534896858,7461018.329877472],[793569.2275462337,7461018.329877472],[793569.2275462337,7460865.455820924],[793416.3534896858,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136262/82267","x":136262,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7460865.455820924],[793569.2275462337,7461018.329877472],[793722.1016027816,7461018.329877472],[793722.1016027816,7460865.455820924],[793569.2275462337,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136263/82267","x":136263,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7460712.581764374],[792499.1091503911,7460865.455820924],[792651.983206939,7460865.455820924],[792651.983206939,7460712.581764374],[792499.1091503911,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136256/82268","x":136256,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7460712.581764374],[792651.983206939,7460865.455820924],[792804.8572634906,7460865.455820924],[792804.8572634906,7460712.581764374],[792651.983206939,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136257/82268","x":136257,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7460559.707707824],[792499.1091503911,7460712.581764374],[792651.983206939,7460712.581764374],[792651.983206939,7460559.707707824],[792499.1091503911,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136256/82269","x":136256,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7460559.707707824],[792651.983206939,7460712.581764374],[792804.8572634906,7460712.581764374],[792804.8572634906,7460559.707707824],[792651.983206939,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136257/82269","x":136257,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7460712.581764374],[792804.8572634906,7460865.455820924],[792957.7313200384,7460865.455820924],[792957.7313200384,7460712.581764374],[792804.8572634906,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136258/82268","x":136258,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7460712.581764374],[792957.7313200384,7460865.455820924],[793110.6053765863,7460865.455820924],[793110.6053765863,7460712.581764374],[792957.7313200384,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136259/82268","x":136259,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7460559.707707824],[792804.8572634906,7460712.581764374],[792957.7313200384,7460712.581764374],[792957.7313200384,7460559.707707824],[792804.8572634906,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136258/82269","x":136258,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7460559.707707824],[792957.7313200384,7460712.581764374],[793110.6053765863,7460712.581764374],[793110.6053765863,7460559.707707824],[792957.7313200384,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136259/82269","x":136259,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7460406.833651276],[792499.1091503911,7460559.707707824],[792651.983206939,7460559.707707824],[792651.983206939,7460406.833651276],[792499.1091503911,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136256/82270","x":136256,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7460406.833651276],[792651.983206939,7460559.707707824],[792804.8572634906,7460559.707707824],[792804.8572634906,7460406.833651276],[792651.983206939,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136257/82270","x":136257,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7460253.959594727],[792499.1091503911,7460406.833651276],[792651.983206939,7460406.833651276],[792651.983206939,7460253.959594727],[792499.1091503911,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136256/82271","x":136256,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7460253.959594727],[792651.983206939,7460406.833651276],[792804.8572634906,7460406.833651276],[792804.8572634906,7460253.959594727],[792651.983206939,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136257/82271","x":136257,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7460406.833651276],[792804.8572634906,7460559.707707824],[792957.7313200384,7460559.707707824],[792957.7313200384,7460406.833651276],[792804.8572634906,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136258/82270","x":136258,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7460406.833651276],[792957.7313200384,7460559.707707824],[793110.6053765863,7460559.707707824],[793110.6053765863,7460406.833651276],[792957.7313200384,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136259/82270","x":136259,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7460253.959594727],[792804.8572634906,7460406.833651276],[792957.7313200384,7460406.833651276],[792957.7313200384,7460253.959594727],[792804.8572634906,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136258/82271","x":136258,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7460253.959594727],[792957.7313200384,7460406.833651276],[793110.6053765863,7460406.833651276],[793110.6053765863,7460253.959594727],[792957.7313200384,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136259/82271","x":136259,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7460712.581764374],[793110.6053765863,7460865.455820924],[793263.4794331342,7460865.455820924],[793263.4794331342,7460712.581764374],[793110.6053765863,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136260/82268","x":136260,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7460712.581764374],[793263.4794331342,7460865.455820924],[793416.3534896858,7460865.455820924],[793416.3534896858,7460712.581764374],[793263.4794331342,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136261/82268","x":136261,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7460559.707707824],[793110.6053765863,7460712.581764374],[793263.4794331342,7460712.581764374],[793263.4794331342,7460559.707707824],[793110.6053765863,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136260/82269","x":136260,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7460559.707707824],[793263.4794331342,7460712.581764374],[793416.3534896858,7460712.581764374],[793416.3534896858,7460559.707707824],[793263.4794331342,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136261/82269","x":136261,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7460712.581764374],[793416.3534896858,7460865.455820924],[793569.2275462337,7460865.455820924],[793569.2275462337,7460712.581764374],[793416.3534896858,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136262/82268","x":136262,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7460712.581764374],[793569.2275462337,7460865.455820924],[793722.1016027816,7460865.455820924],[793722.1016027816,7460712.581764374],[793569.2275462337,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136263/82268","x":136263,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7460559.707707824],[793416.3534896858,7460712.581764374],[793569.2275462337,7460712.581764374],[793569.2275462337,7460559.707707824],[793416.3534896858,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136262/82269","x":136262,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7460559.707707824],[793569.2275462337,7460712.581764374],[793722.1016027816,7460712.581764374],[793722.1016027816,7460559.707707824],[793569.2275462337,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136263/82269","x":136263,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7460406.833651276],[793110.6053765863,7460559.707707824],[793263.4794331342,7460559.707707824],[793263.4794331342,7460406.833651276],[793110.6053765863,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136260/82270","x":136260,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7460406.833651276],[793263.4794331342,7460559.707707824],[793416.3534896858,7460559.707707824],[793416.3534896858,7460406.833651276],[793263.4794331342,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136261/82270","x":136261,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7460253.959594727],[793110.6053765863,7460406.833651276],[793263.4794331342,7460406.833651276],[793263.4794331342,7460253.959594727],[793110.6053765863,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136260/82271","x":136260,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7460253.959594727],[793263.4794331342,7460406.833651276],[793416.3534896858,7460406.833651276],[793416.3534896858,7460253.959594727],[793263.4794331342,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136261/82271","x":136261,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7460406.833651276],[793416.3534896858,7460559.707707824],[793569.2275462337,7460559.707707824],[793569.2275462337,7460406.833651276],[793416.3534896858,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136262/82270","x":136262,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7460406.833651276],[793569.2275462337,7460559.707707824],[793722.1016027816,7460559.707707824],[793722.1016027816,7460406.833651276],[793569.2275462337,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136263/82270","x":136263,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7460253.959594727],[793416.3534896858,7460406.833651276],[793569.2275462337,7460406.833651276],[793569.2275462337,7460253.959594727],[793416.3534896858,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136262/82271","x":136262,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7460253.959594727],[793569.2275462337,7460406.833651276],[793722.1016027816,7460406.833651276],[793722.1016027816,7460253.959594727],[793569.2275462337,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136263/82271","x":136263,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7461324.077990569],[793722.1016027816,7461476.952047119],[793874.9756593332,7461476.952047119],[793874.9756593332,7461324.077990569],[793722.1016027816,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136264/82264","x":136264,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7461324.077990569],[793874.9756593332,7461476.952047119],[794027.849715881,7461476.952047119],[794027.849715881,7461324.077990569],[793874.9756593332,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136265/82264","x":136265,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7461171.203934021],[793722.1016027816,7461324.077990569],[793874.9756593332,7461324.077990569],[793874.9756593332,7461171.203934021],[793722.1016027816,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136264/82265","x":136264,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7461171.203934021],[793874.9756593332,7461324.077990569],[794027.849715881,7461324.077990569],[794027.849715881,7461171.203934021],[793874.9756593332,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136265/82265","x":136265,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7461324.077990569],[794027.849715881,7461476.952047119],[794180.7237724289,7461476.952047119],[794180.7237724289,7461324.077990569],[794027.849715881,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136266/82264","x":136266,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7461324.077990569],[794180.7237724289,7461476.952047119],[794333.5978289805,7461476.952047119],[794333.5978289805,7461324.077990569],[794180.7237724289,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136267/82264","x":136267,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7461171.203934021],[794027.849715881,7461324.077990569],[794180.7237724289,7461324.077990569],[794180.7237724289,7461171.203934021],[794027.849715881,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136266/82265","x":136266,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7461171.203934021],[794180.7237724289,7461324.077990569],[794333.5978289805,7461324.077990569],[794333.5978289805,7461171.203934021],[794180.7237724289,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136267/82265","x":136267,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7461018.329877472],[793722.1016027816,7461171.203934021],[793874.9756593332,7461171.203934021],[793874.9756593332,7461018.329877472],[793722.1016027816,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136264/82266","x":136264,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7461018.329877472],[793874.9756593332,7461171.203934021],[794027.849715881,7461171.203934021],[794027.849715881,7461018.329877472],[793874.9756593332,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136265/82266","x":136265,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7460865.455820924],[793722.1016027816,7461018.329877472],[793874.9756593332,7461018.329877472],[793874.9756593332,7460865.455820924],[793722.1016027816,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136264/82267","x":136264,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7460865.455820924],[793874.9756593332,7461018.329877472],[794027.849715881,7461018.329877472],[794027.849715881,7460865.455820924],[793874.9756593332,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136265/82267","x":136265,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7461018.329877472],[794027.849715881,7461171.203934021],[794180.7237724289,7461171.203934021],[794180.7237724289,7461018.329877472],[794027.849715881,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136266/82266","x":136266,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7461018.329877472],[794180.7237724289,7461171.203934021],[794333.5978289805,7461171.203934021],[794333.5978289805,7461018.329877472],[794180.7237724289,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136267/82266","x":136267,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7460865.455820924],[794027.849715881,7461018.329877472],[794180.7237724289,7461018.329877472],[794180.7237724289,7460865.455820924],[794027.849715881,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136266/82267","x":136266,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7460865.455820924],[794180.7237724289,7461018.329877472],[794333.5978289805,7461018.329877472],[794333.5978289805,7460865.455820924],[794180.7237724289,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136267/82267","x":136267,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7461324.077990569],[794333.5978289805,7461476.952047119],[794486.4718855284,7461476.952047119],[794486.4718855284,7461324.077990569],[794333.5978289805,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136268/82264","x":136268,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7461324.077990569],[794486.4718855284,7461476.952047119],[794639.3459420763,7461476.952047119],[794639.3459420763,7461324.077990569],[794486.4718855284,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136269/82264","x":136269,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7461171.203934021],[794333.5978289805,7461324.077990569],[794486.4718855284,7461324.077990569],[794486.4718855284,7461171.203934021],[794333.5978289805,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136268/82265","x":136268,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7461171.203934021],[794486.4718855284,7461324.077990569],[794639.3459420763,7461324.077990569],[794639.3459420763,7461171.203934021],[794486.4718855284,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136269/82265","x":136269,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7461324.077990569],[794639.3459420763,7461476.952047119],[794792.2199986279,7461476.952047119],[794792.2199986279,7461324.077990569],[794639.3459420763,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136270/82264","x":136270,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7461324.077990569],[794792.2199986279,7461476.952047119],[794945.0940551758,7461476.952047119],[794945.0940551758,7461324.077990569],[794792.2199986279,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136271/82264","x":136271,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7461171.203934021],[794639.3459420763,7461324.077990569],[794792.2199986279,7461324.077990569],[794792.2199986279,7461171.203934021],[794639.3459420763,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136270/82265","x":136270,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7461171.203934021],[794792.2199986279,7461324.077990569],[794945.0940551758,7461324.077990569],[794945.0940551758,7461171.203934021],[794792.2199986279,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136271/82265","x":136271,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7461018.329877472],[794333.5978289805,7461171.203934021],[794486.4718855284,7461171.203934021],[794486.4718855284,7461018.329877472],[794333.5978289805,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136268/82266","x":136268,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7461018.329877472],[794486.4718855284,7461171.203934021],[794639.3459420763,7461171.203934021],[794639.3459420763,7461018.329877472],[794486.4718855284,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136269/82266","x":136269,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7460865.455820924],[794333.5978289805,7461018.329877472],[794486.4718855284,7461018.329877472],[794486.4718855284,7460865.455820924],[794333.5978289805,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136268/82267","x":136268,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7460865.455820924],[794486.4718855284,7461018.329877472],[794639.3459420763,7461018.329877472],[794639.3459420763,7460865.455820924],[794486.4718855284,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136269/82267","x":136269,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7461018.329877472],[794639.3459420763,7461171.203934021],[794792.2199986279,7461171.203934021],[794792.2199986279,7461018.329877472],[794639.3459420763,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136270/82266","x":136270,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7461018.329877472],[794792.2199986279,7461171.203934021],[794945.0940551758,7461171.203934021],[794945.0940551758,7461018.329877472],[794792.2199986279,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136271/82266","x":136271,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7460865.455820924],[794639.3459420763,7461018.329877472],[794792.2199986279,7461018.329877472],[794792.2199986279,7460865.455820924],[794639.3459420763,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136270/82267","x":136270,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7460865.455820924],[794792.2199986279,7461018.329877472],[794945.0940551758,7461018.329877472],[794945.0940551758,7460865.455820924],[794792.2199986279,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136271/82267","x":136271,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7460712.581764374],[793722.1016027816,7460865.455820924],[793874.9756593332,7460865.455820924],[793874.9756593332,7460712.581764374],[793722.1016027816,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136264/82268","x":136264,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7460712.581764374],[793874.9756593332,7460865.455820924],[794027.849715881,7460865.455820924],[794027.849715881,7460712.581764374],[793874.9756593332,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136265/82268","x":136265,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7460559.707707824],[793722.1016027816,7460712.581764374],[793874.9756593332,7460712.581764374],[793874.9756593332,7460559.707707824],[793722.1016027816,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136264/82269","x":136264,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7460559.707707824],[793874.9756593332,7460712.581764374],[794027.849715881,7460712.581764374],[794027.849715881,7460559.707707824],[793874.9756593332,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136265/82269","x":136265,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7460712.581764374],[794027.849715881,7460865.455820924],[794180.7237724289,7460865.455820924],[794180.7237724289,7460712.581764374],[794027.849715881,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136266/82268","x":136266,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7460712.581764374],[794180.7237724289,7460865.455820924],[794333.5978289805,7460865.455820924],[794333.5978289805,7460712.581764374],[794180.7237724289,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136267/82268","x":136267,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7460406.833651276],[793722.1016027816,7460559.707707824],[793874.9756593332,7460559.707707824],[793874.9756593332,7460406.833651276],[793722.1016027816,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136264/82270","x":136264,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7460712.581764374],[794333.5978289805,7460865.455820924],[794486.4718855284,7460865.455820924],[794486.4718855284,7460712.581764374],[794333.5978289805,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136268/82268","x":136268,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7460712.581764374],[794486.4718855284,7460865.455820924],[794639.3459420763,7460865.455820924],[794639.3459420763,7460712.581764374],[794486.4718855284,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136269/82268","x":136269,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7460712.581764374],[794639.3459420763,7460865.455820924],[794792.2199986279,7460865.455820924],[794792.2199986279,7460712.581764374],[794639.3459420763,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136270/82268","x":136270,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7460712.581764374],[794792.2199986279,7460865.455820924],[794945.0940551758,7460865.455820924],[794945.0940551758,7460712.581764374],[794792.2199986279,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136271/82268","x":136271,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7462547.070442963],[794945.0940551758,7462699.944499511],[795097.9681117237,7462699.944499511],[795097.9681117237,7462547.070442963],[794945.0940551758,7462547.070442963]]],"type":"Polygon"},"properties":{"label":"18/136272/82256","x":136272,"y":82256,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7462547.070442963],[795097.9681117237,7462699.944499511],[795250.8421682753,7462699.944499511],[795250.8421682753,7462547.070442963],[795097.9681117237,7462547.070442963]]],"type":"Polygon"},"properties":{"label":"18/136273/82256","x":136273,"y":82256,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7461476.952047119],[794945.0940551758,7461629.826103669],[795097.9681117237,7461629.826103669],[795097.9681117237,7461476.952047119],[794945.0940551758,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136272/82263","x":136272,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7461476.952047119],[795097.9681117237,7461629.826103669],[795250.8421682753,7461629.826103669],[795250.8421682753,7461476.952047119],[795097.9681117237,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136273/82263","x":136273,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7461476.952047119],[795250.8421682753,7461629.826103669],[795403.7162248231,7461629.826103669],[795403.7162248231,7461476.952047119],[795250.8421682753,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136274/82263","x":136274,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7461476.952047119],[795403.7162248231,7461629.826103669],[795556.590281371,7461629.826103669],[795556.590281371,7461476.952047119],[795403.7162248231,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136275/82263","x":136275,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7461476.952047119],[795556.590281371,7461629.826103669],[795709.4643379226,7461629.826103669],[795709.4643379226,7461476.952047119],[795556.590281371,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136276/82263","x":136276,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7461476.952047119],[795709.4643379226,7461629.826103669],[795862.3383944705,7461629.826103669],[795862.3383944705,7461476.952047119],[795709.4643379226,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136277/82263","x":136277,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7461476.952047119],[795862.3383944705,7461629.826103669],[796015.2124510184,7461629.826103669],[796015.2124510184,7461476.952047119],[795862.3383944705,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136278/82263","x":136278,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7461476.952047119],[796015.2124510184,7461629.826103669],[796168.08650757,7461629.826103669],[796168.08650757,7461476.952047119],[796015.2124510184,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136279/82263","x":136279,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7461476.952047119],[796168.08650757,7461629.826103669],[796320.9605641179,7461629.826103669],[796320.9605641179,7461476.952047119],[796168.08650757,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136280/82263","x":136280,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7461476.952047119],[796320.9605641179,7461629.826103669],[796473.8346206658,7461629.826103669],[796473.8346206658,7461476.952047119],[796320.9605641179,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136281/82263","x":136281,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7461476.952047119],[796473.8346206658,7461629.826103669],[796626.7086772174,7461629.826103669],[796626.7086772174,7461476.952047119],[796473.8346206658,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136282/82263","x":136282,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7461476.952047119],[796626.7086772174,7461629.826103669],[796779.5827337652,7461629.826103669],[796779.5827337652,7461476.952047119],[796626.7086772174,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136283/82263","x":136283,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7461476.952047119],[796779.5827337652,7461629.826103669],[796932.4567903131,7461629.826103669],[796932.4567903131,7461476.952047119],[796779.5827337652,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136284/82263","x":136284,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7461476.952047119],[796932.4567903131,7461629.826103669],[797085.330846861,7461629.826103669],[797085.330846861,7461476.952047119],[796932.4567903131,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136285/82263","x":136285,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7461476.952047119],[797085.330846861,7461629.826103669],[797238.2049034126,7461629.826103669],[797238.2049034126,7461476.952047119],[797085.330846861,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136286/82263","x":136286,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7461476.952047119],[797238.2049034126,7461629.826103669],[797391.0789599605,7461629.826103669],[797391.0789599605,7461476.952047119],[797238.2049034126,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136287/82263","x":136287,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7461324.077990569],[794945.0940551758,7461476.952047119],[795097.9681117237,7461476.952047119],[795097.9681117237,7461324.077990569],[794945.0940551758,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136272/82264","x":136272,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7461324.077990569],[795097.9681117237,7461476.952047119],[795250.8421682753,7461476.952047119],[795250.8421682753,7461324.077990569],[795097.9681117237,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136273/82264","x":136273,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7461171.203934021],[794945.0940551758,7461324.077990569],[795097.9681117237,7461324.077990569],[795097.9681117237,7461171.203934021],[794945.0940551758,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136272/82265","x":136272,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7461171.203934021],[795097.9681117237,7461324.077990569],[795250.8421682753,7461324.077990569],[795250.8421682753,7461171.203934021],[795097.9681117237,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136273/82265","x":136273,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7461324.077990569],[795250.8421682753,7461476.952047119],[795403.7162248231,7461476.952047119],[795403.7162248231,7461324.077990569],[795250.8421682753,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136274/82264","x":136274,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7461324.077990569],[795403.7162248231,7461476.952047119],[795556.590281371,7461476.952047119],[795556.590281371,7461324.077990569],[795403.7162248231,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136275/82264","x":136275,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7461171.203934021],[795250.8421682753,7461324.077990569],[795403.7162248231,7461324.077990569],[795403.7162248231,7461171.203934021],[795250.8421682753,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136274/82265","x":136274,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7461171.203934021],[795403.7162248231,7461324.077990569],[795556.590281371,7461324.077990569],[795556.590281371,7461171.203934021],[795403.7162248231,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136275/82265","x":136275,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7461018.329877472],[794945.0940551758,7461171.203934021],[795097.9681117237,7461171.203934021],[795097.9681117237,7461018.329877472],[794945.0940551758,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136272/82266","x":136272,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7461018.329877472],[795097.9681117237,7461171.203934021],[795250.8421682753,7461171.203934021],[795250.8421682753,7461018.329877472],[795097.9681117237,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136273/82266","x":136273,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7460865.455820924],[794945.0940551758,7461018.329877472],[795097.9681117237,7461018.329877472],[795097.9681117237,7460865.455820924],[794945.0940551758,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136272/82267","x":136272,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7460865.455820924],[795097.9681117237,7461018.329877472],[795250.8421682753,7461018.329877472],[795250.8421682753,7460865.455820924],[795097.9681117237,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136273/82267","x":136273,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7461018.329877472],[795250.8421682753,7461171.203934021],[795403.7162248231,7461171.203934021],[795403.7162248231,7461018.329877472],[795250.8421682753,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136274/82266","x":136274,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7461018.329877472],[795403.7162248231,7461171.203934021],[795556.590281371,7461171.203934021],[795556.590281371,7461018.329877472],[795403.7162248231,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136275/82266","x":136275,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7460865.455820924],[795250.8421682753,7461018.329877472],[795403.7162248231,7461018.329877472],[795403.7162248231,7460865.455820924],[795250.8421682753,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136274/82267","x":136274,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7460865.455820924],[795403.7162248231,7461018.329877472],[795556.590281371,7461018.329877472],[795556.590281371,7460865.455820924],[795403.7162248231,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136275/82267","x":136275,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7461324.077990569],[795556.590281371,7461476.952047119],[795709.4643379226,7461476.952047119],[795709.4643379226,7461324.077990569],[795556.590281371,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136276/82264","x":136276,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7461324.077990569],[795709.4643379226,7461476.952047119],[795862.3383944705,7461476.952047119],[795862.3383944705,7461324.077990569],[795709.4643379226,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136277/82264","x":136277,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7461171.203934021],[795556.590281371,7461324.077990569],[795709.4643379226,7461324.077990569],[795709.4643379226,7461171.203934021],[795556.590281371,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136276/82265","x":136276,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7461171.203934021],[795709.4643379226,7461324.077990569],[795862.3383944705,7461324.077990569],[795862.3383944705,7461171.203934021],[795709.4643379226,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136277/82265","x":136277,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7461324.077990569],[795862.3383944705,7461476.952047119],[796015.2124510184,7461476.952047119],[796015.2124510184,7461324.077990569],[795862.3383944705,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136278/82264","x":136278,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7461324.077990569],[796015.2124510184,7461476.952047119],[796168.08650757,7461476.952047119],[796168.08650757,7461324.077990569],[796015.2124510184,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136279/82264","x":136279,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7461171.203934021],[795862.3383944705,7461324.077990569],[796015.2124510184,7461324.077990569],[796015.2124510184,7461171.203934021],[795862.3383944705,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136278/82265","x":136278,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7461171.203934021],[796015.2124510184,7461324.077990569],[796168.08650757,7461324.077990569],[796168.08650757,7461171.203934021],[796015.2124510184,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136279/82265","x":136279,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7461018.329877472],[795556.590281371,7461171.203934021],[795709.4643379226,7461171.203934021],[795709.4643379226,7461018.329877472],[795556.590281371,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136276/82266","x":136276,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7461018.329877472],[795709.4643379226,7461171.203934021],[795862.3383944705,7461171.203934021],[795862.3383944705,7461018.329877472],[795709.4643379226,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136277/82266","x":136277,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7460865.455820924],[795556.590281371,7461018.329877472],[795709.4643379226,7461018.329877472],[795709.4643379226,7460865.455820924],[795556.590281371,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136276/82267","x":136276,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7460865.455820924],[795709.4643379226,7461018.329877472],[795862.3383944705,7461018.329877472],[795862.3383944705,7460865.455820924],[795709.4643379226,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136277/82267","x":136277,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7461018.329877472],[795862.3383944705,7461171.203934021],[796015.2124510184,7461171.203934021],[796015.2124510184,7461018.329877472],[795862.3383944705,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136278/82266","x":136278,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7461018.329877472],[796015.2124510184,7461171.203934021],[796168.08650757,7461171.203934021],[796168.08650757,7461018.329877472],[796015.2124510184,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136279/82266","x":136279,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7460865.455820924],[795862.3383944705,7461018.329877472],[796015.2124510184,7461018.329877472],[796015.2124510184,7460865.455820924],[795862.3383944705,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136278/82267","x":136278,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7460865.455820924],[796015.2124510184,7461018.329877472],[796168.08650757,7461018.329877472],[796168.08650757,7460865.455820924],[796015.2124510184,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136279/82267","x":136279,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7460712.581764374],[794945.0940551758,7460865.455820924],[795097.9681117237,7460865.455820924],[795097.9681117237,7460712.581764374],[794945.0940551758,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136272/82268","x":136272,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7460712.581764374],[795097.9681117237,7460865.455820924],[795250.8421682753,7460865.455820924],[795250.8421682753,7460712.581764374],[795097.9681117237,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136273/82268","x":136273,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7460712.581764374],[795250.8421682753,7460865.455820924],[795403.7162248231,7460865.455820924],[795403.7162248231,7460712.581764374],[795250.8421682753,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136274/82268","x":136274,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7460712.581764374],[795403.7162248231,7460865.455820924],[795556.590281371,7460865.455820924],[795556.590281371,7460712.581764374],[795403.7162248231,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136275/82268","x":136275,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7460712.581764374],[795556.590281371,7460865.455820924],[795709.4643379226,7460865.455820924],[795709.4643379226,7460712.581764374],[795556.590281371,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136276/82268","x":136276,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7460712.581764374],[795709.4643379226,7460865.455820924],[795862.3383944705,7460865.455820924],[795862.3383944705,7460712.581764374],[795709.4643379226,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136277/82268","x":136277,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7460712.581764374],[795862.3383944705,7460865.455820924],[796015.2124510184,7460865.455820924],[796015.2124510184,7460712.581764374],[795862.3383944705,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136278/82268","x":136278,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7460712.581764374],[796015.2124510184,7460865.455820924],[796168.08650757,7460865.455820924],[796168.08650757,7460712.581764374],[796015.2124510184,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136279/82268","x":136279,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7460559.707707824],[796015.2124510184,7460712.581764374],[796168.08650757,7460712.581764374],[796168.08650757,7460559.707707824],[796015.2124510184,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136279/82269","x":136279,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7461324.077990569],[796168.08650757,7461476.952047119],[796320.9605641179,7461476.952047119],[796320.9605641179,7461324.077990569],[796168.08650757,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136280/82264","x":136280,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7461324.077990569],[796320.9605641179,7461476.952047119],[796473.8346206658,7461476.952047119],[796473.8346206658,7461324.077990569],[796320.9605641179,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136281/82264","x":136281,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7461171.203934021],[796168.08650757,7461324.077990569],[796320.9605641179,7461324.077990569],[796320.9605641179,7461171.203934021],[796168.08650757,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136280/82265","x":136280,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7461171.203934021],[796320.9605641179,7461324.077990569],[796473.8346206658,7461324.077990569],[796473.8346206658,7461171.203934021],[796320.9605641179,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136281/82265","x":136281,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7461324.077990569],[796473.8346206658,7461476.952047119],[796626.7086772174,7461476.952047119],[796626.7086772174,7461324.077990569],[796473.8346206658,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136282/82264","x":136282,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7461324.077990569],[796626.7086772174,7461476.952047119],[796779.5827337652,7461476.952047119],[796779.5827337652,7461324.077990569],[796626.7086772174,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136283/82264","x":136283,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7461171.203934021],[796473.8346206658,7461324.077990569],[796626.7086772174,7461324.077990569],[796626.7086772174,7461171.203934021],[796473.8346206658,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136282/82265","x":136282,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7461171.203934021],[796626.7086772174,7461324.077990569],[796779.5827337652,7461324.077990569],[796779.5827337652,7461171.203934021],[796626.7086772174,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136283/82265","x":136283,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7461018.329877472],[796168.08650757,7461171.203934021],[796320.9605641179,7461171.203934021],[796320.9605641179,7461018.329877472],[796168.08650757,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136280/82266","x":136280,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7461018.329877472],[796320.9605641179,7461171.203934021],[796473.8346206658,7461171.203934021],[796473.8346206658,7461018.329877472],[796320.9605641179,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136281/82266","x":136281,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7460865.455820924],[796168.08650757,7461018.329877472],[796320.9605641179,7461018.329877472],[796320.9605641179,7460865.455820924],[796168.08650757,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136280/82267","x":136280,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7460865.455820924],[796320.9605641179,7461018.329877472],[796473.8346206658,7461018.329877472],[796473.8346206658,7460865.455820924],[796320.9605641179,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136281/82267","x":136281,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7461018.329877472],[796473.8346206658,7461171.203934021],[796626.7086772174,7461171.203934021],[796626.7086772174,7461018.329877472],[796473.8346206658,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136282/82266","x":136282,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7461018.329877472],[796626.7086772174,7461171.203934021],[796779.5827337652,7461171.203934021],[796779.5827337652,7461018.329877472],[796626.7086772174,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136283/82266","x":136283,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7460865.455820924],[796473.8346206658,7461018.329877472],[796626.7086772174,7461018.329877472],[796626.7086772174,7460865.455820924],[796473.8346206658,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136282/82267","x":136282,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7460865.455820924],[796626.7086772174,7461018.329877472],[796779.5827337652,7461018.329877472],[796779.5827337652,7460865.455820924],[796626.7086772174,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136283/82267","x":136283,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7461324.077990569],[796779.5827337652,7461476.952047119],[796932.4567903131,7461476.952047119],[796932.4567903131,7461324.077990569],[796779.5827337652,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136284/82264","x":136284,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7461324.077990569],[796932.4567903131,7461476.952047119],[797085.330846861,7461476.952047119],[797085.330846861,7461324.077990569],[796932.4567903131,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136285/82264","x":136285,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7461171.203934021],[796779.5827337652,7461324.077990569],[796932.4567903131,7461324.077990569],[796932.4567903131,7461171.203934021],[796779.5827337652,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136284/82265","x":136284,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7461171.203934021],[796932.4567903131,7461324.077990569],[797085.330846861,7461324.077990569],[797085.330846861,7461171.203934021],[796932.4567903131,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136285/82265","x":136285,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7461324.077990569],[797085.330846861,7461476.952047119],[797238.2049034126,7461476.952047119],[797238.2049034126,7461324.077990569],[797085.330846861,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136286/82264","x":136286,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7461324.077990569],[797238.2049034126,7461476.952047119],[797391.0789599605,7461476.952047119],[797391.0789599605,7461324.077990569],[797238.2049034126,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136287/82264","x":136287,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7461171.203934021],[797085.330846861,7461324.077990569],[797238.2049034126,7461324.077990569],[797238.2049034126,7461171.203934021],[797085.330846861,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136286/82265","x":136286,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7461171.203934021],[797238.2049034126,7461324.077990569],[797391.0789599605,7461324.077990569],[797391.0789599605,7461171.203934021],[797238.2049034126,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136287/82265","x":136287,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7461018.329877472],[796779.5827337652,7461171.203934021],[796932.4567903131,7461171.203934021],[796932.4567903131,7461018.329877472],[796779.5827337652,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136284/82266","x":136284,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7461018.329877472],[796932.4567903131,7461171.203934021],[797085.330846861,7461171.203934021],[797085.330846861,7461018.329877472],[796932.4567903131,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136285/82266","x":136285,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7460865.455820924],[796779.5827337652,7461018.329877472],[796932.4567903131,7461018.329877472],[796932.4567903131,7460865.455820924],[796779.5827337652,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136284/82267","x":136284,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7460865.455820924],[796932.4567903131,7461018.329877472],[797085.330846861,7461018.329877472],[797085.330846861,7460865.455820924],[796932.4567903131,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136285/82267","x":136285,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7461018.329877472],[797085.330846861,7461171.203934021],[797238.2049034126,7461171.203934021],[797238.2049034126,7461018.329877472],[797085.330846861,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136286/82266","x":136286,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7461018.329877472],[797238.2049034126,7461171.203934021],[797391.0789599605,7461171.203934021],[797391.0789599605,7461018.329877472],[797238.2049034126,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136287/82266","x":136287,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7460865.455820924],[797085.330846861,7461018.329877472],[797238.2049034126,7461018.329877472],[797238.2049034126,7460865.455820924],[797085.330846861,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136286/82267","x":136286,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7460865.455820924],[797238.2049034126,7461018.329877472],[797391.0789599605,7461018.329877472],[797391.0789599605,7460865.455820924],[797238.2049034126,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136287/82267","x":136287,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7460712.581764374],[796168.08650757,7460865.455820924],[796320.9605641179,7460865.455820924],[796320.9605641179,7460712.581764374],[796168.08650757,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136280/82268","x":136280,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7460712.581764374],[796320.9605641179,7460865.455820924],[796473.8346206658,7460865.455820924],[796473.8346206658,7460712.581764374],[796320.9605641179,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136281/82268","x":136281,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7460559.707707824],[796168.08650757,7460712.581764374],[796320.9605641179,7460712.581764374],[796320.9605641179,7460559.707707824],[796168.08650757,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136280/82269","x":136280,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7460559.707707824],[796320.9605641179,7460712.581764374],[796473.8346206658,7460712.581764374],[796473.8346206658,7460559.707707824],[796320.9605641179,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136281/82269","x":136281,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7460712.581764374],[796473.8346206658,7460865.455820924],[796626.7086772174,7460865.455820924],[796626.7086772174,7460712.581764374],[796473.8346206658,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136282/82268","x":136282,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7460712.581764374],[796626.7086772174,7460865.455820924],[796779.5827337652,7460865.455820924],[796779.5827337652,7460712.581764374],[796626.7086772174,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136283/82268","x":136283,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7460559.707707824],[796473.8346206658,7460712.581764374],[796626.7086772174,7460712.581764374],[796626.7086772174,7460559.707707824],[796473.8346206658,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136282/82269","x":136282,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7460559.707707824],[796626.7086772174,7460712.581764374],[796779.5827337652,7460712.581764374],[796779.5827337652,7460559.707707824],[796626.7086772174,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136283/82269","x":136283,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7460712.581764374],[796779.5827337652,7460865.455820924],[796932.4567903131,7460865.455820924],[796932.4567903131,7460712.581764374],[796779.5827337652,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136284/82268","x":136284,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7460712.581764374],[796932.4567903131,7460865.455820924],[797085.330846861,7460865.455820924],[797085.330846861,7460712.581764374],[796932.4567903131,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136285/82268","x":136285,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7460559.707707824],[796779.5827337652,7460712.581764374],[796932.4567903131,7460712.581764374],[796932.4567903131,7460559.707707824],[796779.5827337652,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136284/82269","x":136284,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7460559.707707824],[796932.4567903131,7460712.581764374],[797085.330846861,7460712.581764374],[797085.330846861,7460559.707707824],[796932.4567903131,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136285/82269","x":136285,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7460712.581764374],[797085.330846861,7460865.455820924],[797238.2049034126,7460865.455820924],[797238.2049034126,7460712.581764374],[797085.330846861,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136286/82268","x":136286,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7460712.581764374],[797238.2049034126,7460865.455820924],[797391.0789599605,7460865.455820924],[797391.0789599605,7460712.581764374],[797238.2049034126,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136287/82268","x":136287,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7460559.707707824],[797085.330846861,7460712.581764374],[797238.2049034126,7460712.581764374],[797238.2049034126,7460559.707707824],[797085.330846861,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136286/82269","x":136286,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7460559.707707824],[797238.2049034126,7460712.581764374],[797391.0789599605,7460712.581764374],[797391.0789599605,7460559.707707824],[797238.2049034126,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136287/82269","x":136287,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7461476.952047119],[797391.0789599605,7461629.826103669],[797543.9530165084,7461629.826103669],[797543.9530165084,7461476.952047119],[797391.0789599605,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136288/82263","x":136288,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7461476.952047119],[797543.9530165084,7461629.826103669],[797696.82707306,7461629.826103669],[797696.82707306,7461476.952047119],[797543.9530165084,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136289/82263","x":136289,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7461476.952047119],[797696.82707306,7461629.826103669],[797849.7011296079,7461629.826103669],[797849.7011296079,7461476.952047119],[797696.82707306,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136290/82263","x":136290,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7461476.952047119],[797849.7011296079,7461629.826103669],[798002.5751861557,7461629.826103669],[798002.5751861557,7461476.952047119],[797849.7011296079,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136291/82263","x":136291,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7461476.952047119],[798002.5751861557,7461629.826103669],[798155.4492427073,7461629.826103669],[798155.4492427073,7461476.952047119],[798002.5751861557,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136292/82263","x":136292,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7461476.952047119],[798155.4492427073,7461629.826103669],[798308.3232992552,7461629.826103669],[798308.3232992552,7461476.952047119],[798155.4492427073,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136293/82263","x":136293,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7461476.952047119],[798308.3232992552,7461629.826103669],[798461.1973558031,7461629.826103669],[798461.1973558031,7461476.952047119],[798308.3232992552,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136294/82263","x":136294,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7461476.952047119],[798461.1973558031,7461629.826103669],[798614.0714123547,7461629.826103669],[798614.0714123547,7461476.952047119],[798461.1973558031,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136295/82263","x":136295,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7461476.952047119],[798614.0714123547,7461629.826103669],[798766.9454689026,7461629.826103669],[798766.9454689026,7461476.952047119],[798614.0714123547,7461476.952047119]]],"type":"Polygon"},"properties":{"label":"18/136296/82263","x":136296,"y":82263,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7461324.077990569],[797391.0789599605,7461476.952047119],[797543.9530165084,7461476.952047119],[797543.9530165084,7461324.077990569],[797391.0789599605,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136288/82264","x":136288,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7461324.077990569],[797543.9530165084,7461476.952047119],[797696.82707306,7461476.952047119],[797696.82707306,7461324.077990569],[797543.9530165084,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136289/82264","x":136289,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7461171.203934021],[797391.0789599605,7461324.077990569],[797543.9530165084,7461324.077990569],[797543.9530165084,7461171.203934021],[797391.0789599605,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136288/82265","x":136288,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7461171.203934021],[797543.9530165084,7461324.077990569],[797696.82707306,7461324.077990569],[797696.82707306,7461171.203934021],[797543.9530165084,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136289/82265","x":136289,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7461324.077990569],[797696.82707306,7461476.952047119],[797849.7011296079,7461476.952047119],[797849.7011296079,7461324.077990569],[797696.82707306,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136290/82264","x":136290,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7461324.077990569],[797849.7011296079,7461476.952047119],[798002.5751861557,7461476.952047119],[798002.5751861557,7461324.077990569],[797849.7011296079,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136291/82264","x":136291,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7461171.203934021],[797696.82707306,7461324.077990569],[797849.7011296079,7461324.077990569],[797849.7011296079,7461171.203934021],[797696.82707306,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136290/82265","x":136290,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7461171.203934021],[797849.7011296079,7461324.077990569],[798002.5751861557,7461324.077990569],[798002.5751861557,7461171.203934021],[797849.7011296079,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136291/82265","x":136291,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7461018.329877472],[797391.0789599605,7461171.203934021],[797543.9530165084,7461171.203934021],[797543.9530165084,7461018.329877472],[797391.0789599605,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136288/82266","x":136288,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7461018.329877472],[797543.9530165084,7461171.203934021],[797696.82707306,7461171.203934021],[797696.82707306,7461018.329877472],[797543.9530165084,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136289/82266","x":136289,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7460865.455820924],[797391.0789599605,7461018.329877472],[797543.9530165084,7461018.329877472],[797543.9530165084,7460865.455820924],[797391.0789599605,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136288/82267","x":136288,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7460865.455820924],[797543.9530165084,7461018.329877472],[797696.82707306,7461018.329877472],[797696.82707306,7460865.455820924],[797543.9530165084,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136289/82267","x":136289,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7461018.329877472],[797696.82707306,7461171.203934021],[797849.7011296079,7461171.203934021],[797849.7011296079,7461018.329877472],[797696.82707306,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136290/82266","x":136290,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7461018.329877472],[797849.7011296079,7461171.203934021],[798002.5751861557,7461171.203934021],[798002.5751861557,7461018.329877472],[797849.7011296079,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136291/82266","x":136291,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7460865.455820924],[797696.82707306,7461018.329877472],[797849.7011296079,7461018.329877472],[797849.7011296079,7460865.455820924],[797696.82707306,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136290/82267","x":136290,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7460865.455820924],[797849.7011296079,7461018.329877472],[798002.5751861557,7461018.329877472],[798002.5751861557,7460865.455820924],[797849.7011296079,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136291/82267","x":136291,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7461324.077990569],[798002.5751861557,7461476.952047119],[798155.4492427073,7461476.952047119],[798155.4492427073,7461324.077990569],[798002.5751861557,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136292/82264","x":136292,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7461324.077990569],[798155.4492427073,7461476.952047119],[798308.3232992552,7461476.952047119],[798308.3232992552,7461324.077990569],[798155.4492427073,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136293/82264","x":136293,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7461171.203934021],[798002.5751861557,7461324.077990569],[798155.4492427073,7461324.077990569],[798155.4492427073,7461171.203934021],[798002.5751861557,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136292/82265","x":136292,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7461171.203934021],[798155.4492427073,7461324.077990569],[798308.3232992552,7461324.077990569],[798308.3232992552,7461171.203934021],[798155.4492427073,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136293/82265","x":136293,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7461324.077990569],[798308.3232992552,7461476.952047119],[798461.1973558031,7461476.952047119],[798461.1973558031,7461324.077990569],[798308.3232992552,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136294/82264","x":136294,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7461324.077990569],[798461.1973558031,7461476.952047119],[798614.0714123547,7461476.952047119],[798614.0714123547,7461324.077990569],[798461.1973558031,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136295/82264","x":136295,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7461171.203934021],[798308.3232992552,7461324.077990569],[798461.1973558031,7461324.077990569],[798461.1973558031,7461171.203934021],[798308.3232992552,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136294/82265","x":136294,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7461171.203934021],[798461.1973558031,7461324.077990569],[798614.0714123547,7461324.077990569],[798614.0714123547,7461171.203934021],[798461.1973558031,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136295/82265","x":136295,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7461018.329877472],[798002.5751861557,7461171.203934021],[798155.4492427073,7461171.203934021],[798155.4492427073,7461018.329877472],[798002.5751861557,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136292/82266","x":136292,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7461018.329877472],[798155.4492427073,7461171.203934021],[798308.3232992552,7461171.203934021],[798308.3232992552,7461018.329877472],[798155.4492427073,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136293/82266","x":136293,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7460865.455820924],[798002.5751861557,7461018.329877472],[798155.4492427073,7461018.329877472],[798155.4492427073,7460865.455820924],[798002.5751861557,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136292/82267","x":136292,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7460865.455820924],[798155.4492427073,7461018.329877472],[798308.3232992552,7461018.329877472],[798308.3232992552,7460865.455820924],[798155.4492427073,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136293/82267","x":136293,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7461018.329877472],[798308.3232992552,7461171.203934021],[798461.1973558031,7461171.203934021],[798461.1973558031,7461018.329877472],[798308.3232992552,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136294/82266","x":136294,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7461018.329877472],[798461.1973558031,7461171.203934021],[798614.0714123547,7461171.203934021],[798614.0714123547,7461018.329877472],[798461.1973558031,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136295/82266","x":136295,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7460865.455820924],[798308.3232992552,7461018.329877472],[798461.1973558031,7461018.329877472],[798461.1973558031,7460865.455820924],[798308.3232992552,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136294/82267","x":136294,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7460865.455820924],[798461.1973558031,7461018.329877472],[798614.0714123547,7461018.329877472],[798614.0714123547,7460865.455820924],[798461.1973558031,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136295/82267","x":136295,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7460712.581764374],[797391.0789599605,7460865.455820924],[797543.9530165084,7460865.455820924],[797543.9530165084,7460712.581764374],[797391.0789599605,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136288/82268","x":136288,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7460712.581764374],[797543.9530165084,7460865.455820924],[797696.82707306,7460865.455820924],[797696.82707306,7460712.581764374],[797543.9530165084,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136289/82268","x":136289,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7460559.707707824],[797391.0789599605,7460712.581764374],[797543.9530165084,7460712.581764374],[797543.9530165084,7460559.707707824],[797391.0789599605,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136288/82269","x":136288,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7460559.707707824],[797543.9530165084,7460712.581764374],[797696.82707306,7460712.581764374],[797696.82707306,7460559.707707824],[797543.9530165084,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136289/82269","x":136289,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7460712.581764374],[797696.82707306,7460865.455820924],[797849.7011296079,7460865.455820924],[797849.7011296079,7460712.581764374],[797696.82707306,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136290/82268","x":136290,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7460712.581764374],[797849.7011296079,7460865.455820924],[798002.5751861557,7460865.455820924],[798002.5751861557,7460712.581764374],[797849.7011296079,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136291/82268","x":136291,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7460559.707707824],[797696.82707306,7460712.581764374],[797849.7011296079,7460712.581764374],[797849.7011296079,7460559.707707824],[797696.82707306,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136290/82269","x":136290,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7460559.707707824],[797849.7011296079,7460712.581764374],[798002.5751861557,7460712.581764374],[798002.5751861557,7460559.707707824],[797849.7011296079,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136291/82269","x":136291,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7460406.833651276],[797391.0789599605,7460559.707707824],[797543.9530165084,7460559.707707824],[797543.9530165084,7460406.833651276],[797391.0789599605,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136288/82270","x":136288,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7460406.833651276],[797543.9530165084,7460559.707707824],[797696.82707306,7460559.707707824],[797696.82707306,7460406.833651276],[797543.9530165084,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136289/82270","x":136289,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7460253.959594727],[797543.9530165084,7460406.833651276],[797696.82707306,7460406.833651276],[797696.82707306,7460253.959594727],[797543.9530165084,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136289/82271","x":136289,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7460406.833651276],[797696.82707306,7460559.707707824],[797849.7011296079,7460559.707707824],[797849.7011296079,7460406.833651276],[797696.82707306,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136290/82270","x":136290,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7460406.833651276],[797849.7011296079,7460559.707707824],[798002.5751861557,7460559.707707824],[798002.5751861557,7460406.833651276],[797849.7011296079,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136291/82270","x":136291,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7460253.959594727],[797696.82707306,7460406.833651276],[797849.7011296079,7460406.833651276],[797849.7011296079,7460253.959594727],[797696.82707306,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136290/82271","x":136290,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7460253.959594727],[797849.7011296079,7460406.833651276],[798002.5751861557,7460406.833651276],[798002.5751861557,7460253.959594727],[797849.7011296079,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136291/82271","x":136291,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7460712.581764374],[798002.5751861557,7460865.455820924],[798155.4492427073,7460865.455820924],[798155.4492427073,7460712.581764374],[798002.5751861557,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136292/82268","x":136292,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7460712.581764374],[798155.4492427073,7460865.455820924],[798308.3232992552,7460865.455820924],[798308.3232992552,7460712.581764374],[798155.4492427073,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136293/82268","x":136293,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7460559.707707824],[798002.5751861557,7460712.581764374],[798155.4492427073,7460712.581764374],[798155.4492427073,7460559.707707824],[798002.5751861557,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136292/82269","x":136292,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7460559.707707824],[798155.4492427073,7460712.581764374],[798308.3232992552,7460712.581764374],[798308.3232992552,7460559.707707824],[798155.4492427073,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136293/82269","x":136293,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7460712.581764374],[798308.3232992552,7460865.455820924],[798461.1973558031,7460865.455820924],[798461.1973558031,7460712.581764374],[798308.3232992552,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136294/82268","x":136294,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7460712.581764374],[798461.1973558031,7460865.455820924],[798614.0714123547,7460865.455820924],[798614.0714123547,7460712.581764374],[798461.1973558031,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136295/82268","x":136295,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7460559.707707824],[798308.3232992552,7460712.581764374],[798461.1973558031,7460712.581764374],[798461.1973558031,7460559.707707824],[798308.3232992552,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136294/82269","x":136294,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7460559.707707824],[798461.1973558031,7460712.581764374],[798614.0714123547,7460712.581764374],[798614.0714123547,7460559.707707824],[798461.1973558031,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136295/82269","x":136295,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7460406.833651276],[798002.5751861557,7460559.707707824],[798155.4492427073,7460559.707707824],[798155.4492427073,7460406.833651276],[798002.5751861557,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136292/82270","x":136292,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7460406.833651276],[798155.4492427073,7460559.707707824],[798308.3232992552,7460559.707707824],[798308.3232992552,7460406.833651276],[798155.4492427073,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136293/82270","x":136293,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7460253.959594727],[798002.5751861557,7460406.833651276],[798155.4492427073,7460406.833651276],[798155.4492427073,7460253.959594727],[798002.5751861557,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136292/82271","x":136292,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7460253.959594727],[798155.4492427073,7460406.833651276],[798308.3232992552,7460406.833651276],[798308.3232992552,7460253.959594727],[798155.4492427073,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136293/82271","x":136293,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7460406.833651276],[798308.3232992552,7460559.707707824],[798461.1973558031,7460559.707707824],[798461.1973558031,7460406.833651276],[798308.3232992552,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136294/82270","x":136294,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7460406.833651276],[798461.1973558031,7460559.707707824],[798614.0714123547,7460559.707707824],[798614.0714123547,7460406.833651276],[798461.1973558031,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136295/82270","x":136295,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7460253.959594727],[798308.3232992552,7460406.833651276],[798461.1973558031,7460406.833651276],[798461.1973558031,7460253.959594727],[798308.3232992552,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136294/82271","x":136294,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7460253.959594727],[798461.1973558031,7460406.833651276],[798614.0714123547,7460406.833651276],[798614.0714123547,7460253.959594727],[798461.1973558031,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136295/82271","x":136295,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7461324.077990569],[798614.0714123547,7461476.952047119],[798766.9454689026,7461476.952047119],[798766.9454689026,7461324.077990569],[798614.0714123547,7461324.077990569]]],"type":"Polygon"},"properties":{"label":"18/136296/82264","x":136296,"y":82264,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7461171.203934021],[798614.0714123547,7461324.077990569],[798766.9454689026,7461324.077990569],[798766.9454689026,7461171.203934021],[798614.0714123547,7461171.203934021]]],"type":"Polygon"},"properties":{"label":"18/136296/82265","x":136296,"y":82265,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7461018.329877472],[798614.0714123547,7461171.203934021],[798766.9454689026,7461171.203934021],[798766.9454689026,7461018.329877472],[798614.0714123547,7461018.329877472]]],"type":"Polygon"},"properties":{"label":"18/136296/82266","x":136296,"y":82266,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7460865.455820924],[798614.0714123547,7461018.329877472],[798766.9454689026,7461018.329877472],[798766.9454689026,7460865.455820924],[798614.0714123547,7460865.455820924]]],"type":"Polygon"},"properties":{"label":"18/136296/82267","x":136296,"y":82267,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7460712.581764374],[798614.0714123547,7460865.455820924],[798766.9454689026,7460865.455820924],[798766.9454689026,7460712.581764374],[798614.0714123547,7460712.581764374]]],"type":"Polygon"},"properties":{"label":"18/136296/82268","x":136296,"y":82268,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7460559.707707824],[798614.0714123547,7460712.581764374],[798766.9454689026,7460712.581764374],[798766.9454689026,7460559.707707824],[798614.0714123547,7460559.707707824]]],"type":"Polygon"},"properties":{"label":"18/136296/82269","x":136296,"y":82269,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7460406.833651276],[798614.0714123547,7460559.707707824],[798766.9454689026,7460559.707707824],[798766.9454689026,7460406.833651276],[798614.0714123547,7460406.833651276]]],"type":"Polygon"},"properties":{"label":"18/136296/82270","x":136296,"y":82270,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7460253.959594727],[798614.0714123547,7460406.833651276],[798766.9454689026,7460406.833651276],[798766.9454689026,7460253.959594727],[798614.0714123547,7460253.959594727]]],"type":"Polygon"},"properties":{"label":"18/136296/82271","x":136296,"y":82271,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7460101.085538177],[792499.1091503911,7460253.959594727],[792651.983206939,7460253.959594727],[792651.983206939,7460101.085538177],[792499.1091503911,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136256/82272","x":136256,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7460101.085538177],[792651.983206939,7460253.959594727],[792804.8572634906,7460253.959594727],[792804.8572634906,7460101.085538177],[792651.983206939,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136257/82272","x":136257,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7459948.211481629],[792499.1091503911,7460101.085538177],[792651.983206939,7460101.085538177],[792651.983206939,7459948.211481629],[792499.1091503911,7459948.211481629]]],"type":"Polygon"},"properties":{"label":"18/136256/82273","x":136256,"y":82273,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7459948.211481629],[792651.983206939,7460101.085538177],[792804.8572634906,7460101.085538177],[792804.8572634906,7459948.211481629],[792651.983206939,7459948.211481629]]],"type":"Polygon"},"properties":{"label":"18/136257/82273","x":136257,"y":82273,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7460101.085538177],[792804.8572634906,7460253.959594727],[792957.7313200384,7460253.959594727],[792957.7313200384,7460101.085538177],[792804.8572634906,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136258/82272","x":136258,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7460101.085538177],[792957.7313200384,7460253.959594727],[793110.6053765863,7460253.959594727],[793110.6053765863,7460101.085538177],[792957.7313200384,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136259/82272","x":136259,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7459948.211481629],[792804.8572634906,7460101.085538177],[792957.7313200384,7460101.085538177],[792957.7313200384,7459948.211481629],[792804.8572634906,7459948.211481629]]],"type":"Polygon"},"properties":{"label":"18/136258/82273","x":136258,"y":82273,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7459948.211481629],[792957.7313200384,7460101.085538177],[793110.6053765863,7460101.085538177],[793110.6053765863,7459948.211481629],[792957.7313200384,7459948.211481629]]],"type":"Polygon"},"properties":{"label":"18/136259/82273","x":136259,"y":82273,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7459795.337425079],[792499.1091503911,7459948.211481629],[792651.983206939,7459948.211481629],[792651.983206939,7459795.337425079],[792499.1091503911,7459795.337425079]]],"type":"Polygon"},"properties":{"label":"18/136256/82274","x":136256,"y":82274,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7459795.337425079],[792651.983206939,7459948.211481629],[792804.8572634906,7459948.211481629],[792804.8572634906,7459795.337425079],[792651.983206939,7459795.337425079]]],"type":"Polygon"},"properties":{"label":"18/136257/82274","x":136257,"y":82274,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7459642.463368529],[792499.1091503911,7459795.337425079],[792651.983206939,7459795.337425079],[792651.983206939,7459642.463368529],[792499.1091503911,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136256/82275","x":136256,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7459642.463368529],[792651.983206939,7459795.337425079],[792804.8572634906,7459795.337425079],[792804.8572634906,7459642.463368529],[792651.983206939,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136257/82275","x":136257,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7459795.337425079],[792804.8572634906,7459948.211481629],[792957.7313200384,7459948.211481629],[792957.7313200384,7459795.337425079],[792804.8572634906,7459795.337425079]]],"type":"Polygon"},"properties":{"label":"18/136258/82274","x":136258,"y":82274,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7459795.337425079],[792957.7313200384,7459948.211481629],[793110.6053765863,7459948.211481629],[793110.6053765863,7459795.337425079],[792957.7313200384,7459795.337425079]]],"type":"Polygon"},"properties":{"label":"18/136259/82274","x":136259,"y":82274,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7459642.463368529],[792804.8572634906,7459795.337425079],[792957.7313200384,7459795.337425079],[792957.7313200384,7459642.463368529],[792804.8572634906,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136258/82275","x":136258,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7459642.463368529],[792957.7313200384,7459795.337425079],[793110.6053765863,7459795.337425079],[793110.6053765863,7459642.463368529],[792957.7313200384,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136259/82275","x":136259,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7460101.085538177],[793110.6053765863,7460253.959594727],[793263.4794331342,7460253.959594727],[793263.4794331342,7460101.085538177],[793110.6053765863,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136260/82272","x":136260,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7460101.085538177],[793263.4794331342,7460253.959594727],[793416.3534896858,7460253.959594727],[793416.3534896858,7460101.085538177],[793263.4794331342,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136261/82272","x":136261,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7459948.211481629],[793110.6053765863,7460101.085538177],[793263.4794331342,7460101.085538177],[793263.4794331342,7459948.211481629],[793110.6053765863,7459948.211481629]]],"type":"Polygon"},"properties":{"label":"18/136260/82273","x":136260,"y":82273,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7459948.211481629],[793263.4794331342,7460101.085538177],[793416.3534896858,7460101.085538177],[793416.3534896858,7459948.211481629],[793263.4794331342,7459948.211481629]]],"type":"Polygon"},"properties":{"label":"18/136261/82273","x":136261,"y":82273,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7460101.085538177],[793416.3534896858,7460253.959594727],[793569.2275462337,7460253.959594727],[793569.2275462337,7460101.085538177],[793416.3534896858,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136262/82272","x":136262,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7459795.337425079],[793110.6053765863,7459948.211481629],[793263.4794331342,7459948.211481629],[793263.4794331342,7459795.337425079],[793110.6053765863,7459795.337425079]]],"type":"Polygon"},"properties":{"label":"18/136260/82274","x":136260,"y":82274,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7459795.337425079],[793263.4794331342,7459948.211481629],[793416.3534896858,7459948.211481629],[793416.3534896858,7459795.337425079],[793263.4794331342,7459795.337425079]]],"type":"Polygon"},"properties":{"label":"18/136261/82274","x":136261,"y":82274,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7459642.463368529],[793110.6053765863,7459795.337425079],[793263.4794331342,7459795.337425079],[793263.4794331342,7459642.463368529],[793110.6053765863,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136260/82275","x":136260,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7459642.463368529],[793263.4794331342,7459795.337425079],[793416.3534896858,7459795.337425079],[793416.3534896858,7459642.463368529],[793263.4794331342,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136261/82275","x":136261,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7459489.589311982],[792499.1091503911,7459642.463368529],[792651.983206939,7459642.463368529],[792651.983206939,7459489.589311982],[792499.1091503911,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136256/82276","x":136256,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7459489.589311982],[792651.983206939,7459642.463368529],[792804.8572634906,7459642.463368529],[792804.8572634906,7459489.589311982],[792651.983206939,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136257/82276","x":136257,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7459336.715255432],[792499.1091503911,7459489.589311982],[792651.983206939,7459489.589311982],[792651.983206939,7459336.715255432],[792499.1091503911,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136256/82277","x":136256,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7459336.715255432],[792651.983206939,7459489.589311982],[792804.8572634906,7459489.589311982],[792804.8572634906,7459336.715255432],[792651.983206939,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136257/82277","x":136257,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7459489.589311982],[792804.8572634906,7459642.463368529],[792957.7313200384,7459642.463368529],[792957.7313200384,7459489.589311982],[792804.8572634906,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136258/82276","x":136258,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7459489.589311982],[792957.7313200384,7459642.463368529],[793110.6053765863,7459642.463368529],[793110.6053765863,7459489.589311982],[792957.7313200384,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136259/82276","x":136259,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7459336.715255432],[792804.8572634906,7459489.589311982],[792957.7313200384,7459489.589311982],[792957.7313200384,7459336.715255432],[792804.8572634906,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136258/82277","x":136258,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7459336.715255432],[792957.7313200384,7459489.589311982],[793110.6053765863,7459489.589311982],[793110.6053765863,7459336.715255432],[792957.7313200384,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136259/82277","x":136259,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7459183.841198882],[792499.1091503911,7459336.715255432],[792651.983206939,7459336.715255432],[792651.983206939,7459183.841198882],[792499.1091503911,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136256/82278","x":136256,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7459183.841198882],[792651.983206939,7459336.715255432],[792804.8572634906,7459336.715255432],[792804.8572634906,7459183.841198882],[792651.983206939,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136257/82278","x":136257,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7459030.967142334],[792499.1091503911,7459183.841198882],[792651.983206939,7459183.841198882],[792651.983206939,7459030.967142334],[792499.1091503911,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136256/82279","x":136256,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7459030.967142334],[792651.983206939,7459183.841198882],[792804.8572634906,7459183.841198882],[792804.8572634906,7459030.967142334],[792651.983206939,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136257/82279","x":136257,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7459183.841198882],[792804.8572634906,7459336.715255432],[792957.7313200384,7459336.715255432],[792957.7313200384,7459183.841198882],[792804.8572634906,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136258/82278","x":136258,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7459183.841198882],[792957.7313200384,7459336.715255432],[793110.6053765863,7459336.715255432],[793110.6053765863,7459183.841198882],[792957.7313200384,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136259/82278","x":136259,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7459030.967142334],[792804.8572634906,7459183.841198882],[792957.7313200384,7459183.841198882],[792957.7313200384,7459030.967142334],[792804.8572634906,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136258/82279","x":136258,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7459030.967142334],[792957.7313200384,7459183.841198882],[793110.6053765863,7459183.841198882],[793110.6053765863,7459030.967142334],[792957.7313200384,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136259/82279","x":136259,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7459489.589311982],[793110.6053765863,7459642.463368529],[793263.4794331342,7459642.463368529],[793263.4794331342,7459489.589311982],[793110.6053765863,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136260/82276","x":136260,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7459489.589311982],[793263.4794331342,7459642.463368529],[793416.3534896858,7459642.463368529],[793416.3534896858,7459489.589311982],[793263.4794331342,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136261/82276","x":136261,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7459336.715255432],[793110.6053765863,7459489.589311982],[793263.4794331342,7459489.589311982],[793263.4794331342,7459336.715255432],[793110.6053765863,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136260/82277","x":136260,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7459336.715255432],[793263.4794331342,7459489.589311982],[793416.3534896858,7459489.589311982],[793416.3534896858,7459336.715255432],[793263.4794331342,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136261/82277","x":136261,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7459183.841198882],[793110.6053765863,7459336.715255432],[793263.4794331342,7459336.715255432],[793263.4794331342,7459183.841198882],[793110.6053765863,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136260/82278","x":136260,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7459183.841198882],[793263.4794331342,7459336.715255432],[793416.3534896858,7459336.715255432],[793416.3534896858,7459183.841198882],[793263.4794331342,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136261/82278","x":136261,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7459030.967142334],[793110.6053765863,7459183.841198882],[793263.4794331342,7459183.841198882],[793263.4794331342,7459030.967142334],[793110.6053765863,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136260/82279","x":136260,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7459030.967142334],[793263.4794331342,7459183.841198882],[793416.3534896858,7459183.841198882],[793416.3534896858,7459030.967142334],[793263.4794331342,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136261/82279","x":136261,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7459642.463368529],[794639.3459420763,7459795.337425079],[794792.2199986279,7459795.337425079],[794792.2199986279,7459642.463368529],[794639.3459420763,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136270/82275","x":136270,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7459642.463368529],[794792.2199986279,7459795.337425079],[794945.0940551758,7459795.337425079],[794945.0940551758,7459642.463368529],[794792.2199986279,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136271/82275","x":136271,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7459489.589311982],[794639.3459420763,7459642.463368529],[794792.2199986279,7459642.463368529],[794792.2199986279,7459489.589311982],[794639.3459420763,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136270/82276","x":136270,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7459489.589311982],[794792.2199986279,7459642.463368529],[794945.0940551758,7459642.463368529],[794945.0940551758,7459489.589311982],[794792.2199986279,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136271/82276","x":136271,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7459336.715255432],[794639.3459420763,7459489.589311982],[794792.2199986279,7459489.589311982],[794792.2199986279,7459336.715255432],[794639.3459420763,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136270/82277","x":136270,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7459336.715255432],[794792.2199986279,7459489.589311982],[794945.0940551758,7459489.589311982],[794945.0940551758,7459336.715255432],[794792.2199986279,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136271/82277","x":136271,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7459183.841198882],[794792.2199986279,7459336.715255432],[794945.0940551758,7459336.715255432],[794945.0940551758,7459183.841198882],[794792.2199986279,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136271/82278","x":136271,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7458878.0930857845],[792499.1091503911,7459030.967142334],[792651.983206939,7459030.967142334],[792651.983206939,7458878.0930857845],[792499.1091503911,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136256/82280","x":136256,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7458878.0930857845],[792651.983206939,7459030.967142334],[792804.8572634906,7459030.967142334],[792804.8572634906,7458878.0930857845],[792651.983206939,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136257/82280","x":136257,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7458725.219029237],[792499.1091503911,7458878.0930857845],[792651.983206939,7458878.0930857845],[792651.983206939,7458725.219029237],[792499.1091503911,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136256/82281","x":136256,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7458725.219029237],[792651.983206939,7458878.0930857845],[792804.8572634906,7458878.0930857845],[792804.8572634906,7458725.219029237],[792651.983206939,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136257/82281","x":136257,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7458878.0930857845],[792804.8572634906,7459030.967142334],[792957.7313200384,7459030.967142334],[792957.7313200384,7458878.0930857845],[792804.8572634906,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136258/82280","x":136258,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7458878.0930857845],[792957.7313200384,7459030.967142334],[793110.6053765863,7459030.967142334],[793110.6053765863,7458878.0930857845],[792957.7313200384,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136259/82280","x":136259,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7458725.219029237],[792804.8572634906,7458878.0930857845],[792957.7313200384,7458878.0930857845],[792957.7313200384,7458725.219029237],[792804.8572634906,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136258/82281","x":136258,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7458725.219029237],[792957.7313200384,7458878.0930857845],[793110.6053765863,7458878.0930857845],[793110.6053765863,7458725.219029237],[792957.7313200384,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136259/82281","x":136259,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7458572.344972687],[792499.1091503911,7458725.219029237],[792651.983206939,7458725.219029237],[792651.983206939,7458572.344972687],[792499.1091503911,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136256/82282","x":136256,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7458572.344972687],[792651.983206939,7458725.219029237],[792804.8572634906,7458725.219029237],[792804.8572634906,7458572.344972687],[792651.983206939,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136257/82282","x":136257,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7458419.470916137],[792499.1091503911,7458572.344972687],[792651.983206939,7458572.344972687],[792651.983206939,7458419.470916137],[792499.1091503911,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136256/82283","x":136256,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7458419.470916137],[792651.983206939,7458572.344972687],[792804.8572634906,7458572.344972687],[792804.8572634906,7458419.470916137],[792651.983206939,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136257/82283","x":136257,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7458572.344972687],[792804.8572634906,7458725.219029237],[792957.7313200384,7458725.219029237],[792957.7313200384,7458572.344972687],[792804.8572634906,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136258/82282","x":136258,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7458572.344972687],[792957.7313200384,7458725.219029237],[793110.6053765863,7458725.219029237],[793110.6053765863,7458572.344972687],[792957.7313200384,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136259/82282","x":136259,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7458419.470916137],[792804.8572634906,7458572.344972687],[792957.7313200384,7458572.344972687],[792957.7313200384,7458419.470916137],[792804.8572634906,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136258/82283","x":136258,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7458419.470916137],[792957.7313200384,7458572.344972687],[793110.6053765863,7458572.344972687],[793110.6053765863,7458419.470916137],[792957.7313200384,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136259/82283","x":136259,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7458878.0930857845],[793110.6053765863,7459030.967142334],[793263.4794331342,7459030.967142334],[793263.4794331342,7458878.0930857845],[793110.6053765863,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136260/82280","x":136260,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7458878.0930857845],[793263.4794331342,7459030.967142334],[793416.3534896858,7459030.967142334],[793416.3534896858,7458878.0930857845],[793263.4794331342,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136261/82280","x":136261,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7458725.219029237],[793110.6053765863,7458878.0930857845],[793263.4794331342,7458878.0930857845],[793263.4794331342,7458725.219029237],[793110.6053765863,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136260/82281","x":136260,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7458725.219029237],[793263.4794331342,7458878.0930857845],[793416.3534896858,7458878.0930857845],[793416.3534896858,7458725.219029237],[793263.4794331342,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136261/82281","x":136261,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7458572.344972687],[793110.6053765863,7458725.219029237],[793263.4794331342,7458725.219029237],[793263.4794331342,7458572.344972687],[793110.6053765863,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136260/82282","x":136260,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7458572.344972687],[793263.4794331342,7458725.219029237],[793416.3534896858,7458725.219029237],[793416.3534896858,7458572.344972687],[793263.4794331342,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136261/82282","x":136261,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7458419.470916137],[793110.6053765863,7458572.344972687],[793263.4794331342,7458572.344972687],[793263.4794331342,7458419.470916137],[793110.6053765863,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136260/82283","x":136260,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7458419.470916137],[793263.4794331342,7458572.344972687],[793416.3534896858,7458572.344972687],[793416.3534896858,7458419.470916137],[793263.4794331342,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136261/82283","x":136261,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7458266.596859589],[792499.1091503911,7458419.470916137],[792651.983206939,7458419.470916137],[792651.983206939,7458266.596859589],[792499.1091503911,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136256/82284","x":136256,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7458266.596859589],[792651.983206939,7458419.470916137],[792804.8572634906,7458419.470916137],[792804.8572634906,7458266.596859589],[792651.983206939,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136257/82284","x":136257,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7458113.7228030395],[792499.1091503911,7458266.596859589],[792651.983206939,7458266.596859589],[792651.983206939,7458113.7228030395],[792499.1091503911,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136256/82285","x":136256,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7458113.7228030395],[792651.983206939,7458266.596859589],[792804.8572634906,7458266.596859589],[792804.8572634906,7458113.7228030395],[792651.983206939,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136257/82285","x":136257,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7458266.596859589],[792804.8572634906,7458419.470916137],[792957.7313200384,7458419.470916137],[792957.7313200384,7458266.596859589],[792804.8572634906,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136258/82284","x":136258,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7458266.596859589],[792957.7313200384,7458419.470916137],[793110.6053765863,7458419.470916137],[793110.6053765863,7458266.596859589],[792957.7313200384,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136259/82284","x":136259,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7458113.7228030395],[792804.8572634906,7458266.596859589],[792957.7313200384,7458266.596859589],[792957.7313200384,7458113.7228030395],[792804.8572634906,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136258/82285","x":136258,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7458113.7228030395],[792957.7313200384,7458266.596859589],[793110.6053765863,7458266.596859589],[793110.6053765863,7458113.7228030395],[792957.7313200384,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136259/82285","x":136259,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7457960.84874649],[792499.1091503911,7458113.7228030395],[792651.983206939,7458113.7228030395],[792651.983206939,7457960.84874649],[792499.1091503911,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136256/82286","x":136256,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7457960.84874649],[792651.983206939,7458113.7228030395],[792804.8572634906,7458113.7228030395],[792804.8572634906,7457960.84874649],[792651.983206939,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136257/82286","x":136257,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7457807.974689942],[792499.1091503911,7457960.84874649],[792651.983206939,7457960.84874649],[792651.983206939,7457807.974689942],[792499.1091503911,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136256/82287","x":136256,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7457807.974689942],[792651.983206939,7457960.84874649],[792804.8572634906,7457960.84874649],[792804.8572634906,7457807.974689942],[792651.983206939,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136257/82287","x":136257,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7457960.84874649],[792804.8572634906,7458113.7228030395],[792957.7313200384,7458113.7228030395],[792957.7313200384,7457960.84874649],[792804.8572634906,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136258/82286","x":136258,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7457960.84874649],[792957.7313200384,7458113.7228030395],[793110.6053765863,7458113.7228030395],[793110.6053765863,7457960.84874649],[792957.7313200384,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136259/82286","x":136259,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7457807.974689942],[792804.8572634906,7457960.84874649],[792957.7313200384,7457960.84874649],[792957.7313200384,7457807.974689942],[792804.8572634906,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136258/82287","x":136258,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7457807.974689942],[792957.7313200384,7457960.84874649],[793110.6053765863,7457960.84874649],[793110.6053765863,7457807.974689942],[792957.7313200384,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136259/82287","x":136259,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7458266.596859589],[793110.6053765863,7458419.470916137],[793263.4794331342,7458419.470916137],[793263.4794331342,7458266.596859589],[793110.6053765863,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136260/82284","x":136260,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7458113.7228030395],[793110.6053765863,7458266.596859589],[793263.4794331342,7458266.596859589],[793263.4794331342,7458113.7228030395],[793110.6053765863,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136260/82285","x":136260,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7457960.84874649],[793110.6053765863,7458113.7228030395],[793263.4794331342,7458113.7228030395],[793263.4794331342,7457960.84874649],[793110.6053765863,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136260/82286","x":136260,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7457807.974689942],[793110.6053765863,7457960.84874649],[793263.4794331342,7457960.84874649],[793263.4794331342,7457807.974689942],[793110.6053765863,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136260/82287","x":136260,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7457807.974689942],[794486.4718855284,7457960.84874649],[794639.3459420763,7457960.84874649],[794639.3459420763,7457807.974689942],[794486.4718855284,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136269/82287","x":136269,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7457960.84874649],[794792.2199986279,7458113.7228030395],[794945.0940551758,7458113.7228030395],[794945.0940551758,7457960.84874649],[794792.2199986279,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136271/82286","x":136271,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7457807.974689942],[794639.3459420763,7457960.84874649],[794792.2199986279,7457960.84874649],[794792.2199986279,7457807.974689942],[794639.3459420763,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136270/82287","x":136270,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7457807.974689942],[794792.2199986279,7457960.84874649],[794945.0940551758,7457960.84874649],[794945.0940551758,7457807.974689942],[794792.2199986279,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136271/82287","x":136271,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7459642.463368529],[794945.0940551758,7459795.337425079],[795097.9681117237,7459795.337425079],[795097.9681117237,7459642.463368529],[794945.0940551758,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136272/82275","x":136272,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7459642.463368529],[795097.9681117237,7459795.337425079],[795250.8421682753,7459795.337425079],[795250.8421682753,7459642.463368529],[795097.9681117237,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136273/82275","x":136273,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7459642.463368529],[795250.8421682753,7459795.337425079],[795403.7162248231,7459795.337425079],[795403.7162248231,7459642.463368529],[795250.8421682753,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136274/82275","x":136274,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7459642.463368529],[795403.7162248231,7459795.337425079],[795556.590281371,7459795.337425079],[795556.590281371,7459642.463368529],[795403.7162248231,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136275/82275","x":136275,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7459642.463368529],[795556.590281371,7459795.337425079],[795709.4643379226,7459795.337425079],[795709.4643379226,7459642.463368529],[795556.590281371,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136276/82275","x":136276,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7459642.463368529],[795709.4643379226,7459795.337425079],[795862.3383944705,7459795.337425079],[795862.3383944705,7459642.463368529],[795709.4643379226,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136277/82275","x":136277,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7459642.463368529],[795862.3383944705,7459795.337425079],[796015.2124510184,7459795.337425079],[796015.2124510184,7459642.463368529],[795862.3383944705,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136278/82275","x":136278,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7459642.463368529],[796015.2124510184,7459795.337425079],[796168.08650757,7459795.337425079],[796168.08650757,7459642.463368529],[796015.2124510184,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136279/82275","x":136279,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7459489.589311982],[794945.0940551758,7459642.463368529],[795097.9681117237,7459642.463368529],[795097.9681117237,7459489.589311982],[794945.0940551758,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136272/82276","x":136272,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7459489.589311982],[795097.9681117237,7459642.463368529],[795250.8421682753,7459642.463368529],[795250.8421682753,7459489.589311982],[795097.9681117237,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136273/82276","x":136273,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7459336.715255432],[794945.0940551758,7459489.589311982],[795097.9681117237,7459489.589311982],[795097.9681117237,7459336.715255432],[794945.0940551758,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136272/82277","x":136272,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7459336.715255432],[795097.9681117237,7459489.589311982],[795250.8421682753,7459489.589311982],[795250.8421682753,7459336.715255432],[795097.9681117237,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136273/82277","x":136273,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7459489.589311982],[795250.8421682753,7459642.463368529],[795403.7162248231,7459642.463368529],[795403.7162248231,7459489.589311982],[795250.8421682753,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136274/82276","x":136274,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7459489.589311982],[795403.7162248231,7459642.463368529],[795556.590281371,7459642.463368529],[795556.590281371,7459489.589311982],[795403.7162248231,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136275/82276","x":136275,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7459336.715255432],[795250.8421682753,7459489.589311982],[795403.7162248231,7459489.589311982],[795403.7162248231,7459336.715255432],[795250.8421682753,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136274/82277","x":136274,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7459336.715255432],[795403.7162248231,7459489.589311982],[795556.590281371,7459489.589311982],[795556.590281371,7459336.715255432],[795403.7162248231,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136275/82277","x":136275,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7459183.841198882],[794945.0940551758,7459336.715255432],[795097.9681117237,7459336.715255432],[795097.9681117237,7459183.841198882],[794945.0940551758,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136272/82278","x":136272,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7459183.841198882],[795097.9681117237,7459336.715255432],[795250.8421682753,7459336.715255432],[795250.8421682753,7459183.841198882],[795097.9681117237,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136273/82278","x":136273,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7459030.967142334],[795097.9681117237,7459183.841198882],[795250.8421682753,7459183.841198882],[795250.8421682753,7459030.967142334],[795097.9681117237,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136273/82279","x":136273,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7459183.841198882],[795250.8421682753,7459336.715255432],[795403.7162248231,7459336.715255432],[795403.7162248231,7459183.841198882],[795250.8421682753,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136274/82278","x":136274,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7459183.841198882],[795403.7162248231,7459336.715255432],[795556.590281371,7459336.715255432],[795556.590281371,7459183.841198882],[795403.7162248231,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136275/82278","x":136275,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7459030.967142334],[795250.8421682753,7459183.841198882],[795403.7162248231,7459183.841198882],[795403.7162248231,7459030.967142334],[795250.8421682753,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136274/82279","x":136274,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7459030.967142334],[795403.7162248231,7459183.841198882],[795556.590281371,7459183.841198882],[795556.590281371,7459030.967142334],[795403.7162248231,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136275/82279","x":136275,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7459489.589311982],[795556.590281371,7459642.463368529],[795709.4643379226,7459642.463368529],[795709.4643379226,7459489.589311982],[795556.590281371,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136276/82276","x":136276,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7459489.589311982],[795709.4643379226,7459642.463368529],[795862.3383944705,7459642.463368529],[795862.3383944705,7459489.589311982],[795709.4643379226,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136277/82276","x":136277,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7459336.715255432],[795556.590281371,7459489.589311982],[795709.4643379226,7459489.589311982],[795709.4643379226,7459336.715255432],[795556.590281371,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136276/82277","x":136276,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7459336.715255432],[795709.4643379226,7459489.589311982],[795862.3383944705,7459489.589311982],[795862.3383944705,7459336.715255432],[795709.4643379226,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136277/82277","x":136277,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7459489.589311982],[795862.3383944705,7459642.463368529],[796015.2124510184,7459642.463368529],[796015.2124510184,7459489.589311982],[795862.3383944705,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136278/82276","x":136278,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7459489.589311982],[796015.2124510184,7459642.463368529],[796168.08650757,7459642.463368529],[796168.08650757,7459489.589311982],[796015.2124510184,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136279/82276","x":136279,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7459336.715255432],[795862.3383944705,7459489.589311982],[796015.2124510184,7459489.589311982],[796015.2124510184,7459336.715255432],[795862.3383944705,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136278/82277","x":136278,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7459336.715255432],[796015.2124510184,7459489.589311982],[796168.08650757,7459489.589311982],[796168.08650757,7459336.715255432],[796015.2124510184,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136279/82277","x":136279,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7459183.841198882],[795556.590281371,7459336.715255432],[795709.4643379226,7459336.715255432],[795709.4643379226,7459183.841198882],[795556.590281371,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136276/82278","x":136276,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7459183.841198882],[795709.4643379226,7459336.715255432],[795862.3383944705,7459336.715255432],[795862.3383944705,7459183.841198882],[795709.4643379226,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136277/82278","x":136277,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7459030.967142334],[795556.590281371,7459183.841198882],[795709.4643379226,7459183.841198882],[795709.4643379226,7459030.967142334],[795556.590281371,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136276/82279","x":136276,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7459030.967142334],[795709.4643379226,7459183.841198882],[795862.3383944705,7459183.841198882],[795862.3383944705,7459030.967142334],[795709.4643379226,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136277/82279","x":136277,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7459183.841198882],[795862.3383944705,7459336.715255432],[796015.2124510184,7459336.715255432],[796015.2124510184,7459183.841198882],[795862.3383944705,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136278/82278","x":136278,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7459183.841198882],[796015.2124510184,7459336.715255432],[796168.08650757,7459336.715255432],[796168.08650757,7459183.841198882],[796015.2124510184,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136279/82278","x":136279,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7459030.967142334],[795862.3383944705,7459183.841198882],[796015.2124510184,7459183.841198882],[796015.2124510184,7459030.967142334],[795862.3383944705,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136278/82279","x":136278,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7459030.967142334],[796015.2124510184,7459183.841198882],[796168.08650757,7459183.841198882],[796168.08650757,7459030.967142334],[796015.2124510184,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136279/82279","x":136279,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7459642.463368529],[796168.08650757,7459795.337425079],[796320.9605641179,7459795.337425079],[796320.9605641179,7459642.463368529],[796168.08650757,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136280/82275","x":136280,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7459642.463368529],[796320.9605641179,7459795.337425079],[796473.8346206658,7459795.337425079],[796473.8346206658,7459642.463368529],[796320.9605641179,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136281/82275","x":136281,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7459642.463368529],[796473.8346206658,7459795.337425079],[796626.7086772174,7459795.337425079],[796626.7086772174,7459642.463368529],[796473.8346206658,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136282/82275","x":136282,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7459642.463368529],[796626.7086772174,7459795.337425079],[796779.5827337652,7459795.337425079],[796779.5827337652,7459642.463368529],[796626.7086772174,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136283/82275","x":136283,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7459642.463368529],[796779.5827337652,7459795.337425079],[796932.4567903131,7459795.337425079],[796932.4567903131,7459642.463368529],[796779.5827337652,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136284/82275","x":136284,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7459489.589311982],[796168.08650757,7459642.463368529],[796320.9605641179,7459642.463368529],[796320.9605641179,7459489.589311982],[796168.08650757,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136280/82276","x":136280,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7459489.589311982],[796320.9605641179,7459642.463368529],[796473.8346206658,7459642.463368529],[796473.8346206658,7459489.589311982],[796320.9605641179,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136281/82276","x":136281,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7459336.715255432],[796168.08650757,7459489.589311982],[796320.9605641179,7459489.589311982],[796320.9605641179,7459336.715255432],[796168.08650757,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136280/82277","x":136280,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7459336.715255432],[796320.9605641179,7459489.589311982],[796473.8346206658,7459489.589311982],[796473.8346206658,7459336.715255432],[796320.9605641179,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136281/82277","x":136281,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7459489.589311982],[796473.8346206658,7459642.463368529],[796626.7086772174,7459642.463368529],[796626.7086772174,7459489.589311982],[796473.8346206658,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136282/82276","x":136282,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7459489.589311982],[796626.7086772174,7459642.463368529],[796779.5827337652,7459642.463368529],[796779.5827337652,7459489.589311982],[796626.7086772174,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136283/82276","x":136283,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7459336.715255432],[796473.8346206658,7459489.589311982],[796626.7086772174,7459489.589311982],[796626.7086772174,7459336.715255432],[796473.8346206658,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136282/82277","x":136282,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7459336.715255432],[796626.7086772174,7459489.589311982],[796779.5827337652,7459489.589311982],[796779.5827337652,7459336.715255432],[796626.7086772174,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136283/82277","x":136283,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7459183.841198882],[796168.08650757,7459336.715255432],[796320.9605641179,7459336.715255432],[796320.9605641179,7459183.841198882],[796168.08650757,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136280/82278","x":136280,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7459183.841198882],[796320.9605641179,7459336.715255432],[796473.8346206658,7459336.715255432],[796473.8346206658,7459183.841198882],[796320.9605641179,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136281/82278","x":136281,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7459030.967142334],[796168.08650757,7459183.841198882],[796320.9605641179,7459183.841198882],[796320.9605641179,7459030.967142334],[796168.08650757,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136280/82279","x":136280,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7459030.967142334],[796320.9605641179,7459183.841198882],[796473.8346206658,7459183.841198882],[796473.8346206658,7459030.967142334],[796320.9605641179,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136281/82279","x":136281,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7459183.841198882],[796473.8346206658,7459336.715255432],[796626.7086772174,7459336.715255432],[796626.7086772174,7459183.841198882],[796473.8346206658,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136282/82278","x":136282,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7459183.841198882],[796626.7086772174,7459336.715255432],[796779.5827337652,7459336.715255432],[796779.5827337652,7459183.841198882],[796626.7086772174,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136283/82278","x":136283,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7459030.967142334],[796473.8346206658,7459183.841198882],[796626.7086772174,7459183.841198882],[796626.7086772174,7459030.967142334],[796473.8346206658,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136282/82279","x":136282,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7459030.967142334],[796626.7086772174,7459183.841198882],[796779.5827337652,7459183.841198882],[796779.5827337652,7459030.967142334],[796626.7086772174,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136283/82279","x":136283,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7459489.589311982],[796779.5827337652,7459642.463368529],[796932.4567903131,7459642.463368529],[796932.4567903131,7459489.589311982],[796779.5827337652,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136284/82276","x":136284,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7459336.715255432],[796779.5827337652,7459489.589311982],[796932.4567903131,7459489.589311982],[796932.4567903131,7459336.715255432],[796779.5827337652,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136284/82277","x":136284,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7459183.841198882],[796779.5827337652,7459336.715255432],[796932.4567903131,7459336.715255432],[796932.4567903131,7459183.841198882],[796779.5827337652,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136284/82278","x":136284,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7459030.967142334],[796779.5827337652,7459183.841198882],[796932.4567903131,7459183.841198882],[796932.4567903131,7459030.967142334],[796779.5827337652,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136284/82279","x":136284,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7458878.0930857845],[795250.8421682753,7459030.967142334],[795403.7162248231,7459030.967142334],[795403.7162248231,7458878.0930857845],[795250.8421682753,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136274/82280","x":136274,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7458878.0930857845],[795403.7162248231,7459030.967142334],[795556.590281371,7459030.967142334],[795556.590281371,7458878.0930857845],[795403.7162248231,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136275/82280","x":136275,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7458878.0930857845],[795556.590281371,7459030.967142334],[795709.4643379226,7459030.967142334],[795709.4643379226,7458878.0930857845],[795556.590281371,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136276/82280","x":136276,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7458878.0930857845],[795709.4643379226,7459030.967142334],[795862.3383944705,7459030.967142334],[795862.3383944705,7458878.0930857845],[795709.4643379226,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136277/82280","x":136277,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7458725.219029237],[795556.590281371,7458878.0930857845],[795709.4643379226,7458878.0930857845],[795709.4643379226,7458725.219029237],[795556.590281371,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136276/82281","x":136276,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7458725.219029237],[795709.4643379226,7458878.0930857845],[795862.3383944705,7458878.0930857845],[795862.3383944705,7458725.219029237],[795709.4643379226,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136277/82281","x":136277,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7458878.0930857845],[795862.3383944705,7459030.967142334],[796015.2124510184,7459030.967142334],[796015.2124510184,7458878.0930857845],[795862.3383944705,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136278/82280","x":136278,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7458878.0930857845],[796015.2124510184,7459030.967142334],[796168.08650757,7459030.967142334],[796168.08650757,7458878.0930857845],[796015.2124510184,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136279/82280","x":136279,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7458725.219029237],[795862.3383944705,7458878.0930857845],[796015.2124510184,7458878.0930857845],[796015.2124510184,7458725.219029237],[795862.3383944705,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136278/82281","x":136278,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7458725.219029237],[796015.2124510184,7458878.0930857845],[796168.08650757,7458878.0930857845],[796168.08650757,7458725.219029237],[796015.2124510184,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136279/82281","x":136279,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7458572.344972687],[795709.4643379226,7458725.219029237],[795862.3383944705,7458725.219029237],[795862.3383944705,7458572.344972687],[795709.4643379226,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136277/82282","x":136277,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7458419.470916137],[795556.590281371,7458572.344972687],[795709.4643379226,7458572.344972687],[795709.4643379226,7458419.470916137],[795556.590281371,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136276/82283","x":136276,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7458419.470916137],[795709.4643379226,7458572.344972687],[795862.3383944705,7458572.344972687],[795862.3383944705,7458419.470916137],[795709.4643379226,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136277/82283","x":136277,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7458572.344972687],[795862.3383944705,7458725.219029237],[796015.2124510184,7458725.219029237],[796015.2124510184,7458572.344972687],[795862.3383944705,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136278/82282","x":136278,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7458572.344972687],[796015.2124510184,7458725.219029237],[796168.08650757,7458725.219029237],[796168.08650757,7458572.344972687],[796015.2124510184,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136279/82282","x":136279,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7458419.470916137],[795862.3383944705,7458572.344972687],[796015.2124510184,7458572.344972687],[796015.2124510184,7458419.470916137],[795862.3383944705,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136278/82283","x":136278,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7458419.470916137],[796015.2124510184,7458572.344972687],[796168.08650757,7458572.344972687],[796168.08650757,7458419.470916137],[796015.2124510184,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136279/82283","x":136279,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7458113.7228030395],[794945.0940551758,7458266.596859589],[795097.9681117237,7458266.596859589],[795097.9681117237,7458113.7228030395],[794945.0940551758,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136272/82285","x":136272,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7458113.7228030395],[795097.9681117237,7458266.596859589],[795250.8421682753,7458266.596859589],[795250.8421682753,7458113.7228030395],[795097.9681117237,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136273/82285","x":136273,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7458266.596859589],[795250.8421682753,7458419.470916137],[795403.7162248231,7458419.470916137],[795403.7162248231,7458266.596859589],[795250.8421682753,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136274/82284","x":136274,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7458266.596859589],[795403.7162248231,7458419.470916137],[795556.590281371,7458419.470916137],[795556.590281371,7458266.596859589],[795403.7162248231,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136275/82284","x":136275,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7458113.7228030395],[795250.8421682753,7458266.596859589],[795403.7162248231,7458266.596859589],[795403.7162248231,7458113.7228030395],[795250.8421682753,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136274/82285","x":136274,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7458113.7228030395],[795403.7162248231,7458266.596859589],[795556.590281371,7458266.596859589],[795556.590281371,7458113.7228030395],[795403.7162248231,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136275/82285","x":136275,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7457960.84874649],[794945.0940551758,7458113.7228030395],[795097.9681117237,7458113.7228030395],[795097.9681117237,7457960.84874649],[794945.0940551758,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136272/82286","x":136272,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7457960.84874649],[795097.9681117237,7458113.7228030395],[795250.8421682753,7458113.7228030395],[795250.8421682753,7457960.84874649],[795097.9681117237,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136273/82286","x":136273,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7457807.974689942],[794945.0940551758,7457960.84874649],[795097.9681117237,7457960.84874649],[795097.9681117237,7457807.974689942],[794945.0940551758,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136272/82287","x":136272,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7457807.974689942],[795097.9681117237,7457960.84874649],[795250.8421682753,7457960.84874649],[795250.8421682753,7457807.974689942],[795097.9681117237,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136273/82287","x":136273,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7457960.84874649],[795250.8421682753,7458113.7228030395],[795403.7162248231,7458113.7228030395],[795403.7162248231,7457960.84874649],[795250.8421682753,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136274/82286","x":136274,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7457960.84874649],[795403.7162248231,7458113.7228030395],[795556.590281371,7458113.7228030395],[795556.590281371,7457960.84874649],[795403.7162248231,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136275/82286","x":136275,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7457807.974689942],[795250.8421682753,7457960.84874649],[795403.7162248231,7457960.84874649],[795403.7162248231,7457807.974689942],[795250.8421682753,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136274/82287","x":136274,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7457807.974689942],[795403.7162248231,7457960.84874649],[795556.590281371,7457960.84874649],[795556.590281371,7457807.974689942],[795403.7162248231,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136275/82287","x":136275,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7458266.596859589],[795556.590281371,7458419.470916137],[795709.4643379226,7458419.470916137],[795709.4643379226,7458266.596859589],[795556.590281371,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136276/82284","x":136276,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7458266.596859589],[795709.4643379226,7458419.470916137],[795862.3383944705,7458419.470916137],[795862.3383944705,7458266.596859589],[795709.4643379226,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136277/82284","x":136277,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7458113.7228030395],[795556.590281371,7458266.596859589],[795709.4643379226,7458266.596859589],[795709.4643379226,7458113.7228030395],[795556.590281371,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136276/82285","x":136276,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7458113.7228030395],[795709.4643379226,7458266.596859589],[795862.3383944705,7458266.596859589],[795862.3383944705,7458113.7228030395],[795709.4643379226,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136277/82285","x":136277,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7458266.596859589],[795862.3383944705,7458419.470916137],[796015.2124510184,7458419.470916137],[796015.2124510184,7458266.596859589],[795862.3383944705,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136278/82284","x":136278,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7458266.596859589],[796015.2124510184,7458419.470916137],[796168.08650757,7458419.470916137],[796168.08650757,7458266.596859589],[796015.2124510184,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136279/82284","x":136279,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7458113.7228030395],[795862.3383944705,7458266.596859589],[796015.2124510184,7458266.596859589],[796015.2124510184,7458113.7228030395],[795862.3383944705,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136278/82285","x":136278,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7458113.7228030395],[796015.2124510184,7458266.596859589],[796168.08650757,7458266.596859589],[796168.08650757,7458113.7228030395],[796015.2124510184,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136279/82285","x":136279,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7457960.84874649],[795556.590281371,7458113.7228030395],[795709.4643379226,7458113.7228030395],[795709.4643379226,7457960.84874649],[795556.590281371,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136276/82286","x":136276,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7457960.84874649],[795709.4643379226,7458113.7228030395],[795862.3383944705,7458113.7228030395],[795862.3383944705,7457960.84874649],[795709.4643379226,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136277/82286","x":136277,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7457807.974689942],[795556.590281371,7457960.84874649],[795709.4643379226,7457960.84874649],[795709.4643379226,7457807.974689942],[795556.590281371,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136276/82287","x":136276,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7457807.974689942],[795709.4643379226,7457960.84874649],[795862.3383944705,7457960.84874649],[795862.3383944705,7457807.974689942],[795709.4643379226,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136277/82287","x":136277,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7457960.84874649],[795862.3383944705,7458113.7228030395],[796015.2124510184,7458113.7228030395],[796015.2124510184,7457960.84874649],[795862.3383944705,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136278/82286","x":136278,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7457960.84874649],[796015.2124510184,7458113.7228030395],[796168.08650757,7458113.7228030395],[796168.08650757,7457960.84874649],[796015.2124510184,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136279/82286","x":136279,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7457807.974689942],[795862.3383944705,7457960.84874649],[796015.2124510184,7457960.84874649],[796015.2124510184,7457807.974689942],[795862.3383944705,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136278/82287","x":136278,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7457807.974689942],[796015.2124510184,7457960.84874649],[796168.08650757,7457960.84874649],[796168.08650757,7457807.974689942],[796015.2124510184,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136279/82287","x":136279,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7458878.0930857845],[796168.08650757,7459030.967142334],[796320.9605641179,7459030.967142334],[796320.9605641179,7458878.0930857845],[796168.08650757,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136280/82280","x":136280,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7458878.0930857845],[796320.9605641179,7459030.967142334],[796473.8346206658,7459030.967142334],[796473.8346206658,7458878.0930857845],[796320.9605641179,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136281/82280","x":136281,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7458725.219029237],[796168.08650757,7458878.0930857845],[796320.9605641179,7458878.0930857845],[796320.9605641179,7458725.219029237],[796168.08650757,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136280/82281","x":136280,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7458725.219029237],[796320.9605641179,7458878.0930857845],[796473.8346206658,7458878.0930857845],[796473.8346206658,7458725.219029237],[796320.9605641179,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136281/82281","x":136281,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7458878.0930857845],[796473.8346206658,7459030.967142334],[796626.7086772174,7459030.967142334],[796626.7086772174,7458878.0930857845],[796473.8346206658,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136282/82280","x":136282,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7458878.0930857845],[796626.7086772174,7459030.967142334],[796779.5827337652,7459030.967142334],[796779.5827337652,7458878.0930857845],[796626.7086772174,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136283/82280","x":136283,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7458725.219029237],[796473.8346206658,7458878.0930857845],[796626.7086772174,7458878.0930857845],[796626.7086772174,7458725.219029237],[796473.8346206658,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136282/82281","x":136282,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7458725.219029237],[796626.7086772174,7458878.0930857845],[796779.5827337652,7458878.0930857845],[796779.5827337652,7458725.219029237],[796626.7086772174,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136283/82281","x":136283,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7458572.344972687],[796168.08650757,7458725.219029237],[796320.9605641179,7458725.219029237],[796320.9605641179,7458572.344972687],[796168.08650757,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136280/82282","x":136280,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7458572.344972687],[796320.9605641179,7458725.219029237],[796473.8346206658,7458725.219029237],[796473.8346206658,7458572.344972687],[796320.9605641179,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136281/82282","x":136281,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7458419.470916137],[796168.08650757,7458572.344972687],[796320.9605641179,7458572.344972687],[796320.9605641179,7458419.470916137],[796168.08650757,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136280/82283","x":136280,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7458419.470916137],[796320.9605641179,7458572.344972687],[796473.8346206658,7458572.344972687],[796473.8346206658,7458419.470916137],[796320.9605641179,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136281/82283","x":136281,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7458572.344972687],[796473.8346206658,7458725.219029237],[796626.7086772174,7458725.219029237],[796626.7086772174,7458572.344972687],[796473.8346206658,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136282/82282","x":136282,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7458572.344972687],[796626.7086772174,7458725.219029237],[796779.5827337652,7458725.219029237],[796779.5827337652,7458572.344972687],[796626.7086772174,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136283/82282","x":136283,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7458419.470916137],[796473.8346206658,7458572.344972687],[796626.7086772174,7458572.344972687],[796626.7086772174,7458419.470916137],[796473.8346206658,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136282/82283","x":136282,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7458419.470916137],[796626.7086772174,7458572.344972687],[796779.5827337652,7458572.344972687],[796779.5827337652,7458419.470916137],[796626.7086772174,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136283/82283","x":136283,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7458878.0930857845],[796779.5827337652,7459030.967142334],[796932.4567903131,7459030.967142334],[796932.4567903131,7458878.0930857845],[796779.5827337652,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136284/82280","x":136284,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7458266.596859589],[796168.08650757,7458419.470916137],[796320.9605641179,7458419.470916137],[796320.9605641179,7458266.596859589],[796168.08650757,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136280/82284","x":136280,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7458266.596859589],[796320.9605641179,7458419.470916137],[796473.8346206658,7458419.470916137],[796473.8346206658,7458266.596859589],[796320.9605641179,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136281/82284","x":136281,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7458113.7228030395],[796168.08650757,7458266.596859589],[796320.9605641179,7458266.596859589],[796320.9605641179,7458113.7228030395],[796168.08650757,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136280/82285","x":136280,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7458113.7228030395],[796320.9605641179,7458266.596859589],[796473.8346206658,7458266.596859589],[796473.8346206658,7458113.7228030395],[796320.9605641179,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136281/82285","x":136281,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7458266.596859589],[796473.8346206658,7458419.470916137],[796626.7086772174,7458419.470916137],[796626.7086772174,7458266.596859589],[796473.8346206658,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136282/82284","x":136282,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7458266.596859589],[796626.7086772174,7458419.470916137],[796779.5827337652,7458419.470916137],[796779.5827337652,7458266.596859589],[796626.7086772174,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136283/82284","x":136283,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7458113.7228030395],[796473.8346206658,7458266.596859589],[796626.7086772174,7458266.596859589],[796626.7086772174,7458113.7228030395],[796473.8346206658,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136282/82285","x":136282,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7458113.7228030395],[796626.7086772174,7458266.596859589],[796779.5827337652,7458266.596859589],[796779.5827337652,7458113.7228030395],[796626.7086772174,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136283/82285","x":136283,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7457960.84874649],[796168.08650757,7458113.7228030395],[796320.9605641179,7458113.7228030395],[796320.9605641179,7457960.84874649],[796168.08650757,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136280/82286","x":136280,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7457960.84874649],[796320.9605641179,7458113.7228030395],[796473.8346206658,7458113.7228030395],[796473.8346206658,7457960.84874649],[796320.9605641179,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136281/82286","x":136281,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7457807.974689942],[796168.08650757,7457960.84874649],[796320.9605641179,7457960.84874649],[796320.9605641179,7457807.974689942],[796168.08650757,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136280/82287","x":136280,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7457807.974689942],[796320.9605641179,7457960.84874649],[796473.8346206658,7457960.84874649],[796473.8346206658,7457807.974689942],[796320.9605641179,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136281/82287","x":136281,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7457960.84874649],[796473.8346206658,7458113.7228030395],[796626.7086772174,7458113.7228030395],[796626.7086772174,7457960.84874649],[796473.8346206658,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136282/82286","x":136282,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7457960.84874649],[796626.7086772174,7458113.7228030395],[796779.5827337652,7458113.7228030395],[796779.5827337652,7457960.84874649],[796626.7086772174,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136283/82286","x":136283,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7457807.974689942],[796473.8346206658,7457960.84874649],[796626.7086772174,7457960.84874649],[796626.7086772174,7457807.974689942],[796473.8346206658,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136282/82287","x":136282,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7457807.974689942],[796626.7086772174,7457960.84874649],[796779.5827337652,7457960.84874649],[796779.5827337652,7457807.974689942],[796626.7086772174,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136283/82287","x":136283,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7457655.100633392],[792499.1091503911,7457807.974689942],[792651.983206939,7457807.974689942],[792651.983206939,7457655.100633392],[792499.1091503911,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136256/82288","x":136256,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7457655.100633392],[792651.983206939,7457807.974689942],[792804.8572634906,7457807.974689942],[792804.8572634906,7457655.100633392],[792651.983206939,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136257/82288","x":136257,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7457502.226576842],[792499.1091503911,7457655.100633392],[792651.983206939,7457655.100633392],[792651.983206939,7457502.226576842],[792499.1091503911,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136256/82289","x":136256,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7457502.226576842],[792651.983206939,7457655.100633392],[792804.8572634906,7457655.100633392],[792804.8572634906,7457502.226576842],[792651.983206939,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136257/82289","x":136257,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7457655.100633392],[792804.8572634906,7457807.974689942],[792957.7313200384,7457807.974689942],[792957.7313200384,7457655.100633392],[792804.8572634906,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136258/82288","x":136258,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7457655.100633392],[792957.7313200384,7457807.974689942],[793110.6053765863,7457807.974689942],[793110.6053765863,7457655.100633392],[792957.7313200384,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136259/82288","x":136259,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7457502.226576842],[792804.8572634906,7457655.100633392],[792957.7313200384,7457655.100633392],[792957.7313200384,7457502.226576842],[792804.8572634906,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136258/82289","x":136258,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7457502.226576842],[792957.7313200384,7457655.100633392],[793110.6053765863,7457655.100633392],[793110.6053765863,7457502.226576842],[792957.7313200384,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136259/82289","x":136259,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7457349.3525202945],[792499.1091503911,7457502.226576842],[792651.983206939,7457502.226576842],[792651.983206939,7457349.3525202945],[792499.1091503911,7457349.3525202945]]],"type":"Polygon"},"properties":{"label":"18/136256/82290","x":136256,"y":82290,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7457349.3525202945],[792651.983206939,7457502.226576842],[792804.8572634906,7457502.226576842],[792804.8572634906,7457349.3525202945],[792651.983206939,7457349.3525202945]]],"type":"Polygon"},"properties":{"label":"18/136257/82290","x":136257,"y":82290,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7457196.478463745],[792499.1091503911,7457349.3525202945],[792651.983206939,7457349.3525202945],[792651.983206939,7457196.478463745],[792499.1091503911,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136256/82291","x":136256,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7457196.478463745],[792651.983206939,7457349.3525202945],[792804.8572634906,7457349.3525202945],[792804.8572634906,7457196.478463745],[792651.983206939,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136257/82291","x":136257,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7457349.3525202945],[792804.8572634906,7457502.226576842],[792957.7313200384,7457502.226576842],[792957.7313200384,7457349.3525202945],[792804.8572634906,7457349.3525202945]]],"type":"Polygon"},"properties":{"label":"18/136258/82290","x":136258,"y":82290,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7457349.3525202945],[792957.7313200384,7457502.226576842],[793110.6053765863,7457502.226576842],[793110.6053765863,7457349.3525202945],[792957.7313200384,7457349.3525202945]]],"type":"Polygon"},"properties":{"label":"18/136259/82290","x":136259,"y":82290,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7457196.478463745],[792804.8572634906,7457349.3525202945],[792957.7313200384,7457349.3525202945],[792957.7313200384,7457196.478463745],[792804.8572634906,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136258/82291","x":136258,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7457196.478463745],[792957.7313200384,7457349.3525202945],[793110.6053765863,7457349.3525202945],[793110.6053765863,7457196.478463745],[792957.7313200384,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136259/82291","x":136259,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7457655.100633392],[793110.6053765863,7457807.974689942],[793263.4794331342,7457807.974689942],[793263.4794331342,7457655.100633392],[793110.6053765863,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136260/82288","x":136260,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7457502.226576842],[793110.6053765863,7457655.100633392],[793263.4794331342,7457655.100633392],[793263.4794331342,7457502.226576842],[793110.6053765863,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136260/82289","x":136260,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7457349.3525202945],[793110.6053765863,7457502.226576842],[793263.4794331342,7457502.226576842],[793263.4794331342,7457349.3525202945],[793110.6053765863,7457349.3525202945]]],"type":"Polygon"},"properties":{"label":"18/136260/82290","x":136260,"y":82290,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7457196.478463745],[793110.6053765863,7457349.3525202945],[793263.4794331342,7457349.3525202945],[793263.4794331342,7457196.478463745],[793110.6053765863,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136260/82291","x":136260,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7457043.604407197],[792499.1091503911,7457196.478463745],[792651.983206939,7457196.478463745],[792651.983206939,7457043.604407197],[792499.1091503911,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136256/82292","x":136256,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7457043.604407197],[792651.983206939,7457196.478463745],[792804.8572634906,7457196.478463745],[792804.8572634906,7457043.604407197],[792651.983206939,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136257/82292","x":136257,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7456890.730350647],[792499.1091503911,7457043.604407197],[792651.983206939,7457043.604407197],[792651.983206939,7456890.730350647],[792499.1091503911,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136256/82293","x":136256,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7456890.730350647],[792651.983206939,7457043.604407197],[792804.8572634906,7457043.604407197],[792804.8572634906,7456890.730350647],[792651.983206939,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136257/82293","x":136257,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7457043.604407197],[792804.8572634906,7457196.478463745],[792957.7313200384,7457196.478463745],[792957.7313200384,7457043.604407197],[792804.8572634906,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136258/82292","x":136258,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7457043.604407197],[792957.7313200384,7457196.478463745],[793110.6053765863,7457196.478463745],[793110.6053765863,7457043.604407197],[792957.7313200384,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136259/82292","x":136259,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7456890.730350647],[792804.8572634906,7457043.604407197],[792957.7313200384,7457043.604407197],[792957.7313200384,7456890.730350647],[792804.8572634906,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136258/82293","x":136258,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7456890.730350647],[792957.7313200384,7457043.604407197],[793110.6053765863,7457043.604407197],[793110.6053765863,7456890.730350647],[792957.7313200384,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136259/82293","x":136259,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7456737.856294097],[792499.1091503911,7456890.730350647],[792651.983206939,7456890.730350647],[792651.983206939,7456737.856294097],[792499.1091503911,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136256/82294","x":136256,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7456737.856294097],[792651.983206939,7456890.730350647],[792804.8572634906,7456890.730350647],[792804.8572634906,7456737.856294097],[792651.983206939,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136257/82294","x":136257,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792499.1091503911,7456584.9822375495],[792499.1091503911,7456737.856294097],[792651.983206939,7456737.856294097],[792651.983206939,7456584.9822375495],[792499.1091503911,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136256/82295","x":136256,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7456584.9822375495],[792651.983206939,7456737.856294097],[792804.8572634906,7456737.856294097],[792804.8572634906,7456584.9822375495],[792651.983206939,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136257/82295","x":136257,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7456737.856294097],[792804.8572634906,7456890.730350647],[792957.7313200384,7456890.730350647],[792957.7313200384,7456737.856294097],[792804.8572634906,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136258/82294","x":136258,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7456737.856294097],[792957.7313200384,7456890.730350647],[793110.6053765863,7456890.730350647],[793110.6053765863,7456737.856294097],[792957.7313200384,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136259/82294","x":136259,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7456584.9822375495],[792804.8572634906,7456737.856294097],[792957.7313200384,7456737.856294097],[792957.7313200384,7456584.9822375495],[792804.8572634906,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136258/82295","x":136258,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7456584.9822375495],[792957.7313200384,7456737.856294097],[793110.6053765863,7456737.856294097],[793110.6053765863,7456584.9822375495],[792957.7313200384,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136259/82295","x":136259,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7457043.604407197],[793110.6053765863,7457196.478463745],[793263.4794331342,7457196.478463745],[793263.4794331342,7457043.604407197],[793110.6053765863,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136260/82292","x":136260,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7457043.604407197],[793263.4794331342,7457196.478463745],[793416.3534896858,7457196.478463745],[793416.3534896858,7457043.604407197],[793263.4794331342,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136261/82292","x":136261,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7456890.730350647],[793110.6053765863,7457043.604407197],[793263.4794331342,7457043.604407197],[793263.4794331342,7456890.730350647],[793110.6053765863,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136260/82293","x":136260,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7456890.730350647],[793263.4794331342,7457043.604407197],[793416.3534896858,7457043.604407197],[793416.3534896858,7456890.730350647],[793263.4794331342,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136261/82293","x":136261,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7457043.604407197],[793416.3534896858,7457196.478463745],[793569.2275462337,7457196.478463745],[793569.2275462337,7457043.604407197],[793416.3534896858,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136262/82292","x":136262,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7456890.730350647],[793416.3534896858,7457043.604407197],[793569.2275462337,7457043.604407197],[793569.2275462337,7456890.730350647],[793416.3534896858,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136262/82293","x":136262,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7456737.856294097],[793110.6053765863,7456890.730350647],[793263.4794331342,7456890.730350647],[793263.4794331342,7456737.856294097],[793110.6053765863,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136260/82294","x":136260,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7456737.856294097],[793263.4794331342,7456890.730350647],[793416.3534896858,7456890.730350647],[793416.3534896858,7456737.856294097],[793263.4794331342,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136261/82294","x":136261,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7456584.9822375495],[793110.6053765863,7456737.856294097],[793263.4794331342,7456737.856294097],[793263.4794331342,7456584.9822375495],[793110.6053765863,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136260/82295","x":136260,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7456584.9822375495],[793263.4794331342,7456737.856294097],[793416.3534896858,7456737.856294097],[793416.3534896858,7456584.9822375495],[793263.4794331342,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136261/82295","x":136261,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7456737.856294097],[793416.3534896858,7456890.730350647],[793569.2275462337,7456890.730350647],[793569.2275462337,7456737.856294097],[793416.3534896858,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136262/82294","x":136262,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7456737.856294097],[793569.2275462337,7456890.730350647],[793722.1016027816,7456890.730350647],[793722.1016027816,7456737.856294097],[793569.2275462337,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136263/82294","x":136263,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7456584.9822375495],[793416.3534896858,7456737.856294097],[793569.2275462337,7456737.856294097],[793569.2275462337,7456584.9822375495],[793416.3534896858,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136262/82295","x":136262,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7456584.9822375495],[793569.2275462337,7456737.856294097],[793722.1016027816,7456737.856294097],[793722.1016027816,7456584.9822375495],[793569.2275462337,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136263/82295","x":136263,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7457655.100633392],[794486.4718855284,7457807.974689942],[794639.3459420763,7457807.974689942],[794639.3459420763,7457655.100633392],[794486.4718855284,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136269/82288","x":136269,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7457502.226576842],[794486.4718855284,7457655.100633392],[794639.3459420763,7457655.100633392],[794639.3459420763,7457502.226576842],[794486.4718855284,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136269/82289","x":136269,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7457655.100633392],[794639.3459420763,7457807.974689942],[794792.2199986279,7457807.974689942],[794792.2199986279,7457655.100633392],[794639.3459420763,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136270/82288","x":136270,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7457655.100633392],[794792.2199986279,7457807.974689942],[794945.0940551758,7457807.974689942],[794945.0940551758,7457655.100633392],[794792.2199986279,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136271/82288","x":136271,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7457502.226576842],[794639.3459420763,7457655.100633392],[794792.2199986279,7457655.100633392],[794792.2199986279,7457502.226576842],[794639.3459420763,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136270/82289","x":136270,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7457502.226576842],[794792.2199986279,7457655.100633392],[794945.0940551758,7457655.100633392],[794945.0940551758,7457502.226576842],[794792.2199986279,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136271/82289","x":136271,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7456737.856294097],[793722.1016027816,7456890.730350647],[793874.9756593332,7456890.730350647],[793874.9756593332,7456737.856294097],[793722.1016027816,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136264/82294","x":136264,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7456584.9822375495],[793722.1016027816,7456737.856294097],[793874.9756593332,7456737.856294097],[793874.9756593332,7456584.9822375495],[793722.1016027816,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136264/82295","x":136264,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7456584.9822375495],[793874.9756593332,7456737.856294097],[794027.849715881,7456737.856294097],[794027.849715881,7456584.9822375495],[793874.9756593332,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136265/82295","x":136265,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792651.983206939,7456432.108181],[792651.983206939,7456584.9822375495],[792804.8572634906,7456584.9822375495],[792804.8572634906,7456432.108181],[792651.983206939,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136257/82296","x":136257,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792804.8572634906,7456432.108181],[792804.8572634906,7456584.9822375495],[792957.7313200384,7456584.9822375495],[792957.7313200384,7456432.108181],[792804.8572634906,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136258/82296","x":136258,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7456432.108181],[792957.7313200384,7456584.9822375495],[793110.6053765863,7456584.9822375495],[793110.6053765863,7456432.108181],[792957.7313200384,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136259/82296","x":136259,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[792957.7313200384,7456279.23412445],[792957.7313200384,7456432.108181],[793110.6053765863,7456432.108181],[793110.6053765863,7456279.23412445],[792957.7313200384,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136259/82297","x":136259,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7456432.108181],[793110.6053765863,7456584.9822375495],[793263.4794331342,7456584.9822375495],[793263.4794331342,7456432.108181],[793110.6053765863,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136260/82296","x":136260,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7456432.108181],[793263.4794331342,7456584.9822375495],[793416.3534896858,7456584.9822375495],[793416.3534896858,7456432.108181],[793263.4794331342,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136261/82296","x":136261,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7456279.23412445],[793110.6053765863,7456432.108181],[793263.4794331342,7456432.108181],[793263.4794331342,7456279.23412445],[793110.6053765863,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136260/82297","x":136260,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7456279.23412445],[793263.4794331342,7456432.108181],[793416.3534896858,7456432.108181],[793416.3534896858,7456279.23412445],[793263.4794331342,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136261/82297","x":136261,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7456432.108181],[793416.3534896858,7456584.9822375495],[793569.2275462337,7456584.9822375495],[793569.2275462337,7456432.108181],[793416.3534896858,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136262/82296","x":136262,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7456432.108181],[793569.2275462337,7456584.9822375495],[793722.1016027816,7456584.9822375495],[793722.1016027816,7456432.108181],[793569.2275462337,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136263/82296","x":136263,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7456279.23412445],[793416.3534896858,7456432.108181],[793569.2275462337,7456432.108181],[793569.2275462337,7456279.23412445],[793416.3534896858,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136262/82297","x":136262,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7456279.23412445],[793569.2275462337,7456432.108181],[793722.1016027816,7456432.108181],[793722.1016027816,7456279.23412445],[793569.2275462337,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136263/82297","x":136263,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793110.6053765863,7456126.360067902],[793110.6053765863,7456279.23412445],[793263.4794331342,7456279.23412445],[793263.4794331342,7456126.360067902],[793110.6053765863,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136260/82298","x":136260,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7456126.360067902],[793263.4794331342,7456279.23412445],[793416.3534896858,7456279.23412445],[793416.3534896858,7456126.360067902],[793263.4794331342,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136261/82298","x":136261,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793263.4794331342,7455973.486011352],[793263.4794331342,7456126.360067902],[793416.3534896858,7456126.360067902],[793416.3534896858,7455973.486011352],[793263.4794331342,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136261/82299","x":136261,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7456126.360067902],[793416.3534896858,7456279.23412445],[793569.2275462337,7456279.23412445],[793569.2275462337,7456126.360067902],[793416.3534896858,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136262/82298","x":136262,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7456126.360067902],[793569.2275462337,7456279.23412445],[793722.1016027816,7456279.23412445],[793722.1016027816,7456126.360067902],[793569.2275462337,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136263/82298","x":136263,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7455973.486011352],[793416.3534896858,7456126.360067902],[793569.2275462337,7456126.360067902],[793569.2275462337,7455973.486011352],[793416.3534896858,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136262/82299","x":136262,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7455973.486011352],[793569.2275462337,7456126.360067902],[793722.1016027816,7456126.360067902],[793722.1016027816,7455973.486011352],[793569.2275462337,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136263/82299","x":136263,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793416.3534896858,7455820.611954803],[793416.3534896858,7455973.486011352],[793569.2275462337,7455973.486011352],[793569.2275462337,7455820.611954803],[793416.3534896858,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136262/82300","x":136262,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7455820.611954803],[793569.2275462337,7455973.486011352],[793722.1016027816,7455973.486011352],[793722.1016027816,7455820.611954803],[793569.2275462337,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136263/82300","x":136263,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793569.2275462337,7455667.737898255],[793569.2275462337,7455820.611954803],[793722.1016027816,7455820.611954803],[793722.1016027816,7455667.737898255],[793569.2275462337,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136263/82301","x":136263,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7456432.108181],[793722.1016027816,7456584.9822375495],[793874.9756593332,7456584.9822375495],[793874.9756593332,7456432.108181],[793722.1016027816,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136264/82296","x":136264,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7456432.108181],[793874.9756593332,7456584.9822375495],[794027.849715881,7456584.9822375495],[794027.849715881,7456432.108181],[793874.9756593332,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136265/82296","x":136265,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7456279.23412445],[793722.1016027816,7456432.108181],[793874.9756593332,7456432.108181],[793874.9756593332,7456279.23412445],[793722.1016027816,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136264/82297","x":136264,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7456279.23412445],[793874.9756593332,7456432.108181],[794027.849715881,7456432.108181],[794027.849715881,7456279.23412445],[793874.9756593332,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136265/82297","x":136265,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7456432.108181],[794027.849715881,7456584.9822375495],[794180.7237724289,7456584.9822375495],[794180.7237724289,7456432.108181],[794027.849715881,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136266/82296","x":136266,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7456279.23412445],[794027.849715881,7456432.108181],[794180.7237724289,7456432.108181],[794180.7237724289,7456279.23412445],[794027.849715881,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136266/82297","x":136266,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7456279.23412445],[794180.7237724289,7456432.108181],[794333.5978289805,7456432.108181],[794333.5978289805,7456279.23412445],[794180.7237724289,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136267/82297","x":136267,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7456126.360067902],[793722.1016027816,7456279.23412445],[793874.9756593332,7456279.23412445],[793874.9756593332,7456126.360067902],[793722.1016027816,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136264/82298","x":136264,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7456126.360067902],[793874.9756593332,7456279.23412445],[794027.849715881,7456279.23412445],[794027.849715881,7456126.360067902],[793874.9756593332,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136265/82298","x":136265,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7455973.486011352],[793722.1016027816,7456126.360067902],[793874.9756593332,7456126.360067902],[793874.9756593332,7455973.486011352],[793722.1016027816,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136264/82299","x":136264,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7455973.486011352],[793874.9756593332,7456126.360067902],[794027.849715881,7456126.360067902],[794027.849715881,7455973.486011352],[793874.9756593332,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136265/82299","x":136265,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7456126.360067902],[794027.849715881,7456279.23412445],[794180.7237724289,7456279.23412445],[794180.7237724289,7456126.360067902],[794027.849715881,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136266/82298","x":136266,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7456126.360067902],[794180.7237724289,7456279.23412445],[794333.5978289805,7456279.23412445],[794333.5978289805,7456126.360067902],[794180.7237724289,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136267/82298","x":136267,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7455973.486011352],[794027.849715881,7456126.360067902],[794180.7237724289,7456126.360067902],[794180.7237724289,7455973.486011352],[794027.849715881,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136266/82299","x":136266,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7455973.486011352],[794180.7237724289,7456126.360067902],[794333.5978289805,7456126.360067902],[794333.5978289805,7455973.486011352],[794180.7237724289,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136267/82299","x":136267,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7456126.360067902],[794333.5978289805,7456279.23412445],[794486.4718855284,7456279.23412445],[794486.4718855284,7456126.360067902],[794333.5978289805,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136268/82298","x":136268,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7456126.360067902],[794486.4718855284,7456279.23412445],[794639.3459420763,7456279.23412445],[794639.3459420763,7456126.360067902],[794486.4718855284,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136269/82298","x":136269,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7455973.486011352],[794333.5978289805,7456126.360067902],[794486.4718855284,7456126.360067902],[794486.4718855284,7455973.486011352],[794333.5978289805,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136268/82299","x":136268,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7455973.486011352],[794486.4718855284,7456126.360067902],[794639.3459420763,7456126.360067902],[794639.3459420763,7455973.486011352],[794486.4718855284,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136269/82299","x":136269,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7456126.360067902],[794639.3459420763,7456279.23412445],[794792.2199986279,7456279.23412445],[794792.2199986279,7456126.360067902],[794639.3459420763,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136270/82298","x":136270,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7456126.360067902],[794792.2199986279,7456279.23412445],[794945.0940551758,7456279.23412445],[794945.0940551758,7456126.360067902],[794792.2199986279,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136271/82298","x":136271,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7455973.486011352],[794639.3459420763,7456126.360067902],[794792.2199986279,7456126.360067902],[794792.2199986279,7455973.486011352],[794639.3459420763,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136270/82299","x":136270,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7455973.486011352],[794792.2199986279,7456126.360067902],[794945.0940551758,7456126.360067902],[794945.0940551758,7455973.486011352],[794792.2199986279,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136271/82299","x":136271,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7455820.611954803],[793722.1016027816,7455973.486011352],[793874.9756593332,7455973.486011352],[793874.9756593332,7455820.611954803],[793722.1016027816,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136264/82300","x":136264,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7455820.611954803],[793874.9756593332,7455973.486011352],[794027.849715881,7455973.486011352],[794027.849715881,7455820.611954803],[793874.9756593332,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136265/82300","x":136265,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7455667.737898255],[793722.1016027816,7455820.611954803],[793874.9756593332,7455820.611954803],[793874.9756593332,7455667.737898255],[793722.1016027816,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136264/82301","x":136264,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7455667.737898255],[793874.9756593332,7455820.611954803],[794027.849715881,7455820.611954803],[794027.849715881,7455667.737898255],[793874.9756593332,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136265/82301","x":136265,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7455820.611954803],[794027.849715881,7455973.486011352],[794180.7237724289,7455973.486011352],[794180.7237724289,7455820.611954803],[794027.849715881,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136266/82300","x":136266,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7455820.611954803],[794180.7237724289,7455973.486011352],[794333.5978289805,7455973.486011352],[794333.5978289805,7455820.611954803],[794180.7237724289,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136267/82300","x":136267,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7455667.737898255],[794027.849715881,7455820.611954803],[794180.7237724289,7455820.611954803],[794180.7237724289,7455667.737898255],[794027.849715881,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136266/82301","x":136266,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7455667.737898255],[794180.7237724289,7455820.611954803],[794333.5978289805,7455820.611954803],[794333.5978289805,7455667.737898255],[794180.7237724289,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136267/82301","x":136267,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793722.1016027816,7455514.863841705],[793722.1016027816,7455667.737898255],[793874.9756593332,7455667.737898255],[793874.9756593332,7455514.863841705],[793722.1016027816,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136264/82302","x":136264,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7455514.863841705],[793874.9756593332,7455667.737898255],[794027.849715881,7455667.737898255],[794027.849715881,7455514.863841705],[793874.9756593332,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136265/82302","x":136265,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[793874.9756593332,7455361.989785155],[793874.9756593332,7455514.863841705],[794027.849715881,7455514.863841705],[794027.849715881,7455361.989785155],[793874.9756593332,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136265/82303","x":136265,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7455514.863841705],[794027.849715881,7455667.737898255],[794180.7237724289,7455667.737898255],[794180.7237724289,7455514.863841705],[794027.849715881,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136266/82302","x":136266,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7455514.863841705],[794180.7237724289,7455667.737898255],[794333.5978289805,7455667.737898255],[794333.5978289805,7455514.863841705],[794180.7237724289,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136267/82302","x":136267,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7455361.989785155],[794027.849715881,7455514.863841705],[794180.7237724289,7455514.863841705],[794180.7237724289,7455361.989785155],[794027.849715881,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136266/82303","x":136266,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7455361.989785155],[794180.7237724289,7455514.863841705],[794333.5978289805,7455514.863841705],[794333.5978289805,7455361.989785155],[794180.7237724289,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136267/82303","x":136267,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7455820.611954803],[794333.5978289805,7455973.486011352],[794486.4718855284,7455973.486011352],[794486.4718855284,7455820.611954803],[794333.5978289805,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136268/82300","x":136268,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7455820.611954803],[794486.4718855284,7455973.486011352],[794639.3459420763,7455973.486011352],[794639.3459420763,7455820.611954803],[794486.4718855284,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136269/82300","x":136269,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7455667.737898255],[794333.5978289805,7455820.611954803],[794486.4718855284,7455820.611954803],[794486.4718855284,7455667.737898255],[794333.5978289805,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136268/82301","x":136268,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7455667.737898255],[794486.4718855284,7455820.611954803],[794639.3459420763,7455820.611954803],[794639.3459420763,7455667.737898255],[794486.4718855284,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136269/82301","x":136269,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7455820.611954803],[794639.3459420763,7455973.486011352],[794792.2199986279,7455973.486011352],[794792.2199986279,7455820.611954803],[794639.3459420763,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136270/82300","x":136270,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7455820.611954803],[794792.2199986279,7455973.486011352],[794945.0940551758,7455973.486011352],[794945.0940551758,7455820.611954803],[794792.2199986279,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136271/82300","x":136271,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7455667.737898255],[794639.3459420763,7455820.611954803],[794792.2199986279,7455820.611954803],[794792.2199986279,7455667.737898255],[794639.3459420763,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136270/82301","x":136270,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7455667.737898255],[794792.2199986279,7455820.611954803],[794945.0940551758,7455820.611954803],[794945.0940551758,7455667.737898255],[794792.2199986279,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136271/82301","x":136271,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7455514.863841705],[794333.5978289805,7455667.737898255],[794486.4718855284,7455667.737898255],[794486.4718855284,7455514.863841705],[794333.5978289805,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136268/82302","x":136268,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7455514.863841705],[794486.4718855284,7455667.737898255],[794639.3459420763,7455667.737898255],[794639.3459420763,7455514.863841705],[794486.4718855284,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136269/82302","x":136269,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7455361.989785155],[794333.5978289805,7455514.863841705],[794486.4718855284,7455514.863841705],[794486.4718855284,7455361.989785155],[794333.5978289805,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136268/82303","x":136268,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7455361.989785155],[794486.4718855284,7455514.863841705],[794639.3459420763,7455514.863841705],[794639.3459420763,7455361.989785155],[794486.4718855284,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136269/82303","x":136269,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7455514.863841705],[794639.3459420763,7455667.737898255],[794792.2199986279,7455667.737898255],[794792.2199986279,7455514.863841705],[794639.3459420763,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136270/82302","x":136270,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7455514.863841705],[794792.2199986279,7455667.737898255],[794945.0940551758,7455667.737898255],[794945.0940551758,7455514.863841705],[794792.2199986279,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136271/82302","x":136271,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7455361.989785155],[794639.3459420763,7455514.863841705],[794792.2199986279,7455514.863841705],[794792.2199986279,7455361.989785155],[794639.3459420763,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136270/82303","x":136270,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7455361.989785155],[794792.2199986279,7455514.863841705],[794945.0940551758,7455514.863841705],[794945.0940551758,7455361.989785155],[794792.2199986279,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136271/82303","x":136271,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7457655.100633392],[794945.0940551758,7457807.974689942],[795097.9681117237,7457807.974689942],[795097.9681117237,7457655.100633392],[794945.0940551758,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136272/82288","x":136272,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7457655.100633392],[795097.9681117237,7457807.974689942],[795250.8421682753,7457807.974689942],[795250.8421682753,7457655.100633392],[795097.9681117237,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136273/82288","x":136273,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7457502.226576842],[794945.0940551758,7457655.100633392],[795097.9681117237,7457655.100633392],[795097.9681117237,7457502.226576842],[794945.0940551758,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136272/82289","x":136272,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7457502.226576842],[795097.9681117237,7457655.100633392],[795250.8421682753,7457655.100633392],[795250.8421682753,7457502.226576842],[795097.9681117237,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136273/82289","x":136273,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7457655.100633392],[795250.8421682753,7457807.974689942],[795403.7162248231,7457807.974689942],[795403.7162248231,7457655.100633392],[795250.8421682753,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136274/82288","x":136274,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7457655.100633392],[795403.7162248231,7457807.974689942],[795556.590281371,7457807.974689942],[795556.590281371,7457655.100633392],[795403.7162248231,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136275/82288","x":136275,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7457502.226576842],[795250.8421682753,7457655.100633392],[795403.7162248231,7457655.100633392],[795403.7162248231,7457502.226576842],[795250.8421682753,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136274/82289","x":136274,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7457502.226576842],[795403.7162248231,7457655.100633392],[795556.590281371,7457655.100633392],[795556.590281371,7457502.226576842],[795403.7162248231,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136275/82289","x":136275,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7457655.100633392],[795556.590281371,7457807.974689942],[795709.4643379226,7457807.974689942],[795709.4643379226,7457655.100633392],[795556.590281371,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136276/82288","x":136276,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7457655.100633392],[795709.4643379226,7457807.974689942],[795862.3383944705,7457807.974689942],[795862.3383944705,7457655.100633392],[795709.4643379226,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136277/82288","x":136277,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7457502.226576842],[795556.590281371,7457655.100633392],[795709.4643379226,7457655.100633392],[795709.4643379226,7457502.226576842],[795556.590281371,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136276/82289","x":136276,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7457502.226576842],[795709.4643379226,7457655.100633392],[795862.3383944705,7457655.100633392],[795862.3383944705,7457502.226576842],[795709.4643379226,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136277/82289","x":136277,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7457655.100633392],[795862.3383944705,7457807.974689942],[796015.2124510184,7457807.974689942],[796015.2124510184,7457655.100633392],[795862.3383944705,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136278/82288","x":136278,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7457655.100633392],[796015.2124510184,7457807.974689942],[796168.08650757,7457807.974689942],[796168.08650757,7457655.100633392],[796015.2124510184,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136279/82288","x":136279,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7457502.226576842],[795862.3383944705,7457655.100633392],[796015.2124510184,7457655.100633392],[796015.2124510184,7457502.226576842],[795862.3383944705,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136278/82289","x":136278,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7457502.226576842],[796015.2124510184,7457655.100633392],[796168.08650757,7457655.100633392],[796168.08650757,7457502.226576842],[796015.2124510184,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136279/82289","x":136279,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7457655.100633392],[796168.08650757,7457807.974689942],[796320.9605641179,7457807.974689942],[796320.9605641179,7457655.100633392],[796168.08650757,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136280/82288","x":136280,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7457655.100633392],[796320.9605641179,7457807.974689942],[796473.8346206658,7457807.974689942],[796473.8346206658,7457655.100633392],[796320.9605641179,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136281/82288","x":136281,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7457502.226576842],[796168.08650757,7457655.100633392],[796320.9605641179,7457655.100633392],[796320.9605641179,7457502.226576842],[796168.08650757,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136280/82289","x":136280,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7457502.226576842],[796320.9605641179,7457655.100633392],[796473.8346206658,7457655.100633392],[796473.8346206658,7457502.226576842],[796320.9605641179,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136281/82289","x":136281,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7457655.100633392],[796473.8346206658,7457807.974689942],[796626.7086772174,7457807.974689942],[796626.7086772174,7457655.100633392],[796473.8346206658,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136282/82288","x":136282,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7457655.100633392],[796626.7086772174,7457807.974689942],[796779.5827337652,7457807.974689942],[796779.5827337652,7457655.100633392],[796626.7086772174,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136283/82288","x":136283,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7457502.226576842],[796473.8346206658,7457655.100633392],[796626.7086772174,7457655.100633392],[796626.7086772174,7457502.226576842],[796473.8346206658,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136282/82289","x":136282,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7457502.226576842],[796626.7086772174,7457655.100633392],[796779.5827337652,7457655.100633392],[796779.5827337652,7457502.226576842],[796626.7086772174,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136283/82289","x":136283,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7456890.730350647],[797238.2049034126,7457043.604407197],[797391.0789599605,7457043.604407197],[797391.0789599605,7456890.730350647],[797238.2049034126,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136287/82293","x":136287,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7456584.9822375495],[796932.4567903131,7456737.856294097],[797085.330846861,7456737.856294097],[797085.330846861,7456584.9822375495],[796932.4567903131,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136285/82295","x":136285,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7456737.856294097],[797085.330846861,7456890.730350647],[797238.2049034126,7456890.730350647],[797238.2049034126,7456737.856294097],[797085.330846861,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136286/82294","x":136286,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7456737.856294097],[797238.2049034126,7456890.730350647],[797391.0789599605,7456890.730350647],[797391.0789599605,7456737.856294097],[797238.2049034126,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136287/82294","x":136287,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7456584.9822375495],[797085.330846861,7456737.856294097],[797238.2049034126,7456737.856294097],[797238.2049034126,7456584.9822375495],[797085.330846861,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136286/82295","x":136286,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7456584.9822375495],[797238.2049034126,7456737.856294097],[797391.0789599605,7456737.856294097],[797391.0789599605,7456584.9822375495],[797238.2049034126,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136287/82295","x":136287,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7456126.360067902],[794945.0940551758,7456279.23412445],[795097.9681117237,7456279.23412445],[795097.9681117237,7456126.360067902],[794945.0940551758,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136272/82298","x":136272,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7456126.360067902],[795097.9681117237,7456279.23412445],[795250.8421682753,7456279.23412445],[795250.8421682753,7456126.360067902],[795097.9681117237,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136273/82298","x":136273,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7455973.486011352],[794945.0940551758,7456126.360067902],[795097.9681117237,7456126.360067902],[795097.9681117237,7455973.486011352],[794945.0940551758,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136272/82299","x":136272,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7455973.486011352],[795097.9681117237,7456126.360067902],[795250.8421682753,7456126.360067902],[795250.8421682753,7455973.486011352],[795097.9681117237,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136273/82299","x":136273,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7456126.360067902],[795250.8421682753,7456279.23412445],[795403.7162248231,7456279.23412445],[795403.7162248231,7456126.360067902],[795250.8421682753,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136274/82298","x":136274,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7456126.360067902],[795403.7162248231,7456279.23412445],[795556.590281371,7456279.23412445],[795556.590281371,7456126.360067902],[795403.7162248231,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136275/82298","x":136275,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7455973.486011352],[795250.8421682753,7456126.360067902],[795403.7162248231,7456126.360067902],[795403.7162248231,7455973.486011352],[795250.8421682753,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136274/82299","x":136274,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7455973.486011352],[795403.7162248231,7456126.360067902],[795556.590281371,7456126.360067902],[795556.590281371,7455973.486011352],[795403.7162248231,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136275/82299","x":136275,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7456126.360067902],[795556.590281371,7456279.23412445],[795709.4643379226,7456279.23412445],[795709.4643379226,7456126.360067902],[795556.590281371,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136276/82298","x":136276,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7456126.360067902],[795709.4643379226,7456279.23412445],[795862.3383944705,7456279.23412445],[795862.3383944705,7456126.360067902],[795709.4643379226,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136277/82298","x":136277,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7455973.486011352],[795556.590281371,7456126.360067902],[795709.4643379226,7456126.360067902],[795709.4643379226,7455973.486011352],[795556.590281371,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136276/82299","x":136276,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7455973.486011352],[795709.4643379226,7456126.360067902],[795862.3383944705,7456126.360067902],[795862.3383944705,7455973.486011352],[795709.4643379226,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136277/82299","x":136277,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7456126.360067902],[795862.3383944705,7456279.23412445],[796015.2124510184,7456279.23412445],[796015.2124510184,7456126.360067902],[795862.3383944705,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136278/82298","x":136278,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7456126.360067902],[796015.2124510184,7456279.23412445],[796168.08650757,7456279.23412445],[796168.08650757,7456126.360067902],[796015.2124510184,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136279/82298","x":136279,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7455973.486011352],[795862.3383944705,7456126.360067902],[796015.2124510184,7456126.360067902],[796015.2124510184,7455973.486011352],[795862.3383944705,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136278/82299","x":136278,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7455973.486011352],[796015.2124510184,7456126.360067902],[796168.08650757,7456126.360067902],[796168.08650757,7455973.486011352],[796015.2124510184,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136279/82299","x":136279,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7455820.611954803],[794945.0940551758,7455973.486011352],[795097.9681117237,7455973.486011352],[795097.9681117237,7455820.611954803],[794945.0940551758,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136272/82300","x":136272,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7455820.611954803],[795097.9681117237,7455973.486011352],[795250.8421682753,7455973.486011352],[795250.8421682753,7455820.611954803],[795097.9681117237,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136273/82300","x":136273,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7455667.737898255],[794945.0940551758,7455820.611954803],[795097.9681117237,7455820.611954803],[795097.9681117237,7455667.737898255],[794945.0940551758,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136272/82301","x":136272,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7455667.737898255],[795097.9681117237,7455820.611954803],[795250.8421682753,7455820.611954803],[795250.8421682753,7455667.737898255],[795097.9681117237,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136273/82301","x":136273,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7455820.611954803],[795250.8421682753,7455973.486011352],[795403.7162248231,7455973.486011352],[795403.7162248231,7455820.611954803],[795250.8421682753,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136274/82300","x":136274,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7455820.611954803],[795403.7162248231,7455973.486011352],[795556.590281371,7455973.486011352],[795556.590281371,7455820.611954803],[795403.7162248231,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136275/82300","x":136275,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7455667.737898255],[795250.8421682753,7455820.611954803],[795403.7162248231,7455820.611954803],[795403.7162248231,7455667.737898255],[795250.8421682753,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136274/82301","x":136274,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7455667.737898255],[795403.7162248231,7455820.611954803],[795556.590281371,7455820.611954803],[795556.590281371,7455667.737898255],[795403.7162248231,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136275/82301","x":136275,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7455514.863841705],[794945.0940551758,7455667.737898255],[795097.9681117237,7455667.737898255],[795097.9681117237,7455514.863841705],[794945.0940551758,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136272/82302","x":136272,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7455514.863841705],[795097.9681117237,7455667.737898255],[795250.8421682753,7455667.737898255],[795250.8421682753,7455514.863841705],[795097.9681117237,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136273/82302","x":136273,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7455361.989785155],[794945.0940551758,7455514.863841705],[795097.9681117237,7455514.863841705],[795097.9681117237,7455361.989785155],[794945.0940551758,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136272/82303","x":136272,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7455361.989785155],[795097.9681117237,7455514.863841705],[795250.8421682753,7455514.863841705],[795250.8421682753,7455361.989785155],[795097.9681117237,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136273/82303","x":136273,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7455514.863841705],[795250.8421682753,7455667.737898255],[795403.7162248231,7455667.737898255],[795403.7162248231,7455514.863841705],[795250.8421682753,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136274/82302","x":136274,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7455514.863841705],[795403.7162248231,7455667.737898255],[795556.590281371,7455667.737898255],[795556.590281371,7455514.863841705],[795403.7162248231,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136275/82302","x":136275,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7455361.989785155],[795250.8421682753,7455514.863841705],[795403.7162248231,7455514.863841705],[795403.7162248231,7455361.989785155],[795250.8421682753,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136274/82303","x":136274,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7455361.989785155],[795403.7162248231,7455514.863841705],[795556.590281371,7455514.863841705],[795556.590281371,7455361.989785155],[795403.7162248231,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136275/82303","x":136275,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7455820.611954803],[795556.590281371,7455973.486011352],[795709.4643379226,7455973.486011352],[795709.4643379226,7455820.611954803],[795556.590281371,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136276/82300","x":136276,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7455820.611954803],[795709.4643379226,7455973.486011352],[795862.3383944705,7455973.486011352],[795862.3383944705,7455820.611954803],[795709.4643379226,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136277/82300","x":136277,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7455667.737898255],[795556.590281371,7455820.611954803],[795709.4643379226,7455820.611954803],[795709.4643379226,7455667.737898255],[795556.590281371,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136276/82301","x":136276,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7455667.737898255],[795709.4643379226,7455820.611954803],[795862.3383944705,7455820.611954803],[795862.3383944705,7455667.737898255],[795709.4643379226,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136277/82301","x":136277,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7455820.611954803],[795862.3383944705,7455973.486011352],[796015.2124510184,7455973.486011352],[796015.2124510184,7455820.611954803],[795862.3383944705,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136278/82300","x":136278,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7455820.611954803],[796015.2124510184,7455973.486011352],[796168.08650757,7455973.486011352],[796168.08650757,7455820.611954803],[796015.2124510184,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136279/82300","x":136279,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7455667.737898255],[795862.3383944705,7455820.611954803],[796015.2124510184,7455820.611954803],[796015.2124510184,7455667.737898255],[795862.3383944705,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136278/82301","x":136278,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7455667.737898255],[796015.2124510184,7455820.611954803],[796168.08650757,7455820.611954803],[796168.08650757,7455667.737898255],[796015.2124510184,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136279/82301","x":136279,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7455514.863841705],[795556.590281371,7455667.737898255],[795709.4643379226,7455667.737898255],[795709.4643379226,7455514.863841705],[795556.590281371,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136276/82302","x":136276,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7455514.863841705],[795709.4643379226,7455667.737898255],[795862.3383944705,7455667.737898255],[795862.3383944705,7455514.863841705],[795709.4643379226,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136277/82302","x":136277,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7455361.989785155],[795556.590281371,7455514.863841705],[795709.4643379226,7455514.863841705],[795709.4643379226,7455361.989785155],[795556.590281371,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136276/82303","x":136276,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7455361.989785155],[795709.4643379226,7455514.863841705],[795862.3383944705,7455514.863841705],[795862.3383944705,7455361.989785155],[795709.4643379226,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136277/82303","x":136277,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7455514.863841705],[795862.3383944705,7455667.737898255],[796015.2124510184,7455667.737898255],[796015.2124510184,7455514.863841705],[795862.3383944705,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136278/82302","x":136278,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7455514.863841705],[796015.2124510184,7455667.737898255],[796168.08650757,7455667.737898255],[796168.08650757,7455514.863841705],[796015.2124510184,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136279/82302","x":136279,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7455361.989785155],[795862.3383944705,7455514.863841705],[796015.2124510184,7455514.863841705],[796015.2124510184,7455361.989785155],[795862.3383944705,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136278/82303","x":136278,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7455361.989785155],[796015.2124510184,7455514.863841705],[796168.08650757,7455514.863841705],[796168.08650757,7455361.989785155],[796015.2124510184,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136279/82303","x":136279,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7456279.23412445],[796626.7086772174,7456432.108181],[796779.5827337652,7456432.108181],[796779.5827337652,7456279.23412445],[796626.7086772174,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136283/82297","x":136283,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7456126.360067902],[796168.08650757,7456279.23412445],[796320.9605641179,7456279.23412445],[796320.9605641179,7456126.360067902],[796168.08650757,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136280/82298","x":136280,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7456126.360067902],[796320.9605641179,7456279.23412445],[796473.8346206658,7456279.23412445],[796473.8346206658,7456126.360067902],[796320.9605641179,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136281/82298","x":136281,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7455973.486011352],[796168.08650757,7456126.360067902],[796320.9605641179,7456126.360067902],[796320.9605641179,7455973.486011352],[796168.08650757,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136280/82299","x":136280,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7455973.486011352],[796320.9605641179,7456126.360067902],[796473.8346206658,7456126.360067902],[796473.8346206658,7455973.486011352],[796320.9605641179,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136281/82299","x":136281,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7456126.360067902],[796473.8346206658,7456279.23412445],[796626.7086772174,7456279.23412445],[796626.7086772174,7456126.360067902],[796473.8346206658,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136282/82298","x":136282,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7456126.360067902],[796626.7086772174,7456279.23412445],[796779.5827337652,7456279.23412445],[796779.5827337652,7456126.360067902],[796626.7086772174,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136283/82298","x":136283,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7455973.486011352],[796473.8346206658,7456126.360067902],[796626.7086772174,7456126.360067902],[796626.7086772174,7455973.486011352],[796473.8346206658,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136282/82299","x":136282,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7455973.486011352],[796626.7086772174,7456126.360067902],[796779.5827337652,7456126.360067902],[796779.5827337652,7455973.486011352],[796626.7086772174,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136283/82299","x":136283,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7456432.108181],[796779.5827337652,7456584.9822375495],[796932.4567903131,7456584.9822375495],[796932.4567903131,7456432.108181],[796779.5827337652,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136284/82296","x":136284,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7456432.108181],[796932.4567903131,7456584.9822375495],[797085.330846861,7456584.9822375495],[797085.330846861,7456432.108181],[796932.4567903131,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136285/82296","x":136285,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7456279.23412445],[796779.5827337652,7456432.108181],[796932.4567903131,7456432.108181],[796932.4567903131,7456279.23412445],[796779.5827337652,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136284/82297","x":136284,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7456279.23412445],[796932.4567903131,7456432.108181],[797085.330846861,7456432.108181],[797085.330846861,7456279.23412445],[796932.4567903131,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136285/82297","x":136285,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7456432.108181],[797085.330846861,7456584.9822375495],[797238.2049034126,7456584.9822375495],[797238.2049034126,7456432.108181],[797085.330846861,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136286/82296","x":136286,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7456432.108181],[797238.2049034126,7456584.9822375495],[797391.0789599605,7456584.9822375495],[797391.0789599605,7456432.108181],[797238.2049034126,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136287/82296","x":136287,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7456279.23412445],[797085.330846861,7456432.108181],[797238.2049034126,7456432.108181],[797238.2049034126,7456279.23412445],[797085.330846861,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136286/82297","x":136286,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7456279.23412445],[797238.2049034126,7456432.108181],[797391.0789599605,7456432.108181],[797391.0789599605,7456279.23412445],[797238.2049034126,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136287/82297","x":136287,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7456126.360067902],[796779.5827337652,7456279.23412445],[796932.4567903131,7456279.23412445],[796932.4567903131,7456126.360067902],[796779.5827337652,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136284/82298","x":136284,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7456126.360067902],[796932.4567903131,7456279.23412445],[797085.330846861,7456279.23412445],[797085.330846861,7456126.360067902],[796932.4567903131,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136285/82298","x":136285,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7455973.486011352],[796779.5827337652,7456126.360067902],[796932.4567903131,7456126.360067902],[796932.4567903131,7455973.486011352],[796779.5827337652,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136284/82299","x":136284,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7455973.486011352],[796932.4567903131,7456126.360067902],[797085.330846861,7456126.360067902],[797085.330846861,7455973.486011352],[796932.4567903131,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136285/82299","x":136285,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7456126.360067902],[797085.330846861,7456279.23412445],[797238.2049034126,7456279.23412445],[797238.2049034126,7456126.360067902],[797085.330846861,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136286/82298","x":136286,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7456126.360067902],[797238.2049034126,7456279.23412445],[797391.0789599605,7456279.23412445],[797391.0789599605,7456126.360067902],[797238.2049034126,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136287/82298","x":136287,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7455973.486011352],[797085.330846861,7456126.360067902],[797238.2049034126,7456126.360067902],[797238.2049034126,7455973.486011352],[797085.330846861,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136286/82299","x":136286,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7455973.486011352],[797238.2049034126,7456126.360067902],[797391.0789599605,7456126.360067902],[797391.0789599605,7455973.486011352],[797238.2049034126,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136287/82299","x":136287,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7455820.611954803],[796168.08650757,7455973.486011352],[796320.9605641179,7455973.486011352],[796320.9605641179,7455820.611954803],[796168.08650757,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136280/82300","x":136280,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7455820.611954803],[796320.9605641179,7455973.486011352],[796473.8346206658,7455973.486011352],[796473.8346206658,7455820.611954803],[796320.9605641179,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136281/82300","x":136281,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7455667.737898255],[796168.08650757,7455820.611954803],[796320.9605641179,7455820.611954803],[796320.9605641179,7455667.737898255],[796168.08650757,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136280/82301","x":136280,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7455667.737898255],[796320.9605641179,7455820.611954803],[796473.8346206658,7455820.611954803],[796473.8346206658,7455667.737898255],[796320.9605641179,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136281/82301","x":136281,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7455820.611954803],[796473.8346206658,7455973.486011352],[796626.7086772174,7455973.486011352],[796626.7086772174,7455820.611954803],[796473.8346206658,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136282/82300","x":136282,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7455820.611954803],[796626.7086772174,7455973.486011352],[796779.5827337652,7455973.486011352],[796779.5827337652,7455820.611954803],[796626.7086772174,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136283/82300","x":136283,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7455667.737898255],[796473.8346206658,7455820.611954803],[796626.7086772174,7455820.611954803],[796626.7086772174,7455667.737898255],[796473.8346206658,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136282/82301","x":136282,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7455667.737898255],[796626.7086772174,7455820.611954803],[796779.5827337652,7455820.611954803],[796779.5827337652,7455667.737898255],[796626.7086772174,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136283/82301","x":136283,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7455514.863841705],[796168.08650757,7455667.737898255],[796320.9605641179,7455667.737898255],[796320.9605641179,7455514.863841705],[796168.08650757,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136280/82302","x":136280,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7455514.863841705],[796320.9605641179,7455667.737898255],[796473.8346206658,7455667.737898255],[796473.8346206658,7455514.863841705],[796320.9605641179,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136281/82302","x":136281,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7455361.989785155],[796168.08650757,7455514.863841705],[796320.9605641179,7455514.863841705],[796320.9605641179,7455361.989785155],[796168.08650757,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136280/82303","x":136280,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7455361.989785155],[796320.9605641179,7455514.863841705],[796473.8346206658,7455514.863841705],[796473.8346206658,7455361.989785155],[796320.9605641179,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136281/82303","x":136281,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7455514.863841705],[796473.8346206658,7455667.737898255],[796626.7086772174,7455667.737898255],[796626.7086772174,7455514.863841705],[796473.8346206658,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136282/82302","x":136282,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7455514.863841705],[796626.7086772174,7455667.737898255],[796779.5827337652,7455667.737898255],[796779.5827337652,7455514.863841705],[796626.7086772174,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136283/82302","x":136283,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7455361.989785155],[796473.8346206658,7455514.863841705],[796626.7086772174,7455514.863841705],[796626.7086772174,7455361.989785155],[796473.8346206658,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136282/82303","x":136282,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796626.7086772174,7455361.989785155],[796626.7086772174,7455514.863841705],[796779.5827337652,7455514.863841705],[796779.5827337652,7455361.989785155],[796626.7086772174,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136283/82303","x":136283,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7455820.611954803],[796779.5827337652,7455973.486011352],[796932.4567903131,7455973.486011352],[796932.4567903131,7455820.611954803],[796779.5827337652,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136284/82300","x":136284,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7455820.611954803],[796932.4567903131,7455973.486011352],[797085.330846861,7455973.486011352],[797085.330846861,7455820.611954803],[796932.4567903131,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136285/82300","x":136285,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7455667.737898255],[796779.5827337652,7455820.611954803],[796932.4567903131,7455820.611954803],[796932.4567903131,7455667.737898255],[796779.5827337652,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136284/82301","x":136284,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7455667.737898255],[796932.4567903131,7455820.611954803],[797085.330846861,7455820.611954803],[797085.330846861,7455667.737898255],[796932.4567903131,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136285/82301","x":136285,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7455820.611954803],[797085.330846861,7455973.486011352],[797238.2049034126,7455973.486011352],[797238.2049034126,7455820.611954803],[797085.330846861,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136286/82300","x":136286,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797238.2049034126,7455820.611954803],[797238.2049034126,7455973.486011352],[797391.0789599605,7455973.486011352],[797391.0789599605,7455820.611954803],[797238.2049034126,7455820.611954803]]],"type":"Polygon"},"properties":{"label":"18/136287/82300","x":136287,"y":82300,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797085.330846861,7455667.737898255],[797085.330846861,7455820.611954803],[797238.2049034126,7455820.611954803],[797238.2049034126,7455667.737898255],[797085.330846861,7455667.737898255]]],"type":"Polygon"},"properties":{"label":"18/136286/82301","x":136286,"y":82301,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7455514.863841705],[796779.5827337652,7455667.737898255],[796932.4567903131,7455667.737898255],[796932.4567903131,7455514.863841705],[796779.5827337652,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136284/82302","x":136284,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796932.4567903131,7455514.863841705],[796932.4567903131,7455667.737898255],[797085.330846861,7455667.737898255],[797085.330846861,7455514.863841705],[796932.4567903131,7455514.863841705]]],"type":"Polygon"},"properties":{"label":"18/136285/82302","x":136285,"y":82302,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796779.5827337652,7455361.989785155],[796779.5827337652,7455514.863841705],[796932.4567903131,7455514.863841705],[796932.4567903131,7455361.989785155],[796779.5827337652,7455361.989785155]]],"type":"Polygon"},"properties":{"label":"18/136284/82303","x":136284,"y":82303,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7460101.085538177],[797696.82707306,7460253.959594727],[797849.7011296079,7460253.959594727],[797849.7011296079,7460101.085538177],[797696.82707306,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136290/82272","x":136290,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7460101.085538177],[797849.7011296079,7460253.959594727],[798002.5751861557,7460253.959594727],[798002.5751861557,7460101.085538177],[797849.7011296079,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136291/82272","x":136291,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7459948.211481629],[797849.7011296079,7460101.085538177],[798002.5751861557,7460101.085538177],[798002.5751861557,7459948.211481629],[797849.7011296079,7459948.211481629]]],"type":"Polygon"},"properties":{"label":"18/136291/82273","x":136291,"y":82273,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7459795.337425079],[797849.7011296079,7459948.211481629],[798002.5751861557,7459948.211481629],[798002.5751861557,7459795.337425079],[797849.7011296079,7459795.337425079]]],"type":"Polygon"},"properties":{"label":"18/136291/82274","x":136291,"y":82274,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7459642.463368529],[797849.7011296079,7459795.337425079],[798002.5751861557,7459795.337425079],[798002.5751861557,7459642.463368529],[797849.7011296079,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136291/82275","x":136291,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7460101.085538177],[798002.5751861557,7460253.959594727],[798155.4492427073,7460253.959594727],[798155.4492427073,7460101.085538177],[798002.5751861557,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136292/82272","x":136292,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7460101.085538177],[798155.4492427073,7460253.959594727],[798308.3232992552,7460253.959594727],[798308.3232992552,7460101.085538177],[798155.4492427073,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136293/82272","x":136293,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7459948.211481629],[798002.5751861557,7460101.085538177],[798155.4492427073,7460101.085538177],[798155.4492427073,7459948.211481629],[798002.5751861557,7459948.211481629]]],"type":"Polygon"},"properties":{"label":"18/136292/82273","x":136292,"y":82273,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7459948.211481629],[798155.4492427073,7460101.085538177],[798308.3232992552,7460101.085538177],[798308.3232992552,7459948.211481629],[798155.4492427073,7459948.211481629]]],"type":"Polygon"},"properties":{"label":"18/136293/82273","x":136293,"y":82273,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7460101.085538177],[798308.3232992552,7460253.959594727],[798461.1973558031,7460253.959594727],[798461.1973558031,7460101.085538177],[798308.3232992552,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136294/82272","x":136294,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7460101.085538177],[798461.1973558031,7460253.959594727],[798614.0714123547,7460253.959594727],[798614.0714123547,7460101.085538177],[798461.1973558031,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136295/82272","x":136295,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7459948.211481629],[798308.3232992552,7460101.085538177],[798461.1973558031,7460101.085538177],[798461.1973558031,7459948.211481629],[798308.3232992552,7459948.211481629]]],"type":"Polygon"},"properties":{"label":"18/136294/82273","x":136294,"y":82273,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7459948.211481629],[798461.1973558031,7460101.085538177],[798614.0714123547,7460101.085538177],[798614.0714123547,7459948.211481629],[798461.1973558031,7459948.211481629]]],"type":"Polygon"},"properties":{"label":"18/136295/82273","x":136295,"y":82273,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7459795.337425079],[798002.5751861557,7459948.211481629],[798155.4492427073,7459948.211481629],[798155.4492427073,7459795.337425079],[798002.5751861557,7459795.337425079]]],"type":"Polygon"},"properties":{"label":"18/136292/82274","x":136292,"y":82274,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7459795.337425079],[798155.4492427073,7459948.211481629],[798308.3232992552,7459948.211481629],[798308.3232992552,7459795.337425079],[798155.4492427073,7459795.337425079]]],"type":"Polygon"},"properties":{"label":"18/136293/82274","x":136293,"y":82274,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7459642.463368529],[798002.5751861557,7459795.337425079],[798155.4492427073,7459795.337425079],[798155.4492427073,7459642.463368529],[798002.5751861557,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136292/82275","x":136292,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7459642.463368529],[798155.4492427073,7459795.337425079],[798308.3232992552,7459795.337425079],[798308.3232992552,7459642.463368529],[798155.4492427073,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136293/82275","x":136293,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7459795.337425079],[798308.3232992552,7459948.211481629],[798461.1973558031,7459948.211481629],[798461.1973558031,7459795.337425079],[798308.3232992552,7459795.337425079]]],"type":"Polygon"},"properties":{"label":"18/136294/82274","x":136294,"y":82274,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7459795.337425079],[798461.1973558031,7459948.211481629],[798614.0714123547,7459948.211481629],[798614.0714123547,7459795.337425079],[798461.1973558031,7459795.337425079]]],"type":"Polygon"},"properties":{"label":"18/136295/82274","x":136295,"y":82274,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7459642.463368529],[798308.3232992552,7459795.337425079],[798461.1973558031,7459795.337425079],[798461.1973558031,7459642.463368529],[798308.3232992552,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136294/82275","x":136294,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7459642.463368529],[798461.1973558031,7459795.337425079],[798614.0714123547,7459795.337425079],[798614.0714123547,7459642.463368529],[798461.1973558031,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136295/82275","x":136295,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7459489.589311982],[797849.7011296079,7459642.463368529],[798002.5751861557,7459642.463368529],[798002.5751861557,7459489.589311982],[797849.7011296079,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136291/82276","x":136291,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7459336.715255432],[797849.7011296079,7459489.589311982],[798002.5751861557,7459489.589311982],[798002.5751861557,7459336.715255432],[797849.7011296079,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136291/82277","x":136291,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7459183.841198882],[797849.7011296079,7459336.715255432],[798002.5751861557,7459336.715255432],[798002.5751861557,7459183.841198882],[797849.7011296079,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136291/82278","x":136291,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7459030.967142334],[797849.7011296079,7459183.841198882],[798002.5751861557,7459183.841198882],[798002.5751861557,7459030.967142334],[797849.7011296079,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136291/82279","x":136291,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7459489.589311982],[798002.5751861557,7459642.463368529],[798155.4492427073,7459642.463368529],[798155.4492427073,7459489.589311982],[798002.5751861557,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136292/82276","x":136292,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7459489.589311982],[798155.4492427073,7459642.463368529],[798308.3232992552,7459642.463368529],[798308.3232992552,7459489.589311982],[798155.4492427073,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136293/82276","x":136293,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7459336.715255432],[798002.5751861557,7459489.589311982],[798155.4492427073,7459489.589311982],[798155.4492427073,7459336.715255432],[798002.5751861557,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136292/82277","x":136292,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7459336.715255432],[798155.4492427073,7459489.589311982],[798308.3232992552,7459489.589311982],[798308.3232992552,7459336.715255432],[798155.4492427073,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136293/82277","x":136293,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7459489.589311982],[798308.3232992552,7459642.463368529],[798461.1973558031,7459642.463368529],[798461.1973558031,7459489.589311982],[798308.3232992552,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136294/82276","x":136294,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7459489.589311982],[798461.1973558031,7459642.463368529],[798614.0714123547,7459642.463368529],[798614.0714123547,7459489.589311982],[798461.1973558031,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136295/82276","x":136295,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7459336.715255432],[798308.3232992552,7459489.589311982],[798461.1973558031,7459489.589311982],[798461.1973558031,7459336.715255432],[798308.3232992552,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136294/82277","x":136294,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7459336.715255432],[798461.1973558031,7459489.589311982],[798614.0714123547,7459489.589311982],[798614.0714123547,7459336.715255432],[798461.1973558031,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136295/82277","x":136295,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7459183.841198882],[798002.5751861557,7459336.715255432],[798155.4492427073,7459336.715255432],[798155.4492427073,7459183.841198882],[798002.5751861557,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136292/82278","x":136292,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7459183.841198882],[798155.4492427073,7459336.715255432],[798308.3232992552,7459336.715255432],[798308.3232992552,7459183.841198882],[798155.4492427073,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136293/82278","x":136293,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7459030.967142334],[798002.5751861557,7459183.841198882],[798155.4492427073,7459183.841198882],[798155.4492427073,7459030.967142334],[798002.5751861557,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136292/82279","x":136292,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7459030.967142334],[798155.4492427073,7459183.841198882],[798308.3232992552,7459183.841198882],[798308.3232992552,7459030.967142334],[798155.4492427073,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136293/82279","x":136293,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7459183.841198882],[798308.3232992552,7459336.715255432],[798461.1973558031,7459336.715255432],[798461.1973558031,7459183.841198882],[798308.3232992552,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136294/82278","x":136294,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7459183.841198882],[798461.1973558031,7459336.715255432],[798614.0714123547,7459336.715255432],[798614.0714123547,7459183.841198882],[798461.1973558031,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136295/82278","x":136295,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7459030.967142334],[798308.3232992552,7459183.841198882],[798461.1973558031,7459183.841198882],[798461.1973558031,7459030.967142334],[798308.3232992552,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136294/82279","x":136294,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7459030.967142334],[798461.1973558031,7459183.841198882],[798614.0714123547,7459183.841198882],[798614.0714123547,7459030.967142334],[798461.1973558031,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136295/82279","x":136295,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7460101.085538177],[798614.0714123547,7460253.959594727],[798766.9454689026,7460253.959594727],[798766.9454689026,7460101.085538177],[798614.0714123547,7460101.085538177]]],"type":"Polygon"},"properties":{"label":"18/136296/82272","x":136296,"y":82272,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7459948.211481629],[798614.0714123547,7460101.085538177],[798766.9454689026,7460101.085538177],[798766.9454689026,7459948.211481629],[798614.0714123547,7459948.211481629]]],"type":"Polygon"},"properties":{"label":"18/136296/82273","x":136296,"y":82273,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7459795.337425079],[798614.0714123547,7459948.211481629],[798766.9454689026,7459948.211481629],[798766.9454689026,7459795.337425079],[798614.0714123547,7459795.337425079]]],"type":"Polygon"},"properties":{"label":"18/136296/82274","x":136296,"y":82274,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7459642.463368529],[798614.0714123547,7459795.337425079],[798766.9454689026,7459795.337425079],[798766.9454689026,7459642.463368529],[798614.0714123547,7459642.463368529]]],"type":"Polygon"},"properties":{"label":"18/136296/82275","x":136296,"y":82275,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7459489.589311982],[798614.0714123547,7459642.463368529],[798766.9454689026,7459642.463368529],[798766.9454689026,7459489.589311982],[798614.0714123547,7459489.589311982]]],"type":"Polygon"},"properties":{"label":"18/136296/82276","x":136296,"y":82276,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7459336.715255432],[798614.0714123547,7459489.589311982],[798766.9454689026,7459489.589311982],[798766.9454689026,7459336.715255432],[798614.0714123547,7459336.715255432]]],"type":"Polygon"},"properties":{"label":"18/136296/82277","x":136296,"y":82277,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7459183.841198882],[798614.0714123547,7459336.715255432],[798766.9454689026,7459336.715255432],[798766.9454689026,7459183.841198882],[798614.0714123547,7459183.841198882]]],"type":"Polygon"},"properties":{"label":"18/136296/82278","x":136296,"y":82278,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7459030.967142334],[798614.0714123547,7459183.841198882],[798766.9454689026,7459183.841198882],[798766.9454689026,7459030.967142334],[798614.0714123547,7459030.967142334]]],"type":"Polygon"},"properties":{"label":"18/136296/82279","x":136296,"y":82279,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7458878.0930857845],[797849.7011296079,7459030.967142334],[798002.5751861557,7459030.967142334],[798002.5751861557,7458878.0930857845],[797849.7011296079,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136291/82280","x":136291,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7458725.219029237],[797849.7011296079,7458878.0930857845],[798002.5751861557,7458878.0930857845],[798002.5751861557,7458725.219029237],[797849.7011296079,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136291/82281","x":136291,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7458572.344972687],[797849.7011296079,7458725.219029237],[798002.5751861557,7458725.219029237],[798002.5751861557,7458572.344972687],[797849.7011296079,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136291/82282","x":136291,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7458419.470916137],[797849.7011296079,7458572.344972687],[798002.5751861557,7458572.344972687],[798002.5751861557,7458419.470916137],[797849.7011296079,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136291/82283","x":136291,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7458878.0930857845],[798002.5751861557,7459030.967142334],[798155.4492427073,7459030.967142334],[798155.4492427073,7458878.0930857845],[798002.5751861557,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136292/82280","x":136292,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7458878.0930857845],[798155.4492427073,7459030.967142334],[798308.3232992552,7459030.967142334],[798308.3232992552,7458878.0930857845],[798155.4492427073,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136293/82280","x":136293,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7458725.219029237],[798002.5751861557,7458878.0930857845],[798155.4492427073,7458878.0930857845],[798155.4492427073,7458725.219029237],[798002.5751861557,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136292/82281","x":136292,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7458725.219029237],[798155.4492427073,7458878.0930857845],[798308.3232992552,7458878.0930857845],[798308.3232992552,7458725.219029237],[798155.4492427073,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136293/82281","x":136293,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7458878.0930857845],[798308.3232992552,7459030.967142334],[798461.1973558031,7459030.967142334],[798461.1973558031,7458878.0930857845],[798308.3232992552,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136294/82280","x":136294,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7458878.0930857845],[798461.1973558031,7459030.967142334],[798614.0714123547,7459030.967142334],[798614.0714123547,7458878.0930857845],[798461.1973558031,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136295/82280","x":136295,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7458725.219029237],[798308.3232992552,7458878.0930857845],[798461.1973558031,7458878.0930857845],[798461.1973558031,7458725.219029237],[798308.3232992552,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136294/82281","x":136294,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7458725.219029237],[798461.1973558031,7458878.0930857845],[798614.0714123547,7458878.0930857845],[798614.0714123547,7458725.219029237],[798461.1973558031,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136295/82281","x":136295,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7458572.344972687],[798002.5751861557,7458725.219029237],[798155.4492427073,7458725.219029237],[798155.4492427073,7458572.344972687],[798002.5751861557,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136292/82282","x":136292,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7458572.344972687],[798155.4492427073,7458725.219029237],[798308.3232992552,7458725.219029237],[798308.3232992552,7458572.344972687],[798155.4492427073,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136293/82282","x":136293,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7458419.470916137],[798002.5751861557,7458572.344972687],[798155.4492427073,7458572.344972687],[798155.4492427073,7458419.470916137],[798002.5751861557,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136292/82283","x":136292,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7458419.470916137],[798155.4492427073,7458572.344972687],[798308.3232992552,7458572.344972687],[798308.3232992552,7458419.470916137],[798155.4492427073,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136293/82283","x":136293,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7458572.344972687],[798308.3232992552,7458725.219029237],[798461.1973558031,7458725.219029237],[798461.1973558031,7458572.344972687],[798308.3232992552,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136294/82282","x":136294,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7458572.344972687],[798461.1973558031,7458725.219029237],[798614.0714123547,7458725.219029237],[798614.0714123547,7458572.344972687],[798461.1973558031,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136295/82282","x":136295,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7458419.470916137],[798308.3232992552,7458572.344972687],[798461.1973558031,7458572.344972687],[798461.1973558031,7458419.470916137],[798308.3232992552,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136294/82283","x":136294,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7458419.470916137],[798461.1973558031,7458572.344972687],[798614.0714123547,7458572.344972687],[798614.0714123547,7458419.470916137],[798461.1973558031,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136295/82283","x":136295,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7458266.596859589],[797849.7011296079,7458419.470916137],[798002.5751861557,7458419.470916137],[798002.5751861557,7458266.596859589],[797849.7011296079,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136291/82284","x":136291,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7458113.7228030395],[797849.7011296079,7458266.596859589],[798002.5751861557,7458266.596859589],[798002.5751861557,7458113.7228030395],[797849.7011296079,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136291/82285","x":136291,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7457960.84874649],[797849.7011296079,7458113.7228030395],[798002.5751861557,7458113.7228030395],[798002.5751861557,7457960.84874649],[797849.7011296079,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136291/82286","x":136291,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7457807.974689942],[797849.7011296079,7457960.84874649],[798002.5751861557,7457960.84874649],[798002.5751861557,7457807.974689942],[797849.7011296079,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136291/82287","x":136291,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7458266.596859589],[798002.5751861557,7458419.470916137],[798155.4492427073,7458419.470916137],[798155.4492427073,7458266.596859589],[798002.5751861557,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136292/82284","x":136292,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7458266.596859589],[798155.4492427073,7458419.470916137],[798308.3232992552,7458419.470916137],[798308.3232992552,7458266.596859589],[798155.4492427073,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136293/82284","x":136293,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7458113.7228030395],[798002.5751861557,7458266.596859589],[798155.4492427073,7458266.596859589],[798155.4492427073,7458113.7228030395],[798002.5751861557,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136292/82285","x":136292,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7458113.7228030395],[798155.4492427073,7458266.596859589],[798308.3232992552,7458266.596859589],[798308.3232992552,7458113.7228030395],[798155.4492427073,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136293/82285","x":136293,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7458266.596859589],[798308.3232992552,7458419.470916137],[798461.1973558031,7458419.470916137],[798461.1973558031,7458266.596859589],[798308.3232992552,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136294/82284","x":136294,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7458266.596859589],[798461.1973558031,7458419.470916137],[798614.0714123547,7458419.470916137],[798614.0714123547,7458266.596859589],[798461.1973558031,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136295/82284","x":136295,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7458113.7228030395],[798308.3232992552,7458266.596859589],[798461.1973558031,7458266.596859589],[798461.1973558031,7458113.7228030395],[798308.3232992552,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136294/82285","x":136294,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7458113.7228030395],[798461.1973558031,7458266.596859589],[798614.0714123547,7458266.596859589],[798614.0714123547,7458113.7228030395],[798461.1973558031,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136295/82285","x":136295,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7457960.84874649],[798002.5751861557,7458113.7228030395],[798155.4492427073,7458113.7228030395],[798155.4492427073,7457960.84874649],[798002.5751861557,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136292/82286","x":136292,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7457960.84874649],[798155.4492427073,7458113.7228030395],[798308.3232992552,7458113.7228030395],[798308.3232992552,7457960.84874649],[798155.4492427073,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136293/82286","x":136293,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7457807.974689942],[798002.5751861557,7457960.84874649],[798155.4492427073,7457960.84874649],[798155.4492427073,7457807.974689942],[798002.5751861557,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136292/82287","x":136292,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7457807.974689942],[798155.4492427073,7457960.84874649],[798308.3232992552,7457960.84874649],[798308.3232992552,7457807.974689942],[798155.4492427073,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136293/82287","x":136293,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7457960.84874649],[798308.3232992552,7458113.7228030395],[798461.1973558031,7458113.7228030395],[798461.1973558031,7457960.84874649],[798308.3232992552,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136294/82286","x":136294,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7457960.84874649],[798461.1973558031,7458113.7228030395],[798614.0714123547,7458113.7228030395],[798614.0714123547,7457960.84874649],[798461.1973558031,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136295/82286","x":136295,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7457807.974689942],[798308.3232992552,7457960.84874649],[798461.1973558031,7457960.84874649],[798461.1973558031,7457807.974689942],[798308.3232992552,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136294/82287","x":136294,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7457807.974689942],[798461.1973558031,7457960.84874649],[798614.0714123547,7457960.84874649],[798614.0714123547,7457807.974689942],[798461.1973558031,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136295/82287","x":136295,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7458878.0930857845],[798614.0714123547,7459030.967142334],[798766.9454689026,7459030.967142334],[798766.9454689026,7458878.0930857845],[798614.0714123547,7458878.0930857845]]],"type":"Polygon"},"properties":{"label":"18/136296/82280","x":136296,"y":82280,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7458725.219029237],[798614.0714123547,7458878.0930857845],[798766.9454689026,7458878.0930857845],[798766.9454689026,7458725.219029237],[798614.0714123547,7458725.219029237]]],"type":"Polygon"},"properties":{"label":"18/136296/82281","x":136296,"y":82281,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7458572.344972687],[798614.0714123547,7458725.219029237],[798766.9454689026,7458725.219029237],[798766.9454689026,7458572.344972687],[798614.0714123547,7458572.344972687]]],"type":"Polygon"},"properties":{"label":"18/136296/82282","x":136296,"y":82282,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7458419.470916137],[798614.0714123547,7458572.344972687],[798766.9454689026,7458572.344972687],[798766.9454689026,7458419.470916137],[798614.0714123547,7458419.470916137]]],"type":"Polygon"},"properties":{"label":"18/136296/82283","x":136296,"y":82283,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7458266.596859589],[798614.0714123547,7458419.470916137],[798766.9454689026,7458419.470916137],[798766.9454689026,7458266.596859589],[798614.0714123547,7458266.596859589]]],"type":"Polygon"},"properties":{"label":"18/136296/82284","x":136296,"y":82284,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7458113.7228030395],[798614.0714123547,7458266.596859589],[798766.9454689026,7458266.596859589],[798766.9454689026,7458113.7228030395],[798614.0714123547,7458113.7228030395]]],"type":"Polygon"},"properties":{"label":"18/136296/82285","x":136296,"y":82285,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7457960.84874649],[798614.0714123547,7458113.7228030395],[798766.9454689026,7458113.7228030395],[798766.9454689026,7457960.84874649],[798614.0714123547,7457960.84874649]]],"type":"Polygon"},"properties":{"label":"18/136296/82286","x":136296,"y":82286,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7457807.974689942],[798614.0714123547,7457960.84874649],[798766.9454689026,7457960.84874649],[798766.9454689026,7457807.974689942],[798614.0714123547,7457807.974689942]]],"type":"Polygon"},"properties":{"label":"18/136296/82287","x":136296,"y":82287,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7457655.100633392],[797849.7011296079,7457807.974689942],[798002.5751861557,7457807.974689942],[798002.5751861557,7457655.100633392],[797849.7011296079,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136291/82288","x":136291,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7457502.226576842],[797849.7011296079,7457655.100633392],[798002.5751861557,7457655.100633392],[798002.5751861557,7457502.226576842],[797849.7011296079,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136291/82289","x":136291,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7457196.478463745],[797543.9530165084,7457349.3525202945],[797696.82707306,7457349.3525202945],[797696.82707306,7457196.478463745],[797543.9530165084,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136289/82291","x":136289,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7457349.3525202945],[797696.82707306,7457502.226576842],[797849.7011296079,7457502.226576842],[797849.7011296079,7457349.3525202945],[797696.82707306,7457349.3525202945]]],"type":"Polygon"},"properties":{"label":"18/136290/82290","x":136290,"y":82290,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7457349.3525202945],[797849.7011296079,7457502.226576842],[798002.5751861557,7457502.226576842],[798002.5751861557,7457349.3525202945],[797849.7011296079,7457349.3525202945]]],"type":"Polygon"},"properties":{"label":"18/136291/82290","x":136291,"y":82290,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7457196.478463745],[797696.82707306,7457349.3525202945],[797849.7011296079,7457349.3525202945],[797849.7011296079,7457196.478463745],[797696.82707306,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136290/82291","x":136290,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7457196.478463745],[797849.7011296079,7457349.3525202945],[798002.5751861557,7457349.3525202945],[798002.5751861557,7457196.478463745],[797849.7011296079,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136291/82291","x":136291,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7457655.100633392],[798002.5751861557,7457807.974689942],[798155.4492427073,7457807.974689942],[798155.4492427073,7457655.100633392],[798002.5751861557,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136292/82288","x":136292,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7457655.100633392],[798155.4492427073,7457807.974689942],[798308.3232992552,7457807.974689942],[798308.3232992552,7457655.100633392],[798155.4492427073,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136293/82288","x":136293,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7457502.226576842],[798002.5751861557,7457655.100633392],[798155.4492427073,7457655.100633392],[798155.4492427073,7457502.226576842],[798002.5751861557,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136292/82289","x":136292,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7457502.226576842],[798155.4492427073,7457655.100633392],[798308.3232992552,7457655.100633392],[798308.3232992552,7457502.226576842],[798155.4492427073,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136293/82289","x":136293,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7457655.100633392],[798308.3232992552,7457807.974689942],[798461.1973558031,7457807.974689942],[798461.1973558031,7457655.100633392],[798308.3232992552,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136294/82288","x":136294,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7457655.100633392],[798461.1973558031,7457807.974689942],[798614.0714123547,7457807.974689942],[798614.0714123547,7457655.100633392],[798461.1973558031,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136295/82288","x":136295,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7457502.226576842],[798308.3232992552,7457655.100633392],[798461.1973558031,7457655.100633392],[798461.1973558031,7457502.226576842],[798308.3232992552,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136294/82289","x":136294,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7457502.226576842],[798461.1973558031,7457655.100633392],[798614.0714123547,7457655.100633392],[798614.0714123547,7457502.226576842],[798461.1973558031,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136295/82289","x":136295,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7457349.3525202945],[798002.5751861557,7457502.226576842],[798155.4492427073,7457502.226576842],[798155.4492427073,7457349.3525202945],[798002.5751861557,7457349.3525202945]]],"type":"Polygon"},"properties":{"label":"18/136292/82290","x":136292,"y":82290,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7457349.3525202945],[798155.4492427073,7457502.226576842],[798308.3232992552,7457502.226576842],[798308.3232992552,7457349.3525202945],[798155.4492427073,7457349.3525202945]]],"type":"Polygon"},"properties":{"label":"18/136293/82290","x":136293,"y":82290,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7457196.478463745],[798002.5751861557,7457349.3525202945],[798155.4492427073,7457349.3525202945],[798155.4492427073,7457196.478463745],[798002.5751861557,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136292/82291","x":136292,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7457196.478463745],[798155.4492427073,7457349.3525202945],[798308.3232992552,7457349.3525202945],[798308.3232992552,7457196.478463745],[798155.4492427073,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136293/82291","x":136293,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7457349.3525202945],[798308.3232992552,7457502.226576842],[798461.1973558031,7457502.226576842],[798461.1973558031,7457349.3525202945],[798308.3232992552,7457349.3525202945]]],"type":"Polygon"},"properties":{"label":"18/136294/82290","x":136294,"y":82290,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7457349.3525202945],[798461.1973558031,7457502.226576842],[798614.0714123547,7457502.226576842],[798614.0714123547,7457349.3525202945],[798461.1973558031,7457349.3525202945]]],"type":"Polygon"},"properties":{"label":"18/136295/82290","x":136295,"y":82290,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7457196.478463745],[798308.3232992552,7457349.3525202945],[798461.1973558031,7457349.3525202945],[798461.1973558031,7457196.478463745],[798308.3232992552,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136294/82291","x":136294,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7457196.478463745],[798461.1973558031,7457349.3525202945],[798614.0714123547,7457349.3525202945],[798614.0714123547,7457196.478463745],[798461.1973558031,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136295/82291","x":136295,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7457043.604407197],[797391.0789599605,7457196.478463745],[797543.9530165084,7457196.478463745],[797543.9530165084,7457043.604407197],[797391.0789599605,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136288/82292","x":136288,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7457043.604407197],[797543.9530165084,7457196.478463745],[797696.82707306,7457196.478463745],[797696.82707306,7457043.604407197],[797543.9530165084,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136289/82292","x":136289,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7456890.730350647],[797391.0789599605,7457043.604407197],[797543.9530165084,7457043.604407197],[797543.9530165084,7456890.730350647],[797391.0789599605,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136288/82293","x":136288,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7456890.730350647],[797543.9530165084,7457043.604407197],[797696.82707306,7457043.604407197],[797696.82707306,7456890.730350647],[797543.9530165084,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136289/82293","x":136289,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7457043.604407197],[797696.82707306,7457196.478463745],[797849.7011296079,7457196.478463745],[797849.7011296079,7457043.604407197],[797696.82707306,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136290/82292","x":136290,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7457043.604407197],[797849.7011296079,7457196.478463745],[798002.5751861557,7457196.478463745],[798002.5751861557,7457043.604407197],[797849.7011296079,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136291/82292","x":136291,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7456890.730350647],[797696.82707306,7457043.604407197],[797849.7011296079,7457043.604407197],[797849.7011296079,7456890.730350647],[797696.82707306,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136290/82293","x":136290,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7456890.730350647],[797849.7011296079,7457043.604407197],[798002.5751861557,7457043.604407197],[798002.5751861557,7456890.730350647],[797849.7011296079,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136291/82293","x":136291,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7456737.856294097],[797391.0789599605,7456890.730350647],[797543.9530165084,7456890.730350647],[797543.9530165084,7456737.856294097],[797391.0789599605,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136288/82294","x":136288,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7456737.856294097],[797543.9530165084,7456890.730350647],[797696.82707306,7456890.730350647],[797696.82707306,7456737.856294097],[797543.9530165084,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136289/82294","x":136289,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7456584.9822375495],[797391.0789599605,7456737.856294097],[797543.9530165084,7456737.856294097],[797543.9530165084,7456584.9822375495],[797391.0789599605,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136288/82295","x":136288,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7456584.9822375495],[797543.9530165084,7456737.856294097],[797696.82707306,7456737.856294097],[797696.82707306,7456584.9822375495],[797543.9530165084,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136289/82295","x":136289,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7456737.856294097],[797696.82707306,7456890.730350647],[797849.7011296079,7456890.730350647],[797849.7011296079,7456737.856294097],[797696.82707306,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136290/82294","x":136290,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7456737.856294097],[797849.7011296079,7456890.730350647],[798002.5751861557,7456890.730350647],[798002.5751861557,7456737.856294097],[797849.7011296079,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136291/82294","x":136291,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7456584.9822375495],[797696.82707306,7456737.856294097],[797849.7011296079,7456737.856294097],[797849.7011296079,7456584.9822375495],[797696.82707306,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136290/82295","x":136290,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7456584.9822375495],[797849.7011296079,7456737.856294097],[798002.5751861557,7456737.856294097],[798002.5751861557,7456584.9822375495],[797849.7011296079,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136291/82295","x":136291,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7457043.604407197],[798002.5751861557,7457196.478463745],[798155.4492427073,7457196.478463745],[798155.4492427073,7457043.604407197],[798002.5751861557,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136292/82292","x":136292,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7457043.604407197],[798155.4492427073,7457196.478463745],[798308.3232992552,7457196.478463745],[798308.3232992552,7457043.604407197],[798155.4492427073,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136293/82292","x":136293,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7456890.730350647],[798002.5751861557,7457043.604407197],[798155.4492427073,7457043.604407197],[798155.4492427073,7456890.730350647],[798002.5751861557,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136292/82293","x":136292,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7456890.730350647],[798155.4492427073,7457043.604407197],[798308.3232992552,7457043.604407197],[798308.3232992552,7456890.730350647],[798155.4492427073,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136293/82293","x":136293,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7457043.604407197],[798308.3232992552,7457196.478463745],[798461.1973558031,7457196.478463745],[798461.1973558031,7457043.604407197],[798308.3232992552,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136294/82292","x":136294,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7457043.604407197],[798461.1973558031,7457196.478463745],[798614.0714123547,7457196.478463745],[798614.0714123547,7457043.604407197],[798461.1973558031,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136295/82292","x":136295,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7456890.730350647],[798308.3232992552,7457043.604407197],[798461.1973558031,7457043.604407197],[798461.1973558031,7456890.730350647],[798308.3232992552,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136294/82293","x":136294,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798461.1973558031,7456890.730350647],[798461.1973558031,7457043.604407197],[798614.0714123547,7457043.604407197],[798614.0714123547,7456890.730350647],[798461.1973558031,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136295/82293","x":136295,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7456737.856294097],[798002.5751861557,7456890.730350647],[798155.4492427073,7456890.730350647],[798155.4492427073,7456737.856294097],[798002.5751861557,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136292/82294","x":136292,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7456737.856294097],[798155.4492427073,7456890.730350647],[798308.3232992552,7456890.730350647],[798308.3232992552,7456737.856294097],[798155.4492427073,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136293/82294","x":136293,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7456584.9822375495],[798002.5751861557,7456737.856294097],[798155.4492427073,7456737.856294097],[798155.4492427073,7456584.9822375495],[798002.5751861557,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136292/82295","x":136292,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798155.4492427073,7456584.9822375495],[798155.4492427073,7456737.856294097],[798308.3232992552,7456737.856294097],[798308.3232992552,7456584.9822375495],[798155.4492427073,7456584.9822375495]]],"type":"Polygon"},"properties":{"label":"18/136293/82295","x":136293,"y":82295,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798308.3232992552,7456737.856294097],[798308.3232992552,7456890.730350647],[798461.1973558031,7456890.730350647],[798461.1973558031,7456737.856294097],[798308.3232992552,7456737.856294097]]],"type":"Polygon"},"properties":{"label":"18/136294/82294","x":136294,"y":82294,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7457655.100633392],[798614.0714123547,7457807.974689942],[798766.9454689026,7457807.974689942],[798766.9454689026,7457655.100633392],[798614.0714123547,7457655.100633392]]],"type":"Polygon"},"properties":{"label":"18/136296/82288","x":136296,"y":82288,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7457502.226576842],[798614.0714123547,7457655.100633392],[798766.9454689026,7457655.100633392],[798766.9454689026,7457502.226576842],[798614.0714123547,7457502.226576842]]],"type":"Polygon"},"properties":{"label":"18/136296/82289","x":136296,"y":82289,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7457349.3525202945],[798614.0714123547,7457502.226576842],[798766.9454689026,7457502.226576842],[798766.9454689026,7457349.3525202945],[798614.0714123547,7457349.3525202945]]],"type":"Polygon"},"properties":{"label":"18/136296/82290","x":136296,"y":82290,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7457196.478463745],[798614.0714123547,7457349.3525202945],[798766.9454689026,7457349.3525202945],[798766.9454689026,7457196.478463745],[798614.0714123547,7457196.478463745]]],"type":"Polygon"},"properties":{"label":"18/136296/82291","x":136296,"y":82291,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7457043.604407197],[798614.0714123547,7457196.478463745],[798766.9454689026,7457196.478463745],[798766.9454689026,7457043.604407197],[798614.0714123547,7457043.604407197]]],"type":"Polygon"},"properties":{"label":"18/136296/82292","x":136296,"y":82292,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798614.0714123547,7456890.730350647],[798614.0714123547,7457043.604407197],[798766.9454689026,7457043.604407197],[798766.9454689026,7456890.730350647],[798614.0714123547,7456890.730350647]]],"type":"Polygon"},"properties":{"label":"18/136296/82293","x":136296,"y":82293,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7456432.108181],[797391.0789599605,7456584.9822375495],[797543.9530165084,7456584.9822375495],[797543.9530165084,7456432.108181],[797391.0789599605,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136288/82296","x":136288,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7456432.108181],[797543.9530165084,7456584.9822375495],[797696.82707306,7456584.9822375495],[797696.82707306,7456432.108181],[797543.9530165084,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136289/82296","x":136289,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7456279.23412445],[797391.0789599605,7456432.108181],[797543.9530165084,7456432.108181],[797543.9530165084,7456279.23412445],[797391.0789599605,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136288/82297","x":136288,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7456279.23412445],[797543.9530165084,7456432.108181],[797696.82707306,7456432.108181],[797696.82707306,7456279.23412445],[797543.9530165084,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136289/82297","x":136289,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7456432.108181],[797696.82707306,7456584.9822375495],[797849.7011296079,7456584.9822375495],[797849.7011296079,7456432.108181],[797696.82707306,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136290/82296","x":136290,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7456432.108181],[797849.7011296079,7456584.9822375495],[798002.5751861557,7456584.9822375495],[798002.5751861557,7456432.108181],[797849.7011296079,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136291/82296","x":136291,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7456279.23412445],[797696.82707306,7456432.108181],[797849.7011296079,7456432.108181],[797849.7011296079,7456279.23412445],[797696.82707306,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136290/82297","x":136290,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797849.7011296079,7456279.23412445],[797849.7011296079,7456432.108181],[798002.5751861557,7456432.108181],[798002.5751861557,7456279.23412445],[797849.7011296079,7456279.23412445]]],"type":"Polygon"},"properties":{"label":"18/136291/82297","x":136291,"y":82297,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7456126.360067902],[797391.0789599605,7456279.23412445],[797543.9530165084,7456279.23412445],[797543.9530165084,7456126.360067902],[797391.0789599605,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136288/82298","x":136288,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797543.9530165084,7456126.360067902],[797543.9530165084,7456279.23412445],[797696.82707306,7456279.23412445],[797696.82707306,7456126.360067902],[797543.9530165084,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136289/82298","x":136289,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797391.0789599605,7455973.486011352],[797391.0789599605,7456126.360067902],[797543.9530165084,7456126.360067902],[797543.9530165084,7455973.486011352],[797391.0789599605,7455973.486011352]]],"type":"Polygon"},"properties":{"label":"18/136288/82299","x":136288,"y":82299,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[797696.82707306,7456126.360067902],[797696.82707306,7456279.23412445],[797849.7011296079,7456279.23412445],[797849.7011296079,7456126.360067902],[797696.82707306,7456126.360067902]]],"type":"Polygon"},"properties":{"label":"18/136290/82298","x":136290,"y":82298,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[798002.5751861557,7456432.108181],[798002.5751861557,7456584.9822375495],[798155.4492427073,7456584.9822375495],[798155.4492427073,7456432.108181],[798002.5751861557,7456432.108181]]],"type":"Polygon"},"properties":{"label":"18/136292/82296","x":136292,"y":82296,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794027.849715881,7455209.115728607],[794027.849715881,7455361.989785155],[794180.7237724289,7455361.989785155],[794180.7237724289,7455209.115728607],[794027.849715881,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136266/82304","x":136266,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794180.7237724289,7455209.115728607],[794180.7237724289,7455361.989785155],[794333.5978289805,7455361.989785155],[794333.5978289805,7455209.115728607],[794180.7237724289,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136267/82304","x":136267,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7455209.115728607],[794333.5978289805,7455361.989785155],[794486.4718855284,7455361.989785155],[794486.4718855284,7455209.115728607],[794333.5978289805,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136268/82304","x":136268,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7455209.115728607],[794486.4718855284,7455361.989785155],[794639.3459420763,7455361.989785155],[794639.3459420763,7455209.115728607],[794486.4718855284,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136269/82304","x":136269,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794333.5978289805,7455056.241672058],[794333.5978289805,7455209.115728607],[794486.4718855284,7455209.115728607],[794486.4718855284,7455056.241672058],[794333.5978289805,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136268/82305","x":136268,"y":82305,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7455056.241672058],[794486.4718855284,7455209.115728607],[794639.3459420763,7455209.115728607],[794639.3459420763,7455056.241672058],[794486.4718855284,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136269/82305","x":136269,"y":82305,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7455209.115728607],[794639.3459420763,7455361.989785155],[794792.2199986279,7455361.989785155],[794792.2199986279,7455209.115728607],[794639.3459420763,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136270/82304","x":136270,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7455209.115728607],[794792.2199986279,7455361.989785155],[794945.0940551758,7455361.989785155],[794945.0940551758,7455209.115728607],[794792.2199986279,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136271/82304","x":136271,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7455056.241672058],[794639.3459420763,7455209.115728607],[794792.2199986279,7455209.115728607],[794792.2199986279,7455056.241672058],[794639.3459420763,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136270/82305","x":136270,"y":82305,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7455056.241672058],[794792.2199986279,7455209.115728607],[794945.0940551758,7455209.115728607],[794945.0940551758,7455056.241672058],[794792.2199986279,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136271/82305","x":136271,"y":82305,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794486.4718855284,7454903.36761551],[794486.4718855284,7455056.241672058],[794639.3459420763,7455056.241672058],[794639.3459420763,7454903.36761551],[794486.4718855284,7454903.36761551]]],"type":"Polygon"},"properties":{"label":"18/136269/82306","x":136269,"y":82306,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7454903.36761551],[794639.3459420763,7455056.241672058],[794792.2199986279,7455056.241672058],[794792.2199986279,7454903.36761551],[794639.3459420763,7454903.36761551]]],"type":"Polygon"},"properties":{"label":"18/136270/82306","x":136270,"y":82306,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7454903.36761551],[794792.2199986279,7455056.241672058],[794945.0940551758,7455056.241672058],[794945.0940551758,7454903.36761551],[794792.2199986279,7454903.36761551]]],"type":"Polygon"},"properties":{"label":"18/136271/82306","x":136271,"y":82306,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794639.3459420763,7454750.49355896],[794639.3459420763,7454903.36761551],[794792.2199986279,7454903.36761551],[794792.2199986279,7454750.49355896],[794639.3459420763,7454750.49355896]]],"type":"Polygon"},"properties":{"label":"18/136270/82307","x":136270,"y":82307,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7454750.49355896],[794792.2199986279,7454903.36761551],[794945.0940551758,7454903.36761551],[794945.0940551758,7454750.49355896],[794792.2199986279,7454750.49355896]]],"type":"Polygon"},"properties":{"label":"18/136271/82307","x":136271,"y":82307,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794792.2199986279,7454597.61950241],[794792.2199986279,7454750.49355896],[794945.0940551758,7454750.49355896],[794945.0940551758,7454597.61950241],[794792.2199986279,7454597.61950241]]],"type":"Polygon"},"properties":{"label":"18/136271/82308","x":136271,"y":82308,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7455209.115728607],[794945.0940551758,7455361.989785155],[795097.9681117237,7455361.989785155],[795097.9681117237,7455209.115728607],[794945.0940551758,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136272/82304","x":136272,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7455209.115728607],[795097.9681117237,7455361.989785155],[795250.8421682753,7455361.989785155],[795250.8421682753,7455209.115728607],[795097.9681117237,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136273/82304","x":136273,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7455056.241672058],[794945.0940551758,7455209.115728607],[795097.9681117237,7455209.115728607],[795097.9681117237,7455056.241672058],[794945.0940551758,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136272/82305","x":136272,"y":82305,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7455056.241672058],[795097.9681117237,7455209.115728607],[795250.8421682753,7455209.115728607],[795250.8421682753,7455056.241672058],[795097.9681117237,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136273/82305","x":136273,"y":82305,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7455209.115728607],[795250.8421682753,7455361.989785155],[795403.7162248231,7455361.989785155],[795403.7162248231,7455209.115728607],[795250.8421682753,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136274/82304","x":136274,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7455209.115728607],[795403.7162248231,7455361.989785155],[795556.590281371,7455361.989785155],[795556.590281371,7455209.115728607],[795403.7162248231,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136275/82304","x":136275,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7455056.241672058],[795250.8421682753,7455209.115728607],[795403.7162248231,7455209.115728607],[795403.7162248231,7455056.241672058],[795250.8421682753,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136274/82305","x":136274,"y":82305,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7455056.241672058],[795403.7162248231,7455209.115728607],[795556.590281371,7455209.115728607],[795556.590281371,7455056.241672058],[795403.7162248231,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136275/82305","x":136275,"y":82305,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7454903.36761551],[794945.0940551758,7455056.241672058],[795097.9681117237,7455056.241672058],[795097.9681117237,7454903.36761551],[794945.0940551758,7454903.36761551]]],"type":"Polygon"},"properties":{"label":"18/136272/82306","x":136272,"y":82306,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7454903.36761551],[795097.9681117237,7455056.241672058],[795250.8421682753,7455056.241672058],[795250.8421682753,7454903.36761551],[795097.9681117237,7454903.36761551]]],"type":"Polygon"},"properties":{"label":"18/136273/82306","x":136273,"y":82306,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7454750.49355896],[794945.0940551758,7454903.36761551],[795097.9681117237,7454903.36761551],[795097.9681117237,7454750.49355896],[794945.0940551758,7454750.49355896]]],"type":"Polygon"},"properties":{"label":"18/136272/82307","x":136272,"y":82307,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7454750.49355896],[795097.9681117237,7454903.36761551],[795250.8421682753,7454903.36761551],[795250.8421682753,7454750.49355896],[795097.9681117237,7454750.49355896]]],"type":"Polygon"},"properties":{"label":"18/136273/82307","x":136273,"y":82307,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7454903.36761551],[795250.8421682753,7455056.241672058],[795403.7162248231,7455056.241672058],[795403.7162248231,7454903.36761551],[795250.8421682753,7454903.36761551]]],"type":"Polygon"},"properties":{"label":"18/136274/82306","x":136274,"y":82306,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7454903.36761551],[795403.7162248231,7455056.241672058],[795556.590281371,7455056.241672058],[795556.590281371,7454903.36761551],[795403.7162248231,7454903.36761551]]],"type":"Polygon"},"properties":{"label":"18/136275/82306","x":136275,"y":82306,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7454750.49355896],[795250.8421682753,7454903.36761551],[795403.7162248231,7454903.36761551],[795403.7162248231,7454750.49355896],[795250.8421682753,7454750.49355896]]],"type":"Polygon"},"properties":{"label":"18/136274/82307","x":136274,"y":82307,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7454750.49355896],[795403.7162248231,7454903.36761551],[795556.590281371,7454903.36761551],[795556.590281371,7454750.49355896],[795403.7162248231,7454750.49355896]]],"type":"Polygon"},"properties":{"label":"18/136275/82307","x":136275,"y":82307,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7455209.115728607],[795556.590281371,7455361.989785155],[795709.4643379226,7455361.989785155],[795709.4643379226,7455209.115728607],[795556.590281371,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136276/82304","x":136276,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7455209.115728607],[795709.4643379226,7455361.989785155],[795862.3383944705,7455361.989785155],[795862.3383944705,7455209.115728607],[795709.4643379226,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136277/82304","x":136277,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7455056.241672058],[795556.590281371,7455209.115728607],[795709.4643379226,7455209.115728607],[795709.4643379226,7455056.241672058],[795556.590281371,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136276/82305","x":136276,"y":82305,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7455056.241672058],[795709.4643379226,7455209.115728607],[795862.3383944705,7455209.115728607],[795862.3383944705,7455056.241672058],[795709.4643379226,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136277/82305","x":136277,"y":82305,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7455209.115728607],[795862.3383944705,7455361.989785155],[796015.2124510184,7455361.989785155],[796015.2124510184,7455209.115728607],[795862.3383944705,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136278/82304","x":136278,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7455209.115728607],[796015.2124510184,7455361.989785155],[796168.08650757,7455361.989785155],[796168.08650757,7455209.115728607],[796015.2124510184,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136279/82304","x":136279,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7455056.241672058],[795862.3383944705,7455209.115728607],[796015.2124510184,7455209.115728607],[796015.2124510184,7455056.241672058],[795862.3383944705,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136278/82305","x":136278,"y":82305,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7455056.241672058],[796015.2124510184,7455209.115728607],[796168.08650757,7455209.115728607],[796168.08650757,7455056.241672058],[796015.2124510184,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136279/82305","x":136279,"y":82305,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7454903.36761551],[795556.590281371,7455056.241672058],[795709.4643379226,7455056.241672058],[795709.4643379226,7454903.36761551],[795556.590281371,7454903.36761551]]],"type":"Polygon"},"properties":{"label":"18/136276/82306","x":136276,"y":82306,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7454903.36761551],[795709.4643379226,7455056.241672058],[795862.3383944705,7455056.241672058],[795862.3383944705,7454903.36761551],[795709.4643379226,7454903.36761551]]],"type":"Polygon"},"properties":{"label":"18/136277/82306","x":136277,"y":82306,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7454750.49355896],[795556.590281371,7454903.36761551],[795709.4643379226,7454903.36761551],[795709.4643379226,7454750.49355896],[795556.590281371,7454750.49355896]]],"type":"Polygon"},"properties":{"label":"18/136276/82307","x":136276,"y":82307,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7454750.49355896],[795709.4643379226,7454903.36761551],[795862.3383944705,7454903.36761551],[795862.3383944705,7454750.49355896],[795709.4643379226,7454750.49355896]]],"type":"Polygon"},"properties":{"label":"18/136277/82307","x":136277,"y":82307,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7454903.36761551],[795862.3383944705,7455056.241672058],[796015.2124510184,7455056.241672058],[796015.2124510184,7454903.36761551],[795862.3383944705,7454903.36761551]]],"type":"Polygon"},"properties":{"label":"18/136278/82306","x":136278,"y":82306,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7454903.36761551],[796015.2124510184,7455056.241672058],[796168.08650757,7455056.241672058],[796168.08650757,7454903.36761551],[796015.2124510184,7454903.36761551]]],"type":"Polygon"},"properties":{"label":"18/136279/82306","x":136279,"y":82306,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795862.3383944705,7454750.49355896],[795862.3383944705,7454903.36761551],[796015.2124510184,7454903.36761551],[796015.2124510184,7454750.49355896],[795862.3383944705,7454750.49355896]]],"type":"Polygon"},"properties":{"label":"18/136278/82307","x":136278,"y":82307,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796015.2124510184,7454750.49355896],[796015.2124510184,7454903.36761551],[796168.08650757,7454903.36761551],[796168.08650757,7454750.49355896],[796015.2124510184,7454750.49355896]]],"type":"Polygon"},"properties":{"label":"18/136279/82307","x":136279,"y":82307,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7454597.61950241],[794945.0940551758,7454750.49355896],[795097.9681117237,7454750.49355896],[795097.9681117237,7454597.61950241],[794945.0940551758,7454597.61950241]]],"type":"Polygon"},"properties":{"label":"18/136272/82308","x":136272,"y":82308,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7454597.61950241],[795097.9681117237,7454750.49355896],[795250.8421682753,7454750.49355896],[795250.8421682753,7454597.61950241],[795097.9681117237,7454597.61950241]]],"type":"Polygon"},"properties":{"label":"18/136273/82308","x":136273,"y":82308,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[794945.0940551758,7454444.745445862],[794945.0940551758,7454597.61950241],[795097.9681117237,7454597.61950241],[795097.9681117237,7454444.745445862],[794945.0940551758,7454444.745445862]]],"type":"Polygon"},"properties":{"label":"18/136272/82309","x":136272,"y":82309,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7454444.745445862],[795097.9681117237,7454597.61950241],[795250.8421682753,7454597.61950241],[795250.8421682753,7454444.745445862],[795097.9681117237,7454444.745445862]]],"type":"Polygon"},"properties":{"label":"18/136273/82309","x":136273,"y":82309,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7454597.61950241],[795250.8421682753,7454750.49355896],[795403.7162248231,7454750.49355896],[795403.7162248231,7454597.61950241],[795250.8421682753,7454597.61950241]]],"type":"Polygon"},"properties":{"label":"18/136274/82308","x":136274,"y":82308,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7454597.61950241],[795403.7162248231,7454750.49355896],[795556.590281371,7454750.49355896],[795556.590281371,7454597.61950241],[795403.7162248231,7454597.61950241]]],"type":"Polygon"},"properties":{"label":"18/136275/82308","x":136275,"y":82308,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7454444.745445862],[795250.8421682753,7454597.61950241],[795403.7162248231,7454597.61950241],[795403.7162248231,7454444.745445862],[795250.8421682753,7454444.745445862]]],"type":"Polygon"},"properties":{"label":"18/136274/82309","x":136274,"y":82309,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7454444.745445862],[795403.7162248231,7454597.61950241],[795556.590281371,7454597.61950241],[795556.590281371,7454444.745445862],[795403.7162248231,7454444.745445862]]],"type":"Polygon"},"properties":{"label":"18/136275/82309","x":136275,"y":82309,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795097.9681117237,7454291.871389313],[795097.9681117237,7454444.745445862],[795250.8421682753,7454444.745445862],[795250.8421682753,7454291.871389313],[795097.9681117237,7454291.871389313]]],"type":"Polygon"},"properties":{"label":"18/136273/82310","x":136273,"y":82310,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795250.8421682753,7454291.871389313],[795250.8421682753,7454444.745445862],[795403.7162248231,7454444.745445862],[795403.7162248231,7454291.871389313],[795250.8421682753,7454291.871389313]]],"type":"Polygon"},"properties":{"label":"18/136274/82310","x":136274,"y":82310,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795403.7162248231,7454291.871389313],[795403.7162248231,7454444.745445862],[795556.590281371,7454444.745445862],[795556.590281371,7454291.871389313],[795403.7162248231,7454291.871389313]]],"type":"Polygon"},"properties":{"label":"18/136275/82310","x":136275,"y":82310,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7454597.61950241],[795556.590281371,7454750.49355896],[795709.4643379226,7454750.49355896],[795709.4643379226,7454597.61950241],[795556.590281371,7454597.61950241]]],"type":"Polygon"},"properties":{"label":"18/136276/82308","x":136276,"y":82308,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795709.4643379226,7454597.61950241],[795709.4643379226,7454750.49355896],[795862.3383944705,7454750.49355896],[795862.3383944705,7454597.61950241],[795709.4643379226,7454597.61950241]]],"type":"Polygon"},"properties":{"label":"18/136277/82308","x":136277,"y":82308,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[795556.590281371,7454444.745445862],[795556.590281371,7454597.61950241],[795709.4643379226,7454597.61950241],[795709.4643379226,7454444.745445862],[795556.590281371,7454444.745445862]]],"type":"Polygon"},"properties":{"label":"18/136276/82309","x":136276,"y":82309,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7455209.115728607],[796168.08650757,7455361.989785155],[796320.9605641179,7455361.989785155],[796320.9605641179,7455209.115728607],[796168.08650757,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136280/82304","x":136280,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7455209.115728607],[796320.9605641179,7455361.989785155],[796473.8346206658,7455361.989785155],[796473.8346206658,7455209.115728607],[796320.9605641179,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136281/82304","x":136281,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7455056.241672058],[796168.08650757,7455209.115728607],[796320.9605641179,7455209.115728607],[796320.9605641179,7455056.241672058],[796168.08650757,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136280/82305","x":136280,"y":82305,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796320.9605641179,7455056.241672058],[796320.9605641179,7455209.115728607],[796473.8346206658,7455209.115728607],[796473.8346206658,7455056.241672058],[796320.9605641179,7455056.241672058]]],"type":"Polygon"},"properties":{"label":"18/136281/82305","x":136281,"y":82305,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796473.8346206658,7455209.115728607],[796473.8346206658,7455361.989785155],[796626.7086772174,7455361.989785155],[796626.7086772174,7455209.115728607],[796473.8346206658,7455209.115728607]]],"type":"Polygon"},"properties":{"label":"18/136282/82304","x":136282,"y":82304,"z":18},"type":"Feature"}
+,{"geometry":{"coordinates":[[[796168.08650757,7454903.36761551],[796168.08650757,7455056.241672058],[796320.9605641179,7455056.241672058],[796320.9605641179,7454903.36761551],[796168.08650757,7454903.36761551]]],"type":"Polygon"},"properties":{"label":"18/136280/82306","x":136280,"y":82306,"z":18},"type":"Feature"}
+]}
diff --git a/tests/data/expire/test-z18-b05.tiles b/tests/data/expire/test-z18-b05.tiles
new file mode 100644
index 000000000..d518221e9
--- /dev/null
+++ b/tests/data/expire/test-z18-b05.tiles
@@ -0,0 +1,2119 @@
+18/136265/82199
+18/136267/82198
+18/136266/82199
+18/136267/82199
+18/136268/82198
+18/136268/82199
+18/136269/82199
+18/136270/82199
+18/136257/82203
+18/136259/82202
+18/136258/82203
+18/136259/82203
+18/136261/82201
+18/136263/82200
+18/136262/82201
+18/136263/82201
+18/136260/82202
+18/136261/82202
+18/136260/82203
+18/136261/82203
+18/136262/82202
+18/136263/82202
+18/136262/82203
+18/136256/82204
+18/136257/82204
+18/136256/82205
+18/136257/82205
+18/136258/82204
+18/136259/82204
+18/136258/82205
+18/136260/82204
+18/136264/82200
+18/136265/82200
+18/136264/82201
+18/136265/82201
+18/136266/82200
+18/136267/82200
+18/136266/82201
+18/136264/82202
+18/136268/82200
+18/136269/82200
+18/136269/82201
+18/136270/82200
+18/136271/82200
+18/136270/82201
+18/136271/82201
+18/136270/82202
+18/136271/82202
+18/136271/82203
+18/136286/82199
+18/136287/82199
+18/136272/82201
+18/136273/82201
+18/136272/82202
+18/136273/82202
+18/136272/82203
+18/136273/82203
+18/136274/82202
+18/136274/82203
+18/136275/82203
+18/136276/82203
+18/136278/82203
+18/136279/82203
+18/136273/82204
+18/136274/82204
+18/136275/82204
+18/136274/82205
+18/136275/82205
+18/136276/82204
+18/136277/82204
+18/136276/82205
+18/136277/82205
+18/136278/82204
+18/136279/82204
+18/136278/82205
+18/136279/82205
+18/136276/82206
+18/136277/82206
+18/136282/82201
+18/136283/82201
+18/136280/82202
+18/136281/82202
+18/136280/82203
+18/136281/82203
+18/136282/82202
+18/136283/82202
+18/136282/82203
+18/136283/82203
+18/136284/82200
+18/136285/82200
+18/136284/82201
+18/136285/82201
+18/136286/82200
+18/136287/82200
+18/136286/82201
+18/136287/82201
+18/136284/82202
+18/136285/82202
+18/136280/82204
+18/136281/82204
+18/136288/82199
+18/136288/82200
+18/136289/82200
+18/136288/82201
+18/136289/82201
+18/136290/82201
+18/136288/82202
+18/136289/82202
+18/136288/82203
+18/136289/82203
+18/136290/82202
+18/136291/82202
+18/136290/82203
+18/136291/82203
+18/136289/82204
+18/136290/82204
+18/136291/82204
+18/136290/82205
+18/136291/82205
+18/136288/82207
+18/136289/82207
+18/136290/82206
+18/136291/82206
+18/136290/82207
+18/136291/82207
+18/136292/82204
+18/136292/82205
+18/136293/82205
+18/136292/82206
+18/136293/82206
+18/136292/82207
+18/136293/82207
+18/136256/82210
+18/136257/82210
+18/136256/82211
+18/136257/82211
+18/136258/82210
+18/136259/82210
+18/136258/82211
+18/136259/82211
+18/136260/82210
+18/136261/82210
+18/136260/82211
+18/136261/82211
+18/136262/82210
+18/136263/82210
+18/136262/82211
+18/136263/82211
+18/136264/82210
+18/136265/82210
+18/136264/82211
+18/136265/82211
+18/136266/82210
+18/136267/82210
+18/136266/82211
+18/136267/82211
+18/136268/82210
+18/136269/82210
+18/136268/82211
+18/136269/82211
+18/136270/82210
+18/136271/82210
+18/136270/82211
+18/136271/82211
+18/136257/82216
+18/136257/82217
+18/136258/82216
+18/136259/82216
+18/136258/82217
+18/136259/82217
+18/136257/82218
+18/136256/82219
+18/136257/82219
+18/136258/82218
+18/136259/82218
+18/136258/82219
+18/136259/82219
+18/136260/82216
+18/136261/82216
+18/136260/82217
+18/136261/82217
+18/136262/82216
+18/136263/82216
+18/136262/82217
+18/136263/82217
+18/136260/82218
+18/136261/82218
+18/136260/82219
+18/136261/82219
+18/136262/82218
+18/136263/82218
+18/136262/82219
+18/136263/82219
+18/136256/82220
+18/136257/82220
+18/136256/82221
+18/136257/82221
+18/136258/82220
+18/136259/82220
+18/136258/82221
+18/136259/82221
+18/136256/82222
+18/136257/82222
+18/136256/82223
+18/136257/82223
+18/136258/82222
+18/136259/82222
+18/136258/82223
+18/136259/82223
+18/136260/82220
+18/136261/82220
+18/136260/82221
+18/136261/82221
+18/136262/82220
+18/136263/82220
+18/136262/82221
+18/136263/82221
+18/136260/82222
+18/136261/82222
+18/136260/82223
+18/136261/82223
+18/136262/82222
+18/136263/82222
+18/136262/82223
+18/136263/82223
+18/136264/82216
+18/136265/82216
+18/136264/82217
+18/136265/82217
+18/136266/82216
+18/136267/82216
+18/136266/82217
+18/136267/82217
+18/136264/82218
+18/136265/82218
+18/136264/82219
+18/136265/82219
+18/136266/82218
+18/136267/82218
+18/136266/82219
+18/136267/82219
+18/136268/82216
+18/136268/82217
+18/136268/82218
+18/136268/82219
+18/136264/82220
+18/136265/82220
+18/136264/82221
+18/136265/82221
+18/136266/82220
+18/136267/82220
+18/136266/82221
+18/136267/82221
+18/136264/82222
+18/136265/82222
+18/136264/82223
+18/136265/82223
+18/136266/82222
+18/136267/82222
+18/136266/82223
+18/136267/82223
+18/136268/82220
+18/136268/82221
+18/136268/82222
+18/136268/82223
+18/136272/82210
+18/136273/82210
+18/136272/82211
+18/136273/82211
+18/136274/82210
+18/136275/82210
+18/136274/82211
+18/136275/82211
+18/136276/82210
+18/136277/82210
+18/136276/82211
+18/136277/82211
+18/136278/82210
+18/136279/82210
+18/136278/82211
+18/136279/82211
+18/136283/82209
+18/136280/82210
+18/136281/82210
+18/136280/82211
+18/136281/82211
+18/136282/82210
+18/136283/82210
+18/136282/82211
+18/136283/82211
+18/136284/82209
+18/136285/82209
+18/136286/82208
+18/136287/82208
+18/136286/82209
+18/136287/82209
+18/136284/82210
+18/136285/82210
+18/136284/82211
+18/136286/82210
+18/136287/82210
+18/136281/82215
+18/136282/82214
+18/136283/82214
+18/136282/82215
+18/136283/82215
+18/136284/82214
+18/136284/82215
+18/136285/82215
+18/136279/82217
+18/136277/82219
+18/136278/82218
+18/136279/82218
+18/136278/82219
+18/136279/82219
+18/136276/82220
+18/136277/82220
+18/136276/82221
+18/136277/82221
+18/136278/82220
+18/136279/82220
+18/136278/82221
+18/136279/82221
+18/136276/82222
+18/136277/82222
+18/136276/82223
+18/136277/82223
+18/136278/82222
+18/136279/82222
+18/136278/82223
+18/136279/82223
+18/136280/82216
+18/136281/82216
+18/136280/82217
+18/136281/82217
+18/136282/82216
+18/136283/82216
+18/136282/82217
+18/136283/82217
+18/136280/82218
+18/136281/82218
+18/136280/82219
+18/136281/82219
+18/136282/82218
+18/136283/82218
+18/136282/82219
+18/136283/82219
+18/136284/82216
+18/136285/82216
+18/136284/82217
+18/136285/82217
+18/136286/82216
+18/136286/82217
+18/136287/82217
+18/136284/82218
+18/136285/82218
+18/136284/82219
+18/136285/82219
+18/136286/82218
+18/136287/82218
+18/136286/82219
+18/136287/82219
+18/136280/82220
+18/136281/82220
+18/136280/82221
+18/136281/82221
+18/136282/82220
+18/136283/82220
+18/136282/82221
+18/136283/82221
+18/136280/82222
+18/136281/82222
+18/136280/82223
+18/136281/82223
+18/136282/82222
+18/136283/82222
+18/136282/82223
+18/136283/82223
+18/136284/82220
+18/136285/82220
+18/136284/82221
+18/136285/82221
+18/136286/82220
+18/136287/82220
+18/136286/82221
+18/136287/82221
+18/136284/82222
+18/136285/82222
+18/136284/82223
+18/136285/82223
+18/136286/82222
+18/136256/82224
+18/136257/82224
+18/136256/82225
+18/136257/82225
+18/136258/82224
+18/136259/82224
+18/136258/82225
+18/136259/82225
+18/136256/82226
+18/136257/82226
+18/136256/82227
+18/136257/82227
+18/136258/82226
+18/136259/82226
+18/136258/82227
+18/136259/82227
+18/136260/82224
+18/136261/82224
+18/136260/82225
+18/136261/82225
+18/136262/82224
+18/136263/82224
+18/136262/82225
+18/136263/82225
+18/136260/82226
+18/136261/82226
+18/136260/82227
+18/136261/82227
+18/136262/82226
+18/136263/82226
+18/136262/82227
+18/136263/82227
+18/136264/82224
+18/136265/82224
+18/136264/82225
+18/136265/82225
+18/136266/82224
+18/136267/82224
+18/136266/82225
+18/136267/82225
+18/136264/82226
+18/136265/82226
+18/136264/82227
+18/136265/82227
+18/136266/82226
+18/136267/82226
+18/136266/82227
+18/136267/82227
+18/136268/82224
+18/136268/82225
+18/136268/82226
+18/136268/82227
+18/136262/82235
+18/136263/82235
+18/136259/82237
+18/136257/82238
+18/136256/82239
+18/136257/82239
+18/136258/82238
+18/136259/82238
+18/136258/82239
+18/136259/82239
+18/136261/82236
+18/136260/82237
+18/136261/82237
+18/136262/82236
+18/136263/82236
+18/136262/82237
+18/136263/82237
+18/136260/82238
+18/136261/82238
+18/136260/82239
+18/136261/82239
+18/136262/82238
+18/136263/82238
+18/136262/82239
+18/136263/82239
+18/136264/82235
+18/136265/82235
+18/136266/82235
+18/136267/82235
+18/136268/82235
+18/136269/82235
+18/136270/82235
+18/136271/82235
+18/136264/82236
+18/136265/82236
+18/136264/82237
+18/136265/82237
+18/136266/82236
+18/136267/82236
+18/136266/82237
+18/136267/82237
+18/136264/82238
+18/136265/82238
+18/136264/82239
+18/136265/82239
+18/136266/82238
+18/136267/82238
+18/136266/82239
+18/136267/82239
+18/136268/82236
+18/136269/82236
+18/136268/82237
+18/136269/82237
+18/136270/82236
+18/136271/82236
+18/136270/82237
+18/136271/82237
+18/136268/82238
+18/136269/82238
+18/136268/82239
+18/136269/82239
+18/136270/82238
+18/136271/82238
+18/136270/82239
+18/136271/82239
+18/136277/82224
+18/136278/82224
+18/136279/82224
+18/136278/82225
+18/136279/82225
+18/136279/82226
+18/136273/82231
+18/136275/82230
+18/136274/82231
+18/136275/82231
+18/136277/82229
+18/136279/82228
+18/136278/82229
+18/136279/82229
+18/136276/82230
+18/136277/82230
+18/136276/82231
+18/136277/82231
+18/136278/82230
+18/136279/82230
+18/136278/82231
+18/136279/82231
+18/136280/82224
+18/136281/82224
+18/136280/82225
+18/136281/82225
+18/136282/82224
+18/136283/82224
+18/136282/82225
+18/136283/82225
+18/136280/82226
+18/136281/82226
+18/136280/82227
+18/136281/82227
+18/136282/82226
+18/136283/82226
+18/136282/82227
+18/136283/82227
+18/136284/82224
+18/136285/82224
+18/136284/82225
+18/136285/82225
+18/136286/82224
+18/136286/82225
+18/136284/82226
+18/136285/82226
+18/136284/82227
+18/136285/82227
+18/136286/82226
+18/136287/82226
+18/136286/82227
+18/136287/82227
+18/136280/82228
+18/136281/82228
+18/136280/82229
+18/136281/82229
+18/136282/82228
+18/136283/82228
+18/136282/82229
+18/136283/82229
+18/136280/82230
+18/136281/82230
+18/136280/82231
+18/136281/82231
+18/136282/82230
+18/136283/82230
+18/136282/82231
+18/136283/82231
+18/136284/82228
+18/136285/82228
+18/136284/82229
+18/136285/82229
+18/136286/82228
+18/136287/82228
+18/136286/82229
+18/136287/82229
+18/136284/82230
+18/136285/82230
+18/136284/82231
+18/136285/82231
+18/136286/82230
+18/136287/82230
+18/136286/82231
+18/136287/82231
+18/136272/82232
+18/136273/82232
+18/136272/82233
+18/136273/82233
+18/136274/82232
+18/136275/82232
+18/136274/82233
+18/136275/82233
+18/136272/82235
+18/136273/82235
+18/136274/82235
+18/136275/82235
+18/136276/82232
+18/136277/82232
+18/136276/82233
+18/136277/82233
+18/136278/82232
+18/136279/82232
+18/136278/82233
+18/136279/82233
+18/136272/82236
+18/136273/82236
+18/136272/82237
+18/136273/82237
+18/136274/82236
+18/136275/82236
+18/136274/82237
+18/136275/82237
+18/136272/82238
+18/136273/82238
+18/136272/82239
+18/136273/82239
+18/136274/82238
+18/136275/82238
+18/136274/82239
+18/136275/82239
+18/136276/82236
+18/136277/82236
+18/136276/82237
+18/136277/82237
+18/136278/82236
+18/136279/82236
+18/136278/82237
+18/136279/82237
+18/136276/82238
+18/136277/82238
+18/136276/82239
+18/136277/82239
+18/136278/82238
+18/136279/82238
+18/136278/82239
+18/136279/82239
+18/136280/82232
+18/136281/82232
+18/136280/82233
+18/136281/82233
+18/136282/82232
+18/136283/82232
+18/136282/82233
+18/136283/82233
+18/136284/82232
+18/136285/82232
+18/136284/82233
+18/136285/82233
+18/136286/82232
+18/136287/82232
+18/136286/82233
+18/136287/82233
+18/136280/82236
+18/136281/82236
+18/136280/82237
+18/136281/82237
+18/136282/82236
+18/136283/82236
+18/136282/82237
+18/136283/82237
+18/136280/82238
+18/136281/82238
+18/136280/82239
+18/136281/82239
+18/136282/82238
+18/136283/82238
+18/136282/82239
+18/136283/82239
+18/136284/82236
+18/136284/82237
+18/136284/82238
+18/136284/82239
+18/136288/82208
+18/136289/82208
+18/136288/82209
+18/136289/82209
+18/136290/82208
+18/136291/82208
+18/136288/82217
+18/136288/82218
+18/136289/82218
+18/136288/82219
+18/136289/82219
+18/136290/82219
+18/136288/82220
+18/136289/82220
+18/136288/82221
+18/136289/82221
+18/136290/82220
+18/136290/82221
+18/136288/82227
+18/136288/82228
+18/136288/82229
+18/136289/82229
+18/136288/82230
+18/136289/82230
+18/136288/82231
+18/136289/82231
+18/136290/82231
+18/136288/82232
+18/136289/82232
+18/136288/82233
+18/136289/82233
+18/136290/82232
+18/136290/82233
+18/136255/82240
+18/136255/82241
+18/136255/82242
+18/136255/82272
+18/136255/82273
+18/136255/82274
+18/136255/82275
+18/136255/82276
+18/136255/82277
+18/136255/82278
+18/136255/82279
+18/136255/82280
+18/136255/82281
+18/136255/82282
+18/136255/82283
+18/136255/82284
+18/136255/82285
+18/136255/82286
+18/136255/82287
+18/136255/82288
+18/136255/82289
+18/136255/82290
+18/136255/82291
+18/136255/82292
+18/136255/82293
+18/136255/82294
+18/136256/82240
+18/136257/82240
+18/136256/82241
+18/136257/82241
+18/136258/82240
+18/136259/82240
+18/136258/82241
+18/136259/82241
+18/136256/82242
+18/136257/82242
+18/136256/82243
+18/136257/82243
+18/136258/82242
+18/136259/82242
+18/136258/82243
+18/136259/82243
+18/136260/82240
+18/136261/82240
+18/136260/82241
+18/136261/82241
+18/136262/82240
+18/136263/82240
+18/136262/82241
+18/136263/82241
+18/136260/82242
+18/136261/82242
+18/136260/82243
+18/136261/82243
+18/136262/82242
+18/136263/82242
+18/136262/82243
+18/136263/82243
+18/136256/82244
+18/136257/82244
+18/136256/82245
+18/136257/82245
+18/136258/82244
+18/136259/82244
+18/136258/82245
+18/136259/82245
+18/136256/82246
+18/136257/82246
+18/136256/82247
+18/136257/82247
+18/136258/82246
+18/136259/82246
+18/136258/82247
+18/136259/82247
+18/136260/82244
+18/136261/82244
+18/136260/82245
+18/136261/82245
+18/136262/82244
+18/136263/82244
+18/136262/82245
+18/136263/82245
+18/136260/82246
+18/136261/82246
+18/136260/82247
+18/136261/82247
+18/136262/82246
+18/136263/82246
+18/136262/82247
+18/136263/82247
+18/136264/82240
+18/136265/82240
+18/136264/82241
+18/136265/82241
+18/136266/82240
+18/136267/82240
+18/136266/82241
+18/136267/82241
+18/136264/82242
+18/136265/82242
+18/136264/82243
+18/136265/82243
+18/136266/82242
+18/136268/82240
+18/136269/82240
+18/136268/82241
+18/136269/82241
+18/136270/82240
+18/136271/82240
+18/136270/82241
+18/136264/82244
+18/136265/82244
+18/136264/82245
+18/136264/82246
+18/136265/82246
+18/136264/82247
+18/136265/82247
+18/136266/82247
+18/136269/82247
+18/136270/82246
+18/136271/82246
+18/136270/82247
+18/136271/82247
+18/136257/82248
+18/136257/82249
+18/136258/82248
+18/136259/82248
+18/136258/82249
+18/136259/82249
+18/136257/82250
+18/136257/82251
+18/136258/82250
+18/136259/82250
+18/136258/82251
+18/136259/82251
+18/136260/82248
+18/136261/82248
+18/136260/82249
+18/136261/82249
+18/136262/82248
+18/136263/82248
+18/136262/82249
+18/136263/82249
+18/136260/82250
+18/136261/82250
+18/136260/82251
+18/136261/82251
+18/136262/82250
+18/136263/82250
+18/136262/82251
+18/136263/82251
+18/136257/82252
+18/136258/82252
+18/136259/82252
+18/136259/82253
+18/136260/82252
+18/136261/82252
+18/136260/82253
+18/136261/82253
+18/136262/82252
+18/136263/82252
+18/136262/82253
+18/136263/82253
+18/136263/82254
+18/136264/82248
+18/136265/82248
+18/136264/82249
+18/136265/82249
+18/136266/82248
+18/136267/82248
+18/136266/82249
+18/136267/82249
+18/136264/82250
+18/136265/82250
+18/136264/82251
+18/136265/82251
+18/136266/82250
+18/136267/82250
+18/136266/82251
+18/136267/82251
+18/136268/82248
+18/136269/82248
+18/136268/82249
+18/136269/82249
+18/136270/82248
+18/136271/82248
+18/136270/82249
+18/136271/82249
+18/136268/82250
+18/136269/82250
+18/136268/82251
+18/136269/82251
+18/136270/82250
+18/136271/82250
+18/136270/82251
+18/136271/82251
+18/136264/82252
+18/136265/82252
+18/136264/82253
+18/136265/82253
+18/136266/82252
+18/136267/82252
+18/136266/82253
+18/136267/82253
+18/136264/82254
+18/136265/82254
+18/136266/82254
+18/136267/82254
+18/136267/82255
+18/136268/82252
+18/136269/82252
+18/136268/82253
+18/136269/82253
+18/136270/82252
+18/136271/82252
+18/136270/82253
+18/136271/82253
+18/136268/82254
+18/136269/82254
+18/136268/82255
+18/136269/82255
+18/136270/82254
+18/136271/82254
+18/136270/82255
+18/136271/82255
+18/136272/82240
+18/136273/82240
+18/136272/82241
+18/136273/82241
+18/136274/82240
+18/136275/82240
+18/136274/82241
+18/136275/82241
+18/136272/82242
+18/136273/82242
+18/136272/82243
+18/136273/82243
+18/136274/82242
+18/136275/82242
+18/136274/82243
+18/136275/82243
+18/136276/82240
+18/136277/82240
+18/136276/82241
+18/136277/82241
+18/136278/82240
+18/136279/82240
+18/136278/82241
+18/136279/82241
+18/136276/82242
+18/136277/82242
+18/136276/82243
+18/136277/82243
+18/136278/82242
+18/136279/82242
+18/136278/82243
+18/136279/82243
+18/136272/82244
+18/136273/82244
+18/136272/82245
+18/136273/82245
+18/136274/82244
+18/136275/82244
+18/136274/82245
+18/136275/82245
+18/136272/82246
+18/136273/82246
+18/136272/82247
+18/136273/82247
+18/136274/82246
+18/136275/82246
+18/136274/82247
+18/136275/82247
+18/136276/82244
+18/136277/82244
+18/136276/82245
+18/136277/82245
+18/136278/82244
+18/136279/82244
+18/136278/82245
+18/136279/82245
+18/136276/82246
+18/136277/82246
+18/136276/82247
+18/136277/82247
+18/136278/82246
+18/136279/82246
+18/136278/82247
+18/136279/82247
+18/136280/82240
+18/136281/82240
+18/136280/82241
+18/136281/82241
+18/136282/82240
+18/136283/82240
+18/136282/82241
+18/136283/82241
+18/136280/82242
+18/136281/82242
+18/136280/82243
+18/136281/82243
+18/136282/82242
+18/136280/82244
+18/136281/82244
+18/136280/82245
+18/136272/82248
+18/136273/82248
+18/136272/82249
+18/136273/82249
+18/136274/82248
+18/136275/82248
+18/136274/82249
+18/136275/82249
+18/136272/82250
+18/136273/82250
+18/136272/82251
+18/136273/82251
+18/136274/82250
+18/136275/82250
+18/136274/82251
+18/136275/82251
+18/136276/82248
+18/136277/82248
+18/136276/82249
+18/136277/82249
+18/136278/82248
+18/136278/82249
+18/136276/82250
+18/136277/82250
+18/136276/82251
+18/136277/82251
+18/136272/82252
+18/136273/82252
+18/136272/82253
+18/136273/82253
+18/136274/82252
+18/136275/82252
+18/136274/82253
+18/136275/82253
+18/136272/82254
+18/136273/82254
+18/136272/82255
+18/136273/82255
+18/136274/82254
+18/136275/82254
+18/136274/82255
+18/136276/82252
+18/136256/82263
+18/136257/82263
+18/136258/82263
+18/136259/82263
+18/136260/82263
+18/136261/82263
+18/136262/82263
+18/136263/82263
+18/136271/82256
+18/136264/82263
+18/136265/82263
+18/136266/82263
+18/136267/82263
+18/136268/82263
+18/136269/82263
+18/136270/82263
+18/136271/82263
+18/136256/82264
+18/136257/82264
+18/136256/82265
+18/136257/82265
+18/136258/82264
+18/136259/82264
+18/136258/82265
+18/136259/82265
+18/136256/82266
+18/136257/82266
+18/136256/82267
+18/136257/82267
+18/136258/82266
+18/136259/82266
+18/136258/82267
+18/136259/82267
+18/136260/82264
+18/136261/82264
+18/136260/82265
+18/136261/82265
+18/136262/82264
+18/136263/82264
+18/136262/82265
+18/136263/82265
+18/136260/82266
+18/136261/82266
+18/136260/82267
+18/136261/82267
+18/136262/82266
+18/136263/82266
+18/136262/82267
+18/136263/82267
+18/136256/82268
+18/136257/82268
+18/136256/82269
+18/136257/82269
+18/136258/82268
+18/136259/82268
+18/136258/82269
+18/136259/82269
+18/136256/82270
+18/136257/82270
+18/136256/82271
+18/136257/82271
+18/136258/82270
+18/136259/82270
+18/136258/82271
+18/136259/82271
+18/136260/82268
+18/136261/82268
+18/136260/82269
+18/136261/82269
+18/136262/82268
+18/136263/82268
+18/136262/82269
+18/136263/82269
+18/136260/82270
+18/136261/82270
+18/136260/82271
+18/136261/82271
+18/136262/82270
+18/136263/82270
+18/136262/82271
+18/136263/82271
+18/136264/82264
+18/136265/82264
+18/136264/82265
+18/136265/82265
+18/136266/82264
+18/136267/82264
+18/136266/82265
+18/136267/82265
+18/136264/82266
+18/136265/82266
+18/136264/82267
+18/136265/82267
+18/136266/82266
+18/136267/82266
+18/136266/82267
+18/136267/82267
+18/136268/82264
+18/136269/82264
+18/136268/82265
+18/136269/82265
+18/136270/82264
+18/136271/82264
+18/136270/82265
+18/136271/82265
+18/136268/82266
+18/136269/82266
+18/136268/82267
+18/136269/82267
+18/136270/82266
+18/136271/82266
+18/136270/82267
+18/136271/82267
+18/136264/82268
+18/136265/82268
+18/136264/82269
+18/136265/82269
+18/136266/82268
+18/136267/82268
+18/136264/82270
+18/136268/82268
+18/136269/82268
+18/136270/82268
+18/136271/82268
+18/136272/82256
+18/136273/82256
+18/136272/82263
+18/136273/82263
+18/136274/82263
+18/136275/82263
+18/136276/82263
+18/136277/82263
+18/136278/82263
+18/136279/82263
+18/136280/82263
+18/136281/82263
+18/136282/82263
+18/136283/82263
+18/136284/82263
+18/136285/82263
+18/136286/82263
+18/136287/82263
+18/136272/82264
+18/136273/82264
+18/136272/82265
+18/136273/82265
+18/136274/82264
+18/136275/82264
+18/136274/82265
+18/136275/82265
+18/136272/82266
+18/136273/82266
+18/136272/82267
+18/136273/82267
+18/136274/82266
+18/136275/82266
+18/136274/82267
+18/136275/82267
+18/136276/82264
+18/136277/82264
+18/136276/82265
+18/136277/82265
+18/136278/82264
+18/136279/82264
+18/136278/82265
+18/136279/82265
+18/136276/82266
+18/136277/82266
+18/136276/82267
+18/136277/82267
+18/136278/82266
+18/136279/82266
+18/136278/82267
+18/136279/82267
+18/136272/82268
+18/136273/82268
+18/136274/82268
+18/136275/82268
+18/136276/82268
+18/136277/82268
+18/136278/82268
+18/136279/82268
+18/136279/82269
+18/136280/82264
+18/136281/82264
+18/136280/82265
+18/136281/82265
+18/136282/82264
+18/136283/82264
+18/136282/82265
+18/136283/82265
+18/136280/82266
+18/136281/82266
+18/136280/82267
+18/136281/82267
+18/136282/82266
+18/136283/82266
+18/136282/82267
+18/136283/82267
+18/136284/82264
+18/136285/82264
+18/136284/82265
+18/136285/82265
+18/136286/82264
+18/136287/82264
+18/136286/82265
+18/136287/82265
+18/136284/82266
+18/136285/82266
+18/136284/82267
+18/136285/82267
+18/136286/82266
+18/136287/82266
+18/136286/82267
+18/136287/82267
+18/136280/82268
+18/136281/82268
+18/136280/82269
+18/136281/82269
+18/136282/82268
+18/136283/82268
+18/136282/82269
+18/136283/82269
+18/136284/82268
+18/136285/82268
+18/136284/82269
+18/136285/82269
+18/136286/82268
+18/136287/82268
+18/136286/82269
+18/136287/82269
+18/136288/82263
+18/136289/82263
+18/136290/82263
+18/136291/82263
+18/136292/82263
+18/136293/82263
+18/136294/82263
+18/136295/82263
+18/136296/82263
+18/136288/82264
+18/136289/82264
+18/136288/82265
+18/136289/82265
+18/136290/82264
+18/136291/82264
+18/136290/82265
+18/136291/82265
+18/136288/82266
+18/136289/82266
+18/136288/82267
+18/136289/82267
+18/136290/82266
+18/136291/82266
+18/136290/82267
+18/136291/82267
+18/136292/82264
+18/136293/82264
+18/136292/82265
+18/136293/82265
+18/136294/82264
+18/136295/82264
+18/136294/82265
+18/136295/82265
+18/136292/82266
+18/136293/82266
+18/136292/82267
+18/136293/82267
+18/136294/82266
+18/136295/82266
+18/136294/82267
+18/136295/82267
+18/136288/82268
+18/136289/82268
+18/136288/82269
+18/136289/82269
+18/136290/82268
+18/136291/82268
+18/136290/82269
+18/136291/82269
+18/136288/82270
+18/136289/82270
+18/136289/82271
+18/136290/82270
+18/136291/82270
+18/136290/82271
+18/136291/82271
+18/136292/82268
+18/136293/82268
+18/136292/82269
+18/136293/82269
+18/136294/82268
+18/136295/82268
+18/136294/82269
+18/136295/82269
+18/136292/82270
+18/136293/82270
+18/136292/82271
+18/136293/82271
+18/136294/82270
+18/136295/82270
+18/136294/82271
+18/136295/82271
+18/136296/82264
+18/136296/82265
+18/136296/82266
+18/136296/82267
+18/136296/82268
+18/136296/82269
+18/136296/82270
+18/136296/82271
+18/136256/82272
+18/136257/82272
+18/136256/82273
+18/136257/82273
+18/136258/82272
+18/136259/82272
+18/136258/82273
+18/136259/82273
+18/136256/82274
+18/136257/82274
+18/136256/82275
+18/136257/82275
+18/136258/82274
+18/136259/82274
+18/136258/82275
+18/136259/82275
+18/136260/82272
+18/136261/82272
+18/136260/82273
+18/136261/82273
+18/136262/82272
+18/136260/82274
+18/136261/82274
+18/136260/82275
+18/136261/82275
+18/136256/82276
+18/136257/82276
+18/136256/82277
+18/136257/82277
+18/136258/82276
+18/136259/82276
+18/136258/82277
+18/136259/82277
+18/136256/82278
+18/136257/82278
+18/136256/82279
+18/136257/82279
+18/136258/82278
+18/136259/82278
+18/136258/82279
+18/136259/82279
+18/136260/82276
+18/136261/82276
+18/136260/82277
+18/136261/82277
+18/136260/82278
+18/136261/82278
+18/136260/82279
+18/136261/82279
+18/136270/82275
+18/136271/82275
+18/136270/82276
+18/136271/82276
+18/136270/82277
+18/136271/82277
+18/136271/82278
+18/136256/82280
+18/136257/82280
+18/136256/82281
+18/136257/82281
+18/136258/82280
+18/136259/82280
+18/136258/82281
+18/136259/82281
+18/136256/82282
+18/136257/82282
+18/136256/82283
+18/136257/82283
+18/136258/82282
+18/136259/82282
+18/136258/82283
+18/136259/82283
+18/136260/82280
+18/136261/82280
+18/136260/82281
+18/136261/82281
+18/136260/82282
+18/136261/82282
+18/136260/82283
+18/136261/82283
+18/136256/82284
+18/136257/82284
+18/136256/82285
+18/136257/82285
+18/136258/82284
+18/136259/82284
+18/136258/82285
+18/136259/82285
+18/136256/82286
+18/136257/82286
+18/136256/82287
+18/136257/82287
+18/136258/82286
+18/136259/82286
+18/136258/82287
+18/136259/82287
+18/136260/82284
+18/136260/82285
+18/136260/82286
+18/136260/82287
+18/136269/82287
+18/136271/82286
+18/136270/82287
+18/136271/82287
+18/136272/82275
+18/136273/82275
+18/136274/82275
+18/136275/82275
+18/136276/82275
+18/136277/82275
+18/136278/82275
+18/136279/82275
+18/136272/82276
+18/136273/82276
+18/136272/82277
+18/136273/82277
+18/136274/82276
+18/136275/82276
+18/136274/82277
+18/136275/82277
+18/136272/82278
+18/136273/82278
+18/136273/82279
+18/136274/82278
+18/136275/82278
+18/136274/82279
+18/136275/82279
+18/136276/82276
+18/136277/82276
+18/136276/82277
+18/136277/82277
+18/136278/82276
+18/136279/82276
+18/136278/82277
+18/136279/82277
+18/136276/82278
+18/136277/82278
+18/136276/82279
+18/136277/82279
+18/136278/82278
+18/136279/82278
+18/136278/82279
+18/136279/82279
+18/136280/82275
+18/136281/82275
+18/136282/82275
+18/136283/82275
+18/136284/82275
+18/136280/82276
+18/136281/82276
+18/136280/82277
+18/136281/82277
+18/136282/82276
+18/136283/82276
+18/136282/82277
+18/136283/82277
+18/136280/82278
+18/136281/82278
+18/136280/82279
+18/136281/82279
+18/136282/82278
+18/136283/82278
+18/136282/82279
+18/136283/82279
+18/136284/82276
+18/136284/82277
+18/136284/82278
+18/136284/82279
+18/136274/82280
+18/136275/82280
+18/136276/82280
+18/136277/82280
+18/136276/82281
+18/136277/82281
+18/136278/82280
+18/136279/82280
+18/136278/82281
+18/136279/82281
+18/136277/82282
+18/136276/82283
+18/136277/82283
+18/136278/82282
+18/136279/82282
+18/136278/82283
+18/136279/82283
+18/136272/82285
+18/136273/82285
+18/136274/82284
+18/136275/82284
+18/136274/82285
+18/136275/82285
+18/136272/82286
+18/136273/82286
+18/136272/82287
+18/136273/82287
+18/136274/82286
+18/136275/82286
+18/136274/82287
+18/136275/82287
+18/136276/82284
+18/136277/82284
+18/136276/82285
+18/136277/82285
+18/136278/82284
+18/136279/82284
+18/136278/82285
+18/136279/82285
+18/136276/82286
+18/136277/82286
+18/136276/82287
+18/136277/82287
+18/136278/82286
+18/136279/82286
+18/136278/82287
+18/136279/82287
+18/136280/82280
+18/136281/82280
+18/136280/82281
+18/136281/82281
+18/136282/82280
+18/136283/82280
+18/136282/82281
+18/136283/82281
+18/136280/82282
+18/136281/82282
+18/136280/82283
+18/136281/82283
+18/136282/82282
+18/136283/82282
+18/136282/82283
+18/136283/82283
+18/136284/82280
+18/136280/82284
+18/136281/82284
+18/136280/82285
+18/136281/82285
+18/136282/82284
+18/136283/82284
+18/136282/82285
+18/136283/82285
+18/136280/82286
+18/136281/82286
+18/136280/82287
+18/136281/82287
+18/136282/82286
+18/136283/82286
+18/136282/82287
+18/136283/82287
+18/136256/82288
+18/136257/82288
+18/136256/82289
+18/136257/82289
+18/136258/82288
+18/136259/82288
+18/136258/82289
+18/136259/82289
+18/136256/82290
+18/136257/82290
+18/136256/82291
+18/136257/82291
+18/136258/82290
+18/136259/82290
+18/136258/82291
+18/136259/82291
+18/136260/82288
+18/136260/82289
+18/136260/82290
+18/136260/82291
+18/136256/82292
+18/136257/82292
+18/136256/82293
+18/136257/82293
+18/136258/82292
+18/136259/82292
+18/136258/82293
+18/136259/82293
+18/136256/82294
+18/136257/82294
+18/136256/82295
+18/136257/82295
+18/136258/82294
+18/136259/82294
+18/136258/82295
+18/136259/82295
+18/136260/82292
+18/136261/82292
+18/136260/82293
+18/136261/82293
+18/136262/82292
+18/136262/82293
+18/136260/82294
+18/136261/82294
+18/136260/82295
+18/136261/82295
+18/136262/82294
+18/136263/82294
+18/136262/82295
+18/136263/82295
+18/136269/82288
+18/136269/82289
+18/136270/82288
+18/136271/82288
+18/136270/82289
+18/136271/82289
+18/136264/82294
+18/136264/82295
+18/136265/82295
+18/136257/82296
+18/136258/82296
+18/136259/82296
+18/136259/82297
+18/136260/82296
+18/136261/82296
+18/136260/82297
+18/136261/82297
+18/136262/82296
+18/136263/82296
+18/136262/82297
+18/136263/82297
+18/136260/82298
+18/136261/82298
+18/136261/82299
+18/136262/82298
+18/136263/82298
+18/136262/82299
+18/136263/82299
+18/136262/82300
+18/136263/82300
+18/136263/82301
+18/136264/82296
+18/136265/82296
+18/136264/82297
+18/136265/82297
+18/136266/82296
+18/136266/82297
+18/136267/82297
+18/136264/82298
+18/136265/82298
+18/136264/82299
+18/136265/82299
+18/136266/82298
+18/136267/82298
+18/136266/82299
+18/136267/82299
+18/136268/82298
+18/136269/82298
+18/136268/82299
+18/136269/82299
+18/136270/82298
+18/136271/82298
+18/136270/82299
+18/136271/82299
+18/136264/82300
+18/136265/82300
+18/136264/82301
+18/136265/82301
+18/136266/82300
+18/136267/82300
+18/136266/82301
+18/136267/82301
+18/136264/82302
+18/136265/82302
+18/136265/82303
+18/136266/82302
+18/136267/82302
+18/136266/82303
+18/136267/82303
+18/136268/82300
+18/136269/82300
+18/136268/82301
+18/136269/82301
+18/136270/82300
+18/136271/82300
+18/136270/82301
+18/136271/82301
+18/136268/82302
+18/136269/82302
+18/136268/82303
+18/136269/82303
+18/136270/82302
+18/136271/82302
+18/136270/82303
+18/136271/82303
+18/136272/82288
+18/136273/82288
+18/136272/82289
+18/136273/82289
+18/136274/82288
+18/136275/82288
+18/136274/82289
+18/136275/82289
+18/136276/82288
+18/136277/82288
+18/136276/82289
+18/136277/82289
+18/136278/82288
+18/136279/82288
+18/136278/82289
+18/136279/82289
+18/136280/82288
+18/136281/82288
+18/136280/82289
+18/136281/82289
+18/136282/82288
+18/136283/82288
+18/136282/82289
+18/136283/82289
+18/136287/82293
+18/136285/82295
+18/136286/82294
+18/136287/82294
+18/136286/82295
+18/136287/82295
+18/136272/82298
+18/136273/82298
+18/136272/82299
+18/136273/82299
+18/136274/82298
+18/136275/82298
+18/136274/82299
+18/136275/82299
+18/136276/82298
+18/136277/82298
+18/136276/82299
+18/136277/82299
+18/136278/82298
+18/136279/82298
+18/136278/82299
+18/136279/82299
+18/136272/82300
+18/136273/82300
+18/136272/82301
+18/136273/82301
+18/136274/82300
+18/136275/82300
+18/136274/82301
+18/136275/82301
+18/136272/82302
+18/136273/82302
+18/136272/82303
+18/136273/82303
+18/136274/82302
+18/136275/82302
+18/136274/82303
+18/136275/82303
+18/136276/82300
+18/136277/82300
+18/136276/82301
+18/136277/82301
+18/136278/82300
+18/136279/82300
+18/136278/82301
+18/136279/82301
+18/136276/82302
+18/136277/82302
+18/136276/82303
+18/136277/82303
+18/136278/82302
+18/136279/82302
+18/136278/82303
+18/136279/82303
+18/136283/82297
+18/136280/82298
+18/136281/82298
+18/136280/82299
+18/136281/82299
+18/136282/82298
+18/136283/82298
+18/136282/82299
+18/136283/82299
+18/136284/82296
+18/136285/82296
+18/136284/82297
+18/136285/82297
+18/136286/82296
+18/136287/82296
+18/136286/82297
+18/136287/82297
+18/136284/82298
+18/136285/82298
+18/136284/82299
+18/136285/82299
+18/136286/82298
+18/136287/82298
+18/136286/82299
+18/136287/82299
+18/136280/82300
+18/136281/82300
+18/136280/82301
+18/136281/82301
+18/136282/82300
+18/136283/82300
+18/136282/82301
+18/136283/82301
+18/136280/82302
+18/136281/82302
+18/136280/82303
+18/136281/82303
+18/136282/82302
+18/136283/82302
+18/136282/82303
+18/136283/82303
+18/136284/82300
+18/136285/82300
+18/136284/82301
+18/136285/82301
+18/136286/82300
+18/136287/82300
+18/136286/82301
+18/136284/82302
+18/136285/82302
+18/136284/82303
+18/136290/82272
+18/136291/82272
+18/136291/82273
+18/136291/82274
+18/136291/82275
+18/136292/82272
+18/136293/82272
+18/136292/82273
+18/136293/82273
+18/136294/82272
+18/136295/82272
+18/136294/82273
+18/136295/82273
+18/136292/82274
+18/136293/82274
+18/136292/82275
+18/136293/82275
+18/136294/82274
+18/136295/82274
+18/136294/82275
+18/136295/82275
+18/136291/82276
+18/136291/82277
+18/136291/82278
+18/136291/82279
+18/136292/82276
+18/136293/82276
+18/136292/82277
+18/136293/82277
+18/136294/82276
+18/136295/82276
+18/136294/82277
+18/136295/82277
+18/136292/82278
+18/136293/82278
+18/136292/82279
+18/136293/82279
+18/136294/82278
+18/136295/82278
+18/136294/82279
+18/136295/82279
+18/136296/82272
+18/136296/82273
+18/136296/82274
+18/136296/82275
+18/136296/82276
+18/136296/82277
+18/136296/82278
+18/136296/82279
+18/136291/82280
+18/136291/82281
+18/136291/82282
+18/136291/82283
+18/136292/82280
+18/136293/82280
+18/136292/82281
+18/136293/82281
+18/136294/82280
+18/136295/82280
+18/136294/82281
+18/136295/82281
+18/136292/82282
+18/136293/82282
+18/136292/82283
+18/136293/82283
+18/136294/82282
+18/136295/82282
+18/136294/82283
+18/136295/82283
+18/136291/82284
+18/136291/82285
+18/136291/82286
+18/136291/82287
+18/136292/82284
+18/136293/82284
+18/136292/82285
+18/136293/82285
+18/136294/82284
+18/136295/82284
+18/136294/82285
+18/136295/82285
+18/136292/82286
+18/136293/82286
+18/136292/82287
+18/136293/82287
+18/136294/82286
+18/136295/82286
+18/136294/82287
+18/136295/82287
+18/136296/82280
+18/136296/82281
+18/136296/82282
+18/136296/82283
+18/136296/82284
+18/136296/82285
+18/136296/82286
+18/136296/82287
+18/136291/82288
+18/136291/82289
+18/136289/82291
+18/136290/82290
+18/136291/82290
+18/136290/82291
+18/136291/82291
+18/136292/82288
+18/136293/82288
+18/136292/82289
+18/136293/82289
+18/136294/82288
+18/136295/82288
+18/136294/82289
+18/136295/82289
+18/136292/82290
+18/136293/82290
+18/136292/82291
+18/136293/82291
+18/136294/82290
+18/136295/82290
+18/136294/82291
+18/136295/82291
+18/136288/82292
+18/136289/82292
+18/136288/82293
+18/136289/82293
+18/136290/82292
+18/136291/82292
+18/136290/82293
+18/136291/82293
+18/136288/82294
+18/136289/82294
+18/136288/82295
+18/136289/82295
+18/136290/82294
+18/136291/82294
+18/136290/82295
+18/136291/82295
+18/136292/82292
+18/136293/82292
+18/136292/82293
+18/136293/82293
+18/136294/82292
+18/136295/82292
+18/136294/82293
+18/136295/82293
+18/136292/82294
+18/136293/82294
+18/136292/82295
+18/136293/82295
+18/136294/82294
+18/136296/82288
+18/136296/82289
+18/136296/82290
+18/136296/82291
+18/136296/82292
+18/136296/82293
+18/136288/82296
+18/136289/82296
+18/136288/82297
+18/136289/82297
+18/136290/82296
+18/136291/82296
+18/136290/82297
+18/136291/82297
+18/136288/82298
+18/136289/82298
+18/136288/82299
+18/136290/82298
+18/136292/82296
+18/136266/82304
+18/136267/82304
+18/136268/82304
+18/136269/82304
+18/136268/82305
+18/136269/82305
+18/136270/82304
+18/136271/82304
+18/136270/82305
+18/136271/82305
+18/136269/82306
+18/136270/82306
+18/136271/82306
+18/136270/82307
+18/136271/82307
+18/136271/82308
+18/136272/82304
+18/136273/82304
+18/136272/82305
+18/136273/82305
+18/136274/82304
+18/136275/82304
+18/136274/82305
+18/136275/82305
+18/136272/82306
+18/136273/82306
+18/136272/82307
+18/136273/82307
+18/136274/82306
+18/136275/82306
+18/136274/82307
+18/136275/82307
+18/136276/82304
+18/136277/82304
+18/136276/82305
+18/136277/82305
+18/136278/82304
+18/136279/82304
+18/136278/82305
+18/136279/82305
+18/136276/82306
+18/136277/82306
+18/136276/82307
+18/136277/82307
+18/136278/82306
+18/136279/82306
+18/136278/82307
+18/136279/82307
+18/136272/82308
+18/136273/82308
+18/136272/82309
+18/136273/82309
+18/136274/82308
+18/136275/82308
+18/136274/82309
+18/136275/82309
+18/136273/82310
+18/136274/82310
+18/136275/82310
+18/136276/82308
+18/136277/82308
+18/136276/82309
+18/136280/82304
+18/136281/82304
+18/136280/82305
+18/136281/82305
+18/136282/82304
+18/136280/82306
diff --git a/tests/test-expire-tiles.cpp b/tests/test-expire-tiles.cpp
index 22bdfbadf..9ac806158 100644
--- a/tests/test-expire-tiles.cpp
+++ b/tests/test-expire-tiles.cpp
@@ -13,6 +13,7 @@
 #include <set>
 
 #include "expire-tiles.hpp"
+#include "geom-functions.hpp"
 #include "reprojection.hpp"
 #include "tile-output.hpp"
 #include "tile.hpp"
@@ -45,7 +46,7 @@ void expire_centroids(expire_tiles_t *et, std::set<tile_t> const &tiles)
 {
     for (auto const &t : tiles) {
         auto const p = t.center();
-        et->from_bbox({p.x(), p.y(), p.x(), p.y()}, expire_config_t{});
+        et->from_geometry(p, expire_config_t{});
     }
 }
 
@@ -94,7 +95,14 @@ TEST_CASE("simple expire z1", "[NoDB]")
 
     // as big a bbox as possible at the origin to dirty all four
     // quadrants of the world.
-    et.from_bbox({-10000, -10000, 10000, 10000}, expire_config_t{});
+    geom::geometry_t const geom{
+        geom::polygon_t{geom::ring_t{{-10000, -10000},
+                                     {-10000, 10000},
+                                     {10000, 10000},
+                                     {10000, -1000},
+                                     {-10000, -10000}}}};
+
+    et.from_geometry(geom, expire_config_t{});
 
     auto const tiles = get_tiles_ordered(&et, zoom, zoom);
     REQUIRE(tiles.size() == 4);
@@ -113,7 +121,14 @@ TEST_CASE("simple expire z3", "[NoDB]")
 
     // as big a bbox as possible at the origin to dirty all four
     // quadrants of the world.
-    et.from_bbox({-10000, -10000, 10000, 10000}, expire_config_t{});
+    geom::geometry_t const geom{
+        geom::polygon_t{geom::ring_t{{-10000, -10000},
+                                     {-10000, 10000},
+                                     {10000, 10000},
+                                     {10000, -1000},
+                                     {-10000, -10000}}}};
+
+    et.from_geometry(geom, expire_config_t{});
 
     auto const tiles = get_tiles_ordered(&et, zoom, zoom);
     CHECK(tiles.size() == 4);
@@ -132,7 +147,10 @@ TEST_CASE("simple expire z18", "[NoDB]")
 
     // dirty a smaller bbox this time, as at z18 the scale is
     // pretty small.
-    et.from_bbox({-1, -1, 1, 1}, expire_config_t{});
+    geom::geometry_t const geom{geom::polygon_t{
+        geom::ring_t{{-1, -1}, {-1, 1}, {1, 1}, {1, -1}, {-1, -1}}}};
+
+    et.from_geometry(geom, expire_config_t{});
 
     auto const tiles = get_tiles_ordered(&et, zoom, zoom);
     CHECK(tiles.size() == 4);
@@ -310,6 +328,48 @@ TEST_CASE("expire longer diagonal line", "[NoDB]")
     CHECK(tiles.count(tile_t(18, 140222, 82056)) == 1);
 }
 
+TEST_CASE("expire polygon in Z shape", "[NoDB]")
+{
+    uint32_t const zoom = 17;
+    expire_tiles_t et{zoom, defproj};
+
+    geom::geometry_t const geom{geom::polygon_t{geom::ring_t{
+        {7.1390, 55.5498},
+        {7.1637, 55.5495},
+        {7.1633, 55.5457},
+        {7.1489, 55.5430},
+        {7.1493, 55.5401},
+        {7.1628, 55.5401},
+        {7.1632, 55.5379},
+        {7.1469, 55.5381},
+        {7.1380, 55.5437},
+        {7.1486, 55.5452},
+        {7.1528, 55.5480},
+        {7.1390, 55.5484},
+        {7.1390, 55.5498}
+    }}};
+
+    auto const geom_merc = geom::transform(geom, *defproj);
+
+    et.from_geometry(geom_merc, expire_config_t{});
+
+    auto const tiles = get_tiles_unordered(&et, zoom);
+    REQUIRE(tiles.size() == 76);
+
+    CHECK(tiles.count(tile_t(17, 68135, 41106)) == 1);
+    CHECK(tiles.count(tile_t(17, 68135, 41107)) == 1);
+    CHECK(tiles.count(tile_t(17, 68135, 41108)) == 0);
+    CHECK(tiles.count(tile_t(17, 68135, 41109)) == 1);
+
+    CHECK(tiles.count(tile_t(17, 68134, 41109)) == 0);
+    CHECK(tiles.count(tile_t(17, 68134, 41110)) == 1);
+    CHECK(tiles.count(tile_t(17, 68134, 41111)) == 0);
+
+    CHECK(tiles.count(tile_t(17, 68144, 41111)) == 0);
+    CHECK(tiles.count(tile_t(17, 68144, 41112)) == 1);
+    CHECK(tiles.count(tile_t(17, 68144, 41113)) == 1);
+}
+
 /**
  * Test tile expiry on two zoom levels.
  */
@@ -321,7 +381,10 @@ TEST_CASE("simple expire z17 and z18", "[NoDB]")
 
     // dirty a smaller bbox this time, as at z18 the scale is
     // pretty small.
-    et.from_bbox({-1, -1, 1, 1}, expire_config_t{});
+    geom::geometry_t const geom{geom::polygon_t{
+        geom::ring_t{{-1, -1}, {-1, 1}, {1, 1}, {1, -1}, {-1, -1}}}};
+
+    et.from_geometry(geom, expire_config_t{});
 
     auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
     CHECK(tiles.size() == 8);
@@ -347,7 +410,11 @@ TEST_CASE("simple expire z17 and z18 in one superior tile", "[NoDB]")
     uint32_t const maxzoom = 18;
     expire_tiles_t et{maxzoom, defproj};
 
-    et.from_bbox({-163, 140, -140, 164}, expire_config_t{});
+    geom::geometry_t const geom{geom::polygon_t{geom::ring_t{
+        {-163, 140}, {-163, 164}, {-140, 164}, {-140, 140}, {-163, 140}}}};
+
+    et.from_geometry(geom, expire_config_t{});
+
     auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
     CHECK(tiles.size() == 5);
 

From dec29373b408915a140d128abed4c10ff2131156 Mon Sep 17 00:00:00 2001
From: Kefu Chai <tchaikov@gmail.com>
Date: Fri, 3 Apr 2026 14:58:10 +0800
Subject: [PATCH 421/430] Replace fmt::localtime with portable thread-safe
 equivalent

fmt::localtime was removed in fmt 12. Replace it with an equivalent
that is thread-safe and portable:
- POSIX: localtime_r(&time, &tm)
- MSVC:  localtime_s(&tm, &time)  (reversed argument order)

Both are re-entrant and thread-safe, matching the guarantee that
fmt::localtime provided.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
---
 src/logging.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/logging.cpp b/src/logging.cpp
index 95ed5f8f3..b4ecf345c 100644
--- a/src/logging.cpp
+++ b/src/logging.cpp
@@ -27,8 +27,18 @@ void logger_t::generate_common_prefix(std::string *str,
                                       fmt::text_style const &ts,
                                       char const *prefix) const
 {
-    *str += fmt::format("{:%Y-%m-%d %H:%M:%S}  ",
-                        fmt::localtime(std::time(nullptr)));
+    auto const now = std::time(nullptr);
+    std::tm tm_local{};
+#ifdef _MSC_VER
+    if (localtime_s(&tm_local, &now) != 0) {
+        throw fmt::format_error("time_t value out of range");
+    }
+#else
+    if (!localtime_r(&now, &tm_local)) {
+        throw fmt::format_error("time_t value out of range");
+    }
+#endif
+    *str += fmt::format("{:%F %T}  ", tm_local);
 
     if (m_current_level == log_level::debug) {
         *str += fmt::format(ts, "[{:02d}] ", this_thread_num);

From 0a0ecaaefb41f6af39e9250c137ded2382219b6d Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 7 Apr 2026 11:05:47 +0200
Subject: [PATCH 422/430] Github action: Update versions of used action scripts

---
 .github/workflows/ci.yml           | 44 +++++++++++++++---------------
 .github/workflows/clang-tidy.yml   |  2 +-
 .github/workflows/luacheck.yml     |  2 +-
 .github/workflows/test-install.yml |  2 +-
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bcc026d7a..1d8d0a873 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
@@ -37,7 +37,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
@@ -56,7 +56,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
@@ -76,7 +76,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
@@ -95,7 +95,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
@@ -115,7 +115,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
@@ -135,7 +135,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
@@ -154,7 +154,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
@@ -173,7 +173,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
@@ -192,7 +192,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
@@ -211,7 +211,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
@@ -231,7 +231,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
@@ -250,7 +250,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
@@ -269,7 +269,7 @@ jobs:
       PSYCOPG: 2
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
@@ -289,7 +289,7 @@ jobs:
       PSYCOPG: 3
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
@@ -310,7 +310,7 @@ jobs:
       PSYCOPG: 3
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
@@ -330,7 +330,7 @@ jobs:
       PSYCOPG: 3
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/build-and-test
@@ -346,8 +346,8 @@ jobs:
       VCPKG_DEFAULT_BINARY_CACHE: C:/vcpkg_binary_cache
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/cache@v4
+      - uses: actions/checkout@v6
+      - uses: actions/cache@v5
         with:
           path: |
             C:/vcpkg_binary_cache
@@ -371,7 +371,7 @@ jobs:
         working-directory: build
         if: matrix.os == 'windows-2025'
       - name: 'Upload Artifact'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: osm2pgsql-win64
           path: c:/artifact
@@ -385,8 +385,8 @@ jobs:
       OSMURL: https://download.geofabrik.de/europe/monaco-latest.osm.pbf
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v4
+      - uses: actions/checkout@v6
+      - uses: actions/download-artifact@v6
         with:
           name: osm2pgsql-win64
       - uses: ./.github/actions/win-postgres
diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
index 6e8721787..b3d2491ab 100644
--- a/.github/workflows/clang-tidy.yml
+++ b/.github/workflows/clang-tidy.yml
@@ -18,7 +18,7 @@ jobs:
       PIP_OPTION: --break-system-packages
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/linux-cmake
       - uses: ./.github/actions/clang-tidy
diff --git a/.github/workflows/luacheck.yml b/.github/workflows/luacheck.yml
index a21a9053f..26a6eae47 100644
--- a/.github/workflows/luacheck.yml
+++ b/.github/workflows/luacheck.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Install prerequisites
         run: |
diff --git a/.github/workflows/test-install.yml b/.github/workflows/test-install.yml
index eb9f0cc10..4b28eb924 100644
--- a/.github/workflows/test-install.yml
+++ b/.github/workflows/test-install.yml
@@ -28,7 +28,7 @@ jobs:
       OSMFILE: monaco-latest.osm.pbf
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Show installed PostgreSQL packages
         run: apt-cache search postgresql | sort

From c06615483439f026679b6aa0ebbe655ca31f45ee Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 7 Apr 2026 09:34:08 +0200
Subject: [PATCH 423/430] Various include fixes/cleanups

Found by clang-tidy
---
 src/command-line-parser.cpp                 |  1 -
 src/expire-tiles.cpp                        | 19 +++++++++----------
 src/gen/canvas.cpp                          |  1 -
 src/gen/raster.cpp                          |  1 -
 src/geom-from-osm.cpp                       |  5 ++++-
 src/geom-pole-of-inaccessibility.cpp        |  1 -
 src/logging.cpp                             |  2 ++
 src/middle-pgsql.cpp                        |  1 -
 src/osmdata.cpp                             |  1 -
 src/output-flex.cpp                         |  6 ------
 src/output-pgsql.cpp                        |  6 ------
 src/output.cpp                              |  3 +--
 src/reprojection-generic-proj6.cpp          |  3 ---
 src/tagtransform-c.cpp                      |  1 -
 src/tagtransform.cpp                        |  3 +--
 src/util.cpp                                |  1 -
 src/wkb.cpp                                 |  1 -
 tests/test-expire-from-geometry.cpp         |  3 ++-
 tests/test-geom-pole-of-inaccessibility.cpp |  3 ---
 tests/test-options-parse.cpp                |  1 -
 tests/test-output-flex-example-configs.cpp  |  1 -
 tests/test-output-pgsql-style-file.cpp      |  3 +--
 tests/test-util.cpp                         |  1 -
 23 files changed, 20 insertions(+), 48 deletions(-)

diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index a89370d73..e2a8e0698 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -15,7 +15,6 @@
 #include "pgsql.hpp"
 #include "projection.hpp"
 #include "reprojection.hpp"
-#include "util.hpp"
 #include "version.hpp"
 
 #include <osmium/util/string.hpp>
diff --git a/src/expire-tiles.cpp b/src/expire-tiles.cpp
index 72fa02deb..d9d2b81ec 100644
--- a/src/expire-tiles.cpp
+++ b/src/expire-tiles.cpp
@@ -7,25 +7,24 @@
  * For a full list of authors see the git log.
  */
 
-#include <algorithm>
-#include <cerrno>
-#include <cmath>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <stdexcept>
-#include <string>
-
 #include "expire-tiles.hpp"
+
 #include "format.hpp"
 #include "geom-functions.hpp"
 #include "options.hpp"
 #include "projection.hpp"
 #include "reprojection.hpp"
-#include "table.hpp"
 #include "tile.hpp"
 #include "wkb.hpp"
 
+#include <algorithm>
+#include <cerrno>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
+#include <memory>
+#include <vector>
+
 expire_tiles_t::expire_tiles_t(uint32_t max_zoom,
                                std::shared_ptr<reprojection_t> projection,
                                std::size_t max_tiles_geometry)
diff --git a/src/gen/canvas.cpp b/src/gen/canvas.cpp
index 3f30e7530..8eff65564 100644
--- a/src/gen/canvas.cpp
+++ b/src/gen/canvas.cpp
@@ -9,7 +9,6 @@
 
 #include "canvas.hpp"
 
-#include "hex.hpp"
 #include "raster.hpp"
 #include "tile.hpp"
 
diff --git a/src/gen/raster.cpp b/src/gen/raster.cpp
index 2e22ef978..7eef03255 100644
--- a/src/gen/raster.cpp
+++ b/src/gen/raster.cpp
@@ -11,7 +11,6 @@
 
 #include "canvas.hpp"
 #include "format.hpp"
-#include "pgsql.hpp"
 #include "tile.hpp"
 
 #include <string>
diff --git a/src/geom-from-osm.cpp b/src/geom-from-osm.cpp
index 017a9e1f4..339148300 100644
--- a/src/geom-from-osm.cpp
+++ b/src/geom-from-osm.cpp
@@ -10,8 +10,11 @@
 #include "geom-from-osm.hpp"
 
 #include "geom-area-assembler.hpp"
-#include "osmtypes.hpp"
 
+#include <osmium/memory/buffer.hpp>
+#include <osmium/osm/location.hpp>
+#include <osmium/osm/node.hpp>
+#include <osmium/osm/relation.hpp>
 #include <osmium/osm/way.hpp>
 
 #include <cassert>
diff --git a/src/geom-pole-of-inaccessibility.cpp b/src/geom-pole-of-inaccessibility.cpp
index 0b3a9657f..939696fcc 100644
--- a/src/geom-pole-of-inaccessibility.cpp
+++ b/src/geom-pole-of-inaccessibility.cpp
@@ -15,7 +15,6 @@
 #include <algorithm>
 #include <cassert>
 #include <cmath>
-#include <iostream>
 #include <queue>
 
 /**
diff --git a/src/logging.cpp b/src/logging.cpp
index b4ecf345c..48bc0eb5a 100644
--- a/src/logging.cpp
+++ b/src/logging.cpp
@@ -11,6 +11,8 @@
 
 #include <osmium/thread/util.hpp>
 
+#include <ctime>
+
 namespace {
 
 thread_local unsigned int this_thread_num = 0;
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index c31348395..631ed95aa 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -15,7 +15,6 @@
  * emit the final geometry-enabled output formats
 */
 
-#include <array>
 #include <cassert>
 #include <cstdint>
 #include <cstdlib>
diff --git a/src/osmdata.cpp b/src/osmdata.cpp
index 3f0a5a105..3cc4c6a63 100644
--- a/src/osmdata.cpp
+++ b/src/osmdata.cpp
@@ -7,7 +7,6 @@
  * For a full list of authors see the git log.
  */
 
-#include <algorithm>
 #include <cassert>
 #include <chrono>
 #include <functional>
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 5541da3be..8be5af027 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -13,17 +13,14 @@
 #include "debug-output.hpp"
 #include "expire-output.hpp"
 #include "expire-tiles.hpp"
-#include "flex-index.hpp"
 #include "flex-lua-expire-output.hpp"
 #include "flex-lua-geom.hpp"
 #include "flex-lua-index.hpp"
 #include "flex-lua-locator.hpp"
 #include "flex-lua-table.hpp"
-#include "flex-lua-wrapper.hpp"
 #include "flex-write.hpp"
 #include "format.hpp"
 #include "geom-from-osm.hpp"
-#include "geom-functions.hpp"
 #include "logging.hpp"
 #include "lua-init.hpp"
 #include "lua-setup.hpp"
@@ -38,11 +35,8 @@
 #include "reprojection.hpp"
 #include "thread-pool.hpp"
 #include "util.hpp"
-#include "version.hpp"
 #include "wkb.hpp"
 
-#include <osmium/osm/types_from_string.hpp>
-
 #include <cassert>
 #include <cstdlib>
 #include <cstring>
diff --git a/src/output-pgsql.cpp b/src/output-pgsql.cpp
index de1f51275..6b250a696 100644
--- a/src/output-pgsql.cpp
+++ b/src/output-pgsql.cpp
@@ -15,11 +15,7 @@
  * emit the final geometry-enabled output formats
 */
 
-#include <future>
-#include <iostream>
-#include <limits>
 #include <memory>
-#include <stdexcept>
 #include <string>
 
 #include <cassert>
@@ -37,13 +33,11 @@
 #include "options.hpp"
 #include "osmtypes.hpp"
 #include "output-pgsql.hpp"
-#include "pgsql.hpp"
 #include "projection.hpp"
 #include "reprojection.hpp"
 #include "taginfo-impl.hpp"
 #include "tagtransform.hpp"
 #include "util.hpp"
-#include "wildcmp.hpp"
 #include "wkb.hpp"
 
 namespace {
diff --git a/src/output.cpp b/src/output.cpp
index c02b9179c..bae4f3634 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -16,8 +16,7 @@
 #include "output-null.hpp"
 #include "output-pgsql.hpp"
 
-#include <stdexcept>
-#include <string>
+#include <memory>
 #include <utility>
 
 std::shared_ptr<output_t>
diff --git a/src/reprojection-generic-proj6.cpp b/src/reprojection-generic-proj6.cpp
index febfbe1a3..e2b444e44 100644
--- a/src/reprojection-generic-proj6.cpp
+++ b/src/reprojection-generic-proj6.cpp
@@ -1,9 +1,6 @@
 #include "format.hpp"
 #include "reprojection.hpp"
 
-#include <osmium/geom/coordinates.hpp>
-#include <osmium/geom/util.hpp>
-
 #include <proj.h>
 
 namespace {
diff --git a/src/tagtransform-c.cpp b/src/tagtransform-c.cpp
index ca2cfad84..bfbd7fe37 100644
--- a/src/tagtransform-c.cpp
+++ b/src/tagtransform-c.cpp
@@ -14,7 +14,6 @@
 #include "options.hpp"
 #include "taginfo-impl.hpp"
 #include "tagtransform-c.hpp"
-#include "util.hpp"
 #include "wildcmp.hpp"
 
 namespace {
diff --git a/src/tagtransform.cpp b/src/tagtransform.cpp
index 6a2c9b807..477c434c9 100644
--- a/src/tagtransform.cpp
+++ b/src/tagtransform.cpp
@@ -14,8 +14,7 @@
 #include "tagtransform-c.hpp"
 #include "tagtransform-lua.hpp"
 
-#include <stdexcept>
-#include <utility>
+#include <memory>
 
 std::unique_ptr<tagtransform_t>
 tagtransform_t::make_tagtransform(options_t const *options,
diff --git a/src/util.cpp b/src/util.cpp
index a9193454a..f45ffbb34 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -10,7 +10,6 @@
 #include "util.hpp"
 
 #include <iostream>
-#include <iterator>
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/src/wkb.cpp b/src/wkb.cpp
index 629bb4d59..794a16a75 100644
--- a/src/wkb.cpp
+++ b/src/wkb.cpp
@@ -19,7 +19,6 @@
 #include <stdexcept>
 #include <string>
 #include <string_view>
-#include <utility>
 
 namespace ewkb {
 
diff --git a/tests/test-expire-from-geometry.cpp b/tests/test-expire-from-geometry.cpp
index 1cdb4206a..49ff65b40 100644
--- a/tests/test-expire-from-geometry.cpp
+++ b/tests/test-expire-from-geometry.cpp
@@ -9,8 +9,9 @@
 
 #include <catch.hpp>
 
-#include <random>
+#include <memory>
 #include <set>
+#include <utility>
 
 #include "expire-tiles.hpp"
 #include "projection.hpp"
diff --git a/tests/test-geom-pole-of-inaccessibility.cpp b/tests/test-geom-pole-of-inaccessibility.cpp
index c05017a2e..e70aea868 100644
--- a/tests/test-geom-pole-of-inaccessibility.cpp
+++ b/tests/test-geom-pole-of-inaccessibility.cpp
@@ -9,9 +9,6 @@
 
 #include <catch.hpp>
 
-#include "common-buffer.hpp"
-
-#include "geom-from-osm.hpp"
 #include "geom-functions.hpp"
 #include "geom-output.hpp"
 #include "geom-pole-of-inaccessibility.hpp"
diff --git a/tests/test-options-parse.cpp b/tests/test-options-parse.cpp
index 71d4e7f8f..cf632d120 100644
--- a/tests/test-options-parse.cpp
+++ b/tests/test-options-parse.cpp
@@ -12,7 +12,6 @@
 #include <vector>
 
 #include "command-line-parser.hpp"
-#include "taginfo-impl.hpp"
 #include "tagtransform.hpp"
 
 namespace {
diff --git a/tests/test-output-flex-example-configs.cpp b/tests/test-output-flex-example-configs.cpp
index 7775a5c27..7518aee6a 100644
--- a/tests/test-output-flex-example-configs.cpp
+++ b/tests/test-output-flex-example-configs.cpp
@@ -11,7 +11,6 @@
 
 #include "common-import.hpp"
 #include "common-options.hpp"
-#include "format.hpp"
 
 #include <osmium/util/string.hpp>
 
diff --git a/tests/test-output-pgsql-style-file.cpp b/tests/test-output-pgsql-style-file.cpp
index e0d06d17f..4851a30fa 100644
--- a/tests/test-output-pgsql-style-file.cpp
+++ b/tests/test-output-pgsql-style-file.cpp
@@ -9,8 +9,7 @@
 
 #include <catch.hpp>
 
-#include "common-import.hpp"
-#include "common-options.hpp"
+#include "taginfo-impl.hpp"
 
 TEST_CASE("Parse default style file")
 {
diff --git a/tests/test-util.cpp b/tests/test-util.cpp
index e64ce5aff..40ea8e517 100644
--- a/tests/test-util.cpp
+++ b/tests/test-util.cpp
@@ -12,7 +12,6 @@
 #include "util.hpp"
 
 #include <cstring>
-#include <limits>
 #include <string>
 #include <vector>
 

From 9c5c0c266e36795cd607c5d36b88ae82b1c73f15 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 11 Feb 2026 20:18:19 +0100
Subject: [PATCH 424/430] Remove reference capture from several lambdas that
 don't need it

---
 src/command-line-app.cpp    |  2 +-
 src/command-line-parser.cpp |  2 +-
 src/geom-box.cpp            |  2 +-
 src/geom-functions.cpp      | 44 ++++++++++++++++++-------------------
 src/geom.cpp                |  2 +-
 src/locator.cpp             |  4 ++--
 src/wkb.cpp                 |  2 +-
 7 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/src/command-line-app.cpp b/src/command-line-app.cpp
index f038f1ff1..47859d4d6 100644
--- a/src/command-line-app.cpp
+++ b/src/command-line-app.cpp
@@ -97,7 +97,7 @@ void command_line_app_t::init_logging_options(bool with_progress, bool with_sql)
     if (with_progress) {
         add_option_function<std::string>(
             "--log-progress",
-            [&](std::string const &arg) {
+            [](std::string const &arg) {
                 if (arg == "true") {
                     get_logger().enable_progress();
                 } else if (arg == "false") {
diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index a89370d73..871b2d65d 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -431,7 +431,7 @@ options_t parse_command_line(int argc, char *argv[])
                                      options.projection =
                                          reprojection_t::create_projection(arg);
 #else
-           [&](int) {
+           [](int) {
                throw std::runtime_error{
                    "Generic projections not available in this build."};
 #endif
diff --git a/src/geom-box.cpp b/src/geom-box.cpp
index 0b49cfb82..a27caff8a 100644
--- a/src/geom-box.cpp
+++ b/src/geom-box.cpp
@@ -99,7 +99,7 @@ box_t envelope(geom::collection_t const &geom)
 
 box_t envelope(geometry_t const &geom)
 {
-    return geom.visit([&](auto const &g) { return envelope(g); });
+    return geom.visit([](auto const &g) { return envelope(g); });
 }
 
 } // namespace geom
diff --git a/src/geom-functions.cpp b/src/geom-functions.cpp
index 34e5d3fd3..507acc57f 100644
--- a/src/geom-functions.cpp
+++ b/src/geom-functions.cpp
@@ -41,18 +41,16 @@ std::string_view geometry_type(geometry_t const &geom)
 {
     using namespace std::literals::string_view_literals;
     return geom.visit(overloaded{
-        [&](geom::nullgeom_t const & /*input*/) { return "NULL"sv; },
-        [&](geom::point_t const & /*input*/) { return "POINT"sv; },
-        [&](geom::linestring_t const & /*input*/) { return "LINESTRING"sv; },
-        [&](geom::polygon_t const & /*input*/) { return "POLYGON"sv; },
-        [&](geom::multipoint_t const & /*input*/) { return "MULTIPOINT"sv; },
-        [&](geom::multilinestring_t const & /*input*/) {
+        [](geom::nullgeom_t const & /*input*/) { return "NULL"sv; },
+        [](geom::point_t const & /*input*/) { return "POINT"sv; },
+        [](geom::linestring_t const & /*input*/) { return "LINESTRING"sv; },
+        [](geom::polygon_t const & /*input*/) { return "POLYGON"sv; },
+        [](geom::multipoint_t const & /*input*/) { return "MULTIPOINT"sv; },
+        [](geom::multilinestring_t const & /*input*/) {
             return "MULTILINESTRING"sv;
         },
-        [&](geom::multipolygon_t const & /*input*/) {
-            return "MULTIPOLYGON"sv;
-        },
-        [&](geom::collection_t const & /*input*/) {
+        [](geom::multipolygon_t const & /*input*/) { return "MULTIPOLYGON"sv; },
+        [](geom::collection_t const & /*input*/) {
             return "GEOMETRYCOLLECTION"sv;
         }});
 }
@@ -62,7 +60,7 @@ std::string_view geometry_type(geometry_t const &geom)
 std::size_t num_geometries(geometry_t const &geom)
 {
     return geom.visit(
-        [&](auto const &input) { return input.num_geometries(); });
+        [](auto const &input) { return input.num_geometries(); });
 }
 
 /****************************************************************************/
@@ -353,14 +351,14 @@ geometry_t segmentize(geometry_t const &input, double max_segment_length)
 double area(geometry_t const &geom)
 {
     return std::abs(geom.visit(
-        overloaded{[&](geom::nullgeom_t const & /*input*/) { return 0.0; },
-                   [&](geom::collection_t const &input) {
+        overloaded{[](geom::nullgeom_t const & /*input*/) { return 0.0; },
+                   [](geom::collection_t const &input) {
                        return std::accumulate(input.cbegin(), input.cend(), 0.0,
                                               [](double sum, auto const &geom) {
                                                   return sum + area(geom);
                                               });
                    },
-                   [&](auto const &input) {
+                   [](auto const &input) {
                        return static_cast<double>(boost::geometry::area(input));
                    }}));
 }
@@ -390,21 +388,21 @@ double spherical_area(geometry_t const &geom)
     assert(geom.srid() == PROJ_LATLONG);
 
     return std::abs(geom.visit(overloaded{
-        [&](geom::nullgeom_t const & /*input*/) { return 0.0; },
-        [&](geom::collection_t const &input) {
+        [](geom::nullgeom_t const & /*input*/) { return 0.0; },
+        [](geom::collection_t const &input) {
             return std::accumulate(input.cbegin(), input.cend(), 0.0,
                                    [](double sum, auto const &geom) {
                                        return sum + spherical_area(geom);
                                    });
         },
-        [&](geom::polygon_t const &input) { return spherical_area(input); },
-        [&](geom::multipolygon_t const &input) {
+        [](geom::polygon_t const &input) { return spherical_area(input); },
+        [](geom::multipolygon_t const &input) {
             return std::accumulate(input.cbegin(), input.cend(), 0.0,
-                                   [&](double sum, auto const &geom) {
+                                   [](double sum, auto const &geom) {
                                        return sum + spherical_area(geom);
                                    });
         },
-        [&](auto const & /*input*/) { return 0.0; }}));
+        [](auto const & /*input*/) { return 0.0; }}));
 }
 
 /****************************************************************************/
@@ -412,15 +410,15 @@ double spherical_area(geometry_t const &geom)
 double length(geometry_t const &geom)
 {
     return geom.visit(overloaded{
-        [&](geom::nullgeom_t const & /*input*/) { return 0.0; },
-        [&](geom::collection_t const &input) {
+        [](geom::nullgeom_t const & /*input*/) { return 0.0; },
+        [](geom::collection_t const &input) {
             double total = 0.0;
             for (auto const &item : input) {
                 total += length(item);
             }
             return total;
         },
-        [&](auto const &input) {
+        [](auto const &input) {
             return static_cast<double>(boost::geometry::length(input));
         }});
 }
diff --git a/src/geom.cpp b/src/geom.cpp
index 120f56ced..952e0fe85 100644
--- a/src/geom.cpp
+++ b/src/geom.cpp
@@ -40,7 +40,7 @@ std::size_t dimension(collection_t const &geom)
 
 std::size_t dimension(geometry_t const &geom)
 {
-    return geom.visit([&](auto const &input) { return dimension(input); });
+    return geom.visit([](auto const &input) { return dimension(input); });
 }
 
 } // namespace geom
diff --git a/src/locator.cpp b/src/locator.cpp
index 4cdf9baaf..2f5f010c9 100644
--- a/src/locator.cpp
+++ b/src/locator.cpp
@@ -91,7 +91,7 @@ void locator_t::build_index()
 void locator_t::all_intersecting_visit(geom::geometry_t const &geom,
                                        std::set<std::string> *results)
 {
-    geom.visit(overloaded{[&](geom::nullgeom_t const & /*val*/) {},
+    geom.visit(overloaded{[](geom::nullgeom_t const & /*val*/) {},
                           [&](geom::collection_t const &val) {
                               for (auto const &sgeom : val) {
                                   all_intersecting_visit(sgeom, results);
@@ -120,7 +120,7 @@ std::set<std::string> locator_t::all_intersecting(geom::geometry_t const &geom)
 void locator_t::first_intersecting_visit(geom::geometry_t const &geom,
                                          std::string *result)
 {
-    geom.visit(overloaded{[&](geom::nullgeom_t const & /*val*/) {},
+    geom.visit(overloaded{[](geom::nullgeom_t const & /*val*/) {},
                           [&](geom::collection_t const &val) {
                               for (auto const &sgeom : val) {
                                   first_intersecting_visit(sgeom, result);
diff --git a/src/wkb.cpp b/src/wkb.cpp
index 629bb4d59..f310ecd11 100644
--- a/src/wkb.cpp
+++ b/src/wkb.cpp
@@ -174,7 +174,7 @@ void write_collection(std::string *data, geom::collection_t const &geom,
 
     for (auto const &item : geom) {
         item.visit(overloaded{
-            [&](geom::nullgeom_t const & /*input*/) {},
+            [](geom::nullgeom_t const & /*input*/) {},
             [&](geom::point_t const &input) { write_point(data, input); },
             [&](geom::linestring_t const &input) {
                 write_linestring(data, input);

From b0734d6bf96d85ebea14094563f3da645de876e1 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 10 Feb 2026 22:36:02 +0100
Subject: [PATCH 425/430] New constants: SECONDS_IN_MINUTE and MINUTES_IN_HOUR

---
 src/util.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/util.cpp b/src/util.cpp
index a9193454a..9faeb5b5b 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -23,19 +23,22 @@ namespace util {
 
 std::string human_readable_duration(uint64_t seconds)
 {
-    if (seconds < 60UL) {
+    constexpr uint64_t SECONDS_IN_MINUTE = 60UL;
+    constexpr uint64_t MINUTES_IN_HOUR = 60UL;
+
+    if (seconds < SECONDS_IN_MINUTE) {
         return fmt::format("{}s", seconds);
     }
 
-    if (seconds < (60UL * 60UL)) {
-        return fmt::format("{}s ({}m {}s)", seconds, seconds / 60,
-                           seconds % 60);
+    uint64_t const mins = seconds / SECONDS_IN_MINUTE;
+    uint64_t const secs = seconds % SECONDS_IN_MINUTE;
+
+    if (seconds < (SECONDS_IN_MINUTE * MINUTES_IN_HOUR)) {
+        return fmt::format("{}s ({}m {}s)", seconds, mins, secs);
     }
 
-    auto const secs = seconds % 60;
-    auto const mins = seconds / 60;
-    return fmt::format("{}s ({}h {}m {}s)", seconds, mins / 60, mins % 60,
-                       secs);
+    return fmt::format("{}s ({}h {}m {}s)", seconds, mins / MINUTES_IN_HOUR,
+                       mins % MINUTES_IN_HOUR, secs);
 }
 
 std::string human_readable_duration(std::chrono::microseconds duration)

From c4ad5eb52254c16bacea9a4a1b5c98a12effd554 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 10 Feb 2026 22:59:49 +0100
Subject: [PATCH 426/430] Use constants instead of magic numbers in WKB
 encoding

Also fixes the size for multilinestrings!
---
 src/wkb.cpp | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/wkb.cpp b/src/wkb.cpp
index 629bb4d59..ccfac5946 100644
--- a/src/wkb.cpp
+++ b/src/wkb.cpp
@@ -209,6 +209,10 @@ class make_ewkb_visitor_t
 
     std::string operator()(geom::point_t const &geom) const
     {
+        constexpr std::size_t SIZE_POINT_HEADER_WITH_SRID = 1UL + 4UL + 4UL;
+        constexpr std::size_t SIZE_POINT =
+            SIZE_POINT_HEADER_WITH_SRID + SIZE_COORDINATE_PAIR;
+
         std::string data;
 
         if (m_ensure_multi) {
@@ -216,11 +220,9 @@ class make_ewkb_visitor_t
             write_length(&data, 1);
             write_point(&data, geom);
         } else {
-            // 9 byte header plus one set of coordinates
-            constexpr std::size_t SIZE = 9 + 2 * 8;
-            data.reserve(SIZE);
+            data.reserve(SIZE_POINT);
             write_point(&data, geom, m_srid);
-            assert(data.size() == SIZE);
+            assert(data.size() == SIZE_POINT);
         }
 
         return data;
@@ -228,18 +230,27 @@ class make_ewkb_visitor_t
 
     std::string operator()(geom::linestring_t const &geom) const
     {
+        constexpr std::size_t SIZE_HEADER_WITH_COUNT = 1UL + 4UL + 4UL;
+        constexpr std::size_t SIZE_HEADER_WITH_COUNT_AND_SRID =
+            SIZE_HEADER_WITH_COUNT + 4UL;
+
         std::string data;
 
+        std::size_t const coords_size = geom.size() * SIZE_COORDINATE_PAIR;
+
         if (m_ensure_multi) {
-            // Two 13 bytes headers plus n sets of coordinates
-            data.reserve(2UL * 13UL + geom.size() * (2UL * 8UL));
+            data.reserve(SIZE_HEADER_WITH_COUNT_AND_SRID +
+                         SIZE_HEADER_WITH_COUNT + coords_size);
             write_header(&data, wkb_multi_line, m_srid);
             write_length(&data, 1);
             write_linestring(&data, geom);
+            assert(data.size() == SIZE_HEADER_WITH_COUNT_AND_SRID +
+                                      SIZE_HEADER_WITH_COUNT + coords_size);
         } else {
-            // 13 byte header plus n sets of coordinates
-            data.reserve(13UL + geom.size() * (2UL * 8UL));
+            data.reserve(SIZE_HEADER_WITH_COUNT_AND_SRID + coords_size);
             write_linestring(&data, geom, m_srid);
+            assert(data.size() ==
+                   SIZE_HEADER_WITH_COUNT_AND_SRID + coords_size);
         }
 
         return data;
@@ -289,6 +300,8 @@ class make_ewkb_visitor_t
     }
 
 private:
+    static constexpr std::size_t SIZE_COORDINATE_PAIR = 2UL * sizeof(double);
+
     uint32_t m_srid;
     bool m_ensure_multi;
 

From 5ea2e4b8459beeee57413781bdd5525494cc7415 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 11 Feb 2026 11:04:42 +0100
Subject: [PATCH 427/430] Use constant ZOOM_MAX

---
 src/command-line-parser.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index a89370d73..b1b7e0051 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -229,14 +229,16 @@ void check_options_expire(options_t *options)
 {
     // Zoom level 31 is the technical limit because we use 32-bit integers for
     // the x and y index of a tile ID.
-    if (options->expire_tiles_zoom_min > 31) {
-        options->expire_tiles_zoom_min = 31;
+    constexpr uint32_t ZOOM_MAX = 31;
+
+    if (options->expire_tiles_zoom_min > ZOOM_MAX) {
+        options->expire_tiles_zoom_min = ZOOM_MAX;
         log_warn("Minimum zoom level for tile expiry is too "
                  "large and has been set to 31.");
     }
 
-    if (options->expire_tiles_zoom > 31) {
-        options->expire_tiles_zoom = 31;
+    if (options->expire_tiles_zoom > ZOOM_MAX) {
+        options->expire_tiles_zoom = ZOOM_MAX;
         log_warn("Maximum zoom level for tile expiry is too "
                  "large and has been set to 31.");
     }

From edbbcc61de5972197748f2195231c1ee4b4a729a Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 11 Feb 2026 19:40:47 +0100
Subject: [PATCH 428/430] Use uppercase for constant

---
 src/middle-ram.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/middle-ram.cpp b/src/middle-ram.cpp
index 8fe2eff8b..e45a47a99 100644
--- a/src/middle-ram.cpp
+++ b/src/middle-ram.cpp
@@ -113,29 +113,29 @@ void middle_ram_t::stop()
 {
     assert(m_middle_state == middle_state::done);
 
-    auto const mbyte = 1024 * 1024;
+    constexpr auto MBYTE = 1024 * 1024;
 
     if (m_persistent_cache) {
         log_debug("Middle 'ram': Node locations on disk: size={} bytes={}M",
                   m_persistent_cache->size(),
-                  m_persistent_cache->used_memory() / mbyte);
+                  m_persistent_cache->used_memory() / MBYTE);
     } else {
         log_debug("Middle 'ram': Node locations in memory: size={} bytes={}M",
                   m_node_locations.size(),
-                  m_node_locations.used_memory() / mbyte);
+                  m_node_locations.used_memory() / MBYTE);
     }
 
     log_debug("Middle 'ram': Way nodes data: size={} capacity={} bytes={}M",
               m_way_nodes_data.size(), m_way_nodes_data.capacity(),
-              m_way_nodes_data.capacity() / mbyte);
+              m_way_nodes_data.capacity() / MBYTE);
 
     log_debug("Middle 'ram': Way nodes index: size={} capacity={} bytes={}M",
               m_way_nodes_index.size(), m_way_nodes_index.capacity(),
-              m_way_nodes_index.used_memory() / mbyte);
+              m_way_nodes_index.used_memory() / MBYTE);
 
     log_debug("Middle 'ram': Object data: size={} capacity={} bytes={}M",
               m_object_buffer.committed(), m_object_buffer.capacity(),
-              m_object_buffer.capacity() / mbyte);
+              m_object_buffer.capacity() / MBYTE);
 
     std::size_t index_size = 0;
     std::size_t index_capacity = 0;
@@ -146,13 +146,13 @@ void middle_ram_t::stop()
         index_mem += index.used_memory();
     }
     log_debug("Middle 'ram': Object indexes: size={} capacity={} bytes={}M",
-              index_size, index_capacity, index_mem / mbyte);
+              index_size, index_capacity, index_mem / MBYTE);
 
     log_debug("Middle 'ram': Memory used overall: {}MBytes",
               (m_node_locations.used_memory() + m_way_nodes_data.capacity() +
                m_way_nodes_index.used_memory() + m_object_buffer.capacity() +
                index_mem) /
-                  mbyte);
+                  MBYTE);
 
     m_node_locations.clear();
 

From 171e0dcffacd6f99eb4c86d38d3fa97eaad6848d Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 11 Feb 2026 11:05:20 +0100
Subject: [PATCH 429/430] Avoid warnings for use of constants in tile code

The quadkey code uses many magic constants only once or twice, there is
no sense in defining them separately.
---
 src/tile.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/tile.cpp b/src/tile.cpp
index 87d45f66b..ff6592abd 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -36,7 +36,8 @@ geom::point_t tile_t::to_world_coords(geom::point_t p,
 
 geom::point_t tile_t::center() const noexcept
 {
-    return to_world_coords({0.5, 0.5}, 1);
+    constexpr double MIDDLE = 0.5;
+    return to_world_coords({MIDDLE, MIDDLE}, 1);
 }
 
 namespace {
@@ -44,6 +45,8 @@ namespace {
 // Quadkey implementation uses bit interleaving code from
 // https://github.com/lemire/Code-used-on-Daniel-Lemire-s-blog/blob/master/2018/01/08/interleave.c
 
+// NOLINTBEGIN(cppcoreguidelines-avoid-magic-numbers,readability-magic-numbers)
+
 uint64_t interleave_uint32_with_zeros(uint32_t input) noexcept
 {
     uint64_t word = input;
@@ -66,6 +69,8 @@ uint32_t deinterleave_lowuint32(uint64_t word) noexcept
     return static_cast<uint32_t>(word);
 }
 
+// NOLINTEND(cppcoreguidelines-avoid-magic-numbers,readability-magic-numbers)
+
 uint32_t parse_num_with_max(std::string const &str, uint32_t max)
 {
     std::size_t pos = 0;

From 0577e453e1a42c243ac4cf61fda8762e51997b00 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 1 Apr 2026 21:09:13 +0200
Subject: [PATCH 430/430] Introduce new "id cache" for node tables

It is sometimes useful to know whether a way contains nodes of a certain
type, i.e. with certain tags. This commit adds a new functionality
called "id caches" that allows to find out.

When defining a node table in Lua with `define_table` the `ids` section
can now contain a field `cache = true`. If this is set the ids of all
nodes written to that table are stored in memory. Later, when processing
ways, that cache can be queried with `tablename:in_id_cache()`. Usually
this would be used to query all the member nodes of a way:
`...:in_id_cache(object.nodes)`. The `in_id_cache()` function returns
the indexes into the `object.nodes` array where the id matches. From
there it is possible to get the id of the matching node (with
`object.nodes[idx]`) or the location of that node (with
`object:as_point(idx)`. This information can be stored in a way table
which will be correctly updated in append mode. (In append mode the
in-memory id cache is populated with all the ids of the table for which
the cache was defined.)

The whole thing only works for node tables and querying only works in
the process_way() function. It can possibly be extended later to work
in other contexts.
---
 flex-config/turning-circles.lua      |  69 ++++++
 src/debug-output.cpp                 |   1 +
 src/flex-lua-table.cpp               |  12 +
 src/flex-table.cpp                   |   4 +
 src/flex-table.hpp                   |   7 +
 src/idlist.cpp                       |   5 +
 src/idlist.hpp                       |   7 +
 src/output-flex.cpp                  |  75 +++++++
 src/output-flex.hpp                  |  19 ++
 tests/bdd/flex/id-cache.feature      | 132 +++++++++++
 tests/bdd/flex/lua-table-ids.feature | 317 +++++++++++++++++++++++++++
 11 files changed, 648 insertions(+)
 create mode 100644 flex-config/turning-circles.lua
 create mode 100644 tests/bdd/flex/id-cache.feature
 create mode 100644 tests/bdd/flex/lua-table-ids.feature

diff --git a/flex-config/turning-circles.lua b/flex-config/turning-circles.lua
new file mode 100644
index 000000000..dfca535ec
--- /dev/null
+++ b/flex-config/turning-circles.lua
@@ -0,0 +1,69 @@
+-- This config example file is released into the Public Domain.
+
+-- Create a table with turning circles that can be styled in sync with the
+-- highway they are on.
+
+local turning_circles = osm2pgsql.define_table({
+    name = 'turning_circles',
+    ids = { type = 'node', id_column = 'node_id', cache = true },
+    columns = {
+        { column = 'geom', type = 'point', not_null = true },
+    }
+})
+
+local highways = osm2pgsql.define_table({
+    name = 'highways',
+    ids = { type = 'way', id_column = 'way_id' },
+    columns = {
+        { column = 'htype', type = 'text', not_null = true },
+        { column = 'geom', type = 'linestring', not_null = true },
+    }
+})
+
+-- This table will contain entries for all node/way combinations where the way
+-- is tagged as "highway" and the node is tagged as "highway=turning_circle".
+-- The "htype" column contains the highway type, the "geom" the geometry of
+-- the node. This can be used, for instance, to draw the point in a style that
+-- fits with the style of the highway.
+--
+-- Note that you might have multiple entries for the same node in this table
+-- if it is in several ways. In that case you might have to decide at rendering
+-- time which of them to render.
+local highway_ends = osm2pgsql.define_table({
+    name = 'highway_ends',
+    ids = { type = 'way', id_column = 'way_id' },
+    columns = {
+        { column = 'htype', type = 'text', not_null = true },
+        { column = 'node_id', type = 'int8', not_null = true },
+        { column = 'geom', type = 'point', not_null = true },
+    }
+})
+
+function osm2pgsql.process_node(object)
+    if object.tags.highway == 'turning_circle' then
+        -- This insert will add the entry to the id cache later read with
+        -- in_id_cache().
+        turning_circles:insert({
+            geom = object:as_point(),
+        })
+    end
+end
+
+function osm2pgsql.process_way(object)
+    local t = object.tags.highway
+    if t then
+        highways:insert({
+            htype = t,
+            geom = object:as_linestring(),
+        })
+        local c = turning_circles:in_id_cache(object.nodes)
+        for _, n in ipairs(c) do
+            highway_ends:insert({
+                htype = t,
+                node_id = object.nodes[n],
+                geom = object:as_point(n),
+            })
+        end
+    end
+end
+
diff --git a/src/debug-output.cpp b/src/debug-output.cpp
index 6e90fdf0e..ec46a49e3 100644
--- a/src/debug-output.cpp
+++ b/src/debug-output.cpp
@@ -61,6 +61,7 @@ void write_table_list_to_debug_log(std::vector<flex_table_t> const &tables)
         log_debug("  - data_tablespace={}", table.data_tablespace());
         log_debug("  - index_tablespace={}", table.index_tablespace());
         log_debug("  - cluster={}", table.cluster_by_geom());
+        log_debug("  - id_cache={}", table.with_id_cache());
         for (auto const &index : table.indexes()) {
             log_debug("  - INDEX USING {}", index.method());
             if (index.name().empty()) {
diff --git a/src/flex-lua-table.cpp b/src/flex-lua-table.cpp
index f50fef6ab..abb55ed1f 100644
--- a/src/flex-lua-table.cpp
+++ b/src/flex-lua-table.cpp
@@ -174,6 +174,17 @@ void setup_flex_table_id_columns(lua_State *lua_state, flex_table_t *table)
         throw fmt_error("Unknown ids type: {}.", type);
     }
 
+    bool const cache =
+        luaX_get_table_bool(lua_state, "cache", -1, "The ids", false);
+    lua_pop(lua_state, 1); // "cache"
+    if (cache) {
+        if (type == "node") {
+            table->enable_id_cache();
+        } else {
+            throw std::runtime_error{"ID cache only available for node ids."};
+        }
+    }
+
     std::string const name =
         luaX_get_table_string(lua_state, "id_column", -1, "The ids field");
     lua_pop(lua_state, 1); // "id_column"
@@ -459,6 +470,7 @@ void lua_wrapper_table_t::init(lua_State *lua_state)
     luaX_set_up_metatable(lua_state, "Table", OSM2PGSQL_TABLE_CLASS,
                           {{"__tostring", lua_trampoline_table_tostring},
                            {"insert", lua_trampoline_table_insert},
+                           {"in_id_cache", lua_trampoline_table_in_id_cache},
                            {"name", lua_trampoline_table_name},
                            {"schema", lua_trampoline_table_schema},
                            {"cluster", lua_trampoline_table_cluster},
diff --git a/src/flex-table.cpp b/src/flex-table.cpp
index 0204b766d..263a9cedc 100644
--- a/src/flex-table.cpp
+++ b/src/flex-table.cpp
@@ -263,6 +263,10 @@ void flex_table_t::analyze(pg_conn_t const &db_connection) const
     analyze_table(db_connection, schema(), name());
 }
 
+void flex_table_t::enable_id_cache() noexcept { m_with_id_cache = true; }
+
+bool flex_table_t::with_id_cache() const noexcept { return m_with_id_cache; }
+
 namespace {
 
 void enable_check_trigger(pg_conn_t const &db_connection,
diff --git a/src/flex-table.hpp b/src/flex-table.hpp
index d917ddacb..663375327 100644
--- a/src/flex-table.hpp
+++ b/src/flex-table.hpp
@@ -215,6 +215,10 @@ class flex_table_t
 
     void analyze(pg_conn_t const &db_connection) const;
 
+    void enable_id_cache() noexcept;
+
+    bool with_id_cache() const noexcept;
+
 private:
     /// The schema this table is in
     std::string m_schema;
@@ -271,6 +275,9 @@ class flex_table_t
     /// Index should be a primary key.
     bool m_primary_key_index = false;
 
+    /// Do we want an ID cache for this table?
+    bool m_with_id_cache = false;
+
 }; // class flex_table_t
 
 class table_connection_t
diff --git a/src/idlist.cpp b/src/idlist.cpp
index 6877959d1..21d647940 100644
--- a/src/idlist.cpp
+++ b/src/idlist.cpp
@@ -22,6 +22,11 @@ osmid_t idlist_t::pop_id()
     return id;
 }
 
+bool idlist_t::contains(osmid_t id) const
+{
+    return std::binary_search(m_list.begin(), m_list.end(), id);
+}
+
 void idlist_t::sort_unique()
 {
     std::sort(m_list.begin(), m_list.end());
diff --git a/src/idlist.hpp b/src/idlist.hpp
index 5ae6a1b60..0b6068e7b 100644
--- a/src/idlist.hpp
+++ b/src/idlist.hpp
@@ -62,6 +62,13 @@ class idlist_t
 
     void reserve(std::size_t size) { m_list.reserve(size); }
 
+    /**
+     * Is the specified id in the list?
+     *
+     * You must have called sort_unique() before calling this.
+     */
+    bool contains(osmid_t id) const;
+
     /**
      * Remove id at the end of the list and return it.
      *
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 8be5af027..b8a41fbed 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -89,6 +89,7 @@ TRAMPOLINE(app_as_geometrycollection, as_geometrycollection)
 } // anonymous namespace
 
 TRAMPOLINE(table_insert, insert)
+TRAMPOLINE(table_in_id_cache, in_id_cache)
 
 prepared_lua_function_t::prepared_lua_function_t(lua_State *lua_state,
                                                  calling_context context,
@@ -270,6 +271,9 @@ void flush_tables(std::vector<table_connection_t> &table_connections)
     for (auto &table : table_connections) {
         table.flush();
     }
+    for (auto &table : table_connections) {
+        table.sync();
+    }
 }
 
 void create_expire_tables(std::vector<expire_output_t> const &expire_outputs,
@@ -789,6 +793,10 @@ int output_flex_t::table_insert()
     auto const &object = check_and_get_context_object(table);
     osmid_t const id = table.map_id(object.type(), object.id());
 
+    if (table.with_id_cache()) {
+        get_id_cache(table).push_back(id);
+    }
+
     table_connection.new_line();
     auto *copy_mgr = table_connection.copy_mgr();
 
@@ -823,6 +831,46 @@ int output_flex_t::table_insert()
     return 1;
 }
 
+int output_flex_t::table_in_id_cache()
+{
+    if (m_calling_context == calling_context::process_node) {
+        throw std::runtime_error{
+            "Id cache not available while processing nodes."};
+    }
+
+    // The first parameter is the table object.
+    auto const &table = get_table_from_param();
+
+    if (!table.with_id_cache()) {
+        throw fmt_error("No ID cache on table '{}'.", table.name());
+    }
+
+    // The second parameter is an array of ids
+    if (!lua_istable(lua_state(), 1) || !luaX_is_array(lua_state())) {
+        throw std::runtime_error{"Second parameter must be an array of ids."};
+    }
+
+    std::vector<osmid_t> ids;
+    luaX_for_each(lua_state(),
+                  [&]() { ids.push_back(lua_tointeger(lua_state(), -1)); });
+
+    auto const &cache = get_id_cache(table);
+    lua_createtable(lua_state(), 0, 0);
+
+    lua_Integer n = 0;
+    lua_Integer idx = 1;
+    for (auto const id : ids) {
+        if (cache.contains(id)) {
+            lua_pushinteger(lua_state(), ++n);
+            lua_pushinteger(lua_state(), idx);
+            lua_rawset(lua_state(), -3);
+        }
+        ++idx;
+    }
+
+    return 1;
+}
+
 void output_flex_t::call_lua_function(prepared_lua_function_t func)
 {
     lua_pushvalue(lua_state(), func.index());
@@ -980,6 +1028,28 @@ void output_flex_t::after_nodes()
     }
 
     flush_tables(m_table_connections);
+
+    for (auto &table : *m_tables) {
+        if (table.with_id_cache()) {
+            auto &cache = get_id_cache(table);
+            if (get_options()->append) {
+                log_debug("Initializing cache for table '{}' from database...",
+                          table.name());
+                auto const result = m_db_connection.exec(
+                    "SELECT \"{}\" FROM {}", table.id_column_names(),
+                    table.full_name());
+
+                cache.reserve(result.num_tuples());
+                for (int i = 0; i < result.num_tuples(); ++i) {
+                    cache.push_back(
+                        osmium::string_to_object_id(result.get_value(i, 0)));
+                }
+            }
+            cache.sort_unique();
+            log_debug("Cache for table '{}' initialized with {} entries.",
+                      table.name(), cache.size());
+        }
+    }
 }
 
 void output_flex_t::after_ways()
@@ -1199,6 +1269,10 @@ void output_flex_t::relation_modify(osmium::Relation const &rel)
 void output_flex_t::start()
 {
     for (auto &table : m_table_connections) {
+        if (table.table().with_id_cache()) {
+            log_debug("Enable cache for table '{}'.", table.table().name());
+            create_id_cache(table.table());
+        }
         table.start(m_db_connection, get_options()->append);
     }
 
@@ -1212,6 +1286,7 @@ output_flex_t::output_flex_t(output_flex_t const *other,
                              std::shared_ptr<db_copy_thread_t> copy_thread)
 : output_t(other, std::move(mid)), m_locators(other->m_locators),
   m_tables(other->m_tables), m_expire_outputs(other->m_expire_outputs),
+  m_id_caches(other->m_id_caches),
   m_db_connection(get_options()->connection_params, "out.flex.thread"),
   m_stage2_way_ids(other->m_stage2_way_ids),
   m_copy_thread(std::move(copy_thread)), m_lua_state(other->m_lua_state),
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
index 427225208..7bbb6bef3 100644
--- a/src/output-flex.hpp
+++ b/src/output-flex.hpp
@@ -165,6 +165,7 @@ class output_flex_t : public output_t
     int app_get_bbox();
 
     int table_insert();
+    int table_in_id_cache();
 
     // Get the flex table that is as first parameter on the Lua stack.
     flex_table_t &get_table_from_param();
@@ -216,6 +217,21 @@ class output_flex_t : public output_t
 
     lua_State *lua_state() noexcept { return m_lua_state.get(); }
 
+    void create_id_cache(flex_table_t const &table)
+    {
+        if (table.num() >= m_id_caches.size()) {
+            m_id_caches.resize(table.num() + 1);
+        }
+        m_id_caches[table.num()] = std::make_shared<idlist_t>();
+    }
+
+    idlist_t &get_id_cache(flex_table_t const &table)
+    {
+        auto& c = m_id_caches[table.num()];
+        assert(c);
+        return *c;
+    }
+
     class way_cache_t
     {
     public:
@@ -273,6 +289,8 @@ class output_flex_t : public output_t
     std::shared_ptr<std::vector<expire_output_t>> m_expire_outputs =
         std::make_shared<std::vector<expire_output_t>>();
 
+    std::vector<std::shared_ptr<idlist_t>> m_id_caches;
+
     std::vector<table_connection_t> m_table_connections;
 
     /// The connection to the database server.
@@ -325,5 +343,6 @@ class output_flex_t : public output_t
 };
 
 int lua_trampoline_table_insert(lua_State *lua_state);
+int lua_trampoline_table_in_id_cache(lua_State *lua_state);
 
 #endif // OSM2PGSQL_OUTPUT_FLEX_HPP
diff --git a/tests/bdd/flex/id-cache.feature b/tests/bdd/flex/id-cache.feature
new file mode 100644
index 000000000..4eb634c3a
--- /dev/null
+++ b/tests/bdd/flex/id-cache.feature
@@ -0,0 +1,132 @@
+Feature: Id cache
+
+    Background:
+        Given the 0.1 grid
+            |    | 10 | 11 | 12 |
+            | 14 | 15 |    | 16 |
+        And the lua style
+            """
+            local barriers = osm2pgsql.define_table({
+                name = 'barriers',
+                ids = { type = 'node', id_column = 'node_id', cache = true },
+                columns = {
+                    { column = 'btype', type = 'text', not_null = true },
+                    { column = 'geom', type = 'point', projection = 4326, not_null = true },
+                }
+            })
+            local highways = osm2pgsql.define_table({
+                name = 'highways',
+                ids = { type = 'way', id_column = 'way_id' },
+                columns = {
+                    { column = 'htype', type = 'text', not_null = true },
+                    { column = 'geom', type = 'linestring', projection = 4326, not_null = true },
+                }
+            })
+            local b_on_h = osm2pgsql.define_table({
+                name = 'b_on_h',
+                ids = { type = 'way', id_column = 'way_id' },
+                columns = {
+                    { column = 'node_id', type = 'int8', not_null = true },
+                    { column = 'htype', type = 'text', not_null = true },
+                    { column = 'hgeom', type = 'linestring', projection = 4326, not_null = true },
+                    { column = 'bgeom', type = 'point', projection = 4326, not_null = true },
+                }
+            })
+
+            function osm2pgsql.process_node(object)
+                local t = object.tags.barrier
+                if t then
+                    barriers:insert({
+                        btype = t,
+                        geom = object:as_point(),
+                    })
+                end
+            end
+
+            function osm2pgsql.process_way(object)
+                local t = object.tags.highway
+                if t then
+                    highways:insert({
+                        htype = t,
+                        geom = object:as_linestring(),
+                    })
+                    local bidx = barriers:in_id_cache(object.nodes)
+                    for _, idx in ipairs(bidx) do
+                        b_on_h:insert({
+                            node_id = object.nodes[idx],
+                            htype = t,
+                            hgeom = object:as_linestring(),
+                            bgeom = object:as_point(idx),
+                        })
+                    end
+                end
+            end
+            """
+
+    Scenario: Id cache works with simple import
+        Given the OSM data
+            """
+            n10 v1 dV Tbarrier=gate
+            n16 v1 dV Tbarrier=lift_gate
+            w20 v1 dV Thighway=residential Nn10,n11,n12,n16
+            w21 v1 dV Thighway=residential Nn14,n15,n10
+            """
+        When running osm2pgsql flex
+        Then table barriers contains exactly
+            | node_id | btype     | geom!geo |
+            | 10      | gate      | 10       |
+            | 16      | lift_gate | 16       |
+        Then table highways contains exactly
+            | way_id  | htype       | geom!geo    |
+            | 20      | residential | 10,11,12,16 |
+            | 21      | residential | 14,15,10    |
+        Then table b_on_h contains exactly
+            | way_id  | node_id | htype       | bgeom!geo | hgeom!geo   |
+            | 20      | 10      | residential | 10        | 10,11,12,16 |
+            | 20      | 16      | residential | 16        | 10,11,12,16 |
+            | 21      | 10      | residential | 10        | 14,15,10    |
+
+    Scenario: Id cache works with updates
+        Given the OSM data
+            """
+            n10 v1 dV Tbarrier=gate
+            n16 v1 dV Tbarrier=lift_gate
+            w20 v1 dV Thighway=residential Nn10,n11,n12,n16
+            w21 v1 dV Thighway=residential Nn14,n15,n10
+            """
+        When running osm2pgsql flex with parameters
+            | --slim |
+        Then table barriers contains exactly
+            | node_id | btype     | geom!geo |
+            | 10      | gate      | 10       |
+            | 16      | lift_gate | 16       |
+        Then table highways contains exactly
+            | way_id  | htype       | geom!geo    |
+            | 20      | residential | 10,11,12,16 |
+            | 21      | residential | 14,15,10    |
+        Then table b_on_h contains exactly
+            | way_id  | node_id | htype       | bgeom!geo | hgeom!geo   |
+            | 20      | 10      | residential | 10        | 10,11,12,16 |
+            | 20      | 16      | residential | 16        | 10,11,12,16 |
+            | 21      | 10      | residential | 10        | 14,15,10    |
+
+        Given the OSM data
+            """
+            n10 v2 dV Tno=barrier
+            n11 v2 dV Tbarrier=gate
+            """
+        When running osm2pgsql flex with parameters
+            | --slim | -a |
+        Then table barriers contains exactly
+            | node_id | btype     | geom!geo |
+            | 11      | gate      | 11       |
+            | 16      | lift_gate | 16       |
+        Then table highways contains exactly
+            | way_id  | htype       | geom!geo    |
+            | 20      | residential | 10,11,12,16 |
+            | 21      | residential | 14,15,10    |
+        Then table b_on_h contains exactly
+            | way_id  | node_id | htype       | bgeom!geo | hgeom!geo   |
+            | 20      | 11      | residential | 11        | 10,11,12,16 |
+            | 20      | 16      | residential | 16        | 10,11,12,16 |
+
diff --git a/tests/bdd/flex/lua-table-ids.feature b/tests/bdd/flex/lua-table-ids.feature
new file mode 100644
index 000000000..9b0168c5e
--- /dev/null
+++ b/tests/bdd/flex/lua-table-ids.feature
@@ -0,0 +1,317 @@
+Feature: Ids in table definitions in Lua file
+
+    Scenario: Table definition without ids is okay
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            local t = osm2pgsql.define_table({
+                name = 'foo',
+                columns = {{ column = 'bar', type = 'text' }}
+            })
+
+            function osm2pgsql.process_node(object)
+                t:insert({})
+            end
+            """
+        When running osm2pgsql flex
+        Then table foo has 1562 rows
+
+    Scenario: Table definition with empty ids is not allowed
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            local t = osm2pgsql.define_table({
+                name = 'foo',
+                ids = {},
+                columns = {{ column = 'bar', type = 'text' }}
+            })
+
+            function osm2pgsql.process_node(object)
+                t:insert({})
+            end
+            """
+        When running osm2pgsql flex
+        Then execution fails
+        And the error output contains
+            """
+            The ids field must contain a 'type' string field.
+            """
+
+    Scenario: Table ids definition must contain a text id_column field
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            local t = osm2pgsql.define_table({
+                name = 'foo',
+                ids = { type = 123 },
+                columns = {{ column = 'bar', type = 'text' }}
+            })
+
+            function osm2pgsql.process_node(object)
+                t:insert({})
+            end
+            """
+        When running osm2pgsql flex
+        Then execution fails
+        And the error output contains
+            """
+            Unknown ids type: 123.
+            """
+
+    Scenario: Table ids definition must contain an id_column field
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            local t = osm2pgsql.define_table({
+                name = 'foo',
+                ids = { type = 'node' },
+                columns = {{ column = 'bar', type = 'text' }}
+            })
+
+            function osm2pgsql.process_node(object)
+                t:insert({})
+            end
+            """
+        When running osm2pgsql flex
+        Then execution fails
+        And the error output contains
+            """
+            The ids field must contain a 'id_column' string field.
+            """
+
+    Scenario: Table ids definition must contain an id_column field
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            local t = osm2pgsql.define_table({
+                name = 'foo',
+                ids = { type = 'node', ids_column = false },
+                columns = {{ column = 'bar', type = 'text' }}
+            })
+
+            function osm2pgsql.process_node(object)
+                t:insert({})
+            end
+            """
+        When running osm2pgsql flex
+        Then execution fails
+        And the error output contains
+            """
+            The ids field must contain a 'id_column' string field.
+            """
+
+    Scenario: Table ids definition with type and id_column fields is okay
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            local t = osm2pgsql.define_table({
+                name = 'foo',
+                ids = { type = 'node', id_column = 'abc' },
+                columns = {{ column = 'bar', type = 'text' }}
+            })
+
+            function osm2pgsql.process_node(object)
+                t:insert({})
+            end
+            """
+        When running osm2pgsql flex
+        Then table foo has 1562 rows
+
+    Scenario Outline:
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            local t = osm2pgsql.define_table({
+                name = 'foo',
+                ids = { type = '<idtype>', id_column = 'abc' },
+                columns = {{ column = 'bar', type = 'text' }}
+            })
+            """
+        When running osm2pgsql flex
+        Then execution is successful
+
+        Examples:
+            | idtype   |
+            | node     |
+            | way      |
+            | relation |
+            | area     |
+            | any      |
+            | tile     |
+
+    Scenario: Table ids definition checks for special characters in column names
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            local t = osm2pgsql.define_table({
+                name = 'foo',
+                ids = { type = 'node', id_column = 'a"b"c' },
+                columns = {{ column = 'bar', type = 'text' }}
+            })
+
+            function osm2pgsql.process_node(object)
+                t:insert({})
+            end
+            """
+        When running osm2pgsql flex
+        Then execution fails
+        And the error output contains
+            """
+            Special characters are not allowed in column names: 'a"b"c'.
+            """
+
+    Scenario: Table ids definition can contain cache field but needs right type
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            local t = osm2pgsql.define_table({
+                name = 'foo',
+                ids = { type = 'node', id_column = 'abc', cache = 'xxx' },
+                columns = {{ column = 'bar', type = 'text' }}
+            })
+
+            function osm2pgsql.process_node(object)
+                t:insert({})
+            end
+            """
+        When running osm2pgsql flex
+        Then execution fails
+        And the error output contains
+            """
+            The ids field 'cache' must be a boolean field.
+            """
+
+    Scenario: Table ids definition can contain boolean cache field (false)
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            local t = osm2pgsql.define_table({
+                name = 'foo',
+                ids = { type = 'node', id_column = 'abc', cache = false },
+                columns = {{ column = 'bar', type = 'text' }} })
+
+            function osm2pgsql.process_node(object)
+                t:insert({})
+            end
+            """
+        When running osm2pgsql flex
+        Then table foo has 1562 rows
+
+    Scenario: Table ids definition can contain boolean cache field (true)
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            local t = osm2pgsql.define_table({
+                name = 'foo',
+                ids = { type = 'node', id_column = 'abc', cache = true },
+                columns = {{ column = 'bar', type = 'text' }}
+            })
+
+            function osm2pgsql.process_node(object)
+                t:insert({})
+            end
+            """
+        When running osm2pgsql flex
+        Then table foo has 1562 rows
+
+    Scenario: Table ids definition can contain false cache field for a way
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            local t = osm2pgsql.define_table({
+                name = 'foo',
+                ids = { type = 'way', id_column = 'abc', cache = false },
+                columns = {{ column = 'bar', type = 'text' }}
+            })
+
+            function osm2pgsql.process_way(object)
+                t:insert({})
+            end
+            """
+        When running osm2pgsql flex
+        Then table foo has 7105 rows
+
+    Scenario: Table ids definition can contain cache field only for nodes
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            local t = osm2pgsql.define_table({
+                name = 'foo',
+                ids = { type = 'way', id_column = 'abc', cache = true },
+                columns = {{ column = 'bar', type = 'text' }}
+            })
+
+            function osm2pgsql.process_way(object)
+                t:insert({})
+            end
+            """
+        When running osm2pgsql flex
+        Then execution fails
+        And the error output contains
+            """
+            ID cache only available for node ids.
+            """
+
+    Scenario: Error when accessing id cache of table that doesn't have one
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            local t = osm2pgsql.define_table({
+                name = 'foo',
+                ids = { type = 'node', id_column = 'node_id' },
+                columns = {{ column = 'bar', type = 'text' }}
+            })
+
+            function osm2pgsql.process_way(object)
+                t:in_id_cache({})
+            end
+            """
+        When running osm2pgsql flex
+        Then execution fails
+        And the error output contains
+            """
+            No ID cache on table 'foo'.
+            """
+
+    Scenario: Error when accessing id cache of table that doesn't have one
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            local t = osm2pgsql.define_table({
+                name = 'foo',
+                ids = { type = 'node', id_column = 'node_id', cache = true },
+                columns = {{ column = 'bar', type = 'text' }}
+            })
+
+            function osm2pgsql.process_way(object)
+                t:in_id_cache("error")
+            end
+            """
+        When running osm2pgsql flex
+        Then execution fails
+        And the error output contains
+            """
+            Second parameter must be an array of ids.
+            """
+
+    Scenario: Calling in_id_cache() on something other than a table doesn't work
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the lua style
+            """
+            local t = osm2pgsql.define_table({
+                name = 'foo',
+                ids = { type = 'node', id_column = 'node_id', cache = true },
+                columns = {{ column = 'bar', type = 'text' }}
+            })
+
+            function osm2pgsql.process_way(object)
+                t.in_id_cache("error", {})
+            end
+            """
+        When running osm2pgsql flex
+        Then execution fails
+        And the error output contains
+            """
+            First parameter must be of type osm2pgsql.Table.
+            """
+